AaronFiore/electrum
1
0
Fork 0
Code Activity

revert 'keep invoice INFLIGHT', check HTLCs before payment attempt

Browse Source
This commit is contained in:
ThomasV
2021-02-28 09:01:31 +01:00
parent 38652cffb0
commit f32d49b8ca
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
electrum/lnworker.py
View File

@@ -1042,6 +1042,8 @@ class LNWallet(LNWorker):
raise PaymentFailure(_("This invoice has been paid already")) raise PaymentFailure(_("This invoice has been paid already"))
if status == PR_INFLIGHT: if status == PR_INFLIGHT:
raise PaymentFailure(_("A payment was already initiated for this invoice")) raise PaymentFailure(_("A payment was already initiated for this invoice"))
if payment_hash in self.get_payments(status='inflight'):
raise PaymentFailure(_("A previous attempt to pay this invoice did not clear"))
info = PaymentInfo(payment_hash, amount_to_pay, SENT, PR_UNPAID) info = PaymentInfo(payment_hash, amount_to_pay, SENT, PR_UNPAID)
self.save_payment_info(info) self.save_payment_info(info)
self.wallet.set_label(key, lnaddr.get_description()) self.wallet.set_label(key, lnaddr.get_description())
@@ -1069,11 +1071,6 @@ class LNWallet(LNWorker):
self.logger.exception('') self.logger.exception('')
success = False success = False
reason = str(e) reason = str(e)
# keep invoice status INFLIGHT as long as HTLCs are inflight
# maybe we could add an extra state for the waiting time.
while payment_hash in self.get_payments(status='inflight'):
self.logger.info('waiting for inflight HTLCs...')
await self.sent_htlcs[payment_hash].get()
if success: if success:
self.set_invoice_status(key, PR_PAID) self.set_invoice_status(key, PR_PAID)
util.trigger_callback('payment_succeeded', self.wallet, key) util.trigger_callback('payment_succeeded', self.wallet, key)
@@ -1750,10 +1747,9 @@ class LNWallet(LNWorker):
amount_msat=amount_msat) amount_msat=amount_msat)
q.put_nowait(htlc_log) q.put_nowait(htlc_log)
else: else:
if payment_hash not in self.get_payments(status='inflight'): key = payment_hash.hex()
key = payment_hash.hex() self.set_invoice_status(key, PR_PAID)
self.set_invoice_status(key, PR_PAID) util.trigger_callback('payment_succeeded', self.wallet, key)
util.trigger_callback('payment_succeeded', self.wallet, key)
def htlc_failed( def htlc_failed(
self, self,
@@ -1790,10 +1786,9 @@ class LNWallet(LNWorker):
q.put_nowait(htlc_log) q.put_nowait(htlc_log)
else: else:
self.logger.info(f"received unknown htlc_failed, probably from previous session") self.logger.info(f"received unknown htlc_failed, probably from previous session")
if payment_hash not in self.get_payments(status='inflight'): key = payment_hash.hex()
key = payment_hash.hex() self.set_invoice_status(key, PR_UNPAID)
self.set_invoice_status(key, PR_UNPAID) util.trigger_callback('payment_failed', self.wallet, key, '')
util.trigger_callback('payment_failed', self.wallet, key, '')
async def _calc_routing_hints_for_invoice(self, amount_msat: Optional[int]): async def _calc_routing_hints_for_invoice(self, amount_msat: Optional[int]):
"""calculate routing hints (BOLT-11 'r' field)""" """calculate routing hints (BOLT-11 'r' field)"""