Merge pull request crytic#1417 from crytic/update-hevm

Update hevm to `9982c580ed19b88ebab9744d29d940fd2f0bd8c6`

Author: elopez

flake.nix

@@ -55,8 +55,8 @@
           (pkgs.haskellPackages.callCabal2nix "hevm" (pkgs.fetchFromGitHub {
             owner = "ethereum";
             repo = "hevm";
-            rev = "1ee94f7772d42154fcf8df16681d3c6f25a4ecdd";
-            sha256 = "sha256-UgdkkFw1BVjzqRz69FGpwfk/iPqtU5IUqybfAQIhXk8=";
+            rev = "9982c580ed19b88ebab9744d29d940fd2f0bd8c6";
+            sha256 = "sha256-B60aJo9EfIaTWuJaN06Wl1Br+rstzUAYGFBE5rX72Fs=";
           }) { secp256k1 = pkgs.secp256k1; })
           ([
             pkgs.haskell.lib.compose.dontCheck

lib/Echidna/SymExec/Common.hs

@@ -246,4 +246,4 @@ exploreMethod method contract vm defaultSender conf veriOpts solvers rpcInfo con
   (_, models, partials) <- verifyInputs solvers veriOpts fetcher vm' (Just $ checkAssertions [0x1])
   let results = map fst models
   --liftIO $ mapM_ TIO.putStrLn partials
-  return (map (modelToTx dst vm.block.timestamp vm.block.number method conf.solConf.sender defaultSender) results, map formatPartial partials)
+  return (map (modelToTx dst vm.block.timestamp vm.block.number method conf.solConf.sender defaultSender) results, map (formatPartial . fst) partials)

src/test/Tests/Symbolic.hs

@@ -6,14 +6,14 @@ import Echidna.Types.Worker (WorkerType(..))
 
 symbolicTests :: TestTree
 symbolicTests = testGroup "Symbolic tests"
-  [ testContract' "symbolic/verify.sol" Nothing (Just (>= solcV (0,8,0))) (Just "symbolic/verify.yaml") True SymbolicWorker
+  [ testContract' "symbolic/verify.sol" Nothing (Just (>= solcV (0,6,9))) (Just "symbolic/verify.yaml") True SymbolicWorker
       [ ("simple passed", solved "simple")
       , ("array passed", solved "array")
       , ("negative passed", solved "negative")
       , ("close passed", solved "close")
       , ("far not verified", verified "far")
-      , ("correct not verified", verified "correct") 
-    ] 
+      , ("correct not verified", verified "correct")
+    ]
     -- This test is commented out because it requires a specific setup where both the FuzzWorker and SymbolicWorker are used.
     -- If you run the symbolic worker alone, it will hang indefinitely.
     --, testContract' "symbolic/explore.sol" Nothing Nothing (Just "symbolic/explore.yaml") True SymbolicWorker

stack.yaml

@@ -6,7 +6,7 @@ packages:
 
 extra-deps:
 - git: https://github.com/ethereum/hevm.git
-  commit: 1ee94f7772d42154fcf8df16681d3c6f25a4ecdd
+  commit: 9982c580ed19b88ebab9744d29d940fd2f0bd8c6
 
 - smt2-parser-0.1.0.1@sha256:1e1a4565915ed851c13d1e6b8bb5185cf5d454da3b43170825d53e221f753d77,1421
 - spawn-0.3@sha256:b91e01d8f2b076841410ae284b32046f91471943dc799c1af77d666c72101f02,1162