Skip to content

Use crate::runtime::Runtime for VssStore#623

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 1 commit into from
Aug 21, 2025
Merged

Use crate::runtime::Runtime for VssStore#623

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
5 changes: 1 addition & 4 deletions src/builder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -694,10 +694,7 @@ impl NodeBuilder {
let vss_seed_bytes: [u8; 32] = vss_xprv.private_key.secret_bytes();

let vss_store =
VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider).map_err(|e| {
log_error!(logger, "Failed to setup VssStore: {}", e);
BuildError::KVStoreSetupFailed
})?;
VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider, Arc::clone(&runtime));
build_with_store_internal(
config,
self.chain_data_source_config.as_ref(),
Expand Down
107 changes: 60 additions & 47 deletions src/io/vss_store.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
// accordance with one or both of these licenses.

use crate::io::utils::check_namespace_key_validity;
use crate::runtime::Runtime;

use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
use lightning::io::{self, Error, ErrorKind};
use lightning::util::persist::KVStore;
Expand All@@ -15,7 +17,6 @@ use rand::RngCore;
use std::panic::RefUnwindSafe;
use std::sync::Arc;
use std::time::Duration;
use tokio::runtime::Runtime;
use vss_client::client::VssClient;
use vss_client::error::VssError;
use vss_client::headers::VssHeaderProvider;
Expand All@@ -41,17 +42,16 @@ type CustomRetryPolicy = FilteredRetryPolicy<
pub struct VssStore {
client: VssClient<CustomRetryPolicy>,
store_id: String,
runtime: Runtime,
runtime: Arc<Runtime>,
storable_builder: StorableBuilder<RandEntropySource>,
key_obfuscator: KeyObfuscator,
}

impl VssStore {
pub(crate) fn new(
base_url: String, store_id: String, vss_seed: [u8; 32],
header_provider: Arc<dyn VssHeaderProvider>,
) -> io::Result<Self> {
let runtime = tokio::runtime::Builder::new_multi_thread().enable_all().build()?;
header_provider: Arc<dyn VssHeaderProvider>, runtime: Arc<Runtime>,
) -> Self {
let (data_encryption_key, obfuscation_master_key) =
derive_data_encryption_and_obfuscation_keys(&vss_seed);
let key_obfuscator = KeyObfuscator::new(obfuscation_master_key);
Expand All@@ -70,7 +70,7 @@ impl VssStore {
}) as _);

let client = VssClient::new_with_headers(base_url, retry_policy, header_provider);
Ok(Self { client, store_id, runtime, storable_builder, key_obfuscator })
Self { client, store_id, runtime, storable_builder, key_obfuscator }
}

fn build_key(
Expand DownExpand Up@@ -136,19 +136,16 @@ impl KVStore for VssStore {
store_id: self.store_id.clone(),
key: self.build_key(primary_namespace, secondary_namespace, key)?,
};

let resp =
tokio::task::block_in_place(|| self.runtime.block_on(self.client.get_object(&request)))
.map_err(|e| {
let msg = format!(
"Failed to read from key {}/{}/{}: {}",
primary_namespace, secondary_namespace, key, e
);
match e {
VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
_ => Error::new(ErrorKind::Other, msg),
}
})?;
let resp = self.runtime.block_on(self.client.get_object(&request)).map_err(|e| {
let msg = format!(
"Failed to read from key {}/{}/{}: {}",
primary_namespace, secondary_namespace, key, e
);
match e {
VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
_ => Error::new(ErrorKind::Other, msg),
}
})?;
// unwrap safety: resp.value must be always present for a non-erroneous VSS response, otherwise
// it is an API-violation which is converted to [`VssError::InternalServerError`] in [`VssClient`]
let storable = Storable::decode(&resp.value.unwrap().value[..]).map_err(|e| {
Expand DownExpand Up@@ -179,14 +176,13 @@ impl KVStore for VssStore {
delete_items: vec![],
};

tokio::task::block_in_place(|| self.runtime.block_on(self.client.put_object(&request)))
.map_err(|e| {
let msg = format!(
"Failed to write to key {}/{}/{}: {}",
primary_namespace, secondary_namespace, key, e
);
Error::new(ErrorKind::Other, msg)
})?;
self.runtime.block_on(self.client.put_object(&request)).map_err(|e| {
let msg = format!(
"Failed to write to key {}/{}/{}: {}",
primary_namespace, secondary_namespace, key, e
);
Error::new(ErrorKind::Other, msg)
})?;

Ok(())
}
Expand All@@ -204,30 +200,29 @@ impl KVStore for VssStore {
}),
};

tokio::task::block_in_place(|| self.runtime.block_on(self.client.delete_object(&request)))
.map_err(|e| {
let msg = format!(
"Failed to delete key {}/{}/{}: {}",
primary_namespace, secondary_namespace, key, e
);
Error::new(ErrorKind::Other, msg)
})?;
self.runtime.block_on(self.client.delete_object(&request)).map_err(|e| {
let msg = format!(
"Failed to delete key {}/{}/{}: {}",
primary_namespace, secondary_namespace, key, e
);
Error::new(ErrorKind::Other, msg)
})?;
Ok(())
}

fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
check_namespace_key_validity(primary_namespace, secondary_namespace, None, "list")?;

