diff --git a/electrum/lnworker.py b/electrum/lnworker.py index 78ef69232..a77da7596 100644 --- a/electrum/lnworker.py +++ b/electrum/lnworker.py @@ -1398,11 +1398,14 @@ class LNBackups(Logger): self.lock = threading.RLock() self.wallet = wallet self.db = wallet.db - self.sweep_address = wallet.get_receiving_address() self.channel_backups = {} for channel_id, cb in self.db.get_dict("channel_backups").items(): self.channel_backups[bfh(channel_id)] = ChannelBackup(cb, sweep_address=self.sweep_address, lnworker=self) + @property + def sweep_address(self) -> str: + return self.wallet.get_receiving_address() + def channel_state_changed(self, chan): util.trigger_callback('channel', chan) diff --git a/electrum/wallet.py b/electrum/wallet.py index 5a0163fbc..725272fe0 100644 --- a/electrum/wallet.py +++ b/electrum/wallet.py @@ -1513,11 +1513,11 @@ class Abstract_Wallet(AddressSynchronizer, ABC): return addrs[0] @check_returned_address - def get_receiving_address(self): + def get_receiving_address(self) -> str: # always return an address domain = self.get_receiving_addresses() if not domain: - return + raise Exception("no receiving addresses in wallet?!") choice = domain[0] for addr in domain: if not self.is_used(addr): @@ -2030,6 +2030,8 @@ class Imported_Wallet(Simple_Wallet): def delete_address(self, address: str) -> None: if not self.db.has_imported_address(address): return + if len(self.get_addresses()) <= 1: + raise Exception("cannot delete last remaining address from wallet") transactions_to_remove = set() # only referred to by this address transactions_new = set() # txs that are not only referred to by address with self.lock: