Upgrade hevm to echidna-patches-20240826

crytic · Aug 26, 2024 · 28adea9 · 28adea9
1 parent 778f63c
commit 28adea9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/flake.nix b/flake.nix
@@ -69,8 +69,8 @@
         hevm = pkgs: pkgs.lib.pipe ((hsPkgs pkgs).callCabal2nix "hevm" (pkgs.fetchFromGitHub {
             owner = "trail-of-forks";
             repo = "hevm";
-            rev = "3aba82f06a2d1e0a4a4c26458f747a46dad0e7e2";
-            sha256 = "sha256-NXXhEqHTQEL2N9RhXa1eczIsQtIM3mvPfyWXlBXpxK4=";
+            rev = "b51041a7ee57ee09c877bb287d1c131933963913";
+            sha256 = "sha256-Ei/iZjWUVIwDjx94q0gU45zkvpqFiYK7C4JxnMlZbuk=";
         }) { secp256k1 = pkgs.secp256k1; })
         ([
           pkgs.haskell.lib.compose.dontCheck

diff --git a/lib/Echidna/Solidity.hs b/lib/Echidna/Solidity.hs
@@ -30,6 +30,7 @@ import System.Info (os)
 
 import EVM (initialContract, currentContract)
 import EVM.ABI
+import EVM.Effects (runApp)
 import EVM.Solidity
 import EVM.Types hiding (Env)
 
@@ -59,7 +60,7 @@ readSolcBatch d = do
   mapM parseOne fs
   where
   parseOne f =
-    readSolc CombinedJSON "" (d </> f) >>= \case
+    runApp $ readSolc CombinedJSON "" (d </> f) >>= \case
       Right buildOutput -> pure buildOutput
       Left e ->
         error $ "Failed to parse combined JSON file " <> (d </> f) <> "\n" <> e

diff --git a/stack.yaml b/stack.yaml
@@ -5,7 +5,7 @@ packages:
 
 extra-deps:
 - git: https://github.com/trail-of-forks/hevm.git
-  commit: 3aba82f06a2d1e0a4a4c26458f747a46dad0e7e2
+  commit: b51041a7ee57ee09c877bb287d1c131933963913
 
 - smt2-parser-0.1.0.1@sha256:1e1a4565915ed851c13d1e6b8bb5185cf5d454da3b43170825d53e221f753d77,1421
 - spawn-0.3@sha256:b91e01d8f2b076841410ae284b32046f91471943dc799c1af77d666c72101f02,1162