Add LSPS2 RPCs to ldk-server-protos and ldk-server

Expose dedicated LSPS2 invoice endpoints so callers can request fixed
and variable-amount JIT invoices without overloading the existing
`Bolt11Receive` API surface.

Generated with the assistance of AI.

Co-Authored-By: HAL 9000

Author: tnull

ldk-server-protos/src/api.rs

@@ -174,6 +174,70 @@ pub struct Bolt11ReceiveResponse {
 	#[prost(string, tag = "1")]
 	pub invoice: ::prost::alloc::string::String,
 }
+/// Return a BOLT11 payable invoice that can be used to request and receive a payment via an
+/// LSPS2 just-in-time channel.
+/// See more: <https://docs.rs/ldk-node/latest/ldk_node/payment/struct.Bolt11Payment.html#method.receive_via_jit_channel>
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Bolt11ReceiveViaJitChannelRequest {
+	/// The amount in millisatoshi to request.
+	#[prost(uint64, tag = "1")]
+	pub amount_msat: u64,
+	/// An optional description to attach along with the invoice.
+	/// Will be set in the description field of the encoded payment request.
+	#[prost(message, optional, tag = "2")]
+	pub description: ::core::option::Option<super::types::Bolt11InvoiceDescription>,
+	/// Invoice expiry time in seconds.
+	#[prost(uint32, tag = "3")]
+	pub expiry_secs: u32,
+	/// Optional upper bound for the total fee an LSP may deduct when opening the JIT channel.
+	#[prost(uint64, optional, tag = "4")]
+	pub max_total_lsp_fee_limit_msat: ::core::option::Option<u64>,
+}
+/// The response `content` for the `Bolt11ReceiveViaJitChannel` API, when HttpStatusCode is OK (200).
+/// When HttpStatusCode is not OK (non-200), the response `content` contains a serialized `ErrorResponse`.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Bolt11ReceiveViaJitChannelResponse {
+	/// An invoice for a payment within the Lightning Network.
+	#[prost(string, tag = "1")]
+	pub invoice: ::prost::alloc::string::String,
+}
+/// Return a variable-amount BOLT11 invoice that can be used to receive a payment via an LSPS2
+/// just-in-time channel.
+/// See more: <https://docs.rs/ldk-node/latest/ldk_node/payment/struct.Bolt11Payment.html#method.receive_variable_amount_via_jit_channel>
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Bolt11ReceiveVariableAmountViaJitChannelRequest {
+	/// An optional description to attach along with the invoice.
+	/// Will be set in the description field of the encoded payment request.
+	#[prost(message, optional, tag = "1")]
+	pub description: ::core::option::Option<super::types::Bolt11InvoiceDescription>,
+	/// Invoice expiry time in seconds.
+	#[prost(uint32, tag = "2")]
+	pub expiry_secs: u32,
+	/// Optional upper bound for the proportional fee, in parts-per-million millisatoshis, that an
+	/// LSP may deduct when opening the JIT channel.
+	#[prost(uint64, optional, tag = "3")]
+	pub max_proportional_lsp_fee_limit_ppm_msat: ::core::option::Option<u64>,
+}
+/// The response `content` for the `Bolt11ReceiveVariableAmountViaJitChannel` API, when HttpStatusCode is OK (200).
+/// When HttpStatusCode is not OK (non-200), the response `content` contains a serialized `ErrorResponse`.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", serde(rename_all = "snake_case"))]
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct Bolt11ReceiveVariableAmountViaJitChannelResponse {
+	/// An invoice for a payment within the Lightning Network.
+	#[prost(string, tag = "1")]
+	pub invoice: ::prost::alloc::string::String,
+}
 /// Send a payment for a BOLT11 invoice.
 /// See more: <https://docs.rs/ldk-node/latest/ldk_node/payment/struct.Bolt11Payment.html#method.send>
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]

ldk-server-protos/src/endpoints.rs

@@ -12,6 +12,9 @@ pub const GET_BALANCES_PATH: &str = "GetBalances";
 pub const ONCHAIN_RECEIVE_PATH: &str = "OnchainReceive";
 pub const ONCHAIN_SEND_PATH: &str = "OnchainSend";
 pub const BOLT11_RECEIVE_PATH: &str = "Bolt11Receive";
