diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-08-27 22:35:14 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-08-27 22:39:28 +0200 |
| commit | d1062e32fa66db44d0302bbff9d5634f5c698155 (patch) | |
| tree | 5b7db2bc339f6d474594c8fe77b710751cdbb5cd /src/miner.cpp | |
| parent | cd3d80be677a3e9c4e1373c364c65f9d09439021 (diff) | |
| parent | 654871d43677947d124673c9e0dd2984f0d3ca61 (diff) | |
| download | bitcoin-d1062e32fa66db44d0302bbff9d5634f5c698155.tar.xz | |
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)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 8696edcf6e..96dc80a26d 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -307,7 +307,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) // Fill in header pblock->hashPrevBlock = pindexPrev->GetBlockHash(); - UpdateTime(*pblock, pindexPrev); + UpdateTime(pblock, pindexPrev); pblock->nBits = GetNextWorkRequired(pindexPrev, pblock); pblock->nNonce = 0; pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]); @@ -540,7 +540,7 @@ void static BitcoinMiner(CWallet *pwallet) break; // Update nTime every few seconds - UpdateTime(*pblock, pindexPrev); + UpdateTime(pblock, pindexPrev); if (Params().AllowMinDifficultyBlocks()) { // Changing pblock->nTime can change work required on testnet: |