diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-07-03 14:25:32 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-07-03 14:42:16 -0400 |
| commit | 13fc83c77bb9108c00dd7709ce17719edb763273 (patch) | |
| tree | 4d9397d208b3c74bea11056ec9402fdfc81a36f5 /src/miner.cpp | |
| parent | 4b7b1bb1ac54e067d889170757a8c45f0baaae3d (diff) | |
| download | bitcoin-13fc83c77bb9108c00dd7709ce17719edb763273.tar.xz | |
Move fee policy out of core
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 69e53756e0..17918a1280 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -236,7 +236,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) double dPriorityDelta = 0; int64_t nFeeDelta = 0; mempool.ApplyDeltas(hash, dPriorityDelta, nFeeDelta); - if (fSortedByFee && (dPriorityDelta <= 0) && (nFeeDelta <= 0) && (feeRate < CTransaction::minRelayTxFee) && (nBlockSize + nTxSize >= nBlockMinSize)) + if (fSortedByFee && (dPriorityDelta <= 0) && (nFeeDelta <= 0) && (feeRate < ::minRelayTxFee) && (nBlockSize + nTxSize >= nBlockMinSize)) continue; // Prioritise by fee once past the priority size or we run out of high-priority |