Store our skimmed fee in PendingHTLCRouting

Receivers need to use this value to verify incoming payments if
ChannelConfig::accept_underpaying_htlcs is set.

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -104,6 +104,9 @@ pub(super) enum PendingHTLCRouting {
 		/// The SCID from the onion that we should forward to. This could be a real SCID or a fake one
 		/// generated using `get_fake_scid` from the scid_utils::fake_scid module.
 		short_channel_id: u64, // This should be NonZero<u64> eventually when we bump MSRV
+		/// The fee we're skimming off the top of this HTLC. See
+		/// [`ChannelConfig::accept_underpaying_htlcs`].
+		skimmed_fee_msat: Option<u64>,
 	},
 	Receive {
 		payment_data: msgs::FinalOnionHopData,
@@ -2764,6 +2767,7 @@ where
 					routing: PendingHTLCRouting::Forward {
 						onion_packet: outgoing_packet,
 						short_channel_id,
+						skimmed_fee_msat: None,
 					},
 					payment_hash: msg.payment_hash.clone(),
 					incoming_shared_secret: shared_secret,
@@ -3402,8 +3406,16 @@ where
 			})?;
 
 		let routing = match payment.forward_info.routing {
-			PendingHTLCRouting::Forward { onion_packet, .. } => {
-				PendingHTLCRouting::Forward { onion_packet, short_channel_id: next_hop_scid }
+			PendingHTLCRouting::Forward { onion_packet, skimmed_fee_msat, .. } => {
+				debug_assert!(skimmed_fee_msat.is_none());
+				PendingHTLCRouting::Forward {
+					onion_packet,
+					short_channel_id: next_hop_scid,
+					skimmed_fee_msat:
+						// The minuend here must match the expected forward amount generated for the
+						// HTLCIntercepted event.
+						Some(payment.forward_info.outgoing_amt_msat.saturating_sub(amt_to_forward_msat)),
+				}
 			},
 			_ => unreachable!() // Only `PendingHTLCRouting::Forward`s are intercepted
 		};
@@ -7311,6 +7323,7 @@ impl_writeable_tlv_based!(PhantomRouteHints, {
 impl_writeable_tlv_based_enum!(PendingHTLCRouting,
 	(0, Forward) => {
 		(0, onion_packet, required),
+		(1, skimmed_fee_msat, option),
 		(2, short_channel_id, required),
 	},
 	(1, Receive) => {

pending_changelog/forward-underpaying-htlc.txt

@@ -2,3 +2,5 @@
 
 * Setting `ChannelConfig::accept_underpaying_htlcs` may break compatibility with versions of LDK
 	prior to 0.0.116, and unsetting the feature between restarts may lead to payment failures.
+* Forwarding less than the expected amount in `ChannelManager::forward_intercepted_htlc` and
+	subsequently downgrading to an LDK version prior to 0.0.116 may result in forwarding failures.