diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-26 10:06:46 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-26 10:07:04 +0100 |
| commit | 26f5b34e88387a6aabbb886e16532ddbe7dcca92 (patch) | |
| tree | 7dc72bf51bfbd5d9ec04df549ef047ccd69003f8 /src/rpcblockchain.cpp | |
| parent | 5242bb32c7231d3110bfa2fe2f683e9ea18a7444 (diff) | |
| parent | 10e2eae35c65b7551618a24e15cf068ce215beef (diff) | |
Merge pull request #6877
10e2eae rpc: Add maxmempool and effective min fee to getmempoolinfo (Wladimir J. van der Laan)
Diffstat (limited to 'src/rpcblockchain.cpp')
| -rw-r--r-- | src/rpcblockchain.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 20c0c1fb2f..4786d72a3f 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -773,6 +773,9 @@ UniValue mempoolInfoToJSON() ret.push_back(Pair("size", (int64_t) mempool.size())); ret.push_back(Pair("bytes", (int64_t) mempool.GetTotalTxSize())); ret.push_back(Pair("usage", (int64_t) mempool.DynamicMemoryUsage())); + size_t maxmempool = 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()))); return ret; } |