fixup: Use NodeSigner to sign notification instead of custom signing key

Author: martinsaposnic

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;