From 22c4272bf4ea04689fc0ea08e637caa46ba12c98 Mon Sep 17 00:00:00 2001
From: jtimon <jtimon@blockstream.io>
Date: Wed, 22 Oct 2014 01:31:01 +0200
Subject: MOVEONLY: Move void UpdateTime() from pow.o to miner.o (plus fix
 include main.h -> chain.h)

---
 src/miner.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/miner.cpp')

diff --git a/src/miner.cpp b/src/miner.cpp
index 0235de3ab3..d3bbc6235e 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -12,6 +12,7 @@
 #include "main.h"
 #include "net.h"
 #include "pow.h"
+#include "timedata.h"
 #include "util.h"
 #include "utilmoneystr.h"
 #ifdef ENABLE_WALLET
@@ -78,6 +79,15 @@ public:
     }
 };
 
+void UpdateTime(CBlockHeader* pblock, const CBlockIndex* pindexPrev)
+{
+    pblock->nTime = std::max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
+
+    // Updating time can change work required on testnet:
+    if (Params().AllowMinDifficultyBlocks())
+        pblock->nBits = GetNextWorkRequired(pindexPrev, pblock);
+}
+
 CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
 {
     // Create new block
-- 
cgit v1.2.3