Repository navigation
fix: wait for a matching superblock trigger before voting NO on the others - #8131
Conversation
|
✅ Final review complete — no blockers (commit c65cd59) · triage: normal |
|
No actionable comments were generated in the recent review. Walkthrough
Estimated code review effort: 3 (Moderate) | ~25 minutes Possibly related PRs
Merge Risk:
|
07264ef to
773f82b
Compare
thepastaclaw
left a comment
There was a problem hiding this comment.
Final validation — Phase 1 + Phase 2
Verified head 773f82b against the signer lifecycle, related governance code, regression tests, and commit history. No blocking defect was found; two non-blocking improvements remain concerning post-superblock rollback handling and durable end-to-end regression coverage. This was a static review: current CI reports successful builds, linting, ASan tests, and no-wallet tests, with regular Linux, multiprocess, and TSan tests plus multiprocess lint still pending; the supplied base-drift evidence shows no conflicting files.
🟡 2 suggestion(s)
Approved: nothing here blocks the merge. The non-blocking findings are optional: fix them forward, in this PR or a follow-up, without waiting for another review round.
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 introduces stateful governance voting behavior across deadlines, cycle transitions, restarts and rollbacks, but the small production diff does not make large or intricate changes 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 quota lookup failed),glm-5.3-flash(not used above high effort; tier asks max) - Second Phase-2 pass: on this first full review every Phase-2 reviewer also ran a second, independent time, and the verifier weighed both sets
- 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 (PastaClaw). How to work through them:
- Verify each finding against the code; fix only what is real, as narrowly as the finding.
- If a finding is wrong, decline it on its thread in one or two sentences; the bot answers once and stops.
- To defer one, link a tracking issue on its thread (or reply asking the bot to file one).
- Suggestions don't block the merge, but most are worth fixing in this PR; judge each on its merits.
- Keep the PR's scope; don't grow it to satisfy hardening suggestions.
- Carried items were raised in an earlier round: read the thread first, and don't re-fix what you already fixed, declined or deferred there. Disputed and deferred items are already handled and are not listed.
In `src/governance/signing.cpp`:
- [SUGGESTION] src/governance/signing.cpp:319-321: Preserve cycle-specific YES history across post-superblock rollbacks
The height-based reset discards the YES marker permanently when the tip first reaches the target height H. If the node subsequently rolls back below H and connects a replacement block inside that cycle's maturity window, CreateSuperblockCandidate is no longer gated. With a changed approved set and a matching trigger on which it has not previously voted, the node can cast another YES for H. The existing stored-vote check only protects the same trigger, not the whole cycle. The funded-cycle reset already had this limitation, but this new reset extends it to unfunded cycles, whose marker previously survived. Retain cycle-specific YES history and use the candidate's target height to distinguish a new cycle from a revisited one, keeping both reset paths consistent. Add a regression that reaches H before rolling back; the current rollback test stays below H throughout. This is a narrow local voting-policy edge case, not a consensus-rule violation.
In `test/functional/feature_governance_trigger_voting.py`:
- [SUGGESTION] test/functional/feature_governance_trigger_voting.py:433-441: Retain a regression where deferral enables a later YES vote
This scenario verifies abstention before the deadline and a NO at the deadline, but never changes the waiting masternode's candidate to match the protected trigger. The single-approved-set-change scenario exercises successful payment without needing this deferral, while the existing-NO scenario deliberately verifies that a NO remains irreversible. Retain an end-to-end case in which a masternode has no funding vote on an existing non-matching trigger, defers its NO, then changes its approved set before the deadline so that the trigger matches. Assert its resulting YES and the proposal payment. That sequence directly protects the motivating failure mode and preserves the additional locally exercised regression described in the PR.
| assert_equal(governance_info["superblockmaturitywindow"], SB_MATURITY_WINDOW) | ||
| assert_equal(governance_info["governanceminquorum"], 1) | ||
| # Otherwise unlocked collateral transactions are left out of blocks | ||
| node.sporkupdate("SPORK_2_INSTANTSEND_ENABLED", 4070908800) |
There was a problem hiding this comment.
don't touch spork here; instead bump time for 10minutes ahead.
why new functional test created but not new scenario added to existing governance tests?
There was a problem hiding this comment.
Done in c65cd59: the spork update is gone, and create_proposals bumps mocktime by 10 minutes + 1 s after the collateral transactions are in every mempool, the same way bury_tx does. The file passes 3 of 3 runs with it, and against a build without the fix it still fails at the same assertion as before (not(no == yes)).
On the separate file: the scenarios need a different fixture from feature_governance.py. Each one depends on which masternodes have already processed a block at the moment a trigger appears, so the test stops and restarts individual masternodes around single blocks, drives every block and relay flush itself, and gives each scenario its own superblock cycle with its own short-lived proposals (five cycles in total). feature_governance.py is one linear script built around network isolation and a single set of proposals whose state carries through to the end, so adding these would mean either threading five more cycles through that state or resetting it between scenarios, and it would lengthen a test that is already one of the slower and flakier ones (64 s against ~25 s for this file). If you'd still rather have it in one file I can move it there as a second test class sharing the helpers.
🤖 Posted autonomously by Claude on behalf of pasta.
Add functional tests for how masternodes vote on superblock triggers: - a single change of the approved set still pays the later set's trigger; - with no approved proposal, masternodes vote NO on an in-window trigger at the next block; - a trigger creator whose trigger was not funded votes YES on the next cycle's trigger, also after re-learning its YES on restart; - a NO on the trigger matching a masternode's candidate is kept after the approved set is emptied and restored, and other triggers still get NO; - a YES is kept across a tip below the maturity window, so re-entering the window with a different candidate gives no second YES; - without a trigger for its own candidate, a masternode votes NO on other triggers only in the last three blocks before the superblock. The masternode that creates a trigger is stopped while the block is mined and started afterwards, so every other masternode has acted on that block before the trigger exists. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
773f82b to
c65cd59
Compare
thepastaclaw
left a comment
There was a problem hiding this comment.
Re-review — Final validation — Phase 1 + Phase 2
At c65cd59, the change since the previous review replaces the functional test's spork override with the existing collateral-aging approach; static inspection found no new issues, and git diff --check passed. Both prior non-blocking suggestions remain applicable. Current CI reports successful builds, lint, standard, ASan, multiprocess, and nowallet tests; the TSan test remains pending, with no failed checks reported.
🟡 2 suggestion(s)
Approved: nothing here blocks the merge. The non-blocking findings are optional: fix them forward, in this PR or a follow-up, without waiting for another review round.
Still open from earlier rounds (2)
- 🟡 Suggestion: Retain a regression where deferral enables a later YES vote —
test/functional/feature_governance_trigger_voting.py:432-440(thread) - 🟡 Suggestion: Preserve cycle-specific YES history across post-superblock rollbacks —
src/governance/signing.cpp:319-321(thread)
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); final verifier: gpt-6.1-sol (agent: sol-verifier, role: final-verifier)
- Triage:
normalbygpt-6.1-sol(effort low) — This is a substantial but contained governance-signing logic and functional-test change; although superblock funding affects payments, the diff changes masternode voting behavior rather than consensus validation, funds movement, cryptography, networking, or storage. - 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 quota lookup failed),glm-5.3-flash(not used above high effort; tier asks max) - 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
🤖 Prompt for all review comments with AI agents
These findings are from an automated code review (PastaClaw). How to work through them:
- Verify each finding against the code; fix only what is real, as narrowly as the finding.
- If a finding is wrong, decline it on its thread in one or two sentences; the bot answers once and stops.
- To defer one, link a tracking issue on its thread (or reply asking the bot to file one).
- Suggestions don't block the merge, but most are worth fixing in this PR; judge each on its merits.
- Keep the PR's scope; don't grow it to satisfy hardening suggestions.
- Carried items were raised in an earlier round: read the thread first, and don't re-fix what you already fixed, declined or deferred there. Disputed and deferred items are already handled and are not listed.
In `test/functional/feature_governance_trigger_voting.py`:
- [SUGGESTION] test/functional/feature_governance_trigger_voting.py:432-440: Retain a regression where deferral enables a later YES vote
(carried; thread: https://github.com/dashpay/dash/pull/8131#discussion_r4546630308)
In `src/governance/signing.cpp`:
- [SUGGESTION] src/governance/signing.cpp:319-321: Preserve cycle-specific YES history across post-superblock rollbacks
(carried; thread: https://github.com/dashpay/dash/pull/8131#discussion_r4546630299)
…e voting NO on the others c65cd59 test: cover superblock trigger voting across approved set changes (pasta) 79606fb fix(governance): track trigger vote height and defer early NO votes (pasta) Pull request description: ## Issue being fixed or feature implemented Inside a superblock's maturity window a masternode votes YES on the trigger that matches its own candidate and NO on every other trigger, and it never revisits a funding vote it has cast. That is fragile when the set of approved proposals changes while triggers are being created: a masternode whose candidate has no trigger yet votes NO on the triggers that do exist, and if its candidate later matches one of those, it cannot vote YES on it any more. With enough masternodes in that state no trigger reaches the funding threshold and the superblock pays nothing, including proposals that stayed approved throughout. A second problem makes such a cycle carry over. The marker that records "I already voted YES this cycle" was only cleared when a superblock was actually found at a superblock height. After a cycle that ended without one, the masternodes that had voted YES kept the marker, built no candidate in the next cycle and voted NO on its trigger. ## What was done? All in `GovernanceSigner`; no vote that has been cast is ever changed, and nothing changes in consensus, P2P, RPC or storage. - **Wait for a matching trigger before voting NO.** If the masternode has a candidate for this block but no trigger matches it yet, it casts no NO votes that block. Once a matching trigger exists (it votes YES on it, or already has a vote on it), or when it has no candidate at all (nothing approved, outside the window, not synced), it votes NO on the other triggers exactly as before. - **A deadline for that wait.** In the last 3 blocks before the superblock the NO votes are cast regardless, so a trigger that does not match can't keep its funding only because masternodes were still waiting. - **The per-cycle marker records its superblock height** and is cleared once the tip reaches that height, whether or not a trigger was funded. It is not cleared by a tip below the maturity window, so a rollback can't lead to a second YES. The existing reset stays. Masternodes without this change keep voting as before, so the benefit grows with the share of masternode vote weight that has upgraded; without a change in the approved set, old and new masternodes end with the same votes. ## How Has This Been Tested? New functional test `feature_governance_trigger_voting.py` (6 nodes, `-budgetparams=10:10:10`, each scenario in its own cycle, payee asserted through `masternode winners`): 1. A cycle that ends with no funded trigger while its creator holds a YES: in the next cycle every masternode, the creator included, votes YES and the proposal is paid. Also with the creator restarted inside the window, so its YES is re-learned from the stored vote. Without the change the creator votes NO in the next cycle (`not(no == yes)`). 2. A masternode with a candidate but no matching trigger, and not the payee, has no vote on the other trigger 5 and 4 blocks before the superblock and votes NO on it 3 blocks before. Without the change it has voted NO already at 5 blocks (`not(no == None)`). 3. A masternode that already voted NO on the trigger matching its candidate keeps that vote and still votes NO on a non-matching trigger. 4. After a YES, invalidating back below the window and re-entering with a different approved set produces no second YES from that masternode. 5. Unchanged behaviour, passing with and without the change: with nothing approved, masternodes vote NO on an existing trigger at the next block; after a single change of the approved set the later set's trigger is the one paid. Scenarios 3 and 4 pin behaviour the change must keep; each fails against a variant of the rules that was considered and rejected (waiting whenever no YES has been cast; clearing the marker on any tip outside the window). The file passed 3 runs in its final form (21-24 s each). A further end-to-end scenario was run locally against builds with and without the change: it fails without it and passed 5 of 5 runs with it. Existing tests on the final build: `feature_governance.py`, `feature_governance_cl.py`, `feature_governance_objects.py` and the 36 `governance*` unit cases pass unchanged. `feature_governance.py` is intermittent on this machine at its "Should have 25 votes on all nodes" step (`not(24 == 25)`) both with and without the change; the log points at the test's sequential governance re-sync dropping a vote request, not at trigger voting. ## Breaking Changes None. Behaviour change for masternodes: a NO vote on a non-matching trigger may be cast later than before, when the masternode's own candidate has no trigger yet, and at the latest 3 blocks before the superblock. ## 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 _(if you have permission to set one)_ ## Council review Rounds: 3 | Member | Round 1 | Round 2 | Round 3 | | --- | --- | --- | --- | | Fable 5.2 (high) | 7/10 | 8/10 | 8/10 | | Opus 5.5 (high) | 7/10 | 7/10 | 8/10 | | GPT 6.1 Sol (high) | 7/10 | 6/10 | 8/10 | 🤖 Generated with [Claude Code](https://claude.com/claude-code) Top commit has no ACKs. Tree-SHA512: 544e1c1e50fc4ac034bbb543646a55941c88bd998426123cdbf2f863886a559dbb617f837c567fa20fc52719172354ec18c09f93808bbe150fd4e6b5e984baaa (cherry picked from commit 5c34dcf)
78ad074 Merge #8131: fix: wait for a matching superblock trigger before voting NO on the others (merge-script) 6faa5ce Merge #8097: fix: keep governance triggers across a restart on test networks (pasta) 2757e83 Merge #8130: fix: process a node's own DKG messages ahead of queued peer messages (merge-script) cbbee0e Merge #8135: perf: keep verified DKG contributions cached through the commit phase (merge-script) 29a3cdd Merge #8099: fix(rest): don't terminate on blocks with undecodable ProTx payloads (merge-script) 275a142 Merge #8100: fix: don't abort in governance when a reorg changes masternode internal ids (merge-script) d00c4e6 Merge #8104: fix: keep final commitments mineable when their block is rejected (merge-script) b051d3a Merge #8080: test(qt): stop address book tests from answering the shared masternode wizard's prompt (merge-script) ec9e944 Merge #8094: fix(net): stop busy-looping while a peer's send buffer is full (merge-script) 033dae3 Merge #8052: fix(qt): reserve the same shared masternode contribution again after a release (merge-script) 65603d5 Merge #8088: fix: fetch miniupnpc sources from miniupnp.free.fr (merge-script) Pull request description: ## Issue being fixed or feature implemented Backports for v24.0.1, on top of `v24.0.x` at 938fba5 (v24.0.0). v24.0.0 is running on mainnet ahead of the V24 hard fork, and a handful of fixes that landed on develop since the release should not wait for 24.1: a `test_dash-qt` failure that blocks distribution packagers (#8075), a broken dependency download, a peer-triggerable busy loop, a way for a quorum commitment to be lost for a whole DKG cycle, and a node abort after a reorg. It also carries #8131, which changes when masternodes vote NO on superblock triggers. Inside a superblock's maturity window a masternode votes NO on every trigger that doesn't match its candidate and never revisits that vote. If the approved set changes while triggers are being created, masternodes can end up having voted NO on the trigger that matches their final candidate, and the superblock can go unpaid. With #8131 a masternode waits for a trigger matching its own candidate before it votes NO on the others (until 3 blocks before the superblock), and clears the per-cycle "voted YES" marker by height so an unfunded cycle doesn't carry over into the next one. This was a separate PR (#8132) until #8131 merged on develop; it is folded in here so the release branch gets one backport PR. It also carries the fixes for the `llmq_400_85` DKG rounds that have been failing on mainnet, which is what the stalled v24 activation is waiting on: #8135, which stops DKG members from reloading every verification vector at commit time, the reason slow members have been missing the commit phase of `llmq_400_85` rounds, and #8130, which makes a member relay its own DKG messages before it works through queued peer messages. ## What was done? ### Picked All eleven are picked from their develop merge commits with `git cherry-pick -m1 -x`. Each pick changes the same lines as its develop counterpart except where noted. - #8088 fix: fetch miniupnpc sources from miniupnp.free.fr - #8052 fix(qt): reserve the same shared masternode contribution again after a release - #8094 fix(net): stop busy-looping while a peer's send buffer is full - #8080 test(qt): stop address book tests from answering the shared masternode wizard's prompt (fixes #8075) - #8104 fix: keep final commitments mineable when their block is rejected, with the adaptation below - #8100 fix: don't abort in governance when a reorg changes masternode internal ids, with the adaptation below - #8099 fix(rest): don't terminate on blocks with undecodable ProTx payloads - #8135 perf: keep verified DKG contributions cached through the commit phase, with the adaptation below - #8130 fix: process a node's own DKG messages ahead of queued peer messages - #8097 fix: keep governance triggers across a restart on test networks, source change only (see below) - #8131 fix: wait for a matching superblock trigger before voting NO on the others ### Adaptations - **#8104:** `v24.0.x` doesn't have #7936 (parse each quorum commitment payload once per block). `src/llmq/blockprocessor.cpp` keeps the `v24.0.x` `GetCommitmentsFromBlock` and adds the new `RemoveMineableCommitmentsForBlock()` unchanged; in `blockprocessor.h` its lock annotation drops `!m_commitment_payload_mutex`, a mutex that only exists with #7936. `Chainstate` has no `m_special_tx` member on `v24.0.x`, so the two new calls in `validation.cpp` go through `m_chain_helper->special_tx`, like the neighbouring special-transaction calls. The `specialtxman.*` hunks are identical to the develop merge. - **#8135:** in `CDKGSessionManager::CleanupCache`, `v24.0.x` still has a hand-written erase loop that develop had already replaced with `std::erase_if`; the pick takes the new `std::erase_if` form. The benchmark added in `src/bench/bls_dkg.cpp` is left out: it conflicts with the `v24.0.x` version of that file and isn't needed on the release branch. The rest of the source change is identical. - **#8097:** only the source change is picked (two lines in `src/governance/governance.cpp`). It is needed for #8131's test: without it a masternode restarted inside the maturity window drops its stored triggers on regtest, testnet and devnets and then rejects the superblock, which is what the restart case of that test does. Mainnet is not affected by that bug, because the expiry check involved is skipped there. #8097's own `feature_governance.py` step is left out because it restarts the pruned node added with #7860, which `v24.0.x` doesn't have. - **#8131:** no conflicts; `src/governance/signing.cpp` on `v24.0.x` is identical to develop before the change. - **#8100:** the test fixture in `src/test/governance_vote_processing_tests.cpp` keeps `CBaseChainParams::REGTEST`, since `v24.0.x` predates `ChainType`. The source change is identical. ### Not picked - #8129 (re-sign a pending EHF signal on every block): an earlier revision of this PR carried it. It is still under discussion on develop, and v24.0.1 goes ahead without it: the EHF signal is attempted again when a newly formed quorum is selected for it, which the DKG fixes here are meant to make possible. - #8101 (reject InstantSend locks with a noncanonical version or cycle hash): an earlier revision of this PR carried it. It scores a peer 100 for relaying a lock with a non-current version, but nodes without the change accept and relay such a lock, so in a mixed network an upgraded node would discourage honest peers that are still on v24.0.0. It needs to stop scoring that case before it ships anywhere. - #8095 and its follow-up #8121 (block templates while the best ChainLock is above the tip): with both, a node refuses to build a template in that window, which is what v24.0.0 already does with a less helpful error. An earlier revision of this PR carried #8095 alone; it was dropped once #8121 merged. - #8102 (quorum scan cache): written on top of the #7956 refactor; it needs a hand-port to two functions on `v24.0.x`. - #8116 and #7815 (CoinJoin coordinator): long-standing, mixing only; #8116's test depends on #7815. - #8085, #8096, #8098, #8103, and the features, refactors, Bitcoin Core backports, CI and test-only changes merged since the branch point. ## How Has This Been Tested? macOS arm64, depends build with `--enable-debug --enable-werror`, no GUI. The current head is 78ad074. On the current head: - `dashd` and `test_dash` build cleanly. - Unit suites `governance*`, `llmq*`, `dkg*`, `evo*` and `versionbits*` pass, on the relic-based BLS library this branch uses. - `feature_governance_trigger_voting.py`, `feature_governance.py`, `feature_governance_cl.py`, `feature_governance_objects.py`, `feature_llmq_dkgerrors.py`, `feature_mnehf.py` and `interface_rest.py` pass. On earlier revisions of this branch. The current head has the same content as those revisions for the picks concerned; since then #8129 was dropped (one line in `src/llmq/ehf_signals.cpp` plus its test changes), the #8097 and #8131 picks were added, and the later picks were redone from their develop merge commits without changing the tree: - `feature_llmq_signing.py` (both variants), `feature_llmq_chainlocks.py` and `feature_llmq_rotation.py` pass (on the revision without #8097 and #8131). - Without the #8097 source change, `feature_governance_trigger_voting.py` fails in its restart case: the restarted masternode rejects the superblock with `bad-cb-amount`. - Unit suites `bls*` pass. On a revision that also carried #8095 and #8101, `coinjoin*`, `net_tests`, `miner_tests` and `validation*` passed as well. - The full functional suite (`test_runner.py -j16`), on the revision that still carried #8129 and not yet #8097 and #8131: 307 passed, 17 skipped, 1 failed. The skipped ones are the usual environment-dependent tests (`*_bind*`, `interface_usdt_*`, `interface_zmq*`, previous-release compatibility and `feature_unsupported_utxo_db.py`). The run includes `feature_llmq_dkgerrors.py` with #8104's new scenario and `interface_rest.py` with #8099's. - The failure was `feature_llmq_signing.py`, in its first `mine_quorum`, waiting for every member to have received all contributions. The node logs show one masternode relaying its contribution about 0.2 s before its connections to the other members had been authenticated, so no peer received it. That happens before anything #8135 or #8130 changes, and it is load-dependent: running four copies of the test in both variants at `-j8`, three times, 2 of 24 runs fail on that revision and 2 of 24 fail on the same branch without the two DKG commits, with the same assertion. - A full functional run with the #8097 and #8131 changes on top of an older revision of this branch: 310 passed, 17 skipped, none failed. #8131 describes its scenarios and how each was shown to fail without the change. The GUI picks (#8052, #8080) were not built or run locally; CI covers them. The first push of this branch did not compile (`m_special_tx`, see Adaptations); review caught it and it was fixed before any of the above was run. ## Breaking Changes None. Behaviour change for masternodes (#8131): a NO vote on a non-matching trigger may be cast later than before, when the masternode's own candidate has no trigger yet, and at the latest 3 blocks before the superblock. ## 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 _(if you have permission to set one)_ 🤖 Generated with [Claude Code](https://claude.com/claude-code) Top commit has no ACKs. Tree-SHA512: 8ce635d02dd2b9b285aa6a1630d329ffeb9dcb99947a7a758c80ed17a2dbeb7496162a7f3052e872f46d481c6e6391ce866fd296d3ef1fa8edb1dc2d2c5f275e
038306f chore: prepare v24.0.1 release (pasta) Pull request description: ## Issue being fixed or feature implemented Prepares the **v24.0.1** point release on top of the v24.0.1 backports (#8128), following the v23.1.10 prep (#7983). v24.0.1 carries the fix for what has held up `v24` activation on mainnet (`LLMQ_400_85` DKG rounds failing at the commit step, so no new quorum is selected to sign the EHF signal), plus a small set of other fixes. ## What was done? - `configure.ac`: `_CLIENT_VERSION_BUILD` 0 → 1 (`_CLIENT_VERSION_IS_RELEASE` stays `true`, no RC). - `doc/release-notes.md`: v24.0.1 notes covering #8135, #8130 and #8104 (v24 activation), #8131 and #8097 (governance), #8100, #8094, #8099 and #8052 (other fixes), and #8088 and #8080 (build and tests). Upgrade and downgrade notes point to the v24.0.0 notes for everything that applies when coming from v23. - Archived the v24.0.0 notes to `doc/release-notes/dash/release-notes-24.0.0.md` (verbatim copy), added v24.0.0 to "Older releases", and pointed the change log link at `v24.0.0...v24.0.1`. - `contrib/flatpak/org.dash.dash-core.metainfo.xml`: `24.0.1` release entry dated 2026-11-12. The date needs changing if the tag is cut on another day. - `doc/man/*.1`: version string bump only; no CLI option changed since v24.0.0. ## How Has This Been Tested? Release mechanics only; no code changes. - Built the branch (macOS arm64, wallet, no GUI); `dashd -version` and `dash-cli -version` report `v24.0.1`. - Regenerated the `dash-cli`, `dash-tx`, `dash-wallet` and `dash-util` man pages with `contrib/devtools/gen-manpages.py` from that build: byte-identical to this commit. `dashd.1` differs from the regenerated one in a single line, the `lock` debug category that only an `--enable-debug` build lists, so the committed page matches a release build. `dash-qt.1` got the same version-only bump and wasn't regenerated (no GUI build). - The archived 24.0.0 notes are byte-identical to the previous `doc/release-notes.md`. - The notes were checked against the merged diffs and kept to effects. ## Breaking Changes None in this PR. The behaviour changes that ship in the fixes are described in the notes: masternodes cast some NO-FUNDING trigger votes later than before. ## Checklist: - [x] I have performed a self-review of my own code - [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: 1553e82ef0da95830bf0edada0354820da75d72645faec37663694dc790f816fe597f220abee7bad0485be4d41596d26d27f0d2bfc44a05510d71346f5a3204c
Brings the v24.0.1 release into develop. upstream/master is at the signed v24.0.1 tag (137d999), so this merges master itself. Every code change in v24.0.0..v24.0.1 is a cherry-pick -m1 -x of a develop merge commit (#8088, #8052, #8094, #8080, #8104, #8100, #8099, #8135, #8130, #8097, #8131), and each source commit is already on develop. Git reports conflicts in configure.ac, src/validation.cpp, src/llmq/blockprocessor.{cpp,h} and src/test/governance_vote_processing_tests.cpp because v24.0.x carries adapted copies of those changes. All of them resolve to develop's side, which keeps develop's code and configure.ac (24.1.0). Taken from v24.0.1: - doc/release-notes.md: the v24.0.1 release notes; the v24.0.0 notes are archived in doc/release-notes/dash/ - the version string in the man pages (no option changed) - the v24.0.1 flatpak release entry Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
038306f chore: prepare v24.0.1 release (pasta) 78ad074 Merge #8131: fix: wait for a matching superblock trigger before voting NO on the others (merge-script) 6faa5ce Merge #8097: fix: keep governance triggers across a restart on test networks (pasta) 2757e83 Merge #8130: fix: process a node's own DKG messages ahead of queued peer messages (merge-script) cbbee0e Merge #8135: perf: keep verified DKG contributions cached through the commit phase (merge-script) 29a3cdd Merge #8099: fix(rest): don't terminate on blocks with undecodable ProTx payloads (merge-script) 275a142 Merge #8100: fix: don't abort in governance when a reorg changes masternode internal ids (merge-script) d00c4e6 Merge #8104: fix: keep final commitments mineable when their block is rejected (merge-script) b051d3a Merge #8080: test(qt): stop address book tests from answering the shared masternode wizard's prompt (merge-script) ec9e944 Merge #8094: fix(net): stop busy-looping while a peer's send buffer is full (merge-script) 033dae3 Merge #8052: fix(qt): reserve the same shared masternode contribution again after a release (merge-script) 65603d5 Merge #8088: fix: fetch miniupnpc sources from miniupnp.free.fr (merge-script) Pull request description: ## Issue being fixed or feature implemented Merges the v24.0.1 release back into develop, as the release process asks once `master` is fast-forwarded. `master`, `v24.0.x` and the signed `v24.0.1` tag all point to the same commit (137d999). ## What was done? One merge commit of `master` into develop. Every code change in `v24.0.0..v24.0.1` is a `cherry-pick -m1 -x` of a develop merge commit (#8088, #8052, #8094, #8080, #8104, #8100, #8099, #8135, #8130, #8097, #8131), and every source commit is already on develop. The two merge commits on `v24.0.x` (#8128, #8133) add nothing beyond their second parents. Git reports conflicts in `configure.ac`, `src/validation.cpp`, `src/llmq/blockprocessor.{cpp,h}` and `src/test/governance_vote_processing_tests.cpp`, because `v24.0.x` carries adapted copies of those changes. All of them resolve to develop's side, which keeps develop's code and version (`configure.ac` stays at 24.1.0, `CLIENT_VERSION_IS_RELEASE` false). Taken from v24.0.1: - `doc/release-notes.md`: the v24.0.1 release notes. The v24.0.0 notes move to `doc/release-notes/dash/release-notes-24.0.0.md`, unchanged from develop's current `doc/release-notes.md`. - The version string in the man pages (no option changed since v24.0.0). - The v24.0.1 entry in the flatpak release history. None of develop's individual `doc/release-notes-*.md` files cover changes in v24.0.1, so all of them stay. ## How Has This Been Tested? - `git diff develop` on this branch touches only the 9 doc and flatpak files above; `src/`, `test/` and `configure.ac` are byte-identical to develop, so nothing was rebuilt. - Checked that the `-x` source of every non-merge commit in `v24.0.0..master` is an ancestor of develop. ## Breaking Changes None. Develop's code is unchanged. ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [x] I have made corresponding changes to the documentation - [ ] 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: d7021c283bd5fedce891e1317f08d1389b7538755fa63964aeba43a77dba7e1752c96add49d2a18d04ad6406b004bd7a42cce1637e46816a722a8d4dda480904
Issue being fixed or feature implemented
Inside a superblock's maturity window a masternode votes YES on the trigger that matches its own candidate and NO on every other trigger, and it never revisits a funding vote it has cast. That is fragile when the set of approved proposals changes while triggers are being created: a masternode whose candidate has no trigger yet votes NO on the triggers that do exist, and if its candidate later matches one of those, it cannot vote YES on it any more. With enough masternodes in that state no trigger reaches the funding threshold and the superblock pays nothing, including proposals that stayed approved throughout.
A second problem makes such a cycle carry over. The marker that records "I already voted YES this cycle" was only cleared when a superblock was actually found at a superblock height. After a cycle that ended without one, the masternodes that had voted YES kept the marker, built no candidate in the next cycle and voted NO on its trigger.
What was done?
All in
GovernanceSigner; no vote that has been cast is ever changed, and nothing changes in consensus, P2P, RPC or storage.Masternodes without this change keep voting as before, so the benefit grows with the share of masternode vote weight that has upgraded; without a change in the approved set, old and new masternodes end with the same votes.
How Has This Been Tested?
New functional test
feature_governance_trigger_voting.py(6 nodes,-budgetparams=10:10:10, each scenario in its own cycle, payee asserted throughmasternode winners):not(no == yes)).not(no == None)).Scenarios 3 and 4 pin behaviour the change must keep; each fails against a variant of the rules that was considered and rejected (waiting whenever no YES has been cast; clearing the marker on any tip outside the window). The file passed 3 runs in its final form (21-24 s each).
A further end-to-end scenario was run locally against builds with and without the change: it fails without it and passed 5 of 5 runs with it.
Existing tests on the final build:
feature_governance.py,feature_governance_cl.py,feature_governance_objects.pyand the 36governance*unit cases pass unchanged.feature_governance.pyis intermittent on this machine at its "Should have 25 votes on all nodes" step (not(24 == 25)) both with and without the change; the log points at the test's sequential governance re-sync dropping a vote request, not at trigger voting.Breaking Changes
None. Behaviour change for masternodes: a NO vote on a non-matching trigger may be cast later than before, when the masternode's own candidate has no trigger yet, and at the latest 3 blocks before the superblock.
Checklist:
Council review
Rounds: 3
🤖 Generated with Claude Code