chore: impl evm env provider for noop (#13342)

paradigmxyz · Dec 12, 2024 · 3b08b65 · 3b08b65
1 parent 92fae83
commit 3b08b65
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 55 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/evm/Cargo.toml b/crates/evm/Cargo.toml
@@ -24,6 +24,8 @@ 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
 
@@ -66,6 +68,7 @@ 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"
 ]
diff --git a/crates/evm/src/test_utils.rs b/crates/evm/src/test_utils.rs
@@ -5,20 +5,37 @@ use crate::{
         BasicBatchExecutor, BasicBlockExecutor, BatchExecutor, BlockExecutionInput,
         BlockExecutionOutput, BlockExecutionStrategy, BlockExecutorProvider, Executor,
     },
+    provider::EvmEnvProvider,
     system_calls::OnStateHook,
+    ConfigureEvmEnv,
 };
 use alloy_eips::eip7685::Requests;
-use alloy_primitives::BlockNumber;
+use alloy_primitives::{BlockNumber, U256};
 use parking_lot::Mutex;
 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;
+use reth_storage_errors::provider::{ProviderError, ProviderResult};
 use revm::State;
-use revm_primitives::db::Database;
+use revm_primitives::{db::Database, BlockEnv, CfgEnvWithHandlerCfg};
 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<(CfgEnvWithHandlerCfg, BlockEnv)>
+    where
+        EvmConfig: ConfigureEvmEnv<Header = N::BlockHeader>,
+    {
+        Ok(evm_config.cfg_and_block_env(header, U256::MAX))
+    }
+}
+
 /// A [`BlockExecutorProvider`] that returns mocked execution results.
 #[derive(Clone, Debug, Default)]
 pub struct MockExecutorProvider {

diff --git a/crates/storage/storage-api/src/noop.rs b/crates/storage/storage-api/src/noop.rs
@@ -526,58 +526,6 @@ impl<C: Send + Sync + 'static, N: NodePrimitives> StateProviderFactory for NoopP
     }
 }
 
-// impl EvmEnvProvider for NoopProvider {
-//     fn fill_env_at<EvmConfig>(
-//         &self,
-//         _cfg: &mut CfgEnvWithHandlerCfg,
-//         _block_env: &mut BlockEnv,
-//         _at: BlockHashOrNumber,
-//         _evm_config: EvmConfig,
-//     ) -> ProviderResult<()>
-//     where
-//         EvmConfig: ConfigureEvmEnv<Header = Header>,
-//     {
-//         Ok(())
-//     }
-//
-//     fn fill_env_with_header<EvmConfig>(
-//         &self,
-//         _cfg: &mut CfgEnvWithHandlerCfg,
-//         _block_env: &mut BlockEnv,
-//         _header: &Header,
-//         _evm_config: EvmConfig,
-//     ) -> ProviderResult<()>
-//     where
-//         EvmConfig: ConfigureEvmEnv<Header = Header>,
-//     {
-//         Ok(())
-//     }
-//
-//     fn fill_cfg_env_at<EvmConfig>(
-//         &self,
-//         _cfg: &mut CfgEnvWithHandlerCfg,
-//         _at: BlockHashOrNumber,
-//         _evm_config: EvmConfig,
-//     ) -> ProviderResult<()>
-//     where
-//         EvmConfig: ConfigureEvmEnv<Header = Header>,
-//     {
-//         Ok(())
-//     }
-//
-//     fn fill_cfg_env_with_header<EvmConfig>(
-//         &self,
-//         _cfg: &mut CfgEnvWithHandlerCfg,
-//         _header: &Header,
-//         _evm_config: EvmConfig,
-//     ) -> ProviderResult<()>
-//     where
-//         EvmConfig: ConfigureEvmEnv<Header = Header>,
-//     {
-//         Ok(())
-//     }
-// }
-
 impl<C: Send + Sync, N: NodePrimitives> StageCheckpointReader for NoopProvider<C, N> {
     fn get_stage_checkpoint(&self, _id: StageId) -> ProviderResult<Option<StageCheckpoint>> {
         Ok(None)