From: ThomasV <thomasv@gitorious>
Date: Mon, 14 Jul 2014 00:15:29 +0000 (+0200)
Subject: load imported_keys outside of load_accounts
X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=commitdiff_plain;h=3c7346ee9c4cee3174fd5db03f97cd28fe1eb961

load imported_keys outside of load_accounts
---

diff --git a/lib/wallet.py b/lib/wallet.py
index 261f9f1..0b552cc 100644
--- 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():