Skip to content

Commit 01fea7a

Browse files
committed
If we don't allow free txs, always send a fee filter
1 parent 72bf1b3 commit 01fea7a

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/net_processing.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2993,6 +2993,9 @@ bool SendMessages(CNode* pto, CConnman& connman)
29932993
if (pto->nVersion >= FEEFILTER_VERSION && GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
29942994
!(pto->fWhitelisted && GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY))) {
29952995
CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK();
2996+
// If we don't allow free transactions, then we always have a fee filter of at least minRelayTxFee
2997+
if (GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0)
2998+
currentFilter = std::max(currentFilter, ::minRelayTxFee.GetFeePerK());
29962999
int64_t timeNow = GetTimeMicros();
29973000
if (timeNow > pto->nextSendTimeFeeFilter) {
29983001
static CFeeRate default_feerate(DEFAULT_MIN_RELAY_TX_FEE);

0 commit comments

Comments
 (0)