From eb935e3c93c98fba5ca0f37dc0fbc4e7b8aee816 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Thu, 9 Jul 2020 07:22:33 -0400
Subject: [PATCH] Set correct blocktime when disconnecting a block and
 rewinding before our block time halving

---
 src/main.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5b70ed2fd..2681723c9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -115,6 +115,7 @@ bool fAlerts = DEFAULT_ALERTS;
  */
 int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
 bool ishush3 = strncmp(ASSETCHAINS_SYMBOL, "HUSH3",5) == 0 ? true : false;
+int32_t nFirstHalvingHeight = 340000;
 
 unsigned int expiryDelta = DEFAULT_TX_EXPIRY_DELTA;
 extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
@@ -3227,6 +3228,15 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex
     // move best block pointer to prevout block
     view.SetBestBlock(pindex->pprev->GetBlockHash());
 
+    // If disconnecting a block brings us back before our blocktime halving height, go back
+    // to our original blocktime so our DAA has the correct target for that height
+    int nHeight = pindex->pprev->GetHeight();
+    if (ishush3 && (ASSETCHAINS_BLOCKTIME != 150) && (nHeight < nFirstHalvingHeight)) {
+        LogPrintf("%s: Setting blocktime to 150s at height %d!\n",__func__,nHeight);
+        ASSETCHAINS_BLOCKTIME = 150;
+    }
+
+
     if (pfClean) {
         *pfClean = fClean;
         return true;
@@ -3350,7 +3360,6 @@ static int64_t nTimeTotal = 0;
 bool FindBlockPos(int32_t tmpflag,CValidationState &state, CDiskBlockPos &pos, unsigned int nAddSize, unsigned int nHeight, uint64_t nTime, bool fKnown = false);
 bool ReceivedBlockTransactions(const CBlock &block, CValidationState& state, CBlockIndex *pindexNew, const CDiskBlockPos& pos);
 
-int32_t nFirstHalvingHeight = 340000;
 
 bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& view, bool fJustCheck,bool fCheckPOW)
 {