Merge pull request #118 from anoncore/echelon

remove some debug log messages and increment protocol
anonymousbitcoin · Nov 18, 2019 · 6d2b2e3 · 6d2b2e3
2 parents e3c5b42 + c56566d
commit 6d2b2e3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -1609,8 +1609,6 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams, b
         ? nSubsidy = 50 * COIN
         : nSubsidy = 12.5 * COIN;
 
-    LogPrintf("nHeight - %d, nSubsidy - %f\n", nHeight, (float)nSubsidy / (float)COIN);
-
     const CChainParams& chainparams = Params();
 
     //subsidy should be 0 before and during airdrop
@@ -1650,8 +1648,6 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams, b
     // Hard fork to reduce the block reward by 5 extra percent (allowing budget/superblocks)
     CAmount nSuperblockPart = (nHeight >= consensusParams.nBudgetPaymentsStartBlock) ? nSubsidy/20 : 0;
 
-    LogPrintf("nHeight - %d, nSuperblockPart - %f\n", nHeight, (float)nSuperblockPart / (float)COIN);
-
     return fSuperblockPartOnly ? nSuperblockPart : nSubsidy - nSuperblockPart;
 }
 
@@ -1660,7 +1656,6 @@ CAmount GetMasternodePayment(int nHeight, CAmount blockValue)
 {
     // Masternode should get paid only 35% of the block reward, and Masternode should NOT take any of the miners fee
     CAmount ret = 0.35 * GetBlockSubsidy(nHeight, Params().GetConsensus());
-    LogPrintf("masternode reward %f\n", (float)ret / (float)COIN);
     // int nMNPIBlock = Params().GetConsensus().nMasternodePaymentsIncreaseBlock;
     // int nMNPIPeriod = Params().GetConsensus().nMasternodePaymentsIncreasePeriod;
 
@@ -3102,7 +3097,7 @@ bool static ConnectTip(CValidationState& state, CBlockIndex* pindexNew, CBlock*
     {
         bool rv;
         CCoinsViewCache view(pcoinsTip);
-        LogPrintf("pindexNew->nHeight: %d\n", pindexNew->nHeight);
+
         if (pindexNew->nHeight == 1) {
             rv = ConnectBlock(*pblock, state, pindexNew, view, false);
         } else {

diff --git a/src/pow.cpp b/src/pow.cpp
@@ -117,7 +117,6 @@ unsigned int DigishieldCalculateNextWorkRequired(arith_uint256 bnAvg,
 {
     // Limit adjustment step
     // Use medians to prevent time-warp attacks
-    LogPrintf("Digishield, nPowTargetSpacing - %d\n", params.nPowTargetSpacing);
 
     int64_t nActualTimespan = nLastBlockTime - nFirstBlockTime;
     LogPrint("pow", "  nActualTimespan = %d  before dampening\n", nActualTimespan);
@@ -176,7 +175,6 @@ unsigned int LwmaCalculateNextWorkRequired(const CBlockIndex* pindexLast, const
     const int64_t T = params.nPowTargetSpacingEchelon;
     const int64_t N = chainparams.LwmaAveragingWin();
     const arith_uint256 powLimit = UintToArith256(params.powLimit);
-    LogPrintf("Lwma, nPowTargetSpacing - %d\n", params.nPowTargetSpacingEchelon);
 
     // Define a k that will be used to get a proper average after weighting the solvetimes.
     const int64_t k = N * (N + 1) * T / 2;

diff --git a/src/version.h b/src/version.h
@@ -9,7 +9,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 180008;
+static const int PROTOCOL_VERSION = 180009;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;