diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-02-17 13:48:01 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-02-17 13:48:01 -0500 |
| commit | 0a6b081ccaafb57f98098437ee52f7a14b924062 (patch) | |
| tree | 9a4deace8453a5794dff4340825be4153b63439a /src/bitcoinrpc.cpp | |
| parent | 25bc37f8a23487386d96ed27d17f352497de64f2 (diff) | |
| parent | 0f8cb5db73e8ab06b779b3cf82e26986ccc7c3f8 (diff) | |
| download | bitcoin-0a6b081ccaafb57f98098437ee52f7a14b924062.tar.xz | |
Merge branch 'testnetmining' of github.com:gavinandresen/bitcoin-git
Diffstat (limited to 'src/bitcoinrpc.cpp')
| -rw-r--r-- | src/bitcoinrpc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index 30a6344b8f..be40e937b8 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1816,7 +1816,7 @@ Value getwork(const Array& params, bool fHelp) } // Update nTime - pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); + pblock->UpdateTime(pindexPrev); pblock->nNonce = 0; // Update nExtraNonce @@ -1916,7 +1916,7 @@ Value getmemorypool(const Array& params, bool fHelp) } // Update nTime - pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); + pblock->UpdateTime(pindexPrev); pblock->nNonce = 0; Array transactions; |