1.1.9.9b-Mandatory Upgrade

- Remove POG in Prod to prevent external attack vectors
- Fix boost::lexical cast error during syncing

src/governance-classes.cpp

@@ -676,15 +676,14 @@ CAmount CSuperblock::GetPaymentsLimit(int nBlockHeight)
 	int nBits = 486585255;  // Set diff at about 1.42 for Superblocks
 	int nSuperblockCycle = IsValidBlockHeight(nBlockHeight) ? consensusParams.nSuperblockCycle : consensusParams.nDCCSuperblockCycle;
 	// At block 98400, our budget = 13,518,421 (.814 budget factor)
-
 	double nBudgetFactor = 1;
 	// The first call to GetBlockSubsidy calculates the future reward (and this has our standard deflation of 19% per year in it)
     CAmount nSuperblockPartOfSubsidy = GetBlockSubsidy(pindexBestHeader->pprev, nBits, nBlockHeight, consensusParams, true);
 
 	// If this is a DC Superblock, and we exceed F12000 Cutover Height, due to cascading superblocks, the DC superblock budget should be 70% of the budget:
-
+	if (nBlockHeight > 106150 && nBlockHeight < 107001 && IsDCCSuperblock(nBlockHeight)) nBudgetFactor = 1.75;
 	CAmount nPaymentsLimit = nSuperblockPartOfSubsidy * nSuperblockCycle * nBudgetFactor;
-
+	
 	if (nBlockHeight > 107000 && nPaymentsLimit > (13500000*COIN)) nPaymentsLimit = 13500000 * COIN;
     LogPrint("gobject", "CSuperblock::GetPaymentsLimit -- Valid superblock height %f, payments max %f \n",(double)nBlockHeight, (double)nPaymentsLimit/COIN);
 

src/main.cpp

@@ -4575,9 +4575,9 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state, CBlockIn
         }
     }
 
-	// Rob A., Biblepay, 3/7/2018, Kick Off BotNet Rules
+	// Rob A., Biblepay, 3/7/2018, Kick Off BotNet Rules (The following POG check should be disabled until Evolution)
 	double dBlockVersion = GetBlockVersion(block.vtx[0]);
-	if (fProd && nHeight > POG_V3_CUTOVER_HEIGHT_PROD && dBlockVersion < 1199)
+	if (false && fProd && nHeight > POG_V3_CUTOVER_HEIGHT_PROD && dBlockVersion < 1199)
 	{
 		return state.DoS(10, error("%s: Rejecting pog block version < 1189", __func__), REJECT_INVALID, "bad-block-version");
  	}
@@ -6254,6 +6254,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 		std::string sVersion = pfrom->cleanSubVer;
 		sVersion = strReplace(sVersion, "Biblepay Core:", "");
 		sVersion = strReplace(sVersion, "Praise Jesus", "");
+		sVersion = strReplace(sVersion, "Develop", "");
+		sVersion = strReplace(sVersion, "Main", "");
+		sVersion = strReplace(sVersion, "Test", "");
 		sVersion = strReplace(sVersion, ":", "");
 		sVersion = strReplace(sVersion, "-", "");
 		sVersion = strReplace(sVersion, "/", "");

src/masternode-payments.cpp

@@ -51,7 +51,7 @@ bool IsBlockValueValid(const CBlock& block, int nBlockHeight, CAmount blockRewar
 {
 
 	if (!fProd && nBlockHeight < 79999) return true;  // Special case for Testnet superblocks up to block 999 - 1/23/2019
-	if (fProd  && nBlockHeight < 100000) return true; 
+	if (fProd  && nBlockHeight < 106999) return true; 
     strErrorRet = "";
     bool isBlockRewardValueMet = (block.vtx[0].GetValueOut() <= blockReward);
     if(!isBlockRewardValueMet && fDebugMaster) 

src/podc.cpp

@@ -444,16 +444,16 @@ double cdbl(std::string s, int place)
 	try
 	{
 		double r = boost::lexical_cast<double>(t);
-		double d = Round(r,place);
+		double d = Round(r, place);
 		return d;
 	}
 	catch(boost::bad_lexical_cast const& e)
 	{
-		LogPrintf("podc-cdbl bad lexical cast.");
+		LogPrintf("podc-cdbl bad lexical cast %s.", s.c_str());
 	}
 	catch(...)
 	{
-		LogPrintf("podc-cdbl bad lexical cast II.");
+		LogPrintf("podc-cdbl bad lexical cast II. %s", s.c_str());
 	}
 	return 0;
 }