fix: revme

bluealloy · Jun 24, 2024 · cd9c906 · cd9c906
1 parent 2881cdf
commit cd9c906
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/bins/revme/src/cmd/evmrunner.rs b/bins/revme/src/cmd/evmrunner.rs
@@ -2,8 +2,8 @@ use revm::{
     db::BenchmarkDB,
     inspector_handle_register,
     inspectors::TracerEip3155,
-    primitives::{Address, Bytecode, TxKind},
-    Evm,
+    primitives::{address, Address, Bytecode, TxKind},
+    Database, Evm,
 };
 use std::io::Error as IoError;
 use std::path::PathBuf;
@@ -61,6 +61,8 @@ pub struct Cmd {
 impl Cmd {
     /// Run statetest command.
     pub fn run(&self) -> Result<(), Errors> {
+        const CALLER: Address = address!("0000000000000000000000000000000000000001");
+
         let bytecode_str: Cow<'_, str> = if let Some(path) = &self.path {
             // check if path exists.
             if !path.exists() {
@@ -75,19 +77,21 @@ impl Cmd {
         let input = hex::decode(self.input.trim())
             .map_err(|_| Errors::InvalidInput)?
             .into();
+
+        let mut db = BenchmarkDB::new_bytecode(Bytecode::new_raw(bytecode.into()));
+
+        let nonce = db.basic(CALLER).unwrap().map_or(0, |account| account.nonce);
+
         // BenchmarkDB is dummy state that implements Database trait.
         // the bytecode is deployed at zero address.
         let mut evm = Evm::builder()
-            .with_db(BenchmarkDB::new_bytecode(Bytecode::new_raw(
-                bytecode.into(),
-            )))
+            .with_db(db)
             .modify_tx_env(|tx| {
                 // execution globals block hash/gas_limit/coinbase/timestamp..
-                tx.caller = "0x0000000000000000000000000000000000000001"
-                    .parse()
-                    .unwrap();
+                tx.caller = CALLER;
                 tx.transact_to = TxKind::Call(Address::ZERO);
                 tx.data = input;
+                tx.nonce = nonce;
             })
             .build();
 

diff --git a/bins/revme/src/cmd/statetest/runner.rs b/bins/revme/src/cmd/statetest/runner.rs
@@ -348,6 +348,8 @@ pub fn execute_test_suite(
                     .get(test.indexes.data)
                     .unwrap()
                     .clone();
+
+                env.tx.nonce = u64::try_from(unit.transaction.nonce).unwrap();
                 env.tx.value = unit.transaction.value[test.indexes.value];
 
                 env.tx.access_list = unit