chore: upgrade revm to v40, rust toolchain to nightly-2024-07-07 (#16)

* upgrade revm to v37

* suppress log

* bps counter

* fix

* less log

* noticeable log

* short hash

* upgrade revm and rust toolchain

* remove legacy feature gate

* upgrade to v40

* update zkevm-circuits

Author: lightsing

Cargo.lock

@@ -8,13 +8,13 @@ log = "0.4"
 hex = "0.4"
 eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits", features = ["scroll"], branch = "develop" }
 mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits", branch = "develop" }
-revm = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v36" , default-features = false, features = ["scroll-default-handler", "std", "optional_no_base_fee"] } # v36
+revm = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v40" , default-features = false, features = ["scroll-default-handler", "std", "optional_no_base_fee"] } # v40
 zktrie = { git = "https://github.com/scroll-tech/zktrie.git", branch = "main", features= ["rs_zktrie"] }
 
 # for local development
 #eth-types = { path = "../zkevm-circuits/eth-types", features = ["scroll"] }
 #mpt-zktrie = { path = "../zkevm-circuits/zktrie" }
-#revm = {path = "../revm/crates/revm", default-features = false, features = ["scroll-default-handler", "std", "optional_no_base_fee"] } # v36
+#revm = {path = "../revm/crates/revm", default-features = false, features = ["scroll-default-handler", "std", "optional_no_base_fee"] } # v37
 
 # binary dependencies
 anyhow = { version = "1.0", optional = true }

Cargo.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2023-12-03"
+channel = "nightly-2024-07-07"

rust-toolchain.toml

@@ -91,7 +91,7 @@ impl RunRpcCommand {
                             .await?;
 
                         info!(
-                            "worker#{idx}: load trace for block #{block_number}({:?})",
+                            "worker#{idx}: load trace for block #{block_number}({})",
                             l2_trace.header.hash.unwrap()
                         );
 

src/bin/trace-verifier/commands/run_rpc.rs

@@ -1,5 +1,3 @@
-#![feature(lazy_cell)]
-#![feature(slice_group_by)]
 #[macro_use]
 extern crate log;
 

src/bin/trace-verifier/main.rs

@@ -1,18 +1,23 @@
 use eth_types::l2_types::BlockTrace;
 use eth_types::ToWord;
 use stateless_block_verifier::{EvmExecutor, HardforkConfig};
+use std::sync::atomic::AtomicUsize;
+use std::sync::{LazyLock, Mutex};
+use std::time::Instant;
 
 pub fn verify(
     l2_trace: BlockTrace,
     fork_config: &HardforkConfig,
     disable_checks: bool,
     log_error: bool,
 ) -> bool {
+    static BLOCK_COUNTER: AtomicUsize = AtomicUsize::new(0);
+    static LAST_TIME: LazyLock<Mutex<Instant>> = LazyLock::new(|| Mutex::new(Instant::now()));
+
     trace!("{:#?}", l2_trace);
     let root_after = l2_trace.storage_trace.root_after.to_word();
-    info!("Root after in trace: {:x}", root_after);
 
-    let now = std::time::Instant::now();
+    let now = Instant::now();
 
     #[cfg(feature = "profiling")]
     let guard = pprof::ProfilerGuardBuilder::default()
@@ -39,16 +44,28 @@ pub fn verify(
         info!("Profiling report saved to: {:?}", path);
     }
 
-    info!("Root after in revm: {:x}", revm_root_after);
     let elapsed = now.elapsed();
 
     if root_after != revm_root_after {
+        error!("Root after in trace: {:x}", root_after);
+        error!("Root after in revm: {:x}", revm_root_after);
         error!("Root mismatch");
         if !log_error {
             std::process::exit(1);
         }
         return false;
     }
     info!("Root matches in: {} ms", elapsed.as_millis());
+
+    let block_counter = BLOCK_COUNTER.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+    if block_counter > 50 {
+        let mut last_time = LAST_TIME.lock().unwrap();
+        let blocks = BLOCK_COUNTER.swap(0, std::sync::atomic::Ordering::SeqCst);
+        let elapsed = last_time.elapsed().as_secs_f64();
+        let bps = blocks as f64 / elapsed;
+        warn!("Verifying avg speed: {:.2} bps", bps);
+        *last_time = Instant::now();
+    }
+
     true
 }

src/bin/trace-verifier/utils.rs

@@ -88,7 +88,7 @@ impl DatabaseRef for ReadOnlyDB {
     }
 
     /// Get block hash by block number.
-    fn block_hash_ref(&self, _: U256) -> Result<B256, Self::Error> {
+    fn block_hash_ref(&self, _: u64) -> Result<B256, Self::Error> {
         unimplemented!("BLOCKHASH is disabled")
     }
 }
@@ -108,7 +108,7 @@ impl revm::Database for ReadOnlyDB {
         DatabaseRef::storage_ref(self, address, index)
     }
 
-    fn block_hash(&mut self, _: U256) -> Result<B256, Self::Error> {
+    fn block_hash(&mut self, _: u64) -> Result<B256, Self::Error> {
         unimplemented!("BLOCKHASH is disabled")
     }
 }

src/database.rs

@@ -91,14 +91,12 @@ impl EvmExecutor {
             env.tx.scroll.rlp_bytes = Some(revm::primitives::Bytes::from(eth_tx.rlp().to_vec()));
             trace!("{env:#?}");
             {
-                info!("self.spec_id: {:?}", self.spec_id);
-
                 let mut revm = revm::Evm::builder()
                     .with_spec_id(self.spec_id)
                     .with_db(&mut self.db)
                     .with_env(env)
                     .build();
-                info!("handler cfg: {:?}", revm.handler.cfg);
+                trace!("handler cfg: {:?}", revm.handler.cfg);
                 let result = revm.transact_commit().unwrap(); // TODO: handle error
                 trace!("{result:#?}");
             }

src/executor.rs

@@ -3,7 +3,7 @@ use eth_types::{
     l2_predeployed::l1_gas_price_oracle,
 };
 use revm::{
-    primitives::{Account, AccountStatus, Address, Bytecode, Bytes, SpecId, StorageSlot, U256},
+    primitives::{Account, AccountStatus, Address, Bytecode, Bytes, EvmStorageSlot, SpecId, U256},
     Database, DatabaseCommit,
 };
 use std::{collections::HashMap, sync::LazyLock};
@@ -13,7 +13,7 @@ static HARDFORK_HEIGHTS: LazyLock<HashMap<u64, HashMap<SpecId, u64>>> = LazyLock
     let mut heights = hardfork_heights();
     heights.sort_by_key(|a| a.1);
     let heights = heights
-        .group_by(|a, b| a.1 == b.1)
+        .chunk_by(|a, b| a.1 == b.1)
         .map(|slice| {
             let chain_id = slice[0].1;
             (
@@ -106,21 +106,23 @@ impl HardforkConfig {
             storage: HashMap::from([
                 (
                     U256::from_limbs(l1_gas_price_oracle::IS_CURIE_SLOT.0),
-                    StorageSlot::new(U256::from(1)),
+                    EvmStorageSlot::new(U256::from(1)),
                 ),
                 (
                     U256::from_limbs(l1_gas_price_oracle::L1_BLOB_BASEFEE_SLOT.0),
-                    StorageSlot::new(U256::from(1)),
+                    EvmStorageSlot::new(U256::from(1)),
                 ),
                 (
                     U256::from_limbs(l1_gas_price_oracle::COMMIT_SCALAR_SLOT.0),
-                    StorageSlot::new(U256::from_limbs(
+                    EvmStorageSlot::new(U256::from_limbs(
                         l1_gas_price_oracle::INITIAL_COMMIT_SCALAR.0,
                     )),
                 ),
                 (
                     U256::from_limbs(l1_gas_price_oracle::BLOB_SCALAR_SLOT.0),
-                    StorageSlot::new(U256::from_limbs(l1_gas_price_oracle::INITIAL_BLOB_SCALAR.0)),
+                    EvmStorageSlot::new(U256::from_limbs(
+                        l1_gas_price_oracle::INITIAL_BLOB_SCALAR.0,
+                    )),
                 ),
             ]),
             status: AccountStatus::Touched,

src/hardfork.rs

@@ -1,5 +1,3 @@
-#![feature(lazy_cell)]
-#![feature(slice_group_by)]
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]
 //! Stateless Block Verifier