From 46c103f797eae368742ea6f3b72950f457787754 Mon Sep 17 00:00:00 2001 From: Gregory Sanders Date: Fri, 14 Jul 2017 12:55:33 -0400 Subject: [PATCH] Miner selects any feerate no matter how small --- src/miner.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index d79f18c83b7..ce441fb19ba 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -169,7 +169,7 @@ std::unique_ptr BlockAssembler::CreateNewBlock(const CScript& sc // transaction (which in most cases can be a no-op). fIncludeWitness = IsWitnessEnabled(pindexPrev, chainparams.GetConsensus()) && fMineWitnessTx; - addPriorityTxs(); + //addPriorityTxs(); addPackageTxs will take anything at any rate int nPackagesSelected = 0; int nDescendantsUpdated = 0; addPackageTxs(nPackagesSelected, nDescendantsUpdated); @@ -485,11 +485,6 @@ void BlockAssembler::addPackageTxs(int &nPackagesSelected, int &nDescendantsUpda packageSigOpsCost = modit->nSigOpCostWithAncestors; } - if (packageFees < blockMinFeeRate.GetFee(packageSize)) { - // Everything else we might consider has a lower fee rate - return; - } - if (!TestPackage(packageSize, packageSigOpsCost)) { if (fUsingModified) { // Since we always look at the best entry in mapModifiedTx,