diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-15 19:44:49 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-12-15 19:45:54 +0100 |
| commit | 756374c522c46d884496a7c80626a65245db49c8 (patch) | |
| tree | 0fec62eae16f00731d3706bef60ca6bdaac89206 | |
| parent | c6fd923886a3eee01d9e226544b024940038c5e4 (diff) | |
| parent | 01fea7a04834b7fd5eca6f3678f56fed13375d1d (diff) | |
| download | bitcoin-756374c522c46d884496a7c80626a65245db49c8.tar.xz | |
Merge #9313: If we don't allow free txs, always send a fee filter
01fea7a If we don't allow free txs, always send a fee filter (Alex Morcos)
| -rw-r--r-- | src/net_processing.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 74da788ca8..ef2670f517 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2995,6 +2995,9 @@ bool SendMessages(CNode* pto, CConnman& connman) if (pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) && !(pto->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY))) { CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK(); + // If we don't allow free transactions, then we always have a fee filter of at least minRelayTxFee + if (GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0) + currentFilter = std::max(currentFilter, ::minRelayTxFee.GetFeePerK()); int64_t timeNow = GetTimeMicros(); if (timeNow > pto->nextSendTimeFeeFilter) { static CFeeRate default_feerate(DEFAULT_MIN_RELAY_TX_FEE); |