fix: vm.chainId regression in isolation mode on nightly post revm bump (foundry-rs#10589)

* reapply refactor

* reset env

* add repro

* add isolation test into repro

* add previous trace for comparison

* nit remove unused event

* move ecx as_db_env_and_journal into with_stack and resets as well

* revert to use *env directly

Author: zerosnacks

crates/evm/evm/src/inspectors/stack.rs

@@ -616,6 +616,7 @@ impl InspectorStackRefMut<'_> {
         let cached_env = Env::from(ecx.cfg.clone(), ecx.block.clone(), ecx.tx.clone());
 
         ecx.block.basefee = 0;
+        ecx.tx.chain_id = Some(ecx.cfg.chain_id);
         ecx.tx.caller = caller;
         ecx.tx.kind = kind;
         ecx.tx.data = input;

crates/forge/tests/it/repros.rs

@@ -410,3 +410,6 @@ test_repro!(10527);
 
 // https://github.com/foundry-rs/foundry/issues/10552
 test_repro!(10552);
+
+// https://github.com/foundry-rs/foundry/issues/10586
+test_repro!(10586);

testdata/default/cheats/ChainId.t.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.18;
 import "ds-test/test.sol";
 import "cheats/Vm.sol";
 
-contract DealTest is DSTest {
+contract ChainIdTest is DSTest {
     Vm constant vm = Vm(HEVM_ADDRESS);
 
     function testChainId() public {

testdata/default/repros/Issue10586.t.sol

@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity ^0.8.18;
+
+import "ds-test/test.sol";
+import "cheats/Vm.sol";
+
+contract Target is DSTest {
+    Vm constant vm = Vm(HEVM_ADDRESS);
+
+    function setChainId() public {
+        vm.chainId(123);
+    }
+}
+
+contract Issue10586Test is DSTest {
+    Vm constant vm = Vm(HEVM_ADDRESS);
+
+    Target public target;
+
+    function setUp() public {
+        target = new Target();
+    }
+
+    function runTest() internal {
+        // By default, the chainId is 31337 during testing.
+        assertEq(block.chainid, 31337);
+
+        // Call external function to set the chainId to 123.
+        target.setChainId();
+
+        // The chainId is set to 123 in the block.
+        assertEq(block.chainid, 123);
+
+        // Set the chainId to 100.
+        vm.chainId(100);
+
+        // The chainId is set to 100 in the block.
+        assertEq(block.chainid, 100);
+
+        // Call the external function again, which will set the chainId to 123.
+        target.setChainId();
+
+        // The last call to chainId() will be the one that is set
+        // in the block, so it should be 123.
+        assertEq(block.chainid, 123);
+    }
+
+    function testGetChainIdAfterSet() public {
+        runTest();
+    }
+
+    /// forge-config: default.isolate = true
+    function testGetChainIdAfterSetIsolated() public {
+        // Previous test failed with the following error:
+        //
+        // [FAIL: EvmError: Revert] testGetChainIdAfterSetIsolated() (gas: 30322)
+        // Traces:
+        // [208460] DefaultTestContract::setUp()
+        //     ├─ [170920] → new Target@0xCe71065D4017F316EC606Fe4422e11eB2c47c246
+        //     │   └─ ← [Return] 743 bytes of code
+        //     └─ ← [Stop]
+        //
+        // [30322] DefaultTestContract::testGetChainIdAfterSetIsolated()
+        //     ├─ [24037] Target::setChainId()
+        //     │   ├─ [0] VM::chainId(123)
+        //     │   │   └─ ← [Return]
+        //     │   └─ ← [Stop]
+        //     ├─ [0] VM::chainId(100)
+        //     │   └─ ← [Return]
+        //     ├─ [0] Target::setChainId()
+        //     │   └─ ← [Revert] EvmError: Revert
+        //     └─ ← [Revert] EvmError: Revert
+        //
+        // Suite result: FAILED. 1 passed; 1 failed; 0 skipped; finished in 2.89ms (1.79ms CPU time)
+
+        runTest();
+    }
+}