diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-10-21 14:19:26 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-10-21 14:19:33 +0200 |
| commit | 0f86e7f1285c6de697d144a0e68bbd67f4900e19 (patch) | |
| tree | 8cd36e67af030e99e7b84a17254ea5bdce540556 /src/chainparams.cpp | |
| parent | f5bd46a4cc6d395ce71ecb99852c1774235a249c (diff) | |
| parent | 2d5793c0161902730cde384dbdf3e3ba3e55c9e0 (diff) | |
| download | bitcoin-0f86e7f1285c6de697d144a0e68bbd67f4900e19.tar.xz | |
Merge #20157: Bugfix: chainparams: Add missing (always enabled) Taproot deployment for Signet
2d5793c0161902730cde384dbdf3e3ba3e55c9e0 Bugfix: chainparams: Add missing (disabled) Taproot deployment for Signet (Luke Dashjr)
Pull request description:
Is there a way we can trigger compiler warnings if a deployment is undefined?
ACKs for top commit:
decryp2kanon:
utACK 2d5793c0161902730cde384dbdf3e3ba3e55c9e0
MarcoFalke:
review ACK 2d5793c0161902730cde384dbdf3e3ba3e55c9e0
Tree-SHA512: 135cefae0f8dc552b0f682c2b87cabca7a4716290a36410a55968850e803a5049234e3cc597c8ef8d7917ae5d5ea3fb851e160df171b6793114c6bc01c5ea3e7
Diffstat (limited to 'src/chainparams.cpp')
| -rw-r--r-- | src/chainparams.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 7998357bc7..be2f5b53a6 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -330,6 +330,11 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008 consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008 + // Activation of Taproot (BIPs 340-342) + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2; + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = Consensus::BIP9Deployment::ALWAYS_ACTIVE; + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; + // message start is defined as the first 4 bytes of the sha256d of the block script CHashWriter h(SER_DISK, 0); h << consensus.signet_challenge; |