From 0c31c0efd2e263e16b96639bcfcf46923b0c8e0a Mon Sep 17 00:00:00 2001
From: ggrieco-tob <gustavo.grieco@trailofbits.com>
Date: Wed, 4 Jan 2023 23:01:12 -0300
Subject: [PATCH] forcelit when showing address in events

---
 lib/Echidna/Events.hs       | 4 +++-
 lib/Echidna/Transaction.hs  | 9 ++-------
 lib/Echidna/Types/Buffer.hs | 7 ++++++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/Echidna/Events.hs b/lib/Echidna/Events.hs
index b8b1461b3..e40039f68 100644
--- a/lib/Echidna/Events.hs
+++ b/lib/Echidna/Events.hs
@@ -20,6 +20,8 @@ import EVM.Format (showValues, showError, contractNamePart)
 import EVM.Types (Expr(ConcreteBuf), W256, maybeLitWord)
 import EVM.Solidity (contractName)
 
+import Echidna.Types.Buffer (forceLit)
+
 type EventMap = M.Map W256 Event
 type Events = [Text]
 
@@ -53,7 +55,7 @@ extractEvents decodeErrors dappInfo' vm =
                                 showValues [t | (_, t, NotIndexed) <- types] bytes <>
                                 pack " from: " <>
                                 maybe mempty (\ x -> x <> pack "@") maybeContractName <>
-                                pack (show addr)]
+                                pack (show $ forceLit addr)]
                              Nothing -> [pack $ show word]
           ErrorTrace e ->
             case e of
diff --git a/lib/Echidna/Transaction.hs b/lib/Echidna/Transaction.hs
index fc19c4998..257f0ded0 100644
--- a/lib/Echidna/Transaction.hs
+++ b/lib/Echidna/Transaction.hs
@@ -18,12 +18,12 @@ import Data.Set (Set)
 import Data.Vector qualified as V
 import EVM hiding (value)
 import EVM.ABI (abiValueType)
-import EVM.Types (Expr(ConcreteBuf, Lit), EType(EWord), Addr, W256)
+import EVM.Types (Expr(ConcreteBuf, Lit), Addr, W256)
 
 import Echidna.ABI
 import Echidna.Types.Random
 import Echidna.Orphans.JSON ()
-import Echidna.Types.Buffer (viewBuffer)
+import Echidna.Types.Buffer (viewBuffer, forceLit)
 import Echidna.Types.Signature (SignatureMap, SolCall, ContractA, FunctionHash, BytecodeMemo, lookupBytecodeMetadata)
 import Echidna.Types.Tx
 import Echidna.Types.World (World(..))
@@ -148,8 +148,3 @@ setupTx (Tx c s r g gp v (t, b)) = liftSH . sequence_ $
     incrementBalance = (env . contracts . ix r . balance) += v
     encode (n, vs) = abiCalldata
       (encodeSig (n, abiValueType <$> vs)) $ V.fromList vs
-
-forceLit :: Expr 'EWord -> W256
-forceLit x = case x of
-  Lit x' -> x'
-  _ -> error "expected Lit"
diff --git a/lib/Echidna/Types/Buffer.hs b/lib/Echidna/Types/Buffer.hs
index bf7f585c0..824d9a8d4 100644
--- a/lib/Echidna/Types/Buffer.hs
+++ b/lib/Echidna/Types/Buffer.hs
@@ -3,8 +3,13 @@
 module Echidna.Types.Buffer where
 
 import Data.ByteString (ByteString)
-import EVM.Types (Expr(ConcreteBuf), EType(Buf))
+import EVM.Types (Expr(ConcreteBuf, Lit), EType(Buf), EType(EWord), W256)
 
 viewBuffer :: Expr 'Buf -> Maybe ByteString
 viewBuffer (ConcreteBuf b) = Just b
 viewBuffer _ = Nothing
+
+forceLit :: Expr 'EWord -> W256
+forceLit x = case x of
+  Lit x' -> x'
+  _ -> error "expected Lit"