backport: bitcoin#23508, #24187, #24528, #24579, #25412 (deployment backports) #6888

kwvg · 2025-10-14T11:29:25Z

Additional Information

Depends on backport: merge bitcoin#23345, #24410, #15936, #25748, #25863, #24051, #25315, #26624, #26894, #26673, #24462, #25815, #22949, #26723, #23395, #27016, #27189, #27317 (auxiliary backports: part 28) #6901
Depends on backport: merge bitcoin#24595 (move g_versionbitscache global to ChainstateManager) #6933
In bitcoin#23508, AbstractThresholdConditionChecker::GetStateStatisticsFor() retains pindexEndOfPrevPeriod unlike upstream as it's used to calculate dynamic activation threshold (see dash#3692 for more information) but it isn't used to calculate elapsed as bitcoin#23508 no longer calculates the status of the next block but the current block, which prevents complete preservation of old logic.
- Due to this change in behavior, test adjustments were necessary in feature_mnehf.py and feature_new_quorum_type_activation.py to mine one more block to get status information expected by the tests.

Breaking Changes

Requesting deployment information from getblockchaininfo is now deprecated (replaced by getdeploymentinfo) and restoring old behaviour will require the runtime flag -deprecatedrpc=softforks.

Checklist

I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas (note: N/A)
I have added or updated relevant unit/integration/functional/e2e tests
I have made corresponding changes to the documentation
I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

github-actions · 2025-10-14T11:30:12Z

⚠️ Potential Merge Conflicts Detected

This PR has potential conflicts with the following open PRs:

refactor: improve unordered_lru_cache #6965 - refactor: improve unordered_lru_cache
feat: use CheckBlock / ConnectBlock distinction properly #6989 - feat: use CheckBlock / ConnectBlock distinction properly
refactor: extract CActiveMasternodeManager from LLMQContext (1/n, preliminary refactoring) #7056 - refactor: extract CActiveMasternodeManager from LLMQContext (1/n, preliminary refactoring)
backport: merge bitcoin#24595 (move g_versionbitscache global to ChainstateManager) #6933 - backport: merge bitcoin#24595 (move g_versionbitscache global to ChainstateManager)

Please coordinate with the authors of these PRs to avoid merge conflicts.

src/llmq/options.cpp

github-actions · 2025-10-14T13:54:19Z

This pull request has conflicts, please rebase.

github-actions · 2025-10-20T16:34:43Z

This pull request has conflicts, please rebase.

github-actions · 2025-10-29T14:36:14Z

This pull request has conflicts, please rebase.

…nager includes: - 69675ea - 38860f9 - 5c67e84 - deffe0d - 78adef1

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>

The `ConnectManager` approach is no longer needed.

includes: - d603f1d - eca22c7 - bb5c24b

kwvg added this to the 23 milestone Oct 14, 2025

kwvg force-pushed the deploy_bps branch from 4dff118 to 37cea8d Compare October 14, 2025 11:32

knst reviewed Oct 14, 2025

View reviewed changes

src/llmq/options.cpp Outdated Show resolved Hide resolved

github-actions bot added the needs rebase label Oct 14, 2025

kwvg mentioned this pull request Oct 17, 2025

backport: merge bitcoin#23345, #24410, #15936, #25748, #25863, #24051, #25315, #26624, #26894, #26673, #24462, #25815, #22949, #26723, #23395, #27016, #27189, #27317 (auxiliary backports: part 28) #6901

Merged

5 tasks

kwvg force-pushed the deploy_bps branch from 37cea8d to 88d0f13 Compare October 19, 2025 00:26

github-actions bot removed the needs rebase label Oct 19, 2025

kwvg changed the title ~~backport: merge bitcoin#23508, #24187, #24528, #24579, #24595, #25830, #25412 (deployment backports)~~ backport: merge bitcoin#24595, 25830 (deployment backports) Oct 19, 2025

kwvg force-pushed the deploy_bps branch 2 times, most recently from f57c351 to ffc7fdd Compare October 19, 2025 19:11

github-actions bot added the needs rebase label Oct 20, 2025

kwvg modified the milestones: 23, 23.1 Oct 21, 2025

kwvg force-pushed the deploy_bps branch from ffc7fdd to 4951f0d Compare October 23, 2025 15:04

kwvg changed the title ~~backport: merge bitcoin#24595, 25830 (deployment backports)~~ backport: bitcoin#23508, #24187, #24528, #24579, #25412 (deployment backports) Oct 23, 2025

github-actions bot removed the needs rebase label Oct 23, 2025

kwvg added the RPC Some notable changes to RPC params/behaviour/descriptions label Oct 23, 2025

kwvg force-pushed the deploy_bps branch from 4951f0d to 9a8a568 Compare October 23, 2025 15:07

kwvg requested a review from PastaPastaPasta October 23, 2025 15:51

kwvg mentioned this pull request Oct 27, 2025

refactor: delete extra ctors from managers, restore memory-only db for EvoDb and LLMQContext #6923

Merged

5 tasks

github-actions bot added the needs rebase label Oct 29, 2025

kwvg modified the milestones: 23.1, 24 Dec 1, 2025

kwvg force-pushed the deploy_bps branch from 9a8a568 to a352e11 Compare December 18, 2025 21:26

github-actions bot removed the needs rebase label Dec 18, 2025

kwvg mentioned this pull request Dec 18, 2025

backport: merge bitcoin#25065, #25290, #25494, #25439, #25648, #25772, #25222 (kernel backports: part 1) #6904

Draft

5 tasks

kwvg and others added 15 commits December 19, 2025 15:10

partial bitcoin#24595: move g_versionbitscache global to ChainstateMa…

07ea998

…nager includes: - 69675ea - 38860f9 - 5c67e84 - deffe0d - 78adef1

refactor: adapt ProTx logic to DeploymentActive{At,After}

b25e4fd

refactor: adapt CbTx, CreditPool logic to DeploymentActive{At,After}

a223b8c

trivial: force stricter lambda signature for ForEachMN{,Shared}()

dc3f6bd

refactor: abstract masternode structures from Qt wallet

2f9210f

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>

refactor: adapt LLMQ logic to DeploymentActive{At,After}

d4dc191

refactor: move IsQuorumTypeEnabled to ChainstateManager

838cfcb

refactor: accept ChainstateManager in CMNHFManager ctor

14a77f6

The `ConnectManager` approach is no longer needed.

merge bitcoin#24595: move g_versionbitscache global to ChainstateManager

95d5f97

includes: - d603f1d - eca22c7 - bb5c24b

lint: update circular dependencies allowlist

2dc0a25

merge bitcoin#23508: Add getdeploymentinfo RPC

0a13845

merge bitcoin#24187: Followups for getdeploymentinfo

55d401c

merge bitcoin#24528: rename getdeploymentinfo status-next to status_next

c705ea6

merge bitcoin#24579: Fix getblockchaininfo/getdeploymentinfo RPC docs

0a1e55b

merge bitcoin#25412: add /deploymentinfo endpoint

1c10883

kwvg force-pushed the deploy_bps branch from a352e11 to 1c10883 Compare December 19, 2025 11:16

kwvg removed the request for review from PastaPastaPasta December 19, 2025 11:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

backport: bitcoin#23508, #24187, #24528, #24579, #25412 (deployment backports) #6888

backport: bitcoin#23508, #24187, #24528, #24579, #25412 (deployment backports) #6888

Uh oh!

kwvg commented Oct 14, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Oct 14, 2025 •

edited

Loading

Uh oh!

Uh oh!

github-actions bot commented Oct 14, 2025

Uh oh!

github-actions bot commented Oct 20, 2025

Uh oh!

github-actions bot commented Oct 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

backport: bitcoin#23508, #24187, #24528, #24579, #25412 (deployment backports) #6888

Are you sure you want to change the base?

backport: bitcoin#23508, #24187, #24528, #24579, #25412 (deployment backports) #6888

Uh oh!

Conversation

kwvg commented Oct 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Additional Information

Breaking Changes

Checklist

Uh oh!

github-actions bot commented Oct 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ Potential Merge Conflicts Detected

Uh oh!

Uh oh!

github-actions bot commented Oct 14, 2025

Uh oh!

github-actions bot commented Oct 20, 2025

Uh oh!

github-actions bot commented Oct 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

kwvg commented Oct 14, 2025 •

edited

Loading

github-actions bot commented Oct 14, 2025 •

edited

Loading