Parse Trampoline forward payloads

We will be using the same logic for decoding onion payloads for outer
and for Trampoline onions. To accommodate some Trampoline-only payloads,
we add the ability to parse forward payloads that carry a next node ID
rather than an SCID.

Author: arik-so

lightning/src/ln/msgs.rs

@@ -1800,7 +1800,7 @@ mod fuzzy_internal_msgs {
 
 	#[allow(unused_imports)]
 	use crate::prelude::*;
-
+	use crate::routing::gossip::NodeId;
 	// These types aren't intended to be pub, but are exposed for direct fuzzing (as we deserialize
 	// them from untrusted input):
 
@@ -1811,6 +1811,15 @@ mod fuzzy_internal_msgs {
 		pub outgoing_cltv_value: u32,
 	}
 
+	#[allow(unused)]
+	pub struct InboundTrampolineForwardPayload {
+		pub outgoing_node_id: NodeId,
+		/// The value, in msat, of the payment after this hop's fee is deducted.
+		pub amt_to_forward: u64,
+		pub outgoing_cltv_value: u32,
+	}
+
+	#[allow(unused)]
 	pub struct InboundTrampolineEntrypointPayload {
 		pub amt_to_forward: u64,
 		pub outgoing_cltv_value: u32,
@@ -1854,6 +1863,10 @@ mod fuzzy_internal_msgs {
 		Receive(InboundOnionReceivePayload),
 		BlindedForward(InboundOnionBlindedForwardPayload),
 		BlindedReceive(InboundOnionBlindedReceivePayload),
+
+		// These payloads should be seen inside an inner Trampoline onion
+		#[allow(unused)]
+		TrampolineForward(InboundTrampolineForwardPayload),
 	}
 
 	pub(crate) enum OutboundOnionPayload<'a> {
@@ -2914,6 +2927,7 @@ impl<NS: Deref> ReadableArgs<(Option<PublicKey>, NS)> for InboundOnionPayload wh
 		let mut payment_data: Option<FinalOnionHopData> = None;
 		let mut encrypted_tlvs_opt: Option<WithoutLength<Vec<u8>>> = None;
 		let mut intro_node_blinding_point = None;
+		let mut outgoing_node_id: Option<NodeId> = None;
 		let mut payment_metadata: Option<WithoutLength<Vec<u8>>> = None;
 		let mut total_msat = None;
 		let mut keysend_preimage: Option<PaymentPreimage> = None;
@@ -2930,6 +2944,7 @@ impl<NS: Deref> ReadableArgs<(Option<PublicKey>, NS)> for InboundOnionPayload wh
 			(8, payment_data, option),
 			(10, encrypted_tlvs_opt, option),
 			(12, intro_node_blinding_point, option),
+			(14, outgoing_node_id, option),
 			(16, payment_metadata, option),
 			(18, total_msat, (option, encoding: (u64, HighZeroBytesDroppedBigSize))),
 			(20, trampoline_onion_packet, option),
@@ -3011,6 +3026,15 @@ impl<NS: Deref> ReadableArgs<(Option<PublicKey>, NS)> for InboundOnionPayload wh
 				amt_to_forward: amt.ok_or(DecodeError::InvalidValue)?,
 				outgoing_cltv_value: cltv_value.ok_or(DecodeError::InvalidValue)?,
 			}))
+		} else if let Some(outgoing_node_id) = outgoing_node_id {
+			if payment_data.is_some() || payment_metadata.is_some() || encrypted_tlvs_opt.is_some() ||
+				total_msat.is_some() || invoice_request.is_some()
+			{ return Err(DecodeError::InvalidValue) }
+			Ok(Self::TrampolineForward(InboundTrampolineForwardPayload {
+				outgoing_node_id,
+				amt_to_forward: amt.ok_or(DecodeError::InvalidValue)?,
+				outgoing_cltv_value: cltv_value.ok_or(DecodeError::InvalidValue)?,
+			}))
 		} else if let Some(trampoline_onion_packet) = trampoline_onion_packet {
 			if payment_metadata.is_some() || encrypted_tlvs_opt.is_some() ||
 				total_msat.is_some()