AaronFiore/electrum
1
0
Fork 0
Code Activity

lnwatcher.try_redeem: output log only the first time a tx is seen

Browse Source
This commit is contained in:
ThomasV
2021-03-20 09:09:05 +01:00
parent aba0bad30c
commit bbb9ce2430
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
electrum/lnwatcher.py
View File

@@ -375,10 +375,10 @@ class LNWalletWatcher(LNWatcher):
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
chan_id_for_log = chan.get_id_for_log()
# detect who closed and set sweep_info # detect who closed and set sweep_info
sweep_info_dict = chan.sweep_ctx(closing_tx) sweep_info_dict = chan.sweep_ctx(closing_tx)
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())
self.logger.info(f'(chan {chan.get_id_for_log()}) sweep_info_dict {[x.name for x in sweep_info_dict.values()]}')
# 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():
name = sweep_info.name + ' ' + chan.get_id_for_log() name = sweep_info.name + ' ' + chan.get_id_for_log()
@@ -392,51 +392,50 @@ class LNWalletWatcher(LNWatcher):
if e_htlc_tx: if e_htlc_tx:
spender2 = spenders.get(spender_txid+':0') spender2 = spenders.get(spender_txid+':0')
if spender2: if spender2:
self.logger.info(f'(chan {chan.get_id_for_log()}) htlc is already spent {name}: {prevout}')
keep_watching |= not self.is_deeply_mined(spender2) keep_watching |= not self.is_deeply_mined(spender2)
else: else:
self.logger.info(f'(chan {chan.get_id_for_log()}) trying to redeem htlc {name}: {prevout}') await self.try_redeem(spender_txid+':0', e_htlc_tx, chan_id_for_log, name)
await self.try_redeem(spender_txid+':0', e_htlc_tx, name)
keep_watching = True keep_watching = True
else: else:
self.logger.info(f'(chan {chan.get_id_for_log()}) outpoint already spent {name}: {prevout}')
keep_watching |= not self.is_deeply_mined(spender_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]
chan.extract_preimage_from_htlc_txin(spender_txin) chan.extract_preimage_from_htlc_txin(spender_txin)
else: else:
self.logger.info(f'(chan {chan.get_id_for_log()}) trying to redeem {name}: {prevout}') await self.try_redeem(prevout, sweep_info, chan_id_for_log, name)
await self.try_redeem(prevout, sweep_info, name)
keep_watching = True keep_watching = True
return keep_watching return keep_watching
@log_exceptions @log_exceptions
async def try_redeem(self, prevout: str, sweep_info: 'SweepInfo', name: str) -> None: async def try_redeem(self, prevout: str, sweep_info: 'SweepInfo', chan_id_for_log: str, name: str) -> None:
prev_txid, prev_index = prevout.split(':') prev_txid, prev_index = prevout.split(':')
broadcast = True broadcast = True
if sweep_info.cltv_expiry: if sweep_info.cltv_expiry:
local_height = self.network.get_local_height() local_height = self.network.get_local_height()
remaining = sweep_info.cltv_expiry - local_height remaining = sweep_info.cltv_expiry - local_height
if remaining > 0: if remaining > 0:
self.logger.info('waiting for {}: CLTV ({} > {}), prevout {}'
.format(name, local_height, sweep_info.cltv_expiry, prevout))
broadcast = False broadcast = False
reason = 'waiting for {}: CLTV ({} > {}), prevout {}'.format(name, local_height, sweep_info.cltv_expiry, prevout)
if sweep_info.csv_delay: if sweep_info.csv_delay:
prev_height = self.get_tx_height(prev_txid) prev_height = self.get_tx_height(prev_txid)
remaining = sweep_info.csv_delay - prev_height.conf remaining = sweep_info.csv_delay - prev_height.conf
if remaining > 0: if remaining > 0:
self.logger.info('waiting for {}: CSV ({} >= {}), prevout: {}'
.format(name, prev_height.conf, sweep_info.csv_delay, prevout))
broadcast = False broadcast = False
reason = 'waiting for {}: CSV ({} >= {}), prevout: {}'.format(name, prev_height.conf, sweep_info.csv_delay, prevout)
tx = sweep_info.gen_tx() tx = sweep_info.gen_tx()
if tx is None: if tx is None:
self.logger.info(f'{name} could not claim output: {prevout}, dust') self.logger.info(f'{name} could not claim output: {prevout}, dust')
return return
self.lnworker.wallet.set_label(tx.txid(), name) txid = tx.txid()
self.lnworker.wallet.set_label(txid, name)
if broadcast: if broadcast:
await self.network.try_broadcasting(tx, name) await self.network.try_broadcasting(tx, name)
else: else:
if self.lnworker.wallet.db.get_transaction(txid):
return
self.logger.debug(f'(chan {chan_id_for_log}) trying to redeem {name}: {prevout}')
self.logger.info(reason)
# it's OK to add local transaction, the fee will be recomputed # it's OK to add local transaction, the fee will be recomputed
try: try:
tx_was_added = self.lnworker.wallet.add_future_tx(tx, remaining) tx_was_added = self.lnworker.wallet.add_future_tx(tx, remaining)