Skip to content

Commit

Permalink
Upgrade hevm to upstream fix_prank
Browse files Browse the repository at this point in the history
Commit 1dc2e9e96e741b25581c07b7580146afdf1b8676
  • Loading branch information
elopez committed Nov 29, 2024
1 parent 6d5ac38 commit 5b38783
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
hevm = pkgs: pkgs.lib.pipe ((hsPkgs pkgs).callCabal2nix "hevm" (pkgs.fetchFromGitHub {
owner = "ethereum";
repo = "hevm";
rev = "f1f45d3c0d9767a38df04f398d1eab8b66dbe7fc";
sha256 = "sha256-3zEUwcZm4uZZLecvFTgVTV5CAm4qMfKPbLdwO88LnrY=";
rev = "1dc2e9e96e741b25581c07b7580146afdf1b8676";
sha256 = "sha256-yjOvNxjkb0vBVIaUQII56r4mvo59YqA9kqXKmhlbnFQ=";
}) { secp256k1 = pkgs.secp256k1; })
([
pkgs.haskell.lib.compose.dontCheck
Expand Down
6 changes: 4 additions & 2 deletions lib/Echidna/SymExec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ exploreContract conf contract tx vm = do
doneChan <- newEmptyMVar
resultChan <- newEmptyMVar

flip runReaderT defaultEnv $ withSolvers Z3 (fromIntegral conf.campaignConf.symExecNSolvers) timeout $ \solvers -> do
flip runReaderT defaultEnv $ withSolvers Z3 (fromIntegral conf.campaignConf.symExecNSolvers) 1 timeout $ \solvers -> do
threadId <- liftIO $ forkIO $ flip runReaderT defaultEnv $ do
res <- forM methods $ \method -> do
let
Expand Down Expand Up @@ -108,7 +108,7 @@ exploreContract conf contract tx vm = do
pure (threadId, resultChan)

-- | Turn the expression returned by `interpret` into into SMT2 values to feed into the solver
manipulateExprInter :: Bool -> Expr End -> [SMT2]
manipulateExprInter :: Bool -> Expr End -> [Either String SMT2]
manipulateExprInter isConc = map (assertProps defaultConfig) . middleStep . map (extractProps . simplify) . flattenExpr . simplify where
middleStep = if isConc then middleStepConc else id
middleStepConc = map singleton . concatMap (go (PBool True))
Expand Down Expand Up @@ -155,6 +155,8 @@ frameStateMakeSymbolic fs
, gas = ()
, returndata = fs.returndata
, static = fs.static
, overrideCaller = fs.overrideCaller
, resetCaller = fs.resetCaller
}

frameMakeSymbolic :: Frame Concrete s -> Frame Symbolic s
Expand Down
2 changes: 1 addition & 1 deletion lib/Echidna/Types/Tx.hs
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ getResult = \case
VMFailure BadJumpDestination -> ErrorBadJumpDestination
VMFailure (Revert _) -> ErrorRevert
VMFailure (OutOfGas _ _) -> ErrorOutOfGas
VMFailure (BadCheatCode _) -> ErrorBadCheatCode
VMFailure (BadCheatCode _ _) -> ErrorBadCheatCode
VMFailure StackLimitExceeded -> ErrorStackLimitExceeded
VMFailure IllegalOverflow -> ErrorIllegalOverflow
VMFailure StateChangeWhileStatic -> ErrorStateChangeWhileStatic
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ packages:

extra-deps:
- git: https://github.com/ethereum/hevm.git
commit: f1f45d3c0d9767a38df04f398d1eab8b66dbe7fc
commit: 1dc2e9e96e741b25581c07b7580146afdf1b8676

- smt2-parser-0.1.0.1@sha256:1e1a4565915ed851c13d1e6b8bb5185cf5d454da3b43170825d53e221f753d77,1421
- spawn-0.3@sha256:b91e01d8f2b076841410ae284b32046f91471943dc799c1af77d666c72101f02,1162
Expand Down

0 comments on commit 5b38783

Please sign in to comment.