Block time correction

Author: MotoAcidic

.gitignore

@@ -40,3 +40,7 @@
 \.vs/slnx\.sqlite
 
 \.vs/privix-core/v15/\.suo
+
+\.vs/privix-core/v15/ipch/AutoPCH/54b8d9a1e354f82/POW\.ipch
+
+\.vs/privix-core/v15/ipch/AutoPCH/6022c6eb9483ef8f/SPORK\.ipch

src/pow.cpp

@@ -14,6 +14,7 @@
 #include "primitives/block.h"
 #include "uint256.h"
 #include "util.h"
+#include "spork.h"
 
 #include <math.h>
 
@@ -40,6 +41,16 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
         int64_t nTargetSpacing = 60;
         int64_t nTargetTimespan = 60 * 40;
 
+		if (IsSporkActive(SPORK_23_BLOCK_TIME_RETARGET) &&
+			(pindexLast->nHeight <= 10580 && pindexLast->nHeight > 4000)) {
+			nTargetSpacing = 180;
+			nTargetTimespan = 180 * 40;
+		}else if (IsSporkActive(SPORK_23_BLOCK_TIME_RETARGET) &&
+			(pindexLast->nHeight > 10580)) {
+			nTargetSpacing = 120;
+			nTargetTimespan = 120 * 40;
+		}
+
         int64_t nActualSpacing = 0;
         if (pindexLast->nHeight != 0)
             nActualSpacing = pindexLast->GetBlockTime() - pindexLast->pprev->GetBlockTime();

src/spork.cpp

@@ -147,6 +147,7 @@ int64_t GetSporkValue(int nSporkID)
         if (nSporkID == SPORK_20_LOCK_INVALID_UTXO) r = SPORK_20_LOCK_INVALID_UTXO_DEFAULT;
         if (nSporkID == SPORK_21_SEGWIT_ON_COINBASE) r = SPORK_21_SEGWIT_ON_COINBASE_DEFAULT;
         if (nSporkID == SPORK_22_NEW_COLLATERAL) r = SPORK_22_NEW_COLLATERAL_DEFAULT;
+		if (nSporkID == SPORK_23_BLOCK_TIME_RETARGET) r = SPORK_23_BLOCK_TIME_RETARGET_DEFAULT;
 
         if (r == -1) LogPrintf("GetSpork::Unknown Spork %d\n", nSporkID);
     }
@@ -181,6 +182,7 @@ bool IsSporkActive(int nSporkID)
         if (nSporkID == SPORK_20_LOCK_INVALID_UTXO) r = SPORK_20_LOCK_INVALID_UTXO_DEFAULT;
         if (nSporkID == SPORK_21_SEGWIT_ON_COINBASE) r = SPORK_21_SEGWIT_ON_COINBASE_DEFAULT;
         if (nSporkID == SPORK_22_NEW_COLLATERAL) r = SPORK_22_NEW_COLLATERAL_DEFAULT;
+		if (nSporkID == SPORK_23_BLOCK_TIME_RETARGET) r = SPORK_23_BLOCK_TIME_RETARGET_DEFAULT;
 
         if (r == -1) LogPrintf("GetSpork::Unknown Spork %d\n", nSporkID);
     }
@@ -345,6 +347,7 @@ int CSporkManager::GetSporkIDByName(std::string strName)
     if (strName == "SPORK_20_LOCK_INVALID_UTXO") return SPORK_20_LOCK_INVALID_UTXO;
     if (strName == "SPORK_21_SEGWIT_ON_COINBASE") return SPORK_21_SEGWIT_ON_COINBASE;
     if (strName == "SPORK_22_NEW_COLLATERAL") return SPORK_22_NEW_COLLATERAL;
+	if (strName == "SPORK_23_BLOCK_TIME_RETARGET") return SPORK_23_BLOCK_TIME_RETARGET;
 
     return -1;
 }
@@ -370,6 +373,7 @@ std::string CSporkManager::GetSporkNameByID(int id)
     if (id == SPORK_20_LOCK_INVALID_UTXO) return "SPORK_20_LOCK_INVALID_UTXO";
     if (id == SPORK_21_SEGWIT_ON_COINBASE) return "SPORK_21_SEGWIT_ON_COINBASE";
     if (id == SPORK_22_NEW_COLLATERAL) return "SPORK_22_NEW_COLLATERAL";
+	if (id == SPORK_23_BLOCK_TIME_RETARGET) return "SPORK_23_BLOCK_TIME_RETARGET";
 
     return "Unknown";
 }

src/spork.h

@@ -27,7 +27,7 @@ using namespace boost;
     Sporks 11,12, and 16 to be removed with 1st zerocoin release
 */
 #define SPORK_START 10001
-#define SPORK_END 10025
+#define SPORK_END 10026
 
 #define SPORK_2_SWIFTTX 10001
 #define SPORK_3_SWIFTTX_BLOCK_FILTERING 10002
@@ -48,6 +48,8 @@ using namespace boost;
 #define SPORK_20_LOCK_INVALID_UTXO 10023
 #define SPORK_21_SEGWIT_ON_COINBASE 10024
 #define SPORK_22_NEW_COLLATERAL 10025
+#define SPORK_23_BLOCK_TIME_RETARGET 10026
+
 
 #define SPORK_2_SWIFTTX_DEFAULT 978307200                         //2001-1-1
 #define SPORK_3_SWIFTTX_BLOCK_FILTERING_DEFAULT 1424217600        //2015-2-18
@@ -68,6 +70,7 @@ using namespace boost;
 #define SPORK_20_LOCK_INVALID_UTXO_DEFAULT 4070908800
 #define SPORK_21_SEGWIT_ON_COINBASE_DEFAULT 4070908800
 #define SPORK_22_NEW_COLLATERAL_DEFAULT 4070908800
+#define SPORK_23_BLOCK_TIME_RETARGET_DEFAULT 4070908800
 
 class CSporkMessage;
 class CSporkManager;