Merge pull request ethereum#874 from ldct/ldct/py3

drop py2 support, use pyrlp 1.0, switch travis to py3

Author: joeykrug

.travis.yml

@@ -1,5 +1,5 @@
 language: python
-python: 2.7
+python: 3.6
 sudo: required
 dist: trusty
 env:

dev_requirements.txt

@@ -1,5 +1,6 @@
 bitcoin
 coveralls
+https://github.com/ethereum/vyper/tarball/master
 ethereum-serpent
 py-ecc
 pytest-timeout==1.0.0

ethereum/block.py

@@ -1,6 +1,8 @@
 import rlp
-from ethereum.utils import normalize_address, hash32, trie_root, \
-    big_endian_int, address, int256, encode_hex, decode_hex, encode_int, sha3
+from ethereum.utils import (
+    normalize_address, hash32, trie_root,  big_endian_int, address, int256,
+    encode_hex, decode_hex, encode_int, sha3
+)
 from rlp.sedes import big_endian_int, Binary, binary, CountableList
 from ethereum import utils
 from ethereum import trie
@@ -78,11 +80,11 @@ def __init__(self,
                  gas_limit=default_config['GENESIS_GAS_LIMIT'],
                  gas_used=0,
                  timestamp=0,
-                 extra_data='',
+                 extra_data=b'',
                  mixhash=default_config['GENESIS_MIXHASH'],
-                 nonce=''):
+                 nonce=b''):
         # at the beginning of a method, locals() is a dict of all arguments
-        fields = {k: v for k, v in locals().items() if k != 'self'}
+        fields = {k: v for k, v in locals().items() if k not in ['self', '__class__']}
         if len(fields['coinbase']) == 40:
             fields['coinbase'] = decode_hex(fields['coinbase'])
         assert len(fields['coinbase']) == 20
@@ -100,13 +102,37 @@ def hex_hash(self):
 
     @property
     def mining_hash(self):
+
+        # exclude mixhash and nonce
+        fields2 = [
+            (field, sedes) for field, sedes in BlockHeader._meta.fields
+            if field not in ["mixhash", "nonce"]
+        ]
+
+        class BlockHeader2(rlp.Serializable):
+            fields = fields2
+
+        _self = BlockHeader2(**{f:getattr(self, f) for (f, sedes) in fields2})
+
         return utils.sha3(rlp.encode(
-            self, BlockHeader.exclude(['mixhash', 'nonce'])))
+            _self, BlockHeader2))
 
     @property
     def signing_hash(self):
+
+        # exclude extra_data
+        fields3 = [
+            (field, sedes) for field, sedes in BlockHeader._meta.fields
+            if field not in ["extra_data"]
+        ]
+
+        class BlockHeader3(rlp.Serializable):
+            fields = fields3
+
+        _self = BlockHeader3(**{f:getattr(self, f) for (f, sedes) in fields3})
+
         return utils.sha3(rlp.encode(
-            self, BlockHeader.exclude(['extra_data'])))
+            _self, BlockHeader3))
 
     def to_dict(self):
         """Serialize the header to a readable dictionary."""
@@ -169,10 +195,11 @@ def __init__(self, header, transactions=None, uncles=None, db=None):
         # assert isinstance(db, BaseDB), "No database object given"
         # self.db = db
 
-        self.header = header
-        self.transactions = transactions or []
-        self.uncles = uncles or []
-        self.uncles = list(self.uncles)
+        super(Block, self).__init__(
+            header=header,
+            transactions=(transactions or []),
+            uncles=list(uncles or []),
+        )
 
     def __getattribute__(self, name):
         try:

ethereum/common.py

@@ -67,20 +67,23 @@ def calc_difficulty(parent, timestamp, config=default_config):
 
 # Given a parent state, initialize a block with the given arguments
 def mk_block_from_prevstate(chain, state=None, timestamp=None,
-                            coinbase=b'\x35' * 20, extra_data='moo ha ha says the laughing cow.'):
+                            coinbase=b'\x35' * 20, extra_data=b'moo ha ha says the laughing cow.'):
     state = state or chain.state
-    blk = Block(BlockHeader())
     now = timestamp or chain.time()
