Remove starknet_in_rust executor support

.github/workflows/ci.yml

@@ -43,8 +43,6 @@ jobs:
           chmod +x /tmp/bins/katana
           KATANA_RUNNER_BIN=/tmp/bins/katana cargo llvm-cov nextest --no-report --all-features --workspace --exclude katana --build-jobs 20
           cargo llvm-cov nextest --no-report -p katana
-          # TODO(kariy): uncomment this line when `sir` feature support Cairo 2.6.3
-          # cargo llvm-cov nextest --no-report -p katana --no-default-features --features sir
           cargo llvm-cov report --lcov --output-path lcov.info
       - uses: codecov/codecov-action@v4
         with:

bin/katana/Cargo.toml

@@ -15,15 +15,15 @@ common.workspace = true
 console.workspace = true
 dojo-metrics.workspace = true
 katana-core.workspace = true
-katana-executor.workspace = true
+katana-executor = { workspace = true, features = [ "blockifier" ] }
 katana-primitives.workspace = true
-katana-rpc-api.workspace = true
 katana-rpc.workspace = true
+katana-rpc-api.workspace = true
 serde_json.workspace = true
 shellexpand = "3.1.0"
 tokio.workspace = true
-tracing-subscriber.workspace = true
 tracing.workspace = true
+tracing-subscriber.workspace = true
 url.workspace = true
 
 katana-slot-controller = { workspace = true, optional = true }
@@ -32,11 +32,7 @@ katana-slot-controller = { workspace = true, optional = true }
 assert_matches.workspace = true
 
 [features]
-default = [ "blockifier", "jemalloc", "messaging", "slot" ]
-
-blockifier = [ "katana-executor/blockifier" ]
-# Disable until SIR support Cairo 2.6.3
-#sir = [ "katana-executor/sir" ]
+default = [ "jemalloc", "messaging", "slot" ]
 
 jemalloc = [ "dojo-metrics/jemalloc" ]
 messaging = [ "katana-core/messaging" ]

bin/katana/src/main.rs

@@ -63,21 +63,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         ..Default::default()
     };
 
-    // TODO: Uncomment this once we enable the 'sir' feature again because it's not compatible with
-    // our current Cairo version (2.6.3). cfg_if::cfg_if! {
-    //     if #[cfg(all(feature = "blockifier", feature = "sir"))] {
-    //         compile_error!("Cannot enable both `blockifier` and `sir` features at the same
-    // time");     } else if #[cfg(feature = "blockifier")] {
-    //         use katana_executor::implementation::blockifier::BlockifierFactory;
-    //         let executor_factory = BlockifierFactory::new(cfg_env, simulation_flags);
-    //     } else if #[cfg(feature = "sir")] {
-    //         use katana_executor::implementation::sir::NativeExecutorFactory;
-    //         let executor_factory = NativeExecutorFactory::new(cfg_env, simulation_flags);
-    //     } else {
-    //         compile_error!("At least one of the following features must be enabled: blockifier,
-    // sir");     }
-    // }
-
     use katana_executor::implementation::blockifier::BlockifierFactory;
     let executor_factory = BlockifierFactory::new(cfg_env, simulation_flags);
 

crates/katana/executor/Cargo.toml

@@ -18,12 +18,6 @@ tracing.workspace = true
 blockifier = { git = "https://github.com/dojoengine/blockifier", branch = "cairo-2.7", features = [ "testing" ], optional = true }
 katana-cairo = { workspace = true, optional = true }
 
-# Disable SIR for now until they support Cairo 2.6.3
-# # starknet_in_rust deps
-# cairo-lang-sierra = { workspace = true, optional = true }
-# sir = { package = "starknet_in_rust", git = "https://github.com/dojoengine/starknet_in_rust.git", rev = "601a65e", optional = true }
-# starknet-types-core = { version = "0.0.9", optional = true }
-
 [dev-dependencies]
 alloy-primitives.workspace = true
 anyhow.workspace = true
@@ -44,8 +38,6 @@ rayon.workspace = true
 [features]
 blockifier = [ "dep:blockifier", "dep:katana-cairo", "dep:starknet" ]
 default = [ "blockifier" ]
-# native = [ "sir", "sir/cairo-native" ]
-# sir = [ "dep:sir", "dep:starknet-types-core" ]
 
 [[bench]]
 harness = false

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

@@ -1,7 +1,3 @@
 #[cfg(feature = "blockifier")]
 pub mod blockifier;
-
-// #[cfg(feature = "sir")]
-// pub mod sir;
-
 pub mod noop;