From 9e07201f32ac848fbb74e881dca1e0ccae709052 Mon Sep 17 00:00:00 2001 From: RoboticMind <30132912+RoboticMind@users.noreply.github.com> Date: Wed, 7 Jul 2021 09:12:59 -0400 Subject: [PATCH] Remove msMiningErrorsIncluded & msMiningErrorsExcluded --- src/main.cpp | 2 -- src/main.h | 2 -- src/miner.cpp | 20 -------------------- src/validation.cpp | 2 -- 4 files changed, 26 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 3ce9026735..579b984676 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -119,8 +119,6 @@ bool bGridcoinCoreInitComplete = false; // Mining status variables std::string msMiningErrors; -std::string msMiningErrorsIncluded; -std::string msMiningErrorsExcluded; //When syncing, we grandfather block rejection rules up to this block, as rules became stricter over time and fields changed int nGrandfather = 1034700; diff --git a/src/main.h b/src/main.h index 4504118d48..4d033f24e2 100644 --- a/src/main.h +++ b/src/main.h @@ -103,8 +103,6 @@ extern bool fEnforceCanonical; static const uint64_t nMinDiskSpace = 52428800; extern std::string msMiningErrors; -extern std::string msMiningErrorsIncluded; -extern std::string msMiningErrorsExcluded; extern int nGrandfather; diff --git a/src/miner.cpp b/src/miner.cpp index 5f83c45230..9c9549fcca 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -281,7 +281,6 @@ bool CreateRestOfTheBlock(CBlock &block, CBlockIndex* pindexPrev) vOrphan.push_back(COrphan(&tx)); porphan = &vOrphan.back(); LogPrint(BCLog::LogFlags::NOISY, "Orphan tx %s ",tx.GetHash().GetHex()); - msMiningErrorsExcluded += tx.GetHash().GetHex() + ":ORPHAN;"; } mapDependers[txin.prevout.hash].push_back(porphan); porphan->setDependsOn.insert(txin.prevout.hash); @@ -343,10 +342,6 @@ bool CreateRestOfTheBlock(CBlock &block, CBlockIndex* pindexPrev) if (nBlockSize + nTxSize >= nBlockMaxSize) { LogPrintf("Tx size too large for tx %s blksize %" PRIu64 ", tx size %" PRId64, tx.GetHash().GetHex(), nBlockSize, nTxSize); - msMiningErrorsExcluded += tx.GetHash().GetHex() + ":SizeTooLarge(" - + ToString(nBlockSize) + "," + ToString(nTxSize) + ")(" - + ToString(nBlockSize) + ");"; - continue; } @@ -354,17 +349,12 @@ bool CreateRestOfTheBlock(CBlock &block, CBlockIndex* pindexPrev) unsigned int nTxSigOps = GetLegacySigOpCount(tx); if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS) { - msMiningErrorsExcluded += tx.GetHash().GetHex() + ":LegacySigOpLimit(" + - ToString(nBlockSigOps) + "," + ToString(nTxSigOps) + ")(" - + ToString(MAX_BLOCK_SIGOPS) + ");"; continue; } // Timestamp limit if (tx.nTime > block.nTime) { - msMiningErrorsExcluded += tx.GetHash().GetHex() + ":TimestampLimit(" + ToString(tx.nTime) + "," - + ToString(block.vtx[0].nTime) + ");"; continue; } @@ -393,7 +383,6 @@ bool CreateRestOfTheBlock(CBlock &block, CBlockIndex* pindexPrev) if (!FetchInputs(tx, txdb, mapTestPoolTmp, false, true, mapInputs, fInvalid)) { LogPrint(BCLog::LogFlags::NOISY, "Unable to fetch inputs for tx %s ", tx.GetHash().GetHex()); - msMiningErrorsExcluded += tx.GetHash().GetHex() + ":UnableToFetchInputs;"; continue; } @@ -403,8 +392,6 @@ bool CreateRestOfTheBlock(CBlock &block, CBlockIndex* pindexPrev) LogPrint(BCLog::LogFlags::NOISY, "Not including tx %s due to TxFees of %" PRId64 ", bare min fee is %" PRId64, tx.GetHash().GetHex(), nTxFees, nMinFee); - msMiningErrorsExcluded += tx.GetHash().GetHex() + ":FeeTooSmall(" - + RoundToString(CoinToDouble(nFees),8) + "," +RoundToString(CoinToDouble(nMinFee),8) + ");"; continue; } @@ -413,24 +400,17 @@ bool CreateRestOfTheBlock(CBlock &block, CBlockIndex* pindexPrev) { LogPrint(BCLog::LogFlags::NOISY, "Not including tx %s due to exceeding max sigops of %d, sigops is %d", tx.GetHash().GetHex(), (nBlockSigOps+nTxSigOps), MAX_BLOCK_SIGOPS); - msMiningErrorsExcluded += tx.GetHash().GetHex() + ":ExceededSigOps(" - + ToString(nBlockSigOps) + "," + ToString(nTxSigOps) + ")(" - + ToString(MAX_BLOCK_SIGOPS) + ");"; - continue; } if (!ConnectInputs(tx, txdb, mapInputs, mapTestPoolTmp, CDiskTxPos(1,1,1), pindexPrev, false, true)) { LogPrint(BCLog::LogFlags::NOISY, "Unable to connect inputs for tx %s ",tx.GetHash().GetHex()); - msMiningErrorsExcluded += tx.GetHash().GetHex() + ":UnableToConnectInputs();"; continue; } mapTestPoolTmp[tx.GetHash()] = CTxIndex(CDiskTxPos(1,1,1), tx.vout.size()); swap(mapTestPool, mapTestPoolTmp); - // Added - msMiningErrorsIncluded += tx.GetHash().GetHex() + ";"; block.vtx.push_back(tx); nBlockSize += nTxSize; ++nBlockTx; diff --git a/src/validation.cpp b/src/validation.cpp index 03e25b8460..591956955e 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -387,8 +387,6 @@ bool ConnectInputs(CTransaction& tx, CTxDB& txdb, MapPrevTx inputs, std::map