chore: move revm-inspectors to a separate repo (paradigmxyz#5992)

Cargo.toml

@@ -28,7 +28,6 @@ members = [
     "crates/primitives/",
     "crates/prune/",
     "crates/revm/",
-    "crates/revm/revm-inspectors/",
     "crates/rpc/ipc/",
     "crates/rpc/rpc/",
     "crates/rpc/rpc-api/",
@@ -135,7 +134,6 @@ reth-primitives = { path = "crates/primitives" }
 reth-provider = { path = "crates/storage/provider" }
 reth-prune = { path = "crates/prune" }
 reth-revm = { path = "crates/revm" }
-reth-revm-inspectors = { path = "crates/revm/revm-inspectors" }
 reth-rpc = { path = "crates/rpc/rpc" }
 reth-rpc-api = { path = "crates/rpc/rpc-api" }
 reth-rpc-api-testing-util = { path = "crates/rpc/rpc-testing-util" }
@@ -152,16 +150,24 @@ reth-transaction-pool = { path = "crates/transaction-pool" }
 reth-trie = { path = "crates/trie" }
 
 # revm
-revm = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze", features = ["std", "secp256k1"], default-features = false }
-revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze", features = ["std"], default-features = false }
+revm = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze", features = [
+    "std",
+    "secp256k1",
+], default-features = false }
+revm-primitives = { git = "https://github.com/bluealloy/revm", branch = "reth_freeze", features = [
+    "std",
+], default-features = false }
+revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors" }
 
 # eth
 alloy-primitives = "0.5"
 alloy-dyn-abi = "0.5"
 alloy-sol-types = "0.5"
 alloy-rlp = "0.3"
 alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy", features = ["jsonrpsee-types"] }
-alloy-rpc-trace-types = { git = "https://github.com/alloy-rs/alloy", features = ["jsonrpsee-types"] }
+alloy-rpc-trace-types = { git = "https://github.com/alloy-rs/alloy", features = [
+    "jsonrpsee-types",
+] }
 ethers-core = { version = "2.0", default-features = false }
 ethers-providers = { version = "2.0", default-features = false }
 ethers-signers = { version = "2.0", default-features = false }
@@ -196,7 +202,6 @@ once_cell = "1.17"
 syn = "2.0"
 ahash = "0.8.6"
 
-
 # proc-macros
 proc-macro2 = "1.0"
 quote = "1.0"
@@ -241,7 +246,6 @@ proptest = "1.4"
 proptest-derive = "0.4"
 serial_test = "2"
 
-
 [workspace.metadata.cargo-udeps.ignore]
 # ignored because this is mutually exclusive with the optimism payload builder via feature flags
 normal = ["reth-ethereum-payload-builder"]

bin/reth/Cargo.toml

@@ -26,7 +26,6 @@ reth-db = { workspace = true, features = ["mdbx", "test-utils"] }
 # TODO: Temporary use of the test-utils feature
 reth-provider = { workspace = true, features = ["test-utils"] }
 reth-revm.workspace = true
-reth-revm-inspectors.workspace = true
 reth-stages.workspace = true
 reth-interfaces = { workspace = true, features = ["test-utils", "clap"] }
 reth-transaction-pool.workspace = true
@@ -60,6 +59,7 @@ reth-nippy-jar.workspace = true
 # crypto
 alloy-rlp.workspace = true
 secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }
+revm-inspectors.workspace = true
 
 # tracing
 tracing.workspace = true

bin/reth/src/builder/mod.rs

@@ -73,7 +73,6 @@ use reth_provider::{
 };
 use reth_prune::PrunerBuilder;
 use reth_revm::EvmProcessorFactory;
-use reth_revm_inspectors::stack::Hook;
 use reth_rpc_engine_api::EngineApi;
 use reth_stages::{
     prelude::*,
@@ -89,6 +88,7 @@ use reth_transaction_pool::{
     blobstore::InMemoryBlobStore, EthTransactionPool, TransactionPool,
     TransactionValidationTaskExecutor,
 };
+use revm_inspectors::stack::Hook;
 use secp256k1::SecretKey;
 use std::{
     net::{SocketAddr, SocketAddrV4},
@@ -862,7 +862,7 @@ impl NodeConfig {
         }
 
         let (tip_tx, tip_rx) = watch::channel(B256::ZERO);
-        use reth_revm_inspectors::stack::InspectorStackConfig;
+        use revm_inspectors::stack::InspectorStackConfig;
         let factory = reth_revm::EvmProcessorFactory::new(self.chain.clone());
 
         let stack_config = InspectorStackConfig {

crates/revm/Cargo.toml

@@ -16,11 +16,11 @@ workspace = true
 reth-primitives.workspace = true
 reth-interfaces.workspace = true
 reth-provider.workspace = true
-reth-revm-inspectors.workspace = true
 reth-consensus-common.workspace = true
 
 # revm
 revm.workspace = true
+revm-inspectors.workspace = true
 
 # common
 tracing.workspace = true
@@ -35,3 +35,4 @@ optimism = [
   "reth-consensus-common/optimism",
   "reth-interfaces/optimism",
 ]
+js-tracer = ["revm-inspectors/js-tracer"]