diff options
| author | Pieter Wuille <pieter@wuille.net> | 2020-09-11 14:34:17 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter@wuille.net> | 2020-10-12 17:18:47 -0700 |
| commit | d7ff237f2996a4c11fdf9399187c2d2b26bf9809 (patch) | |
| tree | 79de8e7660ed32cf50e94bc340e17bca14ab4bd0 /src/validation.cpp | |
| parent | e9a021d7e6a454d610a45cb9b3995f0d96a5fbb6 (diff) | |
| download | bitcoin-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/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 65958967ee..0b78ba677e 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1920,6 +1920,11 @@ static unsigned int GetBlockScriptFlags(const CBlockIndex* pindex, const Consens flags |= SCRIPT_VERIFY_CHECKSEQUENCEVERIFY; } + // Start enforcing Taproot using versionbits logic. + if (VersionBitsState(pindex->pprev, consensusparams, Consensus::DEPLOYMENT_TAPROOT, versionbitscache) == ThresholdState::ACTIVE) { + flags |= SCRIPT_VERIFY_TAPROOT; + } + // Start enforcing BIP147 NULLDUMMY (activated simultaneously with segwit) if (IsWitnessEnabled(pindex->pprev, consensusparams)) { flags |= SCRIPT_VERIFY_NULLDUMMY; |