AaronFiore/electrum
1
0
Fork 0
Code Activity

lnwatcher: renaming and comments for clarity

Browse Source
This commit is contained in:
bitromortac
2021-09-13 14:46:29 +02:00
committed by ThomasV
parent 4d26fb552b
commit 18f81d0080
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
electrum/lnwatcher.py
View File

@@ -214,7 +214,7 @@ class LNWatcher(Logger, EventListener):
if closing_txid: if closing_txid:
closing_tx = self.adb.get_transaction(closing_txid) closing_tx = self.adb.get_transaction(closing_txid)
if closing_tx: if closing_tx:
keep_watching = await self.do_breach_remedy(funding_outpoint, closing_tx, spenders) keep_watching = await self.sweep_commitment_transaction(funding_outpoint, closing_tx, spenders)
else: else:
self.logger.info(f"channel {funding_outpoint} closed by {closing_txid}. still waiting for tx itself...") self.logger.info(f"channel {funding_outpoint} closed by {closing_txid}. still waiting for tx itself...")
keep_watching = True keep_watching = True
@@ -230,7 +230,7 @@ class LNWatcher(Logger, EventListener):
if not keep_watching: if not keep_watching:
await self.unwatch_channel(address, funding_outpoint) await self.unwatch_channel(address, funding_outpoint)
async def do_breach_remedy(self, funding_outpoint, closing_tx, spenders) -> bool: async def sweep_commitment_transaction(self, funding_outpoint, closing_tx, spenders) -> bool:
raise NotImplementedError() # implemented by subclasses raise NotImplementedError() # implemented by subclasses
async def update_channel_state(self, *, funding_outpoint: str, funding_txid: str, async def update_channel_state(self, *, funding_outpoint: str, funding_txid: str,
@@ -238,7 +238,7 @@ class LNWatcher(Logger, EventListener):
closing_height: TxMinedInfo, keep_watching: bool) -> None: closing_height: TxMinedInfo, keep_watching: bool) -> None:
raise NotImplementedError() # implemented by subclasses raise NotImplementedError() # implemented by subclasses
def inspect_tx_candidate(self, outpoint, n): def inspect_tx_candidate(self, outpoint, n: int) -> Dict[str, str]:
""" """
returns a dict of spenders for a transaction of interest. returns a dict of spenders for a transaction of interest.
subscribes to addresses as a side effect. subscribes to addresses as a side effect.
@@ -339,7 +339,7 @@ class WatchTower(LNWatcher):
for outpoint, address in random_shuffled_copy(lst): for outpoint, address in random_shuffled_copy(lst):
self.add_channel(outpoint, address) self.add_channel(outpoint, address)
async def do_breach_remedy(self, funding_outpoint, closing_tx, spenders): async def sweep_commitment_transaction(self, funding_outpoint, closing_tx, spenders):
keep_watching = False keep_watching = False
for prevout, spender in spenders.items(): for prevout, spender in spenders.items():
if spender is not None: if spender is not None:
@@ -436,16 +436,22 @@ class LNWalletWatcher(LNWatcher):
await self.lnworker.handle_onchain_state(chan) await self.lnworker.handle_onchain_state(chan)
@log_exceptions @log_exceptions
async def do_breach_remedy(self, funding_outpoint, closing_tx, spenders): async def sweep_commitment_transaction(self, funding_outpoint, closing_tx, spenders) -> bool:
"""This function is called when a channel was closed. In this case
we need to check for redeemable outputs of the commitment transaction
or spenders down the line (HTLC-timeout/success transactions).
Returns whether we should continue to monitor."""
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() chan_id_for_log = chan.get_id_for_log()
# detect who closed and set sweep_info # detect who closed and get information about how to claim outputs
sweep_info_dict = chan.sweep_ctx(closing_tx) sweep_info_dict = chan.sweep_ctx(closing_tx)
self.logger.info(f"do_breach_remedy: {[x.name for x in sweep_info_dict.values()]}") self.logger.info(f"do_breach_remedy: {[x.name for x in sweep_info_dict.values()]}")
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 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(':')
if not self.adb.get_transaction(prev_txid): if not self.adb.get_transaction(prev_txid):