diff options
| author | Luke Dashjr <[email protected]> | 2011-09-06 16:43:32 -0400 |
|---|---|---|
| committer | Luke Dashjr <[email protected]> | 2011-09-06 16:43:32 -0400 |
| commit | b760e254584a85db7195a4b1a67731a8cc12f9ed (patch) | |
| tree | 38de6d2be604a3212a39b460649511555f771cf1 /src/rpc.cpp | |
| parent | CHECKMULTISIG unit tests. (diff) | |
| parent | Reset extraNonce only when prevBlock changes, so miners can continue updating... (diff) | |
| download | discoin-b760e254584a85db7195a4b1a67731a8cc12f9ed.tar.xz discoin-b760e254584a85db7195a4b1a67731a8cc12f9ed.zip | |
Merge branch 'getwork_dedupe' into unique_coinbase
Diffstat (limited to 'src/rpc.cpp')
| -rw-r--r-- | src/rpc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rpc.cpp b/src/rpc.cpp index fdb57b3b8..9e7cfc5b3 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -1614,15 +1614,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); |