bug(forge test): panic crash on foundry v1.1+ (backport to v1.2.1) (#10579)

* forge(fix): update persistent storage from active db (#10576)

* forge(fix): update persistent storage from active db

* Clippy

* ci: fix flaky fork test using `StdChains`, add temporary workaround for `eth.llamarpc.com` being down (#10549)

add temporary workaround for eth.llamarpc.com being down

---------

Co-authored-by: zerosnacks <[email protected]>

Author: grandizzy

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

@@ -1102,11 +1102,27 @@ impl DatabaseExt for Backend {
             // update the shared state and track
             let mut fork = self.inner.take_fork(idx);
 
-            // Make sure all persistent accounts on the newly selected fork starts from the init
-            // state (from setup).
-            for addr in &self.inner.persistent_accounts {
-                if let Some(account) = self.fork_init_journaled_state.state.get(addr) {
-                    fork.journaled_state.state.insert(*addr, account.clone());
+            // Make sure all persistent accounts on the newly selected fork reflect same state as
+            // the active db / previous fork.
+            // This can get out of sync when multiple forks are created on test `setUp`, then a
+            // fork is selected and persistent contract is changed. If first action in test is to
+            // select a different fork, then the persistent contract state won't reflect changes
+            // done in `setUp` for the other fork.
+            // See <https://github.com/foundry-rs/foundry/issues/10296> and <https://github.com/foundry-rs/foundry/issues/10552>.
+            let persistent_accounts = self.inner.persistent_accounts.clone();
+            if let Some(db) = self.active_fork_db_mut() {
+                for addr in persistent_accounts {
+                    let Ok(db_account) = db.load_account(addr) else { continue };
+
+                    let Some(fork_account) = fork.journaled_state.state.get_mut(&addr) else {
+                        continue
+                    };
+
+                    for (key, val) in &db_account.storage {
+                        if let Some(fork_storage) = fork_account.storage.get_mut(key) {
+                            fork_storage.present_value = *val;
+                        }
+                    }
                 }
             }
 

crates/forge/tests/cli/test_cmd.rs

@@ -3523,6 +3523,7 @@ contract InterceptInitcodeTest is DSTest {
 });
 
 // <https://github.com/foundry-rs/foundry/issues/10296>
+// <https://github.com/foundry-rs/foundry/issues/10552>
 forgetest_init!(should_preserve_fork_state_setup, |prj, cmd| {
     prj.wipe_contracts();
     prj.add_test(
@@ -3551,6 +3552,13 @@ contract CounterTest is Test {
     mapping(uint256 => SomeStruct) internal data;
 
     function setUp() public {
+        // Temporary workaround for `https://eth.llamarpc.com/` being down
+        setChain("mainnet", ChainData({
+            name: "mainnet",
+            rpcUrl: "https://reth-ethereum.ithaca.xyz/rpc",
+            chainId: 1
+        }));
+
         StdChains.Chain memory chain1 = getChain("mainnet");
         StdChains.Chain memory chain2 = getChain("base");
         Domain memory domain1 = Domain(chain1, vm.createFork(chain1.rpcUrl, 22253716));

crates/forge/tests/it/repros.rs

@@ -404,3 +404,6 @@ test_repro!(10302);
 
 // https://github.com/foundry-rs/foundry/issues/10477
 test_repro!(10477);
+
+// https://github.com/foundry-rs/foundry/issues/10552
+test_repro!(10552);

testdata/default/repros/Issue10552.t.sol

@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity ^0.8.18;
+
+import "ds-test/test.sol";
+import "cheats/Vm.sol";
+
+contract Counter {
+    uint256 public number;
+    uint256 public anotherNumber;
+
+    function setNumber(uint256 newNumber) public {
+        number = newNumber;
+    }
+
+    function setAnotherNumber(uint256 newNumber) public {
+        anotherNumber = newNumber;
+    }
+
+    function increment() public {
+        number++;
+    }
+}
+
+contract Issue10552Test is DSTest {
+    Vm constant vm = Vm(HEVM_ADDRESS);
+
+    Counter public counter;
+    uint256 mainnetId;
+    uint256 opId;
+
+    function setUp() public {
+        counter = new Counter();
+        counter.setNumber(10);
+        vm.makePersistent(address(counter));
+
+        mainnetId = vm.createFork("mainnet");
+        opId = vm.createFork("optimism");
+
+        vm.selectFork(mainnetId);
+        counter.setNumber(100);
+        counter.increment();
+        assertEq(counter.number(), 101);
+
+        counter.increment();
+        assertEq(counter.number(), 102);
+    }
+
+    function test_change_fork_states() public {
+        vm.selectFork(opId);
+        counter.increment();
+        // should account state changes from mainnet fork
+        // without fix for <https://github.com/foundry-rs/foundry/issues/10552> this test was failing with 11 (initial setNumber(10) + one increment) != 103
+        assertEq(counter.number(), 103);
+        counter.setAnotherNumber(11);
+        assertEq(counter.anotherNumber(), 11);
+
+        vm.selectFork(mainnetId);
+        counter.increment();
+        assertEq(counter.number(), 104);
+        assertEq(counter.anotherNumber(), 11);
+    }
+}