-    blk.header.number = state.prev_headers[0].number + 1
-    blk.header.difficulty = calc_difficulty(
-        state.prev_headers[0], now, chain.config)
-    blk.header.gas_limit = calc_gaslimit(state.prev_headers[0], chain.config)
-    blk.header.timestamp = max(now, state.prev_headers[0].timestamp + 1)
-    blk.header.prevhash = state.prev_headers[0].hash
-    blk.header.coinbase = coinbase
-    blk.header.extra_data = extra_data
-    blk.header.bloom = 0
-    blk.transactions = []
+
+    blk = Block(
+        header=BlockHeader(
+            number = state.prev_headers[0].number + 1,
+            difficulty = calc_difficulty(state.prev_headers[0], now, chain.config),
+            gas_limit = calc_gaslimit(state.prev_headers[0], chain.config),
+            timestamp = max(now, state.prev_headers[0].timestamp + 1),
+            prevhash = state.prev_headers[0].hash,
+            coinbase = coinbase,
+            extra_data = extra_data,
+            bloom = 0
+        ),
+        transactions=[]
+    )
     return blk
 
 
@@ -122,7 +125,7 @@ def validate_header(state, header):
 # Add transactions
 def add_transactions(state, block, txqueue, min_gasprice=0):
     if not txqueue:
-        return
+        return block
     pre_txs = len(block.transactions)
     log.info('Adding transactions, %d in txqueue, %d dunkles' %
              (len(txqueue.txs), pre_txs))
@@ -133,12 +136,15 @@ def add_transactions(state, block, txqueue, min_gasprice=0):
             break
         try:
             apply_transaction(state, tx)
-            block.transactions.append(tx)
+            block = block.copy(
+                transactions=block.transactions + (tx,)
+            )
         except (InsufficientBalance, BlockGasLimitReached, InsufficientStartGas,
                 InvalidNonce, UnsignedTransaction) as e:
             log.error(e)
     log.info('Added %d transactions' % (len(block.transactions) - pre_txs))
 
+    return block
 
 # Validate that the transaction list root is correct
 def validate_transaction_tree(state, block):
@@ -151,13 +157,19 @@ def validate_transaction_tree(state, block):
 
 # Set state root, receipt root, etc
 def set_execution_results(state, block):
-    block.header.receipts_root = mk_receipt_sha(state.receipts)
-    block.header.tx_list_root = mk_transaction_sha(block.transactions)
     state.commit()
-    block.header.state_root = state.trie.root_hash
-    block.header.gas_used = state.gas_used
-    block.header.bloom = state.bloom
+
+    block = block.copy(
+        header = block.header.copy(
+            receipts_root = mk_receipt_sha(state.receipts),
+            tx_list_root = mk_transaction_sha(block.transactions),
+            state_root = state.trie.root_hash,
+            gas_used = state.gas_used,
+            bloom = state.bloom
+        )
+    )
     log.info('Block pre-sealed, %d gas used' % state.gas_used)
+    return block
 
 
 # Verify state root, receipt root, etc

ethereum/hybrid_casper/casper_initiating_transactions.py

@@ -1,16 +1,17 @@
 import pkg_resources
-from viper import compiler
+from vyper import compiler
 from ethereum.transactions import Transaction
 from ethereum.abi import ContractTranslator
 import rlp
+from ethereum.utils import decode_hex
 
 gasprice = 25 * 10**9
 
