AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #9996 from spesmilo/lnwatcher_fix_9987

Browse Source 
lnwatcher: add 'subscribe' parameter to add_callback
This commit is contained in:
ThomasV
2025-07-09 11:02:26 +02:00
committed by GitHub
parent f5773fdf1f 102132fa43
commit 487053a8a4
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/lnwatcher.py
View File

@@ -46,8 +46,9 @@ class LNWatcher(Logger, EventListener):
def remove_callback(self, address): def remove_callback(self, address):
self.callbacks.pop(address, None) self.callbacks.pop(address, None)
def add_callback(self, address, callback): def add_callback(self, address, callback, *, subscribe=True):
self.adb.add_address(address) if subscribe:
self.adb.add_address(address)
self.callbacks[address] = callback self.callbacks[address] = callback
async def trigger_callbacks(self, *, requires_synchronizer=True): async def trigger_callbacks(self, *, requires_synchronizer=True):
@@ -86,12 +87,7 @@ class LNWatcher(Logger, EventListener):
outpoint = chan.funding_outpoint.to_str() outpoint = chan.funding_outpoint.to_str()
address = chan.get_funding_address() address = chan.get_funding_address()
callback = lambda: self.check_onchain_situation(address, outpoint) callback = lambda: self.check_onchain_situation(address, outpoint)
if chan.need_to_subscribe(): self.add_callback(address, callback, subscribe=chan.need_to_subscribe())
self.add_callback(address, callback)
def unwatch_channel(self, address: str, funding_outpoint: str) -> None:
self.logger.info(f'unwatching {funding_outpoint}')
self.remove_callback(address)
@ignore_exceptions @ignore_exceptions
@log_exceptions @log_exceptions
@@ -121,8 +117,6 @@ class LNWatcher(Logger, EventListener):
closing_txid=closing_txid, closing_txid=closing_txid,
closing_height=closing_height, closing_height=closing_height,
keep_watching=keep_watching) keep_watching=keep_watching)
if not keep_watching:
self.unwatch_channel(address, funding_outpoint)
def diagnostic_name(self): def diagnostic_name(self):
return f"{self.lnworker.wallet.diagnostic_name()}-LNW" return f"{self.lnworker.wallet.diagnostic_name()}-LNW"