AaronFiore/electrum
1
0
Fork 0
Code Activity

reverse_swap: return as soon as we detect the funding transaction

Browse Source
This commit is contained in:
ThomasV
2023-03-09 14:57:43 +01:00
parent b960433c60
commit d9f1a21219
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
electrum/submarine_swaps.py
View File

@@ -444,12 +444,18 @@ class SwapManager(Logger):
self._add_or_reindex_swap(swap) self._add_or_reindex_swap(swap)
# add callback to lnwatcher # add callback to lnwatcher
self.add_lnwatcher_callback(swap) self.add_lnwatcher_callback(swap)
# initiate payment. # initiate fee payment.
if fee_invoice: if fee_invoice:
self.prepayments[prepay_hash] = preimage_hash self.prepayments[prepay_hash] = preimage_hash
asyncio.ensure_future(self.lnworker.pay_invoice(fee_invoice, attempts=10)) asyncio.ensure_future(self.lnworker.pay_invoice(fee_invoice, attempts=10))
# initiate payment. # we return if we detect funding
success, log = await self.lnworker.pay_invoice(invoice, attempts=10, channels=channels) async def wait_for_funding(swap):
while swap.spending_txid is None:
await asyncio.sleep(1)
# initiate main payment
tasks = [self.lnworker.pay_invoice(invoice, attempts=10, channels=channels), wait_for_funding(swap)]
await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
success = swap.spending_txid is not None
return success return success
def _add_or_reindex_swap(self, swap: SwapData) -> None: def _add_or_reindex_swap(self, swap: SwapData) -> None: