Merge remote-tracking branch 'origin/main' into clap

bluealloy · Sep 11, 2024 · c766e1a · c766e1a
2 parents c60f5bb + 077c2c3
commit c766e1a
Show file tree

Hide file tree

Showing 97 changed files with 4,046 additions and 2,607 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,13 +38,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        features: ["", "optimism,kzg-rs"]
+        features: ["", "kzg-rs"]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           targets: riscv32imac-unknown-none-elf
-      - run: cargo check --target riscv32imac-unknown-none-elf --no-default-features --features=${{ matrix.features }}
+      - run: |
+          cargo check --target riscv32imac-unknown-none-elf --no-default-features --features=${{ matrix.features }}
+          cargo check --target riscv32imac-unknown-none-elf -p revm-optimism --no-default-features --features=${{ matrix.features }}
 
   check:
     name: check ${{ matrix.features }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,6 +6,7 @@ members = [
     "crates/primitives",
     "crates/interpreter",
     "crates/precompile",
+    "crates/optimism",
 ]
 resolver = "2"
 default-members = ["crates/revm"]

diff --git a/bins/revm-test/Cargo.toml b/bins/revm-test/Cargo.toml
@@ -10,7 +10,7 @@ hex = "0.4"
 revm = { path = "../../crates/revm", version = "14.0.1", default-features=false }
 microbench = "0.5"
 alloy-sol-macro = "0.8.0"
-alloy-sol-types = "0.8.0"
+alloy-sol-types = "0.8.2"
 regex = "1.10.6"
 eyre = "0.6.12"
 

diff --git a/bins/revm-test/src/bin/analysis.rs b/bins/revm-test/src/bin/analysis.rs
@@ -1,5 +1,5 @@
 use revm::{
-    db::BenchmarkDB,
+    db::{BenchmarkDB, EthereumBenchmarkWiring},
     interpreter::analysis::to_analysed,
     primitives::{address, bytes, Bytecode, Bytes, TxKind},
     Evm,
@@ -13,7 +13,7 @@ fn main() {
     let bytecode_analysed = to_analysed(Bytecode::new_raw(contract_data));
 
     // BenchmarkDB is dummy state that implements Database trait.
-    let mut evm = Evm::builder()
+    let mut evm = Evm::<EthereumBenchmarkWiring>::builder()
         .modify_tx_env(|tx| {
             // execution globals block hash/gas_limit/coinbase/timestamp..
             tx.caller = address!("1000000000000000000000000000000000000000");
@@ -37,7 +37,7 @@ fn main() {
 
     let mut evm = evm
         .modify()
-        .reset_handler_with_db(BenchmarkDB::new_bytecode(bytecode_analysed))
+        .with_db(BenchmarkDB::new_bytecode(bytecode_analysed))
         .build();
 
     let timer = Instant::now();

diff --git a/bins/revm-test/src/bin/burntpix/main.rs b/bins/revm-test/src/bin/burntpix/main.rs
@@ -4,8 +4,8 @@ use regex::bytes::Regex;
 use revm::{
     db::{CacheDB, EmptyDB},
     primitives::{
-        address, hex, keccak256, AccountInfo, Address, Bytecode, Bytes, ExecutionResult, Output,
-        TxKind, B256, U256,
+        address, hex, keccak256, AccountInfo, Address, Bytecode, Bytes, EthereumWiring,
+        ExecutionResult, Output, TxKind, B256, U256,
     },
     Evm,
 };
@@ -28,14 +28,16 @@ sol! {
     }
 }
 
+type EthereumCacheDbWiring = EthereumWiring<CacheDB<EmptyDB>, ()>;
+
 fn main() {
     let (seed, iterations) = try_init_env_vars().expect("Failed to parse env vars");
 
     let run_call_data = IBURNTPIX::runCall { seed, iterations }.abi_encode();
 
     let db = init_db();
 
-    let mut evm = Evm::builder()
+    let mut evm = Evm::<EthereumCacheDbWiring>::builder()
         .modify_tx_env(|tx| {
             tx.caller = address!("1000000000000000000000000000000000000000");
             tx.transact_to = TxKind::Call(BURNTPIX_MAIN_ADDRESS);

diff --git a/bins/revm-test/src/bin/snailtracer.rs b/bins/revm-test/src/bin/snailtracer.rs
@@ -1,5 +1,5 @@
 use revm::{
-    db::BenchmarkDB,
+    db::{BenchmarkDB, EthereumBenchmarkWiring},
     interpreter::analysis::to_analysed,
     primitives::{address, bytes, Bytecode, Bytes, TxKind},
     Evm,
@@ -9,7 +9,7 @@ pub fn simple_example() {
     let bytecode = to_analysed(Bytecode::new_raw(CONTRACT_DATA.clone()));
 
     // BenchmarkDB is dummy state that implements Database trait.
-    let mut evm = Evm::builder()
+    let mut evm = Evm::<EthereumBenchmarkWiring>::builder()
         .with_db(BenchmarkDB::new_bytecode(bytecode.clone()))
         .modify_tx_env(|tx| {
             // execution globals block hash/gas_limit/coinbase/timestamp..