maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #589 from patricklodder/1.8-dev-testnet-retarget

Browse source 
Break testnet difficulty reset out of never matching condition.
This commit is contained in:
langerhans 2014-08-04 19:10:17 +02:00
parent 2ad389bd43 766c9a0651
commit 553a17edaa
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main.cpp
View file

@ -1299,17 +1299,18 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
if (pindexLast == NULL)
return nProofOfWorkLimit;
// Only change once per interval
if ((pindexLast->nHeight+1) % retargetInterval != 0)
{
if (TestNet())
if (TestNet() && pblock->nTime > pindexLast->nTime + nTargetSpacing*2)
{
// Special difficulty rule for testnet:
// If the new block's timestamp is more than 2* nTargetSpacing minutes
// then allow mining of a min-difficulty block.
if (pblock->nTime > pindexLast->nTime + nTargetSpacing*2)
return nProofOfWorkLimit;
else
}
// Only change once per interval
if ((pindexLast->nHeight+1) % retargetInterval != 0)
{
if (TestNet())
{
// Return the last non-special-min-difficulty-rules-block
const CBlockIndex* pindex = pindexLast;
@ -1317,7 +1318,6 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
pindex = pindex->pprev;
return pindex->nBits;
}
}
return pindexLast->nBits;
}