Repository navigation
fix: guard cached governance object flags with the object lock - #7790
Conversation
|
Navigate logical layers of code changes, visualize relationships, and explore their blast radius. No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configuration
📒 Files selected for processing (1)
Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 1 remain after this review. WalkthroughGovernance-object cache reads and vote counting now use the object mutex. Deletion state updates and deletion eligibility checks use synchronized values. Priority: ⬇️ Low Estimated code review effort: 3 (Moderate) | ~20 minutes Merge Risk: ⚪ Minimal · up to The reviewed synchronization and deletion paths show no actionable new failure. The change is mergeable after normal checks. Architecture SummaryArchitecture risk: 🔵 Low · up to The change affects 1 system. Changed systems: Architecture concerns Review detailsSystems and components
Before / after behavior
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
✅ Final review complete — no blockers (commit 96767a4) · triage: normal |
thepastaclaw
left a comment
There was a problem hiding this comment.
Final validation — Phase 1 + Phase 2
Verified the supplied reviews against exact head c157ef0; no actionable in-scope defects were found. The atomic accesses and explicit copy-constructor loads remove races on the five flags, while single-store recomputation preserves threshold logic, sticky deletion, dirty-cache ordering, and serialization without exposing temporary reset values. This was static verification only: the supplied CI snapshot shows successful formatting and preliminary checks, queued ARM64 container jobs, and no project build/test results yet; the author's reported test results were not independently rerun.
Review provenance
Source: reviewer 1: glm-5.3-flash (agent: phase1-reviewer, role: general); reviewer 2: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 3: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); final verifier: gpt-6.1-sol (agent: sol-verifier, role: final-verifier)
- Triage:
lowbygpt-6.1-sol(effort low) — The diff is a small, contained concurrency fix that makes five cached flags atomic and removes transient reset values without changing vote thresholds or introducing intricate critical-surface logic. - Phase 1 reviewers:
glm-5.3-flash— general (completed, effort high); agentphase1-reviewer - Phase 1 model:
glm-5.3-flash— zai quota: 5h 99% left, weekly 69% left; passed overgemini-3.8-flash-high(antigravity below 15% reserve: weekly 15% left, 5h 100% left) - Fresh verifier:
gpt-6.1-sol— final-verifier; agentsol-verifier - Phase 2 reviewers:
gpt-6.1-sol— general (completed, effort medium); agentphase2-reviewer,gpt-6.1-sol— dash-core-commit-history (completed, effort medium); agentphase2-reviewer
Out-of-scope follow-up suggestions (1)
These are valid observations, but they are outside this PR's scope and should be handled in separate issues or author/maintainer-requested PRs rather than blocking this review.
- Dead cache members fCachedLocalValidity and strLocalValidityError are written but never read — Routine pre-existing cleanup outside this PR's scope. The members are declared in src/governance/object.h:155-156, copied in object.cpp:360-361, and updated in UpdateLocalValidity() at object.cpp:706; GetStateJson() recomputes validity rather than consuming them. Their removal is not required for this atomic-flag fix and does not meet the bar for an exceptional high-value follow-up.
- Follow-up: Consider creating a separate issue or author/maintainer-requested PR for this.
Make CountMatchingVotes() a private helper that runs with the object
lock already held, and take the lock in the public Get{Yes,No,Abstain}Count()
wrappers instead. No behavior change; this lets a caller count several
signals inside one critical section.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
CGovernanceObjectVoteFile already has a copy constructor that rebuilds mapVoteIndex against its own list, but no copy assignment (the implicit one cannot be instantiated because CGovernanceVote is not assignable). Add one with the same rebuild semantics so an owner can copy the vote file after construction, e.g. while holding a lock on the source. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
gobject get could report fCachedFunding/fCachedValid/fCachedEndorsed values that never reflected the votes, and every read of these plain bools raced with their writers: - GetStateJson() and the copy constructor (used by gobject list/diff and the Qt proposal list) read the flags with no lock on the object held. - UpdateSentinelVariables() is reached from CheckAndRemove() (cs_main + cs_store) and from IsSuperblockTriggered() (cs_sb only, including via the `masternode winners` RPC without cs_main), so no outer lock serialized the writers. - UpdateSentinelVariables() first reset the flags to their defaults and only then counted votes, so a concurrent reader could see the defaults. Mark fCachedFunding, fCachedValid, fCachedDelete, fCachedEndorsed and fDirtyCache GUARDED_BY(cs), matching fExpired and nDeletionTime, and make the getters take the lock. UpdateSentinelVariables() now counts the votes and writes every flag inside a single critical section, so readers see either the previous or the new result, concurrent recomputes cannot interleave flag by flag, and clearing fDirtyCache is ordered with the vote counts under the same lock that vote writers already hold. Setting fCachedDelete and nDeletionTime now happens together through MarkForDeletion(), so fCachedDelete implies a non-zero deletion time. GetStateJson() reads all four flags under one lock so `gobject get` returns a consistent snapshot, and the copy constructor copies all cs-guarded state while holding the source object's lock. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
c157ef0 to
6010327
Compare
CheckAndRemove() read GetDeletionTime() and then IsSetCachedDelete() in separate calls. IsSuperblockTriggered() can mark a trigger for deletion concurrently (it runs under cs_sb only, e.g. from `masternode winners`), so CheckAndRemove() could see a zero deletion time followed by a set delete flag, compute a time since deletion of "now - 0", and erase the object immediately instead of after GOVERNANCE_DELETION_DELAY. fCachedDelete is never cleared, and the previous commit makes it change together with nDeletionTime under the object lock, so reading the flag first guarantees that a set delete flag is paired with its deletion time. fExpired is unaffected: it is only set by SuperblockManager::Clean(), which runs from CheckAndRemove() itself and stamps the deletion time before this loop. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
6010327 to
96767a4
Compare
thepastaclaw
left a comment
There was a problem hiding this comment.
Re-review — Final validation — Phase 1 + Phase 2
Verified the complete four-commit PR diff at 96767a4, including callers, flag writers, serialization, copy semantics, and lock ordering; no actionable in-scope defects were found. The object lock protects cached-flag recomputation and snapshots, vote-file assignment rebuilds destination-owned iterators, and flag-before-timestamp reads prevent premature deletion. Verification was static only: the supplied CI snapshot shows successful completed builds, lint, and nowallet tests, while ASan, TSan, SQLite, standard Linux tests, and the multiprocess build remain pending.
🔴 0 blocking | 🟡 0 suggestion(s) | 💬 0 nitpick(s)
Review provenance
Source: reviewer 1: muse-spark-1.3-contributor (agent: phase1-reviewer, role: general); reviewer 2: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 3: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); reviewer 4: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 5: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); final verifier: gpt-6.1-sol (agent: sol-verifier, role: final-verifier)
- Triage:
normalbygpt-6.1-sol(effort low) — The change coordinates governance cache locking, copy semantics and deletion ordering across several files, but the diff does not introduce a large or intricate change to a qualifying critical surface. - Phase 1 reviewers:
muse-spark-1.3-contributor— general (completed, effort xhigh); agentphase1-reviewer - Phase 1 model:
muse-spark-1.3-contributor— not quota-gated; passed overgemini-3.8-flash-high(antigravity below 15% reserve: weekly 15% left, 5h 100% left),glm-5.3-flash(not used above high effort; tier asks max) - Fresh final gate: an independent Phase-2 review ran after iterative findings were reconciled
- Fresh verifier:
gpt-6.1-sol— final-verifier; agentsol-verifier - Phase 2 reviewers:
gpt-6.1-sol— general (completed, effort high); agentphase2-reviewer,gpt-6.1-sol— dash-core-commit-history (completed, effort high); agentphase2-reviewer,gpt-6.1-sol— general (completed, effort high); agentphase2-reviewer,gpt-6.1-sol— dash-core-commit-history (completed, effort high); agentphase2-reviewer
🤖 Prompt for all review comments with AI agents
These findings are from an automated code review. Verify the current code and confirm that no unresolved issues remain.
No unresolved findings remain from the prior review on this head.
…lang-analyzer null dereference) 92365cc fix(qt): reserve the coin vector in the coin control test helper (Konstantin Akimov) 9c6ccd0 fix(qt): clear ItemIsEnabled through QFlags::setFlag in coin control test (Konstantin Akimov) 7daa67d fix(test): assert the chain tip before dereferencing it in reward reallocation tests (Konstantin Akimov) Pull request description: ## Issue being fixed or feature implemented `develop` CI is red since the merge of #7260 (aec4994). Both `linux64_asan-build` and `linux64_multiprocess-build` pass on the merge of #7790 (2ca083a) and on the head of #7584 (fed2f49), and both are red on the head of #7260 (3034e98) and on its merge commit. #7260 was merged with those two jobs failing. 1. `linux64_asan` fails in `test_dash-qt`: `CoinControlTreeWidgetTests::disabledCoinsSkipped()` triggers an UBSan implicit-integer-sign-change inside `QFlags::operator&`. The test, added by #7260 in 3034e98, clears a flag with `flags() & ~Qt::ItemIsEnabled`. `~Qt::ItemIsEnabled` is evaluated as a plain `int` (-33) and QFlags converts it to its unsigned storage type. 2. `linux64_multiprocess` reports a clang static analyzer diagnostic in `test/block_reward_reallocation_tests.cpp:209`: `tip->nBits` dereferences a pointer the analyzer considers possibly null, because `GetMnRewardEraAfter()` (via `DeploymentActiveAfter()`) accepts a null `pindexPrev`. The pattern dates back to #7339 (7f2058e) and the file was last touched by #7536 in August, so this diagnostic is not caused by #7260's diff. The analyzer runs in that job because the tidy step operates on the `make distdir` copy of the tree, which does not include `src/.clang-tidy`, so clang-tidy falls back to its default `clang-analyzer-*` checks. I could not read the job log (needs credentials) to confirm that this diagnostic alone fails the step, so this part is fixed on the evidence of the pasted output. ## What was done? - `src/qt/test/coincontroltreewidgettests.cpp`: clear the flag with `flags().setFlag(Qt::ItemIsEnabled, false)`, which stays inside the `QFlags` type. - `src/test/block_reward_reallocation_tests.cpp`: wrap every chain-tip lookup that feeds `GetMnRewardEraAfter()` in `Assert()` and include `util/check.h`. The chain is never empty at those points; the assertion documents it for the analyzer and the reader. This is test code, so a fatal check is acceptable. ## How Has This Been Tested? see CI ## Breaking Changes None. ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone Top commit has no ACKs. Tree-SHA512: cd7d524e35ec6039f5b72ae05cfd498c83c00d842a617bf412de87a5759eb7fbd74f5b96698e9a3aab27174d8ac8942f5624bbe49a1028c4d9d0fbc3cfb3dd33
…t lock 96767a4 fix: read deletion flags before deletion time in CheckAndRemove (pasta) ebb27a3 fix: guard cached governance object flags with the object lock (pasta) 94df4f1 refactor: give CGovernanceObjectVoteFile a copy assignment operator (pasta) 059bf00 refactor: require cs in CGovernanceObject::CountMatchingVotes (pasta) Pull request description: ## Issue being fixed or feature implemented `gobject get` can report wrong values for `fCachedFunding`, `fCachedValid` and `fCachedEndorsed` while the node is recomputing them. For example, a proposal that has reached the funding threshold can come back as `fCachedFunding: false`, and a proposal the network voted invalid can come back as `fCachedValid: true`. The reads are also a data race on plain `bool` members. That is undefined behavior, and ThreadSanitizer reports it (see below). There are two causes: 1. The cached flags (`fCachedFunding`, `fCachedValid`, `fCachedDelete`, `fCachedEndorsed`, `fDirtyCache`) have no lock. Readers take no lock: - `CGovernanceObject::GetStateJson()`, used by `gobject get`. - The copy constructor, used by `gobject list`, `gobject diff` and the Qt proposal list through `GetAllNewerThan()`. No single outer lock covers the writers either: - `CGovernanceManager::CheckAndRemove()` holds `cs_main` + `cs_store`. - `SuperblockManager::IsSuperblockTriggered()` holds only `cs_sb`. It is called from block-template creation and block validation, and also from the `masternode winners` RPC without `cs_main`. - The vote path writes `fDirtyCache` while holding the object's own `cs`. 2. `CGovernanceObject::UpdateSentinelVariables()` first resets `fCachedFunding`/`fCachedEndorsed` to `false` and `fCachedValid` to `true`. It then counts votes, and only after that writes the real values. A reader that runs during this window sees the defaults instead of the old or the new result. There is also a related ordering bug. `fCachedDelete` was set before the lock that sets `nDeletionTime`. `CheckAndRemove()` reads `GetDeletionTime()` and then `IsSetCachedDelete()` in separate calls. If `IsSuperblockTriggered()` marks a trigger for deletion in between, `CheckAndRemove()` sees a set delete flag with a zero deletion time, computes `now - 0`, and erases the object immediately instead of after `GOVERNANCE_DELETION_DELAY`. Block validation itself is not affected. Its `IsSuperblockTriggered()` call holds `cs_main` and `cs_sb`, which already serializes it against the other writers. The visible impact is on RPC/GUI output, plus undefined behavior under the C++ memory model. ### Reproduction A throwaway test case (not part of this PR) in `governance_vote_processing_tests` reuses its single-masternode fixture. The masternode votes YES on funding and NO on validity, so with `nGovernanceMinQuorum=1` the correct state never changes: `fCachedFunding=true`, `fCachedValid=false`. One thread calls `UpdateSentinelVariables()` in a loop, as `CheckAndRemove()` / `IsSuperblockTriggered()` do. The main thread calls `GetStateJson()` for 3 seconds, as `gobject get` does, and counts reads that disagree with the correct state. <details> <summary>Test case</summary> ```cpp BOOST_AUTO_TEST_CASE(proof_cached_flags_read_during_recompute) { auto& govman = *m_node.govman; const CGovernanceObject proposal{MakeProposal(uint256::ONE)}; const uint256 parent_hash{proposal.GetHash()}; govman.AddGovernanceObjectForTesting(proposal); auto obj = govman.FindGovernanceObject(parent_hash); BOOST_REQUIRE(obj != nullptr); CGovernanceVote funding{MakeVote(parent_hash, VOTE_SIGNAL_FUNDING, VOTE_OUTCOME_YES)}; SignWithVotingKey(funding, mn_voting_key); CGovernanceVote invalid{MakeVote(parent_hash, VOTE_SIGNAL_VALID, VOTE_OUTCOME_NO)}; SignWithOperatorKey(invalid, mn_operator_key); CGovernanceException exception; uint256 hash_to_request; BOOST_REQUIRE(govman.ProcessVote(funding, exception, hash_to_request)); BOOST_REQUIRE(govman.ProcessVote(invalid, exception, hash_to_request)); const auto mn_list{tip_mn_list()}; obj->UpdateSentinelVariables(mn_list); BOOST_REQUIRE(obj->IsSetCachedFunding()); BOOST_REQUIRE(!obj->IsSetCachedValid()); std::atomic<bool> stop{false}; std::thread writer([&] { while (!stop) obj->UpdateSentinelVariables(mn_list); }); int reads{0}, wrong_funding{0}, wrong_valid{0}; const auto deadline{std::chrono::steady_clock::now() + 3s}; while (std::chrono::steady_clock::now() < deadline) { const UniValue state{obj->GetStateJson(*m_node.chainman, mn_list, /*local_valid_key=*/"fLocalValidity")}; ++reads; if (!state["fCachedFunding"].get_bool()) ++wrong_funding; if (state["fCachedValid"].get_bool()) ++wrong_valid; } stop = true; writer.join(); BOOST_TEST_MESSAGE(strprintf("GetStateJson reads=%d fCachedFunding=false seen=%d fCachedValid=true seen=%d", reads, wrong_funding, wrong_valid)); BOOST_CHECK_EQUAL(wrong_funding, 0); BOOST_CHECK_EQUAL(wrong_valid, 0); } ``` </details> Results against the unfixed tree (c14104b): ``` # regular debug build GetStateJson reads=198415 fCachedFunding=false seen=76428 fCachedValid=true seen=193173 # --with-sanitizers=thread GetStateJson reads=29726 fCachedFunding=false seen=0 fCachedValid=true seen=29726 WARNING: ThreadSanitizer: data race Write of size 1 ... by thread T11: #0 CGovernanceObject::UpdateSentinelVariables(CDeterministicMNList const&) object.cpp:996 Previous read of size 1 ... by main thread: #0 CGovernanceObject::IsSetCachedValid() const object.h:196 #1 CGovernanceObject::GetStateJson(...) const object.cpp:617 ``` ## What was done? The flags are now protected by the object's existing `cs` mutex, the same lock that already guards `fExpired`, `nDeletionTime` and the vote maps. Clang's thread-safety analysis enforces it. 1. **`refactor: require cs in CGovernanceObject::CountMatchingVotes`.** `CountMatchingVotes()` becomes a private helper with `EXCLUSIVE_LOCKS_REQUIRED(cs)`. The public `Get{Yes,No,Abstain}Count()` wrappers take the lock. No behavior change. This lets one critical section count several signals. 2. **`refactor: give CGovernanceObjectVoteFile a copy assignment operator`.** `CGovernanceObjectVoteFile` has a copy constructor that rebuilds `mapVoteIndex` (list iterators) against its own list, but no copy assignment. The implicit one can't be instantiated because `CGovernanceVote` is not assignable. This commit adds one with the same rebuild semantics, so the copy constructor in commit 3 can copy the vote file while holding the source's lock. A unit test checks that a copy-assigned file is still usable after its source is destroyed. 3. **`fix: guard cached governance object flags with the object lock`.** - The five flags are `GUARDED_BY(cs)`, and the `IsSetCached*()`/`IsSetDirtyCache()` getters take the lock, like `IsSetExpired()`. - `UpdateSentinelVariables()` counts the votes and writes every flag inside one `LOCK(cs)`. Each flag is assigned its computed value directly, with no reset to a default first. This means: - readers see either the previous result or the new one; - two recomputes running at the same time can't interleave flag by flag; - `fDirtyCache = false` is ordered with the vote counts under the same lock that vote writers already hold, so a vote arriving during a recompute still marks the object dirty. - `PrepareDeletion()` and `UpdateSentinelVariables()` share a private `MarkForDeletion()` helper that sets `fCachedDelete` and `nDeletionTime` together, so `fCachedDelete` implies a non-zero deletion time. - `GetStateJson()` reads all four flags under one lock, so `gobject get` returns a consistent snapshot. - The copy constructor copies all `cs`-guarded state while holding `other.cs`. - The computed values are the same as before. 4. **`fix: read deletion flags before deletion time in CheckAndRemove`.** `CheckAndRemove()` now reads `IsSetCachedDelete()`/`IsSetExpired()` before `GetDeletionTime()`. - `fCachedDelete` is never cleared, and it now changes together with `nDeletionTime`, so a set delete flag is always paired with its deletion time. - `fExpired` is only set by `SuperblockManager::Clean()`. That runs from `CheckAndRemove()` itself and stamps the deletion time before this loop. ### Locking notes - No code holds a governance object's `cs` while calling the getters, `UpdateSentinelVariables()`, `PrepareDeletion()`, `GetStateJson()`, or the copy constructor. The external `cs` holders only touch the vote file. - `UpdateSentinelVariables()` and `GetStateJson()` take no other lock while holding `cs`. - The `cs_main`/`cs_store`/`cs_sb` → `obj.cs` edges already existed through `GetYesCount()` and the old `UpdateSentinelVariables()`. No new lock-order edges are introduced. ### Intentionally left unchanged `fCachedLocalValidity`, `strLocalValidityError` and `fUnparsable` follow the same unguarded pattern. However, `GetStateJson()` recomputes local validity instead of reading the cache, and I found no concurrent reader of those fields, so they are out of scope here. ## How Has This Been Tested? macOS arm64, Apple clang. Built with depends using `--disable-hardening --enable-debug --enable-crash-hooks --enable-stacktraces --enable-suppress-external-warnings --without-gui --enable-tests --disable-bench --disable-fuzz-binary --enable-werror`. This enables `-Wthread-safety` as an error. - **Each commit builds on its own.** - **Thread-safety annotations are enforced.** As a mutation check, I removed the `LOCK(cs)` in `GetStateJson()`. The build then fails with `passing variable 'fCachedValid' by reference requires holding mutex 'cs' [-Werror,-Wthread-safety-reference]`. - **Reproduction above with this PR:** 0 wrong reads across three runs (148887, 155774 and 184427 reads). - **ThreadSanitizer build (`--with-sanitizers=thread`) with this PR.** The reproduction ran with a second reader added that also copy-constructs the object each iteration (the `gobject list` path). Result: no ThreadSanitizer warnings and 0 wrong reads. The same binary built from the unfixed tree reports the data race shown above. - **Regression test status.** The reproduction is not included as a regression test. It is a timing-dependent multithreaded test that runs for several seconds, and this race can't be checked deterministically in a unit test. The `CheckAndRemove()` ordering fix has the same limitation; I verified it by reviewing every writer of `fCachedDelete`, `fExpired` and `nDeletionTime`. - **New unit test:** `governance_vote_sync_tests/copy_assigned_vote_file_indexes_its_own_votes`. - `src/test/test_dash --run_test='governance*'`: `*** No errors detected`. - `test/functional/test_runner.py feature_governance.py feature_governance_cl.py feature_governance_objects.py`: all passed. - `git diff -U0 develop | contrib/devtools/clang-format-diff.py -p1` is clean except for the `LogPrint` in `CheckAndRemove()`. That call keeps its existing layout because `test/lint/lint-logs.py` needs the format string's `\n"` on the same line as `LogPrint(`. `lint-logs`, `lint-format-strings`, `lint-includes`, `lint-whitespace`, `lint-assertions`, `lint-include-guards`, `lint-locale-dependence` and `lint-circular-dependencies` pass locally. ## Breaking Changes None. RPC output fields and values are unchanged. ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ 🤖 Generated with [Claude Code](https://claude.com/claude-code) Top commit has no ACKs. Tree-SHA512: 748663c6af9c62b7f5a15083667fc5ed44907c896f0c7567aab0b08ccb9d908114b6e23c179d88773fb69e190fcb6770170a8f05469636337b67f480a1a7c2a9 (cherry picked from commit 2ca083a)
fbe6526 Merge #7807: feat(consensus): hold EvoNode shares and multiple payouts behind a new evo_shares deployment (pasta) 57fd2d9 Merge #7776: fix: keep a pending ProUpServTx across a registrar update that keeps the operator key (pasta) ca69801 Merge #7803: fix: return non-zero amount of accounts after sethdseed (pasta) 57a8f07 Merge #7796: backport: bitcoin#26720 (remaining), partial bitcoin#29523: weight-check the knapsack exact-match selection (pasta) 4eb82f6 Merge #7786: fix(net): keep a dedicated onion listener when -bind is given and correct the bind release note (pasta) 70626a0 Merge #7793: backport: partial bitcoin#28868 (wallet: reload wallet if migration exited early, keep mixed watchonly txs) (pasta) 250a3cd Merge #7790: fix: guard cached governance object flags with the object lock (pasta) 700c195 Merge #7787: fix: only sign EHF signals inside the deployment's start/timeout window (pasta) a3b0f3c Merge #7785: fix: restore the txindex requirement when governance validation is enabled (pasta) 2d1735d Merge #7794: fix(wallet): floor the denomination gap threshold so rebalancing cannot oscillate (pasta) d9f6592 Merge #7783: fix: stop fish completion from re-running the typed dash-cli command (pasta) 89d44c8 Merge #7795: backport: bitcoin#34272, partial bitcoin#31650 (pass PSBT by const reference in PSBTInputSignedAndVerified) (pasta) a1d7411 Merge #7779: fix!: report legacy evonode Platform addresses when listdiff changes its address (pasta) 73f6ea2 Merge #7789: fix(qt): report malformed lang/font settings instead of aborting at startup (pasta) 40de493 Merge #7781: fix(rpc): use a consistent tip height in quorum dkgstatus (pasta) 7d1a90d Merge #7791: fix(net): request object votes from nPeersPerHashMax peers (pasta) 51b145c Merge #7778: test: use single-member in functional tests: feature_mnehf, feature_notifications, p2p_instantsend (pasta) Pull request description: ## Issue being fixed or feature implemented Backports for v24.0.0-rc.3. `v24.0.x` was cut at the v24.0.0-rc.2 tag (1e239d4), and develop has since moved to 24.1.0 (#7775), so rc.3 is built from this branch instead of being tagged on develop like rc.1 and rc.2. ## What was done? Cherry-picked (`git cherry-pick -m1 -x`) every develop merge since rc.2 that carries `backport-candidate-24.0.x`, plus #7778, which #7807's test needs. They are in develop merge order: - #7778 test: use single-member in functional tests: feature_mnehf, feature_notifications, p2p_instantsend (test-only. Needed because #7807's `feature_evo_shares_activation.py` depends on its `mine_quorum_single_member()` fix and fails without it.) - #7791 fix(net): request object votes from nPeersPerHashMax peers - #7781 fix(rpc): use a consistent tip height in quorum dkgstatus - #7789 fix(qt): report malformed lang/font settings instead of aborting at startup - #7779 fix!: report legacy evonode Platform addresses when listdiff changes its address - #7795 backport: bitcoin#34272, partial bitcoin#31650 (pass PSBT by const reference in PSBTInputSignedAndVerified) - #7783 fix: stop fish completion from re-running the typed dash-cli command - #7794 fix(wallet): floor the denomination gap threshold so rebalancing cannot oscillate - #7785 fix: restore the txindex requirement when governance validation is enabled - #7787 fix: only sign EHF signals inside the deployment's start/timeout window - #7790 fix: guard cached governance object flags with the object lock - #7793 backport: partial bitcoin#28868 (wallet: reload wallet if migration exited early, keep mixed watchonly txs) - #7786 fix(net): keep a dedicated onion listener when -bind is given and correct the bind release note. Includes partial bitcoin#36170 (5f40d56). Upstream's dedicated-onion-bind changes to `feature_torcontrol.py` and `p2p_private_broadcast.py` are not included, because those tests depend on upstream commits (5693833, e74d54e) that Dash does not have. - #7796 backport: bitcoin#26720 (remaining), partial bitcoin#29523: weight-check the knapsack exact-match selection - #7803 fix: return non-zero amount of accounts after sethdseed - #7776 fix: keep a pending ProUpServTx across a registrar update that keeps the operator key - #7807 feat(consensus): hold EvoNode shares and multiple payouts behind a new evo_shares deployment One pick needed conflict resolution, in a test only, described in its commit message: #7793, `test/functional/wallet_migration.py`. `test_conflict_txs()` comes from bitcoin#28542 (#7762), which is not on this branch, so it is left out. The C++ part of #7793 is identical to develop. Merged since rc.2 but intentionally not included: #7775 (24.1 version bump), #7260 and #7804 (new Qt feature and its CI fix), #7584 (refactor), routine upstream backports #7257, #7759, #7762, #7768, #7788, #7801, and test/CI-only changes #7777 and #7797. No version change is needed. `configure.ac` is already 24.0.0 with `CLIENT_VERSION_IS_RELEASE` false, so the build takes its version string from the `v24.0.0-rc.3` tag, as it did for rc.2. ## How Has This Been Tested? Built on macOS arm64 against depends with `--enable-debug --enable-werror` (dashd, dash-qt, tests). - `make check`: all unit test suites pass, including `test_dash-qt`. - Functional tests, all passing: `feature_evo_shares_activation.py`, `feature_masternode_shares.py`, `feature_mnehf.py`, `feature_governance.py --descriptors`, `feature_governance_objects.py`, `feature_governance_txindex_devnet.py`, `feature_proxy.py`, `feature_notifications.py`, `feature_llmq_connections.py`, `feature_llmq_chainlocks_automatic.py`, `feature_llmq_singlenode.py`, `p2p_instantsend.py`, `rpc_blockchain.py` (v1 and v2 transport), `rpc_netinfo.py`, `rpc_quorum.py`, `rpc_verifychainlock.py`, `wallet_hd.py` (legacy and descriptors), `wallet_migration.py`. - `feature_bind_extra.py` (from #7786) only runs on Linux and was skipped locally, so CI covers it. Every touched file was diffed against develop. The remaining differences come only from develop PRs that are not part of this backport. ## Breaking Changes Carried over from the picked PRs: - #7807: consensus change behind the new `evo_shares` deployment (bit 14). Mainnet and testnet are unaffected until it activates. Devnets with `v24` already active and an EvoNode carrying several owner payouts need to check or reset. New RPC `protx shared_register_prepare_evo`. - #7785: outside regtest, a node with `-txindex=0` and without `-disablegovernance` refuses to start again, as before v23.1.0. - #7786: carries a partial bitcoin#36170. A node started with `-bind` but no specific `-bind=<addr:port>=onion` now refuses to start while `-listenonion` is enabled. That is the default when listening, even without Tor configured. A wildcard onion bind is also refused. Such nodes need `-bind=127.0.0.1:<port>=onion` or `-listenonion=0`. Nodes without `-bind`, including those using only `-whitebind`, keep the default `127.0.0.1:9996` (`19996` testnet) onion target. See `doc/release-notes-7300.md`. - #7779: `protx listdiff` now includes `platform_p2p` and `platform_https` for a legacy-address evonode whose core P2P address changes. ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone 🤖 Generated with [Claude Code](https://claude.com/claude-code) Top commit has no ACKs. Tree-SHA512: 8cb01bdb0234f31b5dd2c105b69673de148922991a7523627395c0e0ccfa22b94be5ffbecc842398d443bc90fd9baf2eee6a9cf6fcdbbd1626eb00b93726a55a
d6c066f chore: add v23.1.10 to the flatpak release history (pasta) 202632c chore: release v24.0.0 (pasta) 2bf133c docs: cite #8042 for the index fixes in the v24.0.0 release notes (pasta) 8aa11f6 docs: add the v24.0.0-rc.7 picks and index fixes to the v24.0.0 release notes (pasta) ad4e5d6 docs: drop the index caveat from the -reindex-chainstate man page entry (pasta) 19a90bb test: blocks orphaned while the address index is disabled are removed from it (pasta) d2f2a1f fix(index): don't adopt an empty or rebuilt async index as migrated legacy data (pasta) e3bafdb fix(index): reject an uncommitted tip the block index lost (pasta) 9198962 fix(index): check the blocks governance resumes from at startup (pasta) baff347 fix(index): resume from the tip a skipped commit leaves behind (pasta) 2dbf5ca fix(index): write a rewound block's erasures in one batch with its locator (pasta) 252acbe fix(index): move the committed locator below the entries a rewind erases (Konstantin Akimov) e9f9c8a Merge bitcoin#36150: indexes: set prune lock to genesis before first block (Konstantin Akimov) 2edeb98 partial Merge bitcoin#34897: indexes: Don't commit ahead of the flushed chainstate (Konstantin Akimov) 3eba84c Merge bitcoin#32875: index: handle case where pindex_prev equals chain tip in NextSyncBlock() (Konstantin Akimov) 399125c Merge bitcoin#32882: index: remove unnecessary locator cleaning in BaseIndex::Init() (Konstantin Akimov) bb724c6 Merge bitcoin#33212: index: Don't commit state in BaseIndex::Rewind (Konstantin Akimov) d5ff431 Merge bitcoin#32878: index: fix wrong assert of current_tip == m_best_block_index (Konstantin Akimov) 31c7d8f partial Merge bitcoin#32580: wallet, test: best block locator matches scan state follow-ups (Konstantin Akimov) 94f5c58 partial Merge bitcoin#30221: wallet: Ensure best block matches wallet scan state (Konstantin Akimov) 8e0b1e8 partial Merge bitcoin#32069: test: fix intermittent failure in wallet_reorgsrestore.py (Konstantin Akimov) 4d17947 Merge bitcoin#25193: indexes: Read the locator's top block during init, allow interaction with reindex-chainstate (Konstantin Akimov) 0127df8 Merge #8045: test: scale the mempool-loaded wait by timeout_factor so TSAN reindex restarts stop timing out (pasta) 62d0cef Merge #8036: fix(qt): let a shared masternode participant follow a revised invitation that keeps their share (merge-script) 775d31c Merge #8018: fix(consensus): require IPv4 masternode primaries until IPv4 is optional, pin mainnet ports (merge-script) e1b826e Merge #8026: fix(qt): keep shared masternode contribution fields locked while coins are reserved (merge-script) 9fa3df3 Merge #8020: fix(rpc): make protx shared_sign sign only dissolutions that return every principal (merge-script) 246a465 Merge #8024: fix(qt): keep the shared masternode dissolve dialog consistent with what it will send (merge-script) 590ad0a Merge #8021: fix(qt): don't load a newer shared masternode session copy that changes your own share (merge-script) 974aaa3 Merge #8034: fix(qt): check a shared masternode's service and refund addresses before coins are reserved (merge-script) 0026e3e Merge #8027: fix(qt): fund a shared masternode's service update from this wallet by default (merge-script) 6a5d2dc Merge #8035: fix(qt): don't strand coins reserved for a shared masternode session (merge-script) df6083a Merge #8032: fix(qt): don't offer a new operator key when reopening a shared masternode session (merge-script) 2b5bf30 Merge #8029: fix: let dashd -version, -help and first start work without an existing data directory (merge-script) e33d9b1 Merge #8037: docs: list the config file path each Linux init system uses (merge-script) 6030ea0 docs: add the #8014 migratewallet fixes to the v24.0.0 release notes (pasta) 1b1ea95 Merge #8014: backport: bitcoin#28609, bitcoin#34215, bitcoin#34226, bitcoin#34370, partials bitcoin#31423, bitcoin#34156 (migratewallet fixes from 28.x) (merge-script) 608ff63 Merge bitcoin#28542: wallet: Check for uninitialized last processed and conflicting heights in MarkConflicted (DCG-Claude) 3af6f63 Merge bitcoin#28038: wallet: address book migration bug fixes (DCG-Claude) 2fe41fb docs: add ecosystem notes on Asset Unlock txids, coinbase payees and RPC errors (pasta) 0e3f653 docs: correct operator guidance in the v24.0.0 release notes for rc.7 (pasta) 11c8140 Merge #8019: fix(qt): stop reporting refused shared masternode broadcasts as sent (merge-script) cdb250c doc: note operator-relevant v23.1.x patch-release changes for v24.0.0 (pasta) fcd332b doc: state the provider-transaction InstantSend change on its own (pasta) e6f3ad4 fix(bls): stop weighted contribution batch verification on an invalid partial aggregate (pasta) e04acba fix(llmq): weight batched DKG contribution verification (UdjinM6) ed96227 fix(bls): weight batch-verified signatures so complementary errors cannot cancel (UdjinM6) b5c7985 fix(governance): don't vote on triggers while not synced (pasta) a79f432 fix(governance): don't vote NO-FUNDING on triggers before their maturity window (pasta) 8615244 fix(llmq): accept equal DKG secret key shares when aggregating a member's share (pasta) 1c356f4 test: cover DKG members dealing identical contributions (UdjinM6) f23f748 fix(llmq): drop DKG members whose verification vectors share coefficients (UdjinM6) 914c052 docs: add #8003 to the v24.0.0 release notes and man pages (pasta) e81c511 Merge #8003: fix(net): don't refuse to start over the automatic onion service unless -listenonion=1 (merge-script) 41b4578 ci: run cppcheck as test/lint/cppcheck-dash.py, as develop does since #7966 (pasta) c97f3b3 docs: regenerate man pages for v24.0.0-rc.6 (pasta) 784312c docs: add the v24.0.0-rc.6 changes to the v24.0.0 release notes (pasta) f15a53a Merge #7991: fix(qt): shared masternode wizard fixes for taken shares, unconfirmed funding and reply handling (merge-script) 1c46224 Merge #7995: fix(wallet): don't let a waiting CoinJoin promotion/demotion queue block standard mixing (merge-script) 546db2f Merge #7996: fix(wallet): fill a CoinJoin promotion with sibling coins when needed (merge-script) 349859f Merge #7957: fix(qt): validate shared-masternode shares with the consensus rules (merge-script) 9091f0b Merge #8005: backport: bitcoin#27114, bitcoin#33395 (merge-script) e915ab5 Merge #7990: fix(wallet): pay for 3 byte input and output counts so 253+ input sends work (merge-script) 4f4d188 Merge #7984: chore: Translations 2026-10 (pasta) 129a1fc Merge #7980: chore: update seeds, checkpoints, minimum chain work, assumevalid and tx stats for v24 (pasta) 5800e5d docs: state that SPORK_3/SPORK_9 were already hardened on mainnet (pasta) ddc82a8 docs: separate extended addresses from shared masternodes in v24 notes (pasta) 8660e54 docs: complete the v24.0.0 release notes against the full v24 changeset (pasta) 11ea306 Merge #7947: fix: stop quorum key warming from stalling DKG on 2-core masternodes (pasta) 25d7c85 Merge #7826: fix: skip repeated authenticated Platform bans (pasta) 18073dd Merge #7850: perf: let CHECKDATASIG use the signature cache (pasta) 3759397 Merge #7833: fix: gate signing intake before quorum retrieval (pasta) db98ee2 fix: keep flat-file positions 64-bit clean at the remaining raw seek/tell sites (Konstantin Akimov) 54c9738 Merge bitcoin#36667: net: enforce timeout interval for paused send peers (Konstantin Akimov) f1adb2c Merge bitcoin#36665: sock: align exception monitoring between poll() and select() backends (Konstantin Akimov) 8becf6a Merge bitcoin#36669: refactor: store positions as a 64 bits integer in flatfiles (Konstantin Akimov) 4c0cbd6 fix(llmq): judge every sig-share sender by its own verified shares (pasta) 649259f fix(governance): cap the orphan parent objects re-requested per tick (pasta) 418f5ee fix(llmq): verify DKG contributions individually when a batch vvec check fails (pasta) abf2eb0 fix(llmq): reject invalid decrypted DKG shares before aggregation (pasta) 39bda8f fix(consensus): reject negative transaction nVersion after DIP3 (pasta) 1ba2609 Merge #7951: fix(net): stop peers lingering after disconnect under edge-triggered epoll (pasta) 696d45f Merge #7861: feat: keep at least 4-days worth blocks after pruning (merge-script) 9cd1c72 Merge #7869: fix: let startup block replay handle quorum commitments and asset unlocks (pasta) 73e7254 Merge #7682: build: finish relic_conf.h regeneration before compiling BLS consumers (pasta) 7312925 ci: bake the macOS SDK into the CI runner image (pasta) d885ecd Merge #7916: backport: bitcoin#27800, bitcoin#28125, bitcoin#28232, bitcoin#27695 (merge-script) f55ad1d Merge bitcoin#28139: test: create wallet specific for test_locked_wallet case (DCG-Claude) 80f6cbe chore: add the v23.1.9 release entry to flatpak metainfo (pasta) 5ba801f chore: use translation source strings generated from v24.0.x (pasta) a3b9e30 Merge #7974: chore: update man pages, translation strings, SECURITY.md and flatpak for v24.0.0 (pasta) b5d26bd feat(consensus): schedule V24 and evo_shares on mainnet for November 9, 2026 (pasta) fe78211 docs: state the earliest v24 activation height and the v23.1.9 fixes (pasta) 3bbe3e2 docs: address review of v24.0.0 release notes (pasta) 28c39fc docs: add v24.0.0 release notes and remove individual release notes files (pasta) e8cbfaf docs: archive v23.1.8 and v23.1.9 release notes (pasta) 6c02b2b ci: let DEPENDS_ARCH override the machine arch for multiprocess and tsan (pasta) ce5dbf3 Merge #7888: fix(consensus): canonical ExtNetInfo encoding and strict netInfo decoding (pasta) 54cba5c Merge #7537: fix: data races and check-then-act races in the CoinJoin server (pasta) 08d8bca Merge #7909: feat(mining): build the masternode list incrementally during block assembly (pasta) 5633761 Merge #7895: test: cover retroactive provider tx refusal, fix wording (pasta) cbb9500 Merge #7846: fix: treat pending owner keys and Platform node IDs as one conflict namespace (pasta) 8efdf5e Merge #7857: fix: mine a pending ProUpServTx before a key change of its masternode (pasta) e56e6ae Merge #7842: fix(wallet): reject mnemonic passphrases that seed derivation truncates (pasta) 79480ff test: follow-up for #7821: check if wallet is locked after failed upgrade instead creating brand-new scenario (Konstantin Akimov) a56ed47 fix(net): announce sporks to new peers instead of requesting them during mnsync (pasta) cdaea5f Merge #7894: fix: due to logical conflicts feature_pruning.py had been broken while (pasta) 98d92f6 Merge #7817: backport: partial bitcoin#34156 restore cleanup ownership (pasta) 35e6d18 Merge #7858: fix: do not InstantSend-lock provider transactions (pasta) 904d73d Merge #7881: fix: refuse to sign shared registrar updates that move the funder's coins (pasta) 95982f5 Merge #7782: fix(wallet): persist pending-observation coin locks once the record becomes readable (pasta) cdf65d0 Merge #7836: backport: partial bitcoin#25812, bitcoin#29855 (pasta) cc5716f Merge #7824: fix: retain initialized DKG sessions during inventory reads (pasta) 588e458 Merge #7827: backport: partial bitcoin#35984 (pasta) 795c6f1 Merge #7839: fix: release InstantSend tracking after mempool eviction (pasta) dc1a6b2 Merge #7875: docs(rpc): clarify getchainlockbyheight availability (pasta) e4798ff Merge #7876: fix(consensus): capture operator key scheme changes with unchanged bytes in state diffs (pasta) fe68ecb Merge #7871: backport!: Merge bitcoin#27217: wallet: Replace use of purpose strings with an enum (pasta) 8348d22 Merge #7867: fix: refuse masternode list RPCs for blocks outside the active chain (pasta) 861a579 Merge #7866: fix: stop `masternode payments` at the genesis block (pasta) efcef71 Merge #7521: fix: update masternode rate limit on failed governance trigger path (pasta) 0623182 Merge #7831: fix: bound governance object signatures and reset the governance cache (pasta) b230657 Merge #7841: fix: authenticate cached InstantSend proof bytes (pasta) a1f37ea Merge #7820: fix: hold chainstate lock during CoinJoin input validation (pasta) 50a5617 Merge #7829: fix: preserve wallet permissions when changing passphrases (pasta) 2ff0103 Merge #7818: fix: return REST errors for unavailable deployment data (pasta) cb39369 Merge #7834: fix: validate Electrum import input boundaries (pasta) e7e3daa Merge #7821: fix: relock encrypted wallets after HD upgrade failures (pasta) 2fea45f Merge #7792: fix: treat missing snapshots during evodb repair as repair errors (pasta) 3c5c039 Merge #7838: fix(wallet): authenticate unlock deadline extensions (pasta) 0bf80f8 Merge #7810: fix(rpc): handle unavailable masternode payment inputs (pasta) bcefee4 Merge #7822: fix: reject malformed detached quorum share batches (pasta) 86a7737 Merge #7828: fix: omit recovery words from invalid mnemonic errors (pasta) 886d5c4 Merge #7816: fix: check credit pool amount accumulation (pasta) 00fc3b9 Merge #7851: fix(rpc): correct masternode status help for top-level service field (pasta) 0e75c22 Merge #7814: fix(qt): restore HTML escaping of send confirmation recipients (pasta) fbe6526 Merge #7807: feat(consensus): hold EvoNode shares and multiple payouts behind a new evo_shares deployment (pasta) 57fd2d9 Merge #7776: fix: keep a pending ProUpServTx across a registrar update that keeps the operator key (pasta) ca69801 Merge #7803: fix: return non-zero amount of accounts after sethdseed (pasta) 57a8f07 Merge #7796: backport: bitcoin#26720 (remaining), partial bitcoin#29523: weight-check the knapsack exact-match selection (pasta) 4eb82f6 Merge #7786: fix(net): keep a dedicated onion listener when -bind is given and correct the bind release note (pasta) 70626a0 Merge #7793: backport: partial bitcoin#28868 (wallet: reload wallet if migration exited early, keep mixed watchonly txs) (pasta) 250a3cd Merge #7790: fix: guard cached governance object flags with the object lock (pasta) 700c195 Merge #7787: fix: only sign EHF signals inside the deployment's start/timeout window (pasta) a3b0f3c Merge #7785: fix: restore the txindex requirement when governance validation is enabled (pasta) 2d1735d Merge #7794: fix(wallet): floor the denomination gap threshold so rebalancing cannot oscillate (pasta) d9f6592 Merge #7783: fix: stop fish completion from re-running the typed dash-cli command (pasta) 89d44c8 Merge #7795: backport: bitcoin#34272, partial bitcoin#31650 (pass PSBT by const reference in PSBTInputSignedAndVerified) (pasta) a1d7411 Merge #7779: fix!: report legacy evonode Platform addresses when listdiff changes its address (pasta) 73f6ea2 Merge #7789: fix(qt): report malformed lang/font settings instead of aborting at startup (pasta) 40de493 Merge #7781: fix(rpc): use a consistent tip height in quorum dkgstatus (pasta) 7d1a90d Merge #7791: fix(net): request object votes from nPeersPerHashMax peers (pasta) 51b145c Merge #7778: test: use single-member in functional tests: feature_mnehf, feature_notifications, p2p_instantsend (pasta) Pull request description: ## Issue being fixed or feature implemented Merges the v24.0.0 release back into develop, as the release process asks once `master` is fast-forwarded. `master`, `v24.0.x` and the signed `v24.0.0` tag all point to the same commit (938fba5). ## What was done? One merge commit of `master` into develop. `v24.0.x` was cut from develop, so all of its code is already here. Every commit on it that develop lacks by patch is one of these: - a `cherry-pick -x` of a develop commit; - covered by a develop PR: the index fixes by #8042, the mainnet V24 schedule by #7973, the cppcheck CI move by #7966; - release bookkeeping. Git reports conflicts in many files, because `v24.0.x` carries adapted copies of develop's changes. All of them resolve to develop's side, which keeps develop's code, translations and version (`configure.ac` stays at 24.1.0, `CLIENT_VERSION_IS_RELEASE` false). Taken from v24.0.0: - `doc/release-notes.md`: the v24.0.0 release notes. The v23.1.10 notes move to `doc/release-notes/dash/`. - The man pages regenerated for v24.0.0, replacing develop's older v24.0.0 pages. A few entries (`-prune`, `-par`, `-parbls`, `-maxconnections`) still trail develop's help text, as they did before, until the next regeneration. - `feature_addressindex.py`: the v24.0.x test that blocks orphaned while the address index is disabled are removed from it once it is re-enabled. Release notes: - Individual `doc/release-notes-*.md` files whose content is in the v24.0.0 notes are removed. This includes `release-notes-8018.md`, `release-notes-8029.md` and `release-notes-27114.md`, whose changes shipped in v24.0.0 without the files. - `release-notes-28113.md` and `release-notes-28414.md` also covered `descriptorprocesspsbt`, which only develop has. They are trimmed to that RPC instead of removed. - Notes for changes v24.0.0 doesn't include stay: #7812, #7847, #7860, #7862, bitcoin#25943, bitcoin#26485 and bitcoin#27501. ## How Has This Been Tested? macOS arm64 against depends, `--enable-debug --enable-werror --disable-hardening --without-gui`. `dashd`, `dash-cli` and `test_dash` build cleanly. - `src/` is byte-identical to develop's. The only non-doc change is the new `feature_addressindex.py` case. - Functional tests, all passing: `feature_addressindex.py` (with the new case) and `feature_spentindex.py`. - Unit suites, all passing: `txindex_tests`, `blockfilter_index_tests`, `coinstatsindex_tests`, `index_migration_tests`, `baseindex_tests`. - `lint-python.py`, `lint-whitespace.py`, `lint-includes.py` and `lint-circular-dependencies.py` pass. - An independent review checked every non-merge commit in `develop..master` against develop (by patch, by cherry-pick source, and line by line for the rest), re-merged each `v24.0.x` merge commit to look for content added in a merge, and checked each release-note file decision. I did not run the full functional suite locally; CI covers it. ## Breaking Changes None. Develop's code is unchanged; the only non-doc change is the new functional test case. ## Checklist: - [x] I have performed a self-review of my own code - [x] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(if you have permission to set one)_ 🤖 Generated with [Claude Code](https://claude.com/claude-code) Top commit has no ACKs. Tree-SHA512: 3c2d1b7d2885f983f1457a18920f42907009c8ca77522a6116739d387b011d8d5583da6a4b6a1227bcaa21fa07a7ef635aae58fb8b19e4f31a95582ee1ce2318
Issue being fixed or feature implemented
gobject getcan report wrong values forfCachedFunding,fCachedValidandfCachedEndorsedwhile the node is recomputing them. For example, a proposal that has reached the funding threshold can come back asfCachedFunding: false, and a proposal the network voted invalid can come back asfCachedValid: true. The reads are also a data race on plainboolmembers. That is undefined behavior, and ThreadSanitizer reports it (see below).There are two causes:
The cached flags (
fCachedFunding,fCachedValid,fCachedDelete,fCachedEndorsed,fDirtyCache) have no lock. Readers take no lock:CGovernanceObject::GetStateJson(), used bygobject get.gobject list,gobject diffand the Qt proposal list throughGetAllNewerThan().No single outer lock covers the writers either:
CGovernanceManager::CheckAndRemove()holdscs_main+cs_store.SuperblockManager::IsSuperblockTriggered()holds onlycs_sb. It is called from block-template creation and block validation, and also from themasternode winnersRPC withoutcs_main.fDirtyCachewhile holding the object's owncs.CGovernanceObject::UpdateSentinelVariables()first resetsfCachedFunding/fCachedEndorsedtofalseandfCachedValidtotrue. It then counts votes, and only after that writes the real values. A reader that runs during this window sees the defaults instead of the old or the new result.There is also a related ordering bug.
fCachedDeletewas set before the lock that setsnDeletionTime.CheckAndRemove()readsGetDeletionTime()and thenIsSetCachedDelete()in separate calls. IfIsSuperblockTriggered()marks a trigger for deletion in between,CheckAndRemove()sees a set delete flag with a zero deletion time, computesnow - 0, and erases the object immediately instead of afterGOVERNANCE_DELETION_DELAY.Block validation itself is not affected. Its
IsSuperblockTriggered()call holdscs_mainandcs_sb, which already serializes it against the other writers. The visible impact is on RPC/GUI output, plus undefined behavior under the C++ memory model.Reproduction
A throwaway test case (not part of this PR) in
governance_vote_processing_testsreuses its single-masternode fixture. The masternode votes YES on funding and NO on validity, so withnGovernanceMinQuorum=1the correct state never changes:fCachedFunding=true,fCachedValid=false. One thread callsUpdateSentinelVariables()in a loop, asCheckAndRemove()/IsSuperblockTriggered()do. The main thread callsGetStateJson()for 3 seconds, asgobject getdoes, and counts reads that disagree with the correct state.Test case
Results against the unfixed tree (c14104b):
What was done?
The flags are now protected by the object's existing
csmutex, the same lock that already guardsfExpired,nDeletionTimeand the vote maps. Clang's thread-safety analysis enforces it.refactor: require cs in CGovernanceObject::CountMatchingVotes.CountMatchingVotes()becomes a private helper withEXCLUSIVE_LOCKS_REQUIRED(cs). The publicGet{Yes,No,Abstain}Count()wrappers take the lock. No behavior change. This lets one critical section count several signals.refactor: give CGovernanceObjectVoteFile a copy assignment operator.CGovernanceObjectVoteFilehas a copy constructor that rebuildsmapVoteIndex(list iterators) against its own list, but no copy assignment. The implicit one can't be instantiated becauseCGovernanceVoteis not assignable. This commit adds one with the same rebuild semantics, so the copy constructor in commit 3 can copy the vote file while holding the source's lock. A unit test checks that a copy-assigned file is still usable after its source is destroyed.fix: guard cached governance object flags with the object lock.GUARDED_BY(cs), and theIsSetCached*()/IsSetDirtyCache()getters take the lock, likeIsSetExpired().UpdateSentinelVariables()counts the votes and writes every flag inside oneLOCK(cs). Each flag is assigned its computed value directly, with no reset to a default first. This means:fDirtyCache = falseis ordered with the vote counts under the same lock that vote writers already hold, so a vote arriving during a recompute still marks the object dirty.PrepareDeletion()andUpdateSentinelVariables()share a privateMarkForDeletion()helper that setsfCachedDeleteandnDeletionTimetogether, sofCachedDeleteimplies a non-zero deletion time.GetStateJson()reads all four flags under one lock, sogobject getreturns a consistent snapshot.cs-guarded state while holdingother.cs.fix: read deletion flags before deletion time in CheckAndRemove.CheckAndRemove()now readsIsSetCachedDelete()/IsSetExpired()beforeGetDeletionTime().fCachedDeleteis never cleared, and it now changes together withnDeletionTime, so a set delete flag is always paired with its deletion time.fExpiredis only set bySuperblockManager::Clean(). That runs fromCheckAndRemove()itself and stamps the deletion time before this loop.Locking notes
cswhile calling the getters,UpdateSentinelVariables(),PrepareDeletion(),GetStateJson(), or the copy constructor. The externalcsholders only touch the vote file.UpdateSentinelVariables()andGetStateJson()take no other lock while holdingcs.cs_main/cs_store/cs_sb→obj.csedges already existed throughGetYesCount()and the oldUpdateSentinelVariables(). No new lock-order edges are introduced.Intentionally left unchanged
fCachedLocalValidity,strLocalValidityErrorandfUnparsablefollow the same unguarded pattern. However,GetStateJson()recomputes local validity instead of reading the cache, and I found no concurrent reader of those fields, so they are out of scope here.How Has This Been Tested?
macOS arm64, Apple clang. Built with depends using
--disable-hardening --enable-debug --enable-crash-hooks --enable-stacktraces --enable-suppress-external-warnings --without-gui --enable-tests --disable-bench --disable-fuzz-binary --enable-werror. This enables-Wthread-safetyas an error.LOCK(cs)inGetStateJson(). The build then fails withpassing variable 'fCachedValid' by reference requires holding mutex 'cs' [-Werror,-Wthread-safety-reference].--with-sanitizers=thread) with this PR. The reproduction ran with a second reader added that also copy-constructs the object each iteration (thegobject listpath). Result: no ThreadSanitizer warnings and 0 wrong reads. The same binary built from the unfixed tree reports the data race shown above.CheckAndRemove()ordering fix has the same limitation; I verified it by reviewing every writer offCachedDelete,fExpiredandnDeletionTime.governance_vote_sync_tests/copy_assigned_vote_file_indexes_its_own_votes.src/test/test_dash --run_test='governance*':*** No errors detected.test/functional/test_runner.py feature_governance.py feature_governance_cl.py feature_governance_objects.py: all passed.git diff -U0 develop | contrib/devtools/clang-format-diff.py -p1is clean except for theLogPrintinCheckAndRemove(). That call keeps its existing layout becausetest/lint/lint-logs.pyneeds the format string's\n"on the same line asLogPrint(.lint-logs,lint-format-strings,lint-includes,lint-whitespace,lint-assertions,lint-include-guards,lint-locale-dependenceandlint-circular-dependenciespass locally.Breaking Changes
None. RPC output fields and values are unchanged.
Checklist:
🤖 Generated with Claude Code