use rlp encode_hex rather than encode('hex')

Author: pipermerriam

ethereum/abi.py

@@ -222,7 +222,7 @@ def listen(self, log, noprint=True):
                          if indexed[i]]
         unindexed_types = [types[i] for i in range(len(types))
                            if not indexed[i]]
-        # print('listen', log.data.encode('hex'), log.topics)
+        # print('listen', encode_hex(log.data), log.topics)
         deserialized_args = decode_abi(unindexed_types, log.data)
         o = {}
         c1, c2 = 0, 0
@@ -501,7 +501,7 @@ def decode_single(typ, data):
         i = (o - 2**(high+low)) if o >= 2**(high+low-1) else o
         return (i * 1.0 / 2**low)
     elif base == 'bool':
-        return bool(int(data.encode('hex'), 16))
+        return bool(int(encode_hex(data), 16))
 
 
 # Decodes multiple arguments using the head/tail mechanism

ethereum/blocks.py

@@ -676,8 +676,8 @@ def validate_uncles(self):
                 return False
             if uncle.prevhash not in eligible_ancestor_hashes:
                 log.error("Uncle does not have a valid ancestor", block=self,
-                          eligible=[x.encode('hex') for x in eligible_ancestor_hashes],
-                          uncle_prevhash=uncle.prevhash.encode('hex'))
+                          eligible=[encode_hex(x) for x in eligible_ancestor_hashes],
+                          uncle_prevhash=encode_hex(uncle.prevhash))
                 return False
             if uncle in ineligible:
                 log.error("Duplicate uncle", block=self,
@@ -1035,7 +1035,7 @@ def commit_state(self):
                 #     except:
                 #         pass
                 #     sys.stderr.write("pre: %r\n" % self.account_to_dict(addr)['storage'])
-                #     sys.stderr.write("pre: %r\n" % self.get_storage(addr).root_hash.encode('hex'))
+                #     sys.stderr.write("pre: %r\n" % encode_hex(self.get_storage(addr).root_hash))
                 #     sys.stderr.write("changed: %s %s %s\n" % (encode_hex(addr), encode_hex(enckey), encode_hex(val)))
                 if v:
                     t.update(enckey, val)

ethereum/chain.py

@@ -121,7 +121,7 @@ def __init__(self, env, genesis=None, new_head_cb=None, coinbase='\x00' * 20):
             self._initialize_blockchain(genesis)
         log.debug('chain @', head_hash=self.head)
         self.genesis = self.get(self.index.get_block_by_number(0))
-        log.debug('got genesis', nonce=self.genesis.nonce.encode('hex'),
+        log.debug('got genesis', nonce=encode_hex(self.genesis.nonce),
                   difficulty=self.genesis.difficulty)
         self._update_head_candidate()
 

ethereum/keys.py

@@ -2,6 +2,8 @@
 import pbkdf2
 import sys
 
+from rlp.utils import encode_hex, decode_hex
+
 try:
     scrypt = __import__('scrypt')
 except ImportError:
@@ -225,16 +227,6 @@ def zpad(x, l):
 
 if sys.version_info.major == 2:
 
-    def decode_hex(s):
-        if not isinstance(s, (str, unicode)):
-            raise TypeError('Value must be an instance of str or unicode')
-        return s.decode('hex')
-
-    def encode_hex(s):
-        if not isinstance(s, (str, unicode)):
-            raise TypeError('Value must be an instance of str or unicode')
-        return s.encode('hex')
-
     def int_to_big_endian(value):
         cs = []
         while value > 0:
@@ -254,20 +246,6 @@ def big_endian_to_int(value):
 
 if sys.version_info.major == 3:
 
-    def decode_hex(s):
-        if isinstance(s, str):
-            return bytes.fromhex(s)
-        if isinstance(s, bytes):
-            return binascii.unhexlify(s)
-        raise TypeError('Value must be an instance of str or bytes')
-
-    def encode_hex(b):
-        if isinstance(b, str):
-            b = bytes(b, 'utf-8')
-        if isinstance(b, bytes):
-            return binascii.hexlify(b)
-        raise TypeError('Value must be an instance of str or bytes')
-
     def int_to_big_endian(value):
         byte_length = ceil(value.bit_length() / 8)
         return (value).to_bytes(byte_length, byteorder='big')

ethereum/processblock.py

@@ -256,10 +256,10 @@ def _apply_msg(ext, msg, code):
                       gas=msg.gas, value=msg.value,
                       data=encode_hex(msg.data.extract_all()))
         if log_state.is_active('trace'):
-            log_state.trace('MSG PRE STATE SENDER', account=msg.sender.encode('hex'),
+            log_state.trace('MSG PRE STATE SENDER', account=encode_hex(msg.sender),
                             bal=ext.get_balance(msg.sender),
                             state=ext.log_storage(msg.sender))
-            log_state.trace('MSG PRE STATE RECIPIENT', account=msg.to.encode('hex'),
+            log_state.trace('MSG PRE STATE RECIPIENT', account=encode_hex(msg.to),
                             bal=ext.get_balance(msg.to),
                             state=ext.log_storage(msg.to))
         # log_state.trace('CODE', code=code)
@@ -281,10 +281,10 @@ def _apply_msg(ext, msg, code):
         log_msg.debug('MSG APPLIED', gas_remained=gas,
                       sender=encode_hex(msg.sender), to=encode_hex(msg.to), data=dat)
         if log_state.is_active('trace'):
-            log_state.trace('MSG POST STATE SENDER', account=msg.sender.encode('hex'),
+            log_state.trace('MSG POST STATE SENDER', account=encode_hex(msg.sender),
                             bal=ext.get_balance(msg.sender),
                             state=ext.log_storage(msg.sender))
-            log_state.trace('MSG POST STATE RECIPIENT', account=msg.to.encode('hex'),
+            log_state.trace('MSG POST STATE RECIPIENT', account=encode_hex(msg.to),
                             bal=ext.get_balance(msg.to),
                             state=ext.log_storage(msg.to))
 

ethereum/pruning_trie.py

@@ -270,7 +270,7 @@ def replace_root_hash(self, old_node, new_node):
         self._delete_node_storage(old_node, is_root=True)
         self._encode_node(new_node, is_root=True)
         self.root_node = new_node
-        # sys.stderr.write('nrh: %s\n' % self.root_hash.encode('hex'))
+        # sys.stderr.write('nrh: %s\n' % encode_hex(self.root_hash))
 
     @root_hash.setter
     def root_hash(self, value):

ethereum/tests/profile_vm.py

@@ -6,6 +6,7 @@
 import pstats
 import StringIO
 import time
+from rlp.utils import encode_hex
 from ethereum.utils import sha3
 from ethereum.slogging import get_logger
 logger = get_logger()
@@ -34,7 +35,7 @@ def run(profiler=None):
                 seen += str(testname)
                 i += 1
         print('ran %d tests' % i)
-        print('test key', sha3(seen).encode('hex'))
+        print('test key', encode_hex(sha3(seen)))
 
     if len(sys.argv) == 1:
         pr = cProfile.Profile()

ethereum/tests/test_blocks.py

@@ -95,7 +95,7 @@ def run_block_test(params, config_overrides = {}):
             blockmap[b2.hash] = b2
             env.db.put(b2.hash, rlp.encode(b2))
         if b2:
-            print('Block %d with state root %s' % (b2.number, b2.state.root_hash.encode('hex')))
+            print('Block %d with state root %s' % (b2.number, encode_hex(b2.state.root_hash)))
         # blkdict = b.to_dict(False, True, False, True)
         # assert blk["blockHeader"] == \
         #     translate_keys(blkdict["header"], translator_list, lambda y, x: x, [])

ethereum/tests/test_solidity.py

@@ -3,6 +3,8 @@
 
 import pytest
 
+from rlp.utils import encode_hex
+
 from ethereum import tester
 from ethereum import utils
 from ethereum import _solidity
@@ -24,7 +26,7 @@ def test_library_from_file():
     )
 
     libraries = {
-        'SevenLibrary': library.address.encode('hex'),
+        'SevenLibrary': encode_hex(library.address),
     }
     contract = state.abi_contract(
         None,
@@ -56,7 +58,7 @@ def test_library_from_code():
     )
 
     libraries = {
-        'SevenLibrary': library.address.encode('hex'),
+        'SevenLibrary': encode_hex(library.address),
     }
     contract = state.abi_contract(
         contract_code,