Merge pull request #357 from pipermerriam/piper/python3-support

Piper/python3 support
thanks @pipermerriam, this is a big step!

Author: konradkonrad

.coveragerc

@@ -9,7 +9,6 @@ omit =
   */ethereum/fastvm.py
   */ethereum/spv.py
 
-[report]
 exclude_lines =
   pragma: no cover
   def __repr__

.travis.yml

@@ -1,5 +1,5 @@
 language: python
-python: 2.7
+python: 3.5
 sudo: required
 dist: trusty
 before_install:
@@ -9,17 +9,26 @@ before_install:
 env:
   matrix:
   - TOX_ENV=py27
+  - TOX_ENV=py34
+  - TOX_ENV=py35
   global:
-    secure: cKbIgpTJ1yjKLBxpCEiT6IH7NShDWZUE+BvnrAfc+ujCsR6LyLJcKxFQmKnWryJCqg7fp82Ep2bF2oDKzanAROar2xDY1SFGbai42seYMaFCw53YPGJ6u3VNCcfT0rN9BWgE7el/m4fjcD6CRsZYKArNNJbMX8csRt3uXXCFLso=
+    - COVERAGE_APPEND="--append"
+    - secure: cKbIgpTJ1yjKLBxpCEiT6IH7NShDWZUE+BvnrAfc+ujCsR6LyLJcKxFQmKnWryJCqg7fp82Ep2bF2oDKzanAROar2xDY1SFGbai42seYMaFCw53YPGJ6u3VNCcfT0rN9BWgE7el/m4fjcD6CRsZYKArNNJbMX8csRt3uXXCFLso=
 install:
-- pip install -Ur requirements.txt
-- pip install -Ur dev_requirements.txt
+  - travis_retry pip install setuptools --upgrade
+  - travis_retry pip install tox
+  - travis_retry pip install coverage
 script:
-- coverage run --source ethereum -m py.test --ignore ethereum/tests/test_vm.py --ignore ethereum/tests/test_state.py
-- coverage run --append --source ethereum -m py.test ethereum/tests/test_vm.py
-- coverage run --append --source ethereum -m py.test ethereum/tests/test_state.py
+  - if [ -d .tox/$TOX_ENV/ ]; then cd .tox/$TOX_ENV && coverage erase; fi;
+  - tox -e $TOX_ENV -- --ignore ethereum/tests/test_vm.py --ignore ethereum/tests/test_state.py
+  - tox -e $TOX_ENV -- ethereum/tests/test_vm.py
+  - tox -e $TOX_ENV -- ethereum/tests/test_state.py
+  - cd .tox/$TOX_ENV && coverage report --show-missing
 after_success:
