diff --git a/mythril/laser/ethereum/natives.py b/mythril/laser/ethereum/natives.py index d49713c8..3ce8ab35 100644 --- a/mythril/laser/ethereum/natives.py +++ b/mythril/laser/ethereum/natives.py @@ -6,7 +6,8 @@ import hashlib import coincurve from py_ecc.secp256k1 import N as secp256k1n -from mythril.laser.ethereum.util import ALL_BYTES, bytearray_to_int, concrete_int_to_bytes, sha3, zpad +from rlp.utils import ALL_BYTES +from mythril.laser.ethereum.util import bytearray_to_int, concrete_int_to_bytes, sha3, zpad def int_to_32bytes(i): #used because int can't fit as bytes function's input diff --git a/mythril/laser/ethereum/util.py b/mythril/laser/ethereum/util.py index 32865fb8..c3298146 100644 --- a/mythril/laser/ethereum/util.py +++ b/mythril/laser/ethereum/util.py @@ -10,11 +10,6 @@ TT256M1 = 2 ** 256 - 1 TT255 = 2 ** 255 -ALL_BYTES = tuple( - struct.pack('B', i) - for i in range(256) - ) - def zpad(x, l): diff --git a/requirements.txt b/requirements.txt index aad67f69..c2c8e8a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ configparser>=3.5.0 coverage eth_abi>=1.0.0 eth-account>=0.1.0a2 -ethereum==2.3.1 +ethereum>=2.3.2 eth-hash>=0.1.0 eth-keyfile>=0.5.1 eth-keys>=0.2.0b3 @@ -19,5 +19,5 @@ pytest>=3.6.0 pytest-cov pytest_mock requests -rlp<1.0.0 +rlp>=1.0.1 z3-solver>=4.5 diff --git a/setup.py b/setup.py index 0e7c624d..e1a623a2 100755 --- a/setup.py +++ b/setup.py @@ -305,7 +305,7 @@ setup( packages=find_packages(exclude=['contrib', 'docs', 'tests']), install_requires=[ - 'ethereum==2.3.1', + 'ethereum>=2.3.2', 'z3-solver>=4.5', 'requests', 'py-solc', @@ -320,7 +320,7 @@ setup( 'eth-tester>=0.1.0b21', 'coverage', 'jinja2>=2.9', - 'rlp<1.0.0', + 'rlp>=1.0.1', 'py-flags', 'mock', 'configparser>=3.5.0',