examples: Add custom instruction example

Cargo.toml

@@ -32,7 +32,7 @@ members = [
     "examples/uniswap_v2_usdc_swap",
     "examples/erc20_gas",
     "examples/my_evm",
-    #"examples/custom_opcodes",
+    "examples/custom_opcodes",
 ]
 resolver = "2"
 default-members = ["crates/revm"]

crates/context/src/evm.rs

@@ -14,12 +14,22 @@ pub struct EvmData<CTX, INSP> {
     pub inspector: INSP,
 }
 
-impl<CTX> Evm<CTX, (), (), ()> {
-    pub fn new(ctx: CTX) -> Self {
+impl<CTX, I, P> Evm<CTX, (), I, P> {
+    pub fn new(ctx: CTX, instruction: I, precompiles: P) -> Evm<CTX, (), I, P> {
         Evm {
             data: EvmData { ctx, inspector: () },
-            instruction: (),
-            precompiles: (),
+            instruction,
+            precompiles,
+        }
+    }
+}
+
+impl<CTX, I, INSP, P> Evm<CTX, INSP, I, P> {
+    pub fn new_with_inspector(ctx: CTX, inspector: INSP, instruction: I, precompiles: P) -> Self {
+        Evm {
+            data: EvmData { ctx, inspector },
+            instruction,
+            precompiles,
         }
     }
 }

crates/handler/src/evm.rs

@@ -1,6 +1,5 @@
 use crate::{
-    instructions::{EthInstructions, InstructionProvider},
-    EthFrame, Handler, MainnetHandler, PrecompileProvider,
+    instructions::InstructionProvider, EthFrame, Handler, MainnetHandler, PrecompileProvider,
 };
 use auto_impl::auto_impl;
 use context::{
@@ -136,10 +135,10 @@ where
     }
 }
 
-impl<CTX, INSP, PRECOMPILES> ExecuteEvm
-    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, PRECOMPILES>
+impl<CTX, INSP, INST, PRECOMPILES> ExecuteEvm for Evm<CTX, INSP, INST, PRECOMPILES>
 where
     CTX: ContextTr<Journal: JournalTr<FinalOutput = JournalOutput>> + ContextSetters,
+    INST: InstructionProvider<Context = CTX, InterpreterTypes = EthInterpreter>,
     PRECOMPILES: PrecompileProvider<CTX, Output = InterpreterResult>,
 {
     type Output = Result<
@@ -165,11 +164,11 @@ where
     }
 }
 
-impl<CTX, INSP, PRECOMPILES> ExecuteCommitEvm
-    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, PRECOMPILES>
+impl<CTX, INSP, INST, PRECOMPILES> ExecuteCommitEvm for Evm<CTX, INSP, INST, PRECOMPILES>
 where
     CTX: ContextTr<Journal: JournalTr<FinalOutput = JournalOutput>, Db: DatabaseCommit>
         + ContextSetters,
+    INST: InstructionProvider<Context = CTX, InterpreterTypes = EthInterpreter>,
     PRECOMPILES: PrecompileProvider<CTX, Output = InterpreterResult>,
 {
     type CommitOutput = Result<

crates/inspector/src/eip3155.rs

@@ -114,6 +114,11 @@ impl TracerEip3155 {
         Self::new(Box::new(std::io::BufWriter::new(output)))
     }
 
+    /// Creates a new EIP-3155 tracer with a stdout output.
+    pub fn new_stdout() -> Self {
+        Self::buffered(std::io::stdout())
+    }
+
     /// Creates a new EIP-3155 tracer with the given output writer.
     pub fn new(output: Box<dyn Write>) -> Self {
         Self {

crates/inspector/src/mainnet_inspect.rs

@@ -1,7 +1,7 @@
 use context::{ContextSetters, ContextTr, Evm, JournalOutput, JournalTr};
 use database_interface::DatabaseCommit;
 use handler::{
-    instructions::EthInstructions, EthFrame, EvmTr, EvmTrError, Frame, FrameResult, Handler,
+    instructions::InstructionProvider, EthFrame, EvmTr, EvmTrError, Frame, FrameResult, Handler,
     MainnetHandler, PrecompileProvider,
 };
 use interpreter::{interpreter::EthInterpreter, FrameInput, InterpreterResult};
@@ -24,11 +24,11 @@ where
     type IT = EthInterpreter;
 }
 
-impl<CTX, INSP, PRECOMPILES> InspectEvm
-    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, PRECOMPILES>
+impl<CTX, INSP, INST, PRECOMPILES> InspectEvm for Evm<CTX, INSP, INST, PRECOMPILES>
 where
     CTX: ContextSetters + ContextTr<Journal: JournalTr<FinalOutput = JournalOutput> + JournalExt>,
     INSP: Inspector<CTX, EthInterpreter>,
+    INST: InstructionProvider<Context = CTX, InterpreterTypes = EthInterpreter>,
     PRECOMPILES: PrecompileProvider<CTX, Output = InterpreterResult>,
 {
     type Inspector = INSP;
@@ -46,12 +46,12 @@ where
     }
 }
 
-impl<CTX, INSP, PRECOMPILES> InspectCommitEvm
-    for Evm<CTX, INSP, EthInstructions<EthInterpreter, CTX>, PRECOMPILES>
+impl<CTX, INSP, INST, PRECOMPILES> InspectCommitEvm for Evm<CTX, INSP, INST, PRECOMPILES>
 where
     CTX: ContextSetters
         + ContextTr<Journal: JournalTr<FinalOutput = JournalOutput> + JournalExt, Db: DatabaseCommit>,
     INSP: Inspector<CTX, EthInterpreter>,
+    INST: InstructionProvider<Context = CTX, InterpreterTypes = EthInterpreter>,
     PRECOMPILES: PrecompileProvider<CTX, Output = InterpreterResult>,
 {
     fn inspect_commit_previous(&mut self) -> Self::CommitOutput {

examples/custom_opcodes/Cargo.toml

@@ -22,5 +22,4 @@ rust_2018_idioms = "deny"
 all = "warn"
 
 [dependencies]
-revm.workspace = true
-database.workspace = true
+revm = {workspace = true, features = ["std", "serde-json"]}