feat: frame ctx inside Evm

Cargo.toml

@@ -19,21 +19,21 @@ members = [
     "crates/handler",
 
     # variants
-    "crates/optimism",
+    # "crates/optimism",
     "crates/inspector",
 
     # utility
     "crates/statetest-types",
 
     # examples
-    "examples/block_traces",
-    "examples/cheatcode_inspector",
-    "examples/contract_deployment",
-    "examples/database_components",
-    "examples/uniswap_get_reserves",
-    "examples/uniswap_v2_usdc_swap",
-    "examples/erc20_gas",
-    #"examples/custom_opcodes",
+    # "examples/block_traces",
+    # "examples/cheatcode_inspector",
+    # "examples/contract_deployment",
+    # "examples/database_components",
+    # "examples/uniswap_get_reserves",
+    # "examples/uniswap_v2_usdc_swap",
+    # "examples/erc20_gas",
+    # "examples/custom_opcodes",
 ]
 resolver = "2"
 default-members = ["crates/revm"]

bins/revme/src/cmd/bench/analysis.rs

@@ -4,7 +4,7 @@ use database::{BenchmarkDB, BENCH_CALLER, BENCH_TARGET};
 use revm::{
     bytecode::Bytecode,
     primitives::{bytes, hex, Bytes, TxKind},
-    Context, ExecuteEvm,
+    Context, ExecuteEvm, MainBuilder, MainContext,
 };
 
 const BYTES: &str = include_str!("analysis.hex");
@@ -13,15 +13,16 @@ pub fn run() {
     let bytecode = Bytecode::new_raw(Bytes::from(hex::decode(BYTES).unwrap()));
 
     // BenchmarkDB is dummy state that implements Database trait.
-    let mut context = Context::builder()
+    let mut context = Context::mainnet()
         .with_db(BenchmarkDB::new_bytecode(bytecode))
         .modify_tx_chained(|tx| {
             // Execution globals block hash/gas_limit/coinbase/timestamp..
             tx.caller = BENCH_CALLER;
             tx.kind = TxKind::Call(BENCH_TARGET);
             //evm.env.tx.data = Bytes::from(hex::decode("30627b7c").unwrap());
             tx.data = bytes!("8035F0CE");
-        });
+        })
+        .build_mainnet();
 
     let time = Instant::now();
     let _ = context.exec_previous();

bins/revme/src/cmd/bench/burntpix.rs

@@ -14,7 +14,7 @@ use revm::{
     database_interface::EmptyDB,
     primitives::{hex, keccak256, Address, Bytes, TxKind, B256, U256},
     state::{AccountInfo, Bytecode},
-    transact_main, Context,
+    transact_main, Context, MainBuilder, MainContext,
 };
 
 use std::fs::File;
@@ -36,12 +36,15 @@ pub fn run() {
 
     let db = init_db();
 
-    let mut context = Context::builder().with_db(db).modify_tx_chained(|tx| {
-        tx.caller = BENCH_CALLER;
-        tx.kind = TxKind::Call(BURNTPIX_MAIN_ADDRESS);
-        tx.data = run_call_data.clone().into();
-        tx.gas_limit = u64::MAX;
-    });
+    let mut context = Context::mainnet()
+        .with_db(db)
+        .modify_tx_chained(|tx| {
+            tx.caller = BENCH_CALLER;
+            tx.kind = TxKind::Call(BURNTPIX_MAIN_ADDRESS);
+            tx.data = run_call_data.clone().into();
+            tx.gas_limit = u64::MAX;
+        })
+        .build_mainnet();
 
     let started = Instant::now();
     let tx_result = transact_main(&mut context).unwrap().result;

bins/revme/src/cmd/bench/snailtracer.rs

@@ -2,20 +2,21 @@ use database::{BenchmarkDB, BENCH_CALLER, BENCH_TARGET};
 use revm::{
     bytecode::Bytecode,
     primitives::{bytes, hex, Bytes, TxKind},
-    transact_main, Context,
+    Context, ExecuteEvm, MainBuilder, MainContext,
 };
 
 pub fn simple_example(bytecode: Bytecode) {
-    let mut context = Context::builder()
+    let mut evm = Context::mainnet()
         .with_db(BenchmarkDB::new_bytecode(bytecode.clone()))
         .modify_tx_chained(|tx| {
             // Execution globals block hash/gas_limit/coinbase/timestamp..
             tx.caller = BENCH_CALLER;
             tx.kind = TxKind::Call(BENCH_TARGET);
             tx.data = bytes!("30627b7c");
             tx.gas_limit = 1_000_000_000;
-        });
-    let _ = transact_main(&mut context).unwrap();
+        })
+        .build_mainnet();
+    let _ = evm.exec_previous().unwrap();
 }
 
 pub fn run() {

bins/revme/src/cmd/bench/transfer.rs

@@ -4,23 +4,27 @@ use database::{BenchmarkDB, BENCH_CALLER, BENCH_TARGET};
 use revm::{
     bytecode::Bytecode,
     primitives::{TxKind, U256},
-    Context, ExecuteEvm,
+    Context, ExecuteEvm, MainBuilder, MainContext,
 };
 
 pub fn run() {
-    let mut context = Context::builder()
+    let time = Instant::now();
+    let mut evm = Context::mainnet()
         .with_db(BenchmarkDB::new_bytecode(Bytecode::new()))
         .modify_tx_chained(|tx| {
             // Execution globals block hash/gas_limit/coinbase/timestamp..
             tx.caller = BENCH_CALLER;
             tx.kind = TxKind::Call(BENCH_TARGET);
             tx.value = U256::from(10);
-        });
+        })
+        .build_mainnet();
+    println!("Init: {:?}", time.elapsed());
+
     let time = Instant::now();
-    let _ = context.exec_previous();
-    println!("First init: {:?}", time.elapsed());
+    let _ = evm.exec_previous();
+    println!("First run: {:?}", time.elapsed());
 
     let time = Instant::now();
-    let _ = context.exec_previous();
+    let _ = evm.exec_previous();
     println!("Run: {:?}", time.elapsed());
 }