From 166a3a7363814ba56d1b180465706ef1a5934873 Mon Sep 17 00:00:00 2001 From: Sogobi Napiasi Date: Wed, 12 Jun 2024 16:24:58 -0600 Subject: [PATCH 1/2] Activate Taproot Activate Taproot --- src/chainparams.cpp | 8 ++++---- src/rpc/blockchain.cpp | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 758adc8c0f..1ed3372f39 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -107,8 +107,8 @@ class CMainParams : public CChainParams { // Deployment of Taproot (BIPs 340-342) consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2; - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 4070908800; // January 1st, 2099 - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 4099766400; // December 1st, 2099 + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 1722514104; // 1st August 2024 + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1785586104; // 1st August 2026 consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay // The best chain should have at least this much work. @@ -370,8 +370,8 @@ class CTestNetParams : public CChainParams { // Deployment of Taproot (BIPs 340-342) consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2; - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 4070908800; // January 1st, 2099 - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 4099766400; // December 1st, 2099 + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 1718921304; // 20th June 2024 Testnet + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1750457304; // 20th June 2025 Testnet consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay consensus.nOdoShapechangeInterval = 1*24*60*60; // 1 day diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 29c0b56003..ce8f3b4f19 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1569,6 +1569,7 @@ RPCHelpMan getblockchaininfo() SoftForkDescPushBack(tip, softforks, consensusParams, Consensus::DEPLOYMENT_SEGWIT); SoftForkDescPushBack(tip, softforks, consensusParams, Consensus::DEPLOYMENT_TESTDUMMY); SoftForkDescPushBack(tip, softforks, consensusParams, Consensus::DEPLOYMENT_ODO); + SoftForkDescPushBack(tip, softforks, consensusParams, Consensus::DEPLOYMENT_TAPROOT); obj.pushKV("softforks", softforks); obj.pushKV("warnings", GetWarnings(false).original); return obj; From e067e4d0d45e91a9cee9d9eff7181ec504dbcbef Mon Sep 17 00:00:00 2001 From: SogobiNapiasi Date: Fri, 8 Nov 2024 11:22:34 -0700 Subject: [PATCH 2/2] Update chainparams.cpp Activation Threshold DGB Birthday --- src/chainparams.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 1ed3372f39..54da2437fd 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -107,8 +107,8 @@ class CMainParams : public CChainParams { // Deployment of Taproot (BIPs 340-342) consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2; - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 1722514104; // 1st August 2024 - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1785586104; // 1st August 2026 + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 1736510438; // 10th January 2025 + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1799582438; // 10th January 2027 consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay // The best chain should have at least this much work.