add b prefix to byte strings

Author: pipermerriam

ethereum/ethpow.py

@@ -69,9 +69,9 @@ def check_pow(block_number, header_hash, mixhash, nonce, difficulty):
     # Grab current cache
     cache = get_cache(block_number)
     mining_output = hashimoto_light(block_number, cache, header_hash, nonce)
-    if mining_output['mix digest'] != mixhash:
+    if mining_output[b'mix digest'] != mixhash:
         return False
-    return utils.big_endian_to_int(mining_output['result']) <= 2**256 / (difficulty or 1)
+    return utils.big_endian_to_int(mining_output[b'result']) <= 2**256 / (difficulty or 1)
 
 
 class Miner():

ethereum/tests/test_abi.py

@@ -51,7 +51,7 @@ def test_abi_decode_single_hash():
 
 def test_abi_decode_single_bytes():
     typ = ['bytes', '8', []]
-    assert (b'\x01\x02' + b'\x00'*6) == abi.decode_single(typ, abi.encode_single(typ, '\x01\x02'))
+    assert (b'\x01\x02' + b'\x00'*6) == abi.decode_single(typ, abi.encode_single(typ, b'\x01\x02'))
 
     typ = ['bytes', '', []]
     assert b'\x01\x02' == abi.decode_single(typ, abi.encode_single(typ, b'\x01\x02'))

ethereum/transactions.py

@@ -96,7 +96,7 @@ def sender(self):
                 except Exception:
                     raise InvalidTransaction("Invalid signature values (x^3+7 is non-residue)")
 
-                if pub[1:] == "\x00" * 32:
+                if pub[1:] == b"\x00" * 32:
                     raise InvalidTransaction("Invalid signature (zero privkey cannot sign)")
                 pub = encode_pubkey(pub, 'bin')
                 self._sender = utils.sha3(pub[1:])[-20:]

ethereum/utils.py

@@ -137,7 +137,7 @@ def check_and_strip_checksum(x):
 
 
 def normalize_address(x, allow_blank=False):
-    if allow_blank and x == '':
+    if allow_blank and (x == '' or x == b''):
         return ''
     if len(x) in (42, 50) and x[:2] == '0x':
         x = x[2:]