use starknet_api and cairo-* deps from katana-cairo instead of workspace

bin/katana/Cargo.toml

@@ -9,7 +9,6 @@ version.workspace = true
 [dependencies]
 alloy-primitives.workspace = true
 anyhow.workspace = true
-cfg-if = "1.0.0"
 clap.workspace = true
 clap_complete.workspace = true
 common.workspace = true
@@ -22,7 +21,6 @@ katana-rpc-api.workspace = true
 katana-rpc.workspace = true
 serde_json.workspace = true
 shellexpand = "3.1.0"
-starknet_api.workspace = true
 tokio.workspace = true
 tracing-subscriber.workspace = true
 tracing.workspace = true

bin/katana/src/main.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
+
 use std::io;
 use std::net::SocketAddr;
 use std::sync::Arc;

bin/sozo/src/commands/mod.rs

@@ -53,8 +53,8 @@ pub enum Commands {
     Init(InitArgs),
     #[command(about = "Remove generated artifacts, manifests and abis")]
     Clean(CleanArgs),
-    #[command(about = "Run a migration, declaring and deploying contracts as necessary to update \
-                       the world")]
+    #[command(about = "Run a migration, declaring and deploying contracts as necessary to \
+                       update the world")]
     Migrate(Box<MigrateArgs>),
     #[command(about = "Developer mode: watcher for building and migration")]
     Dev(DevArgs),

crates/benches/Cargo.toml

@@ -9,7 +9,7 @@ version.workspace = true
 clap_builder = "4.4.6"
 reqwest = { workspace = true, features = [ "blocking", "json", "rustls-tls" ], default-features = false }
 
-katana-core = { path = "../katana/core" }
+# katana-core = { path = "../katana/core" }
 katana-runner.workspace = true
 
 anyhow.workspace = true

crates/katana/cairo/Cargo.toml

@@ -17,3 +17,4 @@ cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", tag = "
 cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", tag = "v2.6.3" }
 cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", tag = "v2.6.3" }
 cairo-vm = "0.9.2"
+starknet_api = "0.11.0"

crates/katana/cairo/src/lib.rs

@@ -10,4 +10,4 @@ pub mod lang {
     };
 }
 
-pub use cairo_vm;
+pub use {cairo_vm, starknet_api};

crates/katana/core/Cargo.toml

@@ -14,25 +14,19 @@ katana-provider.workspace = true
 katana-tasks.workspace = true
 
 anyhow.workspace = true
-async-trait.workspace = true
+async-trait = { workspace = true, optional = true }
 cairo-vm.workspace = true
-convert_case.workspace = true
 derive_more.workspace = true
 dojo-metrics.workspace = true
-flate2.workspace = true
 futures.workspace = true
-k256 = { version = "0.13", default-features = false, features = [ "ecdsa", "std" ] }
 lazy_static.workspace = true
 metrics.workspace = true
 num-traits.workspace = true
 parking_lot.workspace = true
-rand = { workspace = true, features = [ "small_rng" ] }
-reqwest.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-serde_with.workspace = true
+reqwest = { workspace = true, optional = true }
+serde = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }
 starknet.workspace = true
-starknet_api.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
 tracing.workspace = true
@@ -45,7 +39,6 @@ alloy-contract = { version = "0.1.0", default-features = false, optional = true
 alloy-network = { version = "0.1.0", default-features = false, optional = true }
 alloy-provider = { version = "0.1.0", default-features = false, optional = true, features = [ "reqwest" ] }
 alloy-rpc-types = { version = "0.1.0", default-features = false, optional = true }
-alloy-signer = { version = "0.1.0", default-features = false, optional = true }
 alloy-transport = { version = "0.1.0", default-features = false, optional = true }
 
 [dev-dependencies]
@@ -59,8 +52,11 @@ messaging = [
     "alloy-network",
     "alloy-provider",
     "alloy-rpc-types",
-    "alloy-signer",
     "alloy-sol-types",
     "alloy-transport",
+    "async-trait",
+    "reqwest",
+    "serde",
+    "serde_json",
 ]
 starknet-messaging = [  ]

crates/katana/core/src/lib.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
+
 pub mod backend;
 pub mod constants;
 pub mod env;

crates/katana/executor/Cargo.toml

@@ -11,16 +11,11 @@ katana-primitives.workspace = true
 katana-provider.workspace = true
 
 convert_case.workspace = true
-futures.workspace = true
 parking_lot.workspace = true
-serde_json.workspace = true
-starknet.workspace = true
-starknet_api.workspace = true
+starknet = { workspace = true, optional = true }
 thiserror.workspace = true
 tracing.workspace = true
 
-alloy-primitives.workspace = true
-
 # blockifier deps
 blockifier = { git = "https://github.com/dojoengine/blockifier", rev = "57c11586", features = [ "testing" ], optional = true }
 katana-cairo = { workspace = true, optional = true }
@@ -32,6 +27,7 @@ katana-cairo = { workspace = true, optional = true }
 # starknet-types-core = { version = "0.0.9", optional = true }
 
 [dev-dependencies]
+alloy-primitives.workspace = true
 anyhow.workspace = true
 katana-cairo.workspace = true
 katana-provider = { workspace = true, features = [ "test-utils" ] }
@@ -46,7 +42,7 @@ criterion.workspace = true
 pprof = { version = "0.13.0", features = [ "criterion", "flamegraph" ] }
 
 [features]
-blockifier = [ "dep:blockifier", "dep:katana-cairo" ]
+blockifier = [ "dep:blockifier", "dep:katana-cairo", "dep:starknet" ]
 default = [ "blockifier" ]
 # native = [ "sir", "sir/cairo-native" ]
 # sir = [ "dep:sir", "dep:starknet-types-core" ]

crates/katana/executor/src/implementation/blockifier/mod.rs

@@ -8,13 +8,13 @@ use blockifier::block::{BlockInfo, GasPrices};
 use blockifier::context::BlockContext;
 use blockifier::state::cached_state::{self, GlobalContractCache, MutRefState};
 use blockifier::state::state_api::StateReader;
+use katana_cairo::starknet_api::block::{BlockNumber, BlockTimestamp};
 use katana_primitives::block::{ExecutableBlock, GasPrices as KatanaGasPrices, PartialHeader};
 use katana_primitives::env::{BlockEnv, CfgEnv};
 use katana_primitives::fee::TxFeeInfo;
 use katana_primitives::transaction::{ExecutableTx, ExecutableTxWithHash, TxWithHash};
 use katana_primitives::FieldElement;
 use katana_provider::traits::state::StateProvider;
-use starknet_api::block::{BlockNumber, BlockTimestamp};
 use tracing::info;
 
 use self::state::CachedState;