Skip to content

Derive shutdown scripts without blocking on wallet persistence#1011

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 11, 2026
Merged

Derive shutdown scripts without blocking on wallet persistence #1011

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
25 changes: 21 additions & 4 deletions src/builder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ use crate::types::{
GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
PeerManager, PendingPaymentStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::persist::{read_address_pool, KVStoreWalletPersister};
use crate::wallet::Wallet;
use crate::{Node, NodeMetrics, PersistedNodeMetrics};

Expand DownExpand Up@@ -1439,8 +1439,8 @@ fn build_with_store_internal(

let kv_store_ref = Arc::clone(&kv_store);
let logger_ref = Arc::clone(&logger);
let (payment_store_res, node_metris_res, pending_payment_store_res) =
runtime.block_on(async move {
let (payment_store_res, node_metris_res, pending_payment_store_res, address_pool_res) = runtime
.block_on(async move {
tokio::join!(
read_all_objects(
&*kv_store_ref,
Expand All@@ -1454,7 +1454,8 @@ fn build_with_store_internal(
PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
Arc::clone(&logger_ref),
)
),
read_address_pool(&*kv_store_ref, &*logger_ref)
)
});

Expand DownExpand Up@@ -1741,9 +1742,18 @@ fn build_with_store_internal(
},
};

let persisted_pool_indices = match address_pool_res {
Ok(indices) => indices,
Err(e) => {
log_error!(logger, "Failed to read address pool data from store: {}", e);
return Err(BuildError::ReadFailed);
},
};

let wallet = Arc::new(Wallet::new(
bdk_wallet,
wallet_persister,
persisted_pool_indices,
Arc::clone(&tx_broadcaster),
Arc::clone(&fee_estimator),
Arc::clone(&chain_source),
Expand All@@ -1754,6 +1764,13 @@ fn build_with_store_internal(
Arc::clone(&pending_payment_store),
));

// Fill the address pool up front so LDK's sync `SignerProvider` callbacks can hand out
// pre-persisted addresses without waiting on wallet persistence.
runtime.block_on(wallet.refill_address_pool()).map_err(|e| {
log_error!(logger, "Failed to fill the wallet's address pool: {}", e);
BuildError::WalletSetupFailed
})?;

tx_broadcaster.set_wallet(Arc::downgrade(&wallet));

// Initialize the KeysManager
Expand Down
16 changes: 16 additions & 0 deletions src/config.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,22 @@ pub const MIN_FULL_SCAN_STOP_GAP: u32 = 1;
/// Values above 1000 are clamped to 1000 when a full scan runs.
pub const MAX_FULL_SCAN_STOP_GAP: u32 = 1000;

/// The number of addresses the node keeps revealed and persisted ahead of use, from which it
/// serves fresh-address requests and channel destination and shutdown scripts.
///
/// Pooled addresses are revealed-but-unused wallet scripts. Addresses are handed out oldest
/// first, which keeps the pool beyond the handed-out addresses, where it cannot hide funds
/// from a full scan's stop gap (e.g. [`EsploraSyncConfig::full_scan_stop_gap`]). A handout
/// that fails while a concurrent one proceeds can briefly leave a pooled address below a
/// handed-out one; such inversions are bounded by the pool size and consumed by the next
/// handouts.
///
/// After a restore from seed, the pool refills from the keychain's first indices before the
/// initial full scan runs, so it can serve addresses a previous installation of the wallet
/// already handed out — possibly even used ones. The cost is address reuse, not fund
/// visibility: the reveals keep the scripts watched and the scan discovers any prior use.
pub const ADDRESS_POOL_SIZE: u32 = 16;

// The number of concurrent requests made against the API provider.
pub(crate) const BDK_CLIENT_CONCURRENCY: usize = 4;

Expand Down
5 changes: 5 additions & 0 deletions src/io/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ pub(crate) const BDK_WALLET_INDEXER_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_INDEXER_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_INDEXER_KEY: &str = "indexer";

/// The derivation indices of the wallet's address pool will be persisted under this key.
pub(crate) const BDK_WALLET_ADDRESS_POOL_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_ADDRESS_POOL_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_ADDRESS_POOL_KEY: &str = "address_pool";

/// [`StaticInvoice`]s will be persisted under this key.
///
/// [`StaticInvoice`]: lightning::offers::static_invoice::StaticInvoice
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Derive shutdown scripts without blocking on wallet persistence by jkczyz · Pull Request #1011 · lightningdevkit/ldk-node · GitHub
Skip to content
Derive shutdown scripts without blocking on wallet persistence#1011

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 11, 2026
 Merged


Derive shutdown scripts without blocking on wallet persistence
#1011
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


25 changes: 21 additions & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ use crate::types::{
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::persist::{read_address_pool, KVStoreWalletPersister};
use crate::wallet::Wallet;
use crate::{Node, NodeMetrics, PersistedNodeMetrics};

Expand DownExpand Up@@ -1439,8 +1439,8 @@ fn build_with_store_internal(

	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (payment_store_res, node_metris_res, pending_payment_store_res) =
runtime.block_on(async move {
	let (payment_store_res, node_metris_res, pending_payment_store_res, address_pool_res) = runtime
 .block_on(async move {
 tokio::join!(
 read_all_objects(
 &*kv_store_ref,
Expand All@@ -1454,7 +1454,8 @@ fn build_with_store_internal(
 PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
 PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
 Arc::clone(&logger_ref),
 )
 ),
 read_address_pool(&*kv_store_ref, &*logger_ref)
 )
 });

Expand DownExpand Up@@ -1741,9 +1742,18 @@ fn build_with_store_internal(
 },
	};

	let persisted_pool_indices = match address_pool_res {
 Ok(indices) => indices,
 Err(e) => {
 log_error!(logger, "Failed to read address pool data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};

	let wallet = Arc::new(Wallet::new(
 bdk_wallet,
 wallet_persister,
 persisted_pool_indices,
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
 Arc::clone(&chain_source),
Expand All@@ -1754,6 +1764,13 @@ fn build_with_store_internal(
 Arc::clone(&pending_payment_store),
	));

	// Fill the address pool up front so LDK's sync `SignerProvider` callbacks can hand out
	// pre-persisted addresses without waiting on wallet persistence.
	runtime.block_on(wallet.refill_address_pool()).map_err(|e| {
 log_error!(logger, "Failed to fill the wallet's address pool: {}", e);
 BuildError::WalletSetupFailed
	})?;

	tx_broadcaster.set_wallet(Arc::downgrade(&wallet));

	// Initialize the KeysManager
Expand Down

16 changes: 16 additions & 0 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,22 @@ pub const MIN_FULL_SCAN_STOP_GAP: u32 = 1;
/// Values above 1000 are clamped to 1000 when a full scan runs.
pub const MAX_FULL_SCAN_STOP_GAP: u32 = 1000;

/// The number of addresses the node keeps revealed and persisted ahead of use, from which it
/// serves fresh-address requests and channel destination and shutdown scripts.
///
/// Pooled addresses are revealed-but-unused wallet scripts. Addresses are handed out oldest
/// first, which keeps the pool beyond the handed-out addresses, where it cannot hide funds
/// from a full scan's stop gap (e.g. [`EsploraSyncConfig::full_scan_stop_gap`]). A handout
/// that fails while a concurrent one proceeds can briefly leave a pooled address below a
/// handed-out one; such inversions are bounded by the pool size and consumed by the next
/// handouts.
///
/// After a restore from seed, the pool refills from the keychain's first indices before the
/// initial full scan runs, so it can serve addresses a previous installation of the wallet
/// already handed out — possibly even used ones. The cost is address reuse, not fund
/// visibility: the reveals keep the scripts watched and the scan discovers any prior use.
pub const ADDRESS_POOL_SIZE: u32 = 16;

// The number of concurrent requests made against the API provider.
pub(crate) const BDK_CLIENT_CONCURRENCY: usize = 4;

Expand Down

5 changes: 5 additions & 0 deletions
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ pub(crate) const BDK_WALLET_INDEXER_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_INDEXER_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_INDEXER_KEY: &str = "indexer";

/// The derivation indices of the wallet's address pool will be persisted under this key.
pub(crate) const BDK_WALLET_ADDRESS_POOL_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_ADDRESS_POOL_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_ADDRESS_POOL_KEY: &str = "address_pool";

/// [`StaticInvoice`]s will be persisted under this key.
///
/// [`StaticInvoice`]: lightning::offers::static_invoice::StaticInvoice
Expand Down
Loading
Loading

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

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 11, 2026
 Merged


Derive shutdown scripts without blocking on wallet persistence
#1011
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


25 changes: 21 additions & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ use crate::types::{
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::persist::{read_address_pool, KVStoreWalletPersister};
use crate::wallet::Wallet;
use crate::{Node, NodeMetrics, PersistedNodeMetrics};

Expand DownExpand Up@@ -1439,8 +1439,8 @@ fn build_with_store_internal(

	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (payment_store_res, node_metris_res, pending_payment_store_res) =
runtime.block_on(async move {
	let (payment_store_res, node_metris_res, pending_payment_store_res, address_pool_res) = runtime
 .block_on(async move {
 tokio::join!(
 read_all_objects(
 &*kv_store_ref,
Expand All@@ -1454,7 +1454,8 @@ fn build_with_store_internal(
 PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
 PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
 Arc::clone(&logger_ref),
 )
 ),
 read_address_pool(&*kv_store_ref, &*logger_ref)
 )
 });

Expand DownExpand Up@@ -1741,9 +1742,18 @@ fn build_with_store_internal(
 },
	};

	let persisted_pool_indices = match address_pool_res {
 Ok(indices) => indices,
 Err(e) => {
 log_error!(logger, "Failed to read address pool data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};

	let wallet = Arc::new(Wallet::new(
 bdk_wallet,
 wallet_persister,
 persisted_pool_indices,
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
 Arc::clone(&chain_source),
Expand All@@ -1754,6 +1764,13 @@ fn build_with_store_internal(
 Arc::clone(&pending_payment_store),
	));

	// Fill the address pool up front so LDK's sync `SignerProvider` callbacks can hand out
	// pre-persisted addresses without waiting on wallet persistence.
	runtime.block_on(wallet.refill_address_pool()).map_err(|e| {
 log_error!(logger, "Failed to fill the wallet's address pool: {}", e);
 BuildError::WalletSetupFailed
	})?;

	tx_broadcaster.set_wallet(Arc::downgrade(&wallet));

	// Initialize the KeysManager
Expand Down

16 changes: 16 additions & 0 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,22 @@ pub const MIN_FULL_SCAN_STOP_GAP: u32 = 1;
/// Values above 1000 are clamped to 1000 when a full scan runs.
pub const MAX_FULL_SCAN_STOP_GAP: u32 = 1000;

/// The number of addresses the node keeps revealed and persisted ahead of use, from which it
/// serves fresh-address requests and channel destination and shutdown scripts.
///
/// Pooled addresses are revealed-but-unused wallet scripts. Addresses are handed out oldest
/// first, which keeps the pool beyond the handed-out addresses, where it cannot hide funds
/// from a full scan's stop gap (e.g. [`EsploraSyncConfig::full_scan_stop_gap`]). A handout
/// that fails while a concurrent one proceeds can briefly leave a pooled address below a
/// handed-out one; such inversions are bounded by the pool size and consumed by the next
/// handouts.
///
/// After a restore from seed, the pool refills from the keychain's first indices before the
/// initial full scan runs, so it can serve addresses a previous installation of the wallet
/// already handed out — possibly even used ones. The cost is address reuse, not fund
/// visibility: the reveals keep the scripts watched and the scan discovers any prior use.
pub const ADDRESS_POOL_SIZE: u32 = 16;

// The number of concurrent requests made against the API provider.
pub(crate) const BDK_CLIENT_CONCURRENCY: usize = 4;

Expand Down

5 changes: 5 additions & 0 deletions
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ pub(crate) const BDK_WALLET_INDEXER_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_INDEXER_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_INDEXER_KEY: &str = "indexer";

/// The derivation indices of the wallet's address pool will be persisted under this key.
pub(crate) const BDK_WALLET_ADDRESS_POOL_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_ADDRESS_POOL_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_ADDRESS_POOL_KEY: &str = "address_pool";

/// [`StaticInvoice`]s will be persisted under this key.
///
/// [`StaticInvoice`]: lightning::offers::static_invoice::StaticInvoice
Expand Down
Loading
Loading

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

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 11, 2026
 Merged


Derive shutdown scripts without blocking on wallet persistence
#1011
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


25 changes: 21 additions & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ use crate::types::{
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::persist::{read_address_pool, KVStoreWalletPersister};
use crate::wallet::Wallet;
use crate::{Node, NodeMetrics, PersistedNodeMetrics};

Expand DownExpand Up@@ -1439,8 +1439,8 @@ fn build_with_store_internal(

	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (payment_store_res, node_metris_res, pending_payment_store_res) =
runtime.block_on(async move {
	let (payment_store_res, node_metris_res, pending_payment_store_res, address_pool_res) = runtime
 .block_on(async move {
 tokio::join!(
 read_all_objects(
 &*kv_store_ref,
Expand All@@ -1454,7 +1454,8 @@ fn build_with_store_internal(
 PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
 PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
 Arc::clone(&logger_ref),
 )
 ),
 read_address_pool(&*kv_store_ref, &*logger_ref)
 )
 });

Expand DownExpand Up@@ -1741,9 +1742,18 @@ fn build_with_store_internal(
 },
	};

	let persisted_pool_indices = match address_pool_res {
 Ok(indices) => indices,
 Err(e) => {
 log_error!(logger, "Failed to read address pool data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};

	let wallet = Arc::new(Wallet::new(
 bdk_wallet,
 wallet_persister,
 persisted_pool_indices,
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
 Arc::clone(&chain_source),
Expand All@@ -1754,6 +1764,13 @@ fn build_with_store_internal(
 Arc::clone(&pending_payment_store),
	));

	// Fill the address pool up front so LDK's sync `SignerProvider` callbacks can hand out
	// pre-persisted addresses without waiting on wallet persistence.
	runtime.block_on(wallet.refill_address_pool()).map_err(|e| {
 log_error!(logger, "Failed to fill the wallet's address pool: {}", e);
 BuildError::WalletSetupFailed
	})?;

	tx_broadcaster.set_wallet(Arc::downgrade(&wallet));

	// Initialize the KeysManager
Expand Down

16 changes: 16 additions & 0 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,22 @@ pub const MIN_FULL_SCAN_STOP_GAP: u32 = 1;
/// Values above 1000 are clamped to 1000 when a full scan runs.
pub const MAX_FULL_SCAN_STOP_GAP: u32 = 1000;

/// The number of addresses the node keeps revealed and persisted ahead of use, from which it
/// serves fresh-address requests and channel destination and shutdown scripts.
///
/// Pooled addresses are revealed-but-unused wallet scripts. Addresses are handed out oldest
/// first, which keeps the pool beyond the handed-out addresses, where it cannot hide funds
/// from a full scan's stop gap (e.g. [`EsploraSyncConfig::full_scan_stop_gap`]). A handout
/// that fails while a concurrent one proceeds can briefly leave a pooled address below a
/// handed-out one; such inversions are bounded by the pool size and consumed by the next
/// handouts.
///
/// After a restore from seed, the pool refills from the keychain's first indices before the
/// initial full scan runs, so it can serve addresses a previous installation of the wallet
/// already handed out — possibly even used ones. The cost is address reuse, not fund
/// visibility: the reveals keep the scripts watched and the scan discovers any prior use.
pub const ADDRESS_POOL_SIZE: u32 = 16;

// The number of concurrent requests made against the API provider.
pub(crate) const BDK_CLIENT_CONCURRENCY: usize = 4;

Expand Down

5 changes: 5 additions & 0 deletions
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ pub(crate) const BDK_WALLET_INDEXER_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_INDEXER_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_INDEXER_KEY: &str = "indexer";

/// The derivation indices of the wallet's address pool will be persisted under this key.
pub(crate) const BDK_WALLET_ADDRESS_POOL_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_ADDRESS_POOL_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_ADDRESS_POOL_KEY: &str = "address_pool";

/// [`StaticInvoice`]s will be persisted under this key.
///
/// [`StaticInvoice`]: lightning::offers::static_invoice::StaticInvoice
Expand Down
Loading
Loading

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

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 11, 2026
 Merged


Derive shutdown scripts without blocking on wallet persistence
#1011
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


25 changes: 21 additions & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ use crate::types::{
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::persist::{read_address_pool, KVStoreWalletPersister};
use crate::wallet::Wallet;
use crate::{Node, NodeMetrics, PersistedNodeMetrics};

Expand DownExpand Up@@ -1439,8 +1439,8 @@ fn build_with_store_internal(

	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (payment_store_res, node_metris_res, pending_payment_store_res) =
runtime.block_on(async move {
	let (payment_store_res, node_metris_res, pending_payment_store_res, address_pool_res) = runtime
 .block_on(async move {
 tokio::join!(
 read_all_objects(
 &*kv_store_ref,
Expand All@@ -1454,7 +1454,8 @@ fn build_with_store_internal(
 PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
 PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
 Arc::clone(&logger_ref),
 )
 ),
 read_address_pool(&*kv_store_ref, &*logger_ref)
 )
 });

Expand DownExpand Up@@ -1741,9 +1742,18 @@ fn build_with_store_internal(
 },
	};

	let persisted_pool_indices = match address_pool_res {
 Ok(indices) => indices,
 Err(e) => {
 log_error!(logger, "Failed to read address pool data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};

	let wallet = Arc::new(Wallet::new(
 bdk_wallet,
 wallet_persister,
 persisted_pool_indices,
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
 Arc::clone(&chain_source),
Expand All@@ -1754,6 +1764,13 @@ fn build_with_store_internal(
 Arc::clone(&pending_payment_store),
	));

	// Fill the address pool up front so LDK's sync `SignerProvider` callbacks can hand out
	// pre-persisted addresses without waiting on wallet persistence.
	runtime.block_on(wallet.refill_address_pool()).map_err(|e| {
 log_error!(logger, "Failed to fill the wallet's address pool: {}", e);
 BuildError::WalletSetupFailed
	})?;

	tx_broadcaster.set_wallet(Arc::downgrade(&wallet));

	// Initialize the KeysManager
Expand Down

16 changes: 16 additions & 0 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,22 @@ pub const MIN_FULL_SCAN_STOP_GAP: u32 = 1;
/// Values above 1000 are clamped to 1000 when a full scan runs.
pub const MAX_FULL_SCAN_STOP_GAP: u32 = 1000;

/// The number of addresses the node keeps revealed and persisted ahead of use, from which it
/// serves fresh-address requests and channel destination and shutdown scripts.
///
/// Pooled addresses are revealed-but-unused wallet scripts. Addresses are handed out oldest
/// first, which keeps the pool beyond the handed-out addresses, where it cannot hide funds
/// from a full scan's stop gap (e.g. [`EsploraSyncConfig::full_scan_stop_gap`]). A handout
/// that fails while a concurrent one proceeds can briefly leave a pooled address below a
/// handed-out one; such inversions are bounded by the pool size and consumed by the next
/// handouts.
///
/// After a restore from seed, the pool refills from the keychain's first indices before the
/// initial full scan runs, so it can serve addresses a previous installation of the wallet
/// already handed out — possibly even used ones. The cost is address reuse, not fund
/// visibility: the reveals keep the scripts watched and the scan discovers any prior use.
pub const ADDRESS_POOL_SIZE: u32 = 16;

// The number of concurrent requests made against the API provider.
pub(crate) const BDK_CLIENT_CONCURRENCY: usize = 4;

Expand Down

5 changes: 5 additions & 0 deletions
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ pub(crate) const BDK_WALLET_INDEXER_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_INDEXER_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_INDEXER_KEY: &str = "indexer";

/// The derivation indices of the wallet's address pool will be persisted under this key.
pub(crate) const BDK_WALLET_ADDRESS_POOL_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_ADDRESS_POOL_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_ADDRESS_POOL_KEY: &str = "address_pool";

/// [`StaticInvoice`]s will be persisted under this key.
///
/// [`StaticInvoice`]: lightning::offers::static_invoice::StaticInvoice
Expand Down
Loading
Loading

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

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 11, 2026
 Merged


Derive shutdown scripts without blocking on wallet persistence
#1011
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


25 changes: 21 additions & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ use crate::types::{
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::persist::{read_address_pool, KVStoreWalletPersister};
use crate::wallet::Wallet;
use crate::{Node, NodeMetrics, PersistedNodeMetrics};

Expand DownExpand Up@@ -1439,8 +1439,8 @@ fn build_with_store_internal(

	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (payment_store_res, node_metris_res, pending_payment_store_res) =
runtime.block_on(async move {
	let (payment_store_res, node_metris_res, pending_payment_store_res, address_pool_res) = runtime
 .block_on(async move {
 tokio::join!(
 read_all_objects(
 &*kv_store_ref,
Expand All@@ -1454,7 +1454,8 @@ fn build_with_store_internal(
 PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
 PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
 Arc::clone(&logger_ref),
 )
 ),
 read_address_pool(&*kv_store_ref, &*logger_ref)
 )
 });

Expand DownExpand Up@@ -1741,9 +1742,18 @@ fn build_with_store_internal(
 },
	};

	let persisted_pool_indices = match address_pool_res {
 Ok(indices) => indices,
 Err(e) => {
 log_error!(logger, "Failed to read address pool data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};

	let wallet = Arc::new(Wallet::new(
 bdk_wallet,
 wallet_persister,
 persisted_pool_indices,
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
 Arc::clone(&chain_source),
Expand All@@ -1754,6 +1764,13 @@ fn build_with_store_internal(
 Arc::clone(&pending_payment_store),
	));

	// Fill the address pool up front so LDK's sync `SignerProvider` callbacks can hand out
	// pre-persisted addresses without waiting on wallet persistence.
	runtime.block_on(wallet.refill_address_pool()).map_err(|e| {
 log_error!(logger, "Failed to fill the wallet's address pool: {}", e);
 BuildError::WalletSetupFailed
	})?;

	tx_broadcaster.set_wallet(Arc::downgrade(&wallet));

	// Initialize the KeysManager
Expand Down

16 changes: 16 additions & 0 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,22 @@ pub const MIN_FULL_SCAN_STOP_GAP: u32 = 1;
/// Values above 1000 are clamped to 1000 when a full scan runs.
pub const MAX_FULL_SCAN_STOP_GAP: u32 = 1000;

/// The number of addresses the node keeps revealed and persisted ahead of use, from which it
/// serves fresh-address requests and channel destination and shutdown scripts.
///
/// Pooled addresses are revealed-but-unused wallet scripts. Addresses are handed out oldest
/// first, which keeps the pool beyond the handed-out addresses, where it cannot hide funds
/// from a full scan's stop gap (e.g. [`EsploraSyncConfig::full_scan_stop_gap`]). A handout
/// that fails while a concurrent one proceeds can briefly leave a pooled address below a
/// handed-out one; such inversions are bounded by the pool size and consumed by the next
/// handouts.
///
/// After a restore from seed, the pool refills from the keychain's first indices before the
/// initial full scan runs, so it can serve addresses a previous installation of the wallet
/// already handed out — possibly even used ones. The cost is address reuse, not fund
/// visibility: the reveals keep the scripts watched and the scan discovers any prior use.
pub const ADDRESS_POOL_SIZE: u32 = 16;

// The number of concurrent requests made against the API provider.
pub(crate) const BDK_CLIENT_CONCURRENCY: usize = 4;

Expand Down

5 changes: 5 additions & 0 deletions
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ pub(crate) const BDK_WALLET_INDEXER_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_INDEXER_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_INDEXER_KEY: &str = "indexer";

/// The derivation indices of the wallet's address pool will be persisted under this key.
pub(crate) const BDK_WALLET_ADDRESS_POOL_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_ADDRESS_POOL_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_ADDRESS_POOL_KEY: &str = "address_pool";

/// [`StaticInvoice`]s will be persisted under this key.
///
/// [`StaticInvoice`]: lightning::offers::static_invoice::StaticInvoice
Expand Down
Loading
Loading

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

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 11, 2026
 Merged


Derive shutdown scripts without blocking on wallet persistence
#1011
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


25 changes: 21 additions & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ use crate::types::{
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::persist::{read_address_pool, KVStoreWalletPersister};
use crate::wallet::Wallet;
use crate::{Node, NodeMetrics, PersistedNodeMetrics};

Expand DownExpand Up@@ -1439,8 +1439,8 @@ fn build_with_store_internal(

	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (payment_store_res, node_metris_res, pending_payment_store_res) =
runtime.block_on(async move {
	let (payment_store_res, node_metris_res, pending_payment_store_res, address_pool_res) = runtime
 .block_on(async move {
 tokio::join!(
 read_all_objects(
 &*kv_store_ref,
Expand All@@ -1454,7 +1454,8 @@ fn build_with_store_internal(
 PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
 PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
 Arc::clone(&logger_ref),
 )
 ),
 read_address_pool(&*kv_store_ref, &*logger_ref)
 )
 });

Expand DownExpand Up@@ -1741,9 +1742,18 @@ fn build_with_store_internal(
 },
	};

	let persisted_pool_indices = match address_pool_res {
 Ok(indices) => indices,
 Err(e) => {
 log_error!(logger, "Failed to read address pool data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};

	let wallet = Arc::new(Wallet::new(
 bdk_wallet,
 wallet_persister,
 persisted_pool_indices,
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
 Arc::clone(&chain_source),
Expand All@@ -1754,6 +1764,13 @@ fn build_with_store_internal(
 Arc::clone(&pending_payment_store),
	));

	// Fill the address pool up front so LDK's sync `SignerProvider` callbacks can hand out
	// pre-persisted addresses without waiting on wallet persistence.
	runtime.block_on(wallet.refill_address_pool()).map_err(|e| {
 log_error!(logger, "Failed to fill the wallet's address pool: {}", e);
 BuildError::WalletSetupFailed
	})?;

	tx_broadcaster.set_wallet(Arc::downgrade(&wallet));

	// Initialize the KeysManager
Expand Down

16 changes: 16 additions & 0 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,22 @@ pub const MIN_FULL_SCAN_STOP_GAP: u32 = 1;
/// Values above 1000 are clamped to 1000 when a full scan runs.
pub const MAX_FULL_SCAN_STOP_GAP: u32 = 1000;

/// The number of addresses the node keeps revealed and persisted ahead of use, from which it
/// serves fresh-address requests and channel destination and shutdown scripts.
///
/// Pooled addresses are revealed-but-unused wallet scripts. Addresses are handed out oldest
/// first, which keeps the pool beyond the handed-out addresses, where it cannot hide funds
/// from a full scan's stop gap (e.g. [`EsploraSyncConfig::full_scan_stop_gap`]). A handout
/// that fails while a concurrent one proceeds can briefly leave a pooled address below a
/// handed-out one; such inversions are bounded by the pool size and consumed by the next
/// handouts.
///
/// After a restore from seed, the pool refills from the keychain's first indices before the
/// initial full scan runs, so it can serve addresses a previous installation of the wallet
/// already handed out — possibly even used ones. The cost is address reuse, not fund
/// visibility: the reveals keep the scripts watched and the scan discovers any prior use.
pub const ADDRESS_POOL_SIZE: u32 = 16;

// The number of concurrent requests made against the API provider.
pub(crate) const BDK_CLIENT_CONCURRENCY: usize = 4;

Expand Down

5 changes: 5 additions & 0 deletions
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ pub(crate) const BDK_WALLET_INDEXER_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_INDEXER_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_INDEXER_KEY: &str = "indexer";

/// The derivation indices of the wallet's address pool will be persisted under this key.
pub(crate) const BDK_WALLET_ADDRESS_POOL_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_ADDRESS_POOL_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_ADDRESS_POOL_KEY: &str = "address_pool";

/// [`StaticInvoice`]s will be persisted under this key.
///
/// [`StaticInvoice`]: lightning::offers::static_invoice::StaticInvoice
Expand Down
Loading
Loading

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

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 11, 2026
 Merged


Derive shutdown scripts without blocking on wallet persistence
#1011
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


25 changes: 21 additions & 4 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -86,7 +86,7 @@ use crate::types::{
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::persist::{read_address_pool, KVStoreWalletPersister};
use crate::wallet::Wallet;
use crate::{Node, NodeMetrics, PersistedNodeMetrics};

Expand DownExpand Up@@ -1439,8 +1439,8 @@ fn build_with_store_internal(

	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (payment_store_res, node_metris_res, pending_payment_store_res) =
runtime.block_on(async move {
	let (payment_store_res, node_metris_res, pending_payment_store_res, address_pool_res) = runtime
 .block_on(async move {
 tokio::join!(
 read_all_objects(
 &*kv_store_ref,
Expand All@@ -1454,7 +1454,8 @@ fn build_with_store_internal(
 PENDING_PAYMENT_INFO_PERSISTENCE_PRIMARY_NAMESPACE,
 PENDING_PAYMENT_INFO_PERSISTENCE_SECONDARY_NAMESPACE,
 Arc::clone(&logger_ref),
 )
 ),
 read_address_pool(&*kv_store_ref, &*logger_ref)
 )
 });

Expand DownExpand Up@@ -1741,9 +1742,18 @@ fn build_with_store_internal(
 },
	};

	let persisted_pool_indices = match address_pool_res {
 Ok(indices) => indices,
 Err(e) => {
 log_error!(logger, "Failed to read address pool data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};

	let wallet = Arc::new(Wallet::new(
 bdk_wallet,
 wallet_persister,
 persisted_pool_indices,
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
 Arc::clone(&chain_source),
Expand All@@ -1754,6 +1764,13 @@ fn build_with_store_internal(
 Arc::clone(&pending_payment_store),
	));

	// Fill the address pool up front so LDK's sync `SignerProvider` callbacks can hand out
	// pre-persisted addresses without waiting on wallet persistence.
	runtime.block_on(wallet.refill_address_pool()).map_err(|e| {
 log_error!(logger, "Failed to fill the wallet's address pool: {}", e);
 BuildError::WalletSetupFailed
	})?;

	tx_broadcaster.set_wallet(Arc::downgrade(&wallet));

	// Initialize the KeysManager
Expand Down

16 changes: 16 additions & 0 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,22 @@ pub const MIN_FULL_SCAN_STOP_GAP: u32 = 1;
/// Values above 1000 are clamped to 1000 when a full scan runs.
pub const MAX_FULL_SCAN_STOP_GAP: u32 = 1000;

/// The number of addresses the node keeps revealed and persisted ahead of use, from which it
/// serves fresh-address requests and channel destination and shutdown scripts.
///
/// Pooled addresses are revealed-but-unused wallet scripts. Addresses are handed out oldest
/// first, which keeps the pool beyond the handed-out addresses, where it cannot hide funds
/// from a full scan's stop gap (e.g. [`EsploraSyncConfig::full_scan_stop_gap`]). A handout
/// that fails while a concurrent one proceeds can briefly leave a pooled address below a
/// handed-out one; such inversions are bounded by the pool size and consumed by the next
/// handouts.
///
/// After a restore from seed, the pool refills from the keychain's first indices before the
/// initial full scan runs, so it can serve addresses a previous installation of the wallet
/// already handed out — possibly even used ones. The cost is address reuse, not fund
/// visibility: the reveals keep the scripts watched and the scan discovers any prior use.
pub const ADDRESS_POOL_SIZE: u32 = 16;

// The number of concurrent requests made against the API provider.
pub(crate) const BDK_CLIENT_CONCURRENCY: usize = 4;

Expand Down

5 changes: 5 additions & 0 deletions
src/io/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,6 +80,11 @@ pub(crate) const BDK_WALLET_INDEXER_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_INDEXER_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_INDEXER_KEY: &str = "indexer";

/// The derivation indices of the wallet's address pool will be persisted under this key.
pub(crate) const BDK_WALLET_ADDRESS_POOL_PRIMARY_NAMESPACE: &str = "bdk_wallet";
pub(crate) const BDK_WALLET_ADDRESS_POOL_SECONDARY_NAMESPACE: &str = "";
pub(crate) const BDK_WALLET_ADDRESS_POOL_KEY: &str = "address_pool";

/// [`StaticInvoice`]s will be persisted under this key.
///
/// [`StaticInvoice`]: lightning::offers::static_invoice::StaticInvoice
Expand Down
Loading
Loading