From 57ab101352e233a481eae06c42a81530547cf7ab Mon Sep 17 00:00:00 2001 From: Andrew Poelstra Date: Mon, 7 Oct 2024 23:50:19 +0000 Subject: [PATCH] simplicity: copy activation threshold/period from taproot Copy the parameters for mainnet because they seem to have worked fine for Taproot and are therefore a good starting point for Simplicity. Copy them for regtest so that we can also copy the functional test for activation, without needing to change a whole bunch of numbers. --- src/chainparams.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index a5a03a9edb..2853304795 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -630,6 +630,8 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].min_activation_height = 0; // No activation delay + consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].nPeriod = 128; // test ability to change from default + consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].nThreshold = 128; consensus.nMinimumChainWork = uint256{}; consensus.defaultAssumeValid = uint256{}; @@ -1290,6 +1292,8 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].nStartTime = Consensus::BIP9Deployment::NEVER_ACTIVE; consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].min_activation_height = 0; // No activation delay + consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].nPeriod = 10080; // one week... + consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].nThreshold = 10080; // ...of 100% signalling // Activated from block 1,000,000. consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].bit = 25;