electrum

commit 17cfc03540a217c1699cf2e1430b5ee409b58ead
parent 7daa8ebfdd923950841627b79a73507dd8e82322
Author: ThomasV <thomasv@electrum.org>
Date:   Sun,  5 Feb 2017 11:30:32 +0100

use serialize_xpub/xprv

Diffstat:
M
lib/bitcoin.py
 | 
14
++++++--------

1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/lib/bitcoin.py b/lib/bitcoin.py
@@ -745,8 +745,8 @@ def xprv_header(xtype):
 def xpub_header(xtype):
     return ("%08x"%(XPUB_HEADER + xtype)).decode('hex')
 
-def serialize_xprv(xtype, c, k):
-    xprv = xprv_header(xtype) + chr(0)*9 + c + chr(0) + k
+def serialize_xprv(xtype, c, k, depth=0, fingerprint=chr(0)*4, child_number=chr(0)*4):
+    xprv = xprv_header(xtype) + chr(depth) + fingerprint + child_number + c + chr(0) + k
     return EncodeBase58Check(xprv)
 
 def serialize_xpub(xtype, c, cK, depth=0, fingerprint=chr(0)*4, child_number=chr(0)*4):
@@ -822,14 +822,13 @@ def bip32_private_derivation(xprv, branch, sequence):
         parent_k = k
         k, c = CKD_priv(k, c, i)
         depth += 1
-
     _, parent_cK = get_pubkeys_from_secret(parent_k)
     fingerprint = hash_160(parent_cK)[0:4]
     child_number = ("%08X"%i).decode('hex')
     K, cK = get_pubkeys_from_secret(k)
-    xprv = xprv_header(xtype) + chr(depth) + fingerprint + child_number + c + chr(0) + k
-    xpub = xpub_header(xtype) + chr(depth) + fingerprint + child_number + c + cK
-    return EncodeBase58Check(xprv), EncodeBase58Check(xpub)
+    xpub = serialize_xpub(xtype, c, cK, depth, fingerprint, child_number)
+    xprv = serialize_xprv(xtype, c, k, depth, fingerprint, child_number)
+    return xprv, xpub
 
 
 def bip32_public_derivation(xpub, branch, sequence):
@@ -844,8 +843,7 @@ def bip32_public_derivation(xpub, branch, sequence):
         depth += 1
     fingerprint = hash_160(parent_cK)[0:4]
     child_number = ("%08X"%i).decode('hex')
-    xpub = xpub_header(xtype) + chr(depth) + fingerprint + child_number + c + cK
-    return EncodeBase58Check(xpub)
+    return serialize_xpub(xtype, c, cK, depth, fingerprint, child_number)
 
 
 def bip32_private_key(sequence, k, chain):