fix(forge): correct nonce before vm.getNonce on script (foundry-rs#…

…2144) * correct nonce before vm.getNonce * update contract name on test
t-proctor · Jun 28, 2022 · b1bdb4d · b1bdb4d
1 parent 9dcc095
commit b1bdb4d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/cli/tests/it/script.rs b/cli/tests/it/script.rs
@@ -287,7 +287,7 @@ forgetest_async!(
         tester
             .load_private_keys(vec![0])
             .await
-            .add_sig("BroadcastTestNoLinking", "deployMix()")
+            .add_sig("BroadcastMix", "deployMix()")
             .simulate(ScriptOutcome::OkSimulation)
             .broadcast(ScriptOutcome::OkBroadcast)
             .assert_nonce_increment(vec![(0, 15)])

diff --git a/evm/src/executor/inspector/cheatcodes/env.rs b/evm/src/executor/inspector/cheatcodes/env.rs
@@ -213,6 +213,8 @@ pub fn apply<DB: Database>(
             }
         }
         HEVMCalls::GetNonce(inner) => {
+            correct_sender_nonce(&data.env.tx.caller, &mut data.subroutine, state);
+
             // TODO:  this is probably not a good long-term solution since it might mess up the gas
             // calculations
             data.subroutine.load_account(inner.0, data.db);
@@ -250,7 +252,7 @@ pub fn apply<DB: Database>(
 }
 
 /// When using `forge script`, the script method is called using the address from `--sender`.
-/// That leads to the its nonce being incremented by `call_raw`. In a `broadcast` scenario this is
+/// That leads to its nonce being incremented by `call_raw`. In a `broadcast` scenario this is
 /// undesirable. Therefore, we make sure to fix the sender's nonce **once**.
 fn correct_sender_nonce(
     sender: &Address,

diff --git a/testdata/cheats/Broadcast.t.sol b/testdata/cheats/Broadcast.t.sol
@@ -160,6 +160,9 @@ contract BroadcastTestNoLinking is DSTest {
     }
 
     function deployMany() public {
+
+        assert(cheats.getNonce(msg.sender) == 0);
+
         cheats.startBroadcast();
 
         for(uint i; i< 100; i++) {
@@ -177,6 +180,25 @@ contract BroadcastTestNoLinking is DSTest {
         cheats.stopBroadcast();
 
     }
+    function errorStaticCall() public {
+        cheats.broadcast();
+        NoLink test11 = new NoLink();
+
+        cheats.broadcast();
+        test11.view_me();
+    }
+}
+
+contract BroadcastMix is DSTest {
+
+    Cheats constant cheats = Cheats(HEVM_ADDRESS);
+
+    // ganache-cli -d 1st
+    address public ACCOUNT_A = 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266;
+
+    // ganache-cli -d 2nd
+    address public ACCOUNT_B = 0x70997970C51812dc3A010C7d01b50e0d17dc79C8;
+
     function more() internal {
         cheats.broadcast();
         NoLink test11 = new NoLink();
@@ -224,21 +246,17 @@ contract BroadcastTestNoLinking is DSTest {
 
         more();
     }
-
-    function errorStaticCall() public {
-        cheats.broadcast();
-        NoLink test11 = new NoLink();
-
-        cheats.broadcast();
-        test11.view_me();
-    }
 }
 
 
 contract BroadcastTestSetup is DSTest {
     Cheats constant cheats = Cheats(HEVM_ADDRESS);
 
     function setUp() public {
+
+        // It predeployed a library first
+        assert(cheats.getNonce(msg.sender) == 1);
+
         cheats.broadcast();
         Test t = new Test();