feat(forge): isolated execution

crates/cheatcodes/src/inspector.rs

@@ -849,7 +849,6 @@ impl<DB: DatabaseExt> Inspector<DB> for Cheatcodes {
                     debug!(target: "cheatcodes", tx=?self.broadcastable_transactions.back().unwrap(), "broadcastable call");
 
                     let prev = account.info.nonce;
-                    account.info.nonce += 1;
                     debug!(target: "cheatcodes", address=%broadcast.new_origin, nonce=prev+1, prev, "incremented nonce");
                 } else if broadcast.single_call {
                     let msg = "`staticcall`s are not allowed after `broadcast`; use `startBroadcast` instead";
@@ -939,6 +938,13 @@ impl<DB: DatabaseExt> Inspector<DB> for Cheatcodes {
                 if data.journaled_state.depth() == broadcast.depth {
                     data.env.tx.caller = broadcast.original_origin;
 
+                    if !call.is_static {
+                        let account =
+                            data.journaled_state.state().get_mut(&broadcast.new_origin).unwrap();
+
+                        account.info.nonce += 1;
+                    }
+
                     // Clean single-call broadcast once we have returned to the original depth
                     if broadcast.single_call {
                         let _ = self.broadcast.take();
@@ -1487,7 +1493,6 @@ fn process_broadcast_create<DB: DatabaseExt>(
             let prev = account.info.nonce;
             account.info.nonce += 1;
             debug!(target: "cheatcodes", address=%broadcast_sender, nonce=prev+1, prev, "incremented nonce in create2");
-
             // Proxy deployer requires the data to be `salt ++ init_code`
             let calldata = [&salt.to_be_bytes::<32>()[..], &bytecode[..]].concat();
             (calldata.into(), Some(DEFAULT_CREATE2_DEPLOYER), prev)

crates/common/src/evm.rs

@@ -144,6 +144,11 @@ pub struct EvmArgs {
     #[clap(flatten)]
     #[serde(flatten)]
     pub env: EnvArgs,
+
+    /// Whether to enable isolation of calls.
+    #[clap(long)]
+    #[serde(skip)]
+    pub isolate: bool,
 }
 
 // Make this set of options a `figment::Provider` so that it can be merged into the `Config`
@@ -166,6 +171,10 @@ impl Provider for EvmArgs {
             dict.insert("ffi".to_string(), self.ffi.into());
         }
 
+        if self.isolate {
+            dict.insert("isolate".to_string(), self.isolate.into());
+        }
+
         if self.always_use_create_2_factory {
             dict.insert(
                 "always_use_create_2_factory".to_string(),

crates/config/src/lib.rs

@@ -374,6 +374,11 @@ pub struct Config {
     /// Should be removed once EvmVersion Cancun is supported by solc
     pub cancun: bool,
 
+    /// Whether to enable call isolation.
+    ///
+    /// Useful for more correct gas accounting and EVM behavior in general.
+    pub isolate: bool,
+
     /// Address labels
     pub labels: HashMap<Address, String>,
 
@@ -1810,6 +1815,7 @@ impl Default for Config {
             profile: Self::DEFAULT_PROFILE,
             fs_permissions: FsPermissions::new([PathPermission::read("out")]),
             cancun: false,
+            isolate: false,
             __root: Default::default(),
             src: "src".into(),
             test: "test".into(),

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

@@ -11,8 +11,8 @@ use alloy_genesis::GenesisAccount;
 use alloy_primitives::{Address, B256, U256};
 use revm::{
     db::DatabaseRef,
-    primitives::{AccountInfo, Bytecode, Env, ResultAndState},
-    Database, Inspector, JournaledState,
+    primitives::{Account, AccountInfo, Bytecode, Env, HashMap as Map, ResultAndState},
+    Database, DatabaseCommit, Inspector, JournaledState,
 };
 use std::{borrow::Cow, collections::HashMap};
 
@@ -279,3 +279,9 @@ impl<'a> Database for FuzzBackendWrapper<'a> {
         DatabaseRef::block_hash_ref(self, number)
     }
 }
+
+impl<'a> DatabaseCommit for FuzzBackendWrapper<'a> {
+    fn commit(&mut self, changes: Map<Address, Account>) {
+        self.backend.to_mut().commit(changes)
+    }
+}

crates/evm/core/src/opts.rs

@@ -61,6 +61,9 @@ pub struct EvmOpts {
     /// The memory limit per EVM execution in bytes.
     /// If this limit is exceeded, a `MemoryLimitOOG` result is thrown.
     pub memory_limit: u64,
+
+    /// Whether to enable isolation of calls.
+    pub isolate: bool,
 }
 
 impl EvmOpts {