expose CSR in ChannelParameters

exposes CSR in ChannelParameters and moves CommonOpenChannelFields::channel_parameters() to OpenChannelV1/V2::channel_parameters()

Author: Prabhat1308

lightning/src/ln/channelmanager.rs

@@ -8158,7 +8158,8 @@ where
 		ComplFunc: FnOnce(
 			Option<u64>,
 			bool,
-		) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
+		)
+			-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
 	>(
 		&self, prev_hop: HTLCPreviousHopData, payment_preimage: PaymentPreimage,
 		payment_info: Option<PaymentClaimDetails>, attribution_data: Option<AttributionData>,
@@ -8188,7 +8189,8 @@ where
 		ComplFunc: FnOnce(
 			Option<u64>,
 			bool,
-		) -> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
+		)
+			-> (Option<MonitorUpdateCompletionAction>, Option<RAAMonitorUpdateBlockingAction>),
 	>(
 		&self, prev_hop: HTLCClaimSource, payment_preimage: PaymentPreimage,
 		payment_info: Option<PaymentClaimDetails>, attribution_data: Option<AttributionData>,
@@ -9295,7 +9297,10 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 				},
 				channel_type,
 				is_announced,
-				params: common_fields.channel_parameters(),
+				params: match msg {
+					OpenChannelMessageRef::V1(msg) => msg.channel_parameters(),
+					OpenChannelMessageRef::V2(msg) => msg.channel_parameters(),
+				},
 			}, None));
 			peer_state.inbound_channel_request_by_id.insert(channel_id, InboundChannelRequest {
 				open_channel_msg: match msg {

lightning/src/ln/msgs.rs

@@ -247,20 +247,6 @@ pub struct CommonOpenChannelFields {
 	pub channel_type: Option<ChannelTypeFeatures>,
 }
 
-impl CommonOpenChannelFields {
-	/// The [`ChannelParameters`] for this channel.
-	pub fn channel_parameters(&self) -> ChannelParameters {
-		ChannelParameters {
-			dust_limit_satoshis: self.dust_limit_satoshis,
-			max_htlc_value_in_flight_msat: self.max_htlc_value_in_flight_msat,
-			htlc_minimum_msat: self.htlc_minimum_msat,
-			commitment_feerate_sat_per_1000_weight: self.commitment_feerate_sat_per_1000_weight,
-			to_self_delay: self.to_self_delay,
-			max_accepted_htlcs: self.max_accepted_htlcs,
-		}
-	}
-}
-
 /// A subset of [`CommonOpenChannelFields`], containing various parameters which are set by the
 /// channel initiator and which are not part of the channel funding transaction.
 #[derive(Clone, Debug, Hash, PartialEq, Eq)]
@@ -280,6 +266,8 @@ pub struct ChannelParameters {
 	pub to_self_delay: u16,
 	/// The maximum number of pending HTLCs towards the channel initiator.
 	pub max_accepted_htlcs: u16,
+	/// The minimum value unencumbered by HTLCs for the counterparty to keep in the channel
+	pub channel_reserve_satoshis: Option<u64>,
 }
 
 /// An [`open_channel`] message to be sent to or received from a peer.
@@ -297,6 +285,23 @@ pub struct OpenChannel {
 	pub channel_reserve_satoshis: u64,
 }
 
+impl OpenChannel {
+	/// The [`ChannelParameters`] for this V1 channel.
+	pub fn channel_parameters(&self) -> ChannelParameters {
+		ChannelParameters {
+			dust_limit_satoshis: self.common_fields.dust_limit_satoshis,
+			max_htlc_value_in_flight_msat: self.common_fields.max_htlc_value_in_flight_msat,
+			htlc_minimum_msat: self.common_fields.htlc_minimum_msat,
+			commitment_feerate_sat_per_1000_weight: self
+				.common_fields
+				.commitment_feerate_sat_per_1000_weight,
+			to_self_delay: self.common_fields.to_self_delay,
+			max_accepted_htlcs: self.common_fields.max_accepted_htlcs,
+			channel_reserve_satoshis: Some(self.channel_reserve_satoshis),
+		}
+	}
+}
+
 /// An [`open_channel2`] message to be sent by or received from the channel initiator.
 ///
 /// Used in V2 channel establishment
@@ -316,6 +321,23 @@ pub struct OpenChannelV2 {
 	pub require_confirmed_inputs: Option<()>,
 }
 
+impl OpenChannelV2 {
+	/// The [`ChannelParameters`] for this V2 channel.
+	pub fn channel_parameters(&self) -> ChannelParameters {
+		ChannelParameters {
+			dust_limit_satoshis: self.common_fields.dust_limit_satoshis,
+			max_htlc_value_in_flight_msat: self.common_fields.max_htlc_value_in_flight_msat,
+			htlc_minimum_msat: self.common_fields.htlc_minimum_msat,
+			commitment_feerate_sat_per_1000_weight: self
+				.common_fields
+				.commitment_feerate_sat_per_1000_weight,
+			to_self_delay: self.common_fields.to_self_delay,
+			max_accepted_htlcs: self.common_fields.max_accepted_htlcs,
+			channel_reserve_satoshis: None, // V2 doesn't have this field
+		}
+	}
+}
+
 /// Contains fields that are both common to [`accept_channel`] and [`accept_channel2`] messages.
 ///
 /// [`accept_channel`]: https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-accept_channel-message
@@ -3531,7 +3553,8 @@ where
 						}),
 				} => {
 					if amt.is_some()
-						|| cltv_value.is_some() || total_msat.is_some()
+						|| cltv_value.is_some()
+						|| total_msat.is_some()
 						|| keysend_preimage.is_some()
 						|| invoice_request.is_some()
 					{
@@ -3681,7 +3704,8 @@ where
 						}),
 				} => {
 					if amt.is_some()
-						|| cltv_value.is_some() || total_msat.is_some()
+						|| cltv_value.is_some()
+						|| total_msat.is_some()
 						|| keysend_preimage.is_some()
 						|| invoice_request.is_some()
 					{