AaronFiore/electrum
1
0
Fork 0
Code Activity

lnpeer: trampoline forwarding failures may be indexed by outer or inner onion payment secret

Browse Source
This commit is contained in:
ThomasV
2023-08-31 05:55:28 +02:00
parent 00ae370a45
commit e80310eb32
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum/lnpeer.py
View File

@@ -2445,13 +2445,16 @@ class Peer(Logger):
return None, fw_info, None return None, fw_info, None
else: else:
# trampoline- HTLC we are supposed to forward, and have already forwarded # trampoline- HTLC we are supposed to forward, and have already forwarded
payment_key = bytes.fromhex(forwarding_info) payment_key_outer_onion = bytes.fromhex(forwarding_info)
preimage = self.lnworker.get_preimage(payment_hash) preimage = self.lnworker.get_preimage(payment_hash)
# get (and not pop) failure because the incoming payment might be multi-part payment_secret_inner_onion = self.lnworker.get_payment_secret(payment_hash)
error_reason = self.lnworker.final_onion_forwarding_failures.get(payment_key) payment_key_inner_onion = payment_hash + payment_secret_inner_onion
if error_reason: for payment_key in [payment_key_inner_onion, payment_key_outer_onion]:
self.logger.info(f'trampoline forwarding failure: {error_reason.code_name()}') # get (and not pop) failure because the incoming payment might be multi-part
raise error_reason error_reason = self.lnworker.final_onion_forwarding_failures.get(payment_key)
if error_reason:
self.logger.info(f'trampoline forwarding failure: {error_reason.code_name()}')
raise error_reason
elif not forwarding_info: elif not forwarding_info:
# HTLC we are supposed to forward, but haven't forwarded yet # HTLC we are supposed to forward, but haven't forwarded yet