From 1eb9e2b839f1c22228147c04e8bf93f4fbcd9e95 Mon Sep 17 00:00:00 2001
From: jc <jc@jc>
Date: Fri, 23 Feb 2018 08:33:30 -0500
Subject: [PATCH] fix pr merge conflicts

---
 src/consensus/params.h | 2 ++
 src/miner.cpp          | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/consensus/params.h b/src/consensus/params.h
index c025ad4b..0892c699 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -77,6 +77,8 @@ struct Params {
     int64_t nPowMaxAdjustUp;
     int64_t nPowTargetSpacing;
 
+    int nPowDifficultyBombHeight;
+
     int64_t AveragingWindowTimespan(bool isFork = false) const { return nPowAveragingWindow * nPowTargetSpacing / (isFork ? 20 : 1); }
     int64_t MinActualTimespan(bool isFork = false) const { return (AveragingWindowTimespan(isFork) * (100 - nPowMaxAdjustUp  )) / 100; }
     int64_t MaxActualTimespan(bool isFork = false) const { return (AveragingWindowTimespan(isFork) * (100 + nPowMaxAdjustDown)) / 100; }
diff --git a/src/miner.cpp b/src/miner.cpp
index d12b76e1..15c07978 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -155,6 +155,7 @@ CBlockTemplate* CreateNewForkBlock(bool& bFileNotFound)
             pblock->hashPrevBlock = pindexPrev->GetBlockHash();
             UpdateTime(pblock, chainparams.GetConsensus(), pindexPrev);
             pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus());
+            pblock->nVersion = ComputeBlockVersion(pindexPrev, Params().GetConsensus());
 
             CValidationState state;
             if (!TestBlockValidity(state, *pblock, pindexPrev, false, false))
@@ -728,7 +729,7 @@ void static BitcoinMiner()
                         LOCK(cs_vNodes);
                         fvNodesEmpty = vNodes.empty();
                     }
-                    if (!fvNodesEmpty && !IsInitialBlockDownload())
+                    if (!fvNodesEmpty) // && !IsInitialBlockDownload())
                         break;
                     MilliSleep(1000);
                 } while (true);