Skip to content

Launch VSS, Expose build_with_vss* methods in bindings.#376

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 2 commits into from
Oct 17, 2024
Merged

Launch VSS, Expose build_with_vss* methods in bindings. #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b05d99b
Launch VSS, remove cfg flag for it.
G8XSU Oct 17, 2024
5bb4855
Expose build_with_vss_* methods in bindings.
G8XSU Oct 15, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/vss-integration.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ jobs:
run: |
cd ldk-node
export TEST_VSS_BASE_URL="http://localhost:8080/vss"
RUSTFLAGS="--cfg vss_test --cfg vss" cargo build --verbose --color always
RUSTFLAGS="--cfg vss_test --cfg vss" cargo test --test integration_tests_vss
RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

- name: Cleanup
run: |
Expand Down
2 changes: 0 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ uniffi = { version = "0.27.3", features = ["build"], optional = true }
serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
serde_json = { version = "1.0.128", default-features = false, features = ["std"] }

[target.'cfg(vss)'.dependencies]
vss-client = "0.3"
prost = { version = "0.11.6", default-features = false}

Expand DownExpand Up@@ -113,7 +112,6 @@ panic = "abort"
level = "forbid"
# When adding a new cfg attribute, ensure that it is added to this list.
check-cfg = [
"cfg(vss)",
"cfg(vss_test)",
"cfg(ldk_bench)",
"cfg(tokio_unstable)",
Expand Down
20 changes: 20 additions & 0 deletions bindings/ldk_node.udl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,12 @@ interface Builder {
Node build();
[Throws=BuildError]
Node build_with_fs_store();
[Throws=BuildError]
Node build_with_vss_store(string vss_url, string store_id, string lnurl_auth_server_url, record<string, string> fixed_headers);
[Throws=BuildError]
Node build_with_vss_store_and_fixed_headers(string vss_url, string store_id, record<string, string> fixed_headers);
[Throws=BuildError]
Node build_with_vss_store_and_header_provider(string vss_url, string store_id, VssHeaderProvider header_provider);
};

interface Node {
Expand DownExpand Up@@ -251,6 +257,20 @@ enum BuildError {
"LoggerSetupFailed",
};

[Trait]
interface VssHeaderProvider {
[Async, Throws=VssHeaderProviderError]
record<string, string> get_headers([ByRef]sequence<u8> request);
Comment thread
G8XSU marked this conversation as resolved.
};

[Error]
enum VssHeaderProviderError {
"InvalidData",
"RequestError",
"AuthorizationError",
"InternalError",
};

[Enum]
interface Event {
PaymentSuccessful(PaymentId? payment_id, PaymentHash payment_hash, u64? fee_paid_msat);
Expand Down
11 changes: 0 additions & 11 deletions src/builder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ use crate::fee_estimator::OnchainFeeEstimator;
use crate::gossip::GossipSource;
use crate::io::sqlite_store::SqliteStore;
use crate::io::utils::{read_node_metrics, write_node_metrics};
#[cfg(any(vss, vss_test))]
Comment thread
G8XSU marked this conversation as resolved.
use crate::io::vss_store::VssStore;
use crate::liquidity::LiquiditySource;
use crate::logger::{log_error, log_info, FilesystemLogger, Logger};
Expand DownExpand Up@@ -64,9 +63,7 @@ use bip39::Mnemonic;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};

#[cfg(any(vss, vss_test))]
use bitcoin::bip32::{ChildNumber, Xpriv};
#[cfg(any(vss, vss_test))]
use std::collections::HashMap;
use std::convert::TryInto;
use std::default::Default;
Expand All@@ -76,7 +73,6 @@ use std::path::PathBuf;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex, RwLock};
use std::time::SystemTime;
#[cfg(any(vss, vss_test))]
use vss_client::headers::{FixedHeaders, LnurlAuthToJwtProvider, VssHeaderProvider};

#[derive(Debug, Clone)]
Expand DownExpand Up@@ -389,7 +385,6 @@ impl NodeBuilder {
///
/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
#[cfg(any(vss, vss_test))]
pub fn build_with_vss_store(
&self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
fixed_headers: HashMap<String, String>,
Expand DownExpand Up@@ -439,7 +434,6 @@ impl NodeBuilder {
/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
///
/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
#[cfg(any(vss, vss_test))]
pub fn build_with_vss_store_and_fixed_headers(
&self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
) -> Result<Node, BuildError> {
Expand All@@ -459,7 +453,6 @@ impl NodeBuilder {
/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
///
/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
#[cfg(any(vss, vss_test))]
pub fn build_with_vss_store_and_header_provider(
&self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
) -> Result<Node, BuildError> {
Expand DownExpand Up@@ -676,7 +669,6 @@ impl ArcedNodeBuilder {
///
/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
#[cfg(any(vss, vss_test))]
pub fn build_with_vss_store(
&self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
fixed_headers: HashMap<String, String>,
Expand All@@ -700,7 +692,6 @@ impl ArcedNodeBuilder {
/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
///
/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
#[cfg(any(vss, vss_test))]
pub fn build_with_vss_store_and_fixed_headers(
&self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
) -> Result<Arc<Node>, BuildError> {
Expand All@@ -722,7 +713,6 @@ impl ArcedNodeBuilder {
/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
///
/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
#[cfg(any(vss, vss_test))]
pub fn build_with_vss_store_and_header_provider(
&self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
) -> Result<Arc<Node>, BuildError> {
Expand DownExpand Up@@ -1276,7 +1266,6 @@ fn seed_bytes_from_config(
}
}

#[cfg(any(vss, vss_test))]
fn derive_vss_xprv(
config: Arc<Config>, seed_bytes: &[u8; 64], logger: Arc<FilesystemLogger>,
) -> Result<Xpriv, BuildError> {
Expand Down
1 change: 0 additions & 1 deletion src/io/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ pub mod sqlite_store;
#[cfg(test)]
pub(crate) mod test_utils;
pub(crate) mod utils;
#[cfg(any(vss, vss_test))]
pub(crate) mod vss_store;

/// The event queue will be persisted under this key.
Expand Down
1 change: 0 additions & 1 deletion src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,6 @@ pub use bip39;
pub use bitcoin;
pub use lightning;
pub use lightning_invoice;
#[cfg(any(vss, vss_test))]
pub use vss_client;

pub use balance::{BalanceDetails, LightningBalance, PendingSweepBalance};
Expand Down
2 changes: 2 additions & 0 deletions src/uniffi_types.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@ pub use bitcoin::{Address, BlockHash, Network, OutPoint, Txid};

pub use bip39::Mnemonic;

pub use vss_client::headers::{VssHeaderProvider, VssHeaderProviderError};

use crate::UniffiCustomTypeConverter;

use crate::builder::sanitize_alias;
Expand Down
, '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" + '
Launch VSS, Expose build_with_vss* methods in bindings. by G8XSU · Pull Request #376 · lightningdevkit/ldk-node · GitHub
Skip to content
Launch VSS, Expose build_with_vss* methods in bindings.#376

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 2 commits into

from

Oct 17, 2024
 Merged


Launch VSS, Expose build_with_vss* methods in bindings.
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b05d99b

Launch VSS, remove cfg flag for it.


G8XSU Oct 17, 2024
5bb4855

Expose build_with_vss_* methods in bindings.


G8XSU Oct 15, 2024

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


4 changes: 2 additions & 2 deletions
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo test --test integration_tests_vss
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

 - name: Cleanup
 run: |
Expand Down

2 changes: 0 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ uniffi = { version = "0.27.3", features = ["build"], optional = true }
serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
serde_json = { version = "1.0.128", default-features = false, features = ["std"] }

[target.'cfg(vss)'.dependencies]
vss-client = "0.3"
prost = { version = "0.11.6", default-features = false}

Expand DownExpand Up@@ -113,7 +112,6 @@ panic = "abort"
level = "forbid"
# When adding a new cfg attribute, ensure that it is added to this list.
check-cfg = [
	"cfg(vss)",
	"cfg(vss_test)",
	"cfg(ldk_bench)",
	"cfg(tokio_unstable)",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,12 @@ interface Builder {
	Node build();
	[Throws=BuildError]
	Node build_with_fs_store();
	[Throws=BuildError]
	Node build_with_vss_store(string vss_url, string store_id, string lnurl_auth_server_url, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_fixed_headers(string vss_url, string store_id, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_header_provider(string vss_url, string store_id, VssHeaderProvider header_provider);
};

interface Node {
Expand DownExpand Up@@ -251,6 +257,20 @@ enum BuildError {
	"LoggerSetupFailed",
};

[Trait]
interface VssHeaderProvider {
	[Async, Throws=VssHeaderProviderError]
	record<string, string> get_headers([ByRef]sequence<u8> request);
Comment thread
G8XSU marked this conversation as resolved.

};

[Error]
enum VssHeaderProviderError {
	"InvalidData",
	"RequestError",
	"AuthorizationError",
	"InternalError",
};

[Enum]
interface Event {
	PaymentSuccessful(PaymentId? payment_id, PaymentHash payment_hash, u64? fee_paid_msat);
Expand Down

11 changes: 0 additions & 11 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ use crate::fee_estimator::OnchainFeeEstimator;
use crate::gossip::GossipSource;
use crate::io::sqlite_store::SqliteStore;
use crate::io::utils::{read_node_metrics, write_node_metrics};
#[cfg(any(vss, vss_test))]
Comment thread
G8XSU marked this conversation as resolved.

use crate::io::vss_store::VssStore;
use crate::liquidity::LiquiditySource;
use crate::logger::{log_error, log_info, FilesystemLogger, Logger};
Expand DownExpand Up@@ -64,9 +63,7 @@ use bip39::Mnemonic;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};

#[cfg(any(vss, vss_test))]
use bitcoin::bip32::{ChildNumber, Xpriv};
#[cfg(any(vss, vss_test))]
use std::collections::HashMap;
use std::convert::TryInto;
use std::default::Default;
Expand All@@ -76,7 +73,6 @@ use std::path::PathBuf;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex, RwLock};
use std::time::SystemTime;
#[cfg(any(vss, vss_test))]
use vss_client::headers::{FixedHeaders, LnurlAuthToJwtProvider, VssHeaderProvider};

#[derive(Debug, Clone)]
Expand DownExpand Up@@ -389,7 +385,6 @@ impl NodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand DownExpand Up@@ -439,7 +434,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Node, BuildError> {
Expand All@@ -459,7 +453,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Node, BuildError> {
Expand DownExpand Up@@ -676,7 +669,6 @@ impl ArcedNodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand All@@ -700,7 +692,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Arc<Node>, BuildError> {
Expand All@@ -722,7 +713,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Arc<Node>, BuildError> {
Expand DownExpand Up@@ -1276,7 +1266,6 @@ fn seed_bytes_from_config(
	}
}

#[cfg(any(vss, vss_test))]
fn derive_vss_xprv(
	config: Arc<Config>, seed_bytes: &[u8; 64], logger: Arc<FilesystemLogger>,
) -> Result<Xpriv, BuildError> {
Expand Down

1 change: 0 additions & 1 deletion
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ pub mod sqlite_store;
#[cfg(test)]
pub(crate) mod test_utils;
pub(crate) mod utils;
#[cfg(any(vss, vss_test))]
pub(crate) mod vss_store;

/// The event queue will be persisted under this key.
Expand Down

1 change: 0 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,6 @@ pub use bip39;
pub use bitcoin;
pub use lightning;
pub use lightning_invoice;
#[cfg(any(vss, vss_test))]
pub use vss_client;

pub use balance::{BalanceDetails, LightningBalance, PendingSweepBalance};
Expand Down

2 changes: 2 additions & 0 deletions
src/uniffi_types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@ pub use bitcoin::{Address, BlockHash, Network, OutPoint, Txid};

pub use bip39::Mnemonic;

pub use vss_client::headers::{VssHeaderProvider, VssHeaderProviderError};

use crate::UniffiCustomTypeConverter;

use crate::builder::sanitize_alias;
Expand Down

, '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('^' + ".*" + '
Launch VSS, Expose build_with_vss* methods in bindings. by G8XSU · Pull Request #376 · lightningdevkit/ldk-node · GitHub
Skip to content
Launch VSS, Expose build_with_vss* methods in bindings.#376

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 2 commits into

from

Oct 17, 2024
 Merged


Launch VSS, Expose build_with_vss* methods in bindings.
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b05d99b

Launch VSS, remove cfg flag for it.


G8XSU Oct 17, 2024
5bb4855

Expose build_with_vss_* methods in bindings.


G8XSU Oct 15, 2024

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


4 changes: 2 additions & 2 deletions
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo test --test integration_tests_vss
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

 - name: Cleanup
 run: |
Expand Down

2 changes: 0 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ uniffi = { version = "0.27.3", features = ["build"], optional = true }
serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
serde_json = { version = "1.0.128", default-features = false, features = ["std"] }

[target.'cfg(vss)'.dependencies]
vss-client = "0.3"
prost = { version = "0.11.6", default-features = false}

Expand DownExpand Up@@ -113,7 +112,6 @@ panic = "abort"
level = "forbid"
# When adding a new cfg attribute, ensure that it is added to this list.
check-cfg = [
	"cfg(vss)",
	"cfg(vss_test)",
	"cfg(ldk_bench)",
	"cfg(tokio_unstable)",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,12 @@ interface Builder {
	Node build();
	[Throws=BuildError]
	Node build_with_fs_store();
	[Throws=BuildError]
	Node build_with_vss_store(string vss_url, string store_id, string lnurl_auth_server_url, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_fixed_headers(string vss_url, string store_id, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_header_provider(string vss_url, string store_id, VssHeaderProvider header_provider);
};

interface Node {
Expand DownExpand Up@@ -251,6 +257,20 @@ enum BuildError {
	"LoggerSetupFailed",
};

[Trait]
interface VssHeaderProvider {
	[Async, Throws=VssHeaderProviderError]
	record<string, string> get_headers([ByRef]sequence<u8> request);
Comment thread
G8XSU marked this conversation as resolved.

};

[Error]
enum VssHeaderProviderError {
	"InvalidData",
	"RequestError",
	"AuthorizationError",
	"InternalError",
};

[Enum]
interface Event {
	PaymentSuccessful(PaymentId? payment_id, PaymentHash payment_hash, u64? fee_paid_msat);
Expand Down

11 changes: 0 additions & 11 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ use crate::fee_estimator::OnchainFeeEstimator;
use crate::gossip::GossipSource;
use crate::io::sqlite_store::SqliteStore;
use crate::io::utils::{read_node_metrics, write_node_metrics};
#[cfg(any(vss, vss_test))]
Comment thread
G8XSU marked this conversation as resolved.

use crate::io::vss_store::VssStore;
use crate::liquidity::LiquiditySource;
use crate::logger::{log_error, log_info, FilesystemLogger, Logger};
Expand DownExpand Up@@ -64,9 +63,7 @@ use bip39::Mnemonic;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};

#[cfg(any(vss, vss_test))]
use bitcoin::bip32::{ChildNumber, Xpriv};
#[cfg(any(vss, vss_test))]
use std::collections::HashMap;
use std::convert::TryInto;
use std::default::Default;
Expand All@@ -76,7 +73,6 @@ use std::path::PathBuf;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex, RwLock};
use std::time::SystemTime;
#[cfg(any(vss, vss_test))]
use vss_client::headers::{FixedHeaders, LnurlAuthToJwtProvider, VssHeaderProvider};

#[derive(Debug, Clone)]
Expand DownExpand Up@@ -389,7 +385,6 @@ impl NodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand DownExpand Up@@ -439,7 +434,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Node, BuildError> {
Expand All@@ -459,7 +453,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Node, BuildError> {
Expand DownExpand Up@@ -676,7 +669,6 @@ impl ArcedNodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand All@@ -700,7 +692,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Arc<Node>, BuildError> {
Expand All@@ -722,7 +713,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Arc<Node>, BuildError> {
Expand DownExpand Up@@ -1276,7 +1266,6 @@ fn seed_bytes_from_config(
	}
}

#[cfg(any(vss, vss_test))]
fn derive_vss_xprv(
	config: Arc<Config>, seed_bytes: &[u8; 64], logger: Arc<FilesystemLogger>,
) -> Result<Xpriv, BuildError> {
Expand Down

1 change: 0 additions & 1 deletion
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ pub mod sqlite_store;
#[cfg(test)]
pub(crate) mod test_utils;
pub(crate) mod utils;
#[cfg(any(vss, vss_test))]
pub(crate) mod vss_store;

/// The event queue will be persisted under this key.
Expand Down

1 change: 0 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,6 @@ pub use bip39;
pub use bitcoin;
pub use lightning;
pub use lightning_invoice;
#[cfg(any(vss, vss_test))]
pub use vss_client;

pub use balance::{BalanceDetails, LightningBalance, PendingSweepBalance};
Expand Down

2 changes: 2 additions & 0 deletions
src/uniffi_types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@ pub use bitcoin::{Address, BlockHash, Network, OutPoint, Txid};

pub use bip39::Mnemonic;

pub use vss_client::headers::{VssHeaderProvider, VssHeaderProviderError};

use crate::UniffiCustomTypeConverter;

use crate::builder::sanitize_alias;
Expand Down

, '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('^' + ".*" + '
Launch VSS, Expose build_with_vss* methods in bindings. by G8XSU · Pull Request #376 · lightningdevkit/ldk-node · GitHub
Skip to content
Launch VSS, Expose build_with_vss* methods in bindings.#376

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 2 commits into

from

Oct 17, 2024
 Merged


Launch VSS, Expose build_with_vss* methods in bindings.
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b05d99b

Launch VSS, remove cfg flag for it.


G8XSU Oct 17, 2024
5bb4855

Expose build_with_vss_* methods in bindings.


G8XSU Oct 15, 2024

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


4 changes: 2 additions & 2 deletions
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo test --test integration_tests_vss
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

 - name: Cleanup
 run: |
Expand Down

2 changes: 0 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ uniffi = { version = "0.27.3", features = ["build"], optional = true }
serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
serde_json = { version = "1.0.128", default-features = false, features = ["std"] }

[target.'cfg(vss)'.dependencies]
vss-client = "0.3"
prost = { version = "0.11.6", default-features = false}

Expand DownExpand Up@@ -113,7 +112,6 @@ panic = "abort"
level = "forbid"
# When adding a new cfg attribute, ensure that it is added to this list.
check-cfg = [
	"cfg(vss)",
	"cfg(vss_test)",
	"cfg(ldk_bench)",
	"cfg(tokio_unstable)",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,12 @@ interface Builder {
	Node build();
	[Throws=BuildError]
	Node build_with_fs_store();
	[Throws=BuildError]
	Node build_with_vss_store(string vss_url, string store_id, string lnurl_auth_server_url, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_fixed_headers(string vss_url, string store_id, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_header_provider(string vss_url, string store_id, VssHeaderProvider header_provider);
};

interface Node {
Expand DownExpand Up@@ -251,6 +257,20 @@ enum BuildError {
	"LoggerSetupFailed",
};

[Trait]
interface VssHeaderProvider {
	[Async, Throws=VssHeaderProviderError]
	record<string, string> get_headers([ByRef]sequence<u8> request);
Comment thread
G8XSU marked this conversation as resolved.

};

[Error]
enum VssHeaderProviderError {
	"InvalidData",
	"RequestError",
	"AuthorizationError",
	"InternalError",
};

[Enum]
interface Event {
	PaymentSuccessful(PaymentId? payment_id, PaymentHash payment_hash, u64? fee_paid_msat);
Expand Down

11 changes: 0 additions & 11 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ use crate::fee_estimator::OnchainFeeEstimator;
use crate::gossip::GossipSource;
use crate::io::sqlite_store::SqliteStore;
use crate::io::utils::{read_node_metrics, write_node_metrics};
#[cfg(any(vss, vss_test))]
Comment thread
G8XSU marked this conversation as resolved.

use crate::io::vss_store::VssStore;
use crate::liquidity::LiquiditySource;
use crate::logger::{log_error, log_info, FilesystemLogger, Logger};
Expand DownExpand Up@@ -64,9 +63,7 @@ use bip39::Mnemonic;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};

#[cfg(any(vss, vss_test))]
use bitcoin::bip32::{ChildNumber, Xpriv};
#[cfg(any(vss, vss_test))]
use std::collections::HashMap;
use std::convert::TryInto;
use std::default::Default;
Expand All@@ -76,7 +73,6 @@ use std::path::PathBuf;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex, RwLock};
use std::time::SystemTime;
#[cfg(any(vss, vss_test))]
use vss_client::headers::{FixedHeaders, LnurlAuthToJwtProvider, VssHeaderProvider};

#[derive(Debug, Clone)]
Expand DownExpand Up@@ -389,7 +385,6 @@ impl NodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand DownExpand Up@@ -439,7 +434,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Node, BuildError> {
Expand All@@ -459,7 +453,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Node, BuildError> {
Expand DownExpand Up@@ -676,7 +669,6 @@ impl ArcedNodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand All@@ -700,7 +692,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Arc<Node>, BuildError> {
Expand All@@ -722,7 +713,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Arc<Node>, BuildError> {
Expand DownExpand Up@@ -1276,7 +1266,6 @@ fn seed_bytes_from_config(
	}
}

#[cfg(any(vss, vss_test))]
fn derive_vss_xprv(
	config: Arc<Config>, seed_bytes: &[u8; 64], logger: Arc<FilesystemLogger>,
) -> Result<Xpriv, BuildError> {
Expand Down

1 change: 0 additions & 1 deletion
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ pub mod sqlite_store;
#[cfg(test)]
pub(crate) mod test_utils;
pub(crate) mod utils;
#[cfg(any(vss, vss_test))]
pub(crate) mod vss_store;

/// The event queue will be persisted under this key.
Expand Down

1 change: 0 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,6 @@ pub use bip39;
pub use bitcoin;
pub use lightning;
pub use lightning_invoice;
#[cfg(any(vss, vss_test))]
pub use vss_client;

pub use balance::{BalanceDetails, LightningBalance, PendingSweepBalance};
Expand Down

2 changes: 2 additions & 0 deletions
src/uniffi_types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@ pub use bitcoin::{Address, BlockHash, Network, OutPoint, Txid};

pub use bip39::Mnemonic;

pub use vss_client::headers::{VssHeaderProvider, VssHeaderProviderError};

use crate::UniffiCustomTypeConverter;

use crate::builder::sanitize_alias;
Expand Down

, '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" + '
Launch VSS, Expose build_with_vss* methods in bindings. by G8XSU · Pull Request #376 · lightningdevkit/ldk-node · GitHub
Skip to content
Launch VSS, Expose build_with_vss* methods in bindings.#376

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 2 commits into

from

Oct 17, 2024
 Merged


Launch VSS, Expose build_with_vss* methods in bindings.
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b05d99b

Launch VSS, remove cfg flag for it.


G8XSU Oct 17, 2024
5bb4855

Expose build_with_vss_* methods in bindings.


G8XSU Oct 15, 2024

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


4 changes: 2 additions & 2 deletions
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo test --test integration_tests_vss
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

 - name: Cleanup
 run: |
Expand Down

2 changes: 0 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ uniffi = { version = "0.27.3", features = ["build"], optional = true }
serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
serde_json = { version = "1.0.128", default-features = false, features = ["std"] }

[target.'cfg(vss)'.dependencies]
vss-client = "0.3"
prost = { version = "0.11.6", default-features = false}

Expand DownExpand Up@@ -113,7 +112,6 @@ panic = "abort"
level = "forbid"
# When adding a new cfg attribute, ensure that it is added to this list.
check-cfg = [
	"cfg(vss)",
	"cfg(vss_test)",
	"cfg(ldk_bench)",
	"cfg(tokio_unstable)",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,12 @@ interface Builder {
	Node build();
	[Throws=BuildError]
	Node build_with_fs_store();
	[Throws=BuildError]
	Node build_with_vss_store(string vss_url, string store_id, string lnurl_auth_server_url, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_fixed_headers(string vss_url, string store_id, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_header_provider(string vss_url, string store_id, VssHeaderProvider header_provider);
};

interface Node {
Expand DownExpand Up@@ -251,6 +257,20 @@ enum BuildError {
	"LoggerSetupFailed",
};

[Trait]
interface VssHeaderProvider {
	[Async, Throws=VssHeaderProviderError]
	record<string, string> get_headers([ByRef]sequence<u8> request);
Comment thread
G8XSU marked this conversation as resolved.

};

[Error]
enum VssHeaderProviderError {
	"InvalidData",
	"RequestError",
	"AuthorizationError",
	"InternalError",
};

[Enum]
interface Event {
	PaymentSuccessful(PaymentId? payment_id, PaymentHash payment_hash, u64? fee_paid_msat);
Expand Down

11 changes: 0 additions & 11 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ use crate::fee_estimator::OnchainFeeEstimator;
use crate::gossip::GossipSource;
use crate::io::sqlite_store::SqliteStore;
use crate::io::utils::{read_node_metrics, write_node_metrics};
#[cfg(any(vss, vss_test))]
Comment thread
G8XSU marked this conversation as resolved.

use crate::io::vss_store::VssStore;
use crate::liquidity::LiquiditySource;
use crate::logger::{log_error, log_info, FilesystemLogger, Logger};
Expand DownExpand Up@@ -64,9 +63,7 @@ use bip39::Mnemonic;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};

#[cfg(any(vss, vss_test))]
use bitcoin::bip32::{ChildNumber, Xpriv};
#[cfg(any(vss, vss_test))]
use std::collections::HashMap;
use std::convert::TryInto;
use std::default::Default;
Expand All@@ -76,7 +73,6 @@ use std::path::PathBuf;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex, RwLock};
use std::time::SystemTime;
#[cfg(any(vss, vss_test))]
use vss_client::headers::{FixedHeaders, LnurlAuthToJwtProvider, VssHeaderProvider};

#[derive(Debug, Clone)]
Expand DownExpand Up@@ -389,7 +385,6 @@ impl NodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand DownExpand Up@@ -439,7 +434,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Node, BuildError> {
Expand All@@ -459,7 +453,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Node, BuildError> {
Expand DownExpand Up@@ -676,7 +669,6 @@ impl ArcedNodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand All@@ -700,7 +692,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Arc<Node>, BuildError> {
Expand All@@ -722,7 +713,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Arc<Node>, BuildError> {
Expand DownExpand Up@@ -1276,7 +1266,6 @@ fn seed_bytes_from_config(
	}
}

#[cfg(any(vss, vss_test))]
fn derive_vss_xprv(
	config: Arc<Config>, seed_bytes: &[u8; 64], logger: Arc<FilesystemLogger>,
) -> Result<Xpriv, BuildError> {
Expand Down

1 change: 0 additions & 1 deletion
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ pub mod sqlite_store;
#[cfg(test)]
pub(crate) mod test_utils;
pub(crate) mod utils;
#[cfg(any(vss, vss_test))]
pub(crate) mod vss_store;

/// The event queue will be persisted under this key.
Expand Down

1 change: 0 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,6 @@ pub use bip39;
pub use bitcoin;
pub use lightning;
pub use lightning_invoice;
#[cfg(any(vss, vss_test))]
pub use vss_client;

pub use balance::{BalanceDetails, LightningBalance, PendingSweepBalance};
Expand Down

2 changes: 2 additions & 0 deletions
src/uniffi_types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@ pub use bitcoin::{Address, BlockHash, Network, OutPoint, Txid};

pub use bip39::Mnemonic;

pub use vss_client::headers::{VssHeaderProvider, VssHeaderProviderError};

use crate::UniffiCustomTypeConverter;

use crate::builder::sanitize_alias;
Expand Down

, '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('^' + ".*" + '
Launch VSS, Expose build_with_vss* methods in bindings. by G8XSU · Pull Request #376 · lightningdevkit/ldk-node · GitHub
Skip to content
Launch VSS, Expose build_with_vss* methods in bindings.#376

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 2 commits into

from

Oct 17, 2024
 Merged


Launch VSS, Expose build_with_vss* methods in bindings.
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b05d99b

Launch VSS, remove cfg flag for it.


G8XSU Oct 17, 2024
5bb4855

Expose build_with_vss_* methods in bindings.


G8XSU Oct 15, 2024

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


4 changes: 2 additions & 2 deletions
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo test --test integration_tests_vss
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

 - name: Cleanup
 run: |
Expand Down

2 changes: 0 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ uniffi = { version = "0.27.3", features = ["build"], optional = true }
serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
serde_json = { version = "1.0.128", default-features = false, features = ["std"] }

[target.'cfg(vss)'.dependencies]
vss-client = "0.3"
prost = { version = "0.11.6", default-features = false}

Expand DownExpand Up@@ -113,7 +112,6 @@ panic = "abort"
level = "forbid"
# When adding a new cfg attribute, ensure that it is added to this list.
check-cfg = [
	"cfg(vss)",
	"cfg(vss_test)",
	"cfg(ldk_bench)",
	"cfg(tokio_unstable)",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,12 @@ interface Builder {
	Node build();
	[Throws=BuildError]
	Node build_with_fs_store();
	[Throws=BuildError]
	Node build_with_vss_store(string vss_url, string store_id, string lnurl_auth_server_url, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_fixed_headers(string vss_url, string store_id, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_header_provider(string vss_url, string store_id, VssHeaderProvider header_provider);
};

interface Node {
Expand DownExpand Up@@ -251,6 +257,20 @@ enum BuildError {
	"LoggerSetupFailed",
};

[Trait]
interface VssHeaderProvider {
	[Async, Throws=VssHeaderProviderError]
	record<string, string> get_headers([ByRef]sequence<u8> request);
Comment thread
G8XSU marked this conversation as resolved.

};

[Error]
enum VssHeaderProviderError {
	"InvalidData",
	"RequestError",
	"AuthorizationError",
	"InternalError",
};

[Enum]
interface Event {
	PaymentSuccessful(PaymentId? payment_id, PaymentHash payment_hash, u64? fee_paid_msat);
Expand Down

11 changes: 0 additions & 11 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ use crate::fee_estimator::OnchainFeeEstimator;
use crate::gossip::GossipSource;
use crate::io::sqlite_store::SqliteStore;
use crate::io::utils::{read_node_metrics, write_node_metrics};
#[cfg(any(vss, vss_test))]
Comment thread
G8XSU marked this conversation as resolved.

use crate::io::vss_store::VssStore;
use crate::liquidity::LiquiditySource;
use crate::logger::{log_error, log_info, FilesystemLogger, Logger};
Expand DownExpand Up@@ -64,9 +63,7 @@ use bip39::Mnemonic;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};

#[cfg(any(vss, vss_test))]
use bitcoin::bip32::{ChildNumber, Xpriv};
#[cfg(any(vss, vss_test))]
use std::collections::HashMap;
use std::convert::TryInto;
use std::default::Default;
Expand All@@ -76,7 +73,6 @@ use std::path::PathBuf;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex, RwLock};
use std::time::SystemTime;
#[cfg(any(vss, vss_test))]
use vss_client::headers::{FixedHeaders, LnurlAuthToJwtProvider, VssHeaderProvider};

#[derive(Debug, Clone)]
Expand DownExpand Up@@ -389,7 +385,6 @@ impl NodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand DownExpand Up@@ -439,7 +434,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Node, BuildError> {
Expand All@@ -459,7 +453,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Node, BuildError> {
Expand DownExpand Up@@ -676,7 +669,6 @@ impl ArcedNodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand All@@ -700,7 +692,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Arc<Node>, BuildError> {
Expand All@@ -722,7 +713,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Arc<Node>, BuildError> {
Expand DownExpand Up@@ -1276,7 +1266,6 @@ fn seed_bytes_from_config(
	}
}

#[cfg(any(vss, vss_test))]
fn derive_vss_xprv(
	config: Arc<Config>, seed_bytes: &[u8; 64], logger: Arc<FilesystemLogger>,
) -> Result<Xpriv, BuildError> {
Expand Down

1 change: 0 additions & 1 deletion
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ pub mod sqlite_store;
#[cfg(test)]
pub(crate) mod test_utils;
pub(crate) mod utils;
#[cfg(any(vss, vss_test))]
pub(crate) mod vss_store;

/// The event queue will be persisted under this key.
Expand Down

1 change: 0 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,6 @@ pub use bip39;
pub use bitcoin;
pub use lightning;
pub use lightning_invoice;
#[cfg(any(vss, vss_test))]
pub use vss_client;

pub use balance::{BalanceDetails, LightningBalance, PendingSweepBalance};
Expand Down

2 changes: 2 additions & 0 deletions
src/uniffi_types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@ pub use bitcoin::{Address, BlockHash, Network, OutPoint, Txid};

pub use bip39::Mnemonic;

pub use vss_client::headers::{VssHeaderProvider, VssHeaderProviderError};

use crate::UniffiCustomTypeConverter;

use crate::builder::sanitize_alias;
Expand Down

, '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('^' + ".*" + '
Launch VSS, Expose build_with_vss* methods in bindings. by G8XSU · Pull Request #376 · lightningdevkit/ldk-node · GitHub
Skip to content
Launch VSS, Expose build_with_vss* methods in bindings.#376

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 2 commits into

from

Oct 17, 2024
 Merged


Launch VSS, Expose build_with_vss* methods in bindings.
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b05d99b

Launch VSS, remove cfg flag for it.


G8XSU Oct 17, 2024
5bb4855

Expose build_with_vss_* methods in bindings.


G8XSU Oct 15, 2024

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


4 changes: 2 additions & 2 deletions
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo test --test integration_tests_vss
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

 - name: Cleanup
 run: |
Expand Down

2 changes: 0 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ uniffi = { version = "0.27.3", features = ["build"], optional = true }
serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
serde_json = { version = "1.0.128", default-features = false, features = ["std"] }

[target.'cfg(vss)'.dependencies]
vss-client = "0.3"
prost = { version = "0.11.6", default-features = false}

Expand DownExpand Up@@ -113,7 +112,6 @@ panic = "abort"
level = "forbid"
# When adding a new cfg attribute, ensure that it is added to this list.
check-cfg = [
	"cfg(vss)",
	"cfg(vss_test)",
	"cfg(ldk_bench)",
	"cfg(tokio_unstable)",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,12 @@ interface Builder {
	Node build();
	[Throws=BuildError]
	Node build_with_fs_store();
	[Throws=BuildError]
	Node build_with_vss_store(string vss_url, string store_id, string lnurl_auth_server_url, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_fixed_headers(string vss_url, string store_id, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_header_provider(string vss_url, string store_id, VssHeaderProvider header_provider);
};

interface Node {
Expand DownExpand Up@@ -251,6 +257,20 @@ enum BuildError {
	"LoggerSetupFailed",
};

[Trait]
interface VssHeaderProvider {
	[Async, Throws=VssHeaderProviderError]
	record<string, string> get_headers([ByRef]sequence<u8> request);
Comment thread
G8XSU marked this conversation as resolved.

};

[Error]
enum VssHeaderProviderError {
	"InvalidData",
	"RequestError",
	"AuthorizationError",
	"InternalError",
};

[Enum]
interface Event {
	PaymentSuccessful(PaymentId? payment_id, PaymentHash payment_hash, u64? fee_paid_msat);
Expand Down

11 changes: 0 additions & 11 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ use crate::fee_estimator::OnchainFeeEstimator;
use crate::gossip::GossipSource;
use crate::io::sqlite_store::SqliteStore;
use crate::io::utils::{read_node_metrics, write_node_metrics};
#[cfg(any(vss, vss_test))]
Comment thread
G8XSU marked this conversation as resolved.

use crate::io::vss_store::VssStore;
use crate::liquidity::LiquiditySource;
use crate::logger::{log_error, log_info, FilesystemLogger, Logger};
Expand DownExpand Up@@ -64,9 +63,7 @@ use bip39::Mnemonic;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};

#[cfg(any(vss, vss_test))]
use bitcoin::bip32::{ChildNumber, Xpriv};
#[cfg(any(vss, vss_test))]
use std::collections::HashMap;
use std::convert::TryInto;
use std::default::Default;
Expand All@@ -76,7 +73,6 @@ use std::path::PathBuf;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex, RwLock};
use std::time::SystemTime;
#[cfg(any(vss, vss_test))]
use vss_client::headers::{FixedHeaders, LnurlAuthToJwtProvider, VssHeaderProvider};

#[derive(Debug, Clone)]
Expand DownExpand Up@@ -389,7 +385,6 @@ impl NodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand DownExpand Up@@ -439,7 +434,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Node, BuildError> {
Expand All@@ -459,7 +453,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Node, BuildError> {
Expand DownExpand Up@@ -676,7 +669,6 @@ impl ArcedNodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand All@@ -700,7 +692,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Arc<Node>, BuildError> {
Expand All@@ -722,7 +713,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Arc<Node>, BuildError> {
Expand DownExpand Up@@ -1276,7 +1266,6 @@ fn seed_bytes_from_config(
	}
}

#[cfg(any(vss, vss_test))]
fn derive_vss_xprv(
	config: Arc<Config>, seed_bytes: &[u8; 64], logger: Arc<FilesystemLogger>,
) -> Result<Xpriv, BuildError> {
Expand Down

1 change: 0 additions & 1 deletion
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ pub mod sqlite_store;
#[cfg(test)]
pub(crate) mod test_utils;
pub(crate) mod utils;
#[cfg(any(vss, vss_test))]
pub(crate) mod vss_store;

/// The event queue will be persisted under this key.
Expand Down

1 change: 0 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,6 @@ pub use bip39;
pub use bitcoin;
pub use lightning;
pub use lightning_invoice;
#[cfg(any(vss, vss_test))]
pub use vss_client;

pub use balance::{BalanceDetails, LightningBalance, PendingSweepBalance};
Expand Down

2 changes: 2 additions & 0 deletions
src/uniffi_types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@ pub use bitcoin::{Address, BlockHash, Network, OutPoint, Txid};

pub use bip39::Mnemonic;

pub use vss_client::headers::{VssHeaderProvider, VssHeaderProviderError};

use crate::UniffiCustomTypeConverter;

use crate::builder::sanitize_alias;
Expand Down

, '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); }
})();
})();
Launch VSS, Expose build_with_vss* methods in bindings. by G8XSU · Pull Request #376 · lightningdevkit/ldk-node · GitHub
Skip to content
Launch VSS, Expose build_with_vss* methods in bindings.#376

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 2 commits into

from

Oct 17, 2024
 Merged


Launch VSS, Expose build_with_vss* methods in bindings.
#376
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
b05d99b

Launch VSS, remove cfg flag for it.


G8XSU Oct 17, 2024
5bb4855

Expose build_with_vss_* methods in bindings.


G8XSU Oct 15, 2024

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


4 changes: 2 additions & 2 deletions
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test --cfg vss" cargo test --test integration_tests_vss
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

 - name: Cleanup
 run: |
Expand Down

2 changes: 0 additions & 2 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,7 +76,6 @@ uniffi = { version = "0.27.3", features = ["build"], optional = true }
serde = { version = "1.0.210", default-features = false, features = ["std", "derive"] }
serde_json = { version = "1.0.128", default-features = false, features = ["std"] }

[target.'cfg(vss)'.dependencies]
vss-client = "0.3"
prost = { version = "0.11.6", default-features = false}

Expand DownExpand Up@@ -113,7 +112,6 @@ panic = "abort"
level = "forbid"
# When adding a new cfg attribute, ensure that it is added to this list.
check-cfg = [
	"cfg(vss)",
	"cfg(vss_test)",
	"cfg(ldk_bench)",
	"cfg(tokio_unstable)",
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,6 +50,12 @@ interface Builder {
	Node build();
	[Throws=BuildError]
	Node build_with_fs_store();
	[Throws=BuildError]
	Node build_with_vss_store(string vss_url, string store_id, string lnurl_auth_server_url, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_fixed_headers(string vss_url, string store_id, record<string, string> fixed_headers);
	[Throws=BuildError]
	Node build_with_vss_store_and_header_provider(string vss_url, string store_id, VssHeaderProvider header_provider);
};

interface Node {
Expand DownExpand Up@@ -251,6 +257,20 @@ enum BuildError {
	"LoggerSetupFailed",
};

[Trait]
interface VssHeaderProvider {
	[Async, Throws=VssHeaderProviderError]
	record<string, string> get_headers([ByRef]sequence<u8> request);
Comment thread
G8XSU marked this conversation as resolved.

};

[Error]
enum VssHeaderProviderError {
	"InvalidData",
	"RequestError",
	"AuthorizationError",
	"InternalError",
};

[Enum]
interface Event {
	PaymentSuccessful(PaymentId? payment_id, PaymentHash payment_hash, u64? fee_paid_msat);
Expand Down

11 changes: 0 additions & 11 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,6 @@ use crate::fee_estimator::OnchainFeeEstimator;
use crate::gossip::GossipSource;
use crate::io::sqlite_store::SqliteStore;
use crate::io::utils::{read_node_metrics, write_node_metrics};
#[cfg(any(vss, vss_test))]
Comment thread
G8XSU marked this conversation as resolved.

use crate::io::vss_store::VssStore;
use crate::liquidity::LiquiditySource;
use crate::logger::{log_error, log_info, FilesystemLogger, Logger};
Expand DownExpand Up@@ -64,9 +63,7 @@ use bip39::Mnemonic;
use bitcoin::secp256k1::PublicKey;
use bitcoin::{BlockHash, Network};

#[cfg(any(vss, vss_test))]
use bitcoin::bip32::{ChildNumber, Xpriv};
#[cfg(any(vss, vss_test))]
use std::collections::HashMap;
use std::convert::TryInto;
use std::default::Default;
Expand All@@ -76,7 +73,6 @@ use std::path::PathBuf;
use std::sync::atomic::AtomicBool;
use std::sync::{Arc, Mutex, RwLock};
use std::time::SystemTime;
#[cfg(any(vss, vss_test))]
use vss_client::headers::{FixedHeaders, LnurlAuthToJwtProvider, VssHeaderProvider};

#[derive(Debug, Clone)]
Expand DownExpand Up@@ -389,7 +385,6 @@ impl NodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand DownExpand Up@@ -439,7 +434,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Node, BuildError> {
Expand All@@ -459,7 +453,6 @@ impl NodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Node, BuildError> {
Expand DownExpand Up@@ -676,7 +669,6 @@ impl ArcedNodeBuilder {
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store(
 &self, vss_url: String, store_id: String, lnurl_auth_server_url: String,
 fixed_headers: HashMap<String, String>,
Expand All@@ -700,7 +692,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_fixed_headers(
 &self, vss_url: String, store_id: String, fixed_headers: HashMap<String, String>,
	) -> Result<Arc<Node>, BuildError> {
Expand All@@ -722,7 +713,6 @@ impl ArcedNodeBuilder {
	/// unrecoverable, i.e., if they remain unresolved after internal retries are exhausted.
	///
	/// [VSS]: https://github.com/lightningdevkit/vss-server/blob/main/README.md
	#[cfg(any(vss, vss_test))]
	pub fn build_with_vss_store_and_header_provider(
 &self, vss_url: String, store_id: String, header_provider: Arc<dyn VssHeaderProvider>,
	) -> Result<Arc<Node>, BuildError> {
Expand DownExpand Up@@ -1276,7 +1266,6 @@ fn seed_bytes_from_config(
	}
}

#[cfg(any(vss, vss_test))]
fn derive_vss_xprv(
	config: Arc<Config>, seed_bytes: &[u8; 64], logger: Arc<FilesystemLogger>,
) -> Result<Xpriv, BuildError> {
Expand Down

1 change: 0 additions & 1 deletion
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,6 @@ pub mod sqlite_store;
#[cfg(test)]
pub(crate) mod test_utils;
pub(crate) mod utils;
#[cfg(any(vss, vss_test))]
pub(crate) mod vss_store;

/// The event queue will be persisted under this key.
Expand Down

1 change: 0 additions & 1 deletion
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,6 @@ pub use bip39;
pub use bitcoin;
pub use lightning;
pub use lightning_invoice;
#[cfg(any(vss, vss_test))]
pub use vss_client;

pub use balance::{BalanceDetails, LightningBalance, PendingSweepBalance};
Expand Down

2 changes: 2 additions & 0 deletions
src/uniffi_types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,8 @@ pub use bitcoin::{Address, BlockHash, Network, OutPoint, Txid};

pub use bip39::Mnemonic;

pub use vss_client::headers::{VssHeaderProvider, VssHeaderProviderError};

use crate::UniffiCustomTypeConverter;

use crate::builder::sanitize_alias;
Expand Down