WIP

Author: martinsaposnic

lightning-liquidity/src/lsps5/client.rs

@@ -457,7 +457,12 @@ where
 		if diff > ten_minutes {
 			return Err(LSPS5ClientError::InvalidTimestamp(signature_timestamp.to_rfc3339()));
 		}
-
+		println!(
+			"LSPS5: Received notification from {} at {}",
+			counterparty_node_id,
+			signature_timestamp.to_rfc3339()
+		);
+		println!("LSPS5: Notification: {:?}", notification);
 		let message = format!(
 			"LSPS5: DO NOT SIGN THIS MESSAGE MANUALLY: LSP: At {} I notify {:?}",
 			signature_timestamp.to_rfc3339(),
@@ -519,16 +524,14 @@ where
 	/// - `counterparty_node_id`: the LSP’s public key, used to verify the signature.
 	/// - `timestamp`: ISO8601 time when the LSP created the notification.
 	/// - `signature`: the zbase32-encoded LN signature over timestamp+body.
-	/// - `notification_json`: the JSON string of the JSON-RPC notification object.
+	/// - `notification`: the [`WebhookNotification`] received from the LSP.
 	///
-	/// On success, emits [`LSPS5ClientEvent::WebhookNotificationReceived`]
-	/// and returns the parsed [`WebhookNotification`].
+	/// On success, emits [`LSPS5ClientEvent::WebhookNotificationReceived`].
 	///
 	/// Failure reasons include:
 	/// - Timestamp too old (drift > 10 minutes)
 	/// - Replay attack detected (signature reused)
 	/// - Invalid signature (crypto check fails)
-	/// - JSON parse errors for malformed `notification_json`
 	///
 	/// Clients should call this method upon receiving a [`LSPS5ServiceEvent::SendWebhookNotification`]
 	/// event, before taking action on the notification. This guarantees that only authentic,
@@ -539,30 +542,28 @@ where
 	/// [`WebhookNotification`]: super::msgs::WebhookNotification
 	pub fn parse_webhook_notification(
 		&self, counterparty_node_id: PublicKey, timestamp: &LSPSDateTime, signature: &str,
-		notification_json: &str,
-	) -> Result<WebhookNotification, LSPS5ClientError> {
-		let event_queue_notifier = self.pending_events.notifier();
-		let notification: WebhookNotification = serde_json::from_str(notification_json)
-			.map_err(|e| LSPS5ClientError::DeserializeError(e.to_string()))?;
-
-		self.check_signature_exists(signature)?;
-
-		self.store_signature(signature.to_string());
-
+		notification: &WebhookNotification,
+	) -> Result<(), LSPS5ClientError> {
 		match self.verify_notification_signature(
 			counterparty_node_id,
 			timestamp,
 			signature,
 			&notification,
 		) {
 			Ok(signature_valid) => {
+				let event_queue_notifier = self.pending_events.notifier();
+
+				self.check_signature_exists(signature)?;
+
+				self.store_signature(signature.to_string());
+
 				event_queue_notifier.enqueue(LSPS5ClientEvent::WebhookNotificationReceived {
 					counterparty_node_id,
 					notification: notification.clone(),
 					timestamp: timestamp.clone(),
 					signature_valid,
 				});
-				Ok(notification)
+				Ok(())
 			},
 			Err(e) => Err(e),
 		}

lightning-liquidity/src/lsps5/msgs.rs

@@ -941,4 +941,45 @@ mod tests {
 			}
 		}
 	}
+
+	#[test]
+	fn test_all_notification_methods_from_spec() {
+		let methods = [
+			("lsps5.webhook_registered", WebhookNotificationMethod::LSPS5WebhookRegistered, "{}"),
+			("lsps5.payment_incoming", WebhookNotificationMethod::LSPS5PaymentIncoming, "{}"),
+			(
+				"lsps5.expiry_soon",
+				WebhookNotificationMethod::LSPS5ExpirySoon { timeout: 144 },
+				"{\"timeout\":144}",
+			),
+			(
+				"lsps5.liquidity_management_request",
+				WebhookNotificationMethod::LSPS5LiquidityManagementRequest,
+				"{}",
+			),
+			(
+				"lsps5.onion_message_incoming",
+				WebhookNotificationMethod::LSPS5OnionMessageIncoming,
+				"{}",
+			),
+		];
+
+		for (method_name, method_enum, params_json) in methods {
+			let json = format!(
+				r#"{{"jsonrpc":"2.0","method":"{}","params":{}}}"#,
+				method_name, params_json
+			);
+
+			let notification: WebhookNotification = serde_json::from_str(&json).unwrap();
+
+			assert_eq!(notification.method, method_enum);
+
+			let serialized = serde_json::to_string(&notification).unwrap();
+			assert!(serialized.contains(&format!("\"method\":\"{}\"", method_name)));
+
+			if method_name == "lsps5.expiry_soon" {
+				assert!(serialized.contains("\"timeout\":144"));
+			}
+		}
+	}
 }