Add node_id field to DecodedOnionFailure.

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

Author: valentinewallace

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) node_id: Option<PublicKey>,
 	pub(crate) onion_error_code: Option<u16>,
 	#[cfg(test)]
 	pub(crate) onion_error_data: Option<Vec<u8>>,
@@ -724,7 +725,7 @@ pub(super) fn process_onion_failure<T: secp256k1::Signing, L: Deref>(
 		network_update, short_channel_id, payment_failed_permanently, node_id
 	}) = res {
 		DecodedOnionFailure {
-			network_update, short_channel_id, payment_failed_permanently,
+			network_update, short_channel_id, payment_failed_permanently, node_id,
 			onion_error_code: error_code_ret,
 			#[cfg(test)]
 			onion_error_data: error_packet_ret
@@ -734,7 +735,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,
-			onion_error_code: None,
+			node_id: None, onion_error_code: None,
 			#[cfg(test)]
 			onion_error_data: None
 		}
@@ -880,6 +881,7 @@ impl HTLCFailReason {
 						network_update: None,
 						payment_failed_permanently: false,
 						short_channel_id: Some(path.hops[0].short_channel_id),
+						node_id: Some(path.hops[0].pubkey),
 						onion_error_code: Some(*failure_code),
 						#[cfg(test)]
 						onion_error_data: Some(data.clone()),

lightning/src/ln/outbound_payment.rs

@@ -1609,11 +1609,11 @@ impl OutboundPayments {
 		#[cfg(test)]
 		let DecodedOnionFailure {
 			network_update, short_channel_id, payment_failed_permanently, onion_error_code,
-			onion_error_data
+			onion_error_data, node_id
 		} = onion_error.decode_onion_failure(secp_ctx, logger, &source);
 		#[cfg(not(test))]
 		let DecodedOnionFailure {
-			network_update, short_channel_id, payment_failed_permanently, onion_error_code,
+			network_update, short_channel_id, payment_failed_permanently, onion_error_code, node_id
 		} = onion_error.decode_onion_failure(secp_ctx, logger, &source);
 
 		let payment_is_probe = payment_is_probe(payment_hash, &payment_id, probing_cookie_secret);