Mercurial > hg > bitcoin

diff src/bitcoinrpc.cpp @ 1854:cdea646ab88a draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix issue #848 : broken mining on testnet
author Gavin Andresen <gavinandresen@gmail.com>
date Thu, 16 Feb 2012 10:22:31 -0500 (2012-02-16)
parents 1961ebec6e7d
children 346f88dbd15b
line wrap: on
line diff
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1816,7 +1816,7 @@
         }
 
         // Update nTime
-        pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
+        pblock->UpdateTime(pindexPrev);
         pblock->nNonce = 0;
 
         // Update nExtraNonce
@@ -1916,7 +1916,7 @@
         }
 
         // Update nTime
-        pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
+        pblock->UpdateTime(pindexPrev);
         pblock->nNonce = 0;
 
         Array transactions;