Final budget alterations

configure.ac

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

contrib/devtools/check-doc.py

@@ -20,7 +20,7 @@
 REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"')
 REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")')
 # list unsupported, deprecated and duplicate args as they need no documentation
-SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-sendfreetransactions', '-checklevel', '-liquidityprovider', '-anonymizeheliumamount'])
+SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay', '-prematurewitness', '-walletprematurewitness', '-promiscuousmempoolflags', '-blockminsize', '-sendfreetransactions', '-checklevel', '-liquidityprovider'])
 
 def main():
   used = check_output(CMD_GREP_ARGS, shell=True)

contrib/gitian-descriptors/gitian-aarch64.yml

@@ -1,5 +1,5 @@
 ---
-name: "helium-aarch64-0.14.7.1"
+name: "helium-aarch64-0.14.8"
 enable_cache: true
 suites:
 - "xenial"

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "helium-linux-0.14.7.1"
+name: "helium-linux-0.14.8"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-osx.yml

@@ -1,5 +1,5 @@
 ---
-name: "helium-osx-0.14.7.1"
+name: "helium-osx-0.14.8"
 enable_cache: true
 suites:
 - "trusty"

contrib/gitian-descriptors/gitian-win.yml

@@ -1,5 +1,5 @@
 ---
-name: "helium-win-0.14.7.1"
+name: "helium-win-0.14.8"
 enable_cache: true
 suites:
 - "trusty"

src/kernel.cpp

@@ -83,8 +83,8 @@ static bool SelectBlockFromCandidates(
     uint64_t nStakeModifierPrev,
     const CBlockIndex** pindexSelected)
 {
-    bool fModifierV2 = false;
-    bool fFirstRun = true;
+    bool fModifierV2 = true;
+    bool fFirstRun = false;
     bool fSelected = false;
     uint256 hashBest = 0;
     *pindexSelected = (const CBlockIndex*)0;

src/main.cpp

@@ -2096,24 +2096,13 @@ int64_t GetMasternodePayment(int nHeight, int64_t blockValue, int nMasternodeCou
 	}
     }
 
-    /* Note: GJH Temporary hack to investigate initial PoW period */
-    // NH - commented out //
-    //if (nHeight <= 10000)
-    //    ret = 0;
-
-    /* FIXME: GJH Particularise masternode payment schedule */
+    /* NOTE: GJH Particularise masternode payment schedule */
     if (nHeight <= 43200) {
         ret = 0;
     } else if (nHeight > 43200) {
         ret = blockValue / (100 / 30);
-//    } else if (nHeight < (Params().NetworkID() == CBaseChainParams::TESTNET ? 145000 : 151200) && nHeight >= 86400) {
-//        ret = 50 * COIN;
-//    } else if (nHeight <= Params().LAST_POW_BLOCK() && nHeight >= 151200) {
-//        ret = blockValue / 2;
-//    } else if (nHeight < Params().Zerocoin_Block_V2_Start()) {
-//        return GetSeeSaw(blockValue, nMasternodeCount, nHeight);
     } else {
-        //When zPIV is staked, masternode only gets 2 PIV
+        //When zPIV is staked, masternode only gets 2 HLM
         ret = 3 * COIN;
         if (isZPIVStake)
             ret = 2 * COIN;

src/masternode-budget.cpp

@@ -925,8 +925,6 @@ CAmount CBudgetManager::GetTotalBudget(int nHeight)
 	nSubsidy = 0;
     } else if (nHeight > 43200) {
         nSubsidy = 5 * COIN;
-//    } else if (nHeight >= Params().Zerocoin_Block_V2_Start()) {
-//        nSubsidy = 4.5 * COIN;
     } else {
         nSubsidy = 5 * COIN;
     }