AaronFiore/electrum
1
0
Fork 0
Code Activity

submarine swaps: remove expired swaps from the list, and log the reason for failing a swap.

Browse Source
This commit is contained in:
ThomasV
2023-09-16 10:21:08 +02:00
parent 956b455954
commit ea79562b7a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
electrum/submarine_swaps.py
View File

@@ -252,21 +252,22 @@ class SwapManager(Logger):
continue continue
await self.taskgroup.spawn(self.pay_invoice(key)) await self.taskgroup.spawn(self.pay_invoice(key))
def cancel_normal_swap(self, swap): def cancel_normal_swap(self, swap: SwapData):
""" we must not have broadcast the funding tx """ """ we must not have broadcast the funding tx """
if swap.funding_txid is not None: if swap.funding_txid is not None:
self.logger.info(f'cannot fail swap {swap.payment_hash.hex()}: already funded') self.logger.info(f'cannot cancel swap {swap.payment_hash.hex()}: already funded')
return return
self._fail_normal_swap(swap) self._fail_swap(swap, 'user cancelled')
def _fail_normal_swap(self, swap): def _fail_swap(self, swap: SwapData, reason: str):
if swap.payment_hash in self.lnworker.hold_invoice_callbacks: self.logger.info(f'failing swap {swap.payment_hash.hex()}: {reason}')
self.logger.info(f'failing normal swap {swap.payment_hash.hex()}') if not swap.is_reverse and swap.payment_hash in self.lnworker.hold_invoice_callbacks:
self.lnworker.unregister_hold_invoice(swap.payment_hash) self.lnworker.unregister_hold_invoice(swap.payment_hash)
payment_secret = self.lnworker.get_payment_secret(swap.payment_hash) payment_secret = self.lnworker.get_payment_secret(swap.payment_hash)
payment_key = swap.payment_hash + payment_secret payment_key = swap.payment_hash + payment_secret
self.lnworker.fail_final_onion_forwarding(payment_key) self.lnworker.fail_final_onion_forwarding(payment_key)
self.lnwatcher.remove_callback(swap.lockup_address) self.lnwatcher.remove_callback(swap.lockup_address)
self.swaps.pop(swap.payment_hash.hex())
@log_exceptions @log_exceptions
async def _claim_swap(self, swap: SwapData) -> None: async def _claim_swap(self, swap: SwapData) -> None:
@@ -285,12 +286,11 @@ class SwapManager(Logger):
break break
else: else:
# swap not funded. # swap not funded.
if delta >= 0:
if not swap.is_reverse:
# we might have received HTLCs and double spent the funding tx
# in that case we need to fail the HTLCs
self._fail_normal_swap(swap)
txin = None txin = None
# if it is a normal swap, we might have double spent the funding tx
# in that case we need to fail the HTLCs
if delta >= 0:
self._fail_swap(swap, 'expired')
if txin: if txin:
# the swap is funded # the swap is funded
@@ -328,7 +328,7 @@ class SwapManager(Logger):
else: else:
# refund tx # refund tx
if spent_height > 0: if spent_height > 0:
self._fail_normal_swap(swap) self._fail_swap(swap, 'refund tx confirmed')
return return
if delta < 0: if delta < 0:
# too early for refund # too early for refund