LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-31 17:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

storage: remove previously imported fake-addresses

Browse source
This commit is contained in:
SomberNight 2017-11-03 17:46:25 +01:00
parent 04640b952b
commit e5d84e41ec
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/storage.py
View file

@ -407,14 +407,39 @@ class WalletStorage(PrintError):
def convert_version_16(self): def convert_version_16(self):
# fixes issue #3193 for Imported_Wallets with addresses # fixes issue #3193 for Imported_Wallets with addresses
# also, previous versions allowed importing any garbage as an address
# which we now try to remove, see pr #3191
if not self._is_upgrade_method_needed(15, 15): if not self._is_upgrade_method_needed(15, 15):
return return
def remove_address(addr):
def remove_from_dict(dict_name):
d = self.get(dict_name, None)
if d is not None:
d.pop(addr, None)
self.put(dict_name, d)
def remove_from_list(list_name):
lst = self.get(list_name, None)
if lst is not None:
s = set(lst)
s -= {addr}
self.put(list_name, list(s))
# note: we don't remove 'addr' from self.get('addresses')
remove_from_dict('addr_history')
remove_from_dict('labels')
remove_from_dict('payment_requests')
remove_from_list('frozen_addresses')
if self.get('wallet_type') == 'imported': if self.get('wallet_type') == 'imported':
addresses = self.get('addresses') addresses = self.get('addresses')
assert isinstance(addresses, dict) assert isinstance(addresses, dict)
addresses_new = dict() addresses_new = dict()
for address, details in addresses.items(): for address, details in addresses.items():
if not bitcoin.is_address(address):
remove_address(address)
continue
if details is None: if details is None:
addresses_new[address] = {} addresses_new[address] = {}
else: else: