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/rpcmining.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/rpcmining.cpp')
| -rw-r--r-- | src/rpcmining.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index 6e508abcda..e4a5bc4162 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -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; |