diff options
| author | Cristian Mircea Messel <mess110@gmail.com> | 2017-10-10 19:36:27 +0300 |
|---|---|---|
| committer | Cristian Mircea Messel <mess110@gmail.com> | 2017-10-11 23:39:47 +0300 |
| commit | 149dffd3b2a137d575ad19b8c0b13345efe3ada1 (patch) | |
| tree | ac8d63ea3fb651e0678619ef8a825d92a44f66b2 /src/rpc/blockchain.cpp | |
| parent | 892809309c1bc370677241a715e57a2744f94323 (diff) | |
| download | bitcoin-149dffd3b2a137d575ad19b8c0b13345efe3ada1.tar.xz | |
[rpc] mempoolinfo should take ::minRelayTxFee into account
Diffstat (limited to 'src/rpc/blockchain.cpp')
| -rw-r--r-- | src/rpc/blockchain.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 68af376f35..874645f653 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -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; } |