Merge remote-tracking branch 'origin/master' into dev-test-refactoring

Author: gustavo-grieco

default.nix

@@ -1,31 +1,11 @@
 { pkgs ? import (builtins.fetchTarball {
-    name = "nixpkgs-unstable";
-    url = "https://github.com/nixos/nixpkgs/archive/fb45fa64ae3460d6bd2701ab5a6c4512d781f166.tar.gz";
-    sha256 = "sha256:1dcvpwshmalp5xp25z9pjm8svlnfgkcrbhany1pwjwwcpxm5kp40";
+    name = "nixpkgs-unstable-2021-10-15";
+    url = "https://github.com/nixos/nixpkgs/archive/ee084c02040e864eeeb4cf4f8538d92f7c675671.tar.gz";
+    sha256 = "sha256:1x8amcixdaw3ryyia32pb706vzhvn5whq9n8jin0qcha5qnm1fnh";
   }) {}
 }:
 
 let
-  dapptools = pkgs.fetchFromGitHub {
-    owner = "dapphub";
-    repo = "dapptools";
-    rev = "hevm/0.47.0";
-    sha256 = "sha256-gFePasNQJ9bxrCDsSHWsZj2JVkjhVwIkjZf+wPDBKo0=";
-  };
-  hevm = pkgs.haskell.lib.dontCheck (
-    pkgs.haskell.lib.doJailbreak (
-      pkgs.haskellPackages.callCabal2nix "hevm" "${dapptools}/src/hevm"
-        { secp256k1 = pkgs.secp256k1; }
-  ));
-
-  crytic-compile = pkgs.python3Packages.callPackage (import ./nix/crytic-compile.nix) { };
-  # slither is shipped with solc by default, we don't use it as we need
-  # precise solc versions
-  slither-analyzer = pkgs.slither-analyzer.override {
-    inherit crytic-compile;
-    withSolc = false;
-  };
-
   # this is not perfect for development as it hardcodes solc to 0.5.7, test suite runs fine though
   # would be great to integrate solc-select to be more flexible, improve this in future
   solc = pkgs.stdenv.mkDerivation {
@@ -48,17 +28,17 @@ let
     '';
   };
 
+  slither-analyzer = pkgs.slither-analyzer.override { withSolc = false; };
+
   v = "1.7.2";
 
-  f = { mkDerivation, aeson, ansi-terminal, base, base16-bytestring
-      , binary, brick, bytestring, cborg, containers, data-dword, data-has
-      , deepseq, directory, exceptions, filepath, hashable, hevm, hpack
-      , lens, lens-aeson, megaparsec, MonadRandom, mtl
-      , optparse-applicative, process, random, stm, tasty
-      , tasty-hunit, tasty-quickcheck, temporary, text, transformers
-      , unix, unliftio, unliftio-core, unordered-containers, vector
-      , vector-instances, vty, wl-pprint-annotated, word8, yaml
-      , cabal-install, extra, ListLike, hlint, semver, haskell-language-server
+  f = { mkDerivation, aeson, ansi-terminal, base, base16-bytestring, binary
+      , brick, bytestring, cborg, containers, data-dword, data-has, deepseq
+      , directory, exceptions, filepath, hashable, hevm, hpack, lens, lens-aeson
+      , megaparsec, MonadRandom, mtl, optparse-applicative, process, random
+      , semver, stm, tasty, tasty-hunit, tasty-quickcheck, temporary, text
+      , transformers, unix, unliftio, unliftio-core, unordered-containers, vector
+      , vector-instances, vty, wl-pprint-annotated, word8, yaml, extra, ListLike
       }:
       mkDerivation rec {
         pname = "echidna";
@@ -68,18 +48,17 @@ let
         isExecutable = true;
         libraryHaskellDepends = [
           aeson ansi-terminal base base16-bytestring binary brick bytestring
-          cborg containers data-dword data-has deepseq directory exceptions filepath
-          hashable hevm lens lens-aeson megaparsec MonadRandom mtl
+          cborg containers data-dword data-has deepseq directory exceptions
+          filepath hashable hevm lens lens-aeson megaparsec MonadRandom mtl
           optparse-applicative process random stm temporary text transformers
           unix unliftio unliftio-core unordered-containers vector
           vector-instances vty wl-pprint-annotated word8 yaml extra ListLike
           semver
         ] ++ (if pkgs.lib.inNixShell then testHaskellDepends else []);
-        libraryToolDepends = [ hpack cabal-install hlint slither-analyzer solc haskell-language-server ];
         executableHaskellDepends = libraryHaskellDepends;
-        testHaskellDepends = [
-          tasty tasty-hunit tasty-quickcheck
-        ];
+        testHaskellDepends = [ tasty tasty-hunit tasty-quickcheck ];
+        libraryToolDepends = [ hpack ];
+        testToolDepends = [ slither-analyzer solc ];
         preConfigure = ''
           hpack
           # re-enable dynamic build for Linux
@@ -91,8 +70,16 @@ let
         doCheck = true;
       };
 
-  drv = pkgs.haskellPackages.callPackage f { hevm = hevm; };
+  echidna = pkgs.haskellPackages.callPackage f { };
+  echidnaShell = pkgs.haskellPackages.shellFor {
+    packages = p: [ echidna ];
+    buildInputs = with pkgs.haskellPackages; [
+      hlint
+      cabal-install
+      haskell-language-server
+    ];
+  };
 in
   if pkgs.lib.inNixShell
-    then drv.env
-    else pkgs.haskell.lib.justStaticExecutables drv
+    then echidnaShell
+    else pkgs.haskell.lib.justStaticExecutables echidna

lib/Echidna/Types/Tx.hs

@@ -102,13 +102,13 @@ data TxResult = ReturnTrue
               | ErrorStackUnderrun
               | ErrorBadJumpDestination
               | ErrorRevert
-              | ErrorNoSuchContract
               | ErrorOutOfGas
               | ErrorBadCheatCode
               | ErrorStackLimitExceeded
               | ErrorIllegalOverflow
               | ErrorQuery
               | ErrorStateChangeWhileStatic
+              | ErrorInvalidFormat
               | ErrorInvalidMemoryAccess
               | ErrorCallDepthLimitReached
               | ErrorMaxCodeSizeExceeded
@@ -148,13 +148,13 @@ getResult (VMFailure SelfDestruction )          = ErrorSelfDestruction
 getResult (VMFailure StackUnderrun )            = ErrorStackUnderrun
 getResult (VMFailure BadJumpDestination )       = ErrorBadJumpDestination
 getResult (VMFailure (Revert _))                = ErrorRevert
-getResult (VMFailure (NoSuchContract _))        = ErrorNoSuchContract
 getResult (VMFailure (OutOfGas _ _))            = ErrorOutOfGas
 getResult (VMFailure (BadCheatCode _))          = ErrorBadCheatCode
 getResult (VMFailure StackLimitExceeded)        = ErrorStackLimitExceeded
 getResult (VMFailure IllegalOverflow)           = ErrorIllegalOverflow
 getResult (VMFailure (Query _))                 = ErrorQuery
 getResult (VMFailure StateChangeWhileStatic)    = ErrorStateChangeWhileStatic
+getResult (VMFailure InvalidFormat)             = ErrorInvalidFormat
 getResult (VMFailure InvalidMemoryAccess)       = ErrorInvalidMemoryAccess
 getResult (VMFailure CallDepthLimitReached)     = ErrorCallDepthLimitReached
 getResult (VMFailure (MaxCodeSizeExceeded _ _)) = ErrorMaxCodeSizeExceeded

nix/crytic-compile.nix

@@ -5,7 +5,7 @@ packages:
 
 extra-deps:
 - git: https://github.com/dapphub/dapptools.git
-  commit: 4fe19a0ff493f09de58c13c54cb69d962dd10b82
+  commit: a2b96cc2dbc28508c9fe699d6438bf6eccafc2ad
   subdirs:
   - src/hevm