GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge #912: Specify BIP9 deployment for DynaFed

Browse source 
afcb71f87 Speficy dynafed deployment for Liquidv1 (Steven Roose)
7208d5b6f Add comment to BIP9 time fields (Steven Roose)
fa3a74b75 Move dynafed bit into the ELEMENTS fields (Steven Roose)

Pull request description:

  Bit: 25 (identical to current elementsregtest dynafed bit)
  Start: block 1,000,000 (recent past)
  Timeout: never

Tree-SHA512: 4fb79e7623ffefdc644d1de75d18b368f1cee755a3a9db66d99021f047064e30f10fbcc450a3318f22f2dddd5101a7fe16edd3d888428a1ad68594f718b28750
This commit is contained in:
Steven Roose 2020-10-06 17:54:42 +02:00
commit 88067ddbe4
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/chainparams.cpp
View file

@ -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() {
@ -861,9 +861,9 @@ public:
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

2
src/consensus/params.h
View file

@ -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. */