Initial py3 compatibility fixes (NOT comprehensive!)

Author: vub

ethereum/block.py

@@ -6,9 +6,9 @@
 from ethereum import trie
 from ethereum.trie import Trie
 from ethereum.securetrie import SecureTrie
-from config import default_config
+from ethereum.config import default_config
 from ethereum.transactions import Transaction
-from db import BaseDB
+from ethereum.db import BaseDB
 import sys
 if sys.version_info.major == 2:
     from repoze.lru import lru_cache

ethereum/block_creation.py

@@ -26,7 +26,7 @@ def add_transactions(state, block, txqueue, min_gasprice=0):
             apply_transaction(state, tx)
             block.transactions.append(tx)
         except (InsufficientBalance, BlockGasLimitReached, InsufficientStartGas,
-                InvalidNonce, UnsignedTransaction), e:
+                InvalidNonce, UnsignedTransaction) as e:
             pass
     log.info('Added %d transactions' % (len(block.transactions) - pre_txs))
 

ethereum/chain.py

@@ -27,23 +27,23 @@ def __init__(self, genesis=None, env=None, coinbase=b'\x00' * 20, \
         # Initialize the state
         if 'head_hash' in self.db:
             self.state = self.mk_poststate_of_blockhash(self.db.get('head_hash'))
-            print 'Initializing chain from saved head, #%d (%s)' % \
-                (self.state.prev_headers[0].number, encode_hex(self.state.prev_headers[0].hash))
+            print('Initializing chain from saved head, #%d (%s)' % \
+                (self.state.prev_headers[0].number, encode_hex(self.state.prev_headers[0].hash)))
         elif genesis is None:
             raise Exception("Need genesis decl!")
         elif isinstance(genesis, State):
             self.state = genesis
-            print 'Initializing chain from provided state'
+            print('Initializing chain from provided state')
         elif "extraData" in genesis:
             self.state = parse_genesis_declaration.state_from_genesis_declaration(
                 genesis, self.env)
-            print 'Initializing chain from provided genesis declaration'
+            print('Initializing chain from provided genesis declaration')
         elif "prev_headers" in genesis:
             self.state = State.from_snapshot(genesis, self.env)
-            print 'Initializing chain from provided state snapshot, %d (%s)' % \
-                (self.state.block_number, encode_hex(self.state.prev_headers[0].hash[:8]))
+            print('Initializing chain from provided state snapshot, %d (%s)' % \
+                (self.state.block_number, encode_hex(self.state.prev_headers[0].hash[:8])))
         else:
-            print 'Initializing chain from new state based on alloc'
+            print('Initializing chain from new state based on alloc')
             self.state = parse_genesis_declaration.mk_basic_state(genesis, {
                 "number": kwargs.get('number', 0),
                 "gas_limit": kwargs.get('gas_limit', 4712388),
@@ -230,7 +230,7 @@ def add_block(self, block):
             log.info('Adding to head', head=encode_hex(block.header.prevhash))
             try:
                 apply_block(self.state, block)
-            except (KeyError, ValueError), e:  # FIXME add relevant exceptions here
+            except (KeyError, ValueError) as e:  # FIXME add relevant exceptions here
                 log.info('Block %s with parent %s invalid, reason: %s' % (encode_hex(block.header.hash), encode_hex(block.header.prevhash), e))
                 return False
             self.db.put('block:' + str(block.header.number), block.header.hash)

ethereum/config.py

@@ -63,7 +63,7 @@
     DAO_WITHDRAWER = utils.normalize_address('0xbf4ed7b27f1d666546e30d74d50d173d20bca754'),
     # Anti-DoS fork
     ANTI_DOS_FORK_BLKNUM = 2463000,
-    CLEARING_FORK_BLKNUM = 2**98,
+    CLEARING_FORK_BLKNUM = 3500000,
     # Default consensus strategy: ethash, poa, casper, pbft
     CONSENSUS_STRATEGY = 'ethash',
     # Serenity fork

ethereum/opcodes.py

@@ -11,7 +11,7 @@
     0x07: ['SMOD', 2, 1, 5],
     0x08: ['ADDMOD', 3, 1, 8],
     0x09: ['MULMOD', 3, 1, 8],
-    0x0a: ['EXP', 2, 1, 10], # soon 80
+    0x0a: ['EXP', 2, 1, 10],
     0x0b: ['SIGNEXTEND', 2, 1, 5],
     0x10: ['LT', 2, 1, 3],
     0x11: ['GT', 2, 1, 3],
@@ -132,4 +132,4 @@
 CALL_CHILD_LIMIT_NUM = 63
 CALL_CHILD_LIMIT_DENOM = 64
 SUICIDE_SUPPLEMENTAL_GAS = 5000
-EXP_SUPPLEMENTAL_GAS = 70
+EXP_SUPPLEMENTAL_GAS = 40

ethereum/processblock.py

@@ -8,7 +8,7 @@
 from ethereum import bloom
 from ethereum import vm as vm
 from ethereum.utils import safe_ord, normalize_address, mk_contract_address, \
-    mk_metropolis_contract_address, int_to_addr, big_endian_to_int
+    mk_metropolis_contract_address, int_to_addr, big_endian_to_int, encode_hex
 from ethereum.exceptions import InvalidNonce, InsufficientStartGas, UnsignedTransaction, \
         BlockGasLimitReached, InsufficientBalance
 from ethereum import transactions
@@ -142,6 +142,7 @@ def create_contract(ext, msg):
     # assert not ext.get_code(msg.to)
     msg.data = vm.CallData([], 0, 0)
     snapshot = ext.snapshot()
+    ext.set_nonce(msg.to, 1)
     res, gas, dat = _apply_msg(ext, msg, code)
     assert utils.is_numeric(gas)
     log_msg.debug('CONTRACT CREATION FINISHED', res=res, gas=gas, dat=dat)
@@ -159,7 +160,8 @@ def create_contract(ext, msg):
                 ext.revert(snapshot)
                 return 0, 0, b''
         ext.set_code(msg.to, b''.join(map(ascii_chr, dat)))
-        log_msg.debug('SETTING CODE', addr=msg.to.encode('hex'))
+        log_msg.debug('SETTING CODE', addr=encode_hex(msg.to))
         return 1, gas, msg.to
     else:
+        ext.revert(snapshot)
         return 0, gas, b''

ethereum/state.py

@@ -2,15 +2,15 @@
 from ethereum.utils import normalize_address, hash32, trie_root, \
     big_endian_int, address, int256, encode_hex, encode_int, \
     big_endian_to_int, int_to_addr, zpad, parse_as_bin, parse_as_int, \
-    decode_hex, sha3
+    decode_hex, sha3, is_string, is_numeric
 from rlp.sedes import big_endian_int, Binary, binary, CountableList
 from ethereum import utils
 from ethereum import trie
 from ethereum.trie import Trie
 from ethereum.securetrie import SecureTrie
-from config import default_config, Env
+from ethereum.config import default_config, Env
 from ethereum.block import FakeHeader
-from db import BaseDB, EphemDB, OverlayDB
+from ethereum.db import BaseDB, EphemDB, OverlayDB
 import copy
 import sys
 if sys.version_info.major == 2:
@@ -33,9 +33,9 @@ def get_block(db, blockhash):
 
 
 def snapshot_form(val):
-    if isinstance(val, (int, long)):
+    if is_numeric(val):
         return str(val)
-    elif isinstance(val, (str, bytes)):
+    elif is_string(val):
         return '0x' + encode_hex(val)
 
 
@@ -59,7 +59,7 @@ def snapshot_form(val):
 
 class State():
 
-    def __init__(self, root='', env=Env(), **kwargs):
+    def __init__(self, root=b'', env=Env(), **kwargs):
         self.env = env
         self.trie = SecureTrie(Trie(self.db, root))
         for k, v in STATE_DEFAULTS.items():
@@ -96,19 +96,19 @@ def add_block_header(self, block_header):
 
     def typecheck_storage(self, k, v):
         if k == 'nonce' or k == 'balance':
-            assert isinstance(v, (int, long))
+            assert is_numeric(v)
         elif k == 'code':
-            assert isinstance(v, (str, bytes))
+            assert is_string(v)
         elif k == 'storage':
-            assert isinstance(v, (str, bytes)) and len(v) == 32
+            assert is_string(v) and len(v) == 32
         elif k == 'deleted':
             assert isinstance(v, bool)
         else:
-            assert isinstance(v, (str, bytes))
+            assert is_string(v)
         return True
 
     def set_storage(self, addr, k, v):
-        if isinstance(k, (int, long)):
+        if is_numeric(k):
             k = zpad(encode_int(k), 32)
         self.typecheck_storage(k, v)
         addr = normalize_address(addr)
@@ -143,7 +143,7 @@ def _get_account_unsafe(self, addr):
             return Account.blank_account(self.db, self.config['ACCOUNT_INITIAL_NONCE'])
 
     def get_storage(self, addr, k):
-        if isinstance(k, (int, long)):
+        if is_numeric(k):
             k = zpad(encode_int(k), 32)
         addr = normalize_address(addr)
         if addr not in self.cache:
@@ -195,7 +195,7 @@ def get_storage_data (self, addr, k):
 
     # set_storage_data = lambda self, addr, k, v: self.set_storage(addr, k, encode_int(v) if isinstance(v, (int, long)) else v)
     def set_storage_data (self, addr, k, v):
-        self.set_storage(addr, k, encode_int(v) if isinstance(v, (int, long)) and k not in ACCOUNT_SPECIAL_PARAMS else v)
+        self.set_storage(addr, k, encode_int(v) if is_numeric(v) and k not in ACCOUNT_SPECIAL_PARAMS else v)
 
     def account_exists(self, addr):
         if self.is_CLEARING():
@@ -221,7 +221,7 @@ def reset_storage(self, addr):
             self.set_storage(addr, k, '')
 
     # Commit the cache to the trie
-    def commit(self):
+    def commit(self, allow_empties=False):
         rt = self.trie.root_hash
         for addr, subcache in self.cache.items():
             if addr not in self.modified:
@@ -251,7 +251,8 @@ def commit(self):
             if addr in self.modified or True:
                 if not acct.deleted:
                     acct._cached_rlp = None
-                    if self.is_CLEARING() and acct.is_blank():
+                    # print 'moose', addr.encode('hex'), self.is_CLEARING(), acct.is_blank(), acct.nonce, acct.balance, repr(acct.code)
+                    if self.is_CLEARING() and acct.is_blank() and not allow_empties:
                         self.trie.delete(addr)
                     else:
                         self.trie.update(addr, rlp.encode(acct))
@@ -372,9 +373,9 @@ def from_snapshot(cls, snapshot_data, env):
         for k, default in STATE_DEFAULTS.items():
             default = copy.copy(default)
             v = snapshot_data[k] if k in snapshot_data else None
-            if isinstance(default, (int, long)):
+            if is_numeric(default):
                 setattr(state, k, parse_as_int(v) if k in snapshot_data else default)
-            elif isinstance(default, (str, bytes)):
+            elif is_string(default):
                 setattr(state, k, parse_as_bin(v) if k in snapshot_data else default)
             elif k == 'prev_headers':
                 if k in snapshot_data:
@@ -409,7 +410,7 @@ def to_snapshot(self, root_only=False, no_prevblocks=False):
         for k, default in STATE_DEFAULTS.items():
             default = copy.copy(default)
             v = getattr(self, k)
-            if isinstance(default, (int, long)):
+            if is_numeric(default):
                 snapshot[k] = str(v)
             elif isinstance(default, (str, bytes)):
                 snapshot[k] = '0x'+encode_hex(v)
@@ -543,4 +544,4 @@ def blank_account(cls, db, initial_nonce=0):
         return o
 
     def is_blank(self):
-        return self.nonce == 0 and self.balance == 0 and self.storage == trie.BLANK_ROOT and self.code_hash == BLANK_HASH
+        return self.nonce == 0 and self.balance == 0 and self.code_hash == BLANK_HASH

ethereum/state_transition.py

@@ -20,8 +20,8 @@
 from ethereum.consensus_strategy import get_consensus_strategy
 from ethereum import vm
 from ethereum.specials import specials as default_specials
-from config import Env, default_config
-from db import BaseDB, EphemDB
+from ethereum.config import Env, default_config
+from ethereum.db import BaseDB, EphemDB
 from ethereum.exceptions import InvalidNonce, InsufficientStartGas, UnsignedTransaction, \
     BlockGasLimitReached, InsufficientBalance, VerificationFailed
 import sys
@@ -119,7 +119,7 @@ def apply_block(state, block):
         assert verify_execution_results(state, block)
         # Post-sealing finalization steps
         post_seal_finalize(state, block)
-    except Exception, e:
+    except Exception as e:
         state.revert(snapshot)
         raise ValueError(str(e))
     return state

ethereum/tester.py

@@ -13,7 +13,7 @@
 from ethereum.config import Env
 from ethereum.slogging import LogRecorder
 from ethereum._solidity import get_solidity
-from ethereum.utils import to_string, sha3, privtoaddr, int_to_addr
+from ethereum.utils import to_string, sha3, privtoaddr, int_to_addr, encode_hex
 from ethereum import parse_genesis_declaration, state_transition
 from ethereum.state import State
 
@@ -176,16 +176,16 @@ def __init__(self2):
 
         for i in range(num_accounts):
             account = accounts[i]
-            initial_balances[account.encode('hex')] = {'wei': str(10**24)}
+            initial_balances[encode_hex(account)] = {'wei': str(10**24)}
 
         for i in range(1, 5):
             address = int_to_addr(i)
-            initial_balances[address.encode('hex')] = {'wei': "1"}
+            initial_balances[encode_hex(address)] = {'wei': "1"}
 
         self.state = State.from_snapshot({
             "alloc": initial_balances,
             "timestamp": "1410973349",
-            "coinbase": DEFAULT_ACCOUNT.encode('hex'),
+            "coinbase": encode_hex(DEFAULT_ACCOUNT),
             "gas_limit": "1000000000"
         }, self.env)
 

ethereum/tests/test_blocks.py

@@ -82,7 +82,7 @@ def run_block_test(params, config_overrides = {}):
                 success = c.add_block(rlp.decode(rlpdata, Block))
             except (ValueError, TypeError, AttributeError, VerificationFailed,
                     DecodingError, DeserializationError, InvalidTransaction, 
-                    InvalidNonce, KeyError), e:
+                    InvalidNonce, KeyError) as e:
                 success = False
             assert not success
         else: