AaronFiore/electrum
1
0
Fork 0
Code Activity

lnwatcher: if broadcast is successful, add tx immediately, so that second-stage htlc can be added as well

Browse Source
This commit is contained in:
ThomasV
2024-11-25 11:39:12 +01:00
parent ea584e13fc
commit cdc746713e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/lnwatcher.py
View File

@@ -454,10 +454,11 @@ class LNWalletWatcher(LNWatcher):
# create and broadcast transactions # create and broadcast transactions
for prevout, sweep_info in sweep_info_dict.items(): for prevout, sweep_info in sweep_info_dict.items():
prev_txid, prev_index = prevout.split(':') prev_txid, prev_index = prevout.split(':')
name = sweep_info.name + ' ' + chan.get_id_for_log()
if not self.adb.get_transaction(prev_txid): if not self.adb.get_transaction(prev_txid):
# do not keep watching if prevout does not exist # do not keep watching if prevout does not exist
self.logger.info(f'prevout does not exist for {name}: {prev_txid}')
continue continue
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
if spender_tx: if spender_tx:
@@ -546,7 +547,10 @@ class LNWalletWatcher(LNWatcher):
return return
if can_broadcast: if can_broadcast:
self.logger.info(f'we can broadcast: {name}') self.logger.info(f'we can broadcast: {name}')
tx_was_added = await self.network.try_broadcasting(new_tx, name) if await self.network.try_broadcasting(new_tx, name):
tx_was_added = self.adb.add_transaction(new_tx, is_new=(old_tx is None))
else:
tx_was_added = False
else: else:
# we may have a tx with a different fee, in which case it will be replaced # we may have a tx with a different fee, in which case it will be replaced
if not old_tx or (old_tx and old_tx.txid() != new_tx.txid()): if not old_tx or (old_tx and old_tx.txid() != new_tx.txid()):