DGW parameters change + checkpoints - v1.0.2.0

Author: GINcoin Dev

configure.ac

@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2017)

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "gincoin-linux-0.12"
+name: "gincoin-linux-1.0.2.0"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-osx.yml

@@ -1,5 +1,5 @@
 ---
-name: "gincoin-osx-0.1.0.0"
+name: "gincoin-osx-1.0.2.0"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-win.yml

@@ -1,5 +1,5 @@
 ---
-name: "gincoin-win-0.12"
+name: "gincoin-win-1.0.2.0"
 enable_cache: true
 suites:
 - "trusty"

share/genbuild.sh

@@ -28,7 +28,7 @@ if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/
 
     # otherwise generate suffix from git, i.e. string like "59887e8-dirty"
     SUFFIX=$(git rev-parse --short HEAD)
-    git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
+    git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX" #-dirty
 
     # get a string like "2012-04-10 16:27:19 +0200"
     LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")"

src/chainparams.cpp

@@ -93,8 +93,8 @@ class CMainParams : public CChainParams {
         consensus.BIP34Height = 0;
         consensus.BIP34Hash = uint256S("0x00000cd6bde619b2c3b23ad2e384328a450a37fa28731debf748c3b17f91f97d");
         consensus.powLimit = uint256S("00000fffff000000000000000000000000000000000000000000000000000000");
-        consensus.nPowTargetTimespan = 24 * 60 * 60; // Gincoin: 1 day
-        consensus.nPowTargetSpacing = 2.5 * 60; // Gincoin: 2.5 minutes
+        consensus.nPowTargetTimespan = 24 * 60 * 60; // Gincoin: 1 day // used only for KGW and Bitcoin Diff
+        consensus.nPowTargetSpacing = 2.5 * 60; // Gincoin: 2.5 minutes // soft change to nPowApr2018TargetSpacing after mPowDGWReconfigureApr2018Height
         consensus.fPowAllowMinDifficultyBlocks = false;
         consensus.fPowNoRetargeting = false;
         consensus.nPowKGWHeight = 15200; //not used
@@ -117,11 +117,15 @@ class CMainParams : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nWindowSize = 4032;
         consensus.vDeployments[Consensus::DEPLOYMENT_DIP0001].nThreshold = 3226; // 80% of 4032
 
+        // Consensus Update Apr 2018
+        consensus.mPowDGWReconfigureApr2018Height = 23750;
+        consensus.nPowApr2018TargetSpacing = 2 * 60;
+
         // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000000006500074");
+        consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000047a222baa2d1fe");
 
         // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0x000001d9726a3d9624b6bd53428b658204333461708f84a520570272c5d7f511");
+        consensus.defaultAssumeValid = uint256S("0x00000000000a106c24554e369cdacdb683fd6daef276ca38b1991ad82e74dc63");
 
         /**
          * The message start string is designed to be unlikely to occur in normal data.
@@ -181,9 +185,11 @@ class CMainParams : public CChainParams {
                     (  0, consensus.hashGenesisBlock)
                     ( 20, uint256S("0x000003e547bec8e303a0af407ab1781e1a56ce995d4cb8abd9443d8e89daee94"))
                     ( 100, uint256S("0x000001d9726a3d9624b6bd53428b658204333461708f84a520570272c5d7f511"))
+                    ( 1000, uint256S("0x00000000015079cff402ec1f9d88af43eba786f1a70bed49eca4c96b1786c074"))
+                    ( 22092, uint256S("0x00000000000a106c24554e369cdacdb683fd6daef276ca38b1991ad82e74dc63"))
             ,
-            1519397453, // * UNIX timestamp of last checkpoint block
-            0,    // * total number of transactions between genesis and last checkpoint
+            1522841266, // * UNIX timestamp of last checkpoint block
+            28497,    // * total number of transactions between genesis and last checkpoint
             //   (the tx=... number in the SetBestChain debug.log lines)
             5000        // * estimated number of transactions per day after checkpoint
         };
@@ -218,8 +224,8 @@ class CTestNetParams : public CChainParams {
         consensus.BIP34Height = 0;
         consensus.BIP34Hash = uint256S("0x0000070936337da4fa971d46112401d17a7288b57bde0e45fba010b94b2577a9");
         consensus.powLimit = uint256S("00000fffff000000000000000000000000000000000000000000000000000000");
-        consensus.nPowTargetTimespan = 24 * 60 * 60; // Gincoin: 1 day
-        consensus.nPowTargetSpacing = 2.5 * 60; // Gincoin: 2.5 minutes
+        consensus.nPowTargetTimespan = 24 * 60 * 60; // Gincoin: 1 day // used only for KGW and Bitcoin Diff
+        consensus.nPowTargetSpacing = 2 * 60; // Gincoin: 2 minutes
         consensus.fPowAllowMinDifficultyBlocks = true;
         consensus.fPowNoRetargeting = false;
         consensus.nPowKGWHeight = 4001; // nPowKGWHeight >= nPowDGWHeight means "no KGW"
@@ -248,6 +254,10 @@ class CTestNetParams : public CChainParams {
         // By default assume that the signatures in ancestors of this block are valid.
         consensus.defaultAssumeValid = uint256S("0x00");
 
+        // Consensus Update Apr 2018
+        consensus.mPowDGWReconfigureApr2018Height = 1;
+        consensus.nPowApr2018TargetSpacing = 2 * 60;
+
         pchMessageStart[0] = 0xce;
         pchMessageStart[1] = 0xe2;
         pchMessageStart[2] = 0xca;
@@ -336,8 +346,8 @@ class CRegTestParams : public CChainParams {
         consensus.BIP34Height = -1; // BIP34 has not necessarily activated on regtest
         consensus.BIP34Hash = uint256();
         consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
-        consensus.nPowTargetTimespan = 24 * 60 * 60; // Gincoin: 1 day
-        consensus.nPowTargetSpacing = 2.5 * 60; // Gincoin: 2.5 minutes
+        consensus.nPowTargetTimespan = 24 * 60 * 60; // Gincoin: 1 day // used only for KGW and Bitcoin Diff
+        consensus.nPowTargetSpacing = 2 * 60; // Gincoin: 2 minutes
         consensus.fPowAllowMinDifficultyBlocks = true;
         consensus.fPowNoRetargeting = true;
         consensus.nPowKGWHeight = 15200; // same as mainnet
@@ -360,6 +370,10 @@ class CRegTestParams : public CChainParams {
         // By default assume that the signatures in ancestors of this block are valid.
         consensus.defaultAssumeValid = uint256S("0x00");
 
+        // Consensus Update Apr 2018
+        consensus.mPowDGWReconfigureApr2018Height = 1;
+        consensus.nPowApr2018TargetSpacing = 2 * 60;
+
         pchMessageStart[0] = 0xfc;
         pchMessageStart[1] = 0xc1;
         pchMessageStart[2] = 0xb7;

src/clientversion.h

@@ -16,7 +16,7 @@
 //! These need to be macros, as clientversion.cpp's and dash*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 0
+#define CLIENT_VERSION_REVISION 2
 #define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build

src/consensus/params.h

@@ -84,6 +84,23 @@ struct Params {
     int64_t DifficultyAdjustmentInterval() const { return nPowTargetTimespan / nPowTargetSpacing; }
     uint256 nMinimumChainWork;
     uint256 defaultAssumeValid;
+    int mPowDGWReconfigureApr2018Height;
+    int64_t nPowApr2018TargetSpacing;
+    int64_t GetPowTargetSpacing(int blockHeight) const {
+        if (blockHeight >= mPowDGWReconfigureApr2018Height) {
+            return nPowApr2018TargetSpacing;
+        } else {
+            return nPowTargetSpacing;
+        }
+    }
+    int nApr2018DGWPastBlocks;
+    int64_t GetDGWPastBlocks(int blockHeight) const {
+        if (blockHeight >= mPowDGWReconfigureApr2018Height) {
+            return 30;
+        } else {
+            return 24;
+        }
+    }
 };
 } // namespace Consensus
 

src/net_processing.cpp

@@ -349,7 +349,7 @@ void UpdateBlockAvailability(NodeId nodeid, const uint256 &hash) {
 // Requires cs_main
 bool CanDirectFetch(const Consensus::Params &consensusParams)
 {
-    return chainActive.Tip()->GetBlockTime() > GetAdjustedTime() - consensusParams.nPowTargetSpacing * 20;
+    return chainActive.Tip()->GetBlockTime() > GetAdjustedTime() - consensusParams.GetPowTargetSpacing(chainActive.Tip()->nHeight) * 20;
 }
 
 // Requires cs_main

src/pow.cpp

@@ -29,8 +29,8 @@ unsigned int static KimotoGravityWell(const CBlockIndex* pindexLast, const Conse
 
     uint64_t pastSecondsMin = params.nPowTargetTimespan * 0.025;
     uint64_t pastSecondsMax = params.nPowTargetTimespan * 7;
-    uint64_t PastBlocksMin = pastSecondsMin / params.nPowTargetSpacing;
-    uint64_t PastBlocksMax = pastSecondsMax / params.nPowTargetSpacing;
+    uint64_t PastBlocksMin = pastSecondsMin / params.GetPowTargetSpacing(BlockLastSolved->nHeight + 1);
+    uint64_t PastBlocksMax = pastSecondsMax / params.GetPowTargetSpacing(BlockLastSolved->nHeight + 1);
 
     if (BlockLastSolved == NULL || BlockLastSolved->nHeight == 0 || (uint64_t)BlockLastSolved->nHeight < PastBlocksMin) { return UintToArith256(params.powLimit).GetCompact(); }
 
@@ -49,7 +49,7 @@ unsigned int static KimotoGravityWell(const CBlockIndex* pindexLast, const Conse
         PastDifficultyAveragePrev = PastDifficultyAverage;
 
         PastRateActualSeconds = BlockLastSolved->GetBlockTime() - BlockReading->GetBlockTime();
-        PastRateTargetSeconds = params.nPowTargetSpacing * PastBlocksMass;
+        PastRateTargetSeconds = params.GetPowTargetSpacing(BlockLastSolved->nHeight + 1) * PastBlocksMass;
         PastRateAdjustmentRatio = double(1);
         if (PastRateActualSeconds < 0) { PastRateActualSeconds = 0; }
         if (PastRateActualSeconds != 0 && PastRateTargetSeconds != 0) {
@@ -83,7 +83,7 @@ unsigned int static KimotoGravityWell(const CBlockIndex* pindexLast, const Conse
 unsigned int static DarkGravityWave(const CBlockIndex* pindexLast, const Consensus::Params& params) {
     /* current difficulty formula, dash - DarkGravity v3, written by Evan Duffield - evan@dash.org */
     const arith_uint256 bnPowLimit = UintToArith256(params.powLimit);
-    int64_t nPastBlocks = 24;
+    int64_t nPastBlocks = params.GetDGWPastBlocks(pindexLast->nHeight);
 
     // make sure we have at least (nPastBlocks + 1) blocks, otherwise just return powLimit
     if (!pindexLast || pindexLast->nHeight < nPastBlocks) {
@@ -112,7 +112,7 @@ unsigned int static DarkGravityWave(const CBlockIndex* pindexLast, const Consens
 
     int64_t nActualTimespan = pindexLast->GetBlockTime() - pindex->GetBlockTime();
     // NOTE: is this accurate? nActualTimespan counts it for (nPastBlocks - 1) blocks only...
-    int64_t nTargetTimespan = nPastBlocks * params.nPowTargetSpacing;
+    int64_t nTargetTimespan = nPastBlocks * params.GetPowTargetSpacing(pindex->nHeight);
 
     if (nActualTimespan < nTargetTimespan/3)
         nActualTimespan = nTargetTimespan/3;
@@ -146,7 +146,7 @@ unsigned int GetNextWorkRequiredBTC(const CBlockIndex* pindexLast, const CBlockH
             // Special difficulty rule for testnet:
             // If the new block's timestamp is more than 2* 2.5 minutes
             // then allow mining of a min-difficulty block.
-            if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.nPowTargetSpacing*2)
+            if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.GetPowTargetSpacing(pindexLast->nHeight+1)*2)
                 return nProofOfWorkLimit;
             else
             {