fixup: Add NodeSigner to LiquidityManager to pass it to LSPS5/service

Also use NodeSigner in the service to sign notification instead of custom signing key

Author: martinsaposnic

lightning-background-processor/src/lib.rs

@@ -239,8 +239,7 @@ impl<
 		G,
 		&'a (dyn UtxoLookup + Send + Sync),
 		L,
-	>
-where
+	> where
 	L::Target: Logger,
 {
 	/// Initializes a new [`GossipSync::Rapid`] variant.
@@ -257,8 +256,7 @@ impl<'a, L: Deref>
 		&'a NetworkGraph<L>,
 		&'a (dyn UtxoLookup + Send + Sync),
 		L,
-	>
-where
+	> where
 	L::Target: Logger,
 {
 	/// Initializes a new [`GossipSync::None`] variant.
@@ -687,7 +685,7 @@ use futures_util::{dummy_waker, OptionalSelector, Selector, SelectorOutput};
 /// # type P2PGossipSync<UL> = lightning::routing::gossip::P2PGossipSync<Arc<NetworkGraph>, Arc<UL>, Arc<Logger>>;
 /// # type ChannelManager<B, F, FE> = lightning::ln::channelmanager::SimpleArcChannelManager<ChainMonitor<B, F, FE>, B, FE, Logger>;
 /// # type OnionMessenger<B, F, FE> = lightning::onion_message::messenger::OnionMessenger<Arc<lightning::sign::KeysManager>, Arc<lightning::sign::KeysManager>, Arc<Logger>, Arc<ChannelManager<B, F, FE>>, Arc<lightning::onion_message::messenger::DefaultMessageRouter<Arc<NetworkGraph>, Arc<Logger>, Arc<lightning::sign::KeysManager>>>, Arc<ChannelManager<B, F, FE>>, lightning::ln::peer_handler::IgnoringMessageHandler, lightning::ln::peer_handler::IgnoringMessageHandler, lightning::ln::peer_handler::IgnoringMessageHandler>;
-/// # type LiquidityManager<B, F, FE> = lightning_liquidity::LiquidityManager<Arc<lightning::sign::KeysManager>, Arc<ChannelManager<B, F, FE>>, Arc<F>, Arc<DefaultTimeProvider>>;
+/// # type LiquidityManager<B, F, FE> = lightning_liquidity::LiquidityManager<Arc<lightning::sign::KeysManager>, Arc<lightning::sign::KeysManager>, Arc<ChannelManager<B, F, FE>>, Arc<F>, Arc<DefaultTimeProvider>>;
 /// # type Scorer = RwLock<lightning::routing::scoring::ProbabilisticScorer<Arc<NetworkGraph>, Arc<Logger>>>;
 /// # type PeerManager<B, F, FE, UL> = lightning::ln::peer_handler::SimpleArcPeerManager<SocketDescriptor, ChainMonitor<B, F, FE>, B, FE, Arc<UL>, Logger, F, Store>;
 /// #
@@ -1307,8 +1305,13 @@ mod tests {
 		IgnoringMessageHandler,
 	>;
 
-	type LM =
-		LiquidityManager<Arc<KeysManager>, Arc<ChannelManager>, Arc<dyn Filter + Sync + Send>, Arc<DefaultTimeProvider>>;
+	type LM = LiquidityManager<
+		Arc<KeysManager>,
+		Arc<KeysManager>,
+		Arc<ChannelManager>,
+		Arc<dyn Filter + Sync + Send>,
+		Arc<DefaultTimeProvider>,
+	>;
 
 	struct Node {
 		node: Arc<ChannelManager>,
@@ -1751,6 +1754,7 @@ mod tests {
 				Arc::clone(&keys_manager),
 			));
 			let liquidity_manager = Arc::new(LiquidityManager::new(
+				Arc::clone(&keys_manager),
 				Arc::clone(&keys_manager),
 				Arc::clone(&keys_manager),
 				Arc::clone(&manager),

lightning-liquidity/src/lsps5/service.rs

@@ -21,12 +21,12 @@ use crate::prelude::hash_map::Entry;
 use crate::prelude::*;
 use crate::sync::{Arc, Mutex};
 
-use bitcoin::secp256k1::{PublicKey, SecretKey};
+use bitcoin::secp256k1::PublicKey;
 
 use lightning::ln::channelmanager::AChannelManager;
 use lightning::ln::msgs::{ErrorAction, LightningError};
+use lightning::sign::NodeSigner;
 use lightning::util::logger::Level;
-use lightning::util::message_signing;
 
 use core::ops::Deref;
 use core::time::Duration;
@@ -81,8 +81,6 @@ impl TimeProvider for DefaultTimeProvider {
 pub struct LSPS5ServiceConfig {
 	/// Maximum number of webhooks allowed per client.
 	pub max_webhooks_per_client: u32,
-	/// Signing key for LSP notifications.
-	pub signing_key: SecretKey,
 	/// Minimum time between sending the same notification type in hours (default: 24)
 	pub notification_cooldown_hours: Duration,
 }
@@ -122,9 +120,10 @@ pub struct LSPS5ServiceConfig {
 /// [`LSPS5ServiceEvent::SendWebhookNotification`]: super::event::LSPS5ServiceEvent::SendWebhookNotification
 /// [`app_name`]: super::msgs::LSPS5AppName
 /// [`lsps5.webhook_registered`]: super::msgs::WebhookNotificationMethod::LSPS5WebhookRegistered
-pub struct LSPS5ServiceHandler<CM: Deref, TP: Deref>
+pub struct LSPS5ServiceHandler<CM: Deref, NS: Deref, TP: Deref>
 where
 	CM::Target: AChannelManager,
+	NS::Target: NodeSigner,
 	TP::Target: TimeProvider,
 {
 	config: LSPS5ServiceConfig,
@@ -133,18 +132,20 @@ where
 	pending_messages: Arc<MessageQueue>,
 	time_provider: TP,
 	channel_manager: CM,
+	node_signer: NS,
 	last_pruning: Mutex<Option<LSPSDateTime>>,
 }
 
-impl<CM: Deref, TP: Deref> LSPS5ServiceHandler<CM, TP>
+impl<CM: Deref, NS: Deref, TP: Deref> LSPS5ServiceHandler<CM, NS, TP>
 where
 	CM::Target: AChannelManager,
+	NS::Target: NodeSigner,
 	TP::Target: TimeProvider,
 {
 	/// Constructs a `LSPS5ServiceHandler` using the given time provider.
 	pub(crate) fn new_with_time_provider(
 		event_queue: Arc<EventQueue>, pending_messages: Arc<MessageQueue>, channel_manager: CM,
-		config: LSPS5ServiceConfig, time_provider: TP,
+		node_signer: NS, config: LSPS5ServiceConfig, time_provider: TP,
 	) -> Self {
 		assert!(config.max_webhooks_per_client > 0, "`max_webhooks_per_client` must be > 0");
 		Self {
@@ -154,6 +155,7 @@ where
 			pending_messages,
 			time_provider,
 			channel_manager,
+			node_signer,
 			last_pruning: Mutex::new(None),
 		}
 	}
@@ -468,7 +470,9 @@ where
 			notification_json
 		);
 
-		message_signing::sign(message.as_bytes(), &self.config.signing_key)
+		self.node_signer
+			.sign_message(message.as_bytes())
+			.map_err(|_| LSPS5ProtocolError::UnknownError)
 	}
 
 	fn prune_stale_webhooks(&self) {
@@ -500,9 +504,10 @@ where
 	}
 }
 
-impl<CM: Deref, TP: Deref> LSPSProtocolMessageHandler for LSPS5ServiceHandler<CM, TP>
+impl<CM: Deref, NS: Deref, TP: Deref> LSPSProtocolMessageHandler for LSPS5ServiceHandler<CM, NS, TP>
 where
 	CM::Target: AChannelManager,
+	NS::Target: NodeSigner,
 	TP::Target: TimeProvider,
 {
 	type ProtocolMessage = LSPS5Message;

lightning-liquidity/src/manager.rs

@@ -33,7 +33,7 @@ use lightning::ln::channelmanager::{AChannelManager, ChainParameters};
 use lightning::ln::msgs::{ErrorAction, LightningError};
 use lightning::ln::peer_handler::CustomMessageHandler;
 use lightning::ln::wire::CustomMessageReader;
-use lightning::sign::EntropySource;
+use lightning::sign::{EntropySource, NodeSigner};
 use lightning::util::logger::Level;
 use lightning::util::ser::{LengthLimitedRead, LengthReadable};
 use lightning::util::wakers::Future;
@@ -86,6 +86,10 @@ pub trait ALiquidityManager {
 	type EntropySource: EntropySource + ?Sized;
 	/// A type that may be dereferenced to [`Self::EntropySource`].
 	type ES: Deref<Target = Self::EntropySource> + Clone;
+	/// A type implementing [`NodeSigner`]
+	type NodeSigner: NodeSigner + ?Sized;
+	/// A type that may be dereferenced to [`Self::NodeSigner`].
+	type NS: Deref<Target = Self::NodeSigner> + Clone;
 	/// A type implementing [`AChannelManager`]
 	type AChannelManager: AChannelManager + ?Sized;
 	/// A type that may be dereferenced to [`Self::AChannelManager`].
@@ -99,26 +103,34 @@ pub trait ALiquidityManager {
 	/// A type that may be dereferenced to [`Self::TimeProvider`].
 	type TP: Deref<Target = Self::TimeProvider> + Clone;
 	/// Returns a reference to the actual [`LiquidityManager`] object.
-	fn get_lm(&self) -> &LiquidityManager<Self::ES, Self::CM, Self::C, Self::TP>;
+	fn get_lm(&self) -> &LiquidityManager<Self::ES, Self::NS, Self::CM, Self::C, Self::TP>;
 }
 
-impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone> ALiquidityManager
-	for LiquidityManager<ES, CM, C, TP>
+impl<
+		ES: Deref + Clone,
+		NS: Deref + Clone,
+		CM: Deref + Clone,
+		C: Deref + Clone,
+		TP: Deref + Clone,
+	> ALiquidityManager for LiquidityManager<ES, NS, CM, C, TP>
 where
 	ES::Target: EntropySource,
+	NS::Target: NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
 {
 	type EntropySource = ES::Target;
 	type ES = ES;
+	type NodeSigner = NS::Target;
+	type NS = NS;
 	type AChannelManager = CM::Target;
 	type CM = CM;
 	type Filter = C::Target;
 	type C = C;
 	type TimeProvider = TP::Target;
 	type TP = TP;
-	fn get_lm(&self) -> &LiquidityManager<ES, CM, C, TP> {
+	fn get_lm(&self) -> &LiquidityManager<ES, NS, CM, C, TP> {
 		self
 	}
 }
@@ -144,11 +156,13 @@ where
 /// [`Event::PaymentForwarded`]: lightning::events::Event::PaymentForwarded
 pub struct LiquidityManager<
 	ES: Deref + Clone,
+	NS: Deref + Clone,
 	CM: Deref + Clone,
 	C: Deref + Clone,
 	TP: Deref + Clone,
 > where
 	ES::Target: EntropySource,
+	NS::Target: NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
@@ -165,7 +179,7 @@ pub struct LiquidityManager<
 	lsps1_client_handler: Option<LSPS1ClientHandler<ES>>,
 	lsps2_service_handler: Option<LSPS2ServiceHandler<CM>>,
 	lsps2_client_handler: Option<LSPS2ClientHandler<ES>>,
-	lsps5_service_handler: Option<LSPS5ServiceHandler<CM, TP>>,
+	lsps5_service_handler: Option<LSPS5ServiceHandler<CM, NS, TP>>,
 	lsps5_client_handler: Option<LSPS5ClientHandler<ES, TP>>,
 	service_config: Option<LiquidityServiceConfig>,
 	_client_config: Option<LiquidityClientConfig>,
@@ -174,22 +188,24 @@ pub struct LiquidityManager<
 }
 
 #[cfg(feature = "time")]
-impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone>
-	LiquidityManager<ES, CM, C, Arc<DefaultTimeProvider>>
+impl<ES: Deref + Clone, NS: Deref + Clone, CM: Deref + Clone, C: Deref + Clone>
+	LiquidityManager<ES, NS, CM, C, Arc<DefaultTimeProvider>>
 where
 	ES::Target: EntropySource,
+	NS::Target: NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 {
 	/// Constructor for the [`LiquidityManager`] using the default system clock
 	pub fn new(
-		entropy_source: ES, channel_manager: CM, chain_source: Option<C>,
+		entropy_source: ES, node_signer: NS, channel_manager: CM, chain_source: Option<C>,
 		chain_params: Option<ChainParameters>, service_config: Option<LiquidityServiceConfig>,
 		client_config: Option<LiquidityClientConfig>,
 	) -> Self {
 		let time_provider = Arc::new(DefaultTimeProvider);
 		Self::new_with_custom_time_provider(
 			entropy_source,
+			node_signer,
 			channel_manager,
 			chain_source,
 			chain_params,
@@ -200,10 +216,16 @@ where
 	}
 }
 
-impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone>
-	LiquidityManager<ES, CM, C, TP>
+impl<
+		ES: Deref + Clone,
+		NS: Deref + Clone,
+		CM: Deref + Clone,
+		C: Deref + Clone,
+		TP: Deref + Clone,
+	> LiquidityManager<ES, NS, CM, C, TP>
 where
 	ES::Target: EntropySource,
+	NS::Target: NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
@@ -215,7 +237,7 @@ where
 	/// Sets up the required protocol message handlers based on the given
 	/// [`LiquidityClientConfig`] and [`LiquidityServiceConfig`].
 	pub fn new_with_custom_time_provider(
-		entropy_source: ES, channel_manager: CM, chain_source: Option<C>,
+		entropy_source: ES, node_signer: NS, channel_manager: CM, chain_source: Option<C>,
 		chain_params: Option<ChainParameters>, service_config: Option<LiquidityServiceConfig>,
 		client_config: Option<LiquidityClientConfig>, time_provider: TP,
 	) -> Self {
@@ -266,18 +288,19 @@ where
 		let lsps5_service_handler = service_config.as_ref().and_then(|config| {
 			config.lsps5_service_config.as_ref().map(|config| {
 				if let Some(number) =
-					<LSPS5ServiceHandler<CM, TP> as LSPSProtocolMessageHandler>::PROTOCOL_NUMBER
+					<LSPS5ServiceHandler<CM, NS, TP> as LSPSProtocolMessageHandler>::PROTOCOL_NUMBER
 				{
 					supported_protocols.push(number);
 				}
 
-				return LSPS5ServiceHandler::new_with_time_provider(
+				LSPS5ServiceHandler::new_with_time_provider(
 					Arc::clone(&pending_events),
 					Arc::clone(&pending_messages),
 					channel_manager.clone(),
+					node_signer,
 					config.clone(),
-					time_provider,
-				);
+					time_provider.clone(),
+				)
 			})
 		});
 
@@ -394,7 +417,7 @@ where
 	/// Returns a reference to the LSPS5 server-side handler.
 	///
 	/// The returned hendler allows to initiate the LSPS5 service-side flow.
-	pub fn lsps5_service_handler(&self) -> Option<&LSPS5ServiceHandler<CM, TP>> {
+	pub fn lsps5_service_handler(&self) -> Option<&LSPS5ServiceHandler<CM, NS, TP>> {
 		self.lsps5_service_handler.as_ref()
 	}
 
@@ -548,10 +571,16 @@ where
 	}
 }
 
-impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone> CustomMessageReader
-	for LiquidityManager<ES, CM, C, TP>
+impl<
+		ES: Deref + Clone,
+		NS: Deref + Clone,
+		CM: Deref + Clone,
+		C: Deref + Clone,
+		TP: Deref + Clone,
+	> CustomMessageReader for LiquidityManager<ES, NS, CM, C, TP>
 where
 	ES::Target: EntropySource,
+	NS::Target: NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
@@ -570,10 +599,16 @@ where
 	}
 }
 
-impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone> CustomMessageHandler
-	for LiquidityManager<ES, CM, C, TP>
+impl<
+		ES: Deref + Clone,
+		NS: Deref + Clone,
+		CM: Deref + Clone,
+		C: Deref + Clone,
+		TP: Deref + Clone,
+	> CustomMessageHandler for LiquidityManager<ES, NS, CM, C, TP>
 where
 	ES::Target: EntropySource,
+	NS::Target: NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
@@ -683,10 +718,16 @@ where
 	}
 }
 
-impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone> Listen
-	for LiquidityManager<ES, CM, C, TP>
+impl<
+		ES: Deref + Clone,
+		NS: Deref + Clone,
+		CM: Deref + Clone,
+		C: Deref + Clone,
+		TP: Deref + Clone,
+	> Listen for LiquidityManager<ES, NS, CM, C, TP>
 where
 	ES::Target: EntropySource,
+	NS::Target: NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
@@ -722,10 +763,16 @@ where
 	}
 }
 
-impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone> Confirm
-	for LiquidityManager<ES, CM, C, TP>
+impl<
+		ES: Deref + Clone,
+		NS: Deref + Clone,
+		CM: Deref + Clone,
+		C: Deref + Clone,
+		TP: Deref + Clone,
+	> Confirm for LiquidityManager<ES, NS, CM, C, TP>
 where
 	ES::Target: EntropySource,
+	NS::Target: NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,