f Add more fields to LSPS2ServiceConfig

Author: tnull

bindings/ldk_node.udl

@@ -25,6 +25,18 @@ dictionary EsploraSyncConfig {
 	u64 fee_rate_cache_update_interval_secs;
 };
 
+dictionary LSPS2ServiceConfig {
+	string? require_token;
+	boolean advertise_service;
+	u32 channel_opening_fee_ppm;
+	u32 channel_over_provisioning_ppm;
+	u64 min_channel_opening_fee_msat;
+	u32 min_channel_lifetime;
+	u32 max_client_to_self_delay;
+	u64 min_payment_size_msat;
+	u64 max_payment_size_msat;
+};
+
 enum LogLevel {
 	"Gossip",
 	"Trace",

src/builder.rs

@@ -18,7 +18,9 @@ use crate::gossip::GossipSource;
 use crate::io::sqlite_store::SqliteStore;
 use crate::io::utils::{read_node_metrics, write_node_metrics};
 use crate::io::vss_store::VssStore;
-use crate::liquidity::{LSPS1ClientConfig, LSPS2ClientConfig, LiquiditySourceBuilder};
+use crate::liquidity::{
+	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
+};
 use crate::logger::{log_error, log_info, LdkLogger, LogLevel, LogWriter, Logger};
 use crate::message_handler::NodeCustomMessageHandler;
 use crate::payment::store::PaymentStore;
@@ -108,12 +110,6 @@ struct LiquiditySourceConfig {
 	lsps2_service: Option<LSPS2ServiceConfig>,
 }
 
-#[derive(Debug, Clone)]
-struct LSPS2ServiceConfig {
-	token: Option<String>,
-	advertise_service: bool,
-}
-
 #[derive(Clone)]
 enum LogWriterConfig {
 	File { log_file_path: Option<String>, log_level: Option<LogLevel> },
@@ -352,20 +348,15 @@ impl NodeBuilder {
 	/// Configures the [`Node`] instance to provide an [LSPS2] service, issuing just-in-time
 	/// channels to clients.
 	///
-	/// If a `token` is provided, only requests matching this token will be accepted.
-	///
-	/// If `advertise_service` is set, the LSPS service will be announced via the gossip network.
-	///
 	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
 	///
 	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
 	pub fn set_liquidity_provider_lsps2(
-		&mut self, token: Option<String>, advertise_service: bool,
+		&mut self, service_config: LSPS2ServiceConfig,
 	) -> &mut Self {
 		let liquidity_source_config =
 			self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
-		let lsps2_service_config = LSPS2ServiceConfig { token, advertise_service };
-		liquidity_source_config.lsps2_service = Some(lsps2_service_config);
+		liquidity_source_config.lsps2_service = Some(service_config);
 		self
 	}
 
@@ -724,15 +715,11 @@ impl ArcedNodeBuilder {
 	/// Configures the [`Node`] instance to provide an [LSPS2] service, issuing just-in-time
 	/// channels to clients.
 	///
-	/// If a `token` is provided, only requests matching this token will be accepted.
-	///
-	/// If `advertise_service` is set, the LSPS service will be announced via the gossip network.
-	///
 	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
 	///
 	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
-	pub fn set_liquidity_provider_lsps2(&self, token: Option<String>, advertise_service: bool) {
-		self.inner.write().unwrap().set_liquidity_provider_lsps2(token, advertise_service);
+	pub fn set_liquidity_provider_lsps2(&self, service_config: LSPS2ServiceConfig) {
+		self.inner.write().unwrap().set_liquidity_provider_lsps2(service_config);
 	}
 
 	/// Sets the used storage directory path.
@@ -1246,11 +1233,7 @@ fn build_with_store_internal(
 				lsps_xpriv.private_key.secret_bytes()
 			};
 			lsc.lsps2_service.as_ref().map(|config| {
-				liquidity_source_builder.lsps2_service(
-					promise_secret,
-					config.token.clone(),
-					config.advertise_service,
-				)
+				liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 			});
 
 			let liquidity_source = Arc::new(liquidity_source_builder.build());

src/liquidity.rs

@@ -77,9 +77,45 @@ pub(crate) struct LSPS2ClientConfig {
 }
 
 struct LSPS2Service {
-	token: Option<String>,
+	service_config: LSPS2ServiceConfig,
 	ldk_service_config: LdkLSPS2ServiceConfig,
-	advertise_service: bool,
+}
+
+/// Represents the configuration of the LSPS2 service.
+///
+/// See [bLIP-52 / LSPS2] for more information.
+///
+/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
+#[derive(Debug, Clone)]
+pub struct LSPS2ServiceConfig {
+	/// A token we may require to be sent by the clients.
+	///
+	/// If set, only requests matching this token will be accepted.
+	pub require_token: Option<String>,
+	/// Indicates whether the LSPS service will be announced via the gossip network.
+	pub advertise_service: bool,
+	/// The fee we withhold for the channel open from the initial payment.
+	///
+	/// This fee is proportional to the client-requested amount, in parts-per-million.
+	pub channel_opening_fee_ppm: u32,
+	/// The proportional overprovisioning for the channel.
+	///
+	/// This determines, in parts-per-million of the client-requested amount, how much value we'll
+	/// provision on top of the client-requested payment amount.
+	///
+	/// For example, setting this to `100_000` will result in a channel being opened that is 10%
+	/// larger than the client-requested payment amount.
+	pub channel_over_provisioning_ppm: u32,
+	/// The minimum fee required for opening a channel.
+	pub min_channel_opening_fee_msat: u64,
+	/// The minimum number of blocks after confirmation we promise to keep the channel open.
+	pub min_channel_lifetime: u32,
+	/// The maximum number of blocks that the client is allowed to set its `to_self_delay` parameter.
+	pub max_client_to_self_delay: u32,
+	/// The minimum payment size that we will accept when opening a channel.
+	pub min_payment_size_msat: u64,
+	/// The maximum payment size that we will accept when opening a channel.
+	pub max_payment_size_msat: u64,
 }
 
 pub(crate) struct LiquiditySourceBuilder<L: Deref>
@@ -157,17 +193,17 @@ where
 	}
 
 	pub(crate) fn lsps2_service(
-		&mut self, promise_secret: [u8; 32], token: Option<String>, advertise_service: bool,
+		&mut self, promise_secret: [u8; 32], service_config: LSPS2ServiceConfig,
 	) -> &mut Self {
 		let ldk_service_config = LdkLSPS2ServiceConfig { promise_secret };
-		self.lsps2_service = Some(LSPS2Service { token, ldk_service_config, advertise_service });
+		self.lsps2_service = Some(LSPS2Service { service_config, ldk_service_config });
 		self
 	}
 
 	pub(crate) fn build(self) -> LiquiditySource<L> {
 		let liquidity_service_config = self.lsps2_service.as_ref().map(|s| {
 			let lsps2_service_config = Some(s.ldk_service_config.clone());
-			let advertise_service = s.advertise_service;
+			let advertise_service = s.service_config.advertise_service;
 			LiquidityServiceConfig { lsps2_service_config, advertise_service }
 		});
 

src/uniffi_types.rs

@@ -14,7 +14,7 @@ pub use crate::config::{
 	default_config, AnchorChannelsConfig, EsploraSyncConfig, MaxDustHTLCExposure,
 };
 pub use crate::graph::{ChannelInfo, ChannelUpdateInfo, NodeAnnouncementInfo, NodeInfo};
-pub use crate::liquidity::{LSPS1OrderStatus, OnchainPaymentInfo, PaymentInfo};
+pub use crate::liquidity::{LSPS1OrderStatus, LSPS2ServiceConfig, OnchainPaymentInfo, PaymentInfo};
 pub use crate::logger::{LogLevel, LogRecord, LogWriter};
 pub use crate::payment::store::{
 	ConfirmationStatus, LSPFeeLimits, PaymentDirection, PaymentKind, PaymentStatus,