Skip to content

LSPS5 support on ldk-node#645

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

Closed
martinsaposnic wants to merge 1 commit into from
Closed

LSPS5 support on ldk-node #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ bdk_esplora = { version = "0.22.0", default-features = false, features = ["async
bdk_electrum = { version = "0.23.0", default-features = false, features = ["use-rustls-ring"]}
bdk_wallet = { version = "2.0.0", default-features = false, features = ["std", "keys-bip39"]}

reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "blocking"] }
rustls = { version = "0.23", default-features = false }
rusqlite = { version = "0.31.0", features = ["bundled"] }
bitcoin = "0.32.4"
Expand Down
26 changes: 26 additions & 0 deletions bindings/ldk_node.udl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ interface Node {
OnchainPayment onchain_payment();
UnifiedQrPayment unified_qr_payment();
LSPS1Liquidity lsps1_liquidity();
LSPS5Liquidity lsps5_liquidity();
[Throws=NodeError]
void connect(PublicKey node_id, SocketAddress address, boolean persist);
[Throws=NodeError]
Expand DownExpand Up@@ -264,6 +265,15 @@ interface LSPS1Liquidity {
LSPS1OrderStatus check_order_status(LSPS1OrderId order_id);
};

interface LSPS5Liquidity {
[Throws=NodeError]
LSPS5SetWebhookResponse set_webhook(string app_name, string webhook_url);
[Throws=NodeError]
LSPS5ListWebhooksResponse list_webhooks();
[Throws=NodeError]
LSPS5RemoveWebhookResponse remove_webhook(string app_name);
};

[Error]
enum NodeError {
"AlreadyRunning",
Expand DownExpand Up@@ -320,6 +330,8 @@ enum NodeError {
"LiquidityFeeTooHigh",
"InvalidBlindedPaths",
"AsyncPaymentServicesDisabled",
"LiquiditySetWebhookFailed",
"LiquidityRemoveWebhookFailed",
};

dictionary NodeStatus {
Expand DownExpand Up@@ -531,6 +543,20 @@ enum LSPS1PaymentState {
"Refunded",
};

dictionary LSPS5SetWebhookResponse {
u32 num_webhooks;
u32 max_webhooks;
boolean no_change;
};

dictionary LSPS5ListWebhooksResponse {
sequence<string> app_names;
u32 max_webhooks;
};

dictionary LSPS5RemoveWebhookResponse {
};

[NonExhaustive]
enum Network {
"Bitcoin",
Expand Down
49 changes: 48 additions & 1 deletion src/builder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ use crate::io::{
self, PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LSPS5ClientConfig,
LSPS5ServiceConfig, LiquiditySourceBuilder,
};
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -125,6 +126,10 @@ struct LiquiditySourceConfig {
lsps2_client: Option<LSPS2ClientConfig>,
// Act as an LSPS2 service.
lsps2_service: Option<LSPS2ServiceConfig>,
/// Act as an LSPS5 client connecting to the given service.
lsps5_client: Option<LSPS5ClientConfig>,
// Act as an LSPS5 service.
lsps5_service: Option<LSPS5ServiceConfig>,
}

#[derive(Clone)]
Expand DownExpand Up@@ -738,6 +743,27 @@ impl NodeBuilder {
kv_store,
)
}

/// Configures the [`Node`] instance to source inbound liquidity from the given
pub fn set_liquidity_source_lsps5(
&mut self, node_id: PublicKey, address: SocketAddress,
) -> &mut Self {
let liquidity_source_config =
self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
let lsps5_client_config = LSPS5ClientConfig { node_id, address };
liquidity_source_config.lsps5_client = Some(lsps5_client_config);
self
}

/// Configures the [`Node`] instance to provide an LSPS5 service
pub fn set_liquidity_provider_lsps5(
&mut self, service_config: LSPS5ServiceConfig,
) -> &mut Self {
let liquidity_source_config =
self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
liquidity_source_config.lsps5_service = Some(service_config);
self
}
}

/// A builder for an [`Node`] instance, allowing to set some configuration and module choices from
Expand DownExpand Up@@ -928,6 +954,20 @@ impl ArcedNodeBuilder {
self.inner.write().unwrap().set_liquidity_provider_lsps2(service_config);
}

/// Configures the [`Node`] instance to source inbound liquidity from the given [LSPS5] LSP.
///
/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
pub fn set_liquidity_source_lsps5(&self, node_id: PublicKey, address: SocketAddress) {
self.inner.write().unwrap().set_liquidity_source_lsps5(node_id, address);
}

/// Configures the [`Node`] instance to provide an LSPS5 service.
///
/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
pub fn set_liquidity_provider_lsps5(&self, service_config: LSPS5ServiceConfig) {
self.inner.write().unwrap().set_liquidity_provider_lsps5(service_config);
}

/// Sets the used storage directory path.
pub fn set_storage_dir_path(&self, storage_dir_path: String) {
self.inner.write().unwrap().set_storage_dir_path(storage_dir_path);
Expand DownExpand Up@@ -1542,6 +1582,13 @@ fn build_with_store_internal(
liquidity_source_builder.lsps2_service(promise_secret, config.clone())
});

lsc.lsps5_client.as_ref().map(|config| {
liquidity_source_builder.lsps5_client(config.node_id, config.address.clone())
});
lsc.lsps5_service
.as_ref()
.map(|config| liquidity_source_builder.lsps5_service(config.clone()));

let liquidity_source = Arc::new(liquidity_source_builder.build());
let custom_message_handler =
Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
Expand Down
10 changes: 10 additions & 0 deletions src/error.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,10 @@ pub enum Error {
InvalidBlindedPaths,
/// Asynchronous payment services are disabled.
AsyncPaymentServicesDisabled,
/// Failed to set a webhook with the LSP.
LiquiditySetWebhookFailed,
/// Failed to remove a webhook with the LSP.
LiquidityRemoveWebhookFailed,
}

impl fmt::Display for Error {
Expand DownExpand Up@@ -201,6 +205,12 @@ impl fmt::Display for Error {
Self::AsyncPaymentServicesDisabled => {
write!(f, "Asynchronous payment services are disabled.")
},
Self::LiquiditySetWebhookFailed => {
write!(f, "Failed to set a webhook with the LSP.")
},
Self::LiquidityRemoveWebhookFailed => {
write!(f, "Failed to remove a webhook with the LSP.")
},
}
}
}
Expand Down
34 changes: 34 additions & 0 deletions src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,14 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex, RwLock};
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};

#[cfg(feature = "uniffi")]
use crate::liquidity::{
LSPS5Liquidity, LSPS5ListWebhooksResponse, LSPS5RemoveWebhookResponse, LSPS5SetWebhookResponse,
};

#[cfg(not(feature = "uniffi"))]
use crate::liquidity::LSPS5Liquidity;

#[cfg(feature = "uniffi")]
uniffi::include_scaffolding!("ldk_node");

Expand DownExpand Up@@ -958,6 +966,32 @@ impl Node {
))
}

/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
///
/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
#[cfg(not(feature = "uniffi"))]
pub fn lsps5_liquidity(&self) -> LSPS5Liquidity {
LSPS5Liquidity::new(
Arc::clone(&self.runtime),
Arc::clone(&self.connection_manager),
self.liquidity_source.clone(),
Arc::clone(&self.logger),
)
}

/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
///
/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
#[cfg(feature = "uniffi")]
pub fn lsps5_liquidity(&self) -> Arc<LSPS5Liquidity> {
Arc::new(LSPS5Liquidity::new(
Arc::clone(&self.runtime),
Arc::clone(&self.connection_manager),
self.liquidity_source.clone(),
Arc::clone(&self.logger),
))
}

/// Retrieve a list of known channels.
pub fn list_channels(&self) -> Vec<ChannelDetails> {
self.channel_manager.list_channels().into_iter().map(|c| c.into()).collect()
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
LSPS5 support on ldk-node by martinsaposnic · Pull Request #645 · lightningdevkit/ldk-node · GitHub
Skip to content
LSPS5 support on ldk-node#645

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

 Closed

martinsaposnic
wants to merge
1
commit into

from

 Closed


LSPS5 support on ldk-node
#645
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ bdk_esplora = { version = "0.22.0", default-features = false, features = ["async
bdk_electrum = { version = "0.23.0", default-features = false, features = ["use-rustls-ring"]}
bdk_wallet = { version = "2.0.0", default-features = false, features = ["std", "keys-bip39"]}

reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "blocking"] }
rustls = { version = "0.23", default-features = false }
rusqlite = { version = "0.31.0", features = ["bundled"] }
bitcoin = "0.32.4"
Expand Down

26 changes: 26 additions & 0 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ interface Node {
	OnchainPayment onchain_payment();
	UnifiedQrPayment unified_qr_payment();
	LSPS1Liquidity lsps1_liquidity();
	LSPS5Liquidity lsps5_liquidity();
	[Throws=NodeError]
	void connect(PublicKey node_id, SocketAddress address, boolean persist);
	[Throws=NodeError]
Expand DownExpand Up@@ -264,6 +265,15 @@ interface LSPS1Liquidity {
	LSPS1OrderStatus check_order_status(LSPS1OrderId order_id);
};

interface LSPS5Liquidity {
	[Throws=NodeError]
	LSPS5SetWebhookResponse set_webhook(string app_name, string webhook_url);
	[Throws=NodeError]
	LSPS5ListWebhooksResponse list_webhooks();
	[Throws=NodeError]
	LSPS5RemoveWebhookResponse remove_webhook(string app_name);
};

[Error]
enum NodeError {
	"AlreadyRunning",
Expand DownExpand Up@@ -320,6 +330,8 @@ enum NodeError {
	"LiquidityFeeTooHigh",
	"InvalidBlindedPaths",
	"AsyncPaymentServicesDisabled",
	"LiquiditySetWebhookFailed",
	"LiquidityRemoveWebhookFailed",
};

dictionary NodeStatus {
Expand DownExpand Up@@ -531,6 +543,20 @@ enum LSPS1PaymentState {
	"Refunded",
};

dictionary LSPS5SetWebhookResponse {
	u32 num_webhooks;
	u32 max_webhooks;
	boolean no_change;
};

dictionary LSPS5ListWebhooksResponse {
	sequence<string> app_names;
	u32 max_webhooks;
};

dictionary LSPS5RemoveWebhookResponse {
};

[NonExhaustive]
enum Network {
	"Bitcoin",
Expand Down

49 changes: 48 additions & 1 deletion
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ use crate::io::{
	self, PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LSPS5ClientConfig,
	LSPS5ServiceConfig, LiquiditySourceBuilder,
};
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -125,6 +126,10 @@ struct LiquiditySourceConfig {
	lsps2_client: Option<LSPS2ClientConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
	/// Act as an LSPS5 client connecting to the given service.
	lsps5_client: Option<LSPS5ClientConfig>,
	// Act as an LSPS5 service.
	lsps5_service: Option<LSPS5ServiceConfig>,
}

#[derive(Clone)]
Expand DownExpand Up@@ -738,6 +743,27 @@ impl NodeBuilder {
 kv_store,
 )
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	pub fn set_liquidity_source_lsps5(
 &mut self, node_id: PublicKey, address: SocketAddress,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps5_client_config = LSPS5ClientConfig { node_id, address };
 liquidity_source_config.lsps5_client = Some(lsps5_client_config);
 self
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service
	pub fn set_liquidity_provider_lsps5(
 &mut self, service_config: LSPS5ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps5_service = Some(service_config);
 self
	}
}

/// A builder for an [`Node`] instance, allowing to set some configuration and module choices from
Expand DownExpand Up@@ -928,6 +954,20 @@ impl ArcedNodeBuilder {
 self.inner.write().unwrap().set_liquidity_provider_lsps2(service_config);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given [LSPS5] LSP.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_source_lsps5(&self, node_id: PublicKey, address: SocketAddress) {
 self.inner.write().unwrap().set_liquidity_source_lsps5(node_id, address);
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_provider_lsps5(&self, service_config: LSPS5ServiceConfig) {
 self.inner.write().unwrap().set_liquidity_provider_lsps5(service_config);
	}

	/// Sets the used storage directory path.
	pub fn set_storage_dir_path(&self, storage_dir_path: String) {
 self.inner.write().unwrap().set_storage_dir_path(storage_dir_path);
Expand DownExpand Up@@ -1542,6 +1582,13 @@ fn build_with_store_internal(
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });

 lsc.lsps5_client.as_ref().map(|config| {
 liquidity_source_builder.lsps5_client(config.node_id, config.address.clone())
 });
 lsc.lsps5_service
 .as_ref()
 .map(|config| liquidity_source_builder.lsps5_service(config.clone()));

 let liquidity_source = Arc::new(liquidity_source_builder.build());
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
Expand Down

10 changes: 10 additions & 0 deletions
src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,10 @@ pub enum Error {
	InvalidBlindedPaths,
	/// Asynchronous payment services are disabled.
	AsyncPaymentServicesDisabled,
	/// Failed to set a webhook with the LSP.
	LiquiditySetWebhookFailed,
	/// Failed to remove a webhook with the LSP.
	LiquidityRemoveWebhookFailed,
}

impl fmt::Display for Error {
Expand DownExpand Up@@ -201,6 +205,12 @@ impl fmt::Display for Error {
 Self::AsyncPaymentServicesDisabled => {
 write!(f, "Asynchronous payment services are disabled.")
 },
 Self::LiquiditySetWebhookFailed => {
 write!(f, "Failed to set a webhook with the LSP.")
 },
 Self::LiquidityRemoveWebhookFailed => {
 write!(f, "Failed to remove a webhook with the LSP.")
 },
 }
	}
}
Expand Down

34 changes: 34 additions & 0 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,14 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex, RwLock};
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};

#[cfg(feature = "uniffi")]
use crate::liquidity::{
	LSPS5Liquidity, LSPS5ListWebhooksResponse, LSPS5RemoveWebhookResponse, LSPS5SetWebhookResponse,
};

#[cfg(not(feature = "uniffi"))]
use crate::liquidity::LSPS5Liquidity;

#[cfg(feature = "uniffi")]
uniffi::include_scaffolding!("ldk_node");

Expand DownExpand Up@@ -958,6 +966,32 @@ impl Node {
 ))
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(not(feature = "uniffi"))]
	pub fn lsps5_liquidity(&self) -> LSPS5Liquidity {
 LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 )
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(feature = "uniffi")]
	pub fn lsps5_liquidity(&self) -> Arc<LSPS5Liquidity> {
 Arc::new(LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 ))
	}

	/// Retrieve a list of known channels.
	pub fn list_channels(&self) -> Vec<ChannelDetails> {
 self.channel_manager.list_channels().into_iter().map(|c| c.into()).collect()
Expand Down
Loading
Loading

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

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

 Closed

martinsaposnic
wants to merge
1
commit into

from

 Closed


LSPS5 support on ldk-node
#645
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ bdk_esplora = { version = "0.22.0", default-features = false, features = ["async
bdk_electrum = { version = "0.23.0", default-features = false, features = ["use-rustls-ring"]}
bdk_wallet = { version = "2.0.0", default-features = false, features = ["std", "keys-bip39"]}

reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "blocking"] }
rustls = { version = "0.23", default-features = false }
rusqlite = { version = "0.31.0", features = ["bundled"] }
bitcoin = "0.32.4"
Expand Down

26 changes: 26 additions & 0 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ interface Node {
	OnchainPayment onchain_payment();
	UnifiedQrPayment unified_qr_payment();
	LSPS1Liquidity lsps1_liquidity();
	LSPS5Liquidity lsps5_liquidity();
	[Throws=NodeError]
	void connect(PublicKey node_id, SocketAddress address, boolean persist);
	[Throws=NodeError]
Expand DownExpand Up@@ -264,6 +265,15 @@ interface LSPS1Liquidity {
	LSPS1OrderStatus check_order_status(LSPS1OrderId order_id);
};

interface LSPS5Liquidity {
	[Throws=NodeError]
	LSPS5SetWebhookResponse set_webhook(string app_name, string webhook_url);
	[Throws=NodeError]
	LSPS5ListWebhooksResponse list_webhooks();
	[Throws=NodeError]
	LSPS5RemoveWebhookResponse remove_webhook(string app_name);
};

[Error]
enum NodeError {
	"AlreadyRunning",
Expand DownExpand Up@@ -320,6 +330,8 @@ enum NodeError {
	"LiquidityFeeTooHigh",
	"InvalidBlindedPaths",
	"AsyncPaymentServicesDisabled",
	"LiquiditySetWebhookFailed",
	"LiquidityRemoveWebhookFailed",
};

dictionary NodeStatus {
Expand DownExpand Up@@ -531,6 +543,20 @@ enum LSPS1PaymentState {
	"Refunded",
};

dictionary LSPS5SetWebhookResponse {
	u32 num_webhooks;
	u32 max_webhooks;
	boolean no_change;
};

dictionary LSPS5ListWebhooksResponse {
	sequence<string> app_names;
	u32 max_webhooks;
};

dictionary LSPS5RemoveWebhookResponse {
};

[NonExhaustive]
enum Network {
	"Bitcoin",
Expand Down

49 changes: 48 additions & 1 deletion
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ use crate::io::{
	self, PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LSPS5ClientConfig,
	LSPS5ServiceConfig, LiquiditySourceBuilder,
};
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -125,6 +126,10 @@ struct LiquiditySourceConfig {
	lsps2_client: Option<LSPS2ClientConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
	/// Act as an LSPS5 client connecting to the given service.
	lsps5_client: Option<LSPS5ClientConfig>,
	// Act as an LSPS5 service.
	lsps5_service: Option<LSPS5ServiceConfig>,
}

#[derive(Clone)]
Expand DownExpand Up@@ -738,6 +743,27 @@ impl NodeBuilder {
 kv_store,
 )
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	pub fn set_liquidity_source_lsps5(
 &mut self, node_id: PublicKey, address: SocketAddress,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps5_client_config = LSPS5ClientConfig { node_id, address };
 liquidity_source_config.lsps5_client = Some(lsps5_client_config);
 self
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service
	pub fn set_liquidity_provider_lsps5(
 &mut self, service_config: LSPS5ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps5_service = Some(service_config);
 self
	}
}

/// A builder for an [`Node`] instance, allowing to set some configuration and module choices from
Expand DownExpand Up@@ -928,6 +954,20 @@ impl ArcedNodeBuilder {
 self.inner.write().unwrap().set_liquidity_provider_lsps2(service_config);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given [LSPS5] LSP.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_source_lsps5(&self, node_id: PublicKey, address: SocketAddress) {
 self.inner.write().unwrap().set_liquidity_source_lsps5(node_id, address);
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_provider_lsps5(&self, service_config: LSPS5ServiceConfig) {
 self.inner.write().unwrap().set_liquidity_provider_lsps5(service_config);
	}

	/// Sets the used storage directory path.
	pub fn set_storage_dir_path(&self, storage_dir_path: String) {
 self.inner.write().unwrap().set_storage_dir_path(storage_dir_path);
Expand DownExpand Up@@ -1542,6 +1582,13 @@ fn build_with_store_internal(
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });

 lsc.lsps5_client.as_ref().map(|config| {
 liquidity_source_builder.lsps5_client(config.node_id, config.address.clone())
 });
 lsc.lsps5_service
 .as_ref()
 .map(|config| liquidity_source_builder.lsps5_service(config.clone()));

 let liquidity_source = Arc::new(liquidity_source_builder.build());
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
Expand Down

10 changes: 10 additions & 0 deletions
src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,10 @@ pub enum Error {
	InvalidBlindedPaths,
	/// Asynchronous payment services are disabled.
	AsyncPaymentServicesDisabled,
	/// Failed to set a webhook with the LSP.
	LiquiditySetWebhookFailed,
	/// Failed to remove a webhook with the LSP.
	LiquidityRemoveWebhookFailed,
}

impl fmt::Display for Error {
Expand DownExpand Up@@ -201,6 +205,12 @@ impl fmt::Display for Error {
 Self::AsyncPaymentServicesDisabled => {
 write!(f, "Asynchronous payment services are disabled.")
 },
 Self::LiquiditySetWebhookFailed => {
 write!(f, "Failed to set a webhook with the LSP.")
 },
 Self::LiquidityRemoveWebhookFailed => {
 write!(f, "Failed to remove a webhook with the LSP.")
 },
 }
	}
}
Expand Down

34 changes: 34 additions & 0 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,14 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex, RwLock};
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};

#[cfg(feature = "uniffi")]
use crate::liquidity::{
	LSPS5Liquidity, LSPS5ListWebhooksResponse, LSPS5RemoveWebhookResponse, LSPS5SetWebhookResponse,
};

#[cfg(not(feature = "uniffi"))]
use crate::liquidity::LSPS5Liquidity;

#[cfg(feature = "uniffi")]
uniffi::include_scaffolding!("ldk_node");

Expand DownExpand Up@@ -958,6 +966,32 @@ impl Node {
 ))
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(not(feature = "uniffi"))]
	pub fn lsps5_liquidity(&self) -> LSPS5Liquidity {
 LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 )
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(feature = "uniffi")]
	pub fn lsps5_liquidity(&self) -> Arc<LSPS5Liquidity> {
 Arc::new(LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 ))
	}

	/// Retrieve a list of known channels.
	pub fn list_channels(&self) -> Vec<ChannelDetails> {
 self.channel_manager.list_channels().into_iter().map(|c| c.into()).collect()
Expand Down
Loading
Loading

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

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

 Closed

martinsaposnic
wants to merge
1
commit into

from

 Closed


LSPS5 support on ldk-node
#645
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ bdk_esplora = { version = "0.22.0", default-features = false, features = ["async
bdk_electrum = { version = "0.23.0", default-features = false, features = ["use-rustls-ring"]}
bdk_wallet = { version = "2.0.0", default-features = false, features = ["std", "keys-bip39"]}

reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "blocking"] }
rustls = { version = "0.23", default-features = false }
rusqlite = { version = "0.31.0", features = ["bundled"] }
bitcoin = "0.32.4"
Expand Down

26 changes: 26 additions & 0 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ interface Node {
	OnchainPayment onchain_payment();
	UnifiedQrPayment unified_qr_payment();
	LSPS1Liquidity lsps1_liquidity();
	LSPS5Liquidity lsps5_liquidity();
	[Throws=NodeError]
	void connect(PublicKey node_id, SocketAddress address, boolean persist);
	[Throws=NodeError]
Expand DownExpand Up@@ -264,6 +265,15 @@ interface LSPS1Liquidity {
	LSPS1OrderStatus check_order_status(LSPS1OrderId order_id);
};

interface LSPS5Liquidity {
	[Throws=NodeError]
	LSPS5SetWebhookResponse set_webhook(string app_name, string webhook_url);
	[Throws=NodeError]
	LSPS5ListWebhooksResponse list_webhooks();
	[Throws=NodeError]
	LSPS5RemoveWebhookResponse remove_webhook(string app_name);
};

[Error]
enum NodeError {
	"AlreadyRunning",
Expand DownExpand Up@@ -320,6 +330,8 @@ enum NodeError {
	"LiquidityFeeTooHigh",
	"InvalidBlindedPaths",
	"AsyncPaymentServicesDisabled",
	"LiquiditySetWebhookFailed",
	"LiquidityRemoveWebhookFailed",
};

dictionary NodeStatus {
Expand DownExpand Up@@ -531,6 +543,20 @@ enum LSPS1PaymentState {
	"Refunded",
};

dictionary LSPS5SetWebhookResponse {
	u32 num_webhooks;
	u32 max_webhooks;
	boolean no_change;
};

dictionary LSPS5ListWebhooksResponse {
	sequence<string> app_names;
	u32 max_webhooks;
};

dictionary LSPS5RemoveWebhookResponse {
};

[NonExhaustive]
enum Network {
	"Bitcoin",
Expand Down

49 changes: 48 additions & 1 deletion
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ use crate::io::{
	self, PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LSPS5ClientConfig,
	LSPS5ServiceConfig, LiquiditySourceBuilder,
};
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -125,6 +126,10 @@ struct LiquiditySourceConfig {
	lsps2_client: Option<LSPS2ClientConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
	/// Act as an LSPS5 client connecting to the given service.
	lsps5_client: Option<LSPS5ClientConfig>,
	// Act as an LSPS5 service.
	lsps5_service: Option<LSPS5ServiceConfig>,
}

#[derive(Clone)]
Expand DownExpand Up@@ -738,6 +743,27 @@ impl NodeBuilder {
 kv_store,
 )
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	pub fn set_liquidity_source_lsps5(
 &mut self, node_id: PublicKey, address: SocketAddress,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps5_client_config = LSPS5ClientConfig { node_id, address };
 liquidity_source_config.lsps5_client = Some(lsps5_client_config);
 self
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service
	pub fn set_liquidity_provider_lsps5(
 &mut self, service_config: LSPS5ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps5_service = Some(service_config);
 self
	}
}

/// A builder for an [`Node`] instance, allowing to set some configuration and module choices from
Expand DownExpand Up@@ -928,6 +954,20 @@ impl ArcedNodeBuilder {
 self.inner.write().unwrap().set_liquidity_provider_lsps2(service_config);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given [LSPS5] LSP.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_source_lsps5(&self, node_id: PublicKey, address: SocketAddress) {
 self.inner.write().unwrap().set_liquidity_source_lsps5(node_id, address);
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_provider_lsps5(&self, service_config: LSPS5ServiceConfig) {
 self.inner.write().unwrap().set_liquidity_provider_lsps5(service_config);
	}

	/// Sets the used storage directory path.
	pub fn set_storage_dir_path(&self, storage_dir_path: String) {
 self.inner.write().unwrap().set_storage_dir_path(storage_dir_path);
Expand DownExpand Up@@ -1542,6 +1582,13 @@ fn build_with_store_internal(
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });

 lsc.lsps5_client.as_ref().map(|config| {
 liquidity_source_builder.lsps5_client(config.node_id, config.address.clone())
 });
 lsc.lsps5_service
 .as_ref()
 .map(|config| liquidity_source_builder.lsps5_service(config.clone()));

 let liquidity_source = Arc::new(liquidity_source_builder.build());
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
Expand Down

10 changes: 10 additions & 0 deletions
src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,10 @@ pub enum Error {
	InvalidBlindedPaths,
	/// Asynchronous payment services are disabled.
	AsyncPaymentServicesDisabled,
	/// Failed to set a webhook with the LSP.
	LiquiditySetWebhookFailed,
	/// Failed to remove a webhook with the LSP.
	LiquidityRemoveWebhookFailed,
}

impl fmt::Display for Error {
Expand DownExpand Up@@ -201,6 +205,12 @@ impl fmt::Display for Error {
 Self::AsyncPaymentServicesDisabled => {
 write!(f, "Asynchronous payment services are disabled.")
 },
 Self::LiquiditySetWebhookFailed => {
 write!(f, "Failed to set a webhook with the LSP.")
 },
 Self::LiquidityRemoveWebhookFailed => {
 write!(f, "Failed to remove a webhook with the LSP.")
 },
 }
	}
}
Expand Down

34 changes: 34 additions & 0 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,14 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex, RwLock};
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};

#[cfg(feature = "uniffi")]
use crate::liquidity::{
	LSPS5Liquidity, LSPS5ListWebhooksResponse, LSPS5RemoveWebhookResponse, LSPS5SetWebhookResponse,
};

#[cfg(not(feature = "uniffi"))]
use crate::liquidity::LSPS5Liquidity;

#[cfg(feature = "uniffi")]
uniffi::include_scaffolding!("ldk_node");

Expand DownExpand Up@@ -958,6 +966,32 @@ impl Node {
 ))
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(not(feature = "uniffi"))]
	pub fn lsps5_liquidity(&self) -> LSPS5Liquidity {
 LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 )
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(feature = "uniffi")]
	pub fn lsps5_liquidity(&self) -> Arc<LSPS5Liquidity> {
 Arc::new(LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 ))
	}

	/// Retrieve a list of known channels.
	pub fn list_channels(&self) -> Vec<ChannelDetails> {
 self.channel_manager.list_channels().into_iter().map(|c| c.into()).collect()
Expand Down
Loading
Loading

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

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

 Closed

martinsaposnic
wants to merge
1
commit into

from

 Closed


LSPS5 support on ldk-node
#645
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ bdk_esplora = { version = "0.22.0", default-features = false, features = ["async
bdk_electrum = { version = "0.23.0", default-features = false, features = ["use-rustls-ring"]}
bdk_wallet = { version = "2.0.0", default-features = false, features = ["std", "keys-bip39"]}

reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "blocking"] }
rustls = { version = "0.23", default-features = false }
rusqlite = { version = "0.31.0", features = ["bundled"] }
bitcoin = "0.32.4"
Expand Down

26 changes: 26 additions & 0 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ interface Node {
	OnchainPayment onchain_payment();
	UnifiedQrPayment unified_qr_payment();
	LSPS1Liquidity lsps1_liquidity();
	LSPS5Liquidity lsps5_liquidity();
	[Throws=NodeError]
	void connect(PublicKey node_id, SocketAddress address, boolean persist);
	[Throws=NodeError]
Expand DownExpand Up@@ -264,6 +265,15 @@ interface LSPS1Liquidity {
	LSPS1OrderStatus check_order_status(LSPS1OrderId order_id);
};

interface LSPS5Liquidity {
	[Throws=NodeError]
	LSPS5SetWebhookResponse set_webhook(string app_name, string webhook_url);
	[Throws=NodeError]
	LSPS5ListWebhooksResponse list_webhooks();
	[Throws=NodeError]
	LSPS5RemoveWebhookResponse remove_webhook(string app_name);
};

[Error]
enum NodeError {
	"AlreadyRunning",
Expand DownExpand Up@@ -320,6 +330,8 @@ enum NodeError {
	"LiquidityFeeTooHigh",
	"InvalidBlindedPaths",
	"AsyncPaymentServicesDisabled",
	"LiquiditySetWebhookFailed",
	"LiquidityRemoveWebhookFailed",
};

dictionary NodeStatus {
Expand DownExpand Up@@ -531,6 +543,20 @@ enum LSPS1PaymentState {
	"Refunded",
};

dictionary LSPS5SetWebhookResponse {
	u32 num_webhooks;
	u32 max_webhooks;
	boolean no_change;
};

dictionary LSPS5ListWebhooksResponse {
	sequence<string> app_names;
	u32 max_webhooks;
};

dictionary LSPS5RemoveWebhookResponse {
};

[NonExhaustive]
enum Network {
	"Bitcoin",
Expand Down

49 changes: 48 additions & 1 deletion
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ use crate::io::{
	self, PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LSPS5ClientConfig,
	LSPS5ServiceConfig, LiquiditySourceBuilder,
};
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -125,6 +126,10 @@ struct LiquiditySourceConfig {
	lsps2_client: Option<LSPS2ClientConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
	/// Act as an LSPS5 client connecting to the given service.
	lsps5_client: Option<LSPS5ClientConfig>,
	// Act as an LSPS5 service.
	lsps5_service: Option<LSPS5ServiceConfig>,
}

#[derive(Clone)]
Expand DownExpand Up@@ -738,6 +743,27 @@ impl NodeBuilder {
 kv_store,
 )
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	pub fn set_liquidity_source_lsps5(
 &mut self, node_id: PublicKey, address: SocketAddress,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps5_client_config = LSPS5ClientConfig { node_id, address };
 liquidity_source_config.lsps5_client = Some(lsps5_client_config);
 self
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service
	pub fn set_liquidity_provider_lsps5(
 &mut self, service_config: LSPS5ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps5_service = Some(service_config);
 self
	}
}

/// A builder for an [`Node`] instance, allowing to set some configuration and module choices from
Expand DownExpand Up@@ -928,6 +954,20 @@ impl ArcedNodeBuilder {
 self.inner.write().unwrap().set_liquidity_provider_lsps2(service_config);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given [LSPS5] LSP.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_source_lsps5(&self, node_id: PublicKey, address: SocketAddress) {
 self.inner.write().unwrap().set_liquidity_source_lsps5(node_id, address);
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_provider_lsps5(&self, service_config: LSPS5ServiceConfig) {
 self.inner.write().unwrap().set_liquidity_provider_lsps5(service_config);
	}

	/// Sets the used storage directory path.
	pub fn set_storage_dir_path(&self, storage_dir_path: String) {
 self.inner.write().unwrap().set_storage_dir_path(storage_dir_path);
Expand DownExpand Up@@ -1542,6 +1582,13 @@ fn build_with_store_internal(
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });

 lsc.lsps5_client.as_ref().map(|config| {
 liquidity_source_builder.lsps5_client(config.node_id, config.address.clone())
 });
 lsc.lsps5_service
 .as_ref()
 .map(|config| liquidity_source_builder.lsps5_service(config.clone()));

 let liquidity_source = Arc::new(liquidity_source_builder.build());
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
Expand Down

10 changes: 10 additions & 0 deletions
src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,10 @@ pub enum Error {
	InvalidBlindedPaths,
	/// Asynchronous payment services are disabled.
	AsyncPaymentServicesDisabled,
	/// Failed to set a webhook with the LSP.
	LiquiditySetWebhookFailed,
	/// Failed to remove a webhook with the LSP.
	LiquidityRemoveWebhookFailed,
}

impl fmt::Display for Error {
Expand DownExpand Up@@ -201,6 +205,12 @@ impl fmt::Display for Error {
 Self::AsyncPaymentServicesDisabled => {
 write!(f, "Asynchronous payment services are disabled.")
 },
 Self::LiquiditySetWebhookFailed => {
 write!(f, "Failed to set a webhook with the LSP.")
 },
 Self::LiquidityRemoveWebhookFailed => {
 write!(f, "Failed to remove a webhook with the LSP.")
 },
 }
	}
}
Expand Down

34 changes: 34 additions & 0 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,14 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex, RwLock};
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};

#[cfg(feature = "uniffi")]
use crate::liquidity::{
	LSPS5Liquidity, LSPS5ListWebhooksResponse, LSPS5RemoveWebhookResponse, LSPS5SetWebhookResponse,
};

#[cfg(not(feature = "uniffi"))]
use crate::liquidity::LSPS5Liquidity;

#[cfg(feature = "uniffi")]
uniffi::include_scaffolding!("ldk_node");

Expand DownExpand Up@@ -958,6 +966,32 @@ impl Node {
 ))
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(not(feature = "uniffi"))]
	pub fn lsps5_liquidity(&self) -> LSPS5Liquidity {
 LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 )
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(feature = "uniffi")]
	pub fn lsps5_liquidity(&self) -> Arc<LSPS5Liquidity> {
 Arc::new(LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 ))
	}

	/// Retrieve a list of known channels.
	pub fn list_channels(&self) -> Vec<ChannelDetails> {
 self.channel_manager.list_channels().into_iter().map(|c| c.into()).collect()
Expand Down
Loading
Loading

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

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

 Closed

martinsaposnic
wants to merge
1
commit into

from

 Closed


LSPS5 support on ldk-node
#645
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ bdk_esplora = { version = "0.22.0", default-features = false, features = ["async
bdk_electrum = { version = "0.23.0", default-features = false, features = ["use-rustls-ring"]}
bdk_wallet = { version = "2.0.0", default-features = false, features = ["std", "keys-bip39"]}

reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "blocking"] }
rustls = { version = "0.23", default-features = false }
rusqlite = { version = "0.31.0", features = ["bundled"] }
bitcoin = "0.32.4"
Expand Down

26 changes: 26 additions & 0 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ interface Node {
	OnchainPayment onchain_payment();
	UnifiedQrPayment unified_qr_payment();
	LSPS1Liquidity lsps1_liquidity();
	LSPS5Liquidity lsps5_liquidity();
	[Throws=NodeError]
	void connect(PublicKey node_id, SocketAddress address, boolean persist);
	[Throws=NodeError]
Expand DownExpand Up@@ -264,6 +265,15 @@ interface LSPS1Liquidity {
	LSPS1OrderStatus check_order_status(LSPS1OrderId order_id);
};

interface LSPS5Liquidity {
	[Throws=NodeError]
	LSPS5SetWebhookResponse set_webhook(string app_name, string webhook_url);
	[Throws=NodeError]
	LSPS5ListWebhooksResponse list_webhooks();
	[Throws=NodeError]
	LSPS5RemoveWebhookResponse remove_webhook(string app_name);
};

[Error]
enum NodeError {
	"AlreadyRunning",
Expand DownExpand Up@@ -320,6 +330,8 @@ enum NodeError {
	"LiquidityFeeTooHigh",
	"InvalidBlindedPaths",
	"AsyncPaymentServicesDisabled",
	"LiquiditySetWebhookFailed",
	"LiquidityRemoveWebhookFailed",
};

dictionary NodeStatus {
Expand DownExpand Up@@ -531,6 +543,20 @@ enum LSPS1PaymentState {
	"Refunded",
};

dictionary LSPS5SetWebhookResponse {
	u32 num_webhooks;
	u32 max_webhooks;
	boolean no_change;
};

dictionary LSPS5ListWebhooksResponse {
	sequence<string> app_names;
	u32 max_webhooks;
};

dictionary LSPS5RemoveWebhookResponse {
};

[NonExhaustive]
enum Network {
	"Bitcoin",
Expand Down

49 changes: 48 additions & 1 deletion
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ use crate::io::{
	self, PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LSPS5ClientConfig,
	LSPS5ServiceConfig, LiquiditySourceBuilder,
};
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -125,6 +126,10 @@ struct LiquiditySourceConfig {
	lsps2_client: Option<LSPS2ClientConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
	/// Act as an LSPS5 client connecting to the given service.
	lsps5_client: Option<LSPS5ClientConfig>,
	// Act as an LSPS5 service.
	lsps5_service: Option<LSPS5ServiceConfig>,
}

#[derive(Clone)]
Expand DownExpand Up@@ -738,6 +743,27 @@ impl NodeBuilder {
 kv_store,
 )
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	pub fn set_liquidity_source_lsps5(
 &mut self, node_id: PublicKey, address: SocketAddress,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps5_client_config = LSPS5ClientConfig { node_id, address };
 liquidity_source_config.lsps5_client = Some(lsps5_client_config);
 self
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service
	pub fn set_liquidity_provider_lsps5(
 &mut self, service_config: LSPS5ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps5_service = Some(service_config);
 self
	}
}

/// A builder for an [`Node`] instance, allowing to set some configuration and module choices from
Expand DownExpand Up@@ -928,6 +954,20 @@ impl ArcedNodeBuilder {
 self.inner.write().unwrap().set_liquidity_provider_lsps2(service_config);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given [LSPS5] LSP.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_source_lsps5(&self, node_id: PublicKey, address: SocketAddress) {
 self.inner.write().unwrap().set_liquidity_source_lsps5(node_id, address);
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_provider_lsps5(&self, service_config: LSPS5ServiceConfig) {
 self.inner.write().unwrap().set_liquidity_provider_lsps5(service_config);
	}

	/// Sets the used storage directory path.
	pub fn set_storage_dir_path(&self, storage_dir_path: String) {
 self.inner.write().unwrap().set_storage_dir_path(storage_dir_path);
Expand DownExpand Up@@ -1542,6 +1582,13 @@ fn build_with_store_internal(
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });

 lsc.lsps5_client.as_ref().map(|config| {
 liquidity_source_builder.lsps5_client(config.node_id, config.address.clone())
 });
 lsc.lsps5_service
 .as_ref()
 .map(|config| liquidity_source_builder.lsps5_service(config.clone()));

 let liquidity_source = Arc::new(liquidity_source_builder.build());
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
Expand Down

10 changes: 10 additions & 0 deletions
src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,10 @@ pub enum Error {
	InvalidBlindedPaths,
	/// Asynchronous payment services are disabled.
	AsyncPaymentServicesDisabled,
	/// Failed to set a webhook with the LSP.
	LiquiditySetWebhookFailed,
	/// Failed to remove a webhook with the LSP.
	LiquidityRemoveWebhookFailed,
}

impl fmt::Display for Error {
Expand DownExpand Up@@ -201,6 +205,12 @@ impl fmt::Display for Error {
 Self::AsyncPaymentServicesDisabled => {
 write!(f, "Asynchronous payment services are disabled.")
 },
 Self::LiquiditySetWebhookFailed => {
 write!(f, "Failed to set a webhook with the LSP.")
 },
 Self::LiquidityRemoveWebhookFailed => {
 write!(f, "Failed to remove a webhook with the LSP.")
 },
 }
	}
}
Expand Down

34 changes: 34 additions & 0 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,14 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex, RwLock};
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};

#[cfg(feature = "uniffi")]
use crate::liquidity::{
	LSPS5Liquidity, LSPS5ListWebhooksResponse, LSPS5RemoveWebhookResponse, LSPS5SetWebhookResponse,
};

#[cfg(not(feature = "uniffi"))]
use crate::liquidity::LSPS5Liquidity;

#[cfg(feature = "uniffi")]
uniffi::include_scaffolding!("ldk_node");

Expand DownExpand Up@@ -958,6 +966,32 @@ impl Node {
 ))
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(not(feature = "uniffi"))]
	pub fn lsps5_liquidity(&self) -> LSPS5Liquidity {
 LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 )
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(feature = "uniffi")]
	pub fn lsps5_liquidity(&self) -> Arc<LSPS5Liquidity> {
 Arc::new(LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 ))
	}

	/// Retrieve a list of known channels.
	pub fn list_channels(&self) -> Vec<ChannelDetails> {
 self.channel_manager.list_channels().into_iter().map(|c| c.into()).collect()
Expand Down
Loading
Loading

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

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

 Closed

martinsaposnic
wants to merge
1
commit into

from

 Closed


LSPS5 support on ldk-node
#645
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ bdk_esplora = { version = "0.22.0", default-features = false, features = ["async
bdk_electrum = { version = "0.23.0", default-features = false, features = ["use-rustls-ring"]}
bdk_wallet = { version = "2.0.0", default-features = false, features = ["std", "keys-bip39"]}

reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "blocking"] }
rustls = { version = "0.23", default-features = false }
rusqlite = { version = "0.31.0", features = ["bundled"] }
bitcoin = "0.32.4"
Expand Down

26 changes: 26 additions & 0 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ interface Node {
	OnchainPayment onchain_payment();
	UnifiedQrPayment unified_qr_payment();
	LSPS1Liquidity lsps1_liquidity();
	LSPS5Liquidity lsps5_liquidity();
	[Throws=NodeError]
	void connect(PublicKey node_id, SocketAddress address, boolean persist);
	[Throws=NodeError]
Expand DownExpand Up@@ -264,6 +265,15 @@ interface LSPS1Liquidity {
	LSPS1OrderStatus check_order_status(LSPS1OrderId order_id);
};

interface LSPS5Liquidity {
	[Throws=NodeError]
	LSPS5SetWebhookResponse set_webhook(string app_name, string webhook_url);
	[Throws=NodeError]
	LSPS5ListWebhooksResponse list_webhooks();
	[Throws=NodeError]
	LSPS5RemoveWebhookResponse remove_webhook(string app_name);
};

[Error]
enum NodeError {
	"AlreadyRunning",
Expand DownExpand Up@@ -320,6 +330,8 @@ enum NodeError {
	"LiquidityFeeTooHigh",
	"InvalidBlindedPaths",
	"AsyncPaymentServicesDisabled",
	"LiquiditySetWebhookFailed",
	"LiquidityRemoveWebhookFailed",
};

dictionary NodeStatus {
Expand DownExpand Up@@ -531,6 +543,20 @@ enum LSPS1PaymentState {
	"Refunded",
};

dictionary LSPS5SetWebhookResponse {
	u32 num_webhooks;
	u32 max_webhooks;
	boolean no_change;
};

dictionary LSPS5ListWebhooksResponse {
	sequence<string> app_names;
	u32 max_webhooks;
};

dictionary LSPS5RemoveWebhookResponse {
};

[NonExhaustive]
enum Network {
	"Bitcoin",
Expand Down

49 changes: 48 additions & 1 deletion
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ use crate::io::{
	self, PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LSPS5ClientConfig,
	LSPS5ServiceConfig, LiquiditySourceBuilder,
};
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -125,6 +126,10 @@ struct LiquiditySourceConfig {
	lsps2_client: Option<LSPS2ClientConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
	/// Act as an LSPS5 client connecting to the given service.
	lsps5_client: Option<LSPS5ClientConfig>,
	// Act as an LSPS5 service.
	lsps5_service: Option<LSPS5ServiceConfig>,
}

#[derive(Clone)]
Expand DownExpand Up@@ -738,6 +743,27 @@ impl NodeBuilder {
 kv_store,
 )
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	pub fn set_liquidity_source_lsps5(
 &mut self, node_id: PublicKey, address: SocketAddress,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps5_client_config = LSPS5ClientConfig { node_id, address };
 liquidity_source_config.lsps5_client = Some(lsps5_client_config);
 self
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service
	pub fn set_liquidity_provider_lsps5(
 &mut self, service_config: LSPS5ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps5_service = Some(service_config);
 self
	}
}

/// A builder for an [`Node`] instance, allowing to set some configuration and module choices from
Expand DownExpand Up@@ -928,6 +954,20 @@ impl ArcedNodeBuilder {
 self.inner.write().unwrap().set_liquidity_provider_lsps2(service_config);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given [LSPS5] LSP.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_source_lsps5(&self, node_id: PublicKey, address: SocketAddress) {
 self.inner.write().unwrap().set_liquidity_source_lsps5(node_id, address);
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_provider_lsps5(&self, service_config: LSPS5ServiceConfig) {
 self.inner.write().unwrap().set_liquidity_provider_lsps5(service_config);
	}

	/// Sets the used storage directory path.
	pub fn set_storage_dir_path(&self, storage_dir_path: String) {
 self.inner.write().unwrap().set_storage_dir_path(storage_dir_path);
Expand DownExpand Up@@ -1542,6 +1582,13 @@ fn build_with_store_internal(
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });

 lsc.lsps5_client.as_ref().map(|config| {
 liquidity_source_builder.lsps5_client(config.node_id, config.address.clone())
 });
 lsc.lsps5_service
 .as_ref()
 .map(|config| liquidity_source_builder.lsps5_service(config.clone()));

 let liquidity_source = Arc::new(liquidity_source_builder.build());
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
Expand Down

10 changes: 10 additions & 0 deletions
src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,10 @@ pub enum Error {
	InvalidBlindedPaths,
	/// Asynchronous payment services are disabled.
	AsyncPaymentServicesDisabled,
	/// Failed to set a webhook with the LSP.
	LiquiditySetWebhookFailed,
	/// Failed to remove a webhook with the LSP.
	LiquidityRemoveWebhookFailed,
}

impl fmt::Display for Error {
Expand DownExpand Up@@ -201,6 +205,12 @@ impl fmt::Display for Error {
 Self::AsyncPaymentServicesDisabled => {
 write!(f, "Asynchronous payment services are disabled.")
 },
 Self::LiquiditySetWebhookFailed => {
 write!(f, "Failed to set a webhook with the LSP.")
 },
 Self::LiquidityRemoveWebhookFailed => {
 write!(f, "Failed to remove a webhook with the LSP.")
 },
 }
	}
}
Expand Down

34 changes: 34 additions & 0 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,14 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex, RwLock};
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};

#[cfg(feature = "uniffi")]
use crate::liquidity::{
	LSPS5Liquidity, LSPS5ListWebhooksResponse, LSPS5RemoveWebhookResponse, LSPS5SetWebhookResponse,
};

#[cfg(not(feature = "uniffi"))]
use crate::liquidity::LSPS5Liquidity;

#[cfg(feature = "uniffi")]
uniffi::include_scaffolding!("ldk_node");

Expand DownExpand Up@@ -958,6 +966,32 @@ impl Node {
 ))
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(not(feature = "uniffi"))]
	pub fn lsps5_liquidity(&self) -> LSPS5Liquidity {
 LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 )
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(feature = "uniffi")]
	pub fn lsps5_liquidity(&self) -> Arc<LSPS5Liquidity> {
 Arc::new(LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 ))
	}

	/// Retrieve a list of known channels.
	pub fn list_channels(&self) -> Vec<ChannelDetails> {
 self.channel_manager.list_channels().into_iter().map(|c| c.into()).collect()
Expand Down
Loading
Loading

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

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

 Closed

martinsaposnic
wants to merge
1
commit into

from

 Closed


LSPS5 support on ldk-node
#645
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ bdk_esplora = { version = "0.22.0", default-features = false, features = ["async
bdk_electrum = { version = "0.23.0", default-features = false, features = ["use-rustls-ring"]}
bdk_wallet = { version = "2.0.0", default-features = false, features = ["std", "keys-bip39"]}

reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] }
reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls", "blocking"] }
rustls = { version = "0.23", default-features = false }
rusqlite = { version = "0.31.0", features = ["bundled"] }
bitcoin = "0.32.4"
Expand Down

26 changes: 26 additions & 0 deletions
bindings/ldk_node.udl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,6 +130,7 @@ interface Node {
	OnchainPayment onchain_payment();
	UnifiedQrPayment unified_qr_payment();
	LSPS1Liquidity lsps1_liquidity();
	LSPS5Liquidity lsps5_liquidity();
	[Throws=NodeError]
	void connect(PublicKey node_id, SocketAddress address, boolean persist);
	[Throws=NodeError]
Expand DownExpand Up@@ -264,6 +265,15 @@ interface LSPS1Liquidity {
	LSPS1OrderStatus check_order_status(LSPS1OrderId order_id);
};

interface LSPS5Liquidity {
	[Throws=NodeError]
	LSPS5SetWebhookResponse set_webhook(string app_name, string webhook_url);
	[Throws=NodeError]
	LSPS5ListWebhooksResponse list_webhooks();
	[Throws=NodeError]
	LSPS5RemoveWebhookResponse remove_webhook(string app_name);
};

[Error]
enum NodeError {
	"AlreadyRunning",
Expand DownExpand Up@@ -320,6 +330,8 @@ enum NodeError {
	"LiquidityFeeTooHigh",
	"InvalidBlindedPaths",
	"AsyncPaymentServicesDisabled",
	"LiquiditySetWebhookFailed",
	"LiquidityRemoveWebhookFailed",
};

dictionary NodeStatus {
Expand DownExpand Up@@ -531,6 +543,20 @@ enum LSPS1PaymentState {
	"Refunded",
};

dictionary LSPS5SetWebhookResponse {
	u32 num_webhooks;
	u32 max_webhooks;
	boolean no_change;
};

dictionary LSPS5ListWebhooksResponse {
	sequence<string> app_names;
	u32 max_webhooks;
};

dictionary LSPS5RemoveWebhookResponse {
};

[NonExhaustive]
enum Network {
	"Bitcoin",
Expand Down

49 changes: 48 additions & 1 deletion
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,8 @@ use crate::io::{
	self, PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::liquidity::{
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LSPS5ClientConfig,
	LSPS5ServiceConfig, LiquiditySourceBuilder,
};
use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
use crate::message_handler::NodeCustomMessageHandler;
Expand DownExpand Up@@ -125,6 +126,10 @@ struct LiquiditySourceConfig {
	lsps2_client: Option<LSPS2ClientConfig>,
	// Act as an LSPS2 service.
	lsps2_service: Option<LSPS2ServiceConfig>,
	/// Act as an LSPS5 client connecting to the given service.
	lsps5_client: Option<LSPS5ClientConfig>,
	// Act as an LSPS5 service.
	lsps5_service: Option<LSPS5ServiceConfig>,
}

#[derive(Clone)]
Expand DownExpand Up@@ -738,6 +743,27 @@ impl NodeBuilder {
 kv_store,
 )
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given
	pub fn set_liquidity_source_lsps5(
 &mut self, node_id: PublicKey, address: SocketAddress,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 let lsps5_client_config = LSPS5ClientConfig { node_id, address };
 liquidity_source_config.lsps5_client = Some(lsps5_client_config);
 self
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service
	pub fn set_liquidity_provider_lsps5(
 &mut self, service_config: LSPS5ServiceConfig,
	) -> &mut Self {
 let liquidity_source_config =
 self.liquidity_source_config.get_or_insert(LiquiditySourceConfig::default());
 liquidity_source_config.lsps5_service = Some(service_config);
 self
	}
}

/// A builder for an [`Node`] instance, allowing to set some configuration and module choices from
Expand DownExpand Up@@ -928,6 +954,20 @@ impl ArcedNodeBuilder {
 self.inner.write().unwrap().set_liquidity_provider_lsps2(service_config);
	}

	/// Configures the [`Node`] instance to source inbound liquidity from the given [LSPS5] LSP.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_source_lsps5(&self, node_id: PublicKey, address: SocketAddress) {
 self.inner.write().unwrap().set_liquidity_source_lsps5(node_id, address);
	}

	/// Configures the [`Node`] instance to provide an LSPS5 service.
	///
	/// [LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	pub fn set_liquidity_provider_lsps5(&self, service_config: LSPS5ServiceConfig) {
 self.inner.write().unwrap().set_liquidity_provider_lsps5(service_config);
	}

	/// Sets the used storage directory path.
	pub fn set_storage_dir_path(&self, storage_dir_path: String) {
 self.inner.write().unwrap().set_storage_dir_path(storage_dir_path);
Expand DownExpand Up@@ -1542,6 +1582,13 @@ fn build_with_store_internal(
 liquidity_source_builder.lsps2_service(promise_secret, config.clone())
 });

 lsc.lsps5_client.as_ref().map(|config| {
 liquidity_source_builder.lsps5_client(config.node_id, config.address.clone())
 });
 lsc.lsps5_service
 .as_ref()
 .map(|config| liquidity_source_builder.lsps5_service(config.clone()));

 let liquidity_source = Arc::new(liquidity_source_builder.build());
 let custom_message_handler =
 Arc::new(NodeCustomMessageHandler::new_liquidity(Arc::clone(&liquidity_source)));
Expand Down

10 changes: 10 additions & 0 deletions
src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,10 @@ pub enum Error {
	InvalidBlindedPaths,
	/// Asynchronous payment services are disabled.
	AsyncPaymentServicesDisabled,
	/// Failed to set a webhook with the LSP.
	LiquiditySetWebhookFailed,
	/// Failed to remove a webhook with the LSP.
	LiquidityRemoveWebhookFailed,
}

impl fmt::Display for Error {
Expand DownExpand Up@@ -201,6 +205,12 @@ impl fmt::Display for Error {
 Self::AsyncPaymentServicesDisabled => {
 write!(f, "Asynchronous payment services are disabled.")
 },
 Self::LiquiditySetWebhookFailed => {
 write!(f, "Failed to set a webhook with the LSP.")
 },
 Self::LiquidityRemoveWebhookFailed => {
 write!(f, "Failed to remove a webhook with the LSP.")
 },
 }
	}
}
Expand Down

34 changes: 34 additions & 0 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,14 @@ use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex, RwLock};
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};

#[cfg(feature = "uniffi")]
use crate::liquidity::{
	LSPS5Liquidity, LSPS5ListWebhooksResponse, LSPS5RemoveWebhookResponse, LSPS5SetWebhookResponse,
};

#[cfg(not(feature = "uniffi"))]
use crate::liquidity::LSPS5Liquidity;

#[cfg(feature = "uniffi")]
uniffi::include_scaffolding!("ldk_node");

Expand DownExpand Up@@ -958,6 +966,32 @@ impl Node {
 ))
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(not(feature = "uniffi"))]
	pub fn lsps5_liquidity(&self) -> LSPS5Liquidity {
 LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 )
	}

	/// Returns a liquidity handler allowing to handle webhooks and notifications via the [bLIP-55 / LSPS5] protocol.
	///
	/// [bLIP-55 / LSPS5]: https://github.com/lightning/blips/blob/master/blip-0055.md
	#[cfg(feature = "uniffi")]
	pub fn lsps5_liquidity(&self) -> Arc<LSPS5Liquidity> {
 Arc::new(LSPS5Liquidity::new(
 Arc::clone(&self.runtime),
 Arc::clone(&self.connection_manager),
 self.liquidity_source.clone(),
 Arc::clone(&self.logger),
 ))
	}

	/// Retrieve a list of known channels.
	pub fn list_channels(&self) -> Vec<ChannelDetails> {
 self.channel_manager.list_channels().into_iter().map(|c| c.into()).collect()
Expand Down
Loading
Loading