rename to ConfigureEvm

crates/consensus/auto-seal/src/lib.rs

@@ -19,7 +19,7 @@ use reth_interfaces::{
     consensus::{Consensus, ConsensusError},
     executor::{BlockExecutionError, BlockValidationError},
 };
-use reth_node_api::{ConfigureEvmEnv, EngineTypes};
+use reth_node_api::{ConfigureEvm, EngineTypes};
 use reth_primitives::{
     constants::{EMPTY_RECEIPTS, EMPTY_TRANSACTIONS, ETHEREUM_BLOCK_GAS_LIMIT},
     proofs, Block, BlockBody, BlockHash, BlockHashOrNumber, BlockNumber, BlockWithSenders, Bloom,
@@ -320,7 +320,7 @@ impl StorageInner {
         executor: &mut EVMProcessor<'_, EvmConfig>,
     ) -> Result<(BundleStateWithReceipts, u64), BlockExecutionError>
     where
-        EvmConfig: reth_node_api::EvmConfig,
+        EvmConfig: ConfigureEvm,
     {
         trace!(target: "consensus::auto", transactions=?&block.body, "executing transactions");
         // TODO: there isn't really a parent beacon block root here, so not sure whether or not to
@@ -434,7 +434,7 @@ impl StorageInner {
         evm_config: EvmConfig,
     ) -> Result<(SealedHeader, BundleStateWithReceipts), BlockExecutionError>
     where
-        EvmConfig: reth_node_api::EvmConfig,
+        EvmConfig: ConfigureEvm,
     {
         let header = self.build_header_template(&transactions, chain_spec.clone());
 

crates/consensus/auto-seal/src/task.rs

@@ -2,7 +2,7 @@ use crate::{mode::MiningMode, Storage};
 use futures_util::{future::BoxFuture, FutureExt};
 use reth_beacon_consensus::{BeaconEngineMessage, ForkchoiceStatus};
 use reth_interfaces::consensus::ForkchoiceState;
-use reth_node_api::{ConfigureEvmEnv, EngineTypes};
+use reth_node_api::{ConfigureEvm, EngineTypes};
 use reth_primitives::{Block, ChainSpec, IntoRecoveredTransaction, SealedBlockWithSenders};
 use reth_provider::{CanonChainTracker, CanonStateNotificationSender, Chain, StateProviderFactory};
 use reth_stages::PipelineEvent;
@@ -88,7 +88,7 @@ where
     Pool: TransactionPool + Unpin + 'static,
     <Pool as TransactionPool>::Transaction: IntoRecoveredTransaction,
     Engine: EngineTypes + 'static,
-    EvmConfig: reth_node_api::EvmConfig + Clone + Unpin + Send + Sync + 'static,
+    EvmConfig: ConfigureEvm + Clone + Unpin + Send + Sync + 'static,
 {
     type Output = ();
 

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

@@ -1,8 +1,5 @@
 //! Traits and structs for working with a configurable EVM.
 
-// /// EVM configuration trait.
-// pub trait EvmConfig: ConfigureEvmEnv + Clone + Send + Sync + 'static {}
-
 /// Traits for working with a configurable EVM.
 mod traits;
-pub use traits::{ConfigureEvmEnv, EvmConfig};
+pub use traits::{ConfigureEvm, ConfigureEvmEnv};

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

@@ -3,7 +3,7 @@ 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 {
+pub trait ConfigureEvm: ConfigureEvmEnv {
     /// Returns new EVM with the given database
     fn evm<'a, DB: Database + 'a>(db: DB) -> Evm<'a, (), DB> {
         EvmBuilder::default().with_db(db).build()

crates/node-api/src/lib.rs

@@ -19,6 +19,6 @@ pub use engine::{
 
 /// Traits and helper types used to abstract over EVM methods and types.
 pub mod evm;
-pub use evm::{ConfigureEvmEnv, EvmConfig};
+pub use evm::{ConfigureEvm, ConfigureEvmEnv};
 
 pub mod primitives;

crates/node-builder/src/node.rs

@@ -4,7 +4,7 @@ use crate::{
 };
 use reth_db::database::Database;
 use reth_network::NetworkHandle;
-use reth_node_api::{evm::EvmConfig, primitives::NodePrimitives, EngineTypes};
+use reth_node_api::{evm::ConfigureEvm, primitives::NodePrimitives, EngineTypes};
 use reth_node_core::{
     cli::components::FullProvider,
     dirs::{ChainPath, DataDirPath},
@@ -21,7 +21,7 @@ pub trait NodeTypes: Send + Sync + 'static {
     /// The node's engine types.
     type Engine: EngineTypes;
     /// The node's evm configuration.
-    type Evm: EvmConfig;
+    type Evm: ConfigureEvm;
 
     /// Returns the node's evm config.
     fn evm_config(&self) -> Self::Evm;

crates/node-core/src/node_config.rs

@@ -39,7 +39,7 @@ use reth_network::{
     transactions::{TransactionFetcherConfig, TransactionsManagerConfig},
     NetworkBuilder, NetworkConfig, NetworkHandle, NetworkManager,
 };
-use reth_node_api::ConfigureEvmEnv;
+use reth_node_api::ConfigureEvm;
 use reth_primitives::{
     constants::eip4844::{LoadKzgSettingsError, MAINNET_KZG_TRUSTED_SETUP},
     kzg::KzgSettings,
@@ -433,7 +433,7 @@ impl NodeConfig {
     ) -> eyre::Result<BlockchainTree<DB, EvmProcessorFactory<EvmConfig>>>
     where
         DB: Database + Unpin + Clone + 'static,
-        EvmConfig: reth_node_api::EvmConfig + Clone + 'static,
+        EvmConfig: ConfigureEvm + Clone + 'static,
     {
         // configure blockchain tree
         let tree_externals = TreeExternals::new(
@@ -547,7 +547,7 @@ impl NodeConfig {
     where
         DB: Database + Unpin + Clone + 'static,
         Client: HeadersClient + BodiesClient + Clone + 'static,
-        EvmConfig: reth_node_api::EvmConfig + Clone + 'static,
+        EvmConfig: ConfigureEvm + Clone + 'static,
     {
         // building network downloaders using the fetch client
         let header_downloader = ReverseHeadersDownloaderBuilder::new(config.headers)
@@ -796,7 +796,7 @@ impl NodeConfig {
         DB: Database + Clone + 'static,
         H: HeaderDownloader + 'static,
         B: BodyDownloader + 'static,
-        EvmConfig: reth_node_api::EvmConfig + Clone + 'static,
+        EvmConfig: ConfigureEvm + Clone + 'static,
     {
         let mut builder = Pipeline::builder();
 

crates/node-ethereum/src/evm.rs

@@ -1,4 +1,4 @@
-use reth_node_api::{ConfigureEvmEnv, EvmConfig};
+use reth_node_api::{ConfigureEvm, ConfigureEvmEnv};
 use reth_primitives::{
     revm::{config::revm_spec, env::fill_tx_env},
     revm_primitives::{AnalysisKind, CfgEnvWithHandlerCfg, TxEnv},
@@ -44,7 +44,7 @@ impl ConfigureEvmEnv for EthEvmConfig {
     }
 }
 
-impl EvmConfig for EthEvmConfig {}
+impl ConfigureEvm for EthEvmConfig {}
 
 #[cfg(test)]
 mod tests {

crates/revm/src/factory.rs

@@ -4,7 +4,7 @@ use crate::{
     stack::{InspectorStack, InspectorStackConfig},
 };
 use reth_interfaces::executor::BlockExecutionError;
-use reth_node_api::ConfigureEvmEnv;
+use reth_node_api::ConfigureEvm;
 use reth_primitives::ChainSpec;
 use reth_provider::{ExecutorFactory, PrunableBlockExecutor, StateProvider};
 use std::sync::Arc;
@@ -39,7 +39,7 @@ impl<EvmConfig> EvmProcessorFactory<EvmConfig> {
 
 impl<EvmConfig> ExecutorFactory for EvmProcessorFactory<EvmConfig>
 where
-    EvmConfig: reth_node_api::EvmConfig + Send + Sync + Clone + 'static,
+    EvmConfig: ConfigureEvm + Send + Sync + Clone + 'static,
 {
     fn with_state<'a, SP: StateProvider + 'a>(
         &'a self,

crates/revm/src/processor.rs

@@ -5,7 +5,7 @@ use crate::{
     state_change::{apply_beacon_root_contract_call, post_block_balance_increments},
 };
 use reth_interfaces::executor::{BlockExecutionError, BlockValidationError};
-use reth_node_api::ConfigureEvmEnv;
+use reth_node_api::ConfigureEvm;
 use reth_primitives::{
     Address, Block, BlockNumber, BlockWithSenders, Bloom, ChainSpec, GotExpected, Hardfork, Header,
     PruneMode, PruneModes, PruneSegmentError, Receipt, ReceiptWithBloom, Receipts,
@@ -83,7 +83,7 @@ pub struct EVMProcessor<'a, EvmConfig> {
 
 impl<'a, EvmConfig> EVMProcessor<'a, EvmConfig>
 where
-    EvmConfig: reth_node_api::EvmConfig,
+    EvmConfig: ConfigureEvm,
 {
     /// Return chain spec.
     pub fn chain_spec(&self) -> &Arc<ChainSpec> {
@@ -93,17 +93,14 @@ where
     /// Create a new pocessor with the given chain spec.
     pub fn new(chain_spec: Arc<ChainSpec>, evm_config: EvmConfig) -> Self {
         // create evm with boxed empty db that is going to be set later.
-        let evm = Evm::builder()
-            .with_db(
-                Box::new(
-                    StateBuilder::new()
-                        .with_database_boxed(Box::new(EmptyDBTyped::<ProviderError>::new())),
-                )
-                .build(),
-            )
-            // Hook and inspector stack that we want to invoke on that hook.
-            .with_external_context(InspectorStack::new(InspectorStackConfig::default()))
-            .build();
+        let db = Box::new(
+            StateBuilder::new().with_database_boxed(Box::new(EmptyDBTyped::<ProviderError>::new())),
+        )
+        .build();
+
+        // Hook and inspector stack that we want to invoke on that hook.
+        let stack = InspectorStack::new(InspectorStackConfig::default());
+        let evm = EvmConfig::evm_with_inspector(db, stack);
         EVMProcessor {
             chain_spec,
             evm,
@@ -407,7 +404,7 @@ where
 #[cfg(not(feature = "optimism"))]
 impl<'a, EvmConfig> BlockExecutor for EVMProcessor<'a, EvmConfig>
 where
-    EvmConfig: reth_node_api::EvmConfig,
+    EvmConfig: ConfigureEvm,
 {
     type Error = BlockExecutionError;
 
@@ -521,7 +518,7 @@ where
 
 impl<'a, EvmConfig> PrunableBlockExecutor for EVMProcessor<'a, EvmConfig>
 where
-    EvmConfig: reth_node_api::EvmConfig,
+    EvmConfig: ConfigureEvm,
 {
     fn set_tip(&mut self, tip: BlockNumber) {
         self.tip = Some(tip);