-- coveralls
+  - travis_retry pip install coveralls
+  - cd .tox/$TOX_ENV && coveralls
+after_script:
+  - cat .tox/$TOX_ENV/log/*.log
 notifications:
   slack:
     secure: W/UAhQ/GgYwMWrl3aiVAVOWr4WGdWrxUOX/rTB3ZgwDwGqDYLzQO5UqbsQlo1JXPZ6JOWfIPMURhHu7DSfue9dBW6xQ+NL+bFHe9lSXG4nqFK3IjezYyTBzNRJRDbGUvSSqgj6D5cwhJ8BjfUIRPbJz3CxL64KmsNXezEaMY60w=

ethereum/__init__.py

@@ -5,7 +5,7 @@
 import subprocess
 import re
 # Import slogging to patch logging as soon as possible
-import slogging  # noqa
+from . import slogging  # noqa
 
 
 GIT_DESCRIBE_RE = re.compile('^(?P<version>v\d+\.\d+\.\d+)-(?P<git>\d+-g[a-fA-F0-9]+(?:-dirty)?)$')

ethereum/_solidity.py

@@ -6,6 +6,9 @@
 
 import yaml
 
+from rlp.utils import decode_hex
+from . import utils
+
 BINARY = 'solc'
 
 
@@ -49,7 +52,7 @@ def solc_arguments(libraries=None, combined='bin,abi', optimize=True):
 
     if libraries is not None and len(libraries):
         addresses = [
-            '{name}:{address}'.format(name=name, address=address)
+            '{name}:{address}'.format(name=name, address=address.decode('utf8'))
             for name, address in libraries.items()
         ]
         args.extend([
@@ -64,21 +67,21 @@ def solc_parse_output(compiler_output):
     """ Parses the compiler output. """
     result = yaml.safe_load(compiler_output)['contracts']
 
-    if 'bin' in result.values()[0]:
+    if 'bin' in tuple(result.values())[0]:
         for value in result.values():
             value['bin_hex'] = value['bin']
 
             # decoding can fail if the compiled contract has unresolved symbols
             try:
-                value['bin'] = value['bin_hex'].decode('hex')
+                value['bin'] = decode_hex(value['bin_hex'])
             except TypeError:
                 pass
 
     for json_data in ('abi', 'devdoc', 'userdoc'):
         # the values in the output can be configured through the
         # --combined-json flag, check that it's present in the first value and
         # assume all values are consistent
-        if json_data not in result.values()[0]:
+        if json_data not in tuple(result.values())[0]:
             continue
 
         for value in result.values():
@@ -182,7 +185,7 @@ def solidity_resolve_address(hex_code, library_symbol, library_address):
         raise ValueError('Address should not contain the 0x prefix')
 
     try:
-        _ = library_address.decode('hex')
+        _ = decode_hex(library_address)
     except TypeError:
         raise ValueError('library_address contains invalid characters, it must be hex encoded.')
 
@@ -291,8 +294,11 @@ def compile_code(sourcecode, libraries=None, combined='bin,abi', optimize=True):
     args = solc_arguments(libraries=libraries, combined=combined, optimize=optimize)
     args.insert(0, get_compiler_path())
 
-    process = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-    stdoutdata, _ = process.communicate(input=sourcecode)
+    process = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdoutdata, stderrdata = process.communicate(input=utils.to_string(sourcecode))
+
+    if process.returncode != 0:
+        raise CompileError(stderrdata)
 
     return solc_parse_output(stdoutdata)
 

ethereum/abi.py

@@ -222,7 +222,7 @@ def listen(self, log, noprint=True):
                          if indexed[i]]
         unindexed_types = [types[i] for i in range(len(types))
                            if not indexed[i]]
-        # print('listen', log.data.encode('hex'), log.topics)
+        # print('listen', encode_hex(log.data), log.topics)
         deserialized_args = decode_abi(unindexed_types, log.data)
         o = {}
         c1, c2 = 0, 0
@@ -494,14 +494,14 @@ def decode_single(typ, data):
         return (o - 2**int(sub)) if o >= 2**(int(sub) - 1) else o
     elif base == 'ureal':
         high, low = [int(x) for x in sub.split('x')]
-        return big_endian_to_int(data) * 1.0 / 2**low
+        return big_endian_to_int(data) * 1.0 // 2**low
     elif base == 'real':
         high, low = [int(x) for x in sub.split('x')]
         o = big_endian_to_int(data)
         i = (o - 2**(high+low)) if o >= 2**(high+low-1) else o
-        return (i * 1.0 / 2**low)
+        return (i * 1.0 // 2**low)
     elif base == 'bool':
-        return bool(int(data.encode('hex'), 16))
+        return bool(int(encode_hex(data), 16))
 
 
 # Decodes multiple arguments using the head/tail mechanism

ethereum/blocks.py

@@ -74,7 +74,7 @@ def calc_difficulty(parent, timestamp):
     period_count = (parent.number + 1) // config['EXPDIFF_PERIOD']
     if period_count >= config['EXPDIFF_FREE_PERIODS']:
         o = max(o + 2**(period_count - config['EXPDIFF_FREE_PERIODS']), config['MIN_DIFF'])
-    # print 'Calculating difficulty of block %d, timestamp difference %d, parent diff %d, child diff %d' % (parent.number + 1, timestamp - parent.timestamp, parent.difficulty, o)
+    # print('Calculating difficulty of block %d, timestamp difference %d, parent diff %d, child diff %d' % (parent.number + 1, timestamp - parent.timestamp, parent.difficulty, o))
     return o
 
 
@@ -676,8 +676,8 @@ def validate_uncles(self):
                 return False
             if uncle.prevhash not in eligible_ancestor_hashes:
                 log.error("Uncle does not have a valid ancestor", block=self,
-                          eligible=[x.encode('hex') for x in eligible_ancestor_hashes],
-                          uncle_prevhash=uncle.prevhash.encode('hex'))
+                          eligible=[encode_hex(x) for x in eligible_ancestor_hashes],
+                          uncle_prevhash=encode_hex(uncle.prevhash))
                 return False
             if uncle in ineligible:
                 log.error("Duplicate uncle", block=self,
@@ -1035,7 +1035,7 @@ def commit_state(self):
                 #     except:
                 #         pass
                 #     sys.stderr.write("pre: %r\n" % self.account_to_dict(addr)['storage'])
-                #     sys.stderr.write("pre: %r\n" % self.get_storage(addr).root_hash.encode('hex'))
+                #     sys.stderr.write("pre: %r\n" % encode_hex(self.get_storage(addr).root_hash))
                 #     sys.stderr.write("changed: %s %s %s\n" % (encode_hex(addr), encode_hex(enckey), encode_hex(val)))
                 if v:
                     t.update(enckey, val)
@@ -1168,11 +1168,12 @@ def finalize(self):
         self.delta_balance(self.coinbase, delta)
         self.ether_delta += delta
 
+        br = self.config['BLOCK_REWARD']
+        udpf = self.config['UNCLE_DEPTH_PENALTY_FACTOR']
+
         for uncle in self.uncles:
-            r = self.config['BLOCK_REWARD'] * \
-                (self.config['UNCLE_DEPTH_PENALTY_FACTOR'] + uncle.number - self.number) \
-                / self.config['UNCLE_DEPTH_PENALTY_FACTOR']
-            r = int(r)
+            r = int(br * (udpf + uncle.number - self.number) // udpf)
+
             self.delta_balance(uncle.coinbase, r)
             self.ether_delta += r
         self.commit_state()
@@ -1307,7 +1308,7 @@ def calc_gaslimit(parent):
 
 def check_gaslimit(parent, gas_limit):
     config = parent.config
-    #  block.gasLimit - parent.gasLimit <= parent.gasLimit / GasLimitBoundDivisor
+    #  block.gasLimit - parent.gasLimit <= parent.gasLimit // GasLimitBoundDivisor
     gl = parent.gas_limit // config['GASLIMIT_ADJMAX_FACTOR']
     a = bool(abs(gas_limit - parent.gas_limit) <= gl)
     b = bool(gas_limit >= config['MIN_GAS_LIMIT'])

ethereum/bloom.py

@@ -27,7 +27,7 @@ def bloom(val):
 
 def bloom_insert(bloom, val):
     h = utils.sha3(val)
-#   print 'bloom_insert', bloom_bits(val), repr(val)
+#   print('bloom_insert', bloom_bits(val), repr(val))
     for i in range(0, BUCKETS_PER_VAL * 2, 2):
         bloom |= 1 << ((safe_ord(h[i + 1]) + (safe_ord(h[i]) << 8)) & 2047)
     return bloom

ethereum/chain.py

@@ -110,7 +110,7 @@ class Chain(object):
     """
     head_candidate = None
 
-    def __init__(self, env, genesis=None, new_head_cb=None, coinbase='\x00' * 20):
+    def __init__(self, env, genesis=None, new_head_cb=None, coinbase=b'\x00' * 20):
         assert isinstance(env, Env)
         self.env = env
         self.db = self.blockchain = env.db
@@ -121,7 +121,7 @@ def __init__(self, env, genesis=None, new_head_cb=None, coinbase='\x00' * 20):
             self._initialize_blockchain(genesis)
         log.debug('chain @', head_hash=self.head)
         self.genesis = self.get(self.index.get_block_by_number(0))
-        log.debug('got genesis', nonce=self.genesis.nonce.encode('hex'),
+        log.debug('got genesis', nonce=encode_hex(self.genesis.nonce),
                   difficulty=self.genesis.difficulty)
         self._update_head_candidate()
 

ethereum/ethash.py

@@ -9,7 +9,7 @@
     from functools import lru_cache
 
 
-cache_seeds = ['\x00' * 32]
+cache_seeds = [b'\x00' * 32]
 
 
 def mkcache(block_number):

ethereum/ethash_utils.py

@@ -94,7 +94,7 @@ def deserialize_cache(ds):
 class ListWrapper(list):
     def __init__(self, data):
         self.data = data
-        self.len = len(data) / HASH_BYTES
+        self.len = len(data) // HASH_BYTES
 
     def __len__(self):
         return self.len
@@ -122,14 +122,14 @@ def isprime(x):
 def get_cache_size(block_number):
     sz = CACHE_BYTES_INIT + CACHE_BYTES_GROWTH * (block_number // EPOCH_LENGTH)
     sz -= HASH_BYTES
-    while not isprime(sz / HASH_BYTES):
+    while not isprime(sz // HASH_BYTES):
         sz -= 2 * HASH_BYTES
     return sz
 
 
 def get_full_size(block_number):
     sz = DATASET_BYTES_INIT + DATASET_BYTES_GROWTH * (block_number // EPOCH_LENGTH)
     sz -= MIX_BYTES
-    while not isprime(sz / MIX_BYTES):
+    while not isprime(sz // MIX_BYTES):
         sz -= 2 * MIX_BYTES
     return sz