feat: add LSPS7 (Channel Lease Extensions) client handler

Implement bLIP-57 / LSPS7 client-side support in lightning-liquidity.
LSPS7 allows extending the lifetime of LSP-purchased channels.

Three JSON-RPC methods:
- lsps7.get_extendable_channels: list channels eligible for extension
- lsps7.create_order: create extension order with payment info
- lsps7.get_order: poll order status

Reuses LSPS1PaymentInfo for the payment object as specified.
Client-only scope (no service handler).

Author: kaloudis

lightning-liquidity/src/events/mod.rs

@@ -24,6 +24,7 @@ use crate::lsps0;
 use crate::lsps1;
 use crate::lsps2;
 use crate::lsps5;
+use crate::lsps7;
 
 /// An event which you should probably take some action in response to.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -42,6 +43,8 @@ pub enum LiquidityEvent {
 	LSPS5Client(lsps5::event::LSPS5ClientEvent),
 	/// An LSPS5 (Webhook) server event.
 	LSPS5Service(lsps5::event::LSPS5ServiceEvent),
+	/// An LSPS7 (Channel Lease Extension) client event.
+	LSPS7Client(lsps7::event::LSPS7ClientEvent),
 }
 
 impl From<lsps0::event::LSPS0ClientEvent> for LiquidityEvent {
@@ -85,3 +88,9 @@ impl From<lsps5::event::LSPS5ServiceEvent> for LiquidityEvent {
 		Self::LSPS5Service(event)
 	}
 }
+
+impl From<lsps7::event::LSPS7ClientEvent> for LiquidityEvent {
+	fn from(event: lsps7::event::LSPS7ClientEvent) -> Self {
+		Self::LSPS7Client(event)
+	}
+}

lightning-liquidity/src/lib.rs

@@ -63,6 +63,7 @@ pub mod lsps0;
 pub mod lsps1;
 pub mod lsps2;
 pub mod lsps5;
+pub mod lsps7;
 mod manager;
 pub mod message_queue;
 pub mod persist;

lightning-liquidity/src/lsps0/msgs.rs

@@ -84,6 +84,7 @@ impl TryFrom<LSPSMessage> for LSPS0Message {
 			LSPSMessage::LSPS1(_) => Err(()),
 			LSPSMessage::LSPS2(_) => Err(()),
 			LSPSMessage::LSPS5(_) => Err(()),
+			LSPSMessage::LSPS7(_) => Err(()),
 		}
 	}
 }

lightning-liquidity/src/lsps0/ser.rs

@@ -25,6 +25,10 @@ use crate::lsps5::msgs::{
 	LSPS5Message, LSPS5Request, LSPS5Response, LSPS5_LIST_WEBHOOKS_METHOD_NAME,
 	LSPS5_REMOVE_WEBHOOK_METHOD_NAME, LSPS5_SET_WEBHOOK_METHOD_NAME,
 };
+use crate::lsps7::msgs::{
+	LSPS7Message, LSPS7Request, LSPS7Response, LSPS7_CREATE_ORDER_METHOD_NAME,
+	LSPS7_GET_EXTENDABLE_CHANNELS_METHOD_NAME, LSPS7_GET_ORDER_METHOD_NAME,
+};
 
 use crate::prelude::HashMap;
 
@@ -69,6 +73,9 @@ pub(crate) enum LSPSMethod {
 	LSPS5SetWebhook,
 	LSPS5ListWebhooks,
 	LSPS5RemoveWebhook,
+	LSPS7GetExtendableChannels,
+	LSPS7CreateOrder,
+	LSPS7GetOrder,
 }
 
 impl LSPSMethod {
@@ -83,6 +90,9 @@ impl LSPSMethod {
 			Self::LSPS5SetWebhook => LSPS5_SET_WEBHOOK_METHOD_NAME,
 			Self::LSPS5ListWebhooks => LSPS5_LIST_WEBHOOKS_METHOD_NAME,
 			Self::LSPS5RemoveWebhook => LSPS5_REMOVE_WEBHOOK_METHOD_NAME,
+			Self::LSPS7GetExtendableChannels => LSPS7_GET_EXTENDABLE_CHANNELS_METHOD_NAME,
+			Self::LSPS7CreateOrder => LSPS7_CREATE_ORDER_METHOD_NAME,
+			Self::LSPS7GetOrder => LSPS7_GET_ORDER_METHOD_NAME,
 		}
 	}
 }
@@ -100,6 +110,9 @@ impl FromStr for LSPSMethod {
 			LSPS5_SET_WEBHOOK_METHOD_NAME => Ok(Self::LSPS5SetWebhook),
 			LSPS5_LIST_WEBHOOKS_METHOD_NAME => Ok(Self::LSPS5ListWebhooks),
 			LSPS5_REMOVE_WEBHOOK_METHOD_NAME => Ok(Self::LSPS5RemoveWebhook),
+			LSPS7_GET_EXTENDABLE_CHANNELS_METHOD_NAME => Ok(Self::LSPS7GetExtendableChannels),
+			LSPS7_CREATE_ORDER_METHOD_NAME => Ok(Self::LSPS7CreateOrder),
+			LSPS7_GET_ORDER_METHOD_NAME => Ok(Self::LSPS7GetOrder),
 			_ => Err(&"Unknown method name"),
 		}
 	}
@@ -142,6 +155,16 @@ impl From<&LSPS5Request> for LSPSMethod {
 	}
 }
 
+impl From<&LSPS7Request> for LSPSMethod {
+	fn from(value: &LSPS7Request) -> Self {
+		match value {
+			LSPS7Request::GetExtendableChannels(_) => Self::LSPS7GetExtendableChannels,
+			LSPS7Request::CreateOrder(_) => Self::LSPS7CreateOrder,
+			LSPS7Request::GetOrder(_) => Self::LSPS7GetOrder,
+		}
+	}
+}
+
 impl<'de> Deserialize<'de> for LSPSMethod {
 	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
 	where
@@ -326,6 +349,8 @@ pub enum LSPSMessage {
 	LSPS2(LSPS2Message),
 	/// An LSPS5 message.
 	LSPS5(LSPS5Message),
+	/// An LSPS7 message.
+	LSPS7(LSPS7Message),
 }
 
 impl LSPSMessage {
@@ -356,6 +381,9 @@ impl LSPSMessage {
 			LSPSMessage::LSPS5(LSPS5Message::Request(request_id, request)) => {
 				Some((LSPSRequestId(request_id.0.clone()), request.into()))
 			},
+			LSPSMessage::LSPS7(LSPS7Message::Request(request_id, request)) => {
+				Some((LSPSRequestId(request_id.0.clone()), request.into()))
+			},
 			_ => None,
 		}
 	}
@@ -510,6 +538,47 @@ impl Serialize for LSPSMessage {
 					},
 				}
 			},
+			LSPSMessage::LSPS7(LSPS7Message::Request(request_id, request)) => {
+				jsonrpc_object.serialize_field(JSONRPC_ID_FIELD_KEY, &request_id.0)?;
+				jsonrpc_object
+					.serialize_field(JSONRPC_METHOD_FIELD_KEY, &LSPSMethod::from(request))?;
+
+				match request {
+					LSPS7Request::GetExtendableChannels(params) => {
+						jsonrpc_object.serialize_field(JSONRPC_PARAMS_FIELD_KEY, params)?
+					},
+					LSPS7Request::CreateOrder(params) => {
+						jsonrpc_object.serialize_field(JSONRPC_PARAMS_FIELD_KEY, params)?
+					},
+					LSPS7Request::GetOrder(params) => {
+						jsonrpc_object.serialize_field(JSONRPC_PARAMS_FIELD_KEY, params)?
+					},
+				}
+			},
+			LSPSMessage::LSPS7(LSPS7Message::Response(request_id, response)) => {
+				jsonrpc_object.serialize_field(JSONRPC_ID_FIELD_KEY, &request_id.0)?;
+
+				match response {
+					LSPS7Response::GetExtendableChannels(result) => {
+						jsonrpc_object.serialize_field(JSONRPC_RESULT_FIELD_KEY, result)?
+					},
+					LSPS7Response::GetExtendableChannelsError(error) => {
+						jsonrpc_object.serialize_field(JSONRPC_ERROR_FIELD_KEY, error)?
+					},
+					LSPS7Response::CreateOrder(result) => {
+						jsonrpc_object.serialize_field(JSONRPC_RESULT_FIELD_KEY, result)?
+					},
+					LSPS7Response::CreateOrderError(error) => {
+						jsonrpc_object.serialize_field(JSONRPC_ERROR_FIELD_KEY, error)?
+					},
+					LSPS7Response::GetOrder(result) => {
+						jsonrpc_object.serialize_field(JSONRPC_RESULT_FIELD_KEY, result)?
+					},
+					LSPS7Response::GetOrderError(error) => {
+						jsonrpc_object.serialize_field(JSONRPC_ERROR_FIELD_KEY, error)?
+					},
+				}
+			},
 		}
 
 		jsonrpc_object.end()
@@ -647,6 +716,30 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
 						LSPS5Request::RemoveWebhook(request),
 					)))
 				},
+				LSPSMethod::LSPS7GetExtendableChannels => {
+					let request = serde_json::from_value(params.unwrap_or(json!({})))
+						.map_err(de::Error::custom)?;
+					Ok(LSPSMessage::LSPS7(LSPS7Message::Request(
+						id,
+						LSPS7Request::GetExtendableChannels(request),
+					)))
+				},
+				LSPSMethod::LSPS7CreateOrder => {
+					let request = serde_json::from_value(params.unwrap_or(json!({})))
+						.map_err(de::Error::custom)?;
+					Ok(LSPSMessage::LSPS7(LSPS7Message::Request(
+						id,
+						LSPS7Request::CreateOrder(request),
+					)))
+				},
+				LSPSMethod::LSPS7GetOrder => {
+					let request = serde_json::from_value(params.unwrap_or(json!({})))
+						.map_err(de::Error::custom)?;
+					Ok(LSPSMessage::LSPS7(LSPS7Message::Request(
+						id,
+						LSPS7Request::GetOrder(request),
+					)))
+				},
 			},
 			None => match self.request_id_to_method_map.remove(&id) {
 				Some(method) => match method {
@@ -798,6 +891,57 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
 							Err(de::Error::custom("Received invalid JSON-RPC object: one of method, result, or error required"))
 						}
 					},
+					LSPSMethod::LSPS7GetExtendableChannels => {
+						if let Some(error) = error {
+							Ok(LSPSMessage::LSPS7(LSPS7Message::Response(
+								id,
+								LSPS7Response::GetExtendableChannelsError(error),
+							)))
+						} else if let Some(result) = result {
+							let response =
+								serde_json::from_value(result).map_err(de::Error::custom)?;
+							Ok(LSPSMessage::LSPS7(LSPS7Message::Response(
+								id,
+								LSPS7Response::GetExtendableChannels(response),
+							)))
+						} else {
+							Err(de::Error::custom("Received invalid JSON-RPC object: one of method, result, or error required"))
+						}
+					},
+					LSPSMethod::LSPS7CreateOrder => {
+						if let Some(error) = error {
+							Ok(LSPSMessage::LSPS7(LSPS7Message::Response(
+								id,
+								LSPS7Response::CreateOrderError(error),
+							)))
+						} else if let Some(result) = result {
+							let response =
+								serde_json::from_value(result).map_err(de::Error::custom)?;
+							Ok(LSPSMessage::LSPS7(LSPS7Message::Response(
+								id,
+								LSPS7Response::CreateOrder(response),
+							)))
+						} else {
+							Err(de::Error::custom("Received invalid JSON-RPC object: one of method, result, or error required"))
+						}
+					},
+					LSPSMethod::LSPS7GetOrder => {
+						if let Some(error) = error {
+							Ok(LSPSMessage::LSPS7(LSPS7Message::Response(
+								id,
+								LSPS7Response::GetOrderError(error),
+							)))
+						} else if let Some(result) = result {
+							let response =
+								serde_json::from_value(result).map_err(de::Error::custom)?;
+							Ok(LSPSMessage::LSPS7(LSPS7Message::Response(
+								id,
+								LSPS7Response::GetOrder(response),
+							)))
+						} else {
+							Err(de::Error::custom("Received invalid JSON-RPC object: one of method, result, or error required"))
+						}
+					},
 				},
 				None => Err(de::Error::custom(format!(
 					"Received response for unknown request id: {}",