A few py3 compatibility and test network changes

Author: vub

ethereum/abi.py

@@ -478,7 +478,7 @@ def encode_abi(types, args):
 def decode_single(typ, data):
     base, sub, _ = typ
     if base == 'address':
-        return encode_hex(data[12:])
+        return '0x' + encode_hex(data[12:])
     elif base == 'hash':
         return data[32-int(sub):]
     elif base == 'string' or base == 'bytes':
@@ -553,7 +553,7 @@ def dec(typ, arg):
     # Dynamic-sized strings are encoded as <len(str)> + <str>
     if base in ('string', 'bytes') and not sub:
         L = big_endian_to_int(arg[:32])
-        assert len(arg[32:]) == ceil32(L), "Wrong data size for string/bytes object"
+        assert len(arg[32:]) == ceil32(L), "Wrong data size for string/bytes object: expected %d actual %d" % (ceil32(L), len(arg[32:]))
         return arg[32:][:L]
     # Dynamic-sized arrays
     elif sz is None:

ethereum/config.py

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

ethereum/state.py

@@ -315,6 +315,19 @@ def revert(self, snapshot):
                 if not premod:
                     del self.modified[addr]
 
+    # Prints the state for a single account
+    def account_to_dict(self, address):
+        address = normalize_address(address)
+        acct = self._get_account_unsafe(address)
+        acct_trie = SecureTrie(Trie(self.db))
+        acct_trie.root_hash = acct.storage
+        odict = acct_trie.to_dict()
+        if address in self.cache:
+            for k, v in self.cache[address].items():
+                if k not in ACCOUNT_SPECIAL_PARAMS:
+                    odict[k] = v 
+        return {'0x'+encode_hex(key): '0x'+encode_hex(val) for key, val in odict.items()}
+
     # Converts the state tree to a dictionary
     def to_dict(self):
         state_dump = {}
@@ -324,7 +337,7 @@ def to_dict(self):
             acct_trie = SecureTrie(Trie(self.db))
             acct_trie.root_hash = acct.storage
             for key, v in acct_trie.to_dict().items():
-                storage_dump[encode_hex(key.lstrip('\x00') or '\x00')] = encode_hex(rlp.decode(v))
+                storage_dump['0x'+encode_hex(key.lstrip('\x00') or '\x00')] = '0x'+encode_hex(rlp.decode(v))
             acct_dump = {"storage": storage_dump}
             for c in ACCOUNT_OUTPUTTABLE_PARAMS:
                 acct_dump[c] = snapshot_form(getattr(acct, c))
@@ -341,7 +354,7 @@ def to_dict(self):
                     acct_dump[key] = snapshot_form(val)
                 else:
                     if val:
-                        acct_dump["storage"][encode_hex(key)] = encode_hex(val)
+                        acct_dump["storage"]['0x'+encode_hex(key)] = '0x'+encode_hex(val)
                     elif encode_hex(key) in acct_dump["storage"]:
                         del acct_dump["storage"][val]
         return state_dump

ethereum/state_transition.py

@@ -409,7 +409,7 @@ def __init__(self, state, tx):
         self.get_storage_data = state.get_storage_data
         self.get_storage_bytes = state.get_storage_bytes
         self.set_storage_bytes = state.set_storage_bytes
-        self.log_storage = lambda x: 'storage logging stub'
+        self.log_storage = lambda x: state.account_to_dict(x)
         self.add_suicide = lambda x: state.add_to_list('suicides', x)
         self.add_refund = lambda x: \
             state.set_param('refunds', state.refunds + x)

ethereum/transactions.py

@@ -74,7 +74,7 @@ def sender(self):
         if not self._sender:
             # Determine sender
             if self.v:
-                if self.r >= N or self.s >= N or self.v not in (27, 28, 37, 38) \
+                if self.r >= N or self.s >= N or self.v not in (27, 28, 37, 38, 41, 42) \
                 or self.r == 0 or self.s == 0:
                     raise InvalidTransaction("Invalid signature values!")
                 log.debug('reco< 27 or self.v > 28 \vering sender')
@@ -86,6 +86,10 @@ def sender(self):
                     rlpdata = rlp.encode(rlp.infer_sedes(self).serialize(self)[:-3] + ['\x01', '', ''])
                     rawhash = utils.sha3(rlpdata)
                     v = self.v - 10
+                elif self.v in (41, 42):
+                    rlpdata = rlp.encode(rlp.infer_sedes(self).serialize(self)[:-3] + ['\x03', '', ''])
+                    rawhash = utils.sha3(rlpdata)
+                    v = self.v - 14
                 pub = ecrecover_to_pub(rawhash, v, self.r, self.s)
                 if pub == b"\x00" * 64:
                     raise InvalidTransaction("Invalid signature (zero privkey cannot sign)")
@@ -99,20 +103,27 @@ def sender(self):
     def sender(self, value):
         self._sender = value
 
-    def sign(self, key):
+    def sign(self, key, network_id=None):
         """Sign this transaction with a private key.
 
         A potentially already existing signature would be overridden.
         """
         if key in (0, '', b'\x00' * 32, '0' * 64):
             raise InvalidTransaction("Zero privkey cannot sign")
-        rawhash = utils.sha3(rlp.encode(self, UnsignedTransaction))
+        if network_id is None:
+            rawhash = utils.sha3(rlp.encode(self, UnsignedTransaction))
+        else:
+            assert 1 <= network_id < 2**63 - 18
+            rlpdata = rlp.encode(rlp.infer_sedes(self).serialize(self)[:-3] + [big_endian_to_int(network_id), '', ''])
+            rawhash = utils.sha3(rlpdata)
 
         if len(key) == 64:
             # we need a binary key
             key = encode_privkey(key, 'bin')
 
         self.v, self.r, self.s = ecsign(rawhash, key)
+        if network_id is not None:
+            self.v += 8 + network_id * 2
 
         self.sender = utils.privtoaddr(key)
         return self

ethereum/utils.py

@@ -76,7 +76,7 @@ def ecrecover_to_pub(rawhash, v, r, s):
         # Legendre symbol check; the secp256k1 library does not seem to do this
         pk = secp256k1.PublicKey(flags=secp256k1.ALL_FLAGS)
         xc = r * r * r + 7
-        assert pow(xc, (SECP256K1P - 1) / 2, SECP256K1P) == 1
+        assert pow(xc, (SECP256K1P - 1) // 2, SECP256K1P) == 1
         try:
             pk.public_key = pk.ecdsa_recover(
                 rawhash,

ethereum/vm.py

@@ -231,7 +231,7 @@ def vm_execute(ext, msg, code):
                                   in compustate.memory])
                 else:
                     trace_data['sha3memory'] = \
-                        encode_hex(utils.sha3(''.join([ascii_chr(x) for
+                        encode_hex(utils.sha3(b''.join([ascii_chr(x) for
                                               x in compustate.memory])))
             if _prevop in ('SSTORE', 'SLOAD') or steps == 0:
                 trace_data['storage'] = ext.log_storage(msg.to)

fixtures

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.6
+current_version = 1.3.7
 commit = True
 tag = True
 

setup.cfg

@@ -21,7 +21,7 @@
 
 # *IMPORTANT*: Don't manually change the version here. Use the 'bumpversion' utility.
 # see: https://github.com/ethereum/pyethapp/wiki/Development:-Versions-and-Releases
-version = '1.3.6'
+version = '1.3.7'
 
 setup(
     name="ethereum",