From 8f5574f25d24f69bf579434ed2dc70b6a9a5595a Mon Sep 17 00:00:00 2001 From: Martin Saposnic Date: Mon, 15 Jun 2026 15:39:38 -0300 Subject: [PATCH] Bump ldk-node f13fcea -> f43d869 (90s wallet-sync timeout + LSPS4 fee_claim arg) Moves the ldk-node pin to the tip of lsp-0.7.0_accept-underpaying-htlcs_with_timing_logs, picking up: - ldk-node#39: LDK_WALLET_SYNC_TIMEOUT_SECS 10 -> 90, and - ldk-node#37: optional fee_claim on the LSPS4 liquidity source. Together with rust-lightning#22 (parallel Esplora tx_sync, already in via ldk-node's rust-lightning rev) and the prod Esplora rate-limit raise (lightning-node#838), this stops the TxSyncTimeout -> NAPI panic on cold webhook-node boots. API adaptation: ldk-node#37 added a fee_claim: Option arg to Builder::set_liquidity_source_lsps4; pass None to preserve prior behavior. bitcoin-payment-instructions stays at main's bdcef061 (no change here). --- Cargo.lock | 36 ++++++++++++++++++------------------ Cargo.toml | 2 +- src/lib.rs | 4 +++- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bdb1fa6..018a57e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1046,7 +1046,7 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "ldk-node" version = "0.7.0" -source = "git+https://github.com/moneydevkit/ldk-node.git?rev=f13fcead7e02ef4b77489a83854f204de11e902b#f13fcead7e02ef4b77489a83854f204de11e902b" +source = "git+https://github.com/moneydevkit/ldk-node.git?rev=f43d869b8ba6ee743c412663d723269d6344df8d#f43d869b8ba6ee743c412663d723269d6344df8d" dependencies = [ "base64 0.22.1", "bdk_chain", @@ -1121,7 +1121,7 @@ dependencies = [ [[package]] name = "lightning" version = "0.2.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "bech32", "bitcoin", @@ -1132,7 +1132,7 @@ dependencies = [ "lightning-macros 0.2.0", "lightning-types 0.3.0", "musig2", - "possiblyrandom 0.2.0 (git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72)", + "possiblyrandom 0.2.0 (git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e)", ] [[package]] @@ -1155,7 +1155,7 @@ dependencies = [ [[package]] name = "lightning-background-processor" version = "0.2.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "bitcoin", "bitcoin-io", @@ -1163,13 +1163,13 @@ dependencies = [ "lightning 0.2.0", "lightning-liquidity", "lightning-rapid-gossip-sync", - "possiblyrandom 0.2.0 (git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72)", + "possiblyrandom 0.2.0 (git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e)", ] [[package]] name = "lightning-block-sync" version = "0.2.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "bitcoin", "chunked_transfer", @@ -1192,7 +1192,7 @@ dependencies = [ [[package]] name = "lightning-invoice" version = "0.34.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "bech32", "bitcoin", @@ -1230,7 +1230,7 @@ dependencies = [ [[package]] name = "lightning-liquidity" version = "0.2.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "bitcoin", "chrono", @@ -1245,7 +1245,7 @@ dependencies = [ [[package]] name = "lightning-macros" version = "0.2.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "proc-macro2", "quote", @@ -1265,7 +1265,7 @@ dependencies = [ [[package]] name = "lightning-net-tokio" version = "0.2.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "bitcoin", "lightning 0.2.0", @@ -1276,7 +1276,7 @@ dependencies = [ [[package]] name = "lightning-persister" version = "0.2.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "bitcoin", "lightning 0.2.0", @@ -1287,7 +1287,7 @@ dependencies = [ [[package]] name = "lightning-rapid-gossip-sync" version = "0.2.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "bitcoin", "bitcoin-io", @@ -1298,7 +1298,7 @@ dependencies = [ [[package]] name = "lightning-transaction-sync" version = "0.2.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "bitcoin", "electrum-client", @@ -1320,7 +1320,7 @@ dependencies = [ [[package]] name = "lightning-types" version = "0.3.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "bitcoin", ] @@ -1526,7 +1526,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "possiblyrandom" version = "0.2.0" -source = "git+https://github.com/lightningdevkit/rust-lightning?rev=e9ce486a425933041b319ac72512227353310dc5#e9ce486a425933041b319ac72512227353310dc5" +source = "git+https://github.com/moneydevkit/rust-lightning?rev=9b5f40f00a623ff5e1cbe2540d79c3665589be6e#9b5f40f00a623ff5e1cbe2540d79c3665589be6e" dependencies = [ "getrandom 0.2.17", ] @@ -1534,7 +1534,7 @@ dependencies = [ [[package]] name = "possiblyrandom" version = "0.2.0" -source = "git+https://github.com/moneydevkit/rust-lightning?rev=f56f47fe6c874771cd079faaacf96c42b32fbe72#f56f47fe6c874771cd079faaacf96c42b32fbe72" +source = "git+https://github.com/lightningdevkit/rust-lightning?rev=e9ce486a425933041b319ac72512227353310dc5#e9ce486a425933041b319ac72512227353310dc5" dependencies = [ "getrandom 0.2.17", ] @@ -1983,7 +1983,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2700,7 +2700,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d62c9e7..6e6829c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ bitcoin-payment-instructions = { git = "https://github.com/moneydevkit/bitcoin-p "http", ] } # Branch: https://github.com/moneydevkit/ldk-node/commits/lsp-0.7.0_accept-underpaying-htlcs_with_timing_logs -ldk-node = { default-features = false, git = "https://github.com/moneydevkit/ldk-node.git", rev = "f13fcead7e02ef4b77489a83854f204de11e902b" } +ldk-node = { default-features = false, git = "https://github.com/moneydevkit/ldk-node.git", rev = "f43d869b8ba6ee743c412663d723269d6344df8d" } #ldk-node = { path = "../ldk-node" } napi = { version = "2", features = ["napi4"] } diff --git a/src/lib.rs b/src/lib.rs index bd6ae51..2d9fca1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -513,7 +513,9 @@ impl MdkNode { let logger_arc = Arc::clone(logger_instance()); let logger: Arc = logger_arc; builder.set_custom_logger(logger); - builder.set_liquidity_source_lsps4(lsp_node_id, lsp_address); + // Third arg is the optional LSPS4 fee_claim (added in ldk-node #37). None + // preserves prior behavior (no fee claim configured). + builder.set_liquidity_source_lsps4(lsp_node_id, lsp_address, None); if let Some(scoring) = options.scoring_param_overrides { let mut fee_params = ProbabilisticScoringFeeParameters::default();