diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 291187cdad004..d7c6d7b090047 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -420,9 +420,9 @@ class CDevNetParams : public CChainParams { consensus.nGovernanceMinQuorum = 1; consensus.nGovernanceFilterElements = 500; consensus.nMasternodeMinimumConfirmations = 1; - consensus.BIP34Height = 2; // BIP34 activated immediately on devnet - consensus.BIP65Height = 2; // BIP65 activated immediately on devnet - consensus.BIP66Height = 2; // BIP66 activated immediately on devnet + consensus.BIP34Height = 1; // BIP34 activated immediately on devnet + consensus.BIP65Height = 1; // BIP65 activated immediately on devnet + consensus.BIP66Height = 1; // BIP66 activated immediately on devnet consensus.DIP0001Height = 2; // DIP0001 activated immediately on devnet consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 1 consensus.nPowTargetTimespan = 24 * 60 * 60; // Dash: 1 day diff --git a/src/validation.cpp b/src/validation.cpp index b28f2f520a07b..d5d9f4d0fc728 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -4212,8 +4212,10 @@ bool InitBlockIndex(const CChainParams& chainparams) return false; if (chainparams.NetworkIDString() == CBaseChainParams::DEVNET) { - if (!AddGenesisBlock(chainparams, chainparams.DevNetGenesisBlock(), state)) - return false; + // We can't continue if devnet genesis block is invalid + std::shared_ptr shared_pblock = std::make_shared(chainparams.DevNetGenesisBlock()); + bool fProcessDevnetGenesisBlock = ProcessNewBlock(chainparams, shared_pblock, true, NULL); + assert(fProcessDevnetGenesisBlock); } // Force a chainstate write so that when we VerifyDB in a moment, it doesn't check stale data