Refactor liquidity source to support multiple LSP nodes#792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 9 commits into from
Jun 12, 2026
Merged

Refactor liquidity source to support multiple LSP nodes #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0713f6d
Move `liquidity.rs` to `liquidity/mod.rs` module directory
Camillarhi Mar 30, 2026
07dbde9
Move LSPS1 client logic into `liquidity/client/lsps1.rs`
Camillarhi Apr 16, 2026
7890b78
Move LSPS1 client event handling into `liquidity/client/lsps1.rs`
Camillarhi Apr 29, 2026
cab8892
Move LSPS2 client logic into `liquidity/client/lsps2.rs`
Camillarhi Apr 16, 2026
1f02b86
Move LSPS2 client event handling into `liquidity/client/lsps2.rs`
Camillarhi Apr 29, 2026
aa2cbfb
Move LSPS2 service logic into `liquidity/service/lsps2.rs`
Camillarhi Apr 16, 2026
96ba539
Move LSPS2 service event handling into `liquidity/service/lsps2.rs`
Camillarhi Apr 29, 2026
988ba66
Refactor liquidity source to support multiple LSP nodes
Camillarhi Apr 29, 2026
5191217
Collapse NodeCustomMessageHandler enum into a struct
Camillarhi May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bindings/ldk_node.udl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ interface Builder {
void set_gossip_source_p2p();
void set_gossip_source_rgs(string rgs_server_url);
void set_pathfinding_scores_source(string url);
void set_liquidity_source_lsps1(PublicKey node_id, SocketAddress address, string? token);
void set_liquidity_source_lsps2(PublicKey node_id, SocketAddress address, string? token);
void add_liquidity_source(PublicKey node_id, SocketAddress address, string? token, boolean trust_peer_0conf);
void set_storage_dir_path(string storage_dir_path);
void set_filesystem_logger(string? log_file_path, LogLevel? max_log_level);
void set_log_facade_logger();
Expand DownExpand Up@@ -99,7 +98,7 @@ interface Node {
SpontaneousPayment spontaneous_payment();
OnchainPayment onchain_payment();
UnifiedPayment unified_payment();
LSPS1Liquidity lsps1_liquidity();
Liquidity liquidity();
[Throws=NodeError]
void lnurl_auth(string lnurl);
[Throws=NodeError]
Expand DownExpand Up@@ -167,7 +166,7 @@ interface FeeRate {

typedef interface UnifiedPayment;

typedef interface LSPS1Liquidity;
typedef interface Liquidity;

[Error]
enum NodeError {
Expand DownExpand Up@@ -275,6 +274,7 @@ dictionary LSPS1OrderStatus {
LSPS1OrderParams order_params;
LSPS1PaymentInfo payment_options;
LSPS1ChannelInfo? channel_state;
PublicKey counterparty_node_id;
};

[Remote]
Expand Down
160 changes: 65 additions & 95 deletions src/builder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,9 +68,7 @@ use crate::io::{
PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
};
use crate::liquidity::{LSPS2ServiceConfig, LiquiditySourceBuilder, LspConfig};
use crate::lnurl_auth::LnurlAuth;
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -123,10 +121,8 @@ struct PathfindingScoresSyncConfig {

#[derive(Debug, Clone, Default)]
struct LiquiditySourceConfig {
// Act as an LSPS1 client connecting to the given service.
lsps1_client: Option<LSPS1ClientConfig>,
// Act as an LSPS2 client connecting to the given service.
lsps2_client: Option<LSPS2ClientConfig>,
// Acts for both LSPS1 and LSPS2 clients connecting to the given service.
lsp_nodes: Vec<LspConfig>,
// Act as an LSPS2 service.
lsps2_service: Option<LSPS2ServiceConfig>,
}
Expand DownExpand Up@@ -443,45 +439,36 @@ impl NodeBuilder {
self
}

/// Configures the [`Node`] instance to source inbound liquidity from the given
/// [bLIP-51 / LSPS1] service.
/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
///
/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
/// and select the appropriate protocol per request automatically.
///
/// The given `token` will be used by the LSP to authenticate the user.
/// `trust_peer_0conf` controls whether the node will additionally accept
/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
///
/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
///
/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
pub fn set_liquidity_source_lsps1(
/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
pub fn add_liquidity_source(
&mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
trust_peer_0conf: bool,
) -> &mut Self {
// Mark the LSP as trusted for 0conf
self.config.trusted_peers_0conf.push(node_id.clone());

let liquidity_source_config =
self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
let lsps1_client_config = LSPS1ClientConfig { node_id, address, token };
liquidity_source_config.lsps1_client = Some(lsps1_client_config);
self
}

/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
/// [bLIP-52 / LSPS2] service.
///
/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
///
/// The given `token` will be used by the LSP to authenticate the user.
///
/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
pub fn set_liquidity_source_lsps2(
&mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
) -> &mut Self {
// Mark the LSP as trusted for 0conf
self.config.trusted_peers_0conf.push(node_id.clone());
if liquidity_source_config.lsp_nodes.iter().any(|n| n.node_id == node_id) {
return self;
}

let liquidity_source_config =
self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
let lsps2_client_config = LSPS2ClientConfig { node_id, address, token };
liquidity_source_config.lsps2_client = Some(lsps2_client_config);
liquidity_source_config.lsp_nodes.push(LspConfig {
node_id,
address,
token,
trust_peer_0conf,
});
self
}

Expand All@@ -491,12 +478,12 @@ impl NodeBuilder {
/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
///
/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
pub fn set_liquidity_provider_lsps2(
&mut self, service_config: LSPS2ServiceConfig,
pub fn enable_liquidity_provider(
&mut self, lsps2_service_config: LSPS2ServiceConfig,
) -> &mut Self {
let liquidity_source_config =
self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
liquidity_source_config.lsps2_service = Some(service_config);
liquidity_source_config.lsps2_service = Some(lsps2_service_config);
self
}

Expand DownExpand Up@@ -1032,32 +1019,29 @@ impl ArcedNodeBuilder {
self.inner.write().expect("lock").set_pathfinding_scores_source(url);
}

/// Configures the [`Node`] instance to source inbound liquidity from the given
/// [bLIP-51 / LSPS1] service.
/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
///
/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
/// and select the appropriate protocol per request automatically.
///
/// The given `token` will be used by the LSP to authenticate the user.
/// `trust_peer_0conf` controls whether the node will additionally accept
/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
///
/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
pub fn set_liquidity_source_lsps1(
&self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
) {
self.inner.write().expect("lock").set_liquidity_source_lsps1(node_id, address, token);
}

/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
/// [bLIP-52 / LSPS2] service.
///
/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
///
/// The given `token` will be used by the LSP to authenticate the user.
/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
///
/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
pub fn set_liquidity_source_lsps2(
/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
pub fn add_liquidity_source(
&self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
trust_peer_0conf: bool,
) {
self.inner.write().expect("lock").set_liquidity_source_lsps2(node_id, address, token);
self.inner.write().expect("lock").add_liquidity_source(
node_id,
address,
token,
trust_peer_0conf,
);
}

/// Configures the [`Node`] instance to provide an [LSPS2] service, issuing just-in-time
Expand All@@ -1066,8 +1050,8 @@ impl ArcedNodeBuilder {
/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
///
/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
pub fn set_liquidity_provider_lsps2(&self, service_config: LSPS2ServiceConfig) {
self.inner.write().expect("lock").set_liquidity_provider_lsps2(service_config);
pub fn enable_liquidity_provider(&self, lsps2_service_config: LSPS2ServiceConfig) {
self.inner.write().expect("lock").enable_liquidity_provider(lsps2_service_config);
}

/// Sets the used storage directory path.
Expand DownExpand Up@@ -1975,33 +1959,19 @@ fn build_with_store_internal(
},
};

let (liquidity_source, custom_message_handler) =
if let Some(lsc) = liquidity_source_config.as_ref() {
let mut liquidity_source_builder = LiquiditySourceBuilder::new(
Arc::clone(&wallet),
Arc::clone(&channel_manager),
Arc::clone(&keys_manager),
Arc::clone(&tx_broadcaster),
Arc::clone(&kv_store),
Arc::clone(&config),
Arc::clone(&logger),
);

lsc.lsps1_client.as_ref().map(|config| {
liquidity_source_builder.lsps1_client(
config.node_id,
config.address.clone(),
config.token.clone(),
)
});
let (liquidity_source, custom_message_handler) = {
let mut liquidity_source_builder = LiquiditySourceBuilder::new(
Arc::clone(&wallet),
Arc::clone(&channel_manager),
Arc::clone(&keys_manager),
Arc::clone(&tx_broadcaster),
Arc::clone(&kv_store),
Arc::clone(&config),
Arc::clone(&logger),
);

lsc.lsps2_client.as_ref().map(|config| {
liquidity_source_builder.lsps2_client(
config.node_id,
config.address.clone(),
config.token.clone(),
)
});
if let Some(lsc) = liquidity_source_config.as_ref() {
liquidity_source_builder.set_lsp_nodes(lsc.lsp_nodes.clone());

let promise_secret = {
let lsps_xpriv = derive_xprv(
Expand All@@ -2015,15 +1985,15 @@ fn build_with_store_internal(
lsc.lsps2_service.as_ref().map(|config| {
liquidity_source_builder.lsps2_service(promise_secret, config.clone())
});
}

let liquidity_source = runtime
.block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
let custom_message_handler =
Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
(Some(liquidity_source), custom_message_handler)
} else {
(None, Arc::new(NodeCustomMessageHandler::new_ignoring()))
};
let liquidity_source = runtime
.block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
let custom_message_handler =
Arc::new(NodeCustomMessageHandler::new(Arc::clone(&liquidity_source)));

(liquidity_source, custom_message_handler)
};

let msg_handler = match gossip_source.as_gossip_sync() {
GossipSync::P2P(p2p_gossip_sync) => MessageHandler {
Expand DownExpand Up@@ -2072,7 +2042,7 @@ fn build_with_store_internal(
}));
}

liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
liquidity_source.lsps2_service().set_peer_manager(Arc::downgrade(&peer_manager));

let connection_manager = Arc::new(ConnectionManager::new(
Arc::clone(&peer_manager),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Refactor liquidity source to support multiple LSP nodes#792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 9 commits into

from

Jun 12, 2026
 Merged


Refactor liquidity source to support multiple LSP nodes
#792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
0713f6d

Move `liquidity.rs` to `liquidity/mod.rs` module directory


Camillarhi Mar 30, 2026
07dbde9

Move LSPS1 client logic into `liquidity/client/lsps1.rs`


Camillarhi Apr 16, 2026
7890b78

Move LSPS1 client event handling into `liquidity/client/lsps1.rs`


Camillarhi Apr 29, 2026
cab8892

Move LSPS2 client logic into `liquidity/client/lsps2.rs`


Camillarhi Apr 16, 2026
1f02b86

Move LSPS2 client event handling into `liquidity/client/lsps2.rs`


Camillarhi Apr 29, 2026
aa2cbfb

Move LSPS2 service logic into `liquidity/service/lsps2.rs`


Camillarhi Apr 16, 2026
96ba539

Move LSPS2 service event handling into `liquidity/service/lsps2.rs`


Camillarhi Apr 29, 2026
988ba66

Refactor liquidity source to support multiple LSP nodes


Camillarhi Apr 29, 2026
5191217

Collapse NodeCustomMessageHandler enum into a struct


Camillarhi May 7, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ interface Builder {
	void set_gossip_source_p2p();
	void set_gossip_source_rgs(string rgs_server_url);
	void set_pathfinding_scores_source(string url);
	void set_liquidity_source_lsps1(PublicKey node_id, SocketAddress address, string? token);
	void set_liquidity_source_lsps2(PublicKey node_id, SocketAddress address, string? token);
	void add_liquidity_source(PublicKey node_id, SocketAddress address, string? token, boolean trust_peer_0conf);
	void set_storage_dir_path(string storage_dir_path);
	void set_filesystem_logger(string? log_file_path, LogLevel? max_log_level);
	void set_log_facade_logger();
Expand DownExpand Up@@ -99,7 +98,7 @@ interface Node {
	SpontaneousPayment spontaneous_payment();
	OnchainPayment onchain_payment();
	UnifiedPayment unified_payment();
LSPS1Liquidity lsps1_liquidity();
Liquidity liquidity();
	[Throws=NodeError]
	void lnurl_auth(string lnurl);
	[Throws=NodeError]
Expand DownExpand Up@@ -167,7 +166,7 @@ interface FeeRate {

typedef interface UnifiedPayment;

typedef interface LSPS1Liquidity;
typedef interface Liquidity;

[Error]
enum NodeError {
Expand DownExpand Up@@ -275,6 +274,7 @@ dictionary LSPS1OrderStatus {
	LSPS1OrderParams order_params;
	LSPS1PaymentInfo payment_options;
	LSPS1ChannelInfo? channel_state;
	PublicKey counterparty_node_id;
};

[Remote]
Expand Down

160 changes: 65 additions & 95 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,9 +68,7 @@ use crate::io::{
	PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
	PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
};
use crate::liquidity::{LSPS2ServiceConfig, LiquiditySourceBuilder, LspConfig};
use crate::lnurl_auth::LnurlAuth;
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -123,10 +121,8 @@ struct PathfindingScoresSyncConfig {

#[derive(Debug, Clone, Default)]
struct LiquiditySourceConfig {
	// Act as an LSPS1 client connecting to the given service.
	lsps1_client: Option<LSPS1ClientConfig>,
	// Act as an LSPS2 client connecting to the given service.
	lsps2_client: Option<LSPS2ClientConfig>,
	// Acts for both LSPS1 and LSPS2 clients connecting to the given service.
	lsp_nodes: Vec<LspConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
}
Expand DownExpand Up@@ -443,45 +439,36 @@ impl NodeBuilder {
 self
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps1_client_config = LSPS1ClientConfig { node_id, address, token };
 liquidity_source_config.lsps1_client = Some(lsps1_client_config);
 self
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());
 if liquidity_source_config.lsp_nodes.iter().any(|n| n.node_id == node_id) {
 return self;
 }

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps2_client_config = LSPS2ClientConfig { node_id, address, token };
 liquidity_source_config.lsps2_client = Some(lsps2_client_config);
 liquidity_source_config.lsp_nodes.push(LspConfig {
 node_id,
 address,
 token,
 trust_peer_0conf,
 });
 self
	}

Expand All@@ -491,12 +478,12 @@ impl NodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(
 &mut self, service_config: LSPS2ServiceConfig,
	pub fn enable_liquidity_provider(
 &mut self, lsps2_service_config: LSPS2ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps2_service = Some(service_config);
 liquidity_source_config.lsps2_service = Some(lsps2_service_config);
 self
	}

Expand DownExpand Up@@ -1032,32 +1019,29 @@ impl ArcedNodeBuilder {
 self.inner.write().expect("lock").set_pathfinding_scores_source(url);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps1(node_id, address, token);
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps2(node_id, address, token);
 self.inner.write().expect("lock").add_liquidity_source(
 node_id,
 address,
 token,
 trust_peer_0conf,
 );
	}

	/// Configures the [`Node`] instance to provide an [LSPS2] service, issuing just-in-time
Expand All@@ -1066,8 +1050,8 @@ impl ArcedNodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(&self, service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").set_liquidity_provider_lsps2(service_config);
	pub fn enable_liquidity_provider(&self, lsps2_service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").enable_liquidity_provider(lsps2_service_config);
	}

	/// Sets the used storage directory path.
Expand DownExpand Up@@ -1975,33 +1959,19 @@ fn build_with_store_internal(
 },
	};

	let (liquidity_source, custom_message_handler) =
 if let Some(lsc) = liquidity_source_config.as_ref() {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps1_client.as_ref().map(|config| {
 liquidity_source_builder.lsps1_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
	let (liquidity_source, custom_message_handler) = {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps2_client.as_ref().map(|config| {
 liquidity_source_builder.lsps2_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
 if let Some(lsc) = liquidity_source_config.as_ref() {
 liquidity_source_builder.set_lsp_nodes(lsc.lsp_nodes.clone());

 let promise_secret = {
 let lsps_xpriv = derive_xprv(
Expand All@@ -2015,15 +1985,15 @@ fn build_with_store_internal(
 lsc.lsps2_service.as_ref().map(|config| {
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });
 }

 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
 (Some(liquidity_source), custom_message_handler)
 } else {
 (None, Arc::new(NodeCustomMessageHandler::new_ignoring()))
 };
 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new(Arc::clone(&liquidity_source)));

 (liquidity_source, custom_message_handler)
	};

	let msg_handler = match gossip_source.as_gossip_sync() {
 GossipSync::P2P(p2p_gossip_sync) => MessageHandler {
Expand DownExpand Up@@ -2072,7 +2042,7 @@ fn build_with_store_internal(
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
	liquidity_source.lsps2_service().set_peer_manager(Arc::downgrade(&peer_manager));

	let connection_manager = Arc::new(ConnectionManager::new(
 Arc::clone(&peer_manager),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor liquidity source to support multiple LSP nodes#792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 9 commits into

from

Jun 12, 2026
 Merged


Refactor liquidity source to support multiple LSP nodes
#792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
0713f6d

Move `liquidity.rs` to `liquidity/mod.rs` module directory


Camillarhi Mar 30, 2026
07dbde9

Move LSPS1 client logic into `liquidity/client/lsps1.rs`


Camillarhi Apr 16, 2026
7890b78

Move LSPS1 client event handling into `liquidity/client/lsps1.rs`


Camillarhi Apr 29, 2026
cab8892

Move LSPS2 client logic into `liquidity/client/lsps2.rs`


Camillarhi Apr 16, 2026
1f02b86

Move LSPS2 client event handling into `liquidity/client/lsps2.rs`


Camillarhi Apr 29, 2026
aa2cbfb

Move LSPS2 service logic into `liquidity/service/lsps2.rs`


Camillarhi Apr 16, 2026
96ba539

Move LSPS2 service event handling into `liquidity/service/lsps2.rs`


Camillarhi Apr 29, 2026
988ba66

Refactor liquidity source to support multiple LSP nodes


Camillarhi Apr 29, 2026
5191217

Collapse NodeCustomMessageHandler enum into a struct


Camillarhi May 7, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ interface Builder {
	void set_gossip_source_p2p();
	void set_gossip_source_rgs(string rgs_server_url);
	void set_pathfinding_scores_source(string url);
	void set_liquidity_source_lsps1(PublicKey node_id, SocketAddress address, string? token);
	void set_liquidity_source_lsps2(PublicKey node_id, SocketAddress address, string? token);
	void add_liquidity_source(PublicKey node_id, SocketAddress address, string? token, boolean trust_peer_0conf);
	void set_storage_dir_path(string storage_dir_path);
	void set_filesystem_logger(string? log_file_path, LogLevel? max_log_level);
	void set_log_facade_logger();
Expand DownExpand Up@@ -99,7 +98,7 @@ interface Node {
	SpontaneousPayment spontaneous_payment();
	OnchainPayment onchain_payment();
	UnifiedPayment unified_payment();
LSPS1Liquidity lsps1_liquidity();
Liquidity liquidity();
	[Throws=NodeError]
	void lnurl_auth(string lnurl);
	[Throws=NodeError]
Expand DownExpand Up@@ -167,7 +166,7 @@ interface FeeRate {

typedef interface UnifiedPayment;

typedef interface LSPS1Liquidity;
typedef interface Liquidity;

[Error]
enum NodeError {
Expand DownExpand Up@@ -275,6 +274,7 @@ dictionary LSPS1OrderStatus {
	LSPS1OrderParams order_params;
	LSPS1PaymentInfo payment_options;
	LSPS1ChannelInfo? channel_state;
	PublicKey counterparty_node_id;
};

[Remote]
Expand Down

160 changes: 65 additions & 95 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,9 +68,7 @@ use crate::io::{
	PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
	PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
};
use crate::liquidity::{LSPS2ServiceConfig, LiquiditySourceBuilder, LspConfig};
use crate::lnurl_auth::LnurlAuth;
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -123,10 +121,8 @@ struct PathfindingScoresSyncConfig {

#[derive(Debug, Clone, Default)]
struct LiquiditySourceConfig {
	// Act as an LSPS1 client connecting to the given service.
	lsps1_client: Option<LSPS1ClientConfig>,
	// Act as an LSPS2 client connecting to the given service.
	lsps2_client: Option<LSPS2ClientConfig>,
	// Acts for both LSPS1 and LSPS2 clients connecting to the given service.
	lsp_nodes: Vec<LspConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
}
Expand DownExpand Up@@ -443,45 +439,36 @@ impl NodeBuilder {
 self
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps1_client_config = LSPS1ClientConfig { node_id, address, token };
 liquidity_source_config.lsps1_client = Some(lsps1_client_config);
 self
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());
 if liquidity_source_config.lsp_nodes.iter().any(|n| n.node_id == node_id) {
 return self;
 }

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps2_client_config = LSPS2ClientConfig { node_id, address, token };
 liquidity_source_config.lsps2_client = Some(lsps2_client_config);
 liquidity_source_config.lsp_nodes.push(LspConfig {
 node_id,
 address,
 token,
 trust_peer_0conf,
 });
 self
	}

Expand All@@ -491,12 +478,12 @@ impl NodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(
 &mut self, service_config: LSPS2ServiceConfig,
	pub fn enable_liquidity_provider(
 &mut self, lsps2_service_config: LSPS2ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps2_service = Some(service_config);
 liquidity_source_config.lsps2_service = Some(lsps2_service_config);
 self
	}

Expand DownExpand Up@@ -1032,32 +1019,29 @@ impl ArcedNodeBuilder {
 self.inner.write().expect("lock").set_pathfinding_scores_source(url);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps1(node_id, address, token);
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps2(node_id, address, token);
 self.inner.write().expect("lock").add_liquidity_source(
 node_id,
 address,
 token,
 trust_peer_0conf,
 );
	}

	/// Configures the [`Node`] instance to provide an [LSPS2] service, issuing just-in-time
Expand All@@ -1066,8 +1050,8 @@ impl ArcedNodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(&self, service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").set_liquidity_provider_lsps2(service_config);
	pub fn enable_liquidity_provider(&self, lsps2_service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").enable_liquidity_provider(lsps2_service_config);
	}

	/// Sets the used storage directory path.
Expand DownExpand Up@@ -1975,33 +1959,19 @@ fn build_with_store_internal(
 },
	};

	let (liquidity_source, custom_message_handler) =
 if let Some(lsc) = liquidity_source_config.as_ref() {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps1_client.as_ref().map(|config| {
 liquidity_source_builder.lsps1_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
	let (liquidity_source, custom_message_handler) = {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps2_client.as_ref().map(|config| {
 liquidity_source_builder.lsps2_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
 if let Some(lsc) = liquidity_source_config.as_ref() {
 liquidity_source_builder.set_lsp_nodes(lsc.lsp_nodes.clone());

 let promise_secret = {
 let lsps_xpriv = derive_xprv(
Expand All@@ -2015,15 +1985,15 @@ fn build_with_store_internal(
 lsc.lsps2_service.as_ref().map(|config| {
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });
 }

 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
 (Some(liquidity_source), custom_message_handler)
 } else {
 (None, Arc::new(NodeCustomMessageHandler::new_ignoring()))
 };
 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new(Arc::clone(&liquidity_source)));

 (liquidity_source, custom_message_handler)
	};

	let msg_handler = match gossip_source.as_gossip_sync() {
 GossipSync::P2P(p2p_gossip_sync) => MessageHandler {
Expand DownExpand Up@@ -2072,7 +2042,7 @@ fn build_with_store_internal(
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
	liquidity_source.lsps2_service().set_peer_manager(Arc::downgrade(&peer_manager));

	let connection_manager = Arc::new(ConnectionManager::new(
 Arc::clone(&peer_manager),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor liquidity source to support multiple LSP nodes#792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 9 commits into

from

Jun 12, 2026
 Merged


Refactor liquidity source to support multiple LSP nodes
#792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
0713f6d

Move `liquidity.rs` to `liquidity/mod.rs` module directory


Camillarhi Mar 30, 2026
07dbde9

Move LSPS1 client logic into `liquidity/client/lsps1.rs`


Camillarhi Apr 16, 2026
7890b78

Move LSPS1 client event handling into `liquidity/client/lsps1.rs`


Camillarhi Apr 29, 2026
cab8892

Move LSPS2 client logic into `liquidity/client/lsps2.rs`


Camillarhi Apr 16, 2026
1f02b86

Move LSPS2 client event handling into `liquidity/client/lsps2.rs`


Camillarhi Apr 29, 2026
aa2cbfb

Move LSPS2 service logic into `liquidity/service/lsps2.rs`


Camillarhi Apr 16, 2026
96ba539

Move LSPS2 service event handling into `liquidity/service/lsps2.rs`


Camillarhi Apr 29, 2026
988ba66

Refactor liquidity source to support multiple LSP nodes


Camillarhi Apr 29, 2026
5191217

Collapse NodeCustomMessageHandler enum into a struct


Camillarhi May 7, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ interface Builder {
	void set_gossip_source_p2p();
	void set_gossip_source_rgs(string rgs_server_url);
	void set_pathfinding_scores_source(string url);
	void set_liquidity_source_lsps1(PublicKey node_id, SocketAddress address, string? token);
	void set_liquidity_source_lsps2(PublicKey node_id, SocketAddress address, string? token);
	void add_liquidity_source(PublicKey node_id, SocketAddress address, string? token, boolean trust_peer_0conf);
	void set_storage_dir_path(string storage_dir_path);
	void set_filesystem_logger(string? log_file_path, LogLevel? max_log_level);
	void set_log_facade_logger();
Expand DownExpand Up@@ -99,7 +98,7 @@ interface Node {
	SpontaneousPayment spontaneous_payment();
	OnchainPayment onchain_payment();
	UnifiedPayment unified_payment();
LSPS1Liquidity lsps1_liquidity();
Liquidity liquidity();
	[Throws=NodeError]
	void lnurl_auth(string lnurl);
	[Throws=NodeError]
Expand DownExpand Up@@ -167,7 +166,7 @@ interface FeeRate {

typedef interface UnifiedPayment;

typedef interface LSPS1Liquidity;
typedef interface Liquidity;

[Error]
enum NodeError {
Expand DownExpand Up@@ -275,6 +274,7 @@ dictionary LSPS1OrderStatus {
	LSPS1OrderParams order_params;
	LSPS1PaymentInfo payment_options;
	LSPS1ChannelInfo? channel_state;
	PublicKey counterparty_node_id;
};

[Remote]
Expand Down

160 changes: 65 additions & 95 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,9 +68,7 @@ use crate::io::{
	PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
	PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
};
use crate::liquidity::{LSPS2ServiceConfig, LiquiditySourceBuilder, LspConfig};
use crate::lnurl_auth::LnurlAuth;
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -123,10 +121,8 @@ struct PathfindingScoresSyncConfig {

#[derive(Debug, Clone, Default)]
struct LiquiditySourceConfig {
	// Act as an LSPS1 client connecting to the given service.
	lsps1_client: Option<LSPS1ClientConfig>,
	// Act as an LSPS2 client connecting to the given service.
	lsps2_client: Option<LSPS2ClientConfig>,
	// Acts for both LSPS1 and LSPS2 clients connecting to the given service.
	lsp_nodes: Vec<LspConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
}
Expand DownExpand Up@@ -443,45 +439,36 @@ impl NodeBuilder {
 self
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps1_client_config = LSPS1ClientConfig { node_id, address, token };
 liquidity_source_config.lsps1_client = Some(lsps1_client_config);
 self
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());
 if liquidity_source_config.lsp_nodes.iter().any(|n| n.node_id == node_id) {
 return self;
 }

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps2_client_config = LSPS2ClientConfig { node_id, address, token };
 liquidity_source_config.lsps2_client = Some(lsps2_client_config);
 liquidity_source_config.lsp_nodes.push(LspConfig {
 node_id,
 address,
 token,
 trust_peer_0conf,
 });
 self
	}

Expand All@@ -491,12 +478,12 @@ impl NodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(
 &mut self, service_config: LSPS2ServiceConfig,
	pub fn enable_liquidity_provider(
 &mut self, lsps2_service_config: LSPS2ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps2_service = Some(service_config);
 liquidity_source_config.lsps2_service = Some(lsps2_service_config);
 self
	}

Expand DownExpand Up@@ -1032,32 +1019,29 @@ impl ArcedNodeBuilder {
 self.inner.write().expect("lock").set_pathfinding_scores_source(url);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps1(node_id, address, token);
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps2(node_id, address, token);
 self.inner.write().expect("lock").add_liquidity_source(
 node_id,
 address,
 token,
 trust_peer_0conf,
 );
	}

	/// Configures the [`Node`] instance to provide an [LSPS2] service, issuing just-in-time
Expand All@@ -1066,8 +1050,8 @@ impl ArcedNodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(&self, service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").set_liquidity_provider_lsps2(service_config);
	pub fn enable_liquidity_provider(&self, lsps2_service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").enable_liquidity_provider(lsps2_service_config);
	}

	/// Sets the used storage directory path.
Expand DownExpand Up@@ -1975,33 +1959,19 @@ fn build_with_store_internal(
 },
	};

	let (liquidity_source, custom_message_handler) =
 if let Some(lsc) = liquidity_source_config.as_ref() {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps1_client.as_ref().map(|config| {
 liquidity_source_builder.lsps1_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
	let (liquidity_source, custom_message_handler) = {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps2_client.as_ref().map(|config| {
 liquidity_source_builder.lsps2_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
 if let Some(lsc) = liquidity_source_config.as_ref() {
 liquidity_source_builder.set_lsp_nodes(lsc.lsp_nodes.clone());

 let promise_secret = {
 let lsps_xpriv = derive_xprv(
Expand All@@ -2015,15 +1985,15 @@ fn build_with_store_internal(
 lsc.lsps2_service.as_ref().map(|config| {
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });
 }

 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
 (Some(liquidity_source), custom_message_handler)
 } else {
 (None, Arc::new(NodeCustomMessageHandler::new_ignoring()))
 };
 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new(Arc::clone(&liquidity_source)));

 (liquidity_source, custom_message_handler)
	};

	let msg_handler = match gossip_source.as_gossip_sync() {
 GossipSync::P2P(p2p_gossip_sync) => MessageHandler {
Expand DownExpand Up@@ -2072,7 +2042,7 @@ fn build_with_store_internal(
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
	liquidity_source.lsps2_service().set_peer_manager(Arc::downgrade(&peer_manager));

	let connection_manager = Arc::new(ConnectionManager::new(
 Arc::clone(&peer_manager),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Refactor liquidity source to support multiple LSP nodes#792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 9 commits into

from

Jun 12, 2026
 Merged


Refactor liquidity source to support multiple LSP nodes
#792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
0713f6d

Move `liquidity.rs` to `liquidity/mod.rs` module directory


Camillarhi Mar 30, 2026
07dbde9

Move LSPS1 client logic into `liquidity/client/lsps1.rs`


Camillarhi Apr 16, 2026
7890b78

Move LSPS1 client event handling into `liquidity/client/lsps1.rs`


Camillarhi Apr 29, 2026
cab8892

Move LSPS2 client logic into `liquidity/client/lsps2.rs`


Camillarhi Apr 16, 2026
1f02b86

Move LSPS2 client event handling into `liquidity/client/lsps2.rs`


Camillarhi Apr 29, 2026
aa2cbfb

Move LSPS2 service logic into `liquidity/service/lsps2.rs`


Camillarhi Apr 16, 2026
96ba539

Move LSPS2 service event handling into `liquidity/service/lsps2.rs`


Camillarhi Apr 29, 2026
988ba66

Refactor liquidity source to support multiple LSP nodes


Camillarhi Apr 29, 2026
5191217

Collapse NodeCustomMessageHandler enum into a struct


Camillarhi May 7, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ interface Builder {
	void set_gossip_source_p2p();
	void set_gossip_source_rgs(string rgs_server_url);
	void set_pathfinding_scores_source(string url);
	void set_liquidity_source_lsps1(PublicKey node_id, SocketAddress address, string? token);
	void set_liquidity_source_lsps2(PublicKey node_id, SocketAddress address, string? token);
	void add_liquidity_source(PublicKey node_id, SocketAddress address, string? token, boolean trust_peer_0conf);
	void set_storage_dir_path(string storage_dir_path);
	void set_filesystem_logger(string? log_file_path, LogLevel? max_log_level);
	void set_log_facade_logger();
Expand DownExpand Up@@ -99,7 +98,7 @@ interface Node {
	SpontaneousPayment spontaneous_payment();
	OnchainPayment onchain_payment();
	UnifiedPayment unified_payment();
LSPS1Liquidity lsps1_liquidity();
Liquidity liquidity();
	[Throws=NodeError]
	void lnurl_auth(string lnurl);
	[Throws=NodeError]
Expand DownExpand Up@@ -167,7 +166,7 @@ interface FeeRate {

typedef interface UnifiedPayment;

typedef interface LSPS1Liquidity;
typedef interface Liquidity;

[Error]
enum NodeError {
Expand DownExpand Up@@ -275,6 +274,7 @@ dictionary LSPS1OrderStatus {
	LSPS1OrderParams order_params;
	LSPS1PaymentInfo payment_options;
	LSPS1ChannelInfo? channel_state;
	PublicKey counterparty_node_id;
};

[Remote]
Expand Down

160 changes: 65 additions & 95 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,9 +68,7 @@ use crate::io::{
	PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
	PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
};
use crate::liquidity::{LSPS2ServiceConfig, LiquiditySourceBuilder, LspConfig};
use crate::lnurl_auth::LnurlAuth;
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -123,10 +121,8 @@ struct PathfindingScoresSyncConfig {

#[derive(Debug, Clone, Default)]
struct LiquiditySourceConfig {
	// Act as an LSPS1 client connecting to the given service.
	lsps1_client: Option<LSPS1ClientConfig>,
	// Act as an LSPS2 client connecting to the given service.
	lsps2_client: Option<LSPS2ClientConfig>,
	// Acts for both LSPS1 and LSPS2 clients connecting to the given service.
	lsp_nodes: Vec<LspConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
}
Expand DownExpand Up@@ -443,45 +439,36 @@ impl NodeBuilder {
 self
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps1_client_config = LSPS1ClientConfig { node_id, address, token };
 liquidity_source_config.lsps1_client = Some(lsps1_client_config);
 self
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());
 if liquidity_source_config.lsp_nodes.iter().any(|n| n.node_id == node_id) {
 return self;
 }

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps2_client_config = LSPS2ClientConfig { node_id, address, token };
 liquidity_source_config.lsps2_client = Some(lsps2_client_config);
 liquidity_source_config.lsp_nodes.push(LspConfig {
 node_id,
 address,
 token,
 trust_peer_0conf,
 });
 self
	}

Expand All@@ -491,12 +478,12 @@ impl NodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(
 &mut self, service_config: LSPS2ServiceConfig,
	pub fn enable_liquidity_provider(
 &mut self, lsps2_service_config: LSPS2ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps2_service = Some(service_config);
 liquidity_source_config.lsps2_service = Some(lsps2_service_config);
 self
	}

Expand DownExpand Up@@ -1032,32 +1019,29 @@ impl ArcedNodeBuilder {
 self.inner.write().expect("lock").set_pathfinding_scores_source(url);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps1(node_id, address, token);
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps2(node_id, address, token);
 self.inner.write().expect("lock").add_liquidity_source(
 node_id,
 address,
 token,
 trust_peer_0conf,
 );
	}

	/// Configures the [`Node`] instance to provide an [LSPS2] service, issuing just-in-time
Expand All@@ -1066,8 +1050,8 @@ impl ArcedNodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(&self, service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").set_liquidity_provider_lsps2(service_config);
	pub fn enable_liquidity_provider(&self, lsps2_service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").enable_liquidity_provider(lsps2_service_config);
	}

	/// Sets the used storage directory path.
Expand DownExpand Up@@ -1975,33 +1959,19 @@ fn build_with_store_internal(
 },
	};

	let (liquidity_source, custom_message_handler) =
 if let Some(lsc) = liquidity_source_config.as_ref() {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps1_client.as_ref().map(|config| {
 liquidity_source_builder.lsps1_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
	let (liquidity_source, custom_message_handler) = {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps2_client.as_ref().map(|config| {
 liquidity_source_builder.lsps2_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
 if let Some(lsc) = liquidity_source_config.as_ref() {
 liquidity_source_builder.set_lsp_nodes(lsc.lsp_nodes.clone());

 let promise_secret = {
 let lsps_xpriv = derive_xprv(
Expand All@@ -2015,15 +1985,15 @@ fn build_with_store_internal(
 lsc.lsps2_service.as_ref().map(|config| {
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });
 }

 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
 (Some(liquidity_source), custom_message_handler)
 } else {
 (None, Arc::new(NodeCustomMessageHandler::new_ignoring()))
 };
 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new(Arc::clone(&liquidity_source)));

 (liquidity_source, custom_message_handler)
	};

	let msg_handler = match gossip_source.as_gossip_sync() {
 GossipSync::P2P(p2p_gossip_sync) => MessageHandler {
Expand DownExpand Up@@ -2072,7 +2042,7 @@ fn build_with_store_internal(
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
	liquidity_source.lsps2_service().set_peer_manager(Arc::downgrade(&peer_manager));

	let connection_manager = Arc::new(ConnectionManager::new(
 Arc::clone(&peer_manager),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor liquidity source to support multiple LSP nodes#792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 9 commits into

from

Jun 12, 2026
 Merged


Refactor liquidity source to support multiple LSP nodes
#792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
0713f6d

Move `liquidity.rs` to `liquidity/mod.rs` module directory


Camillarhi Mar 30, 2026
07dbde9

Move LSPS1 client logic into `liquidity/client/lsps1.rs`


Camillarhi Apr 16, 2026
7890b78

Move LSPS1 client event handling into `liquidity/client/lsps1.rs`


Camillarhi Apr 29, 2026
cab8892

Move LSPS2 client logic into `liquidity/client/lsps2.rs`


Camillarhi Apr 16, 2026
1f02b86

Move LSPS2 client event handling into `liquidity/client/lsps2.rs`


Camillarhi Apr 29, 2026
aa2cbfb

Move LSPS2 service logic into `liquidity/service/lsps2.rs`


Camillarhi Apr 16, 2026
96ba539

Move LSPS2 service event handling into `liquidity/service/lsps2.rs`


Camillarhi Apr 29, 2026
988ba66

Refactor liquidity source to support multiple LSP nodes


Camillarhi Apr 29, 2026
5191217

Collapse NodeCustomMessageHandler enum into a struct


Camillarhi May 7, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ interface Builder {
	void set_gossip_source_p2p();
	void set_gossip_source_rgs(string rgs_server_url);
	void set_pathfinding_scores_source(string url);
	void set_liquidity_source_lsps1(PublicKey node_id, SocketAddress address, string? token);
	void set_liquidity_source_lsps2(PublicKey node_id, SocketAddress address, string? token);
	void add_liquidity_source(PublicKey node_id, SocketAddress address, string? token, boolean trust_peer_0conf);
	void set_storage_dir_path(string storage_dir_path);
	void set_filesystem_logger(string? log_file_path, LogLevel? max_log_level);
	void set_log_facade_logger();
Expand DownExpand Up@@ -99,7 +98,7 @@ interface Node {
	SpontaneousPayment spontaneous_payment();
	OnchainPayment onchain_payment();
	UnifiedPayment unified_payment();
LSPS1Liquidity lsps1_liquidity();
Liquidity liquidity();
	[Throws=NodeError]
	void lnurl_auth(string lnurl);
	[Throws=NodeError]
Expand DownExpand Up@@ -167,7 +166,7 @@ interface FeeRate {

typedef interface UnifiedPayment;

typedef interface LSPS1Liquidity;
typedef interface Liquidity;

[Error]
enum NodeError {
Expand DownExpand Up@@ -275,6 +274,7 @@ dictionary LSPS1OrderStatus {
	LSPS1OrderParams order_params;
	LSPS1PaymentInfo payment_options;
	LSPS1ChannelInfo? channel_state;
	PublicKey counterparty_node_id;
};

[Remote]
Expand Down

160 changes: 65 additions & 95 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,9 +68,7 @@ use crate::io::{
	PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
	PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
};
use crate::liquidity::{LSPS2ServiceConfig, LiquiditySourceBuilder, LspConfig};
use crate::lnurl_auth::LnurlAuth;
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -123,10 +121,8 @@ struct PathfindingScoresSyncConfig {

#[derive(Debug, Clone, Default)]
struct LiquiditySourceConfig {
	// Act as an LSPS1 client connecting to the given service.
	lsps1_client: Option<LSPS1ClientConfig>,
	// Act as an LSPS2 client connecting to the given service.
	lsps2_client: Option<LSPS2ClientConfig>,
	// Acts for both LSPS1 and LSPS2 clients connecting to the given service.
	lsp_nodes: Vec<LspConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
}
Expand DownExpand Up@@ -443,45 +439,36 @@ impl NodeBuilder {
 self
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps1_client_config = LSPS1ClientConfig { node_id, address, token };
 liquidity_source_config.lsps1_client = Some(lsps1_client_config);
 self
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());
 if liquidity_source_config.lsp_nodes.iter().any(|n| n.node_id == node_id) {
 return self;
 }

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps2_client_config = LSPS2ClientConfig { node_id, address, token };
 liquidity_source_config.lsps2_client = Some(lsps2_client_config);
 liquidity_source_config.lsp_nodes.push(LspConfig {
 node_id,
 address,
 token,
 trust_peer_0conf,
 });
 self
	}

Expand All@@ -491,12 +478,12 @@ impl NodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(
 &mut self, service_config: LSPS2ServiceConfig,
	pub fn enable_liquidity_provider(
 &mut self, lsps2_service_config: LSPS2ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps2_service = Some(service_config);
 liquidity_source_config.lsps2_service = Some(lsps2_service_config);
 self
	}

Expand DownExpand Up@@ -1032,32 +1019,29 @@ impl ArcedNodeBuilder {
 self.inner.write().expect("lock").set_pathfinding_scores_source(url);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps1(node_id, address, token);
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps2(node_id, address, token);
 self.inner.write().expect("lock").add_liquidity_source(
 node_id,
 address,
 token,
 trust_peer_0conf,
 );
	}

	/// Configures the [`Node`] instance to provide an [LSPS2] service, issuing just-in-time
Expand All@@ -1066,8 +1050,8 @@ impl ArcedNodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(&self, service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").set_liquidity_provider_lsps2(service_config);
	pub fn enable_liquidity_provider(&self, lsps2_service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").enable_liquidity_provider(lsps2_service_config);
	}

	/// Sets the used storage directory path.
Expand DownExpand Up@@ -1975,33 +1959,19 @@ fn build_with_store_internal(
 },
	};

	let (liquidity_source, custom_message_handler) =
 if let Some(lsc) = liquidity_source_config.as_ref() {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps1_client.as_ref().map(|config| {
 liquidity_source_builder.lsps1_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
	let (liquidity_source, custom_message_handler) = {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps2_client.as_ref().map(|config| {
 liquidity_source_builder.lsps2_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
 if let Some(lsc) = liquidity_source_config.as_ref() {
 liquidity_source_builder.set_lsp_nodes(lsc.lsp_nodes.clone());

 let promise_secret = {
 let lsps_xpriv = derive_xprv(
Expand All@@ -2015,15 +1985,15 @@ fn build_with_store_internal(
 lsc.lsps2_service.as_ref().map(|config| {
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });
 }

 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
 (Some(liquidity_source), custom_message_handler)
 } else {
 (None, Arc::new(NodeCustomMessageHandler::new_ignoring()))
 };
 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new(Arc::clone(&liquidity_source)));

 (liquidity_source, custom_message_handler)
	};

	let msg_handler = match gossip_source.as_gossip_sync() {
 GossipSync::P2P(p2p_gossip_sync) => MessageHandler {
Expand DownExpand Up@@ -2072,7 +2042,7 @@ fn build_with_store_internal(
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
	liquidity_source.lsps2_service().set_peer_manager(Arc::downgrade(&peer_manager));

	let connection_manager = Arc::new(ConnectionManager::new(
 Arc::clone(&peer_manager),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactor liquidity source to support multiple LSP nodes#792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 9 commits into

from

Jun 12, 2026
 Merged


Refactor liquidity source to support multiple LSP nodes
#792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
0713f6d

Move `liquidity.rs` to `liquidity/mod.rs` module directory


Camillarhi Mar 30, 2026
07dbde9

Move LSPS1 client logic into `liquidity/client/lsps1.rs`


Camillarhi Apr 16, 2026
7890b78

Move LSPS1 client event handling into `liquidity/client/lsps1.rs`


Camillarhi Apr 29, 2026
cab8892

Move LSPS2 client logic into `liquidity/client/lsps2.rs`


Camillarhi Apr 16, 2026
1f02b86

Move LSPS2 client event handling into `liquidity/client/lsps2.rs`


Camillarhi Apr 29, 2026
aa2cbfb

Move LSPS2 service logic into `liquidity/service/lsps2.rs`


Camillarhi Apr 16, 2026
96ba539

Move LSPS2 service event handling into `liquidity/service/lsps2.rs`


Camillarhi Apr 29, 2026
988ba66

Refactor liquidity source to support multiple LSP nodes


Camillarhi Apr 29, 2026
5191217

Collapse NodeCustomMessageHandler enum into a struct


Camillarhi May 7, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ interface Builder {
	void set_gossip_source_p2p();
	void set_gossip_source_rgs(string rgs_server_url);
	void set_pathfinding_scores_source(string url);
	void set_liquidity_source_lsps1(PublicKey node_id, SocketAddress address, string? token);
	void set_liquidity_source_lsps2(PublicKey node_id, SocketAddress address, string? token);
	void add_liquidity_source(PublicKey node_id, SocketAddress address, string? token, boolean trust_peer_0conf);
	void set_storage_dir_path(string storage_dir_path);
	void set_filesystem_logger(string? log_file_path, LogLevel? max_log_level);
	void set_log_facade_logger();
Expand DownExpand Up@@ -99,7 +98,7 @@ interface Node {
	SpontaneousPayment spontaneous_payment();
	OnchainPayment onchain_payment();
	UnifiedPayment unified_payment();
LSPS1Liquidity lsps1_liquidity();
Liquidity liquidity();
	[Throws=NodeError]
	void lnurl_auth(string lnurl);
	[Throws=NodeError]
Expand DownExpand Up@@ -167,7 +166,7 @@ interface FeeRate {

typedef interface UnifiedPayment;

typedef interface LSPS1Liquidity;
typedef interface Liquidity;

[Error]
enum NodeError {
Expand DownExpand Up@@ -275,6 +274,7 @@ dictionary LSPS1OrderStatus {
	LSPS1OrderParams order_params;
	LSPS1PaymentInfo payment_options;
	LSPS1ChannelInfo? channel_state;
	PublicKey counterparty_node_id;
};

[Remote]
Expand Down

160 changes: 65 additions & 95 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,9 +68,7 @@ use crate::io::{
	PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
	PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
};
use crate::liquidity::{LSPS2ServiceConfig, LiquiditySourceBuilder, LspConfig};
use crate::lnurl_auth::LnurlAuth;
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -123,10 +121,8 @@ struct PathfindingScoresSyncConfig {

#[derive(Debug, Clone, Default)]
struct LiquiditySourceConfig {
	// Act as an LSPS1 client connecting to the given service.
	lsps1_client: Option<LSPS1ClientConfig>,
	// Act as an LSPS2 client connecting to the given service.
	lsps2_client: Option<LSPS2ClientConfig>,
	// Acts for both LSPS1 and LSPS2 clients connecting to the given service.
	lsp_nodes: Vec<LspConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
}
Expand DownExpand Up@@ -443,45 +439,36 @@ impl NodeBuilder {
 self
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps1_client_config = LSPS1ClientConfig { node_id, address, token };
 liquidity_source_config.lsps1_client = Some(lsps1_client_config);
 self
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());
 if liquidity_source_config.lsp_nodes.iter().any(|n| n.node_id == node_id) {
 return self;
 }

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps2_client_config = LSPS2ClientConfig { node_id, address, token };
 liquidity_source_config.lsps2_client = Some(lsps2_client_config);
 liquidity_source_config.lsp_nodes.push(LspConfig {
 node_id,
 address,
 token,
 trust_peer_0conf,
 });
 self
	}

Expand All@@ -491,12 +478,12 @@ impl NodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(
 &mut self, service_config: LSPS2ServiceConfig,
	pub fn enable_liquidity_provider(
 &mut self, lsps2_service_config: LSPS2ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps2_service = Some(service_config);
 liquidity_source_config.lsps2_service = Some(lsps2_service_config);
 self
	}

Expand DownExpand Up@@ -1032,32 +1019,29 @@ impl ArcedNodeBuilder {
 self.inner.write().expect("lock").set_pathfinding_scores_source(url);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps1(node_id, address, token);
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps2(node_id, address, token);
 self.inner.write().expect("lock").add_liquidity_source(
 node_id,
 address,
 token,
 trust_peer_0conf,
 );
	}

	/// Configures the [`Node`] instance to provide an [LSPS2] service, issuing just-in-time
Expand All@@ -1066,8 +1050,8 @@ impl ArcedNodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(&self, service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").set_liquidity_provider_lsps2(service_config);
	pub fn enable_liquidity_provider(&self, lsps2_service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").enable_liquidity_provider(lsps2_service_config);
	}

	/// Sets the used storage directory path.
Expand DownExpand Up@@ -1975,33 +1959,19 @@ fn build_with_store_internal(
 },
	};

	let (liquidity_source, custom_message_handler) =
 if let Some(lsc) = liquidity_source_config.as_ref() {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps1_client.as_ref().map(|config| {
 liquidity_source_builder.lsps1_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
	let (liquidity_source, custom_message_handler) = {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps2_client.as_ref().map(|config| {
 liquidity_source_builder.lsps2_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
 if let Some(lsc) = liquidity_source_config.as_ref() {
 liquidity_source_builder.set_lsp_nodes(lsc.lsp_nodes.clone());

 let promise_secret = {
 let lsps_xpriv = derive_xprv(
Expand All@@ -2015,15 +1985,15 @@ fn build_with_store_internal(
 lsc.lsps2_service.as_ref().map(|config| {
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });
 }

 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
 (Some(liquidity_source), custom_message_handler)
 } else {
 (None, Arc::new(NodeCustomMessageHandler::new_ignoring()))
 };
 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new(Arc::clone(&liquidity_source)));

 (liquidity_source, custom_message_handler)
	};

	let msg_handler = match gossip_source.as_gossip_sync() {
 GossipSync::P2P(p2p_gossip_sync) => MessageHandler {
Expand DownExpand Up@@ -2072,7 +2042,7 @@ fn build_with_store_internal(
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
	liquidity_source.lsps2_service().set_peer_manager(Arc::downgrade(&peer_manager));

	let connection_manager = Arc::new(ConnectionManager::new(
 Arc::clone(&peer_manager),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Refactor liquidity source to support multiple LSP nodes#792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 9 commits into

from

Jun 12, 2026
 Merged


Refactor liquidity source to support multiple LSP nodes
#792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
0713f6d

Move `liquidity.rs` to `liquidity/mod.rs` module directory


Camillarhi Mar 30, 2026
07dbde9

Move LSPS1 client logic into `liquidity/client/lsps1.rs`


Camillarhi Apr 16, 2026
7890b78

Move LSPS1 client event handling into `liquidity/client/lsps1.rs`


Camillarhi Apr 29, 2026
cab8892

Move LSPS2 client logic into `liquidity/client/lsps2.rs`


Camillarhi Apr 16, 2026
1f02b86

Move LSPS2 client event handling into `liquidity/client/lsps2.rs`


Camillarhi Apr 29, 2026
aa2cbfb

Move LSPS2 service logic into `liquidity/service/lsps2.rs`


Camillarhi Apr 16, 2026
96ba539

Move LSPS2 service event handling into `liquidity/service/lsps2.rs`


Camillarhi Apr 29, 2026
988ba66

Refactor liquidity source to support multiple LSP nodes


Camillarhi Apr 29, 2026
5191217

Collapse NodeCustomMessageHandler enum into a struct


Camillarhi May 7, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,7 @@ interface Builder {
	void set_gossip_source_p2p();
	void set_gossip_source_rgs(string rgs_server_url);
	void set_pathfinding_scores_source(string url);
	void set_liquidity_source_lsps1(PublicKey node_id, SocketAddress address, string? token);
	void set_liquidity_source_lsps2(PublicKey node_id, SocketAddress address, string? token);
	void add_liquidity_source(PublicKey node_id, SocketAddress address, string? token, boolean trust_peer_0conf);
	void set_storage_dir_path(string storage_dir_path);
	void set_filesystem_logger(string? log_file_path, LogLevel? max_log_level);
	void set_log_facade_logger();
Expand DownExpand Up@@ -99,7 +98,7 @@ interface Node {
	SpontaneousPayment spontaneous_payment();
	OnchainPayment onchain_payment();
	UnifiedPayment unified_payment();
LSPS1Liquidity lsps1_liquidity();
Liquidity liquidity();
	[Throws=NodeError]
	void lnurl_auth(string lnurl);
	[Throws=NodeError]
Expand DownExpand Up@@ -167,7 +166,7 @@ interface FeeRate {

typedef interface UnifiedPayment;

typedef interface LSPS1Liquidity;
typedef interface Liquidity;

[Error]
enum NodeError {
Expand DownExpand Up@@ -275,6 +274,7 @@ dictionary LSPS1OrderStatus {
	LSPS1OrderParams order_params;
	LSPS1PaymentInfo payment_options;
	LSPS1ChannelInfo? channel_state;
	PublicKey counterparty_node_id;
};

[Remote]
Expand Down

160 changes: 65 additions & 95 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,9 +68,7 @@ use crate::io::{
	PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
	PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
};
use crate::liquidity::{LSPS2ServiceConfig, LiquiditySourceBuilder, LspConfig};
use crate::lnurl_auth::LnurlAuth;
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -123,10 +121,8 @@ struct PathfindingScoresSyncConfig {

#[derive(Debug, Clone, Default)]
struct LiquiditySourceConfig {
	// Act as an LSPS1 client connecting to the given service.
	lsps1_client: Option<LSPS1ClientConfig>,
	// Act as an LSPS2 client connecting to the given service.
	lsps2_client: Option<LSPS2ClientConfig>,
	// Acts for both LSPS1 and LSPS2 clients connecting to the given service.
	lsp_nodes: Vec<LspConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
}
Expand DownExpand Up@@ -443,45 +439,36 @@ impl NodeBuilder {
 self
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps1_client_config = LSPS1ClientConfig { node_id, address, token };
 liquidity_source_config.lsps1_client = Some(lsps1_client_config);
 self
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
 &mut self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) -> &mut Self {
 // Mark the LSP as trusted for 0conf
 self.config.trusted_peers_0conf.push(node_id.clone());
 if liquidity_source_config.lsp_nodes.iter().any(|n| n.node_id == node_id) {
 return self;
 }

 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps2_client_config = LSPS2ClientConfig { node_id, address, token };
 liquidity_source_config.lsps2_client = Some(lsps2_client_config);
 liquidity_source_config.lsp_nodes.push(LspConfig {
 node_id,
 address,
 token,
 trust_peer_0conf,
 });
 self
	}

Expand All@@ -491,12 +478,12 @@ impl NodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(
 &mut self, service_config: LSPS2ServiceConfig,
	pub fn enable_liquidity_provider(
 &mut self, lsps2_service_config: LSPS2ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps2_service = Some(service_config);
 liquidity_source_config.lsps2_service = Some(lsps2_service_config);
 self
	}

Expand DownExpand Up@@ -1032,32 +1019,29 @@ impl ArcedNodeBuilder {
 self.inner.write().expect("lock").set_pathfinding_scores_source(url);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	/// [bLIP-51 / LSPS1] service.
	/// Configures the [`Node`] instance to source inbound liquidity from the given LSP.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	/// The node will discover the LSP's supported protocols (LSPS1/LSPS2) on startup via [bLIP-50 / LSPS0]
	/// and select the appropriate protocol per request automatically.
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// `trust_peer_0conf` controls whether the node will additionally accept
	/// 0-confirmation channels opened by this LSP. If `false`, 0-confirmation
	/// acceptance for this peer falls back to [`Config::trusted_peers_0conf`].
	///
	/// [bLIP-51 / LSPS1]: https://github.com/lightning/blips/blob/master/blip-0051.md
	pub fn set_liquidity_source_lsps1(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps1(node_id, address, token);
	}

	/// Configures the [`Node`] instance to source just-in-time inbound liquidity from the given
	/// [bLIP-52 / LSPS2] service.
	///
	/// Will mark the LSP as trusted for 0-confirmation channels, see [`Config::trusted_peers_0conf`].
	///
	/// The given `token` will be used by the LSP to authenticate the user.
	/// May be called multiple times to register several LSPs. Duplicate `node_id`s are ignored.
	///
	/// [bLIP-52 / LSPS2]: https://github.com/lightning/blips/blob/master/blip-0052.md
	pub fn set_liquidity_source_lsps2(
	/// [bLIP-50 / LSPS0]: https://github.com/lightning/blips/blob/master/blip-0050.md
	pub fn add_liquidity_source(
 &self, node_id: PublicKey, address: SocketAddress, token: Option<String>,
 trust_peer_0conf: bool,
	) {
 self.inner.write().expect("lock").set_liquidity_source_lsps2(node_id, address, token);
 self.inner.write().expect("lock").add_liquidity_source(
 node_id,
 address,
 token,
 trust_peer_0conf,
 );
	}

	/// Configures the [`Node`] instance to provide an [LSPS2] service, issuing just-in-time
Expand All@@ -1066,8 +1050,8 @@ impl ArcedNodeBuilder {
	/// **Caution**: LSP service support is in **alpha** and is considered an experimental feature.
	///
	/// [LSPS2]: https://github.com/BitcoinAndLightningLayerSpecs/lsp/blob/main/LSPS2/README.md
	pub fn set_liquidity_provider_lsps2(&self, service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").set_liquidity_provider_lsps2(service_config);
	pub fn enable_liquidity_provider(&self, lsps2_service_config: LSPS2ServiceConfig) {
 self.inner.write().expect("lock").enable_liquidity_provider(lsps2_service_config);
	}

	/// Sets the used storage directory path.
Expand DownExpand Up@@ -1975,33 +1959,19 @@ fn build_with_store_internal(
 },
	};

	let (liquidity_source, custom_message_handler) =
 if let Some(lsc) = liquidity_source_config.as_ref() {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps1_client.as_ref().map(|config| {
 liquidity_source_builder.lsps1_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
	let (liquidity_source, custom_message_handler) = {
 let mut liquidity_source_builder = LiquiditySourceBuilder::new(
 Arc::clone(&wallet),
 Arc::clone(&channel_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&kv_store),
 Arc::clone(&config),
 Arc::clone(&logger),
 );

 lsc.lsps2_client.as_ref().map(|config| {
 liquidity_source_builder.lsps2_client(
 config.node_id,
 config.address.clone(),
 config.token.clone(),
 )
 });
 if let Some(lsc) = liquidity_source_config.as_ref() {
 liquidity_source_builder.set_lsp_nodes(lsc.lsp_nodes.clone());

 let promise_secret = {
 let lsps_xpriv = derive_xprv(
Expand All@@ -2015,15 +1985,15 @@ fn build_with_store_internal(
 lsc.lsps2_service.as_ref().map(|config| {
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });
 }

 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
 (Some(liquidity_source), custom_message_handler)
 } else {
 (None, Arc::new(NodeCustomMessageHandler::new_ignoring()))
 };
 let liquidity_source = runtime
 .block_on(async move { liquidity_source_builder.build().await.map(Arc::new) })?;
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new(Arc::clone(&liquidity_source)));

 (liquidity_source, custom_message_handler)
	};

	let msg_handler = match gossip_source.as_gossip_sync() {
 GossipSync::P2P(p2p_gossip_sync) => MessageHandler {
Expand DownExpand Up@@ -2072,7 +2042,7 @@ fn build_with_store_internal(
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
	liquidity_source.lsps2_service().set_peer_manager(Arc::downgrade(&peer_manager));

	let connection_manager = Arc::new(ConnectionManager::new(
 Arc::clone(&peer_manager),
Expand Down
Loading