Merge pull request #253 from BlockchainSociety/develop

update strings formatting to be python3 friendly

Author: heikoheiko

ethereum/blocks.py

@@ -339,10 +339,10 @@ def check_pow(self, nonce=None, debugmode=False):
         mining_output = hashimoto_light(current_full_size, cache, header_hash, nonce)
         diff = self.difficulty
         if debugmode:
-            print 'Mining hash: %s' % encode_hex(header_hash)
-            print 'Seed: %s' % encode_hex(seed)
-            print 'Mixhash: %s' % encode_hex(mining_output['mix digest'])
-            print 'Result: %s' % encode_hex(mining_output['result'])
+            print('Mining hash: {}'.format(encode_hex(header_hash)))
+            print('Seed: {}'.format(encode_hex(seed)))
+            print('Mixhash: {}'.format(encode_hex(mining_output['mix digest'])))
+            print('Result: {}'.format(encode_hex(mining_output['result'])))
         if mining_output['mix digest'] != self.mixhash:
             return False
         return utils.big_endian_to_int(mining_output['result']) <= 2**256 / (diff or 1)
@@ -492,7 +492,7 @@ def __init__(self, header, transaction_list=[], uncles=[], db=None,
         state_unknown = (header.prevhash != GENESIS_PREVHASH and
                          header.state_root != trie.BLANK_ROOT and
                          (len(header.state_root) != 32 or
-                          'validated:' + self.hash not in db) and
+                          b'validated:' + self.hash not in db) and
                          not making)
         if state_unknown:
             assert transaction_list is not None
@@ -566,7 +566,7 @@ def must_le(what, a, b):
                              "database" % self)
         if (not self.is_genesis() and self.nonce and not self.header.check_pow()):
             raise ValueError("PoW check failed")
-        self.db.put('validated:' + self.hash, '1')
+        self.db.put(b'validated:' + self.hash, '1')
 
     @classmethod
     def init_from_header(cls, header_rlp, db):

ethereum/vm.py

@@ -3,6 +3,8 @@
 verify_stack_after_op = False
 
 #  ######################################
+import sys
+
 from ethereum import utils
 from ethereum.abi import is_numeric
 import copy
@@ -83,16 +85,29 @@ def __init__(self, **kwargs):
 # Preprocesses code, and determines which locations are in the middle
 # of pushdata and thus invalid
 def preprocess_code(code):
-    assert isinstance(code, str)
+    assert isinstance(code, (str, bytes))
+
+    # python3 does not require ord() on byte strings
+    if sys.version_info.major == 2:
+        if isinstance(code, bytes):
+            code = str(code)
+
+        def t_ord(char):
+            return ord(char)
+    else:
+        assert isinstance(code, bytes)
+        def t_ord(char):
+            return char
+
     i = 0
     ops = []
     while i < len(code):
-        o = copy.copy(opcodes.opcodes.get(ord(code[i]), ['INVALID', 0, 0, 0]) + [ord(code[i]), 0])
+        o = copy.copy(opcodes.opcodes.get(t_ord(code[i]), ['INVALID', 0, 0, 0]) + [t_ord(code[i]), 0])
         ops.append(o)
         if o[0][:4] == 'PUSH':
             for j in range(int(o[0][4:])):
                 i += 1
-                byte = ord(code[i]) if i < len(code) else 0
+                byte = t_ord(code[i]) if i < len(code) else 0
                 o[-1] = (o[-1] << 8) + byte
                 if i < len(code):
                     ops.append(['INVALID', 0, 0, 0, byte, 0])