From d675547505d48b45549bd5ae6a065a779fe985b4 Mon Sep 17 00:00:00 2001
From: gustavo-grieco <gustavo.grieco+github@gmail.com>
Date: Fri, 8 Aug 2025 15:26:52 +0200
Subject: [PATCH 1/2] collect keccaks in the dictionary as uint256 and bytes32

---
 lib/Echidna/Campaign.hs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/Echidna/Campaign.hs b/lib/Echidna/Campaign.hs
index 029ab8815..830808f29 100644
--- a/lib/Echidna/Campaign.hs
+++ b/lib/Echidna/Campaign.hs
@@ -15,6 +15,8 @@ import Control.Monad.ST (RealWorld)
 import Control.Monad.Trans (lift)
 import Data.Binary.Get (runGetOrFail)
 import Data.ByteString.Lazy qualified as LBS
+import Data.ByteString qualified as BS
+import Data.DoubleWord (Word256)
 import Data.IORef (readIORef, atomicModifyIORef', writeIORef)
 import Data.Foldable (foldlM)
 import Data.List qualified as List
@@ -30,7 +32,7 @@ import Data.Vector qualified as V
 import System.Random (mkStdGen)
 
 import EVM (cheatCode)
-import EVM.ABI (getAbi, AbiType(AbiAddressType, AbiTupleType), AbiValue(AbiAddress, AbiTuple), abiValueType)
+import EVM.ABI (getAbi, AbiType(..), AbiValue(..), abiValueType)
 import EVM.Dapp (DappInfo(..))
 import EVM.Types hiding (Env, Frame(state), Gas)
 import EVM.Solidity (SolcContract(..), Method(..))
@@ -493,8 +495,10 @@ callseq vm txSeq = do
       resultMap = returnValues results workerState.genDict.rTypes
       -- compute the new events to be stored
       eventDiffs = extractEventValues env.dapp vm vm'
+      -- compute the keccak256 preimages from the VM result
+      keccakPreImgs = extractKeccakPreimages vm'
       -- union the return results with the new addresses
-      additions = Map.unionsWith Set.union [resultMap, eventDiffs, diffs]
+      additions = Map.unionsWith Set.union [resultMap, eventDiffs, diffs, keccakPreImgs]
       -- append to the constants dictionary
       updatedDict = workerState.genDict
         { constants = Map.unionWith Set.union workerState.genDict.constants additions
@@ -548,6 +552,17 @@ callseq vm txSeq = do
       getTupleVector (AbiTuple ts) = ts
       getTupleVector _ = error "Not a tuple!"
 
+  -- | Given a vm, extract the keccak256 preimages from the VM result and return them as Uint256 ABI values
+  extractKeccakPreimages
+    :: VM Concrete RealWorld
+    -> Map AbiType (Set AbiValue)
+  extractKeccakPreimages x = Map.unionsWith Set.union [
+    Map.singleton (AbiUIntType 256) $ Set.map (AbiUInt 256 . convertNBytesLen . fst) x.keccakPreImgs,
+    Map.singleton (AbiBytesType 32) $ Set.map (AbiBytes 32 . fst) x.keccakPreImgs
+    ]
+    where convertNBytesLen :: BS.ByteString -> Word256
+          convertNBytesLen bs = fromIntegral $ BS.foldl' (\acc b -> acc * 256 + fromIntegral b) 0 bs
+
   -- | Add transactions to the corpus, discarding reverted ones
   addToCorpus :: Int -> [(Tx, VMResult Concrete RealWorld)] -> Corpus -> Corpus
   addToCorpus n res corpus =

From 622447d3b5c33434419764c70216ea1abe4137b7 Mon Sep 17 00:00:00 2001
From: gustavo-grieco <gustavo.grieco+github@gmail.com>
Date: Fri, 8 Aug 2025 15:29:48 +0200
Subject: [PATCH 2/2] added solidity test

---
 tests/solidity/values/hash.sol | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 tests/solidity/values/hash.sol

diff --git a/tests/solidity/values/hash.sol b/tests/solidity/values/hash.sol
new file mode 100644
index 000000000..3ffb5e6bd
--- /dev/null
+++ b/tests/solidity/values/hash.sol
@@ -0,0 +1,15 @@
+contract C {
+    bool internal b;
+    mapping(bytes32=>uint256) internal state;
+    
+    function f() public {
+      require(!b);
+      state[keccak256(abi.encode(block.number))] = 1;
+      b = true;
+    }
+
+    function g(bytes32 x) public {
+      assert(state[x] == 0);
+      b = true;
+    }
+}