Split address generation steps

crypto_dev_signer/encoding.py

@@ -12,10 +12,7 @@ from hexathon import (
 logg = logging.getLogger(__name__)
 
 
-def private_key_to_address(pk, result_format='hex'):
-    pubk = coincurve.PublicKey.from_secret(pk.secret)
-    logg.debug('secret {} '.format(pk.secret.hex()))
-    pubk_bytes = pubk.format(compressed=False)
+def public_key_bytes_to_address(pubk_bytes, result_format='hex'):
     h = sha3.keccak_256()
     logg.debug('public key bytes {}'.format(pubk_bytes.hex()))
     h.update(pubk_bytes[1:])
@@ -27,6 +24,17 @@ def private_key_to_address(pk, result_format='hex'):
     raise ValueError('invalid result format "{}"'.format(result_format))
 
 
+def public_key_to_address(pubk, result_format='hex'):
+    pubk_bytes = pubk.format(compressed=False)
+    return public_key_bytes_to_address(pubk_bytes, result_format='hex')
+
+
+def private_key_to_address(pk, result_format='hex'):
+    pubk = coincurve.PublicKey.from_secret(pk.secret)
+    logg.debug('secret {} '.format(pk.secret.hex()))
+    return public_key_to_address(pubk, result_format)
+
+
 def is_address(address_hex):
     try:
         address_hex = strip_0x(address_hex)    

crypto_dev_signer/runnable/signer.py

@@ -16,7 +16,7 @@ from jsonrpc.exceptions import *
 # local imports
 from crypto_dev_signer.eth.signer import ReferenceSigner
 from crypto_dev_signer.eth.transaction import EIP155Transaction
-from crypto_dev_signer.keystore import ReferenceKeystore
+from crypto_dev_signer.keystore.reference import ReferenceKeystore
 from crypto_dev_signer.error import UnknownAccountError
 
 logging.basicConfig(level=logging.WARNING)