fix: fail tests on assert failure (#184)

Cargo.toml

@@ -139,9 +139,8 @@ foundry-debugger = { path = "crates/debugger" }
 
 ## revm
 # no default features to avoid c-kzg
-# Using a fork of revm as zksync-era requires the usage of sha3 0.10.6, and the latest revm uses 0.10.8
 revm = { version = "3.5.0", default-features = false }
-era_revm = { git="https://github.com/matter-labs/era-revm", rev = "0e0ea26106a16cfc74a2b9ec37cadd69417ae68b" }
+era_revm = { git="https://github.com/matter-labs/era-revm", rev = "2662bb19427a421662a7e463cf1ed6a15da361e5" }
 
 # We use a fork of `ethers` to gain access to a previously private variable.
 # This ensures that all artifact files, freshly compiled and saved in the `output` directory, are publicly accessible.
@@ -195,4 +194,3 @@ ethers-signers = { git = "https://github.com/mm-zk/ethers-rs", tag = "main_publi
 ethers-middleware = { git = "https://github.com/mm-zk/ethers-rs", tag = "main_public_artifact", default-features = false }
 ethers-etherscan = { git = "https://github.com/mm-zk/ethers-rs", tag = "main_public_artifact", default-features = false }
 ethers-solc = { git = "https://github.com/mm-zk/ethers-rs", tag = "main_public_artifact", default-features = false }
-

crates/evm/src/executor/backend/fuzz.rs

@@ -10,7 +10,7 @@ use crate::executor::{
 use alloy_primitives::{Address, B256, U256};
 use revm::{
     db::DatabaseRef,
-    primitives::{AccountInfo, Bytecode, Env, ResultAndState},
+    primitives::{AccountInfo, Bytecode, EVMResult, Env, ResultAndState},
     Database, Inspector, JournaledState,
 };
 use std::borrow::Cow;
@@ -57,18 +57,17 @@ impl<'a> FuzzBackendWrapper<'a> {
     pub fn inspect_ref<INSP>(
         &mut self,
         env: &mut Env,
-        mut inspector: INSP,
+        inspector: INSP,
     ) -> eyre::Result<ResultAndState>
     where
         INSP: Inspector<Self>,
     {
-        // this is a new call to inspect with a new env, so even if we've cloned the backend
-        // already, we reset the initialized state
         self.is_initialized = false;
-        match revm::evm_inner::<Self, true>(env, self, &mut inspector).transact() {
-            Ok(result) => Ok(result),
-            Err(e) => eyre::bail!("fuzz: failed to inspect: {:?}", e),
-        }
+
+        let result: EVMResult<DatabaseError> =
+            era_revm::transactions::run_era_transaction(env, self, inspector);
+
+        Ok(result.unwrap())
     }
 
     /// Returns whether there was a snapshot failure in the fuzz backend.

crates/evm/src/executor/inspector/stack.rs

@@ -195,7 +195,6 @@ pub struct InspectorData {
     pub script_wallets: Vec<LocalWallet>,
     pub chisel_state: Option<(Stack, Memory, InstructionResult)>,
 }
-
 /// An inspector that calls multiple inspectors in sequence.
 ///
 /// If a call to an inspector returns a value other than [InstructionResult::Continue] (or

crates/evm/src/executor/mod.rs

@@ -274,6 +274,7 @@ impl Executor {
         // execute the call
         let env = self.build_test_env(from, TransactTo::Call(test_contract), calldata, value);
         let call_result = self.call_raw_with_env(env)?;
+        self.record_env_changes(&call_result.env);
         convert_call_result(abi, &func, call_result)
     }
 
@@ -498,7 +499,7 @@ impl Executor {
         }
 
         // Construct a new VM with the state changeset
-        let mut backend = self.backend.clone_empty();
+        let mut backend = self.backend.clone();
 
         // we only clone the test contract and cheatcode accounts, that's all we need to evaluate
         // success
@@ -760,6 +761,7 @@ fn convert_executed_result(
 
     let result = match out {
         Some(Output::Call(ref data)) => data.to_owned(),
+        Some(Output::Create(ref data, _)) => data.to_owned(),
         _ => Bytes::default(),
     };