Proper fix by Emilio

Author: rappie

lib/Echidna/Exec.hs

@@ -40,7 +40,7 @@ import Echidna.Types (ExecException(..), fromEVM, emptyAccount)
 import Echidna.Types.Config (Env(..), EConfig(..), UIConf(..), OperationMode(..), OutputFormat(Text))
 import Echidna.Types.Coverage (CoverageInfo)
 import Echidna.Types.Solidity (SolConf(..))
-import Echidna.Types.Tx (TxCall(..), Tx(call, dst), TxResult(..), initialTimestamp, initialBlockNumber, getResult)
+import Echidna.Types.Tx (TxCall(..), Tx(call, dst, delay), TxResult(..), initialTimestamp, initialBlockNumber, getResult)
 import Echidna.Utility (getTimestamp, timePrefix)
 
 -- | Broad categories of execution failures: reversions, illegal operations, and ???.
@@ -184,6 +184,10 @@ execTxWith executeTx tx = do
       burnedGas <- gets (.burned)
       -- If a transaction reverts reset VM to state before the transaction.
       put vmBeforeTx
+      -- Re-apply the time/block advancement from the transaction's delay.
+      -- Time doesn't go backwards on revert, only EVM state does.
+      let txDelay = tx.delay
+      #block %= \b -> advanceBlock b txDelay
       -- Undo reset of some of the VM state.
       -- Otherwise we'd lose all information about the reverted transaction like
       -- contract address, calldata, result and traces.

lib/Echidna/Shrink.hs

@@ -59,7 +59,7 @@ shrinkTest vm test = do
     _ -> pure Nothing
 
 replaceByNoCall :: Tx -> Tx
-replaceByNoCall tx = tx { call = NoCall, delay = (0, 0) }
+replaceByNoCall tx = tx { call = NoCall }
 
 -- | Given a sequence of transactions, remove useless NoCalls. These are NoCalls
 -- that have both zero increment in timestamp and block number.