tfix load_accounts - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 5c31263848b23dbcf95de12f829fb4195f883cd6
DIR parent 05fcdce018570df7b8815f6141c653e13da677c0
HTML Author: ThomasV <thomasv@gitorious>
Date: Tue, 1 Apr 2014 19:10:59 +0200
fix load_accounts
Diffstat:
M lib/wallet.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -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',{})