AaronFiore/electrum
1
0
Fork 0
Code Activity

lnworker.pay_to_node: re overpayment, raise before actually it happens

Browse Source
This commit is contained in:
SomberNight
2021-03-06 14:23:00 +01:00
parent 6ddd02506e
commit edb214aeca
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
electrum/lnworker.py
View File

@@ -1051,7 +1051,7 @@ class LNWallet(LNWorker):
trampoline_fee_level = 0 # only used for trampoline payments trampoline_fee_level = 0 # only used for trampoline payments
use_two_trampolines = True # only used for pay to legacy use_two_trampolines = True # only used for pay to legacy
amount_inflight = 0 # what we sent in htlcs amount_inflight = 0 # what we sent in htlcs (that receiver gets, without fees)
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:
@@ -1075,6 +1075,9 @@ class LNWallet(LNWorker):
fwd_trampoline_onion=fwd_trampoline_onion)) fwd_trampoline_onion=fwd_trampoline_onion))
# 2. send htlcs # 2. send htlcs
for route, amount_msat, total_msat, amount_receiver_msat, cltv_delta, bucket_payment_secret, trampoline_onion in routes: for route, amount_msat, total_msat, amount_receiver_msat, cltv_delta, bucket_payment_secret, trampoline_onion in routes:
amount_inflight += amount_receiver_msat
if amount_inflight > amount_to_pay: # safety belts
raise Exception(f"amount_inflight={amount_inflight} > amount_to_pay={amount_to_pay}")
await self.pay_to_route( await self.pay_to_route(
route=route, route=route,
amount_msat=amount_msat, amount_msat=amount_msat,
@@ -1084,14 +1087,13 @@ class LNWallet(LNWorker):
payment_secret=bucket_payment_secret, payment_secret=bucket_payment_secret,
min_cltv_expiry=cltv_delta, min_cltv_expiry=cltv_delta,
trampoline_onion=trampoline_onion) trampoline_onion=trampoline_onion)
amount_inflight += amount_receiver_msat
assert amount_inflight <= amount_to_pay, f"amount_inflight {amount_inflight} > amount_to_pay {amount_to_pay}"
util.trigger_callback('invoice_status', self.wallet, payment_hash.hex()) util.trigger_callback('invoice_status', self.wallet, payment_hash.hex())
# 3. await a queue # 3. await a queue
self.logger.info(f"amount inflight {amount_inflight}") self.logger.info(f"amount inflight {amount_inflight}")
htlc_log = await self.sent_htlcs[payment_hash].get() htlc_log = await self.sent_htlcs[payment_hash].get()
amount_inflight -= htlc_log.amount_msat amount_inflight -= htlc_log.amount_msat
assert amount_inflight >= 0, f"amount_inflight={amount_inflight} < 0" if amount_inflight < 0:
raise Exception(f"amount_inflight={amount_inflight} < 0")
log.append(htlc_log) log.append(htlc_log)
if htlc_log.success: if htlc_log.success:
return return