diff options
| author | Ben Woosley <ben.woosley@gmail.com> | 2019-02-01 14:09:36 -0800 |
|---|---|---|
| committer | Ben Woosley <ben.woosley@gmail.com> | 2019-03-22 02:31:20 -0700 |
| commit | bb8ae2c41941d0776968f75cec0de89247e952dc (patch) | |
| tree | 44f74e39cf877e0c7683360fc223fbb55a4b3f5b /src | |
| parent | 3515612e069e3730f173a08e60b99f96b174188d (diff) | |
| download | bitcoin-bb8ae2c41941d0776968f75cec0de89247e952dc.tar.xz | |
rpc: Expose g_is_mempool_loaded via getmempoolinfo and /rest/mempool/info.json
And use it to fix a race condition in mempool_persist.py:
https://travis-ci.org/Empact/bitcoin/jobs/487577243
Since e.g. getrawmempool returns errors based on this status, this
enables users to test it for readiness.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/blockchain.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 72fec2eaa5..cebb331f38 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1484,6 +1484,7 @@ static UniValue getchaintips(const JSONRPCRequest& request) UniValue MempoolInfoToJSON(const CTxMemPool& pool) { UniValue ret(UniValue::VOBJ); + ret.pushKV("loaded", g_is_mempool_loaded); ret.pushKV("size", (int64_t)pool.size()); ret.pushKV("bytes", (int64_t)pool.GetTotalTxSize()); ret.pushKV("usage", (int64_t)pool.DynamicMemoryUsage()); @@ -1504,6 +1505,7 @@ static UniValue getmempoolinfo(const JSONRPCRequest& request) {}, RPCResult{ "{\n" + " \"loaded\": true|false (boolean) True if the mempool is fully loaded\n" " \"size\": xxxxx, (numeric) Current tx count\n" " \"bytes\": xxxxx, (numeric) Sum of all virtual transaction sizes as defined in BIP 141. Differs from actual serialized size because witness data is discounted\n" " \"usage\": xxxxx, (numeric) Total memory usage for the mempool\n" |