fixup: PENDING REBASE. fixing conflicts and fix sign / verify notif flow

Author: martinsaposnic

fuzz/src/chanmon_consistency.rs

@@ -353,13 +353,17 @@ impl NodeSigner for KeyProvider {
 		unreachable!()
 	}
 
-	fn sign_gossip_message(
-		&self, msg: lightning::ln::msgs::UnsignedGossipMessage,
-	) -> Result<Signature, ()> {
-		let msg_hash = Message::from_digest(Sha256dHash::hash(&msg.encode()[..]).to_byte_array());
-		let secp_ctx = Secp256k1::signing_only();
-		Ok(secp_ctx.sign_ecdsa(&msg_hash, &self.node_secret))
-	}
+        fn sign_gossip_message(
+                &self, msg: lightning::ln::msgs::UnsignedGossipMessage,
+        ) -> Result<Signature, ()> {
+                let msg_hash = Message::from_digest(Sha256dHash::hash(&msg.encode()[..]).to_byte_array());
+                let secp_ctx = Secp256k1::signing_only();
+                Ok(secp_ctx.sign_ecdsa(&msg_hash, &self.node_secret))
+        }
+
+        fn sign_message(&self, msg: &[u8]) -> Result<String, ()> {
+                Ok(lightning::util::message_signing::sign(msg, &self.node_secret))
+        }
 }
 
 impl SignerProvider for KeyProvider {

fuzz/src/full_stack.rs

@@ -427,13 +427,17 @@ impl NodeSigner for KeyProvider {
 		unreachable!()
 	}
 
-	fn sign_gossip_message(
-		&self, msg: lightning::ln::msgs::UnsignedGossipMessage,
-	) -> Result<Signature, ()> {
-		let msg_hash = Message::from_digest(Sha256dHash::hash(&msg.encode()[..]).to_byte_array());
-		let secp_ctx = Secp256k1::signing_only();
-		Ok(secp_ctx.sign_ecdsa(&msg_hash, &self.node_secret))
-	}
+        fn sign_gossip_message(
+                &self, msg: lightning::ln::msgs::UnsignedGossipMessage,
+        ) -> Result<Signature, ()> {
+                let msg_hash = Message::from_digest(Sha256dHash::hash(&msg.encode()[..]).to_byte_array());
+                let secp_ctx = Secp256k1::signing_only();
+                Ok(secp_ctx.sign_ecdsa(&msg_hash, &self.node_secret))
+        }
+
+        fn sign_message(&self, msg: &[u8]) -> Result<String, ()> {
+                Ok(lightning::util::message_signing::sign(msg, &self.node_secret))
+        }
 
 	fn get_peer_storage_key(&self) -> PeerStorageKey {
 		PeerStorageKey { inner: [42; 32] }

fuzz/src/onion_message.rs

@@ -269,11 +269,15 @@ impl NodeSigner for KeyProvider {
 		unreachable!()
 	}
 
-	fn sign_gossip_message(
-		&self, _msg: lightning::ln::msgs::UnsignedGossipMessage,
-	) -> Result<bitcoin::secp256k1::ecdsa::Signature, ()> {
-		unreachable!()
-	}
+        fn sign_gossip_message(
+                &self, _msg: lightning::ln::msgs::UnsignedGossipMessage,
+        ) -> Result<bitcoin::secp256k1::ecdsa::Signature, ()> {
+                unreachable!()
+        }
+
+        fn sign_message(&self, msg: &[u8]) -> Result<String, ()> {
+                Ok(lightning::util::message_signing::sign(msg, &self.node_secret))
+        }
 
 	fn get_peer_storage_key(&self) -> PeerStorageKey {
 		unreachable!()

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
 		);
 
-		Ok(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;
@@ -82,8 +82,8 @@ pub struct LiquidityClientConfig {
 /// This is not exported to bindings users as general cover traits aren't useful in other
 /// languages.
 pub trait ALiquidityManager {
-	/// A type implementing [`EntropySource`]
-	type EntropySource: EntropySource + ?Sized;
+	/// A type implementing [`EntropySource`] and [`NodeSigner`]
+	type EntropySource: EntropySource + NodeSigner + ?Sized;
 	/// A type that may be dereferenced to [`Self::EntropySource`].
 	type ES: Deref<Target = Self::EntropySource> + Clone;
 	/// A type implementing [`AChannelManager`]
@@ -105,7 +105,7 @@ pub trait ALiquidityManager {
 impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone> ALiquidityManager
 	for LiquidityManager<ES, CM, C, TP>
 where
-	ES::Target: EntropySource,
+	ES::Target: EntropySource + NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
@@ -148,7 +148,7 @@ pub struct LiquidityManager<
 	C: Deref + Clone,
 	TP: Deref + Clone,
 > where
-	ES::Target: EntropySource,
+	ES::Target: EntropySource + NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
@@ -165,7 +165,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, ES, TP>>,
 	lsps5_client_handler: Option<LSPS5ClientHandler<ES, TP>>,
 	service_config: Option<LiquidityServiceConfig>,
 	_client_config: Option<LiquidityClientConfig>,
@@ -177,7 +177,7 @@ pub struct LiquidityManager<
 impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone>
 	LiquidityManager<ES, CM, C, Arc<DefaultTimeProvider>>
 where
-	ES::Target: EntropySource,
+	ES::Target: EntropySource + NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 {
@@ -203,7 +203,7 @@ where
 impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone>
 	LiquidityManager<ES, CM, C, TP>
 where
-	ES::Target: EntropySource,
+	ES::Target: EntropySource + NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
@@ -266,18 +266,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, ES, 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(),
+					entropy_source.clone(),
 					config.clone(),
-					time_provider,
-				);
+					time_provider.clone(),
+				)
 			})
 		});
 
@@ -394,7 +395,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, ES, TP>> {
 		self.lsps5_service_handler.as_ref()
 	}
 
@@ -551,7 +552,7 @@ where
 impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone> CustomMessageReader
 	for LiquidityManager<ES, CM, C, TP>
 where
-	ES::Target: EntropySource,
+	ES::Target: EntropySource + NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
@@ -573,7 +574,7 @@ where
 impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone> CustomMessageHandler
 	for LiquidityManager<ES, CM, C, TP>
 where
-	ES::Target: EntropySource,
+	ES::Target: EntropySource + NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
@@ -686,7 +687,7 @@ where
 impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone> Listen
 	for LiquidityManager<ES, CM, C, TP>
 where
-	ES::Target: EntropySource,
+	ES::Target: EntropySource + NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,
@@ -725,7 +726,7 @@ where
 impl<ES: Deref + Clone, CM: Deref + Clone, C: Deref + Clone, TP: Deref + Clone> Confirm
 	for LiquidityManager<ES, CM, C, TP>
 where
-	ES::Target: EntropySource,
+	ES::Target: EntropySource + NodeSigner,
 	CM::Target: AChannelManager,
 	C::Target: Filter,
 	TP::Target: TimeProvider,

lightning-liquidity/tests/common/mod.rs

@@ -2,6 +2,7 @@
 
 use bitcoin::Network;
 use lightning::ln::channelmanager::ChainParameters;
+use lightning_liquidity::lsps5::service::TimeProvider;
 use lightning_liquidity::{LiquidityClientConfig, LiquidityManager, LiquidityServiceConfig};
 
 use lightning::chain::{BestBlock, Filter};
@@ -19,28 +20,30 @@ pub(crate) struct LSPSNodes<'a, 'b, 'c> {
 
 pub(crate) fn create_service_and_client_nodes<'a, 'b, 'c>(
 	nodes: Vec<Node<'a, 'b, 'c>>, service_config: LiquidityServiceConfig,
-	client_config: LiquidityClientConfig,
+	client_config: LiquidityClientConfig, time_provider: Arc<dyn TimeProvider + Send + Sync>,
 ) -> LSPSNodes<'a, 'b, 'c> {
 	let chain_params = ChainParameters {
 		network: Network::Testnet,
 		best_block: BestBlock::from_network(Network::Testnet),
 	};
-	let service_lm = LiquidityManager::new(
+	let service_lm = LiquidityManager::new_with_custom_time_provider(
 		nodes[0].keys_manager,
 		nodes[0].node,
 		None::<Arc<dyn Filter + Send + Sync>>,
 		Some(chain_params.clone()),
 		Some(service_config),
 		None,
+		Arc::clone(&time_provider),
 	);
 
-	let client_lm = LiquidityManager::new(
+	let client_lm = LiquidityManager::new_with_custom_time_provider(
 		nodes[1].keys_manager,
 		nodes[1].node,
 		None::<Arc<dyn Filter + Send + Sync>>,
 		Some(chain_params),
 		None,
 		Some(client_config),
+		time_provider,
 	);
 
 	let mut iter = nodes.into_iter();
@@ -56,6 +59,7 @@ pub(crate) struct LiquidityNode<'a, 'b, 'c> {
 		&'c TestKeysInterface,
 		&'a TestChannelManager<'b, 'c>,
 		Arc<dyn Filter + Send + Sync>,
+		Arc<dyn TimeProvider + Send + Sync>,
 	>,
 }
 
@@ -66,6 +70,7 @@ impl<'a, 'b, 'c> LiquidityNode<'a, 'b, 'c> {
 			&'c TestKeysInterface,
 			&'a TestChannelManager<'b, 'c>,
 			Arc<dyn Filter + Send + Sync>,
+			Arc<dyn TimeProvider + Send + Sync>,
 		>,
 	) -> Self {
 		Self { inner: node, liquidity_manager }