f: switch to new HTLCSource variant

Author: arik-so

lightning/src/ln/channelmanager.rs

@@ -6207,25 +6207,31 @@ where
 							HTLCForwardInfo::AddHTLC(PendingAddHTLCInfo {
 								prev_short_channel_id, prev_htlc_id, prev_channel_id, prev_funding_outpoint,
 								prev_user_channel_id, prev_counterparty_node_id, forward_info: PendingHTLCInfo {
-									incoming_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value,
+									incoming_shared_secret: incoming_outer_shared_secret, payment_hash, outgoing_amt_msat, outgoing_cltv_value,
 									routing: PendingHTLCRouting::TrampolineForward {
-										ref onion_packet, blinded, incoming_cltv_expiry, ref hops, ..
+										ref onion_packet, blinded, incoming_cltv_expiry, incoming_shared_secret: incoming_trampoline_shared_secret, ref hops, ..
 									}, skimmed_fee_msat, incoming_amt_msat
 								},
 							}) => {
-								let htlc_source = HTLCSource::PreviousHopData(HTLCPreviousHopData {
-									short_channel_id: prev_short_channel_id,
-									user_channel_id: Some(prev_user_channel_id),
-									counterparty_node_id: prev_counterparty_node_id,
-									channel_id: prev_channel_id,
-									outpoint: prev_funding_outpoint,
-									htlc_id: prev_htlc_id,
-									incoming_packet_shared_secret: incoming_shared_secret,
-									// Phantom payments are only PendingHTLCRouting::Receive.
-									phantom_shared_secret: None,
-									blinded_failure: blinded.map(|b| b.failure),
-									cltv_expiry: Some(incoming_cltv_expiry),
-								});
+								let inter_trampoline_session_priv = SecretKey::from_slice(&self.entropy_source.get_secure_random_bytes()).unwrap();
+								let htlc_source = HTLCSource::TrampolineForward {
+									session_priv: inter_trampoline_session_priv,
+									previous_hop_data: HTLCPreviousHopData {
+										short_channel_id: prev_short_channel_id,
+										user_channel_id: Some(prev_user_channel_id),
+										counterparty_node_id: prev_counterparty_node_id,
+										channel_id: prev_channel_id,
+										outpoint: prev_funding_outpoint,
+										htlc_id: prev_htlc_id,
+										incoming_packet_shared_secret: incoming_outer_shared_secret,
+										// Phantom payments are only PendingHTLCRouting::Receive.
+										phantom_shared_secret: None,
+										blinded_failure: blinded.map(|b| b.failure),
+										cltv_expiry: Some(incoming_cltv_expiry),
+									},
+									incoming_trampoline_shared_secret,
+									hops: hops.clone(),
+								};
 								let next_blinding_point = blinded.and_then(|b| {
 									b.next_blinding_override.or_else(|| {
 										let encrypted_tlvs_ss = self.node_signer.ecdh(
@@ -6281,8 +6287,7 @@ where
 										}
 									}
 
-									let outer_session_priv = SecretKey::from_slice(&self.entropy_source.get_secure_random_bytes()).unwrap();
-									let onion_keys = onion_utils::construct_onion_keys(&self.secp_ctx, &path, &outer_session_priv).map_err(|_| {
+									let onion_keys = onion_utils::construct_onion_keys(&self.secp_ctx, &path, &inter_trampoline_session_priv).map_err(|_| {
 										APIError::InvalidRoute { err: "Pubkey along hop was maliciously selected".to_owned() }
 									}).unwrap();
 									let outer_onion_prng_seed = self.entropy_source.get_secure_random_bytes();