wip. rebase needed

Author: martinsaposnic

lightning-liquidity/src/lsps0/ser.rs

@@ -319,7 +319,6 @@ impl LSPSMessage {
 			LSPSMessage::LSPS2(LSPS2Message::Request(request_id, request)) => {
 				Some((LSPSRequestId(request_id.0.clone()), request.into()))
 			},
-			// Add LSPS5
 			LSPSMessage::LSPS5(LSPS5Message::Request(request_id, request)) => {
 				Some((LSPSRequestId(request_id.0.clone()), request.into()))
 			},
@@ -723,12 +722,11 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
 							Err(de::Error::custom("Received invalid JSON-RPC object: one of method, result, or error required"))
 						}
 					},
-					// Add LSPS5 methods
 					LSPSMethod::LSPS5SetWebhook => {
 						if let Some(error) = error {
 							Ok(LSPSMessage::LSPS5(LSPS5Message::Response(
 								id,
-								LSPS5Response::SetWebhookError(error),
+								LSPS5Response::SetWebhookError(error.into()),
 							)))
 						} else if let Some(result) = result {
 							let response =
@@ -745,7 +743,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
 						if let Some(error) = error {
 							Ok(LSPSMessage::LSPS5(LSPS5Message::Response(
 								id,
-								LSPS5Response::ListWebhooksError(error),
+								LSPS5Response::ListWebhooksError(error.into()),
 							)))
 						} else if let Some(result) = result {
 							let response =
@@ -762,7 +760,7 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
 						if let Some(error) = error {
 							Ok(LSPSMessage::LSPS5(LSPS5Message::Response(
 								id,
-								LSPS5Response::RemoveWebhookError(error),
+								LSPS5Response::RemoveWebhookError(error.into()),
 							)))
 						} else if let Some(result) = result {
 							let response =

lightning-liquidity/src/lsps5/client.rs

@@ -9,6 +9,7 @@
 
 //! Client implementation for LSPS5 webhook registration
 
+use crate::alloc::string::ToString;
 use crate::events::EventQueue;
 use crate::lsps0::ser::{LSPSDateTime, LSPSMessage, LSPSProtocolMessageHandler, LSPSRequestId};
 use crate::lsps5::event::LSPS5ClientEvent;
@@ -17,27 +18,25 @@ use crate::lsps5::msgs::{
 	SetWebhookRequest, WebhookNotification,
 };
 use crate::message_queue::MessageQueue;
-
-use bitcoin::secp256k1::PublicKey;
-use lightning::ln::msgs::{ErrorAction, LightningError};
-use lightning::util::message_signing;
-
-use crate::sync::{Arc, Mutex, RwLock};
-use core::ops::Deref;
-use core::time::Duration;
-
-use crate::alloc::string::ToString;
 use crate::prelude::{new_hash_map, HashMap};
-use alloc::string::String;
+use crate::sync::{Arc, Mutex, RwLock};
+use crate::utils::generate_request_id;
 
 use super::msgs::{LSPS5AppName, LSPS5WebhookUrl};
 #[cfg(feature = "time")]
 use super::service::DefaultTimeProvider;
 use super::service::TimeProvider;
-use crate::utils::generate_request_id;
+
 use alloc::collections::VecDeque;
+use alloc::string::String;
+use bitcoin::secp256k1::PublicKey;
+use lightning::ln::msgs::{ErrorAction, LightningError};
 use lightning::sign::EntropySource;
 use lightning::util::logger::Level;
+use lightning::util::message_signing;
+
+use core::ops::Deref;
+use core::time::Duration;
 
 /// Default maximum age in seconds for cached responses (1 hour)
 pub const DEFAULT_RESPONSE_MAX_AGE_SECS: u64 = 3600;
@@ -226,14 +225,13 @@ where
 	pub fn set_webhook(
 		&self, counterparty_node_id: PublicKey, app_name: String, webhook_url: String,
 	) -> Result<LSPSRequestId, LightningError> {
-		let app_name = LSPS5AppName::new(app_name).map_err(|e| LightningError {
-			err: e.message,
+		let app_name = LSPS5AppName::from_string(app_name).map_err(|e| LightningError {
+			err: e.message(),
 			action: ErrorAction::IgnoreAndLog(Level::Error),
 		})?;
 
-		let lsps_webhook_url = LSPS5WebhookUrl::new(webhook_url).map_err(|e| LightningError {
-			err: e.message,
-			action: ErrorAction::IgnoreAndLog(Level::Error),
+		let lsps_webhook_url = LSPS5WebhookUrl::from_string(webhook_url).map_err(|e| {
+			LightningError { err: e.message(), action: ErrorAction::IgnoreAndLog(Level::Error) }
 		})?;
 
 		let request_id = generate_request_id(&self.entropy_source);
@@ -304,8 +302,8 @@ where
 	pub fn remove_webhook(
 		&self, counterparty_node_id: PublicKey, app_name: String,
 	) -> Result<LSPSRequestId, LightningError> {
-		let app_name = LSPS5AppName::new(app_name).map_err(|e| LightningError {
-			err: e.message,
+		let app_name = LSPS5AppName::from_string(app_name).map_err(|e| LightningError {
+			err: e.message(),
 			action: ErrorAction::IgnoreAndLog(Level::Error),
 		})?;
 
@@ -361,8 +359,7 @@ where
 								self.pending_events.enqueue(
 									LSPS5ClientEvent::WebhookRegistrationFailed {
 										counterparty_node_id: *counterparty_node_id,
-										error_code: error.code,
-										error_message: error.message,
+										error,
 										app_name,
 										url: webhook_url,
 										request_id,
@@ -396,8 +393,7 @@ where
 							LSPS5Response::ListWebhooksError(error) => {
 								self.pending_events.enqueue(LSPS5ClientEvent::WebhooksListFailed {
 									counterparty_node_id: *counterparty_node_id,
-									error_code: error.code,
-									error_message: error.message,
+									error,
 									request_id,
 								});
 								result = Ok(());
@@ -426,8 +422,7 @@ where
 								self.pending_events.enqueue(
 									LSPS5ClientEvent::WebhookRemovalFailed {
 										counterparty_node_id: *counterparty_node_id,
-										error_code: error.code,
-										error_message: error.message,
+										error,
 										app_name,
 										request_id,
 									},
@@ -686,8 +681,8 @@ mod tests {
 		let (client, _, _, peer, _) = setup_test_client();
 		const APP_NAME: &str = "test-app";
 		const WEBHOOK_URL: &str = "https://example.com/hook";
-		let lsps5_app_name = LSPS5AppName::new(APP_NAME.to_string()).unwrap();
-		let lsps5_webhook_url = LSPS5WebhookUrl::new(WEBHOOK_URL.to_string()).unwrap();
+		let lsps5_app_name = LSPS5AppName::from_string(APP_NAME.to_string()).unwrap();
+		let lsps5_webhook_url = LSPS5WebhookUrl::from_string(WEBHOOK_URL.to_string()).unwrap();
 		let set_req_id =
 			client.set_webhook(peer, APP_NAME.to_string(), WEBHOOK_URL.to_string()).unwrap();
 		let list_req_id = client.list_webhooks(peer).unwrap();
@@ -751,9 +746,9 @@ mod tests {
 		const OLD_APP_NAME: &str = "test-app-old";
 		const NEW_APP_NAME: &str = "test-app-new";
 		const WEBHOOK_URL: &str = "https://example.com/hook";
-		let lsps5_old_app_name = LSPS5AppName::new(OLD_APP_NAME.to_string()).unwrap();
-		let lsps5_new_app_name = LSPS5AppName::new(NEW_APP_NAME.to_string()).unwrap();
-		let lsps5_webhook_url = LSPS5WebhookUrl::new(WEBHOOK_URL.to_string()).unwrap();
+		let lsps5_old_app_name = LSPS5AppName::from_string(OLD_APP_NAME.to_string()).unwrap();
+		let lsps5_new_app_name = LSPS5AppName::from_string(NEW_APP_NAME.to_string()).unwrap();
+		let lsps5_webhook_url = LSPS5WebhookUrl::from_string(WEBHOOK_URL.to_string()).unwrap();
 		let now = time_provider.duration_since_epoch();
 		let mut peer_state = PeerState::new(Duration::from_secs(1800), time_provider.clone());
 		peer_state.last_cleanup = Some(LSPSDateTime::new_from_duration_since_epoch(

lightning-liquidity/src/lsps5/event.rs

@@ -16,6 +16,7 @@ use alloc::vec::Vec;
 use bitcoin::secp256k1::PublicKey;
 
 use super::msgs::LSPS5AppName;
+use super::msgs::LSPS5Error;
 use super::msgs::LSPS5WebhookUrl;
 use super::msgs::WebhookNotification;
 /// An event which an bLIP-55 / LSPS5 server should take some action in response to.
@@ -41,6 +42,7 @@ pub enum LSPS5ServiceEvent {
 		/// This URL is used by the LSP to send notifications.
 		///
 		/// **Note**: Ensure the URL is valid and its length does not exceed [`MAX_APP_NAME_LENGTH`].
+		/// Also ensure that the URL points to a public host.
 		///
 		/// [`MAX_APP_NAME_LENGTH`]: super::msgs::MAX_APP_NAME_LENGTH
 		url: LSPS5WebhookUrl,
@@ -146,11 +148,8 @@ pub enum LSPS5ClientEvent {
 	WebhookRegistrationFailed {
 		/// The node id of the LSP that rejected the registration
 		counterparty_node_id: PublicKey,
-		/// Error code from the LSP (500: too_long, 501: url_parse_error,
-		/// 502: unsupported_protocol, 503: too_many_webhooks)
-		error_code: i32,
-		/// Error message from the LSP
-		error_message: String,
+		/// Error from the LSP
+		error: LSPS5Error,
 		/// The app name that was attempted
 		app_name: LSPS5AppName,
 		/// The webhook URL that was attempted
@@ -183,10 +182,8 @@ pub enum LSPS5ClientEvent {
 	WebhooksListFailed {
 		/// The node id of the LSP that rejected the request
 		counterparty_node_id: PublicKey,
-		/// Error code from the LSP
-		error_code: i32,
-		/// Error message from the LSP
-		error_message: String,
+		/// Error from the LSP
+		error: LSPS5Error,
 		/// The identifier of the issued bLIP-55 / LSPS5 list webhooks request
 		///
 		/// This can be used to track which request this event corresponds to.
@@ -215,10 +212,8 @@ pub enum LSPS5ClientEvent {
 	WebhookRemovalFailed {
 		/// The node id of the LSP that rejected the removal
 		counterparty_node_id: PublicKey,
-		/// Error code from the LSP (1010: app_name_not_found)
-		error_code: i32,
-		/// Error message from the LSP
-		error_message: String,
+		/// Error from the LSP
+		error: LSPS5Error,
 		/// The app name that was attempted to be removed
 		app_name: LSPS5AppName,
 		/// The identifier of the issued bLIP-55 / LSPS5 remove webhook request