+pub const BOLT11_RECEIVE_VIA_JIT_CHANNEL_PATH: &str = "Bolt11ReceiveViaJitChannel";
+pub const BOLT11_RECEIVE_VARIABLE_AMOUNT_VIA_JIT_CHANNEL_PATH: &str =
+	"Bolt11ReceiveVariableAmountViaJitChannel";
 pub const BOLT11_SEND_PATH: &str = "Bolt11Send";
 pub const BOLT12_RECEIVE_PATH: &str = "Bolt12Receive";
 pub const BOLT12_SEND_PATH: &str = "Bolt12Send";

ldk-server-protos/src/proto/api.proto

@@ -148,6 +148,58 @@ message Bolt11ReceiveResponse {
   string invoice = 1;
 }
 
+// Return a BOLT11 payable invoice that can be used to request and receive a payment via an
+// LSPS2 just-in-time channel.
+// See more: https://docs.rs/ldk-node/latest/ldk_node/payment/struct.Bolt11Payment.html#method.receive_via_jit_channel
+message Bolt11ReceiveViaJitChannelRequest {
+
+  // The amount in millisatoshi to request.
+  uint64 amount_msat = 1;
+
+  // An optional description to attach along with the invoice.
+  // Will be set in the description field of the encoded payment request.
+  types.Bolt11InvoiceDescription description = 2;
+
+  // Invoice expiry time in seconds.
+  uint32 expiry_secs = 3;
+
+  // Optional upper bound for the total fee an LSP may deduct when opening the JIT channel.
+  optional uint64 max_total_lsp_fee_limit_msat = 4;
+}
+
+// The response `content` for the `Bolt11ReceiveViaJitChannel` API, when HttpStatusCode is OK (200).
+// When HttpStatusCode is not OK (non-200), the response `content` contains a serialized `ErrorResponse`.
+message Bolt11ReceiveViaJitChannelResponse {
+
+  // An invoice for a payment within the Lightning Network.
+  string invoice = 1;
+}
+
+// Return a variable-amount BOLT11 invoice that can be used to receive a payment via an LSPS2
+// just-in-time channel.
+// See more: https://docs.rs/ldk-node/latest/ldk_node/payment/struct.Bolt11Payment.html#method.receive_variable_amount_via_jit_channel
+message Bolt11ReceiveVariableAmountViaJitChannelRequest {
+
+  // An optional description to attach along with the invoice.
+  // Will be set in the description field of the encoded payment request.
+  types.Bolt11InvoiceDescription description = 1;
+
+  // Invoice expiry time in seconds.
+  uint32 expiry_secs = 2;
+
+  // Optional upper bound for the proportional fee, in parts-per-million millisatoshis, that an
+  // LSP may deduct when opening the JIT channel.
+  optional uint64 max_proportional_lsp_fee_limit_ppm_msat = 3;
+}
+
+// The response `content` for the `Bolt11ReceiveVariableAmountViaJitChannel` API, when HttpStatusCode is OK (200).
+// When HttpStatusCode is not OK (non-200), the response `content` contains a serialized `ErrorResponse`.
+message Bolt11ReceiveVariableAmountViaJitChannelResponse {
+
+  // An invoice for a payment within the Lightning Network.
+  string invoice = 1;
+}
+
 // Send a payment for a BOLT11 invoice.
 // See more: https://docs.rs/ldk-node/latest/ldk_node/payment/struct.Bolt11Payment.html#method.send
 message Bolt11SendRequest {

ldk-server/src/api/bolt11_receive_via_jit_channel.rs

@@ -0,0 +1,45 @@
+// This file is Copyright its original authors, visible in version control
+// history.
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
+use ldk_server_protos::api::{
+	Bolt11ReceiveVariableAmountViaJitChannelRequest,
+	Bolt11ReceiveVariableAmountViaJitChannelResponse, Bolt11ReceiveViaJitChannelRequest,
+	Bolt11ReceiveViaJitChannelResponse,
+};
+
+use crate::api::error::LdkServerError;
+use crate::service::Context;
+use crate::util::proto_adapter::proto_to_bolt11_description;
+
+pub(crate) fn handle_bolt11_receive_via_jit_channel_request(
+	context: Context, request: Bolt11ReceiveViaJitChannelRequest,
+) -> Result<Bolt11ReceiveViaJitChannelResponse, LdkServerError> {
+	let description = proto_to_bolt11_description(request.description)?;
+	let invoice = context.node.bolt11_payment().receive_via_jit_channel(
+		request.amount_msat,
+		&description,
+		request.expiry_secs,
+		request.max_total_lsp_fee_limit_msat,
+	)?;
+
+	Ok(Bolt11ReceiveViaJitChannelResponse { invoice: invoice.to_string() })
+}
+
+pub(crate) fn handle_bolt11_receive_variable_amount_via_jit_channel_request(
+	context: Context, request: Bolt11ReceiveVariableAmountViaJitChannelRequest,
+) -> Result<Bolt11ReceiveVariableAmountViaJitChannelResponse, LdkServerError> {
+	let description = proto_to_bolt11_description(request.description)?;
+	let invoice = context.node.bolt11_payment().receive_variable_amount_via_jit_channel(
+		&description,
+		request.expiry_secs,
+		request.max_proportional_lsp_fee_limit_ppm_msat,
+	)?;
+
+	Ok(Bolt11ReceiveVariableAmountViaJitChannelResponse { invoice: invoice.to_string() })
+}

ldk-server/src/api/mod.rs

@@ -15,6 +15,7 @@ use crate::api::error::LdkServerError;
 use crate::api::error::LdkServerErrorCode::InvalidRequestError;
 
 pub(crate) mod bolt11_receive;
+pub(crate) mod bolt11_receive_via_jit_channel;
 pub(crate) mod bolt11_send;
 pub(crate) mod bolt12_receive;
 pub(crate) mod bolt12_send;

ldk-server/src/service.rs

@@ -19,7 +19,8 @@ use ldk_node::bitcoin::hashes::hmac::{Hmac, HmacEngine};
 use ldk_node::bitcoin::hashes::{sha256, Hash, HashEngine};
 use ldk_node::Node;
 use ldk_server_protos::endpoints::{
-	BOLT11_RECEIVE_PATH, BOLT11_SEND_PATH, BOLT12_RECEIVE_PATH, BOLT12_SEND_PATH,
+	BOLT11_RECEIVE_PATH, BOLT11_RECEIVE_VARIABLE_AMOUNT_VIA_JIT_CHANNEL_PATH,
+	BOLT11_RECEIVE_VIA_JIT_CHANNEL_PATH, BOLT11_SEND_PATH, BOLT12_RECEIVE_PATH, BOLT12_SEND_PATH,
 	CLOSE_CHANNEL_PATH, CONNECT_PEER_PATH, DISCONNECT_PEER_PATH, EXPORT_PATHFINDING_SCORES_PATH,
 	FORCE_CLOSE_CHANNEL_PATH, GET_BALANCES_PATH, GET_NODE_INFO_PATH, GET_PAYMENT_DETAILS_PATH,
 	GRAPH_GET_CHANNEL_PATH, GRAPH_GET_NODE_PATH, GRAPH_LIST_CHANNELS_PATH, GRAPH_LIST_NODES_PATH,
@@ -30,6 +31,10 @@ use ldk_server_protos::endpoints::{
 use prost::Message;
 
 use crate::api::bolt11_receive::handle_bolt11_receive_request;
+use crate::api::bolt11_receive_via_jit_channel::{
+	handle_bolt11_receive_variable_amount_via_jit_channel_request,
+	handle_bolt11_receive_via_jit_channel_request,
+};
 use crate::api::bolt11_send::handle_bolt11_send_request;
 use crate::api::bolt12_receive::handle_bolt12_receive_request;
 use crate::api::bolt12_send::handle_bolt12_send_request;
@@ -218,6 +223,20 @@ impl Service<Request<Incoming>> for NodeService {
 				api_key,
 				handle_bolt11_receive_request,
 			)),
+			BOLT11_RECEIVE_VIA_JIT_CHANNEL_PATH => Box::pin(handle_request(
+				context,
+				req,
+				auth_params,
+				api_key,
+				handle_bolt11_receive_via_jit_channel_request,
+			)),
+			BOLT11_RECEIVE_VARIABLE_AMOUNT_VIA_JIT_CHANNEL_PATH => Box::pin(handle_request(
+				context,
+				req,
+				auth_params,
+				api_key,
+				handle_bolt11_receive_variable_amount_via_jit_channel_request,
+			)),
 			BOLT11_SEND_PATH => Box::pin(handle_request(
 				context,
 				req,