Add ChannelConfig options to open channel cli command

These were available on the server side but not in the cli

Author: benthecarman

ldk-server-cli/src/main.rs

@@ -11,7 +11,8 @@ use ldk_server_client::ldk_server_protos::api::{
 	OpenChannelRequest,
 };
 use ldk_server_client::ldk_server_protos::types::{
-	bolt11_invoice_description, Bolt11InvoiceDescription, PageToken, Payment,
+	bolt11_invoice_description, channel_config, Bolt11InvoiceDescription, ChannelConfig, PageToken,
+	Payment,
 };
 use std::fmt::Debug;
 
@@ -101,6 +102,29 @@ enum Commands {
 		push_to_counterparty_msat: Option<u64>,
 		#[arg(long)]
 		announce_channel: bool,
+		// Channel config options
+		#[arg(long, help = "Forwarding fee proportional (in millionths of a satoshi)")]
+		forwarding_fee_proportional_millionths: Option<u32>,
+		#[arg(long, help = "Forwarding fee base (in milli-satoshi)")]
+		forwarding_fee_base_msat: Option<u32>,
+		#[arg(long, help = "CLTV expiry delta")]
+		cltv_expiry_delta: Option<u32>,
+		#[arg(long, help = "Force close avoidance max fee (in satoshis)")]
+		force_close_avoidance_max_fee_satoshis: Option<u64>,
+		#[arg(long, help = "Accept underpaying HTLCs")]
+		accept_underpaying_htlcs: Option<bool>,
+		#[arg(
+			long,
+			help = "Max dust HTLC exposure as fixed limit (in milli-satoshi)",
+			conflicts_with = "max_dust_htlc_fee_rate_multiplier"
+		)]
+		max_dust_htlc_fixed_limit_msat: Option<u64>,
+		#[arg(
+			long,
+			help = "Max dust HTLC exposure as fee rate multiplier",
+			conflicts_with = "max_dust_htlc_fixed_limit_msat"
+		)]
+		max_dust_htlc_fee_rate_multiplier: Option<u64>,
 	},
 	ListChannels,
 	ListPayments {
@@ -213,15 +237,32 @@ async fn main() {
 			channel_amount_sats,
 			push_to_counterparty_msat,
 			announce_channel,
+			forwarding_fee_proportional_millionths,
+			forwarding_fee_base_msat,
+			cltv_expiry_delta,
+			force_close_avoidance_max_fee_satoshis,
+			accept_underpaying_htlcs,
+			max_dust_htlc_fixed_limit_msat,
+			max_dust_htlc_fee_rate_multiplier,
 		} => {
+			let channel_config = build_channel_config(
+				forwarding_fee_proportional_millionths,
+				forwarding_fee_base_msat,
+				cltv_expiry_delta,
+				force_close_avoidance_max_fee_satoshis,
+				accept_underpaying_htlcs,
+				max_dust_htlc_fixed_limit_msat,
+				max_dust_htlc_fee_rate_multiplier,
+			);
+
 			handle_response_result(
 				client
 					.open_channel(OpenChannelRequest {
 						node_pubkey,
 						address,
 						channel_amount_sats,
 						push_to_counterparty_msat,
-						channel_config: None,
+						channel_config,
 						announce_channel,
 					})
 					.await,
@@ -236,6 +277,52 @@ async fn main() {
 	}
 }
 
+fn build_channel_config(
+	forwarding_fee_proportional_millionths: Option<u32>, forwarding_fee_base_msat: Option<u32>,
+	cltv_expiry_delta: Option<u32>, force_close_avoidance_max_fee_satoshis: Option<u64>,
+	accept_underpaying_htlcs: Option<bool>, max_dust_htlc_fixed_limit_msat: Option<u64>,
+	max_dust_htlc_fee_rate_multiplier: Option<u64>,
+) -> Option<ChannelConfig> {
+	// Only create a config if at least one field is set
+	if forwarding_fee_proportional_millionths.is_none()
+		&& forwarding_fee_base_msat.is_none()
+		&& cltv_expiry_delta.is_none()
+		&& force_close_avoidance_max_fee_satoshis.is_none()
+		&& accept_underpaying_htlcs.is_none()
+		&& max_dust_htlc_fixed_limit_msat.is_none()
+		&& max_dust_htlc_fee_rate_multiplier.is_none()
+	{
+		return None;
+	}
+
+	let max_dust_htlc_exposure = match (
+		max_dust_htlc_fixed_limit_msat,
+		max_dust_htlc_fee_rate_multiplier,
+	) {
+		(Some(_), Some(_)) => {
+			// This case should be unreachable due to clap's conflict_with enforcement, but we handle it just in case.
+			handle_error(LdkServerError::new(
+				InvalidRequestError,
+				"Only one of max_dust_htlc_fixed_limit_msat or max_dust_htlc_fee_rate_multiplier can be set.".to_string(),
+			));
+		},
+		(Some(limit), None) => Some(channel_config::MaxDustHtlcExposure::FixedLimitMsat(limit)),
+		(None, Some(multiplier)) => {
+			Some(channel_config::MaxDustHtlcExposure::FeeRateMultiplier(multiplier))
+		},
+		(None, None) => None,
+	};
+
+	Some(ChannelConfig {
+		forwarding_fee_proportional_millionths,
+		forwarding_fee_base_msat,
+		cltv_expiry_delta,
+		force_close_avoidance_max_fee_satoshis,
+		accept_underpaying_htlcs,
+		max_dust_htlc_exposure,
+	})
+}
+
 async fn list_n_payments(
 	client: LdkServerClient, number_of_payments: Option<u64>,
 ) -> Result<Vec<Payment>, LdkServerError> {