BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

load imported_keys outside of load_accounts

This commit is contained in:
ThomasV 2014-07-14 02:15:29 +02:00
parent a471859a3a
commit 3c7346ee9c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/wallet.py
View File

@ -153,6 +153,9 @@ class Abstract_Wallet(object):
# This attribute is set when wallet.start_threads is called. # This attribute is set when wallet.start_threads is called.
self.synchronizer = None self.synchronizer = None
# imported_keys is deprecated. The GUI should call convert_imported_keys
self.imported_keys = self.storage.get('imported_keys',{})
self.load_accounts() self.load_accounts()
self.transactions = {} self.transactions = {}
@ -218,7 +221,6 @@ class Abstract_Wallet(object):
def load_accounts(self): def load_accounts(self):
self.accounts = {} self.accounts = {}
self.imported_keys = self.storage.get('imported_keys',{})
d = self.storage.get('accounts', {}) d = self.storage.get('accounts', {})
for k, v in d.items(): for k, v in d.items():