From 1babeca6ee3620c58ee317b85222d8b52375403e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?=
 <2642849+elopez@users.noreply.github.com>
Date: Wed, 8 May 2024 14:24:13 -0300
Subject: [PATCH] Upgrade hevm to latest `echidna-patches` commit (#1243)

---
 flake.nix              | 6 +++---
 lib/Echidna/Events.hs  | 2 +-
 lib/Echidna/SymExec.hs | 1 +
 stack.yaml             | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index dd888c6db..a9399895f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,10 +49,10 @@
 
         hevm = pkgs: pkgs.haskell.lib.dontCheck (
           pkgs.haskellPackages.callCabal2nix "hevm" (pkgs.fetchFromGitHub {
-            owner = "ethereum";
+            owner = "trail-of-forks";
             repo = "hevm";
-            rev = "release/0.53.0";
-            sha256 = "sha256-/B+McCJBcIxYCmYMcJ5FiwMqPeSCL97WbNusabTUb34=";
+            rev = "2aa7b3e5fea0e0657fe44549ccefbb18f61eb024";
+            sha256 = "sha256-/9NMvSOzP0agJ1qEFDN/OQvV0DXRTN3AbntTAzPXbCw=";
         }) { secp256k1 = pkgs.secp256k1; });
 
         # FIXME: figure out solc situation, it conflicts with the one from
diff --git a/lib/Echidna/Events.hs b/lib/Echidna/Events.hs
index 7300fbaac..645112f9b 100644
--- a/lib/Echidna/Events.hs
+++ b/lib/Echidna/Events.hs
@@ -36,7 +36,7 @@ extractEvents decodeErrors dappInfo vm =
      ++ concatMap ((catMaybes . flatten) . fmap showTrace) forest
   where
   showTrace trace =
-    let ?context = DappContext { info = dappInfo, env = vm.env.contracts } in
+    let ?context = DappContext { info = dappInfo, contracts = vm.env.contracts, labels = vm.labels } in
     let codehash' = fromJust $ maybeLitWord trace.contract.codehash
         maybeContractName = maybeContractNameFromCodeHash dappInfo codehash'
     in case trace.tracedata of
diff --git a/lib/Echidna/SymExec.hs b/lib/Echidna/SymExec.hs
index 752dfcdfa..3c0b973d2 100644
--- a/lib/Echidna/SymExec.hs
+++ b/lib/Echidna/SymExec.hs
@@ -131,6 +131,7 @@ vmMakeSymbolic vm
   , config         = vm.config
   , forks          = vm.forks
   , currentFork    = vm.currentFork
+  , labels         = vm.labels
   }
 
 frameStateMakeSymbolic :: FrameState Concrete s -> FrameState Symbolic s
diff --git a/stack.yaml b/stack.yaml
index 6480ae009..d09734d4f 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -4,8 +4,8 @@ packages:
 - '.'
 
 extra-deps:
-- git: https://github.com/samalws-tob/hevm.git
-  commit: 0a2a7f24303a727b0e65ad2bb3a33ffe4d780a7d
+- git: https://github.com/trail-of-forks/hevm.git
+  commit: 2aa7b3e5fea0e0657fe44549ccefbb18f61eb024
 
 - restless-git-0.7@sha256:346a5775a586f07ecb291036a8d3016c3484ccdc188b574bcdec0a82c12db293,968
 - s-cargot-0.1.4.0@sha256:61ea1833fbb4c80d93577144870e449d2007d311c34d74252850bb48aa8c31fb,3525