From c162c81f6507d36b0e0691f339f1434639768312 Mon Sep 17 00:00:00 2001
From: Artur Cygan <artur.cygan@trailofbits.com>
Date: Wed, 29 Mar 2023 12:13:39 +0200
Subject: [PATCH 1/2] Force corpus evaluation

---
 lib/Echidna/Campaign.hs |  3 ++-
 lib/Echidna/Types/Tx.hs | 43 ++++++++++++++++++++++++++++-------------
 package.yaml            |  1 +
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/lib/Echidna/Campaign.hs b/lib/Echidna/Campaign.hs
index da742092e..b243ea0cb 100644
--- a/lib/Echidna/Campaign.hs
+++ b/lib/Echidna/Campaign.hs
@@ -3,6 +3,7 @@
 
 module Echidna.Campaign where
 
+import Control.DeepSeq (force)
 import Control.Lens
 import Control.Monad (replicateM, when)
 import Control.Monad.Catch (MonadCatch(..), MonadThrow(..))
@@ -236,7 +237,7 @@ callseq initialCorpus vm world seqLen = do
                    else camp.gasInfo
       -- If there is new coverage, add the transaction list to the corpus
     , corpus = if camp'.newCoverage
-                  then addToCorpus (camp.ncallseqs + 1) res camp.corpus
+                  then force $ addToCorpus (camp.ncallseqs + 1) res camp.corpus
                   else camp.corpus
       -- Reset the new coverage flag
     , newCoverage = False
diff --git a/lib/Echidna/Types/Tx.hs b/lib/Echidna/Types/Tx.hs
index 92c494119..af00872fe 100644
--- a/lib/Echidna/Types/Tx.hs
+++ b/lib/Echidna/Types/Tx.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DerivingStrategies #-}
 
 module Echidna.Types.Tx where
 
@@ -15,20 +17,23 @@ import Data.Text (Text)
 import Data.Word (Word64)
 
 import EVM (VMResult(..), Error(..))
-import EVM.ABI (encodeAbiValue, AbiValue(..))
+import EVM.ABI (encodeAbiValue, AbiValue(..), AbiType)
 import EVM.Types (Addr, W256)
 
 import Echidna.Orphans.JSON ()
 import Echidna.Types.Buffer (forceBuf)
 import Echidna.Types.Signature (SolCall)
+import Control.DeepSeq (NFData)
+import GHC.Generics (Generic)
+import Data.DoubleWord (Word256, Word128, Int256, Int128, Word160)
 
 -- | A transaction call is either a @CREATE@, a fully instrumented 'SolCall', or
 -- an abstract call consisting only of calldata.
-data TxCall = SolCreate   ByteString
-            | SolCall     SolCall
-            | SolCalldata ByteString
+data TxCall = SolCreate   !ByteString
+            | SolCall     !SolCall
+            | SolCalldata !ByteString
             | NoCall
-  deriving (Show, Ord, Eq)
+  deriving (Show, Ord, Eq, Generic)
 $(deriveJSON defaultOptions ''TxCall)
 
 maxGasPerBlock :: Word64
@@ -51,14 +56,26 @@ initialBlockNumber = 4370000  -- Initial byzantium block
 
 -- | A transaction is either a @CREATE@ or a regular call with an origin, destination, and value.
 -- Note: I currently don't model nonces or signatures here.
-data Tx = Tx { call  :: TxCall       -- | Call
-             , src   :: Addr         -- | Origin
-             , dst   :: Addr         -- | Destination
-             , gas   :: Word64       -- | Gas
-             , gasprice :: W256     -- | Gas price
-             , value :: W256         -- | Value
-             , delay :: (W256, W256) -- | (Time, # of blocks since last call)
-             } deriving (Eq, Ord, Show)
+data Tx = Tx { call  :: !TxCall       -- | Call
+             , src   :: !Addr         -- | Origin
+             , dst   :: !Addr         -- | Destination
+             , gas   :: !Word64       -- | Gas
+             , gasprice :: !W256      -- | Gas price
+             , value :: !W256         -- | Value
+             , delay :: !(W256, W256) -- | (Time, # of blocks since last call)
+             } deriving (Eq, Ord, Show, Generic)
+
+deriving instance NFData Tx
+deriving instance NFData TxCall
+deriving instance NFData AbiValue
+deriving instance NFData Word256
+deriving instance NFData Word128
+deriving instance NFData Int256
+deriving instance NFData Int128
+deriving instance NFData Word160
+deriving instance NFData AbiType
+deriving anyclass instance NFData Addr
+deriving anyclass instance NFData W256
 
 instance ToJSON Tx where
   toJSON Tx{..} = object
diff --git a/package.yaml b/package.yaml
index e1a8a8f71..e1c0966c0 100644
--- a/package.yaml
+++ b/package.yaml
@@ -18,6 +18,7 @@ dependencies:
   - containers
   - data-bword
   - data-dword
+  - deepseq
   - extra
   - directory
   - exceptions

From ab27897ecbdded989ab05e18e24cf2b72931cc6c Mon Sep 17 00:00:00 2001
From: Artur Cygan <artur.cygan@trailofbits.com>
Date: Wed, 29 Mar 2023 14:43:56 +0200
Subject: [PATCH 2/2] Explanatory comment

---
 lib/Echidna/Campaign.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/Echidna/Campaign.hs b/lib/Echidna/Campaign.hs
index b243ea0cb..c1303789e 100644
--- a/lib/Echidna/Campaign.hs
+++ b/lib/Echidna/Campaign.hs
@@ -237,6 +237,7 @@ callseq initialCorpus vm world seqLen = do
                    else camp.gasInfo
       -- If there is new coverage, add the transaction list to the corpus
     , corpus = if camp'.newCoverage
+                  -- corpus is a bit too lazy, force the evaluation to reduce the memory usage
                   then force $ addToCorpus (camp.ncallseqs + 1) res camp.corpus
                   else camp.corpus
       -- Reset the new coverage flag