tre-enable seed tests. get_public_keys method - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 38a59c0b37448bf6fdc384d4a7f52d63fcd15216
DIR parent 02c3bc131e5427aa06edc8ac39a774a391b67a5d
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 5 Apr 2014 10:08:54 +0200
re-enable seed tests. get_public_keys method
Diffstat:
M lib/wallet.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -608,6 +608,11 @@ class NewWallet:
return out
+ def get_public_keys(self, address):
+ account_id, sequence = self.get_address_index(address)
+ return self.accounts[account_id].get_pubkeys(sequence)
+
+
def add_keypairs_from_wallet(self, tx, keypairs, password):
for txin in tx.inputs:
address = txin['address']
t@@ -1794,12 +1799,12 @@ class Wallet(object):
except Exception:
is_hex = False
- if is_hex or (uses_electrum_words and len(words) != 13):
+ if is_hex or (uses_electrum_words and len(words) == 12):
#print "old style wallet", len(words), words
w = OldWallet(storage)
w.init_seed(seed) #hex
else:
- #assert is_seed(seed)
+ assert is_seed(seed)
w = NewWallet(storage)
w.init_seed(seed)