From c42f094072bcb2cac16487bb33fe63a40e8333d7 Mon Sep 17 00:00:00 2001 From: Carla Kirk-Cohen Date: Mon, 1 Dec 2025 14:41:38 -0500 Subject: [PATCH 1/2] ln: improve error message for blinded trampoline check failure --- lightning/src/ln/onion_payment.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lightning/src/ln/onion_payment.rs b/lightning/src/ln/onion_payment.rs index aeeabf98b67..1abe4330a25 100644 --- a/lightning/src/ln/onion_payment.rs +++ b/lightning/src/ln/onion_payment.rs @@ -649,7 +649,7 @@ where ) { Ok((amt, cltv)) => (amt, cltv), Err(()) => { - return encode_relay_error("Trampoline blinded forward amt or CLTV values exceeded the outer onion's", + return encode_relay_error("Underflow calculating outbound amount or cltv value for blinded trampoline forward", LocalHTLCFailureReason::InvalidOnionBlinding, outer_shared_secret.secret_bytes(), Some(trampoline_shared_secret.secret_bytes()), &[0; 32]); } }; From 2a53ffd460e6d97111c37716ff3bf93d00ce388a Mon Sep 17 00:00:00 2001 From: Carla Kirk-Cohen Date: Mon, 1 Dec 2025 14:44:44 -0500 Subject: [PATCH 2/2] ln: add from_u16 implementation for new trampoline errors --- lightning/src/ln/onion_utils.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs index 75fa46fcea7..18aa43e27c6 100644 --- a/lightning/src/ln/onion_utils.rs +++ b/lightning/src/ln/onion_utils.rs @@ -1800,6 +1800,9 @@ impl_from_u16_for_htlc_reason!( InvalidOnionPayload, MPPTimeout, InvalidOnionBlinding, + TemporaryTrampolineFailure, + TrampolineFeeOrExpiryInsufficient, + UnknownNextTrampoline, ] );