sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Multiple devnet fixes (#1960)

Browse Source 
* Add missing help string for -devnet

* Remove testnet seeds from devnet

* Activate BIP34/65/66 at height 2 instead of 1

Height 1 is the genesis block and not the devnet genesis block. The genesis
block is still at version 1, resulting in re-indexing to fail.
This commit is contained in:
Alexander Block 2018-03-02 14:12:31 +01:00 committed by UdjinM6
parent bab543f3e6
commit 9876207ce2
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/chainparams.cpp
View File

@ -412,9 +412,9 @@ public:
consensus.nGovernanceMinQuorum = 1; consensus.nGovernanceMinQuorum = 1;
consensus.nGovernanceFilterElements = 500; consensus.nGovernanceFilterElements = 500;
consensus.nMasternodeMinimumConfirmations = 1; consensus.nMasternodeMinimumConfirmations = 1;
consensus.BIP34Height = 1; // BIP34 activated immediately on devnet (BIP34Hash is set later for the devnet genesis block) consensus.BIP34Height = 2; // BIP34 activated immediately on devnet
consensus.BIP65Height = 1; // BIP65 activated immediately on devnet consensus.BIP65Height = 2; // BIP65 activated immediately on devnet
consensus.BIP66Height = 1; // BIP66 activated immediately on devnet consensus.BIP66Height = 2; // BIP66 activated immediately on devnet
consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
consensus.nPowTargetTimespan = 24 * 60 * 60; // Dash: 1 day consensus.nPowTargetTimespan = 24 * 60 * 60; // Dash: 1 day
consensus.nPowTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes consensus.nPowTargetSpacing = 2.5 * 60; // Dash: 2.5 minutes
@ -470,8 +470,6 @@ public:
devnetGenesis = FindDevNetGenesisBlock(consensus, genesis, 50 * COIN); devnetGenesis = FindDevNetGenesisBlock(consensus, genesis, 50 * COIN);
consensus.hashDevnetGenesisBlock = devnetGenesis.GetHash(); consensus.hashDevnetGenesisBlock = devnetGenesis.GetHash();
consensus.BIP34Hash = devnetGenesis.GetHash();
vFixedSeeds.clear(); vFixedSeeds.clear();
vSeeds.clear(); vSeeds.clear();
//vSeeds.push_back(CDNSSeedData("dashevo.org", "devnet-seed.dashevo.org")); //vSeeds.push_back(CDNSSeedData("dashevo.org", "devnet-seed.dashevo.org"));
@ -490,8 +488,6 @@ public:
// Testnet Dash BIP44 coin type is '1' (All coin's testnet default) // Testnet Dash BIP44 coin type is '1' (All coin's testnet default)
nExtCoinType = 1; nExtCoinType = 1;
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));
fMiningRequiresPeers = true; fMiningRequiresPeers = true;
fDefaultConsistencyChecks = false; fDefaultConsistencyChecks = false;
fRequireStandard = false; fRequireStandard = false;

1
src/chainparamsbase.cpp
View File

@ -19,6 +19,7 @@ void AppendParamsHelpMessages(std::string& strUsage, bool debugHelp)
{ {
strUsage += HelpMessageGroup(_("Chain selection options:")); strUsage += HelpMessageGroup(_("Chain selection options:"));
strUsage += HelpMessageOpt("-testnet", _("Use the test chain")); strUsage += HelpMessageOpt("-testnet", _("Use the test chain"));
strUsage += HelpMessageOpt("-devnet=<name>", _("Use devnet chain with provided name"));
if (debugHelp) { if (debugHelp) {
strUsage += HelpMessageOpt("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. " strUsage += HelpMessageOpt("-regtest", "Enter regression test mode, which uses a special chain in which blocks can be solved instantly. "
"This is intended for regression testing tools and app development."); "This is intended for regression testing tools and app development.");