AaronFiore/electrum
1
0
Fork 0
Code Activity

lnworker.pay_to_node: log num htlcs in-flight

Browse Source
This commit is contained in:
SomberNight
2023-08-11 13:53:57 +00:00
parent 9f5f802cd1
commit 8f768d1da5
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
electrum/lnworker.py
View File

@@ -1296,6 +1296,7 @@ class LNWallet(LNWorker):
self.failed_trampoline_routes = [] self.failed_trampoline_routes = []
start_time = time.time() start_time = time.time()
amount_inflight = 0 # what we sent in htlcs (that receiver gets, without fees) amount_inflight = 0 # what we sent in htlcs (that receiver gets, without fees)
nhtlcs_inflight = 0
while True: while True:
amount_to_send = amount_to_pay - amount_inflight amount_to_send = amount_to_pay - amount_inflight
if amount_to_send > 0: if amount_to_send > 0:
@@ -1319,6 +1320,7 @@ class LNWallet(LNWorker):
) )
# 2. send htlcs # 2. send htlcs
async for sent_htlc_info, cltv_delta, trampoline_onion in routes: async for sent_htlc_info, cltv_delta, trampoline_onion in routes:
nhtlcs_inflight += 1
amount_inflight += sent_htlc_info.amount_receiver_msat amount_inflight += sent_htlc_info.amount_receiver_msat
if amount_inflight > amount_to_pay: # safety belts if amount_inflight > amount_to_pay: # safety belts
raise Exception(f"amount_inflight={amount_inflight} > amount_to_pay={amount_to_pay}") raise Exception(f"amount_inflight={amount_inflight} > amount_to_pay={amount_to_pay}")
@@ -1329,16 +1331,17 @@ class LNWallet(LNWorker):
min_cltv_expiry=cltv_delta, min_cltv_expiry=cltv_delta,
trampoline_onion=trampoline_onion, trampoline_onion=trampoline_onion,
) )
# invoice_status is triggered in self.set_invoice_status when it actally changes. # invoice_status is triggered in self.set_invoice_status when it actually changes.
# It is also triggered here to update progress for a lightning payment in the GUI # It is also triggered here to update progress for a lightning payment in the GUI
# (e.g. attempt counter) # (e.g. attempt counter)
util.trigger_callback('invoice_status', self.wallet, payment_hash.hex(), PR_INFLIGHT) util.trigger_callback('invoice_status', self.wallet, payment_hash.hex(), PR_INFLIGHT)
# 3. await a queue # 3. await a queue
self.logger.info(f"amount inflight {amount_inflight}") self.logger.info(f"(paysession for RHASH {payment_hash.hex()}) {amount_inflight=}. {nhtlcs_inflight=}")
htlc_log = await self.sent_htlcs_q[payment_key].get() htlc_log = await self.sent_htlcs_q[payment_key].get() # TODO maybe wait a bit, more failures might come
amount_inflight -= htlc_log.amount_msat amount_inflight -= htlc_log.amount_msat
if amount_inflight < 0: nhtlcs_inflight -= 1
raise Exception(f"amount_inflight={amount_inflight} < 0") if amount_inflight < 0 or nhtlcs_inflight < 0:
raise Exception(f"{amount_inflight=}, {nhtlcs_inflight=}. both should be >= 0 !")
log.append(htlc_log) log.append(htlc_log)
if htlc_log.success: if htlc_log.success:
if self.network.path_finder: if self.network.path_finder: