diff options
| author | Gavin Andresen <[email protected]> | 2014-07-03 15:50:24 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2014-07-03 15:50:24 -0400 |
| commit | 21876d38310f07befd5d7967fd68adf923eef6ba (patch) | |
| tree | 69710bd1c5634c859c9888faa2cae8a8c10cff07 /src/miner.cpp | |
| parent | Merge pull request #4302 (diff) | |
| parent | Move fee policy out of core (diff) | |
| download | discoin-21876d38310f07befd5d7967fd68adf923eef6ba.tar.xz discoin-21876d38310f07befd5d7967fd68adf923eef6ba.zip | |
Merge branch 'smartfee_wallet'
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 69e53756e..17918a128 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 |