electrum

commit 3c7346ee9c4cee3174fd5db03f97cd28fe1eb961
parent a471859a3a48f32444f4d64cd7f9365421212fa6
Author: ThomasV <thomasv@gitorious>
Date:   Mon, 14 Jul 2014 02:15:29 +0200

load imported_keys outside of load_accounts

Diffstat:
M
lib/wallet.py
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -153,6 +153,9 @@ class Abstract_Wallet(object):
         # This attribute is set when wallet.start_threads is called.
         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.transactions = {}
@@ -218,7 +221,6 @@ class Abstract_Wallet(object):
 
     def load_accounts(self):
         self.accounts = {}
-        self.imported_keys = self.storage.get('imported_keys',{})
 
         d = self.storage.get('accounts', {})
         for k, v in d.items():