git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
05fcdce
)
fix load_accounts
author
ThomasV
<thomasv@gitorious>
Tue, 1 Apr 2014 17:10:59 +0000 (19:10 +0200)
committer
ThomasV
<thomasv@gitorious>
Tue, 1 Apr 2014 17:10:59 +0000 (19:10 +0200)
lib/wallet.py
patch
|
blob
|
history
diff --git
a/lib/wallet.py
b/lib/wallet.py
index
b5b5216
..
e358bd1
100644
(file)
--- a/
lib/wallet.py
+++ b/
lib/wallet.py
@@
-449,10
+449,14
@@
class NewWallet:
if k == 0:
v['mpk'] = self.storage.get('master_public_key')
self.accounts[k] = OldAccount(v)
- elif '&' in k:
+ elif v.get('xpub3'):
+ self.accounts[k] = BIP32_Account_2of3(v)
+ elif v.get('xpub2'):
self.accounts[k] = BIP32_Account_2of2(v)
- else:
+ elif v.get('xpub'):
self.accounts[k] = BIP32_Account(v)
+ else:
+ raise
self.pending_accounts = self.storage.get('pending_accounts',{})