fix: forbid handler

Author: prestwich

src/evm.rs

@@ -19,10 +19,7 @@ use revm::{
     },
     database::{states::bundle_state::BundleRetention, BundleState, TryDatabaseCommit},
     inspector::NoOpInspector,
-    interpreter::{
-        gas::calculate_initial_tx_gas_for_tx,
-        instructions::{block_info, control},
-    },
+    interpreter::{gas::calculate_initial_tx_gas_for_tx, instructions::block_info},
     primitives::{hardfork::SpecId, TxKind},
     state::{AccountInfo, Bytecode, EvmState},
     Database, DatabaseCommit, DatabaseRef, InspectEvm, Inspector,
@@ -195,9 +192,9 @@ where
     }
 
     /// Disable an opcode by replacing it with unknown opcode behavior. This is
-    /// a shortcut for [`Self::override_opcode`] with [`control::unknown`].
+    /// a shortcut for [`Self::override_opcode`] with [`crate::helpers::forbidden`].
     pub fn disable_opcode(&mut self, opcode: u8) -> Instruction<Db> {
-        self.override_opcode(opcode, control::unknown)
+        self.override_opcode(opcode, crate::helpers::forbidden)
     }
 
     /// Run some closure with an opcode override, then restore the previous
@@ -238,7 +235,7 @@ where
     where
         F: FnOnce(Self) -> Trevm<Db, Insp, NewState>,
     {
-        self.with_opcode_override(DIFFICULTY, control::unknown, f)
+        self.with_opcode_override(DIFFICULTY, crate::helpers::forbidden, f)
     }
 }
 

src/helpers.rs

@@ -1,9 +1,10 @@
 use revm::{
     context::{BlockEnv, CfgEnv, TxEnv},
+    context_interface::context::ContextError,
     handler::{instructions::EthInstructions, EthPrecompiles},
     inspector::NoOpInspector,
-    interpreter::interpreter::EthInterpreter,
-    Context, Journal,
+    interpreter::{interpreter::EthInterpreter, Interpreter, InterpreterTypes},
+    Context, Database, Journal,
 };
 
 /// [`revm::Context`] with default env types and adjustable DB
@@ -18,3 +19,12 @@ pub type Instructions<Db> = EthInstructions<EthInterpreter, Ctx<Db>>;
 
 /// The handler type for an EVM opcode.
 pub type Instruction<Db> = revm::interpreter::Instruction<EthInterpreter, Ctx<Db>>;
+
+/// An [`Instruction`] that sets a [`ContextError`] in the [`Ctx`]. whenever it
+/// is executed.
+pub fn forbidden<Db: Database, Int: InterpreterTypes>(
+    _interpreter: &mut Interpreter<Int>,
+    ctx: &mut Ctx<Db>,
+) {
+    ctx.error = Err(ContextError::Custom("forbidden opcode".to_string()));
+}

src/inspectors/mod.rs

@@ -1,3 +1,6 @@
+mod layer;
+pub use layer::Layered;
+
 mod timeout;
 pub use timeout::TimeLimit;
 
@@ -7,9 +10,6 @@ pub use set::InspectorSet;
 mod spanning;
 pub use spanning::SpanningInspector;
 
-mod layer;
-pub use layer::Layered;
-
 #[cfg(test)]
 mod test {
     use super::*;