[rpc] mempoolinfo should take ::minRelayTxFee into account

This commit is contained in:
Cristian Mircea Messel
2017-10-10 19:36:27 +03:00
parent 892809309c
commit 149dffd3b2
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -1345,7 +1345,7 @@ UniValue mempoolInfoToJSON()
ret.push_back(Pair("usage", (int64_t) mempool.DynamicMemoryUsage()));
size_t maxmempool = gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
ret.push_back(Pair("maxmempool", (int64_t) maxmempool));
ret.push_back(Pair("mempoolminfee", ValueFromAmount(mempool.GetMinFee(maxmempool).GetFeePerK())));
ret.push_back(Pair("mempoolminfee", ValueFromAmount(std::max(mempool.GetMinFee(maxmempool), ::minRelayTxFee).GetFeePerK())));
return ret;
}