AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: set_frozen_state_of_{addresses,coins} to save_db() to disk

Browse Source 
fixes https://github.com/spesmilo/electrum/issues/8389
This commit is contained in:
SomberNight
2023-05-06 13:26:08 +00:00
parent 3674fc5a91
commit 1e55042830
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
electrum/wallet.py
View File

@@ -1860,7 +1860,13 @@ class Abstract_Wallet(ABC, Logger, EventListener):
return False return False
return True return True
def set_frozen_state_of_addresses(self, addrs: Sequence[str], freeze: bool) -> bool: def set_frozen_state_of_addresses(
self,
addrs: Iterable[str],
freeze: bool,
*,
write_to_disk: bool = True,
) -> bool:
"""Set frozen state of the addresses to FREEZE, True or False""" """Set frozen state of the addresses to FREEZE, True or False"""
if all(self.is_mine(addr) for addr in addrs): if all(self.is_mine(addr) for addr in addrs):
with self._freeze_lock: with self._freeze_lock:
@@ -1870,10 +1876,18 @@ class Abstract_Wallet(ABC, Logger, EventListener):
self._frozen_addresses -= set(addrs) self._frozen_addresses -= set(addrs)
self.db.put('frozen_addresses', list(self._frozen_addresses)) self.db.put('frozen_addresses', list(self._frozen_addresses))
util.trigger_callback('status') util.trigger_callback('status')
if write_to_disk:
self.save_db()
return True return True
return False return False
def set_frozen_state_of_coins(self, utxos: Sequence[str], freeze: bool) -> None: def set_frozen_state_of_coins(
self,
utxos: Iterable[str],
freeze: bool,
*,
write_to_disk: bool = True,
) -> None:
"""Set frozen state of the utxos to FREEZE, True or False""" """Set frozen state of the utxos to FREEZE, True or False"""
# basic sanity check that input is not garbage: (see if raises) # basic sanity check that input is not garbage: (see if raises)
[TxOutpoint.from_str(utxo) for utxo in utxos] [TxOutpoint.from_str(utxo) for utxo in utxos]
@@ -1881,6 +1895,8 @@ class Abstract_Wallet(ABC, Logger, EventListener):
for utxo in utxos: for utxo in utxos:
self._frozen_coins[utxo] = bool(freeze) self._frozen_coins[utxo] = bool(freeze)
util.trigger_callback('status') util.trigger_callback('status')
if write_to_disk:
self.save_db()
def is_address_reserved(self, addr: str) -> bool: def is_address_reserved(self, addr: str) -> bool:
# note: atm 'reserved' status is only taken into consideration for 'change addresses' # note: atm 'reserved' status is only taken into consideration for 'change addresses'
@@ -3133,7 +3149,7 @@ class Imported_Wallet(Simple_Wallet):
self.set_label(address, None) self.set_label(address, None)
if req:= self.get_request_by_addr(address): if req:= self.get_request_by_addr(address):
self.delete_request(req.get_id()) self.delete_request(req.get_id())
self.set_frozen_state_of_addresses([address], False) self.set_frozen_state_of_addresses([address], False, write_to_disk=False)
pubkey = self.get_public_key(address) pubkey = self.get_public_key(address)
self.db.remove_imported_address(address) self.db.remove_imported_address(address)
if pubkey: if pubkey: