update evm trait to work with inspectors

crates/node-api/src/evm/traits.rs

@@ -1,19 +1,18 @@
-use reth_primitives::{
-    revm::env::fill_block_env, Address, BlockWithSenders, ChainSpec, Header, Receipt, Transaction,
-    U256,
-};
-// use revm::{builder::SetGenericStage, db::EmptyDB, EvmBuilder};
-use revm::{db::EmptyDB, Database, Evm, EvmBuilder};
+use reth_primitives::{revm::env::fill_block_env, Address, ChainSpec, Header, Transaction, U256};
+use revm::{Database, Evm, EvmBuilder};
 use revm_primitives::{BlockEnv, CfgEnvWithHandlerCfg, SpecId, TxEnv};
 
 /// Trait for configuring the EVM for executing full blocks.
 pub trait EvmConfig: ConfigureEvmEnv {
-    // type Executor;
-
-    /// Returns new EVM builder
-    fn evm<DB: Database>(&self, db: DB) -> Evm<'static, (), DB> {
+    /// Returns new EVM with the given database
+    fn evm<'a, DB: Database + 'a>(db: DB) -> Evm<'a, (), DB> {
         EvmBuilder::default().with_db(db).build()
     }
+
+    /// Returns a new EVM with the given inspector
+    fn evm_with_inspector<'a, DB: Database + 'a, I>(db: DB, inspector: I) -> Evm<'a, I, DB> {
+        EvmBuilder::default().with_db(db).with_external_context(inspector).build()
+    }
 }
 
 /// This represents the set of methods used to configure the EVM before execution.

crates/node-ethereum/src/evm.rs

@@ -44,8 +44,7 @@ impl ConfigureEvmEnv for EthEvmConfig {
     }
 }
 
-impl EvmConfig for EthEvmConfig {
-}
+impl EvmConfig for EthEvmConfig {}
 
 #[cfg(test)]
 mod tests {

crates/revm/src/processor.rs

@@ -137,10 +137,8 @@ where
         revm_state: StateDBBox<'a, ProviderError>,
         evm_config: EvmConfig,
     ) -> Self {
-        let evm = Evm::builder()
-            .with_db(revm_state)
-            .with_external_context(InspectorStack::new(InspectorStackConfig::default()))
-            .build();
+        let stack = InspectorStack::new(InspectorStackConfig::default());
+        let evm = EvmConfig::evm_with_inspector(revm_state, stack);
         EVMProcessor {
             chain_spec,
             evm,