Skip to content

backport: merge bitcoin#24595, 25830 (deployment backports) #6888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 34 commits into
base: develop
Choose a base branch
from
Draft

backport: merge bitcoin#24595, 25830 (deployment backports) #6888

wants to merge 34 commits into from

Conversation

kwvg
Copy link
Collaborator

@kwvg kwvg commented Oct 14, 2025 •
edited
Loading

Additional Information

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
  • 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)

@kwvg kwvg added this to the 23 milestone Oct 14, 2025
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 14, 2025 •
edited
Loading

⚠️ Potential Merge Conflicts Detected

This PR has potential conflicts with the following open PRs:

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

knst
knst reviewed Oct 14, 2025
View reviewed changes
@github-actions GitHub Actions
Copy link

This pull request has conflicts, please rebase.

@kwvg kwvg mentioned this pull request Oct 17, 2025
Draft
5 tasks
kwvg added 22 commits October 18, 2025 07:44
@kwvg
fix: annotate getblockchaininfo[softforks] as OBJ_DYN
91588a8
@kwvg
test: drop extra generates from wallet_signrawtransactionwithwallet
a0b38e9 
bitcoin#22550 adds assertions to validate CSV/CLTV activation and
replaces the `generate()` calls with a helper `generate_to_height()` but
bitcoin#22818 activates all forks from block 1 by default, so the
`generate_to_height()` calls have been dropped.

This leaves us with the `generate()` calls being swapped for assertions.
@kwvg
merge bitcoin#23345: Drop unneeded dependencies for bitcoin-wallet tool
8b4a1aa
@kwvg
merge bitcoin#23508: Add getdeploymentinfo RPC
bf69eb9
@kwvg
merge bitcoin#24187: Followups for getdeploymentinfo
9e79118
@kwvg
merge bitcoin#24528: rename getdeploymentinfo status-next to status_next
780afc1
@kwvg
merge bitcoin#24579: Fix getblockchaininfo/getdeploymentinfo RPC docs
9547c59
@kwvg
partial bitcoin#24595: move g_versionbitscache global to ChainstateMa…
8411522 
…nager

includes:
- 69675ea
- 38860f9
- 5c67e84
- deffe0d
- 78adef1
@kwvg
merge bitcoin#24410: Split hashing/index GetUTXOStats codepaths, de…
2b7d35b 
…couple from `coinstatsindex`
@kwvg
merge bitcoin#15936: Expose settings.json methods to GUI
34b0b25
@kwvg
merge bitcoin#25748: Avoid copies in FlatSigningProvider Merge
358bdfe
@kwvg
merge bitcoin#25863: remove unused norm_prv parameter in `descriptor_…
b8ffa84 
…tests.cpp`
@kwvg
merge bitcoin#24051: bitcoin-{cli,tx,util} don't need UPnP, NAT-PMP, …
a34f9c6 
…or ZMQ
@kwvg
merge bitcoin#25315: Add warning on first startup if free disk space …
cc73b1e 
…is less than necessary
@kwvg
merge bitcoin#26624: Rename local variable to distinguish it from typ…
0f6e1f4 
…e alias
@kwvg
merge bitcoin#26894: Remove redundant key_to_p2pkh call
de5b4bf
@kwvg
merge bitcoin#25412: add /deploymentinfo endpoint
908eb3d
@kwvg
refactor: migrate DeploymentActive{At,After} use in RPC and test logic
9a899dc
@kwvg
refactor: adapt subsidy logic to DeploymentActive{At,After}
2711c21
@kwvg
refactor: adapt ProTx logic to DeploymentActive{At,After}
44f4cf4
@kwvg
refactor: adapt CbTx, CreditPool logic to DeploymentActive{At,After}
c86eb6a
@kwvg
trivial: force stricter lambda signature for ForEachMN{,Shared}()
5081321
@kwvg 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 added 12 commits October 19, 2025 23:49
@kwvg
refactor: adapt DMN logic to DeploymentActive{At,After}
40bf1c6
@kwvg
refactor: adapt some LLMQ logic to DeploymentActive{At,After}
6c0163d
@kwvg
refactor: adapt more LLMQ logic to DeploymentActive{At,After}
3eeffe2
@kwvg
refactor: adapt some more LLMQ logic to DeploymentActive{At,After}
decd6ea
@kwvg
refactor: move IsQuorum{Rotation,Type}Enabled to ChainstateManager
879a43e
@kwvg
refactor: clean up {c,d}tor for TestingSetups
39a2f7d
@kwvg
refactor: make chainstate initialization code unit test aware
17ba102 
When we consolidated functionality, we didn't permeate unit test status
to trigger in-memory database creation, which can result in odd test
failures
@kwvg
refactor: accept ChainstateManager in CMNHFManager ctor
86ff8f7 
The `ConnectManager` approach is no longer needed and directly conflicts
with `ChainstateManager` also holding the versionbits cache as without
it, we start experiencing validation failures.
@kwvg
refactor: migrate remaining DeploymentActive{At,After} use
7fd5745
@kwvg
merge bitcoin#24595: move g_versionbitscache global to ChainstateManager
1c00d0a 
includes:
- d603f1d
- eca22c7
- bb5c24b
@kwvg
merge bitcoin#25830: Replace m_params with chainman.GetParams()
ffc7df4
@kwvg
lint: update circular dependencies allowlist
ffc7fdd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@knst knst knst left review comments

At least 2 approving reviews are required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

23

Development

Successfully merging this pull request may close these issues.

2 participants

@kwvg @knst