Skip to content

Enable deferred writing#782

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 3 commits into from
Mar 26, 2026
Merged

Enable deferred writing #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b088b35
Switch to chain monitor deferred writes mode
joostjager Feb 9, 2026
8f10f90
Re-claim inbound payments when preimage is already known
joostjager Feb 11, 2026
5b39741
Use async chain monitor persister
joostjager Feb 26, 2026
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
26 changes: 13 additions & 13 deletions Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,17 +39,17 @@ default = []
#lightning-liquidity = { version = "0.2.0", features = ["std"] }
#lightning-macros = { version = "0.2.0" }

lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
Expand DownExpand Up@@ -79,13 +79,13 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/tnull/bitcoin-payment-instructions", rev = "e9d7c07d7affc7714b023c853a65771e45277467" }
bitcoin-payment-instructions = { git = "https://github.com/joostjager/bitcoin-payment-instructions", branch = "ldk-dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std", "_test_utils"] }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std", "_test_utils"] }
rand = { version = "0.9.2", default-features = false, features = ["std", "thread_rng", "os_rng"] }
proptest = "1.0.0"
regex = "1.5.6"
Expand Down
43 changes: 19 additions & 24 deletions src/builder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,9 @@ use crate::peer_store::PeerStore;
use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreWrapper, GossipSync, Graph,
KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager, PendingPaymentStore,
Persister, SyncAndAsyncKVStore,
AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
GossipSync, Graph, KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager,
PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1495,7 +1495,7 @@ fn build_with_store_internal(

let peer_storage_key = keys_manager.get_peer_storage_key();
let monitor_reader = Arc::new(AsyncPersister::new(
Arc::clone(&kv_store),
DynStoreRef(Arc::clone(&kv_store)),
RuntimeSpawner::new(Arc::clone(&runtime)),
Arc::clone(&logger),
PERSISTER_MAX_PENDING_UPDATES,
Expand All@@ -1508,7 +1508,7 @@ fn build_with_store_internal(
// Read ChannelMonitors and the NetworkGraph
let kv_store_ref = Arc::clone(&kv_store);
let logger_ref = Arc::clone(&logger);
let (monitor_read_res, network_graph_res) = runtime.block_on(async move {
let (monitor_read_res, network_graph_res) = runtime.block_on(async {
tokio::join!(
monitor_reader.read_all_channel_monitors_with_updates_parallel(),
read_network_graph(&*kv_store_ref, logger_ref),
Expand All@@ -1528,26 +1528,21 @@ fn build_with_store_internal(
},
};

let persister = Arc::new(Persister::new(
Arc::clone(&kv_store),
Arc::clone(&logger),
PERSISTER_MAX_PENDING_UPDATES,
Arc::clone(&keys_manager),
Arc::clone(&keys_manager),
Arc::clone(&tx_broadcaster),
Arc::clone(&fee_estimator),
));

// Initialize the ChainMonitor
let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
Some(Arc::clone(&chain_source)),
Arc::clone(&tx_broadcaster),
Arc::clone(&logger),
Arc::clone(&fee_estimator),
Arc::clone(&persister),
Arc::clone(&keys_manager),
peer_storage_key,
));
let chain_monitor: Arc<ChainMonitor> = {
let persister = Arc::try_unwrap(monitor_reader)
.unwrap_or_else(|_| panic!("Arc<AsyncPersister> should have no other references"));
Arc::new(chainmonitor::ChainMonitor::new_async_beta(
Some(Arc::clone(&chain_source)),
Arc::clone(&tx_broadcaster),
Arc::clone(&logger),
Arc::clone(&fee_estimator),
persister,
Arc::clone(&keys_manager),
peer_storage_key,
true,
))
};

// Initialize the network graph, scorer, and router
let network_graph = match network_graph_res {
Expand Down
20 changes: 20 additions & 0 deletions src/event.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -691,6 +691,26 @@ where
if info.status == PaymentStatus::Succeeded
|| matches!(info.kind, PaymentKind::Spontaneous { .. })
{
let stored_preimage = match info.kind {

@tnulltnullMar 2, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might or might not conflict with #811, we'll also need to think through this depending on the order these land.

@tnulltnullMar 26, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, concern still stands, I'll see to continue work on #811 in the next days so we can decide better.

PaymentKind::Bolt11 { preimage, .. }
| PaymentKind::Bolt11Jit { preimage, .. }
| PaymentKind::Bolt12Offer { preimage, .. }
| PaymentKind::Bolt12Refund { preimage, .. }
| PaymentKind::Spontaneous { preimage, .. } => preimage,
_ => None,
};

if let Some(preimage) = stored_preimage {
log_info!(
self.logger,
"Re-claiming previously succeeded payment with hash {} of {}msat",
hex_utils::to_string(&payment_hash.0),
amount_msat,
);
self.channel_manager.claim_funds(preimage);
return Ok(());
}

log_info!(
self.logger,
"Refused duplicate inbound payment from payment hash {} of {}msat",
Expand Down
58 changes: 44 additions & 14 deletions src/types.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,7 @@ use lightning::routing::gossip;
use lightning::routing::router::DefaultRouter;
use lightning::routing::scoring::{CombinedScorer, ProbabilisticScoringFeeParameters};
use lightning::sign::InMemorySigner;
use lightning::util::persist::{
KVStore, KVStoreSync, MonitorUpdatingPersister, MonitorUpdatingPersisterAsync,
};
use lightning::util::persist::{KVStore, KVStoreSync, MonitorUpdatingPersisterAsync};
use lightning::util::ser::{Readable, Writeable, Writer};
use lightning::util::sweep::OutputSweeper;
use lightning_block_sync::gossip::GossipVerifier;
Expand DownExpand Up@@ -135,6 +133,39 @@ impl<'a> KVStoreSync for dyn DynStoreTrait + 'a {

pub(crate) type DynStore = dyn DynStoreTrait;

// Newtype wrapper that implements `KVStore` for `Arc<DynStore>`. This is needed because `KVStore`
// methods return `impl Future`, which is not object-safe. `DynStoreTrait` works around this by
// returning `Pin<Box<dyn Future>>` instead, and this wrapper bridges the two by delegating
// `KVStore` methods to the corresponding `DynStoreTrait::*_async` methods.
#[derive(Clone)]
pub(crate) struct DynStoreRef(pub(crate) Arc<DynStore>);

@tnulltnullMar 2, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, yet another boilerplate wrapper around KVStore. Note that this might conflict with #692 and/or needs to be DRYed up with the work there or any uniffi-related wrappers we introduce there or in a follow up. Ofc. depends on what ends up landing first. Also cc @enigbe.

@tnulltnullMar 26, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise still an unresolved question to me.


impl KVStore for DynStoreRef {
fn read(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
) -> impl Future<Output = Result<Vec<u8>, bitcoin::io::Error>> + Send + 'static {
DynStoreTrait::read_async(&*self.0, primary_namespace, secondary_namespace, key)
}

fn write(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
DynStoreTrait::write_async(&*self.0, primary_namespace, secondary_namespace, key, buf)
}

fn remove(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
DynStoreTrait::remove_async(&*self.0, primary_namespace, secondary_namespace, key, lazy)
}

fn list(
&self, primary_namespace: &str, secondary_namespace: &str,
) -> impl Future<Output = Result<Vec<String>, bitcoin::io::Error>> + Send + 'static {
DynStoreTrait::list_async(&*self.0, primary_namespace, secondary_namespace)
}
}

pub(crate) struct DynStoreWrapper<T: SyncAndAsyncKVStore + Send + Sync>(pub(crate) T);

impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T> {
Expand DownExpand Up@@ -188,7 +219,7 @@ impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T>
}

pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
Arc<DynStore>,
DynStoreRef,
RuntimeSpawner,
Arc<Logger>,
Arc<KeysManager>,
Expand All@@ -197,22 +228,21 @@ pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
Arc<OnchainFeeEstimator>,
>;

pub type Persister = MonitorUpdatingPersister<
Arc<DynStore>,
Arc<Logger>,
Arc<KeysManager>,
Arc<KeysManager>,
Arc<Broadcaster>,
Arc<OnchainFeeEstimator>,
>;

pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
InMemorySigner,
Arc<ChainSource>,
Arc<Broadcaster>,
Arc<OnchainFeeEstimator>,
Arc<Logger>,
Arc<Persister>,
chainmonitor::AsyncPersister<
DynStoreRef,
RuntimeSpawner,
Arc<Logger>,
Arc<KeysManager>,
Arc<KeysManager>,
Arc<Broadcaster>,
Arc<OnchainFeeEstimator>,
>,
Arc<KeysManager>,
>;

Expand Down
2 changes: 1 addition & 1 deletion tests/common/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1262,8 +1262,8 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
);

println!("\nB close_channel (force: {})", force_close);
tokio::time::sleep(Duration::from_secs(1)).await;
if force_close {
tokio::time::sleep(Duration::from_secs(1)).await;
node_a.force_close_channel(&user_channel_id_a, node_b.node_id(), None).unwrap();
} else {
node_a.close_channel(&user_channel_id_a, node_b.node_id()).unwrap();
Expand Down
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" + '
Enable deferred writing by joostjager · Pull Request #782 · lightningdevkit/ldk-node · GitHub
Skip to content
Enable deferred writing#782

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

from

Mar 26, 2026
 Merged


Enable deferred writing
#782
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b088b35

Switch to chain monitor deferred writes mode


joostjager Feb 9, 2026
8f10f90

Re-claim inbound payments when preimage is already known


joostjager Feb 11, 2026
5b39741

Use async chain monitor persister


joostjager Feb 26, 2026

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


26 changes: 13 additions & 13 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,17 +39,17 @@ default = []
#lightning-liquidity = { version = "0.2.0", features = ["std"] }
#lightning-macros = { version = "0.2.0" }

lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
Expand DownExpand Up@@ -79,13 +79,13 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/tnull/bitcoin-payment-instructions", rev = "e9d7c07d7affc7714b023c853a65771e45277467" }
bitcoin-payment-instructions = { git = "https://github.com/joostjager/bitcoin-payment-instructions", branch = "ldk-dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std", "_test_utils"] }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std", "_test_utils"] }
rand = { version = "0.9.2", default-features = false, features = ["std", "thread_rng", "os_rng"] }
proptest = "1.0.0"
regex = "1.5.6"
Expand Down

43 changes: 19 additions & 24 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,9 @@ use crate::peer_store::PeerStore;
use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreWrapper, GossipSync, Graph,
	KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager, PendingPaymentStore,
Persister, SyncAndAsyncKVStore,
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
GossipSync, Graph, KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager,
PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1495,7 +1495,7 @@ fn build_with_store_internal(

	let peer_storage_key = keys_manager.get_peer_storage_key();
	let monitor_reader = Arc::new(AsyncPersister::new(
 Arc::clone(&kv_store),
DynStoreRef(Arc::clone(&kv_store)),
 RuntimeSpawner::new(Arc::clone(&runtime)),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
Expand All@@ -1508,7 +1508,7 @@ fn build_with_store_internal(
	// Read ChannelMonitors and the NetworkGraph
	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (monitor_read_res, network_graph_res) = runtime.block_on(async move {
	let (monitor_read_res, network_graph_res) = runtime.block_on(async {
 tokio::join!(
 monitor_reader.read_all_channel_monitors_with_updates_parallel(),
 read_network_graph(&*kv_store_ref, logger_ref),
Expand All@@ -1528,26 +1528,21 @@ fn build_with_store_internal(
 },
	};

	let persister = Arc::new(Persister::new(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
	));

	// Initialize the ChainMonitor
	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 Arc::clone(&persister),
 Arc::clone(&keys_manager),
 peer_storage_key,
	));
	let chain_monitor: Arc<ChainMonitor> = {
 let persister = Arc::try_unwrap(monitor_reader)
 .unwrap_or_else(|_| panic!("Arc<AsyncPersister> should have no other references"));
 Arc::new(chainmonitor::ChainMonitor::new_async_beta(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 persister,
 Arc::clone(&keys_manager),
 peer_storage_key,
 true,
 ))
	};

	// Initialize the network graph, scorer, and router
	let network_graph = match network_graph_res {
Expand Down

20 changes: 20 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,6 +691,26 @@ where
 if info.status == PaymentStatus::Succeeded
 || matches!(info.kind, PaymentKind::Spontaneous { .. })
 {
 let stored_preimage = match info.kind {
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might or might not conflict with #811, we'll also need to think through this depending on the order these land.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, concern still stands, I'll see to continue work on #811 in the next days so we can decide better.
 PaymentKind::Bolt11 { preimage, .. }
 | PaymentKind::Bolt11Jit { preimage, .. }
 | PaymentKind::Bolt12Offer { preimage, .. }
 | PaymentKind::Bolt12Refund { preimage, .. }
 | PaymentKind::Spontaneous { preimage, .. } => preimage,
 _ => None,
 };

 if let Some(preimage) = stored_preimage {
 log_info!(
 self.logger,
 "Re-claiming previously succeeded payment with hash {} of {}msat",
 hex_utils::to_string(&payment_hash.0),
 amount_msat,
 );
 self.channel_manager.claim_funds(preimage);
 return Ok(());
 }

 log_info!(
 self.logger,
 "Refused duplicate inbound payment from payment hash {} of {}msat",
Expand Down

58 changes: 44 additions & 14 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,7 @@ use lightning::routing::gossip;
use lightning::routing::router::DefaultRouter;
use lightning::routing::scoring::{CombinedScorer, ProbabilisticScoringFeeParameters};
use lightning::sign::InMemorySigner;
use lightning::util::persist::{
	KVStore, KVStoreSync, MonitorUpdatingPersister, MonitorUpdatingPersisterAsync,
};
use lightning::util::persist::{KVStore, KVStoreSync, MonitorUpdatingPersisterAsync};
use lightning::util::ser::{Readable, Writeable, Writer};
use lightning::util::sweep::OutputSweeper;
use lightning_block_sync::gossip::GossipVerifier;
Expand DownExpand Up@@ -135,6 +133,39 @@ impl<'a> KVStoreSync for dyn DynStoreTrait + 'a {

pub(crate) type DynStore = dyn DynStoreTrait;

// Newtype wrapper that implements `KVStore` for `Arc<DynStore>`. This is needed because `KVStore`
// methods return `impl Future`, which is not object-safe. `DynStoreTrait` works around this by
// returning `Pin<Box<dyn Future>>` instead, and this wrapper bridges the two by delegating
// `KVStore` methods to the corresponding `DynStoreTrait::*_async` methods.
#[derive(Clone)]
pub(crate) struct DynStoreRef(pub(crate) Arc<DynStore>);
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, yet another boilerplate wrapper around KVStore. Note that this might conflict with #692 and/or needs to be DRYed up with the work there or any uniffi-related wrappers we introduce there or in a follow up. Ofc. depends on what ends up landing first. Also cc @enigbe.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise still an unresolved question to me.

impl KVStore for DynStoreRef {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> impl Future<Output = Result<Vec<u8>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::read_async(&*self.0, primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::write_async(&*self.0, primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::remove_async(&*self.0, primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> impl Future<Output = Result<Vec<String>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::list_async(&*self.0, primary_namespace, secondary_namespace)
	}
}

pub(crate) struct DynStoreWrapper<T: SyncAndAsyncKVStore + Send + Sync>(pub(crate) T);

impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T> {
Expand DownExpand Up@@ -188,7 +219,7 @@ impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T>
}

pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
Arc<DynStore>,
DynStoreRef,
	RuntimeSpawner,
	Arc<Logger>,
	Arc<KeysManager>,
Expand All@@ -197,22 +228,21 @@ pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
	Arc<OnchainFeeEstimator>,
>;

pub type Persister = MonitorUpdatingPersister<
	Arc<DynStore>,
	Arc<Logger>,
	Arc<KeysManager>,
	Arc<KeysManager>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
>;

pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
	InMemorySigner,
	Arc<ChainSource>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
	Arc<Logger>,
	Arc<Persister>,
	chainmonitor::AsyncPersister<
 DynStoreRef,
 RuntimeSpawner,
 Arc<Logger>,
 Arc<KeysManager>,
 Arc<KeysManager>,
 Arc<Broadcaster>,
 Arc<OnchainFeeEstimator>,
	>,
	Arc<KeysManager>,
>;

Expand Down

2 changes: 1 addition & 1 deletion
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1262,8 +1262,8 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
	);

	println!("\nB close_channel (force: {})", force_close);
	tokio::time::sleep(Duration::from_secs(1)).await;
	if force_close {
 tokio::time::sleep(Duration::from_secs(1)).await;
 node_a.force_close_channel(&user_channel_id_a, node_b.node_id(), None).unwrap();
	} else {
 node_a.close_channel(&user_channel_id_a, node_b.node_id()).unwrap();
Expand Down
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('^' + ".*" + '
Enable deferred writing by joostjager · Pull Request #782 · lightningdevkit/ldk-node · GitHub
Skip to content
Enable deferred writing#782

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

from

Mar 26, 2026
 Merged


Enable deferred writing
#782
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b088b35

Switch to chain monitor deferred writes mode


joostjager Feb 9, 2026
8f10f90

Re-claim inbound payments when preimage is already known


joostjager Feb 11, 2026
5b39741

Use async chain monitor persister


joostjager Feb 26, 2026

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


26 changes: 13 additions & 13 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,17 +39,17 @@ default = []
#lightning-liquidity = { version = "0.2.0", features = ["std"] }
#lightning-macros = { version = "0.2.0" }

lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
Expand DownExpand Up@@ -79,13 +79,13 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/tnull/bitcoin-payment-instructions", rev = "e9d7c07d7affc7714b023c853a65771e45277467" }
bitcoin-payment-instructions = { git = "https://github.com/joostjager/bitcoin-payment-instructions", branch = "ldk-dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std", "_test_utils"] }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std", "_test_utils"] }
rand = { version = "0.9.2", default-features = false, features = ["std", "thread_rng", "os_rng"] }
proptest = "1.0.0"
regex = "1.5.6"
Expand Down

43 changes: 19 additions & 24 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,9 @@ use crate::peer_store::PeerStore;
use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreWrapper, GossipSync, Graph,
	KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager, PendingPaymentStore,
Persister, SyncAndAsyncKVStore,
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
GossipSync, Graph, KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager,
PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1495,7 +1495,7 @@ fn build_with_store_internal(

	let peer_storage_key = keys_manager.get_peer_storage_key();
	let monitor_reader = Arc::new(AsyncPersister::new(
 Arc::clone(&kv_store),
DynStoreRef(Arc::clone(&kv_store)),
 RuntimeSpawner::new(Arc::clone(&runtime)),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
Expand All@@ -1508,7 +1508,7 @@ fn build_with_store_internal(
	// Read ChannelMonitors and the NetworkGraph
	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (monitor_read_res, network_graph_res) = runtime.block_on(async move {
	let (monitor_read_res, network_graph_res) = runtime.block_on(async {
 tokio::join!(
 monitor_reader.read_all_channel_monitors_with_updates_parallel(),
 read_network_graph(&*kv_store_ref, logger_ref),
Expand All@@ -1528,26 +1528,21 @@ fn build_with_store_internal(
 },
	};

	let persister = Arc::new(Persister::new(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
	));

	// Initialize the ChainMonitor
	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 Arc::clone(&persister),
 Arc::clone(&keys_manager),
 peer_storage_key,
	));
	let chain_monitor: Arc<ChainMonitor> = {
 let persister = Arc::try_unwrap(monitor_reader)
 .unwrap_or_else(|_| panic!("Arc<AsyncPersister> should have no other references"));
 Arc::new(chainmonitor::ChainMonitor::new_async_beta(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 persister,
 Arc::clone(&keys_manager),
 peer_storage_key,
 true,
 ))
	};

	// Initialize the network graph, scorer, and router
	let network_graph = match network_graph_res {
Expand Down

20 changes: 20 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,6 +691,26 @@ where
 if info.status == PaymentStatus::Succeeded
 || matches!(info.kind, PaymentKind::Spontaneous { .. })
 {
 let stored_preimage = match info.kind {
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might or might not conflict with #811, we'll also need to think through this depending on the order these land.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, concern still stands, I'll see to continue work on #811 in the next days so we can decide better.
 PaymentKind::Bolt11 { preimage, .. }
 | PaymentKind::Bolt11Jit { preimage, .. }
 | PaymentKind::Bolt12Offer { preimage, .. }
 | PaymentKind::Bolt12Refund { preimage, .. }
 | PaymentKind::Spontaneous { preimage, .. } => preimage,
 _ => None,
 };

 if let Some(preimage) = stored_preimage {
 log_info!(
 self.logger,
 "Re-claiming previously succeeded payment with hash {} of {}msat",
 hex_utils::to_string(&payment_hash.0),
 amount_msat,
 );
 self.channel_manager.claim_funds(preimage);
 return Ok(());
 }

 log_info!(
 self.logger,
 "Refused duplicate inbound payment from payment hash {} of {}msat",
Expand Down

58 changes: 44 additions & 14 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,7 @@ use lightning::routing::gossip;
use lightning::routing::router::DefaultRouter;
use lightning::routing::scoring::{CombinedScorer, ProbabilisticScoringFeeParameters};
use lightning::sign::InMemorySigner;
use lightning::util::persist::{
	KVStore, KVStoreSync, MonitorUpdatingPersister, MonitorUpdatingPersisterAsync,
};
use lightning::util::persist::{KVStore, KVStoreSync, MonitorUpdatingPersisterAsync};
use lightning::util::ser::{Readable, Writeable, Writer};
use lightning::util::sweep::OutputSweeper;
use lightning_block_sync::gossip::GossipVerifier;
Expand DownExpand Up@@ -135,6 +133,39 @@ impl<'a> KVStoreSync for dyn DynStoreTrait + 'a {

pub(crate) type DynStore = dyn DynStoreTrait;

// Newtype wrapper that implements `KVStore` for `Arc<DynStore>`. This is needed because `KVStore`
// methods return `impl Future`, which is not object-safe. `DynStoreTrait` works around this by
// returning `Pin<Box<dyn Future>>` instead, and this wrapper bridges the two by delegating
// `KVStore` methods to the corresponding `DynStoreTrait::*_async` methods.
#[derive(Clone)]
pub(crate) struct DynStoreRef(pub(crate) Arc<DynStore>);
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, yet another boilerplate wrapper around KVStore. Note that this might conflict with #692 and/or needs to be DRYed up with the work there or any uniffi-related wrappers we introduce there or in a follow up. Ofc. depends on what ends up landing first. Also cc @enigbe.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise still an unresolved question to me.

impl KVStore for DynStoreRef {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> impl Future<Output = Result<Vec<u8>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::read_async(&*self.0, primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::write_async(&*self.0, primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::remove_async(&*self.0, primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> impl Future<Output = Result<Vec<String>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::list_async(&*self.0, primary_namespace, secondary_namespace)
	}
}

pub(crate) struct DynStoreWrapper<T: SyncAndAsyncKVStore + Send + Sync>(pub(crate) T);

impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T> {
Expand DownExpand Up@@ -188,7 +219,7 @@ impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T>
}

pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
Arc<DynStore>,
DynStoreRef,
	RuntimeSpawner,
	Arc<Logger>,
	Arc<KeysManager>,
Expand All@@ -197,22 +228,21 @@ pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
	Arc<OnchainFeeEstimator>,
>;

pub type Persister = MonitorUpdatingPersister<
	Arc<DynStore>,
	Arc<Logger>,
	Arc<KeysManager>,
	Arc<KeysManager>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
>;

pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
	InMemorySigner,
	Arc<ChainSource>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
	Arc<Logger>,
	Arc<Persister>,
	chainmonitor::AsyncPersister<
 DynStoreRef,
 RuntimeSpawner,
 Arc<Logger>,
 Arc<KeysManager>,
 Arc<KeysManager>,
 Arc<Broadcaster>,
 Arc<OnchainFeeEstimator>,
	>,
	Arc<KeysManager>,
>;

Expand Down

2 changes: 1 addition & 1 deletion
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1262,8 +1262,8 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
	);

	println!("\nB close_channel (force: {})", force_close);
	tokio::time::sleep(Duration::from_secs(1)).await;
	if force_close {
 tokio::time::sleep(Duration::from_secs(1)).await;
 node_a.force_close_channel(&user_channel_id_a, node_b.node_id(), None).unwrap();
	} else {
 node_a.close_channel(&user_channel_id_a, node_b.node_id()).unwrap();
Expand Down
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('^' + ".*" + '
Enable deferred writing by joostjager · Pull Request #782 · lightningdevkit/ldk-node · GitHub
Skip to content
Enable deferred writing#782

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

from

Mar 26, 2026
 Merged


Enable deferred writing
#782
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b088b35

Switch to chain monitor deferred writes mode


joostjager Feb 9, 2026
8f10f90

Re-claim inbound payments when preimage is already known


joostjager Feb 11, 2026
5b39741

Use async chain monitor persister


joostjager Feb 26, 2026

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


26 changes: 13 additions & 13 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,17 +39,17 @@ default = []
#lightning-liquidity = { version = "0.2.0", features = ["std"] }
#lightning-macros = { version = "0.2.0" }

lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
Expand DownExpand Up@@ -79,13 +79,13 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/tnull/bitcoin-payment-instructions", rev = "e9d7c07d7affc7714b023c853a65771e45277467" }
bitcoin-payment-instructions = { git = "https://github.com/joostjager/bitcoin-payment-instructions", branch = "ldk-dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std", "_test_utils"] }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std", "_test_utils"] }
rand = { version = "0.9.2", default-features = false, features = ["std", "thread_rng", "os_rng"] }
proptest = "1.0.0"
regex = "1.5.6"
Expand Down

43 changes: 19 additions & 24 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,9 @@ use crate::peer_store::PeerStore;
use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreWrapper, GossipSync, Graph,
	KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager, PendingPaymentStore,
Persister, SyncAndAsyncKVStore,
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
GossipSync, Graph, KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager,
PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1495,7 +1495,7 @@ fn build_with_store_internal(

	let peer_storage_key = keys_manager.get_peer_storage_key();
	let monitor_reader = Arc::new(AsyncPersister::new(
 Arc::clone(&kv_store),
DynStoreRef(Arc::clone(&kv_store)),
 RuntimeSpawner::new(Arc::clone(&runtime)),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
Expand All@@ -1508,7 +1508,7 @@ fn build_with_store_internal(
	// Read ChannelMonitors and the NetworkGraph
	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (monitor_read_res, network_graph_res) = runtime.block_on(async move {
	let (monitor_read_res, network_graph_res) = runtime.block_on(async {
 tokio::join!(
 monitor_reader.read_all_channel_monitors_with_updates_parallel(),
 read_network_graph(&*kv_store_ref, logger_ref),
Expand All@@ -1528,26 +1528,21 @@ fn build_with_store_internal(
 },
	};

	let persister = Arc::new(Persister::new(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
	));

	// Initialize the ChainMonitor
	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 Arc::clone(&persister),
 Arc::clone(&keys_manager),
 peer_storage_key,
	));
	let chain_monitor: Arc<ChainMonitor> = {
 let persister = Arc::try_unwrap(monitor_reader)
 .unwrap_or_else(|_| panic!("Arc<AsyncPersister> should have no other references"));
 Arc::new(chainmonitor::ChainMonitor::new_async_beta(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 persister,
 Arc::clone(&keys_manager),
 peer_storage_key,
 true,
 ))
	};

	// Initialize the network graph, scorer, and router
	let network_graph = match network_graph_res {
Expand Down

20 changes: 20 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,6 +691,26 @@ where
 if info.status == PaymentStatus::Succeeded
 || matches!(info.kind, PaymentKind::Spontaneous { .. })
 {
 let stored_preimage = match info.kind {
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might or might not conflict with #811, we'll also need to think through this depending on the order these land.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, concern still stands, I'll see to continue work on #811 in the next days so we can decide better.
 PaymentKind::Bolt11 { preimage, .. }
 | PaymentKind::Bolt11Jit { preimage, .. }
 | PaymentKind::Bolt12Offer { preimage, .. }
 | PaymentKind::Bolt12Refund { preimage, .. }
 | PaymentKind::Spontaneous { preimage, .. } => preimage,
 _ => None,
 };

 if let Some(preimage) = stored_preimage {
 log_info!(
 self.logger,
 "Re-claiming previously succeeded payment with hash {} of {}msat",
 hex_utils::to_string(&payment_hash.0),
 amount_msat,
 );
 self.channel_manager.claim_funds(preimage);
 return Ok(());
 }

 log_info!(
 self.logger,
 "Refused duplicate inbound payment from payment hash {} of {}msat",
Expand Down

58 changes: 44 additions & 14 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,7 @@ use lightning::routing::gossip;
use lightning::routing::router::DefaultRouter;
use lightning::routing::scoring::{CombinedScorer, ProbabilisticScoringFeeParameters};
use lightning::sign::InMemorySigner;
use lightning::util::persist::{
	KVStore, KVStoreSync, MonitorUpdatingPersister, MonitorUpdatingPersisterAsync,
};
use lightning::util::persist::{KVStore, KVStoreSync, MonitorUpdatingPersisterAsync};
use lightning::util::ser::{Readable, Writeable, Writer};
use lightning::util::sweep::OutputSweeper;
use lightning_block_sync::gossip::GossipVerifier;
Expand DownExpand Up@@ -135,6 +133,39 @@ impl<'a> KVStoreSync for dyn DynStoreTrait + 'a {

pub(crate) type DynStore = dyn DynStoreTrait;

// Newtype wrapper that implements `KVStore` for `Arc<DynStore>`. This is needed because `KVStore`
// methods return `impl Future`, which is not object-safe. `DynStoreTrait` works around this by
// returning `Pin<Box<dyn Future>>` instead, and this wrapper bridges the two by delegating
// `KVStore` methods to the corresponding `DynStoreTrait::*_async` methods.
#[derive(Clone)]
pub(crate) struct DynStoreRef(pub(crate) Arc<DynStore>);
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, yet another boilerplate wrapper around KVStore. Note that this might conflict with #692 and/or needs to be DRYed up with the work there or any uniffi-related wrappers we introduce there or in a follow up. Ofc. depends on what ends up landing first. Also cc @enigbe.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise still an unresolved question to me.

impl KVStore for DynStoreRef {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> impl Future<Output = Result<Vec<u8>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::read_async(&*self.0, primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::write_async(&*self.0, primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::remove_async(&*self.0, primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> impl Future<Output = Result<Vec<String>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::list_async(&*self.0, primary_namespace, secondary_namespace)
	}
}

pub(crate) struct DynStoreWrapper<T: SyncAndAsyncKVStore + Send + Sync>(pub(crate) T);

impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T> {
Expand DownExpand Up@@ -188,7 +219,7 @@ impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T>
}

pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
Arc<DynStore>,
DynStoreRef,
	RuntimeSpawner,
	Arc<Logger>,
	Arc<KeysManager>,
Expand All@@ -197,22 +228,21 @@ pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
	Arc<OnchainFeeEstimator>,
>;

pub type Persister = MonitorUpdatingPersister<
	Arc<DynStore>,
	Arc<Logger>,
	Arc<KeysManager>,
	Arc<KeysManager>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
>;

pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
	InMemorySigner,
	Arc<ChainSource>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
	Arc<Logger>,
	Arc<Persister>,
	chainmonitor::AsyncPersister<
 DynStoreRef,
 RuntimeSpawner,
 Arc<Logger>,
 Arc<KeysManager>,
 Arc<KeysManager>,
 Arc<Broadcaster>,
 Arc<OnchainFeeEstimator>,
	>,
	Arc<KeysManager>,
>;

Expand Down

2 changes: 1 addition & 1 deletion
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1262,8 +1262,8 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
	);

	println!("\nB close_channel (force: {})", force_close);
	tokio::time::sleep(Duration::from_secs(1)).await;
	if force_close {
 tokio::time::sleep(Duration::from_secs(1)).await;
 node_a.force_close_channel(&user_channel_id_a, node_b.node_id(), None).unwrap();
	} else {
 node_a.close_channel(&user_channel_id_a, node_b.node_id()).unwrap();
Expand Down
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" + '
Enable deferred writing by joostjager · Pull Request #782 · lightningdevkit/ldk-node · GitHub
Skip to content
Enable deferred writing#782

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

from

Mar 26, 2026
 Merged


Enable deferred writing
#782
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b088b35

Switch to chain monitor deferred writes mode


joostjager Feb 9, 2026
8f10f90

Re-claim inbound payments when preimage is already known


joostjager Feb 11, 2026
5b39741

Use async chain monitor persister


joostjager Feb 26, 2026

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


26 changes: 13 additions & 13 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,17 +39,17 @@ default = []
#lightning-liquidity = { version = "0.2.0", features = ["std"] }
#lightning-macros = { version = "0.2.0" }

lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
Expand DownExpand Up@@ -79,13 +79,13 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/tnull/bitcoin-payment-instructions", rev = "e9d7c07d7affc7714b023c853a65771e45277467" }
bitcoin-payment-instructions = { git = "https://github.com/joostjager/bitcoin-payment-instructions", branch = "ldk-dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std", "_test_utils"] }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std", "_test_utils"] }
rand = { version = "0.9.2", default-features = false, features = ["std", "thread_rng", "os_rng"] }
proptest = "1.0.0"
regex = "1.5.6"
Expand Down

43 changes: 19 additions & 24 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,9 @@ use crate::peer_store::PeerStore;
use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreWrapper, GossipSync, Graph,
	KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager, PendingPaymentStore,
Persister, SyncAndAsyncKVStore,
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
GossipSync, Graph, KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager,
PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1495,7 +1495,7 @@ fn build_with_store_internal(

	let peer_storage_key = keys_manager.get_peer_storage_key();
	let monitor_reader = Arc::new(AsyncPersister::new(
 Arc::clone(&kv_store),
DynStoreRef(Arc::clone(&kv_store)),
 RuntimeSpawner::new(Arc::clone(&runtime)),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
Expand All@@ -1508,7 +1508,7 @@ fn build_with_store_internal(
	// Read ChannelMonitors and the NetworkGraph
	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (monitor_read_res, network_graph_res) = runtime.block_on(async move {
	let (monitor_read_res, network_graph_res) = runtime.block_on(async {
 tokio::join!(
 monitor_reader.read_all_channel_monitors_with_updates_parallel(),
 read_network_graph(&*kv_store_ref, logger_ref),
Expand All@@ -1528,26 +1528,21 @@ fn build_with_store_internal(
 },
	};

	let persister = Arc::new(Persister::new(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
	));

	// Initialize the ChainMonitor
	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 Arc::clone(&persister),
 Arc::clone(&keys_manager),
 peer_storage_key,
	));
	let chain_monitor: Arc<ChainMonitor> = {
 let persister = Arc::try_unwrap(monitor_reader)
 .unwrap_or_else(|_| panic!("Arc<AsyncPersister> should have no other references"));
 Arc::new(chainmonitor::ChainMonitor::new_async_beta(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 persister,
 Arc::clone(&keys_manager),
 peer_storage_key,
 true,
 ))
	};

	// Initialize the network graph, scorer, and router
	let network_graph = match network_graph_res {
Expand Down

20 changes: 20 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,6 +691,26 @@ where
 if info.status == PaymentStatus::Succeeded
 || matches!(info.kind, PaymentKind::Spontaneous { .. })
 {
 let stored_preimage = match info.kind {
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might or might not conflict with #811, we'll also need to think through this depending on the order these land.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, concern still stands, I'll see to continue work on #811 in the next days so we can decide better.
 PaymentKind::Bolt11 { preimage, .. }
 | PaymentKind::Bolt11Jit { preimage, .. }
 | PaymentKind::Bolt12Offer { preimage, .. }
 | PaymentKind::Bolt12Refund { preimage, .. }
 | PaymentKind::Spontaneous { preimage, .. } => preimage,
 _ => None,
 };

 if let Some(preimage) = stored_preimage {
 log_info!(
 self.logger,
 "Re-claiming previously succeeded payment with hash {} of {}msat",
 hex_utils::to_string(&payment_hash.0),
 amount_msat,
 );
 self.channel_manager.claim_funds(preimage);
 return Ok(());
 }

 log_info!(
 self.logger,
 "Refused duplicate inbound payment from payment hash {} of {}msat",
Expand Down

58 changes: 44 additions & 14 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,7 @@ use lightning::routing::gossip;
use lightning::routing::router::DefaultRouter;
use lightning::routing::scoring::{CombinedScorer, ProbabilisticScoringFeeParameters};
use lightning::sign::InMemorySigner;
use lightning::util::persist::{
	KVStore, KVStoreSync, MonitorUpdatingPersister, MonitorUpdatingPersisterAsync,
};
use lightning::util::persist::{KVStore, KVStoreSync, MonitorUpdatingPersisterAsync};
use lightning::util::ser::{Readable, Writeable, Writer};
use lightning::util::sweep::OutputSweeper;
use lightning_block_sync::gossip::GossipVerifier;
Expand DownExpand Up@@ -135,6 +133,39 @@ impl<'a> KVStoreSync for dyn DynStoreTrait + 'a {

pub(crate) type DynStore = dyn DynStoreTrait;

// Newtype wrapper that implements `KVStore` for `Arc<DynStore>`. This is needed because `KVStore`
// methods return `impl Future`, which is not object-safe. `DynStoreTrait` works around this by
// returning `Pin<Box<dyn Future>>` instead, and this wrapper bridges the two by delegating
// `KVStore` methods to the corresponding `DynStoreTrait::*_async` methods.
#[derive(Clone)]
pub(crate) struct DynStoreRef(pub(crate) Arc<DynStore>);
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, yet another boilerplate wrapper around KVStore. Note that this might conflict with #692 and/or needs to be DRYed up with the work there or any uniffi-related wrappers we introduce there or in a follow up. Ofc. depends on what ends up landing first. Also cc @enigbe.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise still an unresolved question to me.

impl KVStore for DynStoreRef {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> impl Future<Output = Result<Vec<u8>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::read_async(&*self.0, primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::write_async(&*self.0, primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::remove_async(&*self.0, primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> impl Future<Output = Result<Vec<String>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::list_async(&*self.0, primary_namespace, secondary_namespace)
	}
}

pub(crate) struct DynStoreWrapper<T: SyncAndAsyncKVStore + Send + Sync>(pub(crate) T);

impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T> {
Expand DownExpand Up@@ -188,7 +219,7 @@ impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T>
}

pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
Arc<DynStore>,
DynStoreRef,
	RuntimeSpawner,
	Arc<Logger>,
	Arc<KeysManager>,
Expand All@@ -197,22 +228,21 @@ pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
	Arc<OnchainFeeEstimator>,
>;

pub type Persister = MonitorUpdatingPersister<
	Arc<DynStore>,
	Arc<Logger>,
	Arc<KeysManager>,
	Arc<KeysManager>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
>;

pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
	InMemorySigner,
	Arc<ChainSource>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
	Arc<Logger>,
	Arc<Persister>,
	chainmonitor::AsyncPersister<
 DynStoreRef,
 RuntimeSpawner,
 Arc<Logger>,
 Arc<KeysManager>,
 Arc<KeysManager>,
 Arc<Broadcaster>,
 Arc<OnchainFeeEstimator>,
	>,
	Arc<KeysManager>,
>;

Expand Down

2 changes: 1 addition & 1 deletion
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1262,8 +1262,8 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
	);

	println!("\nB close_channel (force: {})", force_close);
	tokio::time::sleep(Duration::from_secs(1)).await;
	if force_close {
 tokio::time::sleep(Duration::from_secs(1)).await;
 node_a.force_close_channel(&user_channel_id_a, node_b.node_id(), None).unwrap();
	} else {
 node_a.close_channel(&user_channel_id_a, node_b.node_id()).unwrap();
Expand Down
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('^' + ".*" + '
Enable deferred writing by joostjager · Pull Request #782 · lightningdevkit/ldk-node · GitHub
Skip to content
Enable deferred writing#782

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

from

Mar 26, 2026
 Merged


Enable deferred writing
#782
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b088b35

Switch to chain monitor deferred writes mode


joostjager Feb 9, 2026
8f10f90

Re-claim inbound payments when preimage is already known


joostjager Feb 11, 2026
5b39741

Use async chain monitor persister


joostjager Feb 26, 2026

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


26 changes: 13 additions & 13 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,17 +39,17 @@ default = []
#lightning-liquidity = { version = "0.2.0", features = ["std"] }
#lightning-macros = { version = "0.2.0" }

lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
Expand DownExpand Up@@ -79,13 +79,13 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/tnull/bitcoin-payment-instructions", rev = "e9d7c07d7affc7714b023c853a65771e45277467" }
bitcoin-payment-instructions = { git = "https://github.com/joostjager/bitcoin-payment-instructions", branch = "ldk-dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std", "_test_utils"] }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std", "_test_utils"] }
rand = { version = "0.9.2", default-features = false, features = ["std", "thread_rng", "os_rng"] }
proptest = "1.0.0"
regex = "1.5.6"
Expand Down

43 changes: 19 additions & 24 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,9 @@ use crate::peer_store::PeerStore;
use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreWrapper, GossipSync, Graph,
	KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager, PendingPaymentStore,
Persister, SyncAndAsyncKVStore,
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
GossipSync, Graph, KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager,
PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1495,7 +1495,7 @@ fn build_with_store_internal(

	let peer_storage_key = keys_manager.get_peer_storage_key();
	let monitor_reader = Arc::new(AsyncPersister::new(
 Arc::clone(&kv_store),
DynStoreRef(Arc::clone(&kv_store)),
 RuntimeSpawner::new(Arc::clone(&runtime)),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
Expand All@@ -1508,7 +1508,7 @@ fn build_with_store_internal(
	// Read ChannelMonitors and the NetworkGraph
	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (monitor_read_res, network_graph_res) = runtime.block_on(async move {
	let (monitor_read_res, network_graph_res) = runtime.block_on(async {
 tokio::join!(
 monitor_reader.read_all_channel_monitors_with_updates_parallel(),
 read_network_graph(&*kv_store_ref, logger_ref),
Expand All@@ -1528,26 +1528,21 @@ fn build_with_store_internal(
 },
	};

	let persister = Arc::new(Persister::new(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
	));

	// Initialize the ChainMonitor
	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 Arc::clone(&persister),
 Arc::clone(&keys_manager),
 peer_storage_key,
	));
	let chain_monitor: Arc<ChainMonitor> = {
 let persister = Arc::try_unwrap(monitor_reader)
 .unwrap_or_else(|_| panic!("Arc<AsyncPersister> should have no other references"));
 Arc::new(chainmonitor::ChainMonitor::new_async_beta(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 persister,
 Arc::clone(&keys_manager),
 peer_storage_key,
 true,
 ))
	};

	// Initialize the network graph, scorer, and router
	let network_graph = match network_graph_res {
Expand Down

20 changes: 20 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,6 +691,26 @@ where
 if info.status == PaymentStatus::Succeeded
 || matches!(info.kind, PaymentKind::Spontaneous { .. })
 {
 let stored_preimage = match info.kind {
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might or might not conflict with #811, we'll also need to think through this depending on the order these land.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, concern still stands, I'll see to continue work on #811 in the next days so we can decide better.
 PaymentKind::Bolt11 { preimage, .. }
 | PaymentKind::Bolt11Jit { preimage, .. }
 | PaymentKind::Bolt12Offer { preimage, .. }
 | PaymentKind::Bolt12Refund { preimage, .. }
 | PaymentKind::Spontaneous { preimage, .. } => preimage,
 _ => None,
 };

 if let Some(preimage) = stored_preimage {
 log_info!(
 self.logger,
 "Re-claiming previously succeeded payment with hash {} of {}msat",
 hex_utils::to_string(&payment_hash.0),
 amount_msat,
 );
 self.channel_manager.claim_funds(preimage);
 return Ok(());
 }

 log_info!(
 self.logger,
 "Refused duplicate inbound payment from payment hash {} of {}msat",
Expand Down

58 changes: 44 additions & 14 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,7 @@ use lightning::routing::gossip;
use lightning::routing::router::DefaultRouter;
use lightning::routing::scoring::{CombinedScorer, ProbabilisticScoringFeeParameters};
use lightning::sign::InMemorySigner;
use lightning::util::persist::{
	KVStore, KVStoreSync, MonitorUpdatingPersister, MonitorUpdatingPersisterAsync,
};
use lightning::util::persist::{KVStore, KVStoreSync, MonitorUpdatingPersisterAsync};
use lightning::util::ser::{Readable, Writeable, Writer};
use lightning::util::sweep::OutputSweeper;
use lightning_block_sync::gossip::GossipVerifier;
Expand DownExpand Up@@ -135,6 +133,39 @@ impl<'a> KVStoreSync for dyn DynStoreTrait + 'a {

pub(crate) type DynStore = dyn DynStoreTrait;

// Newtype wrapper that implements `KVStore` for `Arc<DynStore>`. This is needed because `KVStore`
// methods return `impl Future`, which is not object-safe. `DynStoreTrait` works around this by
// returning `Pin<Box<dyn Future>>` instead, and this wrapper bridges the two by delegating
// `KVStore` methods to the corresponding `DynStoreTrait::*_async` methods.
#[derive(Clone)]
pub(crate) struct DynStoreRef(pub(crate) Arc<DynStore>);
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, yet another boilerplate wrapper around KVStore. Note that this might conflict with #692 and/or needs to be DRYed up with the work there or any uniffi-related wrappers we introduce there or in a follow up. Ofc. depends on what ends up landing first. Also cc @enigbe.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise still an unresolved question to me.

impl KVStore for DynStoreRef {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> impl Future<Output = Result<Vec<u8>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::read_async(&*self.0, primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::write_async(&*self.0, primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::remove_async(&*self.0, primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> impl Future<Output = Result<Vec<String>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::list_async(&*self.0, primary_namespace, secondary_namespace)
	}
}

pub(crate) struct DynStoreWrapper<T: SyncAndAsyncKVStore + Send + Sync>(pub(crate) T);

impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T> {
Expand DownExpand Up@@ -188,7 +219,7 @@ impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T>
}

pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
Arc<DynStore>,
DynStoreRef,
	RuntimeSpawner,
	Arc<Logger>,
	Arc<KeysManager>,
Expand All@@ -197,22 +228,21 @@ pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
	Arc<OnchainFeeEstimator>,
>;

pub type Persister = MonitorUpdatingPersister<
	Arc<DynStore>,
	Arc<Logger>,
	Arc<KeysManager>,
	Arc<KeysManager>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
>;

pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
	InMemorySigner,
	Arc<ChainSource>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
	Arc<Logger>,
	Arc<Persister>,
	chainmonitor::AsyncPersister<
 DynStoreRef,
 RuntimeSpawner,
 Arc<Logger>,
 Arc<KeysManager>,
 Arc<KeysManager>,
 Arc<Broadcaster>,
 Arc<OnchainFeeEstimator>,
	>,
	Arc<KeysManager>,
>;

Expand Down

2 changes: 1 addition & 1 deletion
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1262,8 +1262,8 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
	);

	println!("\nB close_channel (force: {})", force_close);
	tokio::time::sleep(Duration::from_secs(1)).await;
	if force_close {
 tokio::time::sleep(Duration::from_secs(1)).await;
 node_a.force_close_channel(&user_channel_id_a, node_b.node_id(), None).unwrap();
	} else {
 node_a.close_channel(&user_channel_id_a, node_b.node_id()).unwrap();
Expand Down
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('^' + ".*" + '
Enable deferred writing by joostjager · Pull Request #782 · lightningdevkit/ldk-node · GitHub
Skip to content
Enable deferred writing#782

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

from

Mar 26, 2026
 Merged


Enable deferred writing
#782
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b088b35

Switch to chain monitor deferred writes mode


joostjager Feb 9, 2026
8f10f90

Re-claim inbound payments when preimage is already known


joostjager Feb 11, 2026
5b39741

Use async chain monitor persister


joostjager Feb 26, 2026

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


26 changes: 13 additions & 13 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,17 +39,17 @@ default = []
#lightning-liquidity = { version = "0.2.0", features = ["std"] }
#lightning-macros = { version = "0.2.0" }

lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
Expand DownExpand Up@@ -79,13 +79,13 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/tnull/bitcoin-payment-instructions", rev = "e9d7c07d7affc7714b023c853a65771e45277467" }
bitcoin-payment-instructions = { git = "https://github.com/joostjager/bitcoin-payment-instructions", branch = "ldk-dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std", "_test_utils"] }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std", "_test_utils"] }
rand = { version = "0.9.2", default-features = false, features = ["std", "thread_rng", "os_rng"] }
proptest = "1.0.0"
regex = "1.5.6"
Expand Down

43 changes: 19 additions & 24 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,9 @@ use crate::peer_store::PeerStore;
use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreWrapper, GossipSync, Graph,
	KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager, PendingPaymentStore,
Persister, SyncAndAsyncKVStore,
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
GossipSync, Graph, KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager,
PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1495,7 +1495,7 @@ fn build_with_store_internal(

	let peer_storage_key = keys_manager.get_peer_storage_key();
	let monitor_reader = Arc::new(AsyncPersister::new(
 Arc::clone(&kv_store),
DynStoreRef(Arc::clone(&kv_store)),
 RuntimeSpawner::new(Arc::clone(&runtime)),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
Expand All@@ -1508,7 +1508,7 @@ fn build_with_store_internal(
	// Read ChannelMonitors and the NetworkGraph
	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (monitor_read_res, network_graph_res) = runtime.block_on(async move {
	let (monitor_read_res, network_graph_res) = runtime.block_on(async {
 tokio::join!(
 monitor_reader.read_all_channel_monitors_with_updates_parallel(),
 read_network_graph(&*kv_store_ref, logger_ref),
Expand All@@ -1528,26 +1528,21 @@ fn build_with_store_internal(
 },
	};

	let persister = Arc::new(Persister::new(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
	));

	// Initialize the ChainMonitor
	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 Arc::clone(&persister),
 Arc::clone(&keys_manager),
 peer_storage_key,
	));
	let chain_monitor: Arc<ChainMonitor> = {
 let persister = Arc::try_unwrap(monitor_reader)
 .unwrap_or_else(|_| panic!("Arc<AsyncPersister> should have no other references"));
 Arc::new(chainmonitor::ChainMonitor::new_async_beta(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 persister,
 Arc::clone(&keys_manager),
 peer_storage_key,
 true,
 ))
	};

	// Initialize the network graph, scorer, and router
	let network_graph = match network_graph_res {
Expand Down

20 changes: 20 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,6 +691,26 @@ where
 if info.status == PaymentStatus::Succeeded
 || matches!(info.kind, PaymentKind::Spontaneous { .. })
 {
 let stored_preimage = match info.kind {
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might or might not conflict with #811, we'll also need to think through this depending on the order these land.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, concern still stands, I'll see to continue work on #811 in the next days so we can decide better.
 PaymentKind::Bolt11 { preimage, .. }
 | PaymentKind::Bolt11Jit { preimage, .. }
 | PaymentKind::Bolt12Offer { preimage, .. }
 | PaymentKind::Bolt12Refund { preimage, .. }
 | PaymentKind::Spontaneous { preimage, .. } => preimage,
 _ => None,
 };

 if let Some(preimage) = stored_preimage {
 log_info!(
 self.logger,
 "Re-claiming previously succeeded payment with hash {} of {}msat",
 hex_utils::to_string(&payment_hash.0),
 amount_msat,
 );
 self.channel_manager.claim_funds(preimage);
 return Ok(());
 }

 log_info!(
 self.logger,
 "Refused duplicate inbound payment from payment hash {} of {}msat",
Expand Down

58 changes: 44 additions & 14 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,7 @@ use lightning::routing::gossip;
use lightning::routing::router::DefaultRouter;
use lightning::routing::scoring::{CombinedScorer, ProbabilisticScoringFeeParameters};
use lightning::sign::InMemorySigner;
use lightning::util::persist::{
	KVStore, KVStoreSync, MonitorUpdatingPersister, MonitorUpdatingPersisterAsync,
};
use lightning::util::persist::{KVStore, KVStoreSync, MonitorUpdatingPersisterAsync};
use lightning::util::ser::{Readable, Writeable, Writer};
use lightning::util::sweep::OutputSweeper;
use lightning_block_sync::gossip::GossipVerifier;
Expand DownExpand Up@@ -135,6 +133,39 @@ impl<'a> KVStoreSync for dyn DynStoreTrait + 'a {

pub(crate) type DynStore = dyn DynStoreTrait;

// Newtype wrapper that implements `KVStore` for `Arc<DynStore>`. This is needed because `KVStore`
// methods return `impl Future`, which is not object-safe. `DynStoreTrait` works around this by
// returning `Pin<Box<dyn Future>>` instead, and this wrapper bridges the two by delegating
// `KVStore` methods to the corresponding `DynStoreTrait::*_async` methods.
#[derive(Clone)]
pub(crate) struct DynStoreRef(pub(crate) Arc<DynStore>);
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, yet another boilerplate wrapper around KVStore. Note that this might conflict with #692 and/or needs to be DRYed up with the work there or any uniffi-related wrappers we introduce there or in a follow up. Ofc. depends on what ends up landing first. Also cc @enigbe.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise still an unresolved question to me.

impl KVStore for DynStoreRef {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> impl Future<Output = Result<Vec<u8>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::read_async(&*self.0, primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::write_async(&*self.0, primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::remove_async(&*self.0, primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> impl Future<Output = Result<Vec<String>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::list_async(&*self.0, primary_namespace, secondary_namespace)
	}
}

pub(crate) struct DynStoreWrapper<T: SyncAndAsyncKVStore + Send + Sync>(pub(crate) T);

impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T> {
Expand DownExpand Up@@ -188,7 +219,7 @@ impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T>
}

pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
Arc<DynStore>,
DynStoreRef,
	RuntimeSpawner,
	Arc<Logger>,
	Arc<KeysManager>,
Expand All@@ -197,22 +228,21 @@ pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
	Arc<OnchainFeeEstimator>,
>;

pub type Persister = MonitorUpdatingPersister<
	Arc<DynStore>,
	Arc<Logger>,
	Arc<KeysManager>,
	Arc<KeysManager>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
>;

pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
	InMemorySigner,
	Arc<ChainSource>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
	Arc<Logger>,
	Arc<Persister>,
	chainmonitor::AsyncPersister<
 DynStoreRef,
 RuntimeSpawner,
 Arc<Logger>,
 Arc<KeysManager>,
 Arc<KeysManager>,
 Arc<Broadcaster>,
 Arc<OnchainFeeEstimator>,
	>,
	Arc<KeysManager>,
>;

Expand Down

2 changes: 1 addition & 1 deletion
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1262,8 +1262,8 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
	);

	println!("\nB close_channel (force: {})", force_close);
	tokio::time::sleep(Duration::from_secs(1)).await;
	if force_close {
 tokio::time::sleep(Duration::from_secs(1)).await;
 node_a.force_close_channel(&user_channel_id_a, node_b.node_id(), None).unwrap();
	} else {
 node_a.close_channel(&user_channel_id_a, node_b.node_id()).unwrap();
Expand Down
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); }
})();
})();
Enable deferred writing by joostjager · Pull Request #782 · lightningdevkit/ldk-node · GitHub
Skip to content
Enable deferred writing#782

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

from

Mar 26, 2026
 Merged


Enable deferred writing
#782
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
b088b35

Switch to chain monitor deferred writes mode


joostjager Feb 9, 2026
8f10f90

Re-claim inbound payments when preimage is already known


joostjager Feb 11, 2026
5b39741

Use async chain monitor persister


joostjager Feb 26, 2026

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


26 changes: 13 additions & 13 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,17 +39,17 @@ default = []
#lightning-liquidity = { version = "0.2.0", features = ["std"] }
#lightning-macros = { version = "0.2.0" }

lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953" }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["tokio"] }
lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }
lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std"] }
lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
Expand DownExpand Up@@ -79,13 +79,13 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/tnull/bitcoin-payment-instructions", rev = "e9d7c07d7affc7714b023c853a65771e45277467" }
bitcoin-payment-instructions = { git = "https://github.com/joostjager/bitcoin-payment-instructions", branch = "ldk-dcf0c203e166da2348bef12b2e5eff4a250cdec7" }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "49912057895ddfbd69d503de67c80d5576c09953", features = ["std", "_test_utils"] }
lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "dcf0c203e166da2348bef12b2e5eff4a250cdec7", features = ["std", "_test_utils"] }
rand = { version = "0.9.2", default-features = false, features = ["std", "thread_rng", "os_rng"] }
proptest = "1.0.0"
regex = "1.5.6"
Expand Down

43 changes: 19 additions & 24 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,9 +76,9 @@ use crate::peer_store::PeerStore;
use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreWrapper, GossipSync, Graph,
	KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager, PendingPaymentStore,
Persister, SyncAndAsyncKVStore,
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
GossipSync, Graph, KeysManager, MessageRouter, OnionMessenger, PaymentStore, PeerManager,
PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1495,7 +1495,7 @@ fn build_with_store_internal(

	let peer_storage_key = keys_manager.get_peer_storage_key();
	let monitor_reader = Arc::new(AsyncPersister::new(
 Arc::clone(&kv_store),
DynStoreRef(Arc::clone(&kv_store)),
 RuntimeSpawner::new(Arc::clone(&runtime)),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
Expand All@@ -1508,7 +1508,7 @@ fn build_with_store_internal(
	// Read ChannelMonitors and the NetworkGraph
	let kv_store_ref = Arc::clone(&kv_store);
	let logger_ref = Arc::clone(&logger);
	let (monitor_read_res, network_graph_res) = runtime.block_on(async move {
	let (monitor_read_res, network_graph_res) = runtime.block_on(async {
 tokio::join!(
 monitor_reader.read_all_channel_monitors_with_updates_parallel(),
 read_network_graph(&*kv_store_ref, logger_ref),
Expand All@@ -1528,26 +1528,21 @@ fn build_with_store_internal(
 },
	};

	let persister = Arc::new(Persister::new(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 PERSISTER_MAX_PENDING_UPDATES,
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&fee_estimator),
	));

	// Initialize the ChainMonitor
	let chain_monitor: Arc<ChainMonitor> = Arc::new(chainmonitor::ChainMonitor::new(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 Arc::clone(&persister),
 Arc::clone(&keys_manager),
 peer_storage_key,
	));
	let chain_monitor: Arc<ChainMonitor> = {
 let persister = Arc::try_unwrap(monitor_reader)
 .unwrap_or_else(|_| panic!("Arc<AsyncPersister> should have no other references"));
 Arc::new(chainmonitor::ChainMonitor::new_async_beta(
 Some(Arc::clone(&chain_source)),
 Arc::clone(&tx_broadcaster),
 Arc::clone(&logger),
 Arc::clone(&fee_estimator),
 persister,
 Arc::clone(&keys_manager),
 peer_storage_key,
 true,
 ))
	};

	// Initialize the network graph, scorer, and router
	let network_graph = match network_graph_res {
Expand Down

20 changes: 20 additions & 0 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -691,6 +691,26 @@ where
 if info.status == PaymentStatus::Succeeded
 || matches!(info.kind, PaymentKind::Spontaneous { .. })
 {
 let stored_preimage = match info.kind {
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might or might not conflict with #811, we'll also need to think through this depending on the order these land.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, concern still stands, I'll see to continue work on #811 in the next days so we can decide better.
 PaymentKind::Bolt11 { preimage, .. }
 | PaymentKind::Bolt11Jit { preimage, .. }
 | PaymentKind::Bolt12Offer { preimage, .. }
 | PaymentKind::Bolt12Refund { preimage, .. }
 | PaymentKind::Spontaneous { preimage, .. } => preimage,
 _ => None,
 };

 if let Some(preimage) = stored_preimage {
 log_info!(
 self.logger,
 "Re-claiming previously succeeded payment with hash {} of {}msat",
 hex_utils::to_string(&payment_hash.0),
 amount_msat,
 );
 self.channel_manager.claim_funds(preimage);
 return Ok(());
 }

 log_info!(
 self.logger,
 "Refused duplicate inbound payment from payment hash {} of {}msat",
Expand Down

58 changes: 44 additions & 14 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,9 +23,7 @@ use lightning::routing::gossip;
use lightning::routing::router::DefaultRouter;
use lightning::routing::scoring::{CombinedScorer, ProbabilisticScoringFeeParameters};
use lightning::sign::InMemorySigner;
use lightning::util::persist::{
	KVStore, KVStoreSync, MonitorUpdatingPersister, MonitorUpdatingPersisterAsync,
};
use lightning::util::persist::{KVStore, KVStoreSync, MonitorUpdatingPersisterAsync};
use lightning::util::ser::{Readable, Writeable, Writer};
use lightning::util::sweep::OutputSweeper;
use lightning_block_sync::gossip::GossipVerifier;
Expand DownExpand Up@@ -135,6 +133,39 @@ impl<'a> KVStoreSync for dyn DynStoreTrait + 'a {

pub(crate) type DynStore = dyn DynStoreTrait;

// Newtype wrapper that implements `KVStore` for `Arc<DynStore>`. This is needed because `KVStore`
// methods return `impl Future`, which is not object-safe. `DynStoreTrait` works around this by
// returning `Pin<Box<dyn Future>>` instead, and this wrapper bridges the two by delegating
// `KVStore` methods to the corresponding `DynStoreTrait::*_async` methods.
#[derive(Clone)]
pub(crate) struct DynStoreRef(pub(crate) Arc<DynStore>);
@tnulltnullMar 2, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugh, yet another boilerplate wrapper around KVStore. Note that this might conflict with #692 and/or needs to be DRYed up with the work there or any uniffi-related wrappers we introduce there or in a follow up. Ofc. depends on what ends up landing first. Also cc @enigbe.
@tnulltnullMar 26, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise still an unresolved question to me.

impl KVStore for DynStoreRef {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> impl Future<Output = Result<Vec<u8>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::read_async(&*self.0, primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::write_async(&*self.0, primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> impl Future<Output = Result<(), bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::remove_async(&*self.0, primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> impl Future<Output = Result<Vec<String>, bitcoin::io::Error>> + Send + 'static {
 DynStoreTrait::list_async(&*self.0, primary_namespace, secondary_namespace)
	}
}

pub(crate) struct DynStoreWrapper<T: SyncAndAsyncKVStore + Send + Sync>(pub(crate) T);

impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T> {
Expand DownExpand Up@@ -188,7 +219,7 @@ impl<T: SyncAndAsyncKVStore + Send + Sync> DynStoreTrait for DynStoreWrapper<T>
}

pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
Arc<DynStore>,
DynStoreRef,
	RuntimeSpawner,
	Arc<Logger>,
	Arc<KeysManager>,
Expand All@@ -197,22 +228,21 @@ pub(crate) type AsyncPersister = MonitorUpdatingPersisterAsync<
	Arc<OnchainFeeEstimator>,
>;

pub type Persister = MonitorUpdatingPersister<
	Arc<DynStore>,
	Arc<Logger>,
	Arc<KeysManager>,
	Arc<KeysManager>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
>;

pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
	InMemorySigner,
	Arc<ChainSource>,
	Arc<Broadcaster>,
	Arc<OnchainFeeEstimator>,
	Arc<Logger>,
	Arc<Persister>,
	chainmonitor::AsyncPersister<
 DynStoreRef,
 RuntimeSpawner,
 Arc<Logger>,
 Arc<KeysManager>,
 Arc<KeysManager>,
 Arc<Broadcaster>,
 Arc<OnchainFeeEstimator>,
	>,
	Arc<KeysManager>,
>;

Expand Down

2 changes: 1 addition & 1 deletion
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1262,8 +1262,8 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
	);

	println!("\nB close_channel (force: {})", force_close);
	tokio::time::sleep(Duration::from_secs(1)).await;
	if force_close {
 tokio::time::sleep(Duration::from_secs(1)).await;
 node_a.force_close_channel(&user_channel_id_a, node_b.node_id(), None).unwrap();
	} else {
 node_a.close_channel(&user_channel_id_a, node_b.node_id()).unwrap();
Expand Down
Loading