-viper_rlp_decoder_tx = rlp.hex_decode("0xf90237808506fc23ac00830330888080b902246102128061000e60003961022056600060007f010000000000000000000000000000000000000000000000000000000000000060003504600060c082121515585760f882121561004d5760bf820336141558576001905061006e565b600181013560f783036020035260005160f6830301361415585760f6820390505b5b368112156101c2577f010000000000000000000000000000000000000000000000000000000000000081350483602086026040015260018501945060808112156100d55760018461044001526001828561046001376001820191506021840193506101bc565b60b881121561014357608081038461044001526080810360018301856104600137608181141561012e5760807f010000000000000000000000000000000000000000000000000000000000000060018401350412151558575b607f81038201915060608103840193506101bb565b60c08112156101b857600182013560b782036020035260005160388112157f010000000000000000000000000000000000000000000000000000000000000060018501350402155857808561044001528060b6838501038661046001378060b6830301830192506020810185019450506101ba565bfe5b5b5b5061006f565b601f841315155857602060208502016020810391505b6000821215156101fc578082604001510182826104400301526020820391506101d8565b808401610420528381018161044003f350505050505b6000f31b2d4f", Transaction)  # noqa: E501
+viper_rlp_decoder_tx = decode_hex("0xf90237808506fc23ac00830330888080b902246102128061000e60003961022056600060007f010000000000000000000000000000000000000000000000000000000000000060003504600060c082121515585760f882121561004d5760bf820336141558576001905061006e565b600181013560f783036020035260005160f6830301361415585760f6820390505b5b368112156101c2577f010000000000000000000000000000000000000000000000000000000000000081350483602086026040015260018501945060808112156100d55760018461044001526001828561046001376001820191506021840193506101bc565b60b881121561014357608081038461044001526080810360018301856104600137608181141561012e5760807f010000000000000000000000000000000000000000000000000000000000000060018401350412151558575b607f81038201915060608103840193506101bb565b60c08112156101b857600182013560b782036020035260005160388112157f010000000000000000000000000000000000000000000000000000000000000060018501350402155857808561044001528060b6838501038661046001378060b6830301830192506020810185019450506101ba565bfe5b5b5b5061006f565b601f841315155857602060208502016020810391505b6000821215156101fc578082604001510182826104400301526020820391506101d8565b808401610420528381018161044003f350505050505b6000f31b2d4f", Transaction)  # noqa: E501
 
-sig_hasher_tx = rlp.hex_decode("0xf9016d808506fc23ac0083026a508080b9015a6101488061000e6000396101565660007f01000000000000000000000000000000000000000000000000000000000000006000350460f8811215610038576001915061003f565b60f6810391505b508060005b368312156100c8577f01000000000000000000000000000000000000000000000000000000000000008335048391506080811215610087576001840193506100c2565b60b881121561009d57607f8103840193506100c1565b60c08112156100c05760b68103600185013560b783036020035260005101840193505b5b5b50610044565b81810360388112156100f4578060c00160005380836001378060010160002060e052602060e0f3610143565b61010081121561010557600161011b565b6201000081121561011757600261011a565b60035b5b8160005280601f038160f701815382856020378282600101018120610140526020610140f350505b505050505b6000f31b2d4f", Transaction)  # noqa: E501
+sig_hasher_tx = decode_hex("0xf9016d808506fc23ac0083026a508080b9015a6101488061000e6000396101565660007f01000000000000000000000000000000000000000000000000000000000000006000350460f8811215610038576001915061003f565b60f6810391505b508060005b368312156100c8577f01000000000000000000000000000000000000000000000000000000000000008335048391506080811215610087576001840193506100c2565b60b881121561009d57607f8103840193506100c1565b60c08112156100c05760b68103600185013560b783036020035260005101840193505b5b5b50610044565b81810360388112156100f4578060c00160005380836001378060010160002060e052602060e0f3610143565b61010081121561010557600161011b565b6201000081121561011757600261011a565b60035b5b8160005280601f038160f701815382856020378282600101018120610140526020610140f350505b505050505b6000f31b2d4f", Transaction)  # noqa: E501
 
