AaronFiore/electrum
1
0
Fork 0
Code Activity

follow-up c0bf9b4509

Browse Source
This commit is contained in:
ThomasV
2021-02-05 11:33:45 +01:00
parent ef5a265449
commit ff8fc798f4
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
electrum/lnworker.py
View File

@@ -571,7 +571,6 @@ class LNWallet(LNWorker):
# note: this sweep_address is only used as fallback; as it might result in address-reuse # note: this sweep_address is only used as fallback; as it might result in address-reuse
self.sweep_address = wallet.get_new_sweep_address_for_channel() self.sweep_address = wallet.get_new_sweep_address_for_channel()
self.logs = defaultdict(list) # type: Dict[str, List[PaymentAttemptLog]] # key is RHASH # (not persisted) self.logs = defaultdict(list) # type: Dict[str, List[PaymentAttemptLog]] # key is RHASH # (not persisted)
self.is_routing = set() # (not persisted) keys of invoices that are in PR_ROUTING state
# used in tests # used in tests
self.enable_htlc_settle = asyncio.Event() self.enable_htlc_settle = asyncio.Event()
self.enable_htlc_settle.set() self.enable_htlc_settle.set()
@@ -587,6 +586,7 @@ class LNWallet(LNWorker):
self.swap_manager = SwapManager(wallet=self.wallet, lnworker=self) self.swap_manager = SwapManager(wallet=self.wallet, lnworker=self)
# detect inflight payments # detect inflight payments
self.inflight_payments = set() # (not persisted) keys of invoices that are in PR_INFLIGHT state
for payment_hash in self.get_payments(status='inflight').keys(): for payment_hash in self.get_payments(status='inflight').keys():
self.set_invoice_status(payment_hash.hex(), PR_INFLIGHT) self.set_invoice_status(payment_hash.hex(), PR_INFLIGHT)
@@ -971,15 +971,12 @@ class LNWallet(LNWorker):
try: try:
# note: path-finding runs in a separate thread so that we don't block the asyncio loop # note: path-finding runs in a separate thread so that we don't block the asyncio loop
# graph updates might occur during the computation # graph updates might occur during the computation
self.set_invoice_status(key, PR_ROUTING)
util.trigger_callback('invoice_status', self.wallet, key)
route = await run_in_thread(partial(self._create_route_from_invoice, lnaddr, full_path=full_path))
self.set_invoice_status(key, PR_INFLIGHT) self.set_invoice_status(key, PR_INFLIGHT)
util.trigger_callback('invoice_status', self.wallet, key) util.trigger_callback('invoice_status', self.wallet, key)
route = await run_in_thread(partial(self._create_route_from_invoice, lnaddr, full_path=full_path))
payment_attempt_log = await self._pay_to_route(route, lnaddr) payment_attempt_log = await self._pay_to_route(route, lnaddr)
except Exception as e: except Exception as e:
log.append(PaymentAttemptLog(success=False, exception=e)) log.append(PaymentAttemptLog(success=False, exception=e))
self.set_invoice_status(key, PR_UNPAID)
reason = str(e) reason = str(e)
break break
log.append(payment_attempt_log) log.append(payment_attempt_log)
@@ -988,6 +985,7 @@ class LNWallet(LNWorker):
break break
else: else:
reason = _('Failed after {} attempts').format(attempts) reason = _('Failed after {} attempts').format(attempts)
self.set_invoice_status(key, PR_PAID if success else PR_UNPAID)
util.trigger_callback('invoice_status', self.wallet, key) util.trigger_callback('invoice_status', self.wallet, key)
if success: if success:
util.trigger_callback('payment_succeeded', self.wallet, key) util.trigger_callback('payment_succeeded', self.wallet, key)
@@ -1312,8 +1310,8 @@ class LNWallet(LNWorker):
def get_invoice_status(self, invoice): def get_invoice_status(self, invoice):
key = invoice.rhash key = invoice.rhash
log = self.logs[key] log = self.logs[key]
if key in self.is_routing: if key in self.inflight_payments:
return PR_ROUTING return PR_INFLIGHT
# status may be PR_FAILED # status may be PR_FAILED
status = self.get_payment_status(bfh(key)) status = self.get_payment_status(bfh(key))
if status == PR_UNPAID and log: if status == PR_UNPAID and log:
@@ -1321,10 +1319,10 @@ class LNWallet(LNWorker):
return status return status
def set_invoice_status(self, key, status): def set_invoice_status(self, key, status):
if status == PR_ROUTING: if status == PR_INFLIGHT:
self.is_routing.add(key) self.inflight_payments.add(key)
elif key in self.is_routing: elif key in self.inflight_payments:
self.is_routing.remove(key) self.inflight_payments.remove(key)
if status in SAVED_PR_STATUS: if status in SAVED_PR_STATUS:
self.set_payment_status(bfh(key), status) self.set_payment_status(bfh(key), status)