Merge remote-tracking branch 'origin/duke' into duke

2019-10-18 00:34:56 -04:00
parent 799f6d757b 8aaa92366f
commit a93763aadc
78 changed files with 1225 additions and 11448 deletions
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1908,6 +1908,10 @@ UniValue mempoolInfoToJSON()
    ret.push_back(Pair("bytes", (int64_t) mempool.GetTotalTxSize()));
    ret.push_back(Pair("usage", (int64_t) mempool.DynamicMemoryUsage()));

+    if (Params().NetworkIDString() == "regtest") {
+        ret.push_back(Pair("fullyNotified", mempool.IsFullyNotified()));
+    }
+    
    return ret;
 }