Page MenuHomePhabricator
Differential D12224

deploymentinfo: Add DeploymentName()
ClosedPublic
Actions

Authored by PiRK on Oct 12 2022, 15:02.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABC4352a943c0b9: deploymentinfo: Add DeploymentName()
Summary

Add and use DeploymentName(). Add missing includes in blockchain.cpp. Rename BIP9SoftForkDescPushBack -> SoftForkDescPushBack. Add a SoftForkDescPushBack function for buried deployments (currently not used in the RPC)

This is a partial backport of core#19438
https://github.com/bitcoin/bitcoin/pull/19438/commits/92f48f360da5f425428b761219301f509826bec4
https://github.com/bitcoin/bitcoin/pull/19438/commits/8ee3e0bed5bf2cd3c7a68ca6ba6c65f7b9a72cca

Notes:

  • D5218 already replaced the name argument with a DeploymentPos in BIP9SoftForkDescPushBack
  • we don't report buried deployment in getblockchaininfo, so this backport only maintains the current code we have for active BIP9 activations. A DeploymentName function is added for buried deployments, but currently unused.

Depends on D12222

Test Plan

ninja all check-all

Diff Detail

Event Timeline

PiRK created this revision.Oct 12 2022, 15:02
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 12 2022, 15:02
PiRK requested review of this revision.Oct 12 2022, 15:02
teamcity edited the summary of this revision. (Show Details)Oct 12 2022, 15:03
PiRK edited the summary of this revision. (Show Details)Oct 12 2022, 15:04
PiRK added a parent revision: D12222: [move-only] Rename versionbitsinfo to deploymentinfo.
PiRK added a child revision: D12225: [refactor] versionbits: make VersionBitsCache a full class.Oct 12 2022, 15:05
PiRK updated this revision to Diff 35623.Oct 12 2022, 15:09

remove unused std::string DeploymentName(Consensus::BuriedDeployment dep) function

Harbormaster completed remote builds in B20468: Diff 35621.Oct 12 2022, 15:21
Harbormaster completed remote builds in B20470: Diff 35623.Oct 12 2022, 15:29
Fabien requested changes to this revision.Oct 12 2022, 15:54
Fabien added a subscriber: Fabien.

You should not remove the buried part but rather use [[maybe_unused]] and leave it there so we can use it for miner fund activation later

src/rpc/blockchain.cpp
1638 ↗(On Diff #35623)

This is renamed in the source material

This revision now requires changes to proceed.Oct 12 2022, 15:54
PiRK updated this revision to Diff 35634.Oct 13 2022, 05:16
PiRK edited the summary of this revision. (Show Details)

add missing includes and DeploymentName function for buried deployments.

PiRK updated this revision to Diff 35635.Oct 13 2022, 05:23
PiRK edited the summary of this revision. (Show Details)

also add [[maybe_unused]] SoftForkDescPushBack(... , Consensus::BuriedDeployment dep) for potential later use and for easier future backports

Harbormaster completed remote builds in B20478: Diff 35634.Oct 13 2022, 05:30
Harbormaster completed remote builds in B20479: Diff 35635.Oct 13 2022, 05:39
Fabien requested changes to this revision.Oct 13 2022, 08:19
Fabien added inline comments.
src/deploymentinfo.cpp
17 ↗(On Diff #35635)

You need maybe_unused here as well

This revision now requires changes to proceed.Oct 13 2022, 08:19
PiRK updated this revision to Diff 35653.Oct 13 2022, 09:13

add missing maybe_unused

Fabien accepted this revision.Oct 13 2022, 09:35
This revision is now accepted and ready to land.Oct 13 2022, 09:35
This revision was landed with ongoing or failed builds.Oct 13 2022, 09:43
Closed by commit rABC4352a943c0b9: deploymentinfo: Add DeploymentName() (authored by Anthony Towns <aj@erisian.com.au>, committed by PiRK). · Explain Why
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABC4352a943c0b9: deploymentinfo: Add DeploymentName().
Harbormaster completed remote builds in B20487: Diff 35653.Oct 13 2022, 10:04

Revision Contents
Changeset List

PathSize
src/
14 lines
17 lines
rpc/
19 lines

Diff 35634

View Options

src/deploymentinfo.h

Loading...
View Options

src/deploymentinfo.cpp

Loading...
View Options

src/rpc/blockchain.cpp

Loading...