update eth deps

README.rst

@@ -78,7 +78,6 @@ Check out the code from GitHub::
 
 Run install (this should install dependencies)::
 
-    python3 -m pip install -r ./contrib/requirements/requirements-eth.txt
     python3 -m pip install --user -e .
 
 

contrib/build-linux/appimage/build.sh

@@ -121,7 +121,6 @@ mkdir -p "$CACHEDIR/pip_cache"
 "$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements.txt"
 "$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-binaries.txt"
 "$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-hw.txt"
-"$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-eth.txt"
 "$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" "$PROJECT_ROOT"
 
 # was only needed during build time, not runtime

contrib/build-wine/build-electrum-git.sh

@@ -46,8 +46,6 @@ $PYTHON -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"
 
 $PYTHON -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-hw.txt
 
-$PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-eth.txt
-
 pushd $WINEPREFIX/drive_c/electrum
 # see https://github.com/pypa/pip/issues/2195 -- pip makes a copy of the entire directory
 info "Pip installing Electrum. This might take a long time if the project folder is large."

contrib/deterministic-build/requirements.txt

@@ -135,4 +135,20 @@ zipp==3.1.0 \
     --hash=sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96
 colorama==0.4.3 \
     --hash=sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff \
-    --hash=sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1
+    --hash=sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1
+toolz==0.10.0 \
+    --hash=sha256:08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560
+parsimonious==0.8.1 \
+    --hash=sha256:3add338892d580e0cb3b1a39e4a1b427ff9f687858fdd61097053742391a9f6b
+eth-typing==2.2.2 \
+    --hash=sha256:1140c7592321dbf10d6663c46f7e43eb0e6410b011b03f14b3df3eb1f76aa9bb \
+    --hash=sha256:97ba0f83da7cf1d3668f6ed54983f21168076c552762bf5e06d4a20921877f3f
+eth-hash-qtum==0.2.0 \
+    --hash=sha256:8b5c607c74702f56cb4ed26721cc06a91972fa21c2973d0f21b69ba3872533b2 \
+    --hash=sha256:589ab8b0fcb96a6637f4d4968da7ccd9dde6a9f3867a059f42b636175d3ad2f5
+eth-utils-qtum==1.9.5 \
+    --hash=sha256:df2e40fe8d82e5654e086984eff3bebedf594da80e828ae54a4cb16ef7250699 \
+    --hash=sha256:e88d939a2206fa498ffce22b77183b18a1bd75b39bc89d325742bbb2ef675605
+eth-abi-qtum==2.1.1 \
+    --hash=sha256:1e79a49d4f483296c9466eeb2f1d313628e4c947363451a2fdea8cd715fe6bef \
+    --hash=sha256:2b80dc2139b179eed2967fc6de627204821abd9a8c1ce101a0580c95ae6f0be7

contrib/osx/make_osx

@@ -150,10 +150,6 @@ info "Installing dependencies specific to binaries..."
 python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements-binaries.txt --user \
     || fail "Could not install dependencies specific to binaries"
 
-info "Installing eth requirements..."
-python3 -m pip install -Ir ./contrib/deterministic-build/requirements-eth.txt --user \
-    || fail "Could not install eth requirements"
-
 info "Building $PACKAGE..."
 python3 -m pip install --no-dependencies --user . > /dev/null || fail "Could not build $PACKAGE"
 

contrib/requirements/requirements.txt

@@ -10,3 +10,8 @@ aiohttp_socks>=0.3
 certifi
 bitstring
 attrs>=19.2.0
+eth-typing>=2.2.2
+parsimonious>=0.8.0,<0.9.0
+eth-hash-qtum>=0.2.0
+eth-utils-qtum>=1.9.5
+eth-abi-qtum>=2.1.1

setup.py

@@ -22,8 +22,6 @@
 with open('contrib/requirements/requirements.txt') as f:
     requirements = f.read().splitlines()
 
-requirements += ['eth-hash', 'eth-utils', 'eth-abi']
-
 with open('contrib/requirements/requirements-hw.txt') as f:
     requirements_hw = f.read().splitlines()