Skip to content

Commit

Permalink
Miner selects any feerate no matter how small
Browse files Browse the repository at this point in the history
  • Loading branch information
instagibbs committed Jul 14, 2017
1 parent 3c37653 commit 46c103f
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions src/miner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ std::unique_ptr<CBlockTemplate> 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);
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 46c103f

Please sign in to comment.