tfix #699 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit adb53e4c41e5049a68f0d3050d82825198f6a111
DIR parent 3ba71627f4b27048c2c5e33eda017edeec604855
HTML Author: ThomasV <thomasv@gitorious>
Date: Wed, 21 May 2014 22:04:10 +0200
fix #699
Diffstat:
M lib/wallet.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1595,7 +1595,6 @@ class OldWallet(Deterministic_Wallet):
def add_keypairs_from_KeyID(self, tx, keypairs, password):
# first check the provided password
- seed = self.get_seed(password)
for txin in tx.inputs:
keyid = txin.get('KeyID')
if keyid:
t@@ -1608,9 +1607,10 @@ class OldWallet(Deterministic_Wallet):
account = self.accounts[0]
addr = account.get_address(for_change, num)
txin['address'] = addr # fixme: side effect
- pk = account.get_private_key(seed, (for_change, num))
- pubkey = public_key_from_private_key(pk)
- keypairs[pubkey] = pk
+ pk = account.get_private_key((for_change, num), self, password)
+ for sec in pk:
+ pubkey = public_key_from_private_key(sec)
+ keypairs[pubkey] = sec