use byte strings

Author: pipermerriam

ethereum/abi.py

@@ -344,7 +344,7 @@ def encode_single(typ, arg):
             return zpad(arg, 32)
         elif len(arg) == 40:
             return zpad(decode_hex(arg), 32)
-        elif len(arg) == 42 and arg[:2] == '0x':
+        elif len(arg) == 42 and arg[:2] in {'0x', b'0x'}:
             return zpad(decode_hex(arg[2:]), 32)
         else:
             raise EncodingError("Could not parse address: %r" % arg)

ethereum/blocks.py

@@ -794,7 +794,7 @@ def _delta_item(self, address, param, value):
     def mk_transaction_receipt(self, tx):
         """Create a receipt for a transaction."""
         if self.number >= self.config["METROPOLIS_FORK_BLKNUM"]:
-            return Receipt('\x00' * 32, self.gas_used, self.logs)
+            return Receipt(b'\x00' * 32, self.gas_used, self.logs)
         else:
             return Receipt(self.state_root, self.gas_used, self.logs)
 
@@ -984,7 +984,7 @@ def get_storage_bytes(self, address, index):
         if storage:
             return rlp.decode(storage)
         else:
-            return ''
+            return b''
 
     def get_storage_data(self, address, index):
         bytez = self.get_storage_bytes(address, index)

ethereum/utils.py

@@ -117,7 +117,7 @@ def sha3(seed):
     sha3_count[0] += 1
     return sha3_256(to_string(seed))
 
-assert encode_hex(sha3('')) == b'c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470'
+assert encode_hex(sha3(b'')) == b'c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470'
 
 
 def privtoaddr(x, extended=False):
@@ -145,9 +145,9 @@ def check_and_strip_checksum(x):
 def normalize_address(x, allow_blank=False):
     if is_numeric(x):
         return int_to_addr(x)
-    if allow_blank and (x == '' or x == b''):
+    if allow_blank and x in {'', b''}:
         return b''
-    if len(x) in (42, 50) and x[:2] == '0x':
+    if len(x) in (42, 50) and x[:2] in {'0x', b'0x'}:
         x = x[2:]
     if len(x) in (40, 48):
         x = decode_hex(x)
@@ -171,7 +171,7 @@ def zunpad(x):
 
 
 def int_to_addr(x):
-    o = [''] * 20
+    o = [b''] * 20
     for i in range(20):
         o[19 - i] = ascii_chr(x & 0xff)
         x >>= 8

ethereum/vm.py

@@ -482,7 +482,7 @@ def vm_execute(ext, msg, code):
                 if compustate.gas < gas_payment:
                     return vm_exception('OUT OF GAS')
                 compustate.gas -= gas_payment
-                data = ''.join(map(chr, mem[mstart: mstart + msize]))
+                data = b''.join(map(chr, mem[mstart: mstart + msize]))
                 ext.set_storage_data(msg.to, data)
                 ext.add_refund(refund)
             elif op == 'SSIZE':