diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-10 15:57:58 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-10 15:58:00 +0100 |
| commit | 9fa54a1b0c1ae1b12c292d5cb3158c58c975eb24 (patch) | |
| tree | a6c750dc620b99c57d7b887da54c467a91218cb4 /src/main.cpp | |
| parent | 755b4ba848bc61c6c0a858aba042739f34fe37ff (diff) | |
| parent | e20d9245e58bafdab51105c985478ccb3e0c9095 (diff) | |
| download | bitcoin-9fa54a1b0c1ae1b12c292d5cb3158c58c975eb24.tar.xz | |
Merge pull request #6822
e20d924 [trivial] init: Use defaults MIN_RELAY_TX_FEE & TRANSACTION_MAXFEE (MarcoFalke)
536766c [trivial] New DEFAULT_MIN_RELAY_TX_FEE = 1000 (MarcoFalke)
5f46a7d transaction_tests: Be more strict checking dust (MarcoFalke)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index bc49d09fe7..cd932b5d3a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -75,7 +75,7 @@ uint64_t nPruneTarget = 0; bool fAlerts = DEFAULT_ALERTS; /** Fees smaller than this (in satoshi) are considered zero fee (for relaying, mining and transaction creation) */ -CFeeRate minRelayTxFee = CFeeRate(1000); +CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE); CTxMemPool mempool(::minRelayTxFee); |