Skip to content

Commit 90e9736

Browse files
authored
Merge pull request #627 from tnull/2025-08-upgrade-vss-encryption-obfuscation-scheme
Upgrade VSS encryption and obfuscation scheme
2 parents 357ac29 + d2153f2 commit 90e9736

File tree

4 files changed

+471
-137
lines changed

4 files changed

+471
-137
lines changed

Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ serde = { version = "1.0.210", default-features = false, features = ["std", "der
6565
serde_json = { version = "1.0.128", default-features = false, features = ["std"] }
6666
log = { version = "0.4.22", default-features = false, features = ["std"]}
6767

68-
vss-client = "0.3"
68+
vss-client = { package = "vss-client-ng", version = "0.4" }
6969
prost = { version = "0.11.6", default-features = false}
7070

7171
[target.'cfg(windows)'.dependencies]
@@ -91,6 +91,9 @@ clightningrpc = { version = "0.3.0-beta.8", default-features = false }
9191
lnd_grpc_rust = { version = "2.10.0", default-features = false }
9292
tokio = { version = "1.37", features = ["fs"] }
9393

94+
[target.'cfg(vss_test)'.dev-dependencies]
95+
ldk-node-062 = { package = "ldk-node", version = "=0.6.2" }
96+
9497
[build-dependencies]
9598
uniffi = { version = "0.28.3", features = ["build"], optional = true }
9699

@@ -151,3 +154,6 @@ harness = false
151154
#lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
152155
#lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
153156
#lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03" }
157+
158+
#vss-client-ng = { path = "../vss-client" }
159+
#vss-client-ng = { git = "https://github.com/lightningdevkit/vss-client", branch = "main" }

src/builder.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,11 @@ impl NodeBuilder {
732732
let vss_seed_bytes: [u8; 32] = vss_xprv.private_key.secret_bytes();
733733

734734
let vss_store =
735-
VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider, Arc::clone(&runtime));
735+
VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider).map_err(|e| {
736+
log_error!(logger, "Failed to setup VSS store: {}", e);
737+
BuildError::KVStoreSetupFailed
738+
})?;
739+
736740
build_with_store_internal(
737741
config,
738742
self.chain_data_source_config.as_ref(),

0 commit comments

Comments
 (0)