tfix get_private_key_from_xpubkey - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit fb75e2e53d516e96840abc83dbba85a7807ebb8e
DIR parent 24b6ae775775d16579815eeabd5797355d1b6896
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 4 Nov 2014 10:50:28 +0100
fix get_private_key_from_xpubkey
Diffstat:
M lib/wallet.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -780,7 +780,6 @@ class Abstract_Wallet(object):
x_pubkeys = tx.inputs_to_sign()
for x in x_pubkeys:
sec = self.get_private_key_from_xpubkey(x, password)
- print "sec", sec
if sec:
keypairs[ x ] = sec
if keypairs:
t@@ -1020,10 +1019,12 @@ class Abstract_Wallet(object):
return self.get_private_key(addr, password)[0]
elif x_pubkey[0:2] == 'ff':
xpub, sequence = BIP32_Account.parse_xpubkey(x_pubkey)
- for k, account in self.accounts.items():
- if xpub in account.get_master_pubkeys():
- pk = account.get_private_key(sequence, self, password)
- return pk[0]
+ for k, v in self.master_public_keys.items():
+ if v == xpub:
+ xprv = self.get_master_private_key(k, password)
+ if xprv:
+ _, _, _, c, k = deserialize_xkey(xprv)
+ return bip32_private_key(sequence, k, c)
elif x_pubkey[0:2] == 'fe':
xpub, sequence = OldAccount.parse_xpubkey(x_pubkey)
for k, account in self.accounts.items():