diff options
| author | Patrick Lodder <[email protected]> | 2021-07-31 20:58:53 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-07-31 20:58:53 +0200 |
| commit | 7abb81b2ea3bd11e6d01476b2c1739d793006a83 (patch) | |
| tree | 7765fbeda190b3630de9810f4b246a7c1c0c5e75 /src/net_processing.cpp | |
| parent | Merge pull request #2426 from xanimo/1.14.4-qa (diff) | |
| parent | Initial back end framework to separate wallet and relay fees + dust. (diff) | |
| download | discoin-7abb81b2ea3bd11e6d01476b2c1739d793006a83.tar.xz discoin-7abb81b2ea3bd11e6d01476b2c1739d793006a83.zip | |
Merge pull request #2368 from michilumin/1.14.4-fees
1.14.4 fees backend improvements
Diffstat (limited to 'src/net_processing.cpp')
| -rw-r--r-- | src/net_processing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 5c595a891..6de152ae8 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -3317,9 +3317,9 @@ bool SendMessages(CNode* pto, CConnman& connman, const std::atomic<bool>& interr static CFeeRate default_feerate(DEFAULT_MIN_RELAY_TX_FEE); static FeeFilterRounder filterRounder(default_feerate); CAmount filterToSend = filterRounder.round(currentFilter); - // If we don't allow free transactions, then we always have a fee filter of at least minRelayTxFee + // If we don't allow free transactions, then we always have a fee filter of at least minRelayTxFeeRate if (GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0) - filterToSend = std::max(filterToSend, ::minRelayTxFee.GetFeePerK()); + filterToSend = std::max(filterToSend, ::minRelayTxFeeRate.GetFeePerK()); if (filterToSend != pto->lastSentFeeFilter) { connman.PushMessage(pto, msgMaker.Make(NetMsgType::FEEFILTER, filterToSend)); pto->lastSentFeeFilter = filterToSend; |