Merge remote-tracking branch 'origin/master' into elopez/windows-buil…

…d-refresh

lib/Echidna/Solidity.hs

@@ -90,8 +90,11 @@ compileContracts solConf fp = do
         compileOne :: FilePath -> IO ([SolcContract], SourceCaches)
         compileOne x = do
           mSolc <- do
-            stderr <- if solConf.quiet then UseHandle <$> openFile nullFilePath WriteMode else pure Inherit
-            (ec, out, err) <- readCreateProcessWithExitCode (proc path $ (solConf.cryticArgs ++ solargs) |> x) {std_err = stderr} ""
+            stderr <- if solConf.quiet
+                         then UseHandle <$> openFile nullFilePath WriteMode
+                         else pure Inherit
+            (ec, out, err) <- readCreateProcessWithExitCode
+              (proc path $ (solConf.cryticArgs ++ solargs) |> x) {std_err = stderr} ""
             case ec of
               ExitSuccess -> readSolcBatch "crytic-export"
               ExitFailure _ -> throwM $ CompileFailure out err
@@ -268,13 +271,14 @@ loadSpecified env name cs = do
           Just (VMFailure _) -> throwM SetUpCallFailed
           _ -> pure (vm4, neFuns, fst <$> tests, abiMapping)
 
-  where choose []    _        = throwM NoContracts
-        choose (c:_) Nothing  = return c
-        choose _     (Just n) = maybe (throwM $ ContractNotFound n) pure $
-                                      find (Data.Text.isSuffixOf (contractId n) . (.contractName)) cs
+  where choose [] _ = throwM NoContracts
+        choose (c:_) Nothing = pure c
+        choose _ (Just n) =
+          maybe (throwM $ ContractNotFound n) pure $
+            find (Data.Text.isSuffixOf (contractId n) . (.contractName)) cs
         contractId n | T.any (== ':') n = let (splitPath, splitName) = T.breakOn ":" n in
                                           rewritePathSeparators splitPath `T.append` splitName
-                     | otherwise        = ":" `append` n
+                     | otherwise = ":" `append` n
         rewritePathSeparators = T.pack . joinPath . splitDirectories . T.unpack
         setUpFunction = ("setUp", [])
 

src/Main.hs

@@ -26,6 +26,7 @@ import Data.Text qualified as Text
 import Data.Time.Clock.System (getSystemTime, systemSeconds)
 import Data.Vector qualified as Vector
 import Data.Version (showVersion)
+import GHC.Generics (Generic)
 import Main.Utf8 (withUtf8)
 import Options.Applicative
 import Paths_echidna (version)
@@ -35,6 +36,7 @@ import System.Exit (exitWith, exitSuccess, ExitCode(..))
 import System.FilePath ((</>))
 import System.IO (hPutStrLn, stderr)
 import System.IO.CodePage (withCP65001)
+import Text.Read (readMaybe)
 
 import EVM (Contract(..), bytecode, ContractCode (RuntimeCode), RuntimeCode (ConcreteRuntimeCode), initialContract)
 import EVM.Dapp (dappInfo, emptyDapp)