tlnworker.pay_to_node: re overpayment, raise before actually it happens - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit edb214aeca91de2d0f3719c0258e98592bef6481
DIR parent 6ddd02506eefcbef358c18bcb5fb8106400a3c2b
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Sat, 6 Mar 2021 14:23:00 +0100
lnworker.pay_to_node: re overpayment, raise before actually it happens
Diffstat:
M electrum/lnworker.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
DIR diff --git a/electrum/lnworker.py b/electrum/lnworker.py
t@@ -1051,7 +1051,7 @@ class LNWallet(LNWorker):
trampoline_fee_level = 0 # only used for trampoline payments
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:
amount_to_send = amount_to_pay - amount_inflight
if amount_to_send > 0:
t@@ -1075,6 +1075,9 @@ class LNWallet(LNWorker):
fwd_trampoline_onion=fwd_trampoline_onion))
# 2. send htlcs
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(
route=route,
amount_msat=amount_msat,
t@@ -1084,14 +1087,13 @@ class LNWallet(LNWorker):
payment_secret=bucket_payment_secret,
min_cltv_expiry=cltv_delta,
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())
# 3. await a queue
self.logger.info(f"amount inflight {amount_inflight}")
htlc_log = await self.sent_htlcs[payment_hash].get()
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)
if htlc_log.success:
return