Add BOLT12 support to LSPS2 via custom Router implementation

fuzz/src/lsps_message.rs

@@ -21,7 +21,7 @@ use lightning::util::test_utils::{
 };
 
 use lightning_liquidity::lsps0::ser::LSPS_MESSAGE_TYPE_ID;
-use lightning_liquidity::LiquidityManagerSync;
+use lightning_liquidity::{DummyOnionMessageInterceptor, LiquidityManagerSync};
 
 use core::time::Duration;
 
@@ -87,6 +87,7 @@ pub fn do_test(data: &[u8]) {
 			Arc::clone(&tx_broadcaster),
 			None,
 			None,
+			DummyOnionMessageInterceptor,
 		)
 		.unwrap(),
 	);

lightning-background-processor/src/lib.rs

@@ -71,9 +71,9 @@ use lightning::util::wakers::Future;
 use lightning::util::wakers::Sleeper;
 use lightning_rapid_gossip_sync::RapidGossipSync;
 
-use lightning_liquidity::ALiquidityManager;
 #[cfg(feature = "std")]
 use lightning_liquidity::ALiquidityManagerSync;
+use lightning_liquidity::{ALiquidityManager, DummyOnionMessageInterceptor};
 
 use core::ops::Deref;
 use core::time::Duration;
@@ -463,6 +463,7 @@ pub const NO_LIQUIDITY_MANAGER: Option<
 				BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 					+ Send
 					+ Sync),
+					OMI = DummyOnionMessageInterceptor,
 			> + Send
 			+ Sync,
 	>,
@@ -485,6 +486,7 @@ pub const NO_LIQUIDITY_MANAGER_SYNC: Option<
 				BroadcasterInterface = &(dyn lightning::chain::chaininterface::BroadcasterInterface
 					+ Send
 					+ Sync),
+					OMI = DummyOnionMessageInterceptor,
 			> + Send
 			+ Sync,
 	>,
@@ -1972,7 +1974,9 @@ mod tests {
 	use lightning::util::test_utils;
 	use lightning::{get_event, get_event_msg};
 	use lightning_liquidity::utils::time::DefaultTimeProvider;
-	use lightning_liquidity::{ALiquidityManagerSync, LiquidityManager, LiquidityManagerSync};
+	use lightning_liquidity::{
+		ALiquidityManagerSync, DummyOnionMessageInterceptor, LiquidityManager, LiquidityManagerSync,
+	};
 	use lightning_persister::fs_store::v1::FilesystemStore;
 	use lightning_rapid_gossip_sync::RapidGossipSync;
 	use std::collections::VecDeque;
@@ -2556,6 +2560,7 @@ mod tests {
 					Arc::clone(&tx_broadcaster),
 					None,
 					None,
+					DummyOnionMessageInterceptor,
 				)
 				.unwrap(),
 			);

lightning-liquidity/src/lib.rs

@@ -74,6 +74,6 @@ mod tests;
 pub mod utils;
 
 pub use manager::{
-	ALiquidityManager, ALiquidityManagerSync, LiquidityClientConfig, LiquidityManager,
-	LiquidityManagerSync, LiquidityServiceConfig,
+	ALiquidityManager, ALiquidityManagerSync, DummyOnionMessageInterceptor, LiquidityClientConfig,
+	LiquidityManager, LiquidityManagerSync, LiquidityServiceConfig,
 };

lightning-liquidity/src/lsps2/event.rs

@@ -49,7 +49,17 @@ pub enum LSPS2ClientEvent {
 	/// When the invoice is paid, the LSP will open a channel with the previously agreed upon
 	/// parameters to you.
 	///
+	/// For BOLT11 JIT invoices, `intercept_scid` and `cltv_expiry_delta` can be used in a route
+	/// hint.
+	///
+	/// For BOLT12 JIT flows, register these parameters for your offer id on an
+	/// [`LSPS2BOLT12Router`] and then proceed with the regular BOLT12 offer
+	/// flow. The router will inject the LSPS2-specific blinded payment path when creating the
+	/// invoice.
+	///
 	/// **Note: ** This event will *not* be persisted across restarts.
+	///
+	/// [`LSPS2BOLT12Router`]: crate::lsps2::router::LSPS2BOLT12Router
 	InvoiceParametersReady {
 		/// The identifier of the issued bLIP-52 / LSPS2 `buy` request, as returned by
 		/// [`LSPS2ClientHandler::select_opening_params`].

lightning-liquidity/src/lsps2/mod.rs

@@ -13,5 +13,6 @@ pub mod client;
 pub mod event;
 pub mod msgs;
 pub(crate) mod payment_queue;
+pub mod router;
 pub mod service;
 pub mod utils;