aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/fees.cpp
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2021-10-28 13:46:19 -0400
committerCarl Dong <contact@carldong.me>2022-06-28 15:36:18 -0400
commit82f00de7a6a60cbc9ad0c6e1d0ffb1bc70c49af5 (patch)
tree1a034d8f11035bf508c82a9cac2c8d935c648d03 /src/rpc/fees.cpp
parentf1941e8bfd2eecc478c7660434b1ebf6a64095a0 (diff)
downloadbitcoin-82f00de7a6a60cbc9ad0c6e1d0ffb1bc70c49af5.tar.xz
mempool: Pass in -maxmempool instead of referencing gArgs
- Store the mempool size limit (-maxmempool) in CTxMemPool as a member. - Remove the requirement to explicitly specify a mempool size limit for CTxMemPool::GetMinFee(...) and LimitMempoolSize(...), just use the stored mempool size limit where possible. - Remove all now-unnecessary instances of: gArgs.GetIntArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE_MB) * 1000000 The code change in CChainState::GetCoinsCacheSizeState() is correct since the coinscache should not repurpose "extra" mempool memory headroom for itself if the mempool doesn't even exist.
Diffstat (limited to 'src/rpc/fees.cpp')
-rw-r--r--src/rpc/fees.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc/fees.cpp b/src/rpc/fees.cpp
index e6e8324c27..dd1a6441a0 100644
--- a/src/rpc/fees.cpp
+++ b/src/rpc/fees.cpp
@@ -89,7 +89,7 @@ static RPCHelpMan estimatesmartfee()
FeeCalculation feeCalc;
CFeeRate feeRate{fee_estimator.estimateSmartFee(conf_target, &feeCalc, conservative)};
if (feeRate != CFeeRate(0)) {
- CFeeRate min_mempool_feerate{mempool.GetMinFee(gArgs.GetIntArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE_MB) * 1000000)};
+ CFeeRate min_mempool_feerate{mempool.GetMinFee()};
CFeeRate min_relay_feerate{::minRelayTxFee};
feeRate = std::max({feeRate, min_mempool_feerate, min_relay_feerate});
result.pushKV("feerate", ValueFromAmount(feeRate.GetFeePerK()));