chore: API cleanup (#2067)

* chore: rm clone from PrecompileProvider * clonable spec * relax evm transact * inspect relaxed trait for evm
bluealloy · Feb 11, 2025 · c12a95e · c12a95e
1 parent 6fe9047
commit c12a95e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/crates/context/interface/src/cfg.rs b/crates/context/interface/src/cfg.rs
@@ -6,7 +6,7 @@ use specification::hardfork::SpecId;
 
 #[auto_impl(&, &mut, Box, Arc)]
 pub trait Cfg {
-    type Spec: Into<SpecId>;
+    type Spec: Into<SpecId> + Clone;
 
     fn chain_id(&self) -> u64;
 

diff --git a/crates/handler/src/precompile_provider.rs b/crates/handler/src/precompile_provider.rs
@@ -9,7 +9,7 @@ use specification::hardfork::SpecId;
 use std::boxed::Box;
 
 #[auto_impl(&mut, Box)]
-pub trait PrecompileProvider: Clone {
+pub trait PrecompileProvider {
     type Context: ContextTrait;
     type Output;
 

diff --git a/crates/revm/src/mainnet_exec_inspect.rs b/crates/revm/src/mainnet_exec_inspect.rs
@@ -8,23 +8,25 @@ use context_interface::{
 };
 use database_interface::DatabaseCommit;
 use handler::inspector::JournalExt;
+use handler::PrecompileProvider;
 use handler::{handler::EvmTrait, inspector::EthInspectorHandler};
 use handler::{
-    inspector::Inspector, instructions::EthInstructions, EthFrame, EthHandler, EthPrecompiles,
-    MainnetHandler,
+    inspector::Inspector, instructions::EthInstructions, EthFrame, EthHandler, MainnetHandler,
 };
 use interpreter::interpreter::EthInterpreter;
 
+use interpreter::InterpreterResult;
 use primitives::Log;
 use state::EvmState;
 use std::vec::Vec;
 
-impl<CTX, INSP> ExecuteEvm
-    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, EthPrecompiles<CTX>>
+impl<CTX, INSP, PRECOMPILES> ExecuteEvm
+    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, PRECOMPILES>
 where
     CTX: ContextSetters
         + ContextTrait<Journal: Journal<FinalOutput = (EvmState, Vec<Log>)> + JournalExt>,
     INSP: Inspector<CTX, EthInterpreter>,
+    PRECOMPILES: PrecompileProvider<Context = CTX, Output = InterpreterResult>,
 {
     type Output = Result<
         ResultAndState<HaltReason>,
@@ -37,15 +39,16 @@ where
     }
 }
 
-impl<CTX, INSP> ExecuteCommitEvm
-    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, EthPrecompiles<CTX>>
+impl<CTX, INSP, PRECOMPILES> ExecuteCommitEvm
+    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, PRECOMPILES>
 where
     CTX: ContextSetters
         + ContextTrait<
             Journal: Journal<FinalOutput = (EvmState, Vec<Log>)> + JournalExt,
             Db: DatabaseCommit,
         >,
     INSP: Inspector<CTX, EthInterpreter>,
+    PRECOMPILES: PrecompileProvider<Context = CTX, Output = InterpreterResult>,
 {
     type CommitOutput = Result<
         ExecutionResult<HaltReason>,
@@ -60,12 +63,13 @@ where
     }
 }
 
-impl<CTX, INSP> InspectEvm
-    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, EthPrecompiles<CTX>>
+impl<CTX, INSP, PRECOMPILES> InspectEvm
+    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, PRECOMPILES>
 where
     CTX: ContextSetters
         + ContextTrait<Journal: Journal<FinalOutput = (EvmState, Vec<Log>)> + JournalExt>,
     INSP: Inspector<CTX, EthInterpreter>,
+    PRECOMPILES: PrecompileProvider<Context = CTX, Output = InterpreterResult>,
 {
     type Inspector = INSP;
 
@@ -82,15 +86,16 @@ where
     }
 }
 
-impl<CTX, INSP> InspectCommitEvm
-    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, EthPrecompiles<CTX>>
+impl<CTX, INSP, PRECOMPILES> InspectCommitEvm
+    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, PRECOMPILES>
 where
     CTX: ContextSetters
         + ContextTrait<
             Journal: Journal<FinalOutput = (EvmState, Vec<Log>)> + JournalExt,
             Db: DatabaseCommit,
         >,
     INSP: Inspector<CTX, EthInterpreter>,
+    PRECOMPILES: PrecompileProvider<Context = CTX, Output = InterpreterResult>,
 {
     fn inspect_commit_previous(&mut self) -> Self::CommitOutput {
         self.inspect_previous().map(|r| {