aboutsummaryrefslogtreecommitdiff
path: root/src/consensus
diff options
context:
space:
mode:
authorPieter Wuille <pieter@wuille.net>2020-09-11 14:34:17 -0700
committerPieter Wuille <pieter@wuille.net>2020-10-12 17:18:47 -0700
commitd7ff237f2996a4c11fdf9399187c2d2b26bf9809 (patch)
tree79de8e7660ed32cf50e94bc340e17bca14ab4bd0 /src/consensus
parente9a021d7e6a454d610a45cb9b3995f0d96a5fbb6 (diff)
downloadbitcoin-d7ff237f2996a4c11fdf9399187c2d2b26bf9809.tar.xz
Activate Taproot/Tapscript on regtest (BIP 341, BIP 342)
Define a versionbits-based activation for the new consensus rules on regtest. No activation or activation mechanism is defined for testnet or mainnet.
Diffstat (limited to 'src/consensus')
-rw-r--r--src/consensus/params.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 85ab3f61ef..932f0d2c60 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -14,6 +14,7 @@ namespace Consensus {
enum DeploymentPos
{
DEPLOYMENT_TESTDUMMY,
+ DEPLOYMENT_TAPROOT, // Deployment of Schnorr/Taproot (BIPs 340-342)
// NOTE: Also add new deployments to VersionBitsDeploymentInfo in versionbits.cpp
MAX_VERSION_BITS_DEPLOYMENTS
};