fix(dashmate): empty masternode status while syncing - #970
Merged
Conversation
shumkov
approved these changes
Apr 25, 2023
markin-io
pushed a commit
that referenced
this pull request
Apr 28, 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.
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
2 participants
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
Dashmate status shows empty masternode status while syncing
What was done?
Dashmate status now shows UNKNOWN masternode status while it is syncing
How Has This Been Tested?
Manual
Breaking Changes
No
Checklist:
For repository code-owners and collaborators only