diff options
| author | Gavin Andresen <[email protected]> | 2014-03-11 11:20:07 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2014-03-11 11:20:07 -0400 |
| commit | 669264c176da0bb46465596b626353af348047bf (patch) | |
| tree | f286e417bd951e15b9ec899bccc06b23936f94fc /src/miner.cpp | |
| parent | Merge pull request #3696 (diff) | |
| parent | Make mining fee policy match relay fee policy. (diff) | |
| download | discoin-669264c176da0bb46465596b626353af348047bf.tar.xz discoin-669264c176da0bb46465596b626353af348047bf.zip | |
Merge branch 'match_relay_fee' of git://github.com/mikehearn/bitcoin
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index e52f53908..3351908e6 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -136,7 +136,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) // Minimum block size you want to create; block will be filled with free transactions // until there are no more or the block reaches this size: - unsigned int nBlockMinSize = GetArg("-blockminsize", 0); + unsigned int nBlockMinSize = GetArg("-blockminsize", DEFAULT_BLOCK_MIN_SIZE); nBlockMinSize = std::min(nBlockMaxSize, nBlockMinSize); // Collect memory pool transactions into the block @@ -254,7 +254,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) continue; // Skip free transactions if we're past the minimum block size: - if (fSortedByFee && (dFeePerKb < CTransaction::nMinTxFee) && (nBlockSize + nTxSize >= nBlockMinSize)) + if (fSortedByFee && (dFeePerKb < CTransaction::nMinRelayTxFee) && (nBlockSize + nTxSize >= nBlockMinSize)) continue; // Prioritize by fee once past the priority size or we run out of high-priority |