Merge pull request #4377

654871d replace ComputeMinWork with CheckMinWork (jtimon)
b343c1a Move CBlockIndex::GetBlockWork() to pow::GetProofIncrement(nBits) (jtimon)
c2c02f3 Move UpdateTime to pow (jtimon)
This commit is contained in:
Pieter Wuille 2014-08-27 22:35:14 +02:00
commit d1062e32fa
No known key found for this signature in database
GPG key ID: 8F653255C87992E0
7 changed files with 53 additions and 65 deletions

View file

@ -458,7 +458,7 @@ Value getblocktemplate(const Array& params, bool fHelp)
CBlock* pblock = &pblocktemplate->block; // pointer for convenience
// Update nTime
UpdateTime(*pblock, pindexPrev);
UpdateTime(pblock, pindexPrev);
pblock->nNonce = 0;
Array transactions;