diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/chainparams.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/mining.cpp | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index b7d69c071..29892e8a2 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -369,6 +369,7 @@ public: consensus.powLimit = uint256S("0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 1; consensus.nPowTargetTimespan = 4 * 60 * 60; // pre-digishield: 4 hours consensus.nPowTargetSpacing = 1; // regtest: 1 second blocks + consensus.fDigishieldDifficultyCalculation = false; consensus.fPowAllowMinDifficultyBlocks = true; consensus.fPowNoRetargeting = true; consensus.nRuleChangeActivationThreshold = 108; // 75% for testchains diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 17e8fd57a..35103e006 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -124,16 +124,17 @@ UniValue generateBlocks(boost::shared_ptr<CReserveScript> coinbaseScript, int nG LOCK(cs_main); IncrementExtraNonce(pblock, chainActive.Tip(), nExtraNonce); } - CAuxPow::initAuxPow(*pblock); - CPureBlockHeader& miningHeader = pblock->auxpow->parentBlock; - while (nMaxTries > 0 && miningHeader.nNonce < nInnerLoopCount && !CheckProofOfWork(miningHeader.GetHash(), pblock->nBits, Params().GetConsensus(nHeight))) { - ++miningHeader.nNonce; + // Dogecoin: Don't mine Aux blocks in regtest + //CAuxPow::initAuxPow(*pblock); + //CPureBlockHeader& miningHeader = pblock->auxpow->parentBlock; + while (nMaxTries > 0 && pblock->nNonce < nInnerLoopCount && !CheckProofOfWork(pblock->GetPoWHash(), pblock->nBits, Params().GetConsensus(nHeight))) { + ++pblock->nNonce; --nMaxTries; } if (nMaxTries == 0) { break; } - if (miningHeader.nNonce == nInnerLoopCount) { + if (pblock->nNonce == nInnerLoopCount) { continue; } std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(*pblock); |