fix(wasm-dpp): failing build and tests - #947
Merged
Merged
Conversation
QuantumExplorer
approved these changes
Apr 21, 2023
5 tasks
romchornyi
pushed a commit
that referenced
this pull request
Aug 22, 2026
…ashcore-dev-961 Two conflicts, both about the rust-dashcore pin, plus one semantic break the textual merge hid. `v4.2-dev` pinned `a97b32c6` in #4455, which turns out to be a side branch off the old `173ffac0` carrying cherry-picks of the seed refresh and the BIP-39 fix. This branch pinned `5877d15f`, on `dev`'s mainline. Neither contains the other. Resolved onto `dev`'s head `b66db390`, which is a superset of both: it carries the seed refresh (#970) and the BIP-39 fix (#980) that `v4.2-dev` wanted, plus #966 and #969 that this branch needs, plus the QRInfo masternode-sync recovery (#947). The hidden break: `v4.2-dev` added `get_wallet_blocking`, which calls `blocking_read()` on the wallets map — a method this branch removed when the map became an `ArcSwap`. Git merged the file cleanly and the build failed. The accessor now loads wait-free; its name is kept so the FFI callers that predate the change still compile.
romchornyi
pushed a commit
that referenced
this pull request
Aug 25, 2026
Per the decision on the blocker: the pinned branch is re-cut without #866's `rescan_committed_range`. Two reasons, and the second is the one that decides it. The Codex finding stands — the sweep accumulates every match from the birth height into one `BTreeMap` and queues them together, so an eclipsing compact-filter peer can turn a full-history rescan into a chain-length allocation followed by millions of block requests, and nothing upstream bounds it yet. More decisive is the honest case. On a real long-history CoinJoined restore the #846 backward sweep ran 191 times, reached a 2.9 GB footprint, and was killed by jetsam before finishing; the coalescing fix for that is dashpay/rust-dashcore#974, which is not merged. Shipping #866 without #974 would trade a mid-sync stall for a restore that kills the app — and long-history migrated wallets are exactly this release's audience. What the pin still carries is the point of this PR: #964, #960, #955, #947 and #946, the six sync-stall fixes, plus #945, #928, #963, #965, #967, #970 and #980. Dropping #866 restores the status quo of the previous pin rather than introducing a regression — #846's mid-sync invisibility was never fixed in what shipped — and the migrated-wallet heal (#4377) does a full rescan, so it does not lean on this sweep. #866 and #974 come back together next cycle, with a bounded drain for the accumulation finding. Branch: dashpay/rust-dashcore@chore/sync-fixes-without-swept, re-cut at 33030acf (base #945 plus eight cherry-picks, #866 omitted).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue being fixed or feature implemented
What was done?
How Has This Been Tested?
yarn testin packages/wasm-dppBreaking Changes
Checklist:
For repository code-owners and collaborators only