f Fix Add htcl min/max to CounterpartyForwardingInfo

Author: ViktorTigerstrom

lightning/src/ln/channel.rs

@@ -4310,6 +4310,11 @@ impl<Signer: Sign> Channel<Signer> {
 		self.counterparty_htlc_minimum_msat
 	}
 
+	/// Allowed in any state (including after shutdown), but will return none before TheirInitSent
+	pub fn get_counterparty_htlc_maximum_msat(&self) -> Option<u64> {
+		self.get_htlc_maximum_msat(self.counterparty_max_htlc_value_in_flight_msat)
+	}
+
 	fn get_htlc_maximum_msat(&self, party_max_htlc_value_in_flight_msat: u64) -> Option<u64> {
 		self.counterparty_selected_channel_reserve_satoshis.map(|counterparty_reserve| {
 			let holder_reserve = self.holder_selected_channel_reserve_satoshis;
@@ -5385,16 +5390,12 @@ impl<Signer: Sign> Channel<Signer> {
 		if msg.contents.htlc_minimum_msat >= self.channel_value_satoshis * 1000 {
 			return Err(ChannelError::Close("Minimum htlc value is greater than channel value".to_string()));
 		}
-		let outbound_htlc_maximum_msat = match msg.contents.htlc_maximum_msat {
-			OptionalField::Present(htcl_max) => Some(htcl_max),
-			OptionalField::Absent => None
-		};
 		self.counterparty_forwarding_info = Some(CounterpartyForwardingInfo {
 			fee_base_msat: msg.contents.fee_base_msat,
 			fee_proportional_millionths: msg.contents.fee_proportional_millionths,
 			cltv_expiry_delta: msg.contents.cltv_expiry_delta,
-			outbound_htlc_minimum_msat: Some(msg.contents.htlc_minimum_msat),
-			outbound_htlc_maximum_msat,
+			outbound_htlc_minimum_msat: Some(self.get_counterparty_htlc_minimum_msat()),
+			outbound_htlc_maximum_msat: self.get_counterparty_htlc_maximum_msat(),
 		});
 
 		Ok(())

lightning/src/ln/channelmanager.rs

@@ -1160,7 +1160,7 @@ pub struct CounterpartyForwardingInfo {
 	/// `cltv_expiry_delta` for more details.
 	pub cltv_expiry_delta: u16,
 	/// The smallest value HTLC (in msat) the remote peer will accept, for this channel. This field
-	/// is only None for `CounterpartyForwardingInfo` objects serialized prior to LDK 0.0.107
+	/// is only `None` for `CounterpartyForwardingInfo` objects serialized prior to LDK 0.0.107
 	pub outbound_htlc_minimum_msat: Option<u64>,
 	/// The largest value HTLC (in msat) the remote peer currently will accept, for this channel.
 	pub outbound_htlc_maximum_msat: Option<u64>,