electrum

commit acd70f55c33dce8004f51fa6e77984f522d504ef
parent f92807f019db811f6b8a005da200772caa212840
Author: ThomasV <thomasv@electrum.org>
Date:   Mon,  6 Mar 2017 15:54:31 +0100

simplify storage: we don't store pubkeys anymore

Diffstat:
M
lib/storage.py
 | 
15
+--------------

1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/lib/storage.py b/lib/storage.py
@@ -229,18 +229,8 @@ class WalletStorage(PrintError):
         self.convert_imported()
         self.convert_wallet_type()
         self.convert_account()
-        self.convert_pubkeys()
         self.write()
 
-    def convert_pubkeys(self):
-        # version 12 had a bug in pubkey ordering
-        # it is fixed by forcing pubkey regeneration
-        if self.get_seed_version() != 12:
-            return
-        if self.get('wallet_type') in ['standard', 'imported']:
-            return
-        self.put('pubkeys', {})
-
     def convert_wallet_type(self):
         wallet_type = self.get('wallet_type')
         if wallet_type == 'btchip': wallet_type = 'ledger'
@@ -354,11 +344,8 @@ class WalletStorage(PrintError):
             raise BaseException('no addresses or privkeys')
 
     def convert_account(self):
-        d = self.get('accounts', {}).get('0', {})
-        if not d:
-            return False
         self.put('accounts', None)
-        self.put('pubkeys', d)
+        self.put('pubkeys', None)
 
     def get_action(self):
         action = run_hook('get_action', self)