Merge branch 'master' into gas-per-second-text

Author: elopez

CHANGELOG.md

@@ -8,6 +8,7 @@
 * Fix worker crashes when shrinking empty reproducers (#1378)
 * Fix shrinking sometimes not progressing (#1399)
 * Fix gas accounting; it was not considering the intrinsic cost of transactions (#1392)
+* Fix issue collecting deployed contract addresses into the dictionary (#1400)
 * Improved UI responsiveness (#1387)
 * Update `hevm` to reduce memory usage on certain scenarios (#1346)
 * Update `hevm` to fix multiple deployments under `prank`ing cheatcodes (#1377)

lib/Echidna/Campaign.hs

@@ -481,8 +481,8 @@ evalSeq vm0 execFunc = go vm0 [] where
         -- NOTE: we don't use the intermediate VMs, just the last one. If any of
         -- the intermediate VMs are needed, they can be put next to the result
         -- of each transaction - `m ([(Tx, result, VM)])`
-        (remaining, _vm) <- go vm' (tx:executedSoFar) remainingTxs
-        pure ((tx, result) : remaining, vm')
+        (remaining, vm'') <- go vm' (tx:executedSoFar) remainingTxs
+        pure ((tx, result) : remaining, vm'')
 
 -- | Update tests based on the return value from the given function.
 -- Nothing skips the update.

src/test/Tests/Values.hs

@@ -43,5 +43,8 @@ valuesTests = testGroup "Value extraction tests"
     , testContract "values/darray.sol"       Nothing
       [ ("echidna_darray passed",                  solved      "echidna_darray")
       , ("echidna_darray didn't shrink optimally", solvedLen 1 "echidna_darray") ]
+    , testContract' "values/contract.sol" (Just "Test") Nothing (Just "values/contract.yaml") False FuzzWorker
+      [ ("verify_first passed",                    solved      "verify_first")
+      , ("verify_later passed",                    solved      "verify_later") ]
 
   ]

tests/solidity/values/contract.sol

@@ -0,0 +1,38 @@
+contract F {
+  bool fail;
+  function init(bool x) public {
+    fail = x;
+  }
+
+  function is_f() public returns (bool) {
+    return true;
+  }
+
+  function f() public returns (bool) {
+    return fail;
+  }
+}
+
+contract Test {
+  bool firstRun = true;
+  bool tested = false;
+
+  function spawn() public {
+    (new F()).init(firstRun);
+    firstRun = false;
+  }
+
+  function verify_first(F f) public {
+    require(f.is_f());
+    assert(f.f() == true);
+    // writes state to make it non-pure and more likely for echidna to call
+    tested = true;
+  }
+
+  function verify_later(F f) public {
+    require(f.is_f());
+    assert(f.f() == false);
+    // writes state to make it non-pure and more likely for echidna to call
+    tested = true;
+  }
+}

tests/solidity/values/contract.yaml

@@ -0,0 +1,4 @@
+testLimit: 5000
+shrinkLimit: 1
+seqLen: 20
+testMode: assertion