-purity_checker_tx = rlp.hex_decode("0xf90467808506fc23ac00830583c88080b904546104428061000e60003961045056600061033f537c0100000000000000000000000000000000000000000000000000000000600035047f80010000000000000000000000000000000000000030ffff1c0e00000000000060205263a1903eab8114156103f7573659905901600090523660048237600435608052506080513b806020015990590160009052818152602081019050905060a0526080513b600060a0516080513c6080513b8060200260200159905901600090528181526020810190509050610100526080513b806020026020015990590160009052818152602081019050905061016052600060005b602060a05103518212156103c957610100601f8360a051010351066020518160020a161561010a57fe5b80606013151561011e57607f811315610121565b60005b1561014f5780607f036101000a60018460a0510101510482602002610160510152605e8103830192506103b2565b60f18114801561015f5780610164565b60f282145b905080156101725780610177565b60f482145b9050156103aa5760028212151561019e5760606001830360200261010051015112156101a1565b60005b156101bc57607f6001830360200261010051015113156101bf565b60005b156101d157600282036102605261031e565b6004821215156101f057600360018303602002610100510151146101f3565b60005b1561020d57605a6002830360200261010051015114610210565b60005b1561022b57606060038303602002610100510151121561022e565b60005b1561024957607f60038303602002610100510151131561024c565b60005b1561025e57600482036102605261031d565b60028212151561027d57605a6001830360200261010051015114610280565b60005b1561029257600282036102605261031c565b6002821215156102b157609060018303602002610100510151146102b4565b60005b156102c657600282036102605261031b565b6002821215156102e65760806001830360200261010051015112156102e9565b60005b156103035760906001830360200261010051015112610306565b60005b1561031857600282036102605261031a565bfe5b5b5b5b5b604060405990590160009052600081526102605160200261016051015181602001528090502054156103555760016102a052610393565b60306102605160200261010051015114156103755760016102a052610392565b60606102605160200261010051015114156103915760016102a0525b5b5b6102a051151561039f57fe5b6001830192506103b1565b6001830192505b5b8082602002610100510152600182019150506100e0565b50506001604060405990590160009052600081526080518160200152809050205560016102e05260206102e0f35b63c23697a8811415610440573659905901600090523660048237600435608052506040604059905901600090526000815260805181602001528090502054610300526020610300f35b505b6000f31b2d4f", Transaction)  # noqa: E501
+purity_checker_tx = decode_hex("0xf90467808506fc23ac00830583c88080b904546104428061000e60003961045056600061033f537c0100000000000000000000000000000000000000000000000000000000600035047f80010000000000000000000000000000000000000030ffff1c0e00000000000060205263a1903eab8114156103f7573659905901600090523660048237600435608052506080513b806020015990590160009052818152602081019050905060a0526080513b600060a0516080513c6080513b8060200260200159905901600090528181526020810190509050610100526080513b806020026020015990590160009052818152602081019050905061016052600060005b602060a05103518212156103c957610100601f8360a051010351066020518160020a161561010a57fe5b80606013151561011e57607f811315610121565b60005b1561014f5780607f036101000a60018460a0510101510482602002610160510152605e8103830192506103b2565b60f18114801561015f5780610164565b60f282145b905080156101725780610177565b60f482145b9050156103aa5760028212151561019e5760606001830360200261010051015112156101a1565b60005b156101bc57607f6001830360200261010051015113156101bf565b60005b156101d157600282036102605261031e565b6004821215156101f057600360018303602002610100510151146101f3565b60005b1561020d57605a6002830360200261010051015114610210565b60005b1561022b57606060038303602002610100510151121561022e565b60005b1561024957607f60038303602002610100510151131561024c565b60005b1561025e57600482036102605261031d565b60028212151561027d57605a6001830360200261010051015114610280565b60005b1561029257600282036102605261031c565b6002821215156102b157609060018303602002610100510151146102b4565b60005b156102c657600282036102605261031b565b6002821215156102e65760806001830360200261010051015112156102e9565b60005b156103035760906001830360200261010051015112610306565b60005b1561031857600282036102605261031a565bfe5b5b5b5b5b604060405990590160009052600081526102605160200261016051015181602001528090502054156103555760016102a052610393565b60306102605160200261010051015114156103755760016102a052610392565b60606102605160200261010051015114156103915760016102a0525b5b5b6102a051151561039f57fe5b6001830192506103b1565b6001830192505b5b8082602002610100510152600182019150506100e0565b50506001604060405990590160009052600081526080518160200152809050205560016102e05260206102e0f35b63c23697a8811415610440573659905901600090523660048237600435608052506040604059905901600090526000815260805181602001528090502054610300526020610300f35b505b6000f31b2d4f", Transaction)  # noqa: E501
 
 purity_checker_address = purity_checker_tx.creates
 purity_checker_abi = [{'name': 'check(address)', 'type': 'function', 'constant': True, 'inputs': [{'name': 'addr', 'type': 'address'}], 'outputs': [{'name': 'out', 'type': 'bool'}]}, {'name': 'submit(address)', 'type': 'function', 'constant': False, 'inputs': [{'name': 'addr', 'type': 'address'}], 'outputs': [{'name': 'out', 'type': 'bool'}]}]  # noqa: E501

ethereum/hybrid_casper/casper_utils.py

@@ -7,7 +7,7 @@
 from ethereum.hybrid_casper import consensus
 from ethereum.messages import apply_transaction
 from ethereum.tools.tester import a0
-from viper import compiler
+from vyper import compiler
 import serpent
 import rlp
 

ethereum/messages.py

@@ -89,29 +89,25 @@ class Receipt(rlp.Serializable):
         ('logs', CountableList(Log))
     ]
 
-    def __init__(self, state_root, gas_used, logs, bloom=None):
-        # does not call super.__init__ as bloom should not be an attribute but
-        # a property
-        self.state_root = state_root
-        self.gas_used = gas_used
-        self.logs = logs
-        if bloom is not None and bloom != self.bloom:
-            raise ValueError("Invalid bloom filter")
-        self._cached_rlp = None
-        self._mutable = True
-
     @property
     def bloom(self):
         bloomables = [x.bloomables() for x in self.logs]
         return bloom.bloom_from_list(utils.flatten(bloomables))
 
 
 def mk_receipt(state, success, logs):
+    bloomables = [x.bloomables() for x in logs]
+    ret_bloom = bloom.bloom_from_list(utils.flatten(bloomables))
+
     if state.is_METROPOLIS():
-        o = Receipt(b'\x01' if success else b'', state.gas_used, logs)
-        return o
+        ret = Receipt(
+            state_root=(b'\x01' if success else b''),
+            gas_used=state.gas_used,
+            bloom=ret_bloom,
+            logs=logs)
+        return ret
     else:
-        return Receipt(state.trie.root_hash, state.gas_used, logs)
+        return Receipt(state.trie.root_hash, state.gas_used, ret_bloom, logs)
 
 
 def config_fork_specific_validation(config, blknum, tx):

ethereum/meta.py

@@ -45,7 +45,7 @@ def make_head_candidate(chain, txqueue=None,
                         parent=None,
                         timestamp=None,
                         coinbase=b'\x35' * 20,
-                        extra_data='moo ha ha says the laughing cow.',
+                        extra_data=b'moo ha ha says the laughing cow.',
                         min_gasprice=0):
     log.debug('Creating head candidate')
     if parent is None:
@@ -64,15 +64,19 @@ def make_head_candidate(chain, txqueue=None,
         coinbase,
         extra_data)
     # Find and set the uncles
-    blk.uncles = cs.get_uncles(chain, temp_state)
-    blk.header.uncles_hash = sha3(rlp.encode(blk.uncles))
+    blk = blk.copy(
+        uncles = cs.get_uncles(chain, temp_state)
+    )
+    blk = blk.copy(header = blk.header.copy(
+        uncles_hash = sha3(rlp.encode(blk.uncles))
+    ))
     # Call the initialize state transition function
     cs.initialize(temp_state, blk)
     # Add transactions
-    add_transactions(temp_state, blk, txqueue, min_gasprice)
+    blk = add_transactions(temp_state, blk, txqueue, min_gasprice)
     # Call the finalize state transition function
     cs.finalize(temp_state, blk)
     # Set state root, receipt root, etc
-    set_execution_results(temp_state, blk)
+    blk = set_execution_results(temp_state, blk)
     log.debug('Created head candidate successfully')
     return blk, temp_state

ethereum/pow/ethpow.py

@@ -106,11 +106,11 @@ def mine(self, rounds=1000, start_nonce=0):
         blk = self.block
         bin_nonce, mixhash = mine(blk.number, blk.difficulty, blk.mining_hash,
                                   start_nonce=start_nonce, rounds=rounds)
-        if bin_nonce:
-            blk.header.mixhash = mixhash
-            blk.header.nonce = bin_nonce
-            # assert blk.check_pow()
-            return blk
+        if bin_nonce is not None:
+            return bin_nonce, mixhash
+
+        return None, None
+
 
 
 def mine(block_number, difficulty, mining_hash, start_nonce=0, rounds=1000):

ethereum/slogging.py

@@ -266,7 +266,7 @@ def _stringify_dict_keys(input_):
         res = {}
         for k, v in input_.items():
             v = _stringify_dict_keys(v)
-            if not isinstance(k, (int, long, bool, None.__class__)):
+            if not isinstance(k, (int, bool, None.__class__)):
                 k = str(k)
             res[k] = v
     elif isinstance(input_, (list, tuple)):