chore: rm evmenvprovider trait (#13503)

crates/evm/Cargo.toml

@@ -24,8 +24,6 @@ reth-prune-types.workspace = true
 reth-revm.workspace = true
 reth-storage-errors.workspace = true
 
-reth-storage-api = { workspace = true, optional = true }
-
 revm.workspace = true
 revm-primitives.workspace = true
 
@@ -68,7 +66,6 @@ test-utils = [
     "reth-primitives/test-utils",
     "reth-primitives-traits/test-utils",
     "reth-revm/test-utils",
-	"dep:reth-storage-api",
     "revm/test-utils",
     "reth-prune-types/test-utils"
 ]

crates/evm/src/lib.rs

@@ -34,7 +34,6 @@ use env::EvmEnv;
 #[cfg(feature = "std")]
 pub mod metrics;
 pub mod noop;
-pub mod provider;
 pub mod state_change;
 pub mod system_calls;
 #[cfg(any(test, feature = "test-utils"))]

crates/evm/src/test_utils.rs

@@ -1,14 +1,11 @@
 //! Helpers for testing.
 
 use crate::{
-    env::EvmEnv,
     execute::{
         BasicBatchExecutor, BasicBlockExecutor, BatchExecutor, BlockExecutionOutput,
         BlockExecutionStrategy, BlockExecutorProvider, Executor,
     },
-    provider::EvmEnvProvider,
     system_calls::OnStateHook,
-    ConfigureEvmEnv,
 };
 use alloy_eips::eip7685::Requests;
 use alloy_primitives::BlockNumber;
@@ -17,26 +14,11 @@ use reth_execution_errors::BlockExecutionError;
 use reth_execution_types::ExecutionOutcome;
 use reth_primitives::{BlockWithSenders, EthPrimitives, NodePrimitives, Receipt, Receipts};
 use reth_prune_types::PruneModes;
-use reth_storage_errors::provider::{ProviderError, ProviderResult};
+use reth_storage_errors::provider::ProviderError;
 use revm::State;
 use revm_primitives::db::Database;
 use std::{fmt::Display, sync::Arc};
 
-impl<C: Send + Sync, N: NodePrimitives> EvmEnvProvider<N::BlockHeader>
-    for reth_storage_api::noop::NoopProvider<C, N>
-{
-    fn env_with_header<EvmConfig>(
-        &self,
-        header: &N::BlockHeader,
-        evm_config: EvmConfig,
-    ) -> ProviderResult<EvmEnv>
-    where
-        EvmConfig: ConfigureEvmEnv<Header = N::BlockHeader>,
-    {
-        Ok(evm_config.cfg_and_block_env(header))
-    }
-}
-
 /// A [`BlockExecutorProvider`] that returns mocked execution results.
 #[derive(Clone, Debug, Default)]
 pub struct MockExecutorProvider {

crates/optimism/rpc/src/eth/mod.rs

@@ -21,8 +21,8 @@ use reth_network_api::NetworkInfo;
 use reth_node_builder::EthApiBuilderCtx;
 use reth_provider::{
     BlockNumReader, BlockReader, BlockReaderIdExt, CanonStateSubscriptions, ChainSpecProvider,
-    EvmEnvProvider, NodePrimitivesProvider, ProviderBlock, ProviderHeader, ProviderReceipt,
-    ProviderTx, StageCheckpointReader, StateProviderFactory,
+    NodePrimitivesProvider, ProviderBlock, ProviderHeader, ProviderReceipt, ProviderTx,
+    StageCheckpointReader, StateProviderFactory,
 };
 use reth_rpc::eth::{core::EthApiInner, DevSigner};
 use reth_rpc_eth_api::{
@@ -203,7 +203,6 @@ where
     Self: LoadBlock<Provider = N::Provider>,
     N: OpNodeCore<
         Provider: BlockReaderIdExt
-                      + EvmEnvProvider
                       + ChainSpecProvider<ChainSpec: EthChainSpec + EthereumHardforks>
                       + StateProviderFactory,
     >,

crates/optimism/rpc/src/eth/pending_block.rs

@@ -12,8 +12,8 @@ use reth_evm::ConfigureEvm;
 use reth_optimism_consensus::calculate_receipt_root_no_memo_optimism;
 use reth_primitives::{logs_bloom, BlockBody, Receipt, SealedBlockWithSenders, TransactionSigned};
 use reth_provider::{
-    BlockReader, BlockReaderIdExt, ChainSpecProvider, EvmEnvProvider, ProviderBlock,
-    ProviderHeader, ProviderReceipt, ProviderTx, ReceiptProvider, StateProviderFactory,
+    BlockReader, BlockReaderIdExt, ChainSpecProvider, ProviderBlock, ProviderHeader,
+    ProviderReceipt, ProviderTx, ReceiptProvider, StateProviderFactory,
 };
 use reth_rpc_eth_api::{
     helpers::{LoadPendingBlock, SpawnBlocking},
@@ -37,8 +37,7 @@ where
             Block = reth_primitives::Block,
             Receipt = reth_primitives::Receipt,
             Header = reth_primitives::Header,
-        > + EvmEnvProvider
-                      + ChainSpecProvider<ChainSpec: EthChainSpec + EthereumHardforks>
+        > + ChainSpecProvider<ChainSpec: EthChainSpec + EthereumHardforks>
                       + StateProviderFactory,
         Pool: TransactionPool<Transaction: PoolTransaction<Consensus = ProviderTx<N::Provider>>>,
         Evm: ConfigureEvm<Header = Header, Transaction = TransactionSigned>,

crates/rpc/rpc-builder/src/eth.rs

@@ -1,6 +1,6 @@
 use reth_evm::ConfigureEvm;
 use reth_primitives::NodePrimitives;
-use reth_provider::{BlockReader, CanonStateSubscriptions, EvmEnvProvider, StateProviderFactory};
+use reth_provider::{BlockReader, CanonStateSubscriptions, StateProviderFactory};
 use reth_rpc::{EthFilter, EthPubSub};
 use reth_rpc_eth_api::EthApiTypes;
 use reth_rpc_eth_types::{
@@ -31,8 +31,7 @@ where
         + BlockReader<
             Block = <Events::Primitives as NodePrimitives>::Block,
             Receipt = <Events::Primitives as NodePrimitives>::Receipt,
-        > + EvmEnvProvider
-        + Clone
+        > + Clone
         + Unpin
         + 'static,
     Events: CanonStateSubscriptions + Clone + 'static,

crates/rpc/rpc-builder/src/lib.rs

@@ -233,8 +233,7 @@ use reth_network_api::{noop::NoopNetwork, NetworkInfo, Peers};
 use reth_primitives::NodePrimitives;
 use reth_provider::{
     AccountReader, BlockReader, CanonStateSubscriptions, ChainSpecProvider, ChangeSetReader,
-    EvmEnvProvider, FullRpcProvider, ProviderBlock, ProviderHeader, ProviderReceipt,
-    StateProviderFactory,
+    FullRpcProvider, ProviderBlock, ProviderHeader, ProviderReceipt, StateProviderFactory,
 };
 use reth_rpc::{
     AdminApi, DebugApi, EngineEthApi, EthBundle, MinerApi, NetApi, OtterscanApi, RPCApi, RethApi,
@@ -403,7 +402,7 @@ impl<Provider, Pool, Network, Tasks, Events, EvmConfig, BlockExecutor, Consensus
         provider: P,
     ) -> RpcModuleBuilder<P, Pool, Network, Tasks, Events, EvmConfig, BlockExecutor, Consensus>
     where
-        P: BlockReader + StateProviderFactory + EvmEnvProvider + 'static,
+        P: BlockReader + StateProviderFactory + 'static,
     {
         let Self { pool, network, executor, events, evm_config, block_executor, consensus, .. } =
             self;
@@ -1004,8 +1003,7 @@ where
         + BlockReader<
             Block = <Events::Primitives as NodePrimitives>::Block,
             Receipt = <Events::Primitives as NodePrimitives>::Receipt,
-        > + EvmEnvProvider
-        + Clone
+        > + Clone
         + Unpin
         + 'static,
     Pool: Send + Sync + Clone + 'static,

crates/rpc/rpc-engine-api/Cargo.toml

@@ -24,7 +24,6 @@ reth-payload-primitives.workspace = true
 reth-tasks.workspace = true
 reth-rpc-types-compat.workspace = true
 reth-engine-primitives.workspace = true
-reth-evm.workspace = true
 reth-transaction-pool.workspace = true
 
 # ethereum

crates/rpc/rpc-engine-api/src/engine_api.rs

@@ -19,7 +19,6 @@ use parking_lot::Mutex;
 use reth_beacon_consensus::BeaconConsensusEngineHandle;
 use reth_chainspec::{EthereumHardforks, Hardforks};
 use reth_engine_primitives::{EngineTypes, EngineValidator};
-use reth_evm::provider::EvmEnvProvider;
 use reth_payload_builder::PayloadStore;
 use reth_payload_primitives::{
     validate_payload_timestamp, EngineApiMessageVersion, PayloadBuilderAttributes,
@@ -80,7 +79,7 @@ struct EngineApiInner<Provider, EngineT: EngineTypes, Pool, Validator, ChainSpec
 impl<Provider, EngineT, Pool, Validator, ChainSpec>
     EngineApi<Provider, EngineT, Pool, Validator, ChainSpec>
 where
-    Provider: HeaderProvider + BlockReader + StateProviderFactory + EvmEnvProvider + 'static,
+    Provider: HeaderProvider + BlockReader + StateProviderFactory + 'static,
     EngineT: EngineTypes,
     Pool: TransactionPool + 'static,
     Validator: EngineValidator<EngineT>,
@@ -744,7 +743,7 @@ where
 impl<Provider, EngineT, Pool, Validator, ChainSpec> EngineApiServer<EngineT>
     for EngineApi<Provider, EngineT, Pool, Validator, ChainSpec>
 where
-    Provider: HeaderProvider + BlockReader + StateProviderFactory + EvmEnvProvider + 'static,
+    Provider: HeaderProvider + BlockReader + StateProviderFactory + 'static,
     EngineT: EngineTypes,
     Pool: TransactionPool + 'static,
     Validator: EngineValidator<EngineT>,

crates/rpc/rpc-eth-api/src/helpers/pending_block.rs

@@ -18,8 +18,8 @@ use reth_evm::{
 use reth_primitives::{BlockExt, InvalidTransactionError, SealedBlockWithSenders};
 use reth_primitives_traits::Receipt;
 use reth_provider::{
-    BlockReader, BlockReaderIdExt, ChainSpecProvider, EvmEnvProvider, ProviderBlock, ProviderError,
-    ProviderHeader, ProviderReceipt, ProviderTx, ReceiptProvider, StateProviderFactory,
+    BlockReader, BlockReaderIdExt, ChainSpecProvider, ProviderBlock, ProviderError, ProviderHeader,
+    ProviderReceipt, ProviderTx, ReceiptProvider, StateProviderFactory,
 };
 use reth_revm::{
     database::StateProviderDatabase,
@@ -48,7 +48,6 @@ pub trait LoadPendingBlock:
         >,
     > + RpcNodeCore<
         Provider: BlockReaderIdExt<Receipt: Receipt>
-                      + EvmEnvProvider<ProviderHeader<Self::Provider>>
                       + ChainSpecProvider<ChainSpec: EthChainSpec + EthereumHardforks>
                       + StateProviderFactory,
         Pool: TransactionPool<Transaction: PoolTransaction<Consensus = ProviderTx<Self::Provider>>>,
@@ -87,12 +86,8 @@ pub trait LoadPendingBlock:
                 // Note: for the PENDING block we assume it is past the known merge block and
                 // thus this will not fail when looking up the total
                 // difficulty value for the blockenv.
-                let evm_env = self
-                    .provider()
-                    .env_with_header(block.header(), self.evm_config().clone())
-                    .map_err(Self::Error::from_eth_err)?;
-
-                let EvmEnv { cfg_env_with_handler_cfg, block_env } = evm_env;
+                let EvmEnv { cfg_env_with_handler_cfg, block_env } =
+                    self.evm_config().cfg_and_block_env(block.header());
 
                 return Ok(PendingBlockEnv::new(
                     cfg_env_with_handler_cfg,

crates/rpc/rpc-eth-api/src/helpers/state.rs

@@ -10,10 +10,10 @@ use alloy_serde::JsonStorageKey;
 use futures::Future;
 use reth_chainspec::{EthChainSpec, EthereumHardforks};
 use reth_errors::RethError;
-use reth_evm::env::EvmEnv;
+use reth_evm::{env::EvmEnv, ConfigureEvmEnv};
 use reth_provider::{
-    BlockIdReader, BlockNumReader, ChainSpecProvider, EvmEnvProvider as _, StateProvider,
-    StateProviderBox, StateProviderFactory,
+    BlockIdReader, BlockNumReader, ChainSpecProvider, StateProvider, StateProviderBox,
+    StateProviderFactory,
 };
 use reth_rpc_eth_types::{EthApiError, PendingBlockEnv, RpcInvalidTransactionError};
 use reth_transaction_pool::TransactionPool;
@@ -231,10 +231,8 @@ pub trait LoadState:
 
                 let header =
                     self.cache().get_header(block_hash).await.map_err(Self::Error::from_eth_err)?;
-                let evm_env = self
-                    .provider()
-                    .env_with_header(&header, self.evm_config().clone())
-                    .map_err(Self::Error::from_eth_err)?;
+                let evm_env = self.evm_config().cfg_and_block_env(&header);
+
                 Ok((evm_env, block_hash.into()))
             }
         }

crates/rpc/rpc/src/debug.rs

@@ -23,8 +23,8 @@ use reth_evm::{
 use reth_primitives::{BlockExt, NodePrimitives, ReceiptWithBloom, SealedBlockWithSenders};
 use reth_primitives_traits::{Block as _, BlockBody, SignedTransaction};
 use reth_provider::{
-    BlockIdReader, BlockReaderIdExt, ChainSpecProvider, EvmEnvProvider, HeaderProvider,
-    ProviderBlock, ReceiptProviderIdExt, StateProofProvider, TransactionVariant,
+    BlockIdReader, BlockReaderIdExt, ChainSpecProvider, HeaderProvider, ProviderBlock,
+    ReceiptProviderIdExt, StateProofProvider, TransactionVariant,
 };
 use reth_revm::{database::StateProviderDatabase, witness::ExecutionWitnessRecord};
 use reth_rpc_api::DebugApiServer;
@@ -162,11 +162,8 @@ where
             .map_err(BlockError::RlpDecodeRawBlock)
             .map_err(Eth::Error::from_eth_err)?;
 
-        // Note: we assume the block has a valid height
-        let EvmEnv { cfg_env_with_handler_cfg, block_env } = self
-            .provider()
-            .env_with_header(block.header(), self.eth_api().evm_config().clone())
-            .map_err(Eth::Error::from_eth_err)?;
+        let EvmEnv { cfg_env_with_handler_cfg, block_env } =
+            self.eth_api().evm_config().cfg_and_block_env(block.header());
 
         // Depending on EIP-2 we need to recover the transactions differently
         let senders =

crates/rpc/rpc/src/eth/core.rs

@@ -464,7 +464,7 @@ mod tests {
     use reth_primitives::{Block, BlockBody, TransactionSigned};
     use reth_provider::{
         test_utils::{MockEthProvider, NoopProvider},
-        BlockReader, BlockReaderIdExt, ChainSpecProvider, EvmEnvProvider, StateProviderFactory,
+        BlockReader, BlockReaderIdExt, ChainSpecProvider, StateProviderFactory,
     };
     use reth_rpc_eth_api::EthApiServer;
     use reth_rpc_eth_types::{
@@ -484,7 +484,6 @@ mod tests {
                 Header = reth_primitives::Header,
             > + BlockReader
             + ChainSpecProvider<ChainSpec = ChainSpec>
-            + EvmEnvProvider
             + StateProviderFactory
             + Unpin
             + Clone

crates/rpc/rpc/src/eth/helpers/fees.rs

@@ -1,9 +1,7 @@
 //! Contains RPC handler implementations for fee history.
 
 use reth_chainspec::{EthChainSpec, EthereumHardforks};
-use reth_provider::{
-    BlockReader, BlockReaderIdExt, ChainSpecProvider, EvmEnvProvider, StateProviderFactory,
-};
+use reth_provider::{BlockReader, BlockReaderIdExt, ChainSpecProvider, StateProviderFactory};
 use reth_rpc_eth_api::helpers::{EthFees, LoadBlock, LoadFee};
 use reth_rpc_eth_types::{FeeHistoryCache, GasPriceOracle};
 
@@ -20,7 +18,6 @@ impl<Provider, Pool, Network, EvmConfig> LoadFee for EthApi<Provider, Pool, Netw
 where
     Self: LoadBlock<Provider = Provider>,
     Provider: BlockReaderIdExt
-        + EvmEnvProvider
         + ChainSpecProvider<ChainSpec: EthChainSpec + EthereumHardforks>
         + StateProviderFactory,
 {

crates/rpc/rpc/src/eth/helpers/pending_block.rs

@@ -11,8 +11,8 @@ use reth_primitives::{
     BlockBody, Receipt,
 };
 use reth_provider::{
-    BlockReader, BlockReaderIdExt, ChainSpecProvider, EvmEnvProvider, ProviderBlock,
-    ProviderReceipt, ProviderTx, StateProviderFactory,
+    BlockReader, BlockReaderIdExt, ChainSpecProvider, ProviderBlock, ProviderReceipt, ProviderTx,
+    StateProviderFactory,
 };
 use reth_rpc_eth_api::{
     helpers::{LoadPendingBlock, SpawnBlocking},
@@ -35,8 +35,7 @@ where
                 Block = reth_primitives::Block,
                 Receipt = reth_primitives::Receipt,
                 Header = reth_primitives::Header,
-            > + EvmEnvProvider
-                          + ChainSpecProvider<ChainSpec: EthChainSpec + EthereumHardforks>
+            > + ChainSpecProvider<ChainSpec: EthChainSpec + EthereumHardforks>
                           + StateProviderFactory,
             Pool: TransactionPool<
                 Transaction: PoolTransaction<Consensus = ProviderTx<Self::Provider>>,