Skip to content

Commit 0f86e7f

Browse files
author
MarcoFalke
committed
Merge #20157: Bugfix: chainparams: Add missing (always enabled) Taproot deployment for Signet
2d5793c 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 2d5793c MarcoFalke: review ACK 2d5793c Tree-SHA512: 135cefae0f8dc552b0f682c2b87cabca7a4716290a36410a55968850e803a5049234e3cc597c8ef8d7917ae5d5ea3fb851e160df171b6793114c6bc01c5ea3e7
2 parents f5bd46a + 2d5793c commit 0f86e7f

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/chainparams.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,11 @@ class SigNetParams : public CChainParams {
330330
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
331331
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
332332

333+
// Activation of Taproot (BIPs 340-342)
334+
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2;
335+
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = Consensus::BIP9Deployment::ALWAYS_ACTIVE;
336+
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
337+
333338
// message start is defined as the first 4 bytes of the sha256d of the block script
334339
CHashWriter h(SER_DISK, 0);
335340
h << consensus.signet_challenge;

0 commit comments

Comments
 (0)