Merge pull request #336 from norhh/rlp

Rlp

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

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):

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

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',