talways store next_account a PendinfAccount is created - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit c5b47bd5136debbb561651148e8e76320864c79a
DIR parent 1995c56b7f1b11045eead75e2436b8615332496d
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 14 Nov 2014 13:48:15 +0100
always store next_account a PendinfAccount is created
Diffstat:
M lib/wallet.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1427,7 +1427,10 @@ class BIP32_HD_Wallet(BIP32_Wallet):
self.save_accounts()
def create_pending_account(self, name, password):
- next_id, next_xpub, next_address = self.next_account if self.next_account else self.get_next_account(password)
+ if self.next_account is None:
+ self.next_account = self.get_next_account(password)
+ self.storage.put('next_account', self.next_account)
+ next_id, next_xpub, next_address = self.next_account
self.set_label(next_id, name)
self.accounts[next_id] = PendingAccount({'pending':next_address})
self.save_accounts()
t@@ -1436,12 +1439,9 @@ class BIP32_HD_Wallet(BIP32_Wallet):
# synchronize existing accounts
BIP32_Wallet.synchronize(self)
- if self.next_account is None:
- try:
- self.next_account = self.get_next_account(None)
- self.storage.put('next_account', self.next_account)
- except:
- pass
+ if self.next_account is None and not self.use_encryption:
+ self.next_account = self.get_next_account(None)
+ self.storage.put('next_account', self.next_account)
# check pending account
if self.next_account is not None: