From d1bc3c6ca3610c2d4fdbd525cd7c35fe73833337 Mon Sep 17 00:00:00 2001 From: Jared Tate <13957390+JaredTate@users.noreply.github.com> Date: Tue, 7 Jan 2025 18:27:42 -0700 Subject: [PATCH 1/4] Update RegTest Settings - Taproot Test --- src/chainparams.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index ff2644362a..c2782b0a67 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -636,13 +636,15 @@ class CRegTestParams : public CChainParams { consensus.alwaysUpdateDiffChangeTarget = 400; // Block 400,000 MultiShield Hard Fork consensus.workComputationChangeTarget = 1430; // Block 1,430,000 DigiSpeed Hard Fork consensus.algoSwapChangeTarget = 2000; // Block 9,000,000 Odo PoW Hard Fork - consensus.nRuleChangeActivationThreshold = 168; // 70% of 240 - consensus.nMinerConfirmationWindow = 240; // 1 hour in RegTest - consensus.fRbfEnabled = false; + // Soft fork Threshhold Regtest + consensus.nRuleChangeActivationThreshold = 70; // 70% of 100 + consensus.nMinerConfirmationWindow = 100; // 1 hour in RegTest + + + consensus.fRbfEnabled = false; consensus.nOdoShapechangeInterval = 4; // 1 minute consensus.fPowNoRetargeting = true; - consensus.initialTarget[ALGO_ODO] = ArithToUint256(~arith_uint256(0) >> 38); // 4 difficulty // Old 1% monthly DGB Reward before 15 secon block change @@ -684,11 +686,11 @@ class CRegTestParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].min_activation_height = 0; // No activation delay - // Activation of Taproot (BIPs 340-342) + // Configure Taproot Test Deployment consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2; - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = Consensus::BIP9Deployment::ALWAYS_ACTIVE; + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 0; // Start at genesis 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].min_activation_height = 10; consensus.nMinimumChainWork = uint256{}; consensus.defaultAssumeValid = uint256{}; From 48cc4465bb577b973f011a8839bc080a97fe36d1 Mon Sep 17 00:00:00 2001 From: Jared Tate <13957390+JaredTate@users.noreply.github.com> Date: Tue, 21 Jan 2025 08:47:48 -0700 Subject: [PATCH 2/4] Update Assumevalid Block & Checkpoint --- src/chainparams.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index c2782b0a67..f0a1f3fe69 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -115,7 +115,7 @@ class CMainParams : public CChainParams { consensus.nMinimumChainWork = uint256S("0x00"); // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x6495a84f8f83981a435a6cbf9e6dd4bf0f38618c8325213ca6ef6add40c0ddd8"); // Block 6,000,000 + consensus.defaultAssumeValid = uint256S("0xf530a66ba6fe93e647f7d88a9b3f22bfe8c2c2ab1ec1b0286286f86b82d6a10f"); // Block 20,000,000 /** * The message start string is designed to be unlikely to occur in normal data. @@ -200,6 +200,7 @@ class CMainParams : public CChainParams { { 1435000, uint256S("0xf78cc9c2791c8a23720e2efcdaf46584046ee5db8f050e21a3a15a13f5c68da0")}, { 4255555, uint256S("0x23f72e760542bf021ec76d04231ad7cf80142069a79ba702028e074b726f86ef")}, { 6000000, uint256S("0x6495a84f8f83981a435a6cbf9e6dd4bf0f38618c8325213ca6ef6add40c0ddd8")}, + { 20000000, uint256S("0xf530a66ba6fe93e647f7d88a9b3f22bfe8c2c2ab1ec1b0286286f86b82d6a10f")}, } }; From d6c4ba1b070bd36cdfd7a212b03828fe7959cf6c Mon Sep 17 00:00:00 2001 From: Jared Tate <13957390+JaredTate@users.noreply.github.com> Date: Tue, 21 Jan 2025 08:48:36 -0700 Subject: [PATCH 3/4] Version Bump --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 72ee9dd039..395d7a16a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 8) define(_CLIENT_VERSION_MINOR, 22) -define(_CLIENT_VERSION_BUILD, 0) -define(_CLIENT_VERSION_RC, 5) +define(_CLIENT_VERSION_BUILD, 1) +define(_CLIENT_VERSION_RC, 1) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2025) define(_COPYRIGHT_HOLDERS,[The %s developers]) From 37c46626e8a4acce26de536d7299be2395f0e4ef Mon Sep 17 00:00:00 2001 From: Jared Tate <13957390+JaredTate@users.noreply.github.com> Date: Tue, 21 Jan 2025 08:53:44 -0700 Subject: [PATCH 4/4] Revert "Update RegTest Settings - Taproot Test" This reverts commit d1bc3c6ca3610c2d4fdbd525cd7c35fe73833337. --- src/chainparams.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index f0a1f3fe69..be5addcbab 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -637,15 +637,13 @@ class CRegTestParams : public CChainParams { consensus.alwaysUpdateDiffChangeTarget = 400; // Block 400,000 MultiShield Hard Fork consensus.workComputationChangeTarget = 1430; // Block 1,430,000 DigiSpeed Hard Fork consensus.algoSwapChangeTarget = 2000; // Block 9,000,000 Odo PoW Hard Fork - - // Soft fork Threshhold Regtest - consensus.nRuleChangeActivationThreshold = 70; // 70% of 100 - consensus.nMinerConfirmationWindow = 100; // 1 hour in RegTest - - + consensus.nRuleChangeActivationThreshold = 168; // 70% of 240 + consensus.nMinerConfirmationWindow = 240; // 1 hour in RegTest consensus.fRbfEnabled = false; + consensus.nOdoShapechangeInterval = 4; // 1 minute consensus.fPowNoRetargeting = true; + consensus.initialTarget[ALGO_ODO] = ArithToUint256(~arith_uint256(0) >> 38); // 4 difficulty // Old 1% monthly DGB Reward before 15 secon block change @@ -687,11 +685,11 @@ class CRegTestParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].min_activation_height = 0; // No activation delay - // Configure Taproot Test Deployment + // Activation of Taproot (BIPs 340-342) consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].bit = 2; - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 0; // Start at genesis + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = Consensus::BIP9Deployment::ALWAYS_ACTIVE; consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; - consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 10; + consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay consensus.nMinimumChainWork = uint256{}; consensus.defaultAssumeValid = uint256{};