let keys = tokio::task::block_in_place(|| {
self.runtime.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
})
.map_err(|e| {
let msg = format!(
"Failed to retrieve keys in namespace: {}/{} : {}",
primary_namespace, secondary_namespace, e
);
Error::new(ErrorKind::Other, msg)
})?;
let keys = self
.runtime
.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
.map_err(|e| {
let msg = format!(
"Failed to retrieve keys in namespace: {}/{} : {}",
primary_namespace, secondary_namespace, e
);
Error::new(ErrorKind::Other, msg)
})?;

Ok(keys)
}
Expand DownExpand Up@@ -266,19 +261,37 @@ mod tests {
use rand::distributions::Alphanumeric;
use rand::{thread_rng, Rng, RngCore};
use std::collections::HashMap;
use tokio::runtime;
use vss_client::headers::FixedHeaders;

#[test]
fn read_write_remove_list_persist() {
fn vss_read_write_remove_list_persist() {
let runtime = Arc::new(Runtime::new().unwrap());
let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
let mut rng = thread_rng();
let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
let mut vss_seed = [0u8; 32];
rng.fill_bytes(&mut vss_seed);
let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
let vss_store =
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

do_read_write_remove_list_persist(&vss_store);
}

#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
async fn vss_read_write_remove_list_persist_in_runtime_context() {
let runtime = Arc::new(Runtime::new().unwrap());
let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
let mut rng = thread_rng();
let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
let mut vss_seed = [0u8; 32];
rng.fill_bytes(&mut vss_seed);
let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
let vss_store =
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider).unwrap();
VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

do_read_write_remove_list_persist(&vss_store);
drop(vss_store)
}
}
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" + '
Use `crate::runtime::Runtime` for `VssStore` by tnull · Pull Request #623 · lightningdevkit/ldk-node · GitHub
Skip to content
Use crate::runtime::Runtime for VssStore#623

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 1 commit into

from

Aug 21, 2025
 Merged


Use crate::runtime::Runtime for VssStore#623
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


5 changes: 1 addition & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,10 +694,7 @@ impl NodeBuilder {
 let vss_seed_bytes: [u8; 32] = vss_xprv.private_key.secret_bytes();

 let vss_store =
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider).map_err(|e| {
 log_error!(logger, "Failed to setup VssStore: {}", e);
 BuildError::KVStoreSetupFailed
 })?;
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider, Arc::clone(&runtime));
 build_with_store_internal(
 config,
 self.chain_data_source_config.as_ref(),
Expand Down

107 changes: 60 additions & 47 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
// accordance with one or both of these licenses.

use crate::io::utils::check_namespace_key_validity;
use crate::runtime::Runtime;

use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
use lightning::io::{self, Error, ErrorKind};
use lightning::util::persist::KVStore;
Expand All@@ -15,7 +17,6 @@ use rand::RngCore;
use std::panic::RefUnwindSafe;
use std::sync::Arc;
use std::time::Duration;
use tokio::runtime::Runtime;
use vss_client::client::VssClient;
use vss_client::error::VssError;
use vss_client::headers::VssHeaderProvider;
Expand All@@ -41,17 +42,16 @@ type CustomRetryPolicy = FilteredRetryPolicy<
pub struct VssStore {
	client: VssClient<CustomRetryPolicy>,
	store_id: String,
	runtime: Runtime,
	runtime: Arc<Runtime>,
	storable_builder: StorableBuilder<RandEntropySource>,
	key_obfuscator: KeyObfuscator,
}

impl VssStore {
	pub(crate) fn new(
 base_url: String, store_id: String, vss_seed: [u8; 32],
 header_provider: Arc<dyn VssHeaderProvider>,
	) -> io::Result<Self> {
 let runtime = tokio::runtime::Builder::new_multi_thread().enable_all().build()?;
 header_provider: Arc<dyn VssHeaderProvider>, runtime: Arc<Runtime>,
	) -> Self {
 let (data_encryption_key, obfuscation_master_key) =
 derive_data_encryption_and_obfuscation_keys(&vss_seed);
 let key_obfuscator = KeyObfuscator::new(obfuscation_master_key);
Expand All@@ -70,7 +70,7 @@ impl VssStore {
 }) as _);

 let client = VssClient::new_with_headers(base_url, retry_policy, header_provider);
Ok(Self { client, store_id, runtime, storable_builder, key_obfuscator })
 Self { client, store_id, runtime, storable_builder, key_obfuscator }
	}

	fn build_key(
Expand DownExpand Up@@ -136,19 +136,16 @@ impl KVStore for VssStore {
 store_id: self.store_id.clone(),
 key: self.build_key(primary_namespace, secondary_namespace, key)?,
 };

 let resp =
 tokio::task::block_in_place(|| self.runtime.block_on(self.client.get_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 let resp = self.runtime.block_on(self.client.get_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 // unwrap safety: resp.value must be always present for a non-erroneous VSS response, otherwise
 // it is an API-violation which is converted to [`VssError::InternalServerError`] in [`VssClient`]
 let storable = Storable::decode(&resp.value.unwrap().value[..]).map_err(|e| {
Expand DownExpand Up@@ -179,14 +176,13 @@ impl KVStore for VssStore {
 delete_items: vec![],
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.put_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.put_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;

 Ok(())
	}
Expand All@@ -204,30 +200,29 @@ impl KVStore for VssStore {
 }),
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.delete_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.delete_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 check_namespace_key_validity(primary_namespace, secondary_namespace, None, "list")?;

 let keys = tokio::task::block_in_place(|| {
self.runtime.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
})
 .map_err(|e| {
 let msg = format!(
 "Failed to retrieve keys in namespace: {}/{} : {}",
 primary_namespace, secondary_namespace, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 let keys = self
 .runtime
	.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
.map_err(|e| {
let msg = format!(
"Failed to retrieve keys in namespace: {}/{} : {}",
primary_namespace, secondary_namespace, e
);
Error::new(ErrorKind::Other, msg)
})?;

 Ok(keys)
	}
Expand DownExpand Up@@ -266,19 +261,37 @@ mod tests {
	use rand::distributions::Alphanumeric;
	use rand::{thread_rng, Rng, RngCore};
	use std::collections::HashMap;
	use tokio::runtime;
	use vss_client::headers::FixedHeaders;

	#[test]
	fn read_write_remove_list_persist() {
	fn vss_read_write_remove_list_persist() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
	}

	#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
	async fn vss_read_write_remove_list_persist_in_runtime_context() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider).unwrap();
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
 drop(vss_store)
	}
}
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('^' + ".*" + '
Use `crate::runtime::Runtime` for `VssStore` by tnull · Pull Request #623 · lightningdevkit/ldk-node · GitHub
Skip to content
Use crate::runtime::Runtime for VssStore#623

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 1 commit into

from

Aug 21, 2025
 Merged


Use crate::runtime::Runtime for VssStore#623
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


5 changes: 1 addition & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,10 +694,7 @@ impl NodeBuilder {
 let vss_seed_bytes: [u8; 32] = vss_xprv.private_key.secret_bytes();

 let vss_store =
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider).map_err(|e| {
 log_error!(logger, "Failed to setup VssStore: {}", e);
 BuildError::KVStoreSetupFailed
 })?;
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider, Arc::clone(&runtime));
 build_with_store_internal(
 config,
 self.chain_data_source_config.as_ref(),
Expand Down

107 changes: 60 additions & 47 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
// accordance with one or both of these licenses.

use crate::io::utils::check_namespace_key_validity;
use crate::runtime::Runtime;

use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
use lightning::io::{self, Error, ErrorKind};
use lightning::util::persist::KVStore;
Expand All@@ -15,7 +17,6 @@ use rand::RngCore;
use std::panic::RefUnwindSafe;
use std::sync::Arc;
use std::time::Duration;
use tokio::runtime::Runtime;
use vss_client::client::VssClient;
use vss_client::error::VssError;
use vss_client::headers::VssHeaderProvider;
Expand All@@ -41,17 +42,16 @@ type CustomRetryPolicy = FilteredRetryPolicy<
pub struct VssStore {
	client: VssClient<CustomRetryPolicy>,
	store_id: String,
	runtime: Runtime,
	runtime: Arc<Runtime>,
	storable_builder: StorableBuilder<RandEntropySource>,
	key_obfuscator: KeyObfuscator,
}

impl VssStore {
	pub(crate) fn new(
 base_url: String, store_id: String, vss_seed: [u8; 32],
 header_provider: Arc<dyn VssHeaderProvider>,
	) -> io::Result<Self> {
 let runtime = tokio::runtime::Builder::new_multi_thread().enable_all().build()?;
 header_provider: Arc<dyn VssHeaderProvider>, runtime: Arc<Runtime>,
	) -> Self {
 let (data_encryption_key, obfuscation_master_key) =
 derive_data_encryption_and_obfuscation_keys(&vss_seed);
 let key_obfuscator = KeyObfuscator::new(obfuscation_master_key);
Expand All@@ -70,7 +70,7 @@ impl VssStore {
 }) as _);

 let client = VssClient::new_with_headers(base_url, retry_policy, header_provider);
Ok(Self { client, store_id, runtime, storable_builder, key_obfuscator })
 Self { client, store_id, runtime, storable_builder, key_obfuscator }
	}

	fn build_key(
Expand DownExpand Up@@ -136,19 +136,16 @@ impl KVStore for VssStore {
 store_id: self.store_id.clone(),
 key: self.build_key(primary_namespace, secondary_namespace, key)?,
 };

 let resp =
 tokio::task::block_in_place(|| self.runtime.block_on(self.client.get_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 let resp = self.runtime.block_on(self.client.get_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 // unwrap safety: resp.value must be always present for a non-erroneous VSS response, otherwise
 // it is an API-violation which is converted to [`VssError::InternalServerError`] in [`VssClient`]
 let storable = Storable::decode(&resp.value.unwrap().value[..]).map_err(|e| {
Expand DownExpand Up@@ -179,14 +176,13 @@ impl KVStore for VssStore {
 delete_items: vec![],
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.put_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.put_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;

 Ok(())
	}
Expand All@@ -204,30 +200,29 @@ impl KVStore for VssStore {
 }),
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.delete_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.delete_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 check_namespace_key_validity(primary_namespace, secondary_namespace, None, "list")?;

 let keys = tokio::task::block_in_place(|| {
self.runtime.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
})
 .map_err(|e| {
 let msg = format!(
 "Failed to retrieve keys in namespace: {}/{} : {}",
 primary_namespace, secondary_namespace, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 let keys = self
 .runtime
	.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
.map_err(|e| {
let msg = format!(
"Failed to retrieve keys in namespace: {}/{} : {}",
primary_namespace, secondary_namespace, e
);
Error::new(ErrorKind::Other, msg)
})?;

 Ok(keys)
	}
Expand DownExpand Up@@ -266,19 +261,37 @@ mod tests {
	use rand::distributions::Alphanumeric;
	use rand::{thread_rng, Rng, RngCore};
	use std::collections::HashMap;
	use tokio::runtime;
	use vss_client::headers::FixedHeaders;

	#[test]
	fn read_write_remove_list_persist() {
	fn vss_read_write_remove_list_persist() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
	}

	#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
	async fn vss_read_write_remove_list_persist_in_runtime_context() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider).unwrap();
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
 drop(vss_store)
	}
}
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('^' + ".*" + '
Use `crate::runtime::Runtime` for `VssStore` by tnull · Pull Request #623 · lightningdevkit/ldk-node · GitHub
Skip to content
Use crate::runtime::Runtime for VssStore#623

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 1 commit into

from

Aug 21, 2025
 Merged


Use crate::runtime::Runtime for VssStore#623
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


5 changes: 1 addition & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,10 +694,7 @@ impl NodeBuilder {
 let vss_seed_bytes: [u8; 32] = vss_xprv.private_key.secret_bytes();

 let vss_store =
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider).map_err(|e| {
 log_error!(logger, "Failed to setup VssStore: {}", e);
 BuildError::KVStoreSetupFailed
 })?;
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider, Arc::clone(&runtime));
 build_with_store_internal(
 config,
 self.chain_data_source_config.as_ref(),
Expand Down

107 changes: 60 additions & 47 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
// accordance with one or both of these licenses.

use crate::io::utils::check_namespace_key_validity;
use crate::runtime::Runtime;

use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
use lightning::io::{self, Error, ErrorKind};
use lightning::util::persist::KVStore;
Expand All@@ -15,7 +17,6 @@ use rand::RngCore;
use std::panic::RefUnwindSafe;
use std::sync::Arc;
use std::time::Duration;
use tokio::runtime::Runtime;
use vss_client::client::VssClient;
use vss_client::error::VssError;
use vss_client::headers::VssHeaderProvider;
Expand All@@ -41,17 +42,16 @@ type CustomRetryPolicy = FilteredRetryPolicy<
pub struct VssStore {
	client: VssClient<CustomRetryPolicy>,
	store_id: String,
	runtime: Runtime,
	runtime: Arc<Runtime>,
	storable_builder: StorableBuilder<RandEntropySource>,
	key_obfuscator: KeyObfuscator,
}

impl VssStore {
	pub(crate) fn new(
 base_url: String, store_id: String, vss_seed: [u8; 32],
 header_provider: Arc<dyn VssHeaderProvider>,
	) -> io::Result<Self> {
 let runtime = tokio::runtime::Builder::new_multi_thread().enable_all().build()?;
 header_provider: Arc<dyn VssHeaderProvider>, runtime: Arc<Runtime>,
	) -> Self {
 let (data_encryption_key, obfuscation_master_key) =
 derive_data_encryption_and_obfuscation_keys(&vss_seed);
 let key_obfuscator = KeyObfuscator::new(obfuscation_master_key);
Expand All@@ -70,7 +70,7 @@ impl VssStore {
 }) as _);

 let client = VssClient::new_with_headers(base_url, retry_policy, header_provider);
Ok(Self { client, store_id, runtime, storable_builder, key_obfuscator })
 Self { client, store_id, runtime, storable_builder, key_obfuscator }
	}

	fn build_key(
Expand DownExpand Up@@ -136,19 +136,16 @@ impl KVStore for VssStore {
 store_id: self.store_id.clone(),
 key: self.build_key(primary_namespace, secondary_namespace, key)?,
 };

 let resp =
 tokio::task::block_in_place(|| self.runtime.block_on(self.client.get_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 let resp = self.runtime.block_on(self.client.get_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 // unwrap safety: resp.value must be always present for a non-erroneous VSS response, otherwise
 // it is an API-violation which is converted to [`VssError::InternalServerError`] in [`VssClient`]
 let storable = Storable::decode(&resp.value.unwrap().value[..]).map_err(|e| {
Expand DownExpand Up@@ -179,14 +176,13 @@ impl KVStore for VssStore {
 delete_items: vec![],
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.put_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.put_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;

 Ok(())
	}
Expand All@@ -204,30 +200,29 @@ impl KVStore for VssStore {
 }),
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.delete_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.delete_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 check_namespace_key_validity(primary_namespace, secondary_namespace, None, "list")?;

 let keys = tokio::task::block_in_place(|| {
self.runtime.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
})
 .map_err(|e| {
 let msg = format!(
 "Failed to retrieve keys in namespace: {}/{} : {}",
 primary_namespace, secondary_namespace, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 let keys = self
 .runtime
	.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
.map_err(|e| {
let msg = format!(
"Failed to retrieve keys in namespace: {}/{} : {}",
primary_namespace, secondary_namespace, e
);
Error::new(ErrorKind::Other, msg)
})?;

 Ok(keys)
	}
Expand DownExpand Up@@ -266,19 +261,37 @@ mod tests {
	use rand::distributions::Alphanumeric;
	use rand::{thread_rng, Rng, RngCore};
	use std::collections::HashMap;
	use tokio::runtime;
	use vss_client::headers::FixedHeaders;

	#[test]
	fn read_write_remove_list_persist() {
	fn vss_read_write_remove_list_persist() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
	}

	#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
	async fn vss_read_write_remove_list_persist_in_runtime_context() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider).unwrap();
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
 drop(vss_store)
	}
}
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" + '
Use `crate::runtime::Runtime` for `VssStore` by tnull · Pull Request #623 · lightningdevkit/ldk-node · GitHub
Skip to content
Use crate::runtime::Runtime for VssStore#623

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 1 commit into

from

Aug 21, 2025
 Merged


Use crate::runtime::Runtime for VssStore#623
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


5 changes: 1 addition & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,10 +694,7 @@ impl NodeBuilder {
 let vss_seed_bytes: [u8; 32] = vss_xprv.private_key.secret_bytes();

 let vss_store =
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider).map_err(|e| {
 log_error!(logger, "Failed to setup VssStore: {}", e);
 BuildError::KVStoreSetupFailed
 })?;
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider, Arc::clone(&runtime));
 build_with_store_internal(
 config,
 self.chain_data_source_config.as_ref(),
Expand Down

107 changes: 60 additions & 47 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
// accordance with one or both of these licenses.

use crate::io::utils::check_namespace_key_validity;
use crate::runtime::Runtime;

use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
use lightning::io::{self, Error, ErrorKind};
use lightning::util::persist::KVStore;
Expand All@@ -15,7 +17,6 @@ use rand::RngCore;
use std::panic::RefUnwindSafe;
use std::sync::Arc;
use std::time::Duration;
use tokio::runtime::Runtime;
use vss_client::client::VssClient;
use vss_client::error::VssError;
use vss_client::headers::VssHeaderProvider;
Expand All@@ -41,17 +42,16 @@ type CustomRetryPolicy = FilteredRetryPolicy<
pub struct VssStore {
	client: VssClient<CustomRetryPolicy>,
	store_id: String,
	runtime: Runtime,
	runtime: Arc<Runtime>,
	storable_builder: StorableBuilder<RandEntropySource>,
	key_obfuscator: KeyObfuscator,
}

impl VssStore {
	pub(crate) fn new(
 base_url: String, store_id: String, vss_seed: [u8; 32],
 header_provider: Arc<dyn VssHeaderProvider>,
	) -> io::Result<Self> {
 let runtime = tokio::runtime::Builder::new_multi_thread().enable_all().build()?;
 header_provider: Arc<dyn VssHeaderProvider>, runtime: Arc<Runtime>,
	) -> Self {
 let (data_encryption_key, obfuscation_master_key) =
 derive_data_encryption_and_obfuscation_keys(&vss_seed);
 let key_obfuscator = KeyObfuscator::new(obfuscation_master_key);
Expand All@@ -70,7 +70,7 @@ impl VssStore {
 }) as _);

 let client = VssClient::new_with_headers(base_url, retry_policy, header_provider);
Ok(Self { client, store_id, runtime, storable_builder, key_obfuscator })
 Self { client, store_id, runtime, storable_builder, key_obfuscator }
	}

	fn build_key(
Expand DownExpand Up@@ -136,19 +136,16 @@ impl KVStore for VssStore {
 store_id: self.store_id.clone(),
 key: self.build_key(primary_namespace, secondary_namespace, key)?,
 };

 let resp =
 tokio::task::block_in_place(|| self.runtime.block_on(self.client.get_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 let resp = self.runtime.block_on(self.client.get_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 // unwrap safety: resp.value must be always present for a non-erroneous VSS response, otherwise
 // it is an API-violation which is converted to [`VssError::InternalServerError`] in [`VssClient`]
 let storable = Storable::decode(&resp.value.unwrap().value[..]).map_err(|e| {
Expand DownExpand Up@@ -179,14 +176,13 @@ impl KVStore for VssStore {
 delete_items: vec![],
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.put_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.put_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;

 Ok(())
	}
Expand All@@ -204,30 +200,29 @@ impl KVStore for VssStore {
 }),
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.delete_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.delete_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 check_namespace_key_validity(primary_namespace, secondary_namespace, None, "list")?;

 let keys = tokio::task::block_in_place(|| {
self.runtime.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
})
 .map_err(|e| {
 let msg = format!(
 "Failed to retrieve keys in namespace: {}/{} : {}",
 primary_namespace, secondary_namespace, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 let keys = self
 .runtime
	.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
.map_err(|e| {
let msg = format!(
"Failed to retrieve keys in namespace: {}/{} : {}",
primary_namespace, secondary_namespace, e
);
Error::new(ErrorKind::Other, msg)
})?;

 Ok(keys)
	}
Expand DownExpand Up@@ -266,19 +261,37 @@ mod tests {
	use rand::distributions::Alphanumeric;
	use rand::{thread_rng, Rng, RngCore};
	use std::collections::HashMap;
	use tokio::runtime;
	use vss_client::headers::FixedHeaders;

	#[test]
	fn read_write_remove_list_persist() {
	fn vss_read_write_remove_list_persist() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
	}

	#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
	async fn vss_read_write_remove_list_persist_in_runtime_context() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider).unwrap();
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
 drop(vss_store)
	}
}
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('^' + ".*" + '
Use `crate::runtime::Runtime` for `VssStore` by tnull · Pull Request #623 · lightningdevkit/ldk-node · GitHub
Skip to content
Use crate::runtime::Runtime for VssStore#623

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 1 commit into

from

Aug 21, 2025
 Merged


Use crate::runtime::Runtime for VssStore#623
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


5 changes: 1 addition & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,10 +694,7 @@ impl NodeBuilder {
 let vss_seed_bytes: [u8; 32] = vss_xprv.private_key.secret_bytes();

 let vss_store =
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider).map_err(|e| {
 log_error!(logger, "Failed to setup VssStore: {}", e);
 BuildError::KVStoreSetupFailed
 })?;
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider, Arc::clone(&runtime));
 build_with_store_internal(
 config,
 self.chain_data_source_config.as_ref(),
Expand Down

107 changes: 60 additions & 47 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
// accordance with one or both of these licenses.

use crate::io::utils::check_namespace_key_validity;
use crate::runtime::Runtime;

use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
use lightning::io::{self, Error, ErrorKind};
use lightning::util::persist::KVStore;
Expand All@@ -15,7 +17,6 @@ use rand::RngCore;
use std::panic::RefUnwindSafe;
use std::sync::Arc;
use std::time::Duration;
use tokio::runtime::Runtime;
use vss_client::client::VssClient;
use vss_client::error::VssError;
use vss_client::headers::VssHeaderProvider;
Expand All@@ -41,17 +42,16 @@ type CustomRetryPolicy = FilteredRetryPolicy<
pub struct VssStore {
	client: VssClient<CustomRetryPolicy>,
	store_id: String,
	runtime: Runtime,
	runtime: Arc<Runtime>,
	storable_builder: StorableBuilder<RandEntropySource>,
	key_obfuscator: KeyObfuscator,
}

impl VssStore {
	pub(crate) fn new(
 base_url: String, store_id: String, vss_seed: [u8; 32],
 header_provider: Arc<dyn VssHeaderProvider>,
	) -> io::Result<Self> {
 let runtime = tokio::runtime::Builder::new_multi_thread().enable_all().build()?;
 header_provider: Arc<dyn VssHeaderProvider>, runtime: Arc<Runtime>,
	) -> Self {
 let (data_encryption_key, obfuscation_master_key) =
 derive_data_encryption_and_obfuscation_keys(&vss_seed);
 let key_obfuscator = KeyObfuscator::new(obfuscation_master_key);
Expand All@@ -70,7 +70,7 @@ impl VssStore {
 }) as _);

 let client = VssClient::new_with_headers(base_url, retry_policy, header_provider);
Ok(Self { client, store_id, runtime, storable_builder, key_obfuscator })
 Self { client, store_id, runtime, storable_builder, key_obfuscator }
	}

	fn build_key(
Expand DownExpand Up@@ -136,19 +136,16 @@ impl KVStore for VssStore {
 store_id: self.store_id.clone(),
 key: self.build_key(primary_namespace, secondary_namespace, key)?,
 };

 let resp =
 tokio::task::block_in_place(|| self.runtime.block_on(self.client.get_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 let resp = self.runtime.block_on(self.client.get_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 // unwrap safety: resp.value must be always present for a non-erroneous VSS response, otherwise
 // it is an API-violation which is converted to [`VssError::InternalServerError`] in [`VssClient`]
 let storable = Storable::decode(&resp.value.unwrap().value[..]).map_err(|e| {
Expand DownExpand Up@@ -179,14 +176,13 @@ impl KVStore for VssStore {
 delete_items: vec![],
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.put_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.put_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;

 Ok(())
	}
Expand All@@ -204,30 +200,29 @@ impl KVStore for VssStore {
 }),
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.delete_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.delete_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 check_namespace_key_validity(primary_namespace, secondary_namespace, None, "list")?;

 let keys = tokio::task::block_in_place(|| {
self.runtime.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
})
 .map_err(|e| {
 let msg = format!(
 "Failed to retrieve keys in namespace: {}/{} : {}",
 primary_namespace, secondary_namespace, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 let keys = self
 .runtime
	.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
.map_err(|e| {
let msg = format!(
"Failed to retrieve keys in namespace: {}/{} : {}",
primary_namespace, secondary_namespace, e
);
Error::new(ErrorKind::Other, msg)
})?;

 Ok(keys)
	}
Expand DownExpand Up@@ -266,19 +261,37 @@ mod tests {
	use rand::distributions::Alphanumeric;
	use rand::{thread_rng, Rng, RngCore};
	use std::collections::HashMap;
	use tokio::runtime;
	use vss_client::headers::FixedHeaders;

	#[test]
	fn read_write_remove_list_persist() {
	fn vss_read_write_remove_list_persist() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
	}

	#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
	async fn vss_read_write_remove_list_persist_in_runtime_context() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider).unwrap();
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
 drop(vss_store)
	}
}
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('^' + ".*" + '
Use `crate::runtime::Runtime` for `VssStore` by tnull · Pull Request #623 · lightningdevkit/ldk-node · GitHub
Skip to content
Use crate::runtime::Runtime for VssStore#623

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 1 commit into

from

Aug 21, 2025
 Merged


Use crate::runtime::Runtime for VssStore#623
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


5 changes: 1 addition & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,10 +694,7 @@ impl NodeBuilder {
 let vss_seed_bytes: [u8; 32] = vss_xprv.private_key.secret_bytes();

 let vss_store =
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider).map_err(|e| {
 log_error!(logger, "Failed to setup VssStore: {}", e);
 BuildError::KVStoreSetupFailed
 })?;
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider, Arc::clone(&runtime));
 build_with_store_internal(
 config,
 self.chain_data_source_config.as_ref(),
Expand Down

107 changes: 60 additions & 47 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
// accordance with one or both of these licenses.

use crate::io::utils::check_namespace_key_validity;
use crate::runtime::Runtime;

use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
use lightning::io::{self, Error, ErrorKind};
use lightning::util::persist::KVStore;
Expand All@@ -15,7 +17,6 @@ use rand::RngCore;
use std::panic::RefUnwindSafe;
use std::sync::Arc;
use std::time::Duration;
use tokio::runtime::Runtime;
use vss_client::client::VssClient;
use vss_client::error::VssError;
use vss_client::headers::VssHeaderProvider;
Expand All@@ -41,17 +42,16 @@ type CustomRetryPolicy = FilteredRetryPolicy<
pub struct VssStore {
	client: VssClient<CustomRetryPolicy>,
	store_id: String,
	runtime: Runtime,
	runtime: Arc<Runtime>,
	storable_builder: StorableBuilder<RandEntropySource>,
	key_obfuscator: KeyObfuscator,
}

impl VssStore {
	pub(crate) fn new(
 base_url: String, store_id: String, vss_seed: [u8; 32],
 header_provider: Arc<dyn VssHeaderProvider>,
	) -> io::Result<Self> {
 let runtime = tokio::runtime::Builder::new_multi_thread().enable_all().build()?;
 header_provider: Arc<dyn VssHeaderProvider>, runtime: Arc<Runtime>,
	) -> Self {
 let (data_encryption_key, obfuscation_master_key) =
 derive_data_encryption_and_obfuscation_keys(&vss_seed);
 let key_obfuscator = KeyObfuscator::new(obfuscation_master_key);
Expand All@@ -70,7 +70,7 @@ impl VssStore {
 }) as _);

 let client = VssClient::new_with_headers(base_url, retry_policy, header_provider);
Ok(Self { client, store_id, runtime, storable_builder, key_obfuscator })
 Self { client, store_id, runtime, storable_builder, key_obfuscator }
	}

	fn build_key(
Expand DownExpand Up@@ -136,19 +136,16 @@ impl KVStore for VssStore {
 store_id: self.store_id.clone(),
 key: self.build_key(primary_namespace, secondary_namespace, key)?,
 };

 let resp =
 tokio::task::block_in_place(|| self.runtime.block_on(self.client.get_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 let resp = self.runtime.block_on(self.client.get_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 // unwrap safety: resp.value must be always present for a non-erroneous VSS response, otherwise
 // it is an API-violation which is converted to [`VssError::InternalServerError`] in [`VssClient`]
 let storable = Storable::decode(&resp.value.unwrap().value[..]).map_err(|e| {
Expand DownExpand Up@@ -179,14 +176,13 @@ impl KVStore for VssStore {
 delete_items: vec![],
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.put_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.put_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;

 Ok(())
	}
Expand All@@ -204,30 +200,29 @@ impl KVStore for VssStore {
 }),
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.delete_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.delete_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 check_namespace_key_validity(primary_namespace, secondary_namespace, None, "list")?;

 let keys = tokio::task::block_in_place(|| {
self.runtime.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
})
 .map_err(|e| {
 let msg = format!(
 "Failed to retrieve keys in namespace: {}/{} : {}",
 primary_namespace, secondary_namespace, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 let keys = self
 .runtime
	.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
.map_err(|e| {
let msg = format!(
"Failed to retrieve keys in namespace: {}/{} : {}",
primary_namespace, secondary_namespace, e
);
Error::new(ErrorKind::Other, msg)
})?;

 Ok(keys)
	}
Expand DownExpand Up@@ -266,19 +261,37 @@ mod tests {
	use rand::distributions::Alphanumeric;
	use rand::{thread_rng, Rng, RngCore};
	use std::collections::HashMap;
	use tokio::runtime;
	use vss_client::headers::FixedHeaders;

	#[test]
	fn read_write_remove_list_persist() {
	fn vss_read_write_remove_list_persist() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
	}

	#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
	async fn vss_read_write_remove_list_persist_in_runtime_context() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider).unwrap();
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
 drop(vss_store)
	}
}
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); }
})();
})();
Use `crate::runtime::Runtime` for `VssStore` by tnull · Pull Request #623 · lightningdevkit/ldk-node · GitHub
Skip to content
Use crate::runtime::Runtime for VssStore#623

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 1 commit into

from

Aug 21, 2025
 Merged


Use crate::runtime::Runtime for VssStore#623
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


5 changes: 1 addition & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -694,10 +694,7 @@ impl NodeBuilder {
 let vss_seed_bytes: [u8; 32] = vss_xprv.private_key.secret_bytes();

 let vss_store =
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider).map_err(|e| {
 log_error!(logger, "Failed to setup VssStore: {}", e);
 BuildError::KVStoreSetupFailed
 })?;
 VssStore::new(vss_url, store_id, vss_seed_bytes, header_provider, Arc::clone(&runtime));
 build_with_store_internal(
 config,
 self.chain_data_source_config.as_ref(),
Expand Down

107 changes: 60 additions & 47 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@
// accordance with one or both of these licenses.

use crate::io::utils::check_namespace_key_validity;
use crate::runtime::Runtime;

use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
use lightning::io::{self, Error, ErrorKind};
use lightning::util::persist::KVStore;
Expand All@@ -15,7 +17,6 @@ use rand::RngCore;
use std::panic::RefUnwindSafe;
use std::sync::Arc;
use std::time::Duration;
use tokio::runtime::Runtime;
use vss_client::client::VssClient;
use vss_client::error::VssError;
use vss_client::headers::VssHeaderProvider;
Expand All@@ -41,17 +42,16 @@ type CustomRetryPolicy = FilteredRetryPolicy<
pub struct VssStore {
	client: VssClient<CustomRetryPolicy>,
	store_id: String,
	runtime: Runtime,
	runtime: Arc<Runtime>,
	storable_builder: StorableBuilder<RandEntropySource>,
	key_obfuscator: KeyObfuscator,
}

impl VssStore {
	pub(crate) fn new(
 base_url: String, store_id: String, vss_seed: [u8; 32],
 header_provider: Arc<dyn VssHeaderProvider>,
	) -> io::Result<Self> {
 let runtime = tokio::runtime::Builder::new_multi_thread().enable_all().build()?;
 header_provider: Arc<dyn VssHeaderProvider>, runtime: Arc<Runtime>,
	) -> Self {
 let (data_encryption_key, obfuscation_master_key) =
 derive_data_encryption_and_obfuscation_keys(&vss_seed);
 let key_obfuscator = KeyObfuscator::new(obfuscation_master_key);
Expand All@@ -70,7 +70,7 @@ impl VssStore {
 }) as _);

 let client = VssClient::new_with_headers(base_url, retry_policy, header_provider);
Ok(Self { client, store_id, runtime, storable_builder, key_obfuscator })
 Self { client, store_id, runtime, storable_builder, key_obfuscator }
	}

	fn build_key(
Expand DownExpand Up@@ -136,19 +136,16 @@ impl KVStore for VssStore {
 store_id: self.store_id.clone(),
 key: self.build_key(primary_namespace, secondary_namespace, key)?,
 };

 let resp =
 tokio::task::block_in_place(|| self.runtime.block_on(self.client.get_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 let resp = self.runtime.block_on(self.client.get_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to read from key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 match e {
 VssError::NoSuchKeyError(..) => Error::new(ErrorKind::NotFound, msg),
 _ => Error::new(ErrorKind::Other, msg),
 }
 })?;
 // unwrap safety: resp.value must be always present for a non-erroneous VSS response, otherwise
 // it is an API-violation which is converted to [`VssError::InternalServerError`] in [`VssClient`]
 let storable = Storable::decode(&resp.value.unwrap().value[..]).map_err(|e| {
Expand DownExpand Up@@ -179,14 +176,13 @@ impl KVStore for VssStore {
 delete_items: vec![],
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.put_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.put_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to write to key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;

 Ok(())
	}
Expand All@@ -204,30 +200,29 @@ impl KVStore for VssStore {
 }),
 };

 tokio::task::block_in_place(|| self.runtime.block_on(self.client.delete_object(&request)))
 .map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 self.runtime.block_on(self.client.delete_object(&request)).map_err(|e| {
 let msg = format!(
 "Failed to delete key {}/{}/{}: {}",
 primary_namespace, secondary_namespace, key, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 check_namespace_key_validity(primary_namespace, secondary_namespace, None, "list")?;

 let keys = tokio::task::block_in_place(|| {
self.runtime.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
})
 .map_err(|e| {
 let msg = format!(
 "Failed to retrieve keys in namespace: {}/{} : {}",
 primary_namespace, secondary_namespace, e
 );
 Error::new(ErrorKind::Other, msg)
 })?;
 let keys = self
 .runtime
	.block_on(self.list_all_keys(primary_namespace, secondary_namespace))
.map_err(|e| {
let msg = format!(
"Failed to retrieve keys in namespace: {}/{} : {}",
primary_namespace, secondary_namespace, e
);
Error::new(ErrorKind::Other, msg)
})?;

 Ok(keys)
	}
Expand DownExpand Up@@ -266,19 +261,37 @@ mod tests {
	use rand::distributions::Alphanumeric;
	use rand::{thread_rng, Rng, RngCore};
	use std::collections::HashMap;
	use tokio::runtime;
	use vss_client::headers::FixedHeaders;

	#[test]
	fn read_write_remove_list_persist() {
	fn vss_read_write_remove_list_persist() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
	}

	#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
	async fn vss_read_write_remove_list_persist_in_runtime_context() {
 let runtime = Arc::new(Runtime::new().unwrap());
 let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
 let mut rng = thread_rng();
 let rand_store_id: String = (0..7).map(|_| rng.sample(Alphanumeric) as char).collect();
 let mut vss_seed = [0u8; 32];
 rng.fill_bytes(&mut vss_seed);
 let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
 let vss_store =
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider).unwrap();
 VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider, runtime).unwrap();

 do_read_write_remove_list_persist(&vss_store);
 drop(vss_store)
	}
}
Loading