diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-12-06 13:28:10 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-12-06 13:33:01 -0800 |
| commit | 09c4fd157c5b88df2d97fad4826c79b094db90c9 (patch) | |
| tree | 1e81ce42ada36e2d935c1daa47e88f9038c1a62e /src | |
| parent | fde7d99c4d7d95e243bb18bb5ed49b864d3b58e7 (diff) | |
| parent | 9b9324ee49e3e9cd401cedb8cdfce9a4b7c040de (diff) | |
| download | bitcoin-09c4fd157c5b88df2d97fad4826c79b094db90c9.tar.xz | |
Merge #9268: Fix rounding privacy leak introduced in #9260
9b9324e Fix rounding privacy leak introduced in #9260 (Matt Corallo)
Diffstat (limited to 'src')
| -rw-r--r-- | src/net_processing.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 4bee13a7bf..0137108cf0 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2995,7 +2995,8 @@ bool SendMessages(CNode* pto, CConnman& connman) CAmount currentFilter = mempool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000).GetFeePerK(); int64_t timeNow = GetTimeMicros(); if (timeNow > pto->nextSendTimeFeeFilter) { - static FeeFilterRounder filterRounder(::minRelayTxFee); + static CFeeRate default_feerate(DEFAULT_MIN_RELAY_TX_FEE); + static FeeFilterRounder filterRounder(default_feerate); CAmount filterToSend = filterRounder.round(currentFilter); if (filterToSend != pto->lastSentFeeFilter) { connman.PushMessage(pto, msgMaker.Make(NetMsgType::FEEFILTER, filterToSend)); |