From 6f70350d07946eed093576bbd93c7593f770aa31 Mon Sep 17 00:00:00 2001 From: Steven Roose Date: Wed, 30 Sep 2020 18:54:34 +0200 Subject: [PATCH 1/3] Move dynafed bit into the ELEMENTS fields --- src/chainparams.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index f687d0317b..c55a815b79 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -613,6 +613,10 @@ class CCustomParams : public CRegTestParams { consensus.subsidy_asset = CAsset(uint256S(gArgs.GetArg("-subsidyasset", "0x00"))); } + consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].bit = 25; + consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = args.GetArg("-con_dyna_deploy_start", Consensus::BIP9Deployment::ALWAYS_ACTIVE); + consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; + // END ELEMENTS fields // CSV always active by default, unlike regtest @@ -620,10 +624,6 @@ class CCustomParams : public CRegTestParams { consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = args.GetArg("-con_csv_deploy_start", Consensus::BIP9Deployment::ALWAYS_ACTIVE); consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; - consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].bit = 25; - consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = args.GetArg("-con_dyna_deploy_start", Consensus::BIP9Deployment::ALWAYS_ACTIVE); - consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; - } void SetGenesisBlock() { From 385b670a9f7be472e8fd4eaeb195936c5efb2da5 Mon Sep 17 00:00:00 2001 From: Steven Roose Date: Wed, 30 Sep 2020 18:56:52 +0200 Subject: [PATCH 2/3] Add comment to BIP9 time fields The semantics of these fields were changed in 6fc3fe04efc01a68f7bdaabf054929dc8db6dcb1. --- src/consensus/params.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/consensus/params.h b/src/consensus/params.h index e4ef209bef..6a90c7a417 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -34,8 +34,10 @@ struct BIP9Deployment { /** Bit position to select the particular bit in nVersion. */ int bit; /** Start MedianTime for version bits miner confirmation. Can be a date in the past */ + // ELEMENTS: Interpreted as block height! int64_t nStartTime; /** Timeout/expiry MedianTime for the deployment attempt. */ + // ELEMENTS: Interpreted as block height! int64_t nTimeout; /** Constant for nTimeout very far in the future. */ From 47bc28aa88a75bfabf0ba7bf35ae12adf498a959 Mon Sep 17 00:00:00 2001 From: Steven Roose Date: Wed, 30 Sep 2020 18:57:47 +0200 Subject: [PATCH 3/3] Speficy dynafed deployment for Liquidv1 Bit: 25 Start: block 1,000,000 (recent past) Timeout: never --- src/chainparams.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index c55a815b79..7ab1a9a91e 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -883,9 +883,9 @@ class CLiquidV1Params : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; // Not active yet. - consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].bit = 0; - consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = 0; - consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nTimeout = 0; + consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].bit = 25; + consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = 1000000; + consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT; // Finally, create genesis block