AaronFiore/electrum
1
0
Fork 0
Code Activity

lnwatcher: do not keep watching channel because of non-existing outputs. fixes #9299

Browse Source
This commit is contained in:
ThomasV
2024-11-14 10:18:07 +01:00
parent 7a7c0f1606
commit fef6fc54c9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/lnwatcher.py
View File

@@ -447,6 +447,10 @@ class LNWalletWatcher(LNWatcher):
keep_watching = False if sweep_info_dict else not self.is_deeply_mined(closing_tx.txid()) keep_watching = False if sweep_info_dict else not self.is_deeply_mined(closing_tx.txid())
# create and broadcast transaction # create and broadcast transaction
for prevout, sweep_info in sweep_info_dict.items(): for prevout, sweep_info in sweep_info_dict.items():
prev_txid, prev_index = prevout.split(':')
if not self.adb.get_transaction(prev_txid):
# do not keep watching if prevout does not exist
continue
name = sweep_info.name + ' ' + chan.get_id_for_log() name = sweep_info.name + ' ' + chan.get_id_for_log()
spender_txid = spenders.get(prevout) spender_txid = spenders.get(prevout)
spender_tx = self.adb.get_transaction(spender_txid) if spender_txid else None spender_tx = self.adb.get_transaction(spender_txid) if spender_txid else None
@@ -461,7 +465,7 @@ class LNWalletWatcher(LNWatcher):
keep_watching = True keep_watching = True
await self.maybe_redeem(spenders, spender_txid+':0', e_htlc_tx, name) await self.maybe_redeem(spenders, spender_txid+':0', e_htlc_tx, name)
else: else:
keep_watching |= not self.is_deeply_mined(spender_tx.txid()) keep_watching |= not self.is_deeply_mined(spender_txid)
txin_idx = spender_tx.get_input_idx_that_spent_prevout(TxOutpoint.from_str(prevout)) txin_idx = spender_tx.get_input_idx_that_spent_prevout(TxOutpoint.from_str(prevout))
assert txin_idx is not None assert txin_idx is not None
spender_txin = spender_tx.inputs()[txin_idx] spender_txin = spender_tx.inputs()[txin_idx]