Goldminenode

AdvancedTechnologyCoin · Feb 15, 2017 · 30690ea · 30690ea
1 parent 00a5140
commit 30690ea
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -63,7 +63,6 @@ class CMainParams : public CChainParams {
         strNetworkID = "main";
         consensus.nSubsidyHalvingInterval = 210240; // Note: actual number of blocks per calendar year with DGW v3 is ~200700 (for example 449750 - 249050)
         consensus.nGoldminenodePaymentsStartBlock = 1; // not true, but it's ok as long as it's less then nGoldminenodePaymentsIncreaseBlock
-        consensus.nGoldminenodePaymentsIncreaseBlock = 1493; // actual historical value
         consensus.nInstantSendKeepLock = 24;
         consensus.nEvolutionPaymentsStartBlock = 16616; // actual historical value
         consensus.nEvolutionPaymentsCycleBlocks = 16616; // ~(60*24*30)/2.6, actual number of blocks per month is 200700 / 12 = 16725
@@ -178,7 +177,6 @@ class CTestNetParams : public CChainParams {
         strNetworkID = "test";
         consensus.nSubsidyHalvingInterval = 210240;
         consensus.nGoldminenodePaymentsStartBlock = 10000; // not true, but it's ok as long as it's less then nGoldminenodePaymentsIncreaseBlock
-        consensus.nGoldminenodePaymentsIncreaseBlock = 46000;
         consensus.nInstantSendKeepLock = 6;
         consensus.nEvolutionPaymentsCycleBlocks = 50;
         consensus.nEvolutionPaymentsWindowBlocks = 10;
@@ -278,7 +276,6 @@ class CRegTestParams : public CChainParams {
         strNetworkID = "regtest";
         consensus.nSubsidyHalvingInterval = 150;
         consensus.nGoldminenodePaymentsStartBlock = 240;
-        consensus.nGoldminenodePaymentsIncreaseBlock = 350;
         consensus.nInstantSendKeepLock = 6;
         consensus.nEvolutionPaymentsStartBlock = 1000;
         consensus.nEvolutionPaymentsWindowBlocks = 10;

diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -38,7 +38,6 @@ struct Params {
     uint256 hashGenesisBlock;
     int nSubsidyHalvingInterval;
     int nGoldminenodePaymentsStartBlock;
-    int nGoldminenodePaymentsIncreaseBlock;
     int nGoldminenodePaymentsIncreasePeriod; // in blocks
     int nInstantSendKeepLock; // in blocks
     int nEvolutionPaymentsStartBlock;

diff --git a/src/main.cpp b/src/main.cpp
@@ -1783,11 +1783,7 @@ CAmount GetBlockSubsidy(int nPrevBits, int nPrevHeight, const Consensus::Params&
 
 CAmount GetGoldminenodePayment(int nHeight, CAmount blockValue)
 {
-    CAmount ret = blockValue/5; // start at 20%
-
-    int nMNPIBlock = Params().GetConsensus().nGoldminenodePaymentsIncreaseBlock;
-                                                       // mainnet:
-    if(nHeight > nMNPIBlock)                  ret += blockValue / 2; // 50% PoS & 50% PoW
+    CAmount ret = blockValue/2; // 50% PoS & 50% PoW
     return ret;
 }