AaronFiore/electrum
1
0
Fork 0
Code Activity

simplify storage: we don't store pubkeys anymore

Browse Source
This commit is contained in:
ThomasV
2017-03-06 15:54:31 +01:00
parent f92807f019
commit acd70f55c3
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/storage.py
View File

@@ -229,18 +229,8 @@ class WalletStorage(PrintError):
self.convert_imported() self.convert_imported()
self.convert_wallet_type() self.convert_wallet_type()
self.convert_account() self.convert_account()
self.convert_pubkeys()
self.write() 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): def convert_wallet_type(self):
wallet_type = self.get('wallet_type') wallet_type = self.get('wallet_type')
if wallet_type == 'btchip': wallet_type = 'ledger' if wallet_type == 'btchip': wallet_type = 'ledger'
@@ -354,11 +344,8 @@ class WalletStorage(PrintError):
raise BaseException('no addresses or privkeys') raise BaseException('no addresses or privkeys')
def convert_account(self): def convert_account(self):
d = self.get('accounts', {}).get('0', {})
if not d:
return False
self.put('accounts', None) self.put('accounts', None)
self.put('pubkeys', d) self.put('pubkeys', None)
def get_action(self): def get_action(self):
action = run_hook('get_action', self) action = run_hook('get_action', self)