From 9924c105c404aa8b26763dc4c8da1506cd7ffdc5 Mon Sep 17 00:00:00 2001 From: Roman <51091564+jeanpierreroma@users.noreply.github.com> Date: Sun, 23 Aug 2026 01:06:32 +0300 Subject: [PATCH] chore: bump rust-dashcore to the merged sync fixes, minus the sweep-event chain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Six merged dash-spv fixes for stalled and slow sync have been sitting in `dev` unreachable from the app, because the pin does not follow `dev` — it is moved onto side branches cut for one fix at a time. The last bump to a `dev` revision was #4394 on 08-13; #4455 on 08-22 moved it to `a062ccb9`, a cherry-pick of the mnemonic fix on top of an older base. What that leaves out, and what this brings in: | | | |---|---| | #964 | extend the CFHeaders queue from the tick — the queue was never re-extended when block-header storage advanced without an event, and filter sync stopped for good while headers and ChainLocks carried on | | #960 | promote finished header segments from the tick, not only on a message | | #955 | resume on the invariant `start_download` asserts | | #947 | recover masternode sync from a rejected QRInfo | | #946 | release clean storage segments below the committed height during long scans | | #866 | rescan committed filter ranges for newly derived scripts | Plus #945, #928, #963, #965, #967, #970, and #980 — the multilingual BIP-39 fix the current pin carries, so nothing regresses there. **Why a curated branch rather than `dev` HEAD.** `dev` also contains #961, which adds `WalletEvent::TransactionsSwept`, and #962/#966/#969 on top of it. That variant makes four `match` sites in `rs-platform-wallet` non-exhaustive, so pinning `dev` does not compile here — handling it is the substance of #4406 and is not something this bump should duplicate. The branch is `dev` with that chain left out: base `55afccfc` (#945) plus nine cherry-picks, every one applying without conflict. The exclusion has a cost worth stating: #961 stops a never-broadcast transaction from crediting money that does not exist, so a wallet can still read a balance that is too high in that case, and #966/#969 remove quadratic work from the sweep walk. Those arrive with #4406. This trades that for six stall fixes that are blocking users today. Ref: dashpay/rust-dashcore branch `chore/sync-fixes-without-swept`. --- Cargo.lock | 46 +++++++++++++++++++++++----------------------- Cargo.toml | 16 ++++++++-------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92026cb5b5..79f7c37fde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1229,7 +1229,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1662,7 +1662,7 @@ dependencies = [ [[package]] name = "dash-network" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" dependencies = [ "bincode", "bincode_derive", @@ -1673,7 +1673,7 @@ dependencies = [ [[package]] name = "dash-network-seeds" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" dependencies = [ "dash-network", ] @@ -1768,7 +1768,7 @@ dependencies = [ [[package]] name = "dash-spv" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" dependencies = [ "async-trait", "chrono", @@ -1797,7 +1797,7 @@ dependencies = [ [[package]] name = "dashcore" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" dependencies = [ "anyhow", "base64-compat", @@ -1823,12 +1823,12 @@ dependencies = [ [[package]] name = "dashcore-private" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" [[package]] name = "dashcore-rpc" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" dependencies = [ "dashcore-rpc-json", "hex", @@ -1841,7 +1841,7 @@ dependencies = [ [[package]] name = "dashcore-rpc-json" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" dependencies = [ "bincode", "dashcore", @@ -1856,7 +1856,7 @@ dependencies = [ [[package]] name = "dashcore_hashes" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" dependencies = [ "bincode", "dashcore-private", @@ -2493,7 +2493,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2554,7 +2554,7 @@ checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" dependencies = [ "cfg-if", "rustix 1.1.4", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2923,7 +2923,7 @@ dependencies = [ [[package]] name = "git-state" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" [[package]] name = "glob" @@ -3858,7 +3858,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4114,7 +4114,7 @@ dependencies = [ [[package]] name = "key-wallet" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" dependencies = [ "aes", "async-trait", @@ -4143,7 +4143,7 @@ dependencies = [ [[package]] name = "key-wallet-ffi" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" dependencies = [ "cbindgen 0.29.4", "dash-network", @@ -4159,7 +4159,7 @@ dependencies = [ [[package]] name = "key-wallet-manager" version = "0.45.0" -source = "git+https://github.com/dashpay/rust-dashcore?rev=a97b32c617c8b1fef5185bb806500b66faf8e8c4#a97b32c617c8b1fef5185bb806500b66faf8e8c4" +source = "git+https://github.com/dashpay/rust-dashcore?rev=1322ef7252fe00cbe941a574c78fe94d755c27cd#1322ef7252fe00cbe941a574c78fe94d755c27cd" dependencies = [ "async-trait", "bincode", @@ -4670,7 +4670,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -5770,7 +5770,7 @@ dependencies = [ "once_cell", "socket2 0.5.10", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6578,7 +6578,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6591,7 +6591,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6650,7 +6650,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7510,7 +7510,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8959,7 +8959,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 23dcd8d051..f5186f6121 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,14 +53,14 @@ members = [ ] [workspace.dependencies] -dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "a97b32c617c8b1fef5185bb806500b66faf8e8c4" } -dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "a97b32c617c8b1fef5185bb806500b66faf8e8c4" } -dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "a97b32c617c8b1fef5185bb806500b66faf8e8c4" } -key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "a97b32c617c8b1fef5185bb806500b66faf8e8c4" } -key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "a97b32c617c8b1fef5185bb806500b66faf8e8c4" } -key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "a97b32c617c8b1fef5185bb806500b66faf8e8c4" } -dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "a97b32c617c8b1fef5185bb806500b66faf8e8c4" } -dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "a97b32c617c8b1fef5185bb806500b66faf8e8c4" } +dashcore = { git = "https://github.com/dashpay/rust-dashcore", rev = "1322ef7252fe00cbe941a574c78fe94d755c27cd" } +dash-network-seeds = { git = "https://github.com/dashpay/rust-dashcore", rev = "1322ef7252fe00cbe941a574c78fe94d755c27cd" } +dash-spv = { git = "https://github.com/dashpay/rust-dashcore", rev = "1322ef7252fe00cbe941a574c78fe94d755c27cd" } +key-wallet = { git = "https://github.com/dashpay/rust-dashcore", rev = "1322ef7252fe00cbe941a574c78fe94d755c27cd" } +key-wallet-ffi = { git = "https://github.com/dashpay/rust-dashcore", rev = "1322ef7252fe00cbe941a574c78fe94d755c27cd" } +key-wallet-manager = { git = "https://github.com/dashpay/rust-dashcore", rev = "1322ef7252fe00cbe941a574c78fe94d755c27cd" } +dash-network = { git = "https://github.com/dashpay/rust-dashcore", rev = "1322ef7252fe00cbe941a574c78fe94d755c27cd" } +dashcore-rpc = { git = "https://github.com/dashpay/rust-dashcore", rev = "1322ef7252fe00cbe941a574c78fe94d755c27cd" } tokio-metrics = "0.5"