From 7f67b36a19736ade7d1bc3dd6e142fcf95a9fb20 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Mon, 5 May 2014 12:17:25 +0200 Subject: [PATCH] fix: num_accounts should return only confirmed bip32 accounts --- lib/account.py | 2 +- lib/wallet.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/account.py b/lib/account.py index c4cfa6a1..66e6b730 100644 --- a/lib/account.py +++ b/lib/account.py @@ -71,7 +71,7 @@ class PendingAccount(Account): def dump(self): return {'pending':self.addresses[0]} - def get_name(self): + def get_name(self, k): return _('Pending account') diff --git a/lib/wallet.py b/lib/wallet.py index 557b8e27..ebd24297 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -1391,7 +1391,12 @@ class NewWallet(Deterministic_Wallet): def num_accounts(self): - keys = self.accounts.keys() + keys = [] + for k, v in self.accounts.items(): + if type(v) != BIP32_Account: + continue + keys.append(k) + i = 0 while True: account_id = self.account_id(i)