From 3e4e4a25174f039294ee838457d71acdcff323cc Mon Sep 17 00:00:00 2001
From: "Dr. Sergey Pogodin" <dr.pogodin@gmail.com>
Date: Thu, 9 May 2019 22:09:28 +0200
Subject: [PATCH 1/2] FIX: Restricts `eth-account` package version to be
 <=0.3.0

Because `eth-account@0.4.0` depends on `eth_abi>=2.0.0b7`, which
conflicts with `eth_abi==1.3.0` required by `mythril-classic`. As I am
looking for a rapid fix, I am restricting `eth-account<=0.3.0` rather
than trying to allow higher versions of `eth_abi`. Thus, leaving to
`mythril-classic` team to inverstigate possibility of update to latest
`eth-account` and `eth_abi`, and fix any related issues.
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c22d72d0..11cdeff3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ configparser>=3.5.0
 coverage
 py_ecc==1.4.2
 eth_abi==1.3.0
-eth-account>=0.1.0a2
+eth-account>=0.1.0a2,<=0.3.0
 ethereum>=2.3.2
 ethereum-input-decoder>=0.2.2
 eth-hash>=0.1.0
diff --git a/setup.py b/setup.py
index 67d7f39a..4605b5d3 100755
--- a/setup.py
+++ b/setup.py
@@ -81,7 +81,7 @@ setup(
         "plyvel",
         "eth_abi==1.3.0",
         "eth-utils>=1.0.1",
-        "eth-account>=0.1.0a2",
+        "eth-account>=0.1.0a2,<=0.3.0",
         "eth-hash>=0.1.0",
         "eth-keyfile>=0.5.1",
         "eth-keys>=0.2.0b3",

From 5ec39fdce5aee3b94a1859c6338ee3a9d3b51870 Mon Sep 17 00:00:00 2001
From: Joran Honig <joran.honig@gmail.com>
Date: Fri, 10 May 2019 21:12:22 +0200
Subject: [PATCH 2/2] Revert "Change timeout logic"

This reverts commit fda18b3e77b3980d7aa89de27e9edb938207ebbc.
---
 mythril/interfaces/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mythril/interfaces/cli.py b/mythril/interfaces/cli.py
index 0fbbab7e..adb0e8f2 100644
--- a/mythril/interfaces/cli.py
+++ b/mythril/interfaces/cli.py
@@ -216,7 +216,7 @@ def create_parser(parser: argparse.ArgumentParser) -> None:
     options.add_argument(
         "--execution-timeout",
         type=int,
-        default=86400,
+        default=600,
         help="The amount of seconds to spend on symbolic execution",
     )
     options.add_argument(