Update nTime after nExtraNonce to avoid potential race

(extraNonce being reset due to just-occurred time change after nTime is set)
This commit is contained in:
Luke Dashjr 2011-05-11 16:50:14 -04:00
parent 64ad448adc
commit 3a8029f033

View file

@ -1330,15 +1330,15 @@ Value getwork(const Array& params, bool fHelp)
vNewBlock.push_back(pblock);
}
// Update nTime
pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
pblock->nNonce = 0;
// Update nExtraNonce
static unsigned int nExtraNonce = 0;
static int64 nPrevTime = 0;
IncrementExtraNonce(pblock, pindexPrev, nExtraNonce, nPrevTime);
// Update nTime
pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
pblock->nNonce = 0;
// Save
mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, nExtraNonce);