WIP

Author: martinsaposnic

lightning-background-processor/src/lib.rs

@@ -230,7 +230,8 @@ impl<
 		G,
 		&'a (dyn UtxoLookup + Send + Sync),
 		L,
-	> where
+	>
+where
 	L::Target: Logger,
 {
 	/// Initializes a new [`GossipSync::Rapid`] variant.
@@ -247,7 +248,8 @@ impl<'a, L: Deref>
 		&'a NetworkGraph<L>,
 		&'a (dyn UtxoLookup + Send + Sync),
 		L,
-	> where
+	>
+where
 	L::Target: Logger,
 {
 	/// Initializes a new [`GossipSync::None`] variant.
@@ -1683,7 +1685,6 @@ mod tests {
 				None,
 				None,
 				None,
-				None,
 			));
 			let node = Node {
 				node: manager,

lightning-liquidity/src/lsps0/ser.rs

@@ -592,7 +592,6 @@ impl<'de, 'a> Visitor<'de> for LSPSMessageVisitor<'a> {
 						.map_err(de::Error::custom)?;
 					Ok(LSPSMessage::LSPS2(LSPS2Message::Request(id, LSPS2Request::Buy(request))))
 				},
-				// Add LSPS5 methods
 				LSPSMethod::LSPS5SetWebhook => {
 					let request = serde_json::from_value(params.unwrap_or(json!({})))
 						.map_err(de::Error::custom)?;

lightning-liquidity/src/lsps5/client.rs

@@ -25,16 +25,16 @@ use crate::utils::generate_request_id;
 use super::msgs::{LSPS5AppName, LSPS5Error, LSPS5WebhookUrl};
 use super::service::TimeProvider;
 
-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 alloc::collections::VecDeque;
+use alloc::string::String;
+
 use core::ops::Deref;
 use core::time::Duration;
 
@@ -85,9 +85,9 @@ impl Default for LSPS5ClientConfig {
 
 struct PeerState {
 	pending_set_webhook_requests:
-		HashMap<LSPSRequestId, (LSPS5AppName, LSPS5WebhookUrl, LSPSDateTime)>, // RequestId -> (app_name, webhook_url, timestamp)
-	pending_list_webhooks_requests: HashMap<LSPSRequestId, LSPSDateTime>, // RequestId -> timestamp
-	pending_remove_webhook_requests: HashMap<LSPSRequestId, (LSPS5AppName, LSPSDateTime)>, // RequestId -> (app_name, timestamp)
+		HashMap<LSPSRequestId, (LSPS5AppName, LSPS5WebhookUrl, LSPSDateTime)>,
+	pending_list_webhooks_requests: HashMap<LSPSRequestId, LSPSDateTime>,
+	pending_remove_webhook_requests: HashMap<LSPSRequestId, (LSPS5AppName, LSPSDateTime)>,
 	last_cleanup: Option<LSPSDateTime>,
 	max_age_secs: Duration,
 	time_provider: Arc<dyn TimeProvider>,
@@ -455,8 +455,8 @@ where
 		let now =
 			LSPSDateTime::new_from_duration_since_epoch(self.time_provider.duration_since_epoch());
 		let diff = signature_timestamp.abs_diff(now);
-
-		if diff > 600 {
+		let ten_minutes = 600;
+		if diff > ten_minutes {
 			return Err(LSPS5Error::InvalidTimestamp(signature_timestamp.to_rfc3339()));
 		}
 

lightning-liquidity/src/lsps5/event.rs

@@ -7,7 +7,7 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-//! Events generated by the LSPS5 service and client
+//! Contains bLIP-55 / LSPS5 event types
 
 use crate::lsps0::ser::LSPSDateTime;
 use crate::lsps0::ser::LSPSRequestId;

lightning-liquidity/src/lsps5/msgs.rs

@@ -9,24 +9,27 @@
 
 //! LSPS5 message formats for webhook registration
 
-use core::fmt;
-use core::fmt::Display;
-use core::ops::Deref;
-
 use crate::alloc::string::ToString;
 use crate::lsps0::ser::LSPSMessage;
 use crate::lsps0::ser::LSPSRequestId;
 use crate::lsps0::ser::LSPSResponseError;
-use alloc::string::String;
-use alloc::vec::Vec;
+
+use super::url_utils::LSPSUrl;
+
 use lightning_types::string::UntrustedString;
+
 use serde::de::{self, Deserializer, MapAccess, Visitor};
 use serde::ser::SerializeMap;
 use serde::ser::SerializeStruct;
 use serde::Serializer;
 use serde::{Deserialize, Serialize};
 
-use super::url_utils::LSPSUrl;
+use alloc::string::String;
+use alloc::vec::Vec;
+
+use core::fmt;
+use core::fmt::Display;
+use core::ops::Deref;
 
 /// Maximum allowed length for an `app_name` (in bytes).
 pub const MAX_APP_NAME_LENGTH: usize = 64;

lightning-liquidity/src/lsps5/service.rs

@@ -9,6 +9,7 @@
 
 //! Service implementation for LSPS5 webhook registration.
 
+use crate::alloc::string::ToString;
 use crate::events::EventQueue;
 use crate::lsps0::ser::{LSPSDateTime, LSPSProtocolMessageHandler, LSPSRequestId};
 use crate::lsps5::msgs::{
@@ -17,17 +18,18 @@ use crate::lsps5::msgs::{
 };
 use crate::message_queue::MessageQueue;
 use crate::prelude::*;
-use core::ops::Deref;
-use core::time::Duration;
+use crate::sync::{Arc, Mutex};
 
 use bitcoin::secp256k1::{PublicKey, SecretKey};
+
 use lightning::ln::channelmanager::AChannelManager;
 use lightning::ln::msgs::{ErrorAction, LightningError};
 use lightning::util::logger::Level;
 use lightning::util::message_signing;
 
-use crate::alloc::string::ToString;
-use crate::sync::{Arc, Mutex};
+use core::ops::Deref;
+use core::time::Duration;
+
 use alloc::string::String;
 use alloc::vec::Vec;
 
@@ -100,7 +102,7 @@ pub struct LSPS5ServiceConfig {
 ///   - `lsps5.remove_webhook` → delete a named webhook or return [`app_name_not_found`]
 ///     error, emitting [`LSPS5ServiceEvent::WebhookRemoved`].
 /// - Prune stale webhooks after a client has no open channels and no activity for at least
-///     [`MIN_WEBHOOK_RETENTION_DAYS`].
+/// [`MIN_WEBHOOK_RETENTION_DAYS`].
 /// - Rate-limit repeat notifications of the same method to a client by
 ///   [`notification_cooldown_hours`].
 /// - Sign and enqueue outgoing webhook notifications:
@@ -518,11 +520,7 @@ where
 						self.handle_set_webhook(*counterparty_node_id, request_id.clone(), params)
 					},
 					LSPS5Request::ListWebhooks(params) => {
-						self.handle_list_webhooks(
-							*counterparty_node_id, 
-							request_id.clone(), 
-							params
-						)
+						self.handle_list_webhooks(*counterparty_node_id, request_id.clone(), params)
 					},
 					LSPS5Request::RemoveWebhook(params) => self.handle_remove_webhook(
 						*counterparty_node_id,
@@ -537,8 +535,11 @@ where
 					false,
 					"Service handler received LSPS5 response message. This should never happen."
 				);
-				let err = format!("Service handler received LSPS5 response message from node {:?}. 
-				This should never happen.", counterparty_node_id);
+				let err = format!(
+					"Service handler received LSPS5 response message from node {:?}. 
+				This should never happen.",
+					counterparty_node_id
+				);
 				Err(LightningError { err, action: ErrorAction::IgnoreAndLog(Level::Info) })
 			},
 		}

lightning-liquidity/src/manager.rs

@@ -12,9 +12,9 @@ use crate::lsps0::ser::{
 use crate::lsps0::service::LSPS0ServiceHandler;
 use crate::lsps5::client::{LSPS5ClientConfig, LSPS5ClientHandler};
 use crate::lsps5::msgs::LSPS5Message;
-use crate::lsps5::service::{
-	DefaultTimeProvider, LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider,
-};
+#[cfg(feature = "time")]
+use crate::lsps5::service::DefaultTimeProvider;
+use crate::lsps5::service::{LSPS5ServiceConfig, LSPS5ServiceHandler, TimeProvider};
 use crate::message_queue::MessageQueue;
 
 use crate::lsps1::client::{LSPS1ClientConfig, LSPS1ClientHandler};
@@ -208,7 +208,7 @@ where {
 		let mut supported_protocols = Vec::new();
 
 		let lsps2_client_handler = client_config.as_ref().and_then(|config| {
-			config.lsps2_client_config.as_ref().map(|config| {
+			config.lsps2_client_config.map(|config| {
 				LSPS2ClientHandler::new(
 					entropy_source.clone(),
 					Arc::clone(&pending_messages),