From: Valentine Wallace <vwallace@protonmail.com>
Date: Fri, 12 Jan 2024 16:35:08 +0000 (-0500)
Subject: Add failed_within_blinded_path to DecodedOnionFailure.
X-Git-Tag: v0.0.120~1^2~5
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=75a1c47b192b693c08645d6a6697ad6d37839220;p=rust-lightning

Add failed_within_blinded_path to DecodedOnionFailure.

Will be used to ensure correctness when we store previously failed blinded
paths to avoid retrying over them.
---

diff --git a/lightning/src/ln/onion_utils.rs b/lightning/src/ln/onion_utils.rs
index be984858..ea6563d4 100644
--- a/lightning/src/ln/onion_utils.rs
+++ b/lightning/src/ln/onion_utils.rs
@@ -429,6 +429,7 @@ pub(crate) struct DecodedOnionFailure {
 	pub(crate) network_update: Option<NetworkUpdate>,
 	pub(crate) short_channel_id: Option<u64>,
 	pub(crate) payment_failed_permanently: bool,
+	pub(crate) failed_within_blinded_path: bool,
 	#[cfg(test)]
 	pub(crate) onion_error_code: Option<u16>,
 	#[cfg(test)]
@@ -725,7 +726,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(
 		network_update, short_channel_id, payment_failed_permanently, failed_within_blinded_path
 	}) = res {
 		DecodedOnionFailure {
-			network_update, short_channel_id, payment_failed_permanently,
+			network_update, short_channel_id, payment_failed_permanently, failed_within_blinded_path,
 			#[cfg(test)]
 			onion_error_code: error_code_ret,
 			#[cfg(test)]
@@ -736,6 +737,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(
 		// payment not retryable only when garbage is from the final node
 		DecodedOnionFailure {
 			network_update: None, short_channel_id: None, payment_failed_permanently: is_from_final_node,
+			failed_within_blinded_path: false,
 			#[cfg(test)]
 			onion_error_code: None,
 			#[cfg(test)]
@@ -883,6 +885,7 @@ impl HTLCFailReason {
 						network_update: None,
 						payment_failed_permanently: false,
 						short_channel_id: Some(path.hops[0].short_channel_id),
+						failed_within_blinded_path: false,
 						#[cfg(test)]
 						onion_error_code: Some(*failure_code),
 						#[cfg(test)]
diff --git a/lightning/src/ln/outbound_payment.rs b/lightning/src/ln/outbound_payment.rs
index e1748dca..e4158a89 100644
--- a/lightning/src/ln/outbound_payment.rs
+++ b/lightning/src/ln/outbound_payment.rs
@@ -243,7 +243,7 @@ impl PendingOutboundPayment {
 		if insert_res {
 			if let PendingOutboundPayment::Retryable {
 				ref mut pending_amt_msat, ref mut pending_fee_msat,
-				ref mut remaining_max_total_routing_fee_msat, .. 
+				ref mut remaining_max_total_routing_fee_msat, ..
 			} = self {
 					*pending_amt_msat += path.final_value_msat();
 					let path_fee_msat = path.fee_msat();
@@ -1604,11 +1604,12 @@ impl OutboundPayments {
 		#[cfg(test)]
 		let DecodedOnionFailure {
 			network_update, short_channel_id, payment_failed_permanently, onion_error_code,
-			onion_error_data
+			onion_error_data, failed_within_blinded_path
 		} = onion_error.decode_onion_failure(secp_ctx, logger, &source);
 		#[cfg(not(test))]
-		let DecodedOnionFailure { network_update, short_channel_id, payment_failed_permanently } =
-			onion_error.decode_onion_failure(secp_ctx, logger, &source);
+		let DecodedOnionFailure {
+			network_update, short_channel_id, payment_failed_permanently, failed_within_blinded_path
+		} = onion_error.decode_onion_failure(secp_ctx, logger, &source);
 
 		let payment_is_probe = payment_is_probe(payment_hash, &payment_id, probing_cookie_secret);
 		let mut session_priv_bytes = [0; 32];