AaronFiore/electrum
1
0
Fork 0
Code Activity

lnwatcher: remove rearly return that breaks accounting_addresses

Browse Source 
This reverts 6ffaa55.
Also, in regtests, add a check that fails if accounting_addresses are broken.
This commit is contained in:
ThomasV
2025-12-04 10:18:30 +01:00
parent 32c677bed0
commit 9b72dc297b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/lnwatcher.py
View File

@@ -157,9 +157,6 @@ class LNWatcher(Logger, EventListener):
chan = self.lnworker.channel_by_txo(funding_outpoint) chan = self.lnworker.channel_by_txo(funding_outpoint)
if not chan: if not chan:
return False return False
if not chan.need_to_subscribe():
return False
self.logger.info(f'sweep_commitment_transaction {funding_outpoint}')
# detect who closed and get information about how to claim outputs # detect who closed and get information about how to claim outputs
is_local_ctx, sweep_info_dict = chan.get_ctx_sweep_info(closing_tx) is_local_ctx, sweep_info_dict = chan.get_ctx_sweep_info(closing_tx)
# note: we need to keep watching *at least* until the closing tx is deeply mined, # note: we need to keep watching *at least* until the closing tx is deeply mined,

6
tests/regtest/regtest.sh
View File

@@ -344,6 +344,12 @@ if [[ $1 == "swapserver_forceclose" ]]; then
wait_until_spent $ctx_id $output_index wait_until_spent $ctx_id $output_index
new_blocks 144 new_blocks 144
wait_for_balance bob 0.999 wait_for_balance bob 0.999
# check that the closing tx is in alice's onchain_history. Since this tx does not
# touch alice's wallet addresses, this test requires accounting_addresses to be set
if [[ ! $($alice onchain_history| jq --arg txid $ctx_id '.[]|select(.txid == $txid)') ]]; then
echo "accounting_address not set"
exit 1
fi
fi fi