AaronFiore/electrum
1
0
Fork 0
Code Activity

re-enable seed tests. get_public_keys method

Browse Source
This commit is contained in:
ThomasV
2014-04-05 10:08:54 +02:00
parent 02c3bc131e
commit 38a59c0b37
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/wallet.py
View File

@@ -608,6 +608,11 @@ class NewWallet:
return out 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): def add_keypairs_from_wallet(self, tx, keypairs, password):
for txin in tx.inputs: for txin in tx.inputs:
address = txin['address'] address = txin['address']
@@ -1794,12 +1799,12 @@ class Wallet(object):
except Exception: except Exception:
is_hex = False 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 #print "old style wallet", len(words), words
w = OldWallet(storage) w = OldWallet(storage)
w.init_seed(seed) #hex w.init_seed(seed) #hex
else: else:
#assert is_seed(seed) assert is_seed(seed)
w = NewWallet(storage) w = NewWallet(storage)
w.init_seed(seed) w.init_seed(seed)