diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2021-04-14 22:36:19 -0400 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2021-04-15 20:59:21 -0400 |
| commit | cbd64c3a28a7466f421477daadc6e6e6b69b898a (patch) | |
| tree | 00230433826f344300a0dc00f4f16274c602ff5d | |
| parent | ec7824396bdd2e93b429ddce9fea6bb29695454a (diff) | |
| download | bitcoin-cbd64c3a28a7466f421477daadc6e6e6b69b898a.tar.xz | |
Add mainnet and testnet taproot activation params
Github-Pull: #21686
Rebased-From: f979b3237f1cfc28f9c4ccb07beab558d5357a55
| -rw-r--r-- | src/chainparams.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 16dde1c577..0a45b782b9 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -89,9 +89,9 @@ public: // Deployment of Taproot (BIPs 340-342) consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2; - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 1619222400; // April 24th, 2021 + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1628640000; // August 11th, 2021 + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 709632; // Approximately November 12th, 2021 consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000001533efd8d716a517fe2c5008"); consensus.defaultAssumeValid = uint256S("0x0000000000000000000b9d2ec5a352ecba0592946514a92f14319dc2b367fc72"); // 654683 @@ -204,8 +204,8 @@ public: // Deployment of Taproot (BIPs 340-342) consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2; - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 1619222400; // April 24th, 2021 + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1628640000; // August 11th, 2021 consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000001db6ec4ac88cf2272c6"); |