Remove Taproot activation height #26201

Sjors · 2022-09-29T11:16:54Z

Drop DEPLOYMENT_TAPROOT from consensus.vDeployments.

Now that the commit (7c08d81) which changes taproot to be enforced for all blocks is included in v24.0, it seems a good time to remove no longer needed non-consensus code.

Clarify what is considered a BuriedDeployment.

We drop taproot from getdeploymentinfo RPC, rather than mark it as buried, because this is not a buried deployment in the sense of BIP 90. This is because the activation height has been completely removed from the code, rather than hard coded.

See discussion in #24737 and #26162.

DrahtBot · 2022-09-30T14:34:31Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/26201.

Reviews

See the guideline for information on the review process.

Type	Reviewers
Concept ACK	l0rinc, sedited
Stale ACK	jonatack

If your review is incorrectly listed, please copy-paste  into the comment that the bot should ignore.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#34049 (rpc: Disallow captures in RPCMethodImpl by ajtowns)
#31974 (Drop testnet3 by Sjors)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

luke-jr · 2022-10-02T14:04:08Z

Concept ~0, but I object the claim in general that commits "sufficiently buried by other commits, and thus less likely to be reverted". Git isn't PoW, and "burying" commits does not make them less likely to be reverted.

Sjors · 2022-10-03T09:22:14Z

@luke-jr changed the wording to "is (probably) included in v24.0".

ajtowns · 2022-10-08T03:47:41Z

This should be updating MinBIP9WarningHeight above the taproot activation height (otherwise you should see "warnings": "Unknown new rules activated (versionbit 2)" due to miner signalling)

Sjors · 2022-11-01T09:41:51Z

@ajtowns done

src/consensus/params.h

doc/release-notes-26201.md

achow101 · 2023-04-25T15:23:34Z

Are you still working on this?

Sjors · 2023-05-08T14:12:42Z

I'll rebase soon(tm).

luke-jr · 2023-07-27T00:54:31Z

src/deploymentinfo.cpp

This will need aRules in rpc/mining.cpp updated

Sjors · 2023-08-18T10:30:05Z

src/rpc/mining.cpp

@luke-jr like this?

This will need aRules in rpc/mining.cpp updated

Oh wait, without !

I'll push a fix and add a test...

Before and after this change it should be:

bitcoin-cli getblocktemplate '{"rules": ["segwit"]}' | jq '.rules' [ "csv", "!segwit", "taproot" ]

Sjors · 2023-08-18T11:12:37Z

Rebased after kernel changes. Fixed a regression in getblocktemplate's rules result, and added a test for tit.

Sjors · 2023-08-18T11:16:34Z

src/rpc/mining.cpp

In #27433 I propose getting rid of fPreSegWit.

this was #31625, but then closed

Indeed it was split out from #27433 into its own PR #31625, which after some discussion I marked up for grabs.

Sjors · 2025-04-30T13:09:07Z

Rebased after #29039.

Sjors · 2025-05-14T07:01:42Z

Trivial rebase after #32386.

Sjors · 2025-06-19T08:09:46Z

Rebased after #31981 for minor conflict in mining_basic.py.

doc/bips.md

8ee8a95 doc: taproot became always active in v24.0 (Sjors Provoost) Pull request description: Split from #26201. ACKs for top commit: maflcko: lgtm ACK 8ee8a95 janb84: ACK 8ee8a95 Tree-SHA512: 1ac6994c6775ca5423f022d1e02e3d531fb7fa295be9940355b8aa9d173787a8d65945a0cf976ab344bcaa3ea8a0f3aa6f8da851325bf475e59375981b115cab

Sjors · 2025-06-19T15:02:25Z

Rebased after splitting the doc/bips.md changes off into #32776.

Drop DEPLOYMENT_TAPROOT from consensus.vDeployments. Bump MinBIP9WarningHeight. Clarify what is considered a BuriedDeployment and drop taproot from getdeploymentinfo RPC. Add a test to getblocktemplate to ensure the taproot rule is still set. Co-Authored-By: MarcoFalke <*~=`'#}+{/-|&$^[email protected]>

Sjors · 2025-09-03T11:32:57Z

Rebased after #33274.

sedited · 2025-12-28T17:03:16Z

Concept ACK

Seems reasonable given that we say "Consensus changes for which the new rules are enforced from genesis are not listed here."

Sjors mentioned this pull request Sep 29, 2022

Remove taproot chain param and list exception blocks in getdeploymentinfo #26162

Closed

DrahtBot mentioned this pull request Oct 1, 2022

refactor / kernel: Move non-gArgs chainparams functionality to kernel #26177

Merged

Sjors force-pushed the 2022/09/taproot-demarcation-height branch from b0f4391 to 8f96e52 Compare November 1, 2022 09:41

maflcko reviewed Nov 1, 2022

View reviewed changes

src/consensus/params.h Outdated Show resolved Hide resolved

maflcko reviewed Nov 1, 2022

View reviewed changes

doc/release-notes-26201.md Outdated Show resolved Hide resolved

Sjors force-pushed the 2022/09/taproot-demarcation-height branch 2 times, most recently from b8c2cc1 to 20ef70f Compare November 1, 2022 09:51

DrahtBot mentioned this pull request Jan 27, 2023

OP_VAULT draft #26857

Closed

DrahtBot mentioned this pull request Mar 7, 2023

Update chainparams for 25.x #27223

Closed

DrahtBot added the Needs rebase label Mar 16, 2023

luke-jr suggested changes Jul 27, 2023

View reviewed changes

src/deploymentinfo.cpp Outdated

Comment on lines 14 to 19

Copy link

Member

luke-jr Jul 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will need aRules in rpc/mining.cpp updated

Sjors force-pushed the 2022/09/taproot-demarcation-height branch 2 times, most recently from 20687de to 7fb3287 Compare August 18, 2023 10:28

Sjors commented Aug 18, 2023

View reviewed changes

DrahtBot removed the Needs rebase label Aug 18, 2023

Sjors force-pushed the 2022/09/taproot-demarcation-height branch from 7fb3287 to b5d8ddb Compare August 18, 2023 11:11

Sjors commented Aug 18, 2023

View reviewed changes

Sjors mentioned this pull request Aug 18, 2023

getblocktemplate improvements for segwit and sigops #27433

Closed

DrahtBot added CI failed and removed CI failed labels Sep 12, 2023

This was referenced Sep 28, 2023

Covenant tools softfork #28550

Closed

kernel: chainparams updates for 26.x #28591

Merged

DrahtBot mentioned this pull request Mar 20, 2025

BIP-119 (OP_CHECKTEMPLATEVERIFY) (regtest only) #31989

Open

DrahtBot mentioned this pull request Mar 30, 2025

OP_CHECKCONTRACTVERIFY #32080

Closed

DrahtBot mentioned this pull request Apr 10, 2025

BIP-348 (OP_CHECKSIGFROMSTACK) (regtest only) #32247

Draft

DrahtBot added the Needs rebase label Apr 29, 2025

Sjors force-pushed the 2022/09/taproot-demarcation-height branch from f88b9cb to 1e9c19e Compare April 30, 2025 13:08

DrahtBot removed the Needs rebase label Apr 30, 2025

Sjors mentioned this pull request Apr 30, 2025

mining: rename gbt_force and gbt_force_name #32386

Merged

DrahtBot added the Needs rebase label May 13, 2025

Sjors force-pushed the 2022/09/taproot-demarcation-height branch from 1e9c19e to 6eff04e Compare May 14, 2025 07:01

DrahtBot removed the Needs rebase label May 14, 2025

DrahtBot mentioned this pull request Jun 12, 2025

Add checkBlock() to Mining interface #31981

Merged

DrahtBot added the Needs rebase label Jun 19, 2025

Sjors force-pushed the 2022/09/taproot-demarcation-height branch from 6eff04e to f08e573 Compare June 19, 2025 08:08

maflcko reviewed Jun 19, 2025

View reviewed changes

doc/bips.md Outdated Show resolved Hide resolved

DrahtBot removed the Needs rebase label Jun 19, 2025

Sjors mentioned this pull request Jun 19, 2025

doc: taproot became always active in v24.0 (doc/bips.md) #32776

Merged

Sjors force-pushed the 2022/09/taproot-demarcation-height branch from f08e573 to 84287a3 Compare June 19, 2025 15:01

DrahtBot mentioned this pull request Sep 2, 2025

kernel: chainparams & headersync updates for 30.0 #33274

Merged

DrahtBot added the Needs rebase label Sep 3, 2025

Sjors force-pushed the 2022/09/taproot-demarcation-height branch from 84287a3 to ec17c82 Compare September 3, 2025 11:32

DrahtBot removed the Needs rebase label Sep 3, 2025

DrahtBot mentioned this pull request Dec 12, 2025

rpc: Disallow captures in RPCMethodImpl #34049

Open

Remove Taproot activation height #26201

Are you sure you want to change the base?

Remove Taproot activation height #26201

Conversation

Sjors commented Sep 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrahtBot commented Sep 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Coverage & Benchmarks

Reviews

Conflicts

Uh oh!

luke-jr commented Oct 2, 2022

Uh oh!

Sjors commented Oct 3, 2022

Uh oh!

ajtowns commented Oct 8, 2022

Uh oh!

Sjors commented Nov 1, 2022

Uh oh!

Uh oh!

Uh oh!

achow101 commented Apr 25, 2023

Uh oh!

Sjors commented May 8, 2023

Uh oh!

luke-jr Jul 27, 2023

Choose a reason for hiding this comment

Uh oh!

Sjors Aug 18, 2023

Choose a reason for hiding this comment

Uh oh!

Sjors Aug 18, 2023

Choose a reason for hiding this comment

Uh oh!

Sjors commented Aug 18, 2023

Uh oh!

Sjors Aug 18, 2023

Choose a reason for hiding this comment

Uh oh!

maflcko Jun 19, 2025

Choose a reason for hiding this comment

Uh oh!

Sjors Jun 19, 2025

Choose a reason for hiding this comment

Uh oh!

Sjors commented Apr 30, 2025

Uh oh!

Sjors commented May 14, 2025

Uh oh!

Sjors commented Jun 19, 2025

Uh oh!

Uh oh!

Sjors commented Jun 19, 2025

Uh oh!

Sjors commented Sep 3, 2025

Uh oh!

sedited commented Dec 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Sjors commented Sep 29, 2022 •

edited

Loading

DrahtBot commented Sep 30, 2022 •

edited

Loading