[RPC] Add shieldedsupply to getsupplyinfo and getinfo

rename moneysupply to transparentsupply
KolbyML · Nov 23, 2020 · c764f02 · c764f02
1 parent 18ee5ce
commit c764f02
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -648,8 +648,9 @@ UniValue getsupplyinfo(const JSONRPCRequest& request)
 
             "\nResult:\n"
             "{\n"
-            "  \"updateheight\" : n, (numeric) The chain height when the supply was updated\n"
-            "  \"supply\" :       n   (numeric) The sum of all spendable transaction outputs at height updateheight\n"
+            "  \"updateheight\" : n,       (numeric) The chain height when the transparent supply was updated\n"
+            "  \"transparentsupply\" : n   (numeric) The sum of all spendable transaction outputs at height updateheight\n"
+            "  \"shieldedsupply\": n       (numeric) Chain tip shielded pool value\n"
             "}\n"
 
             "\nExamples:\n" +
@@ -665,7 +666,9 @@ UniValue getsupplyinfo(const JSONRPCRequest& request)
 
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("updateheight", MoneySupply.GetCacheHeight());
-    ret.pushKV("supply", ValueFromAmount(MoneySupply.Get()));
+    ret.pushKV("transparentsupply", ValueFromAmount(MoneySupply.Get()));
+    Optional<CAmount> shieldedPoolValue = WITH_LOCK(cs_main, return (chainActive.Tip() ? chainActive.Tip()->nChainSaplingValue : nullopt); );
+    ret.pushKV("shieldedsupply", ValuePoolDesc(shieldedPoolValue, nullopt)["chainValue"]);
 
     return ret;
 }

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -68,9 +68,10 @@ UniValue getinfo(const JSONRPCRequest& request)
             "  \"proxy\": \"host:port\",       (string, optional) the proxy used by the server\n"
             "  \"difficulty\": xxxxxx,         (numeric) the current difficulty\n"
             "  \"testnet\": true|false,        (boolean) if the server is using testnet or not\n"
-            "  \"moneysupply\" : \"supply\"    (numeric) The sum of the value of all unspent outputs when the chainstate was\n"
+            "  \"transparentsupply\" : n       (numeric) The sum of the value of all unspent outputs when the chainstate was\n"
             "                                            last flushed to disk (use getsupplyinfo to know the update-height, or\n"
             "                                            to trigger the money supply update/recalculation)"
+            "  \"shieldedsupply\": n           (numeric) Chain tip shielded pool value\n"
             "  \"zPIVsupply\" :\n"
             "  {\n"
             "     \"1\" : n,            (numeric) supply of 1 zPIV denomination\n"
@@ -143,7 +144,8 @@ UniValue getinfo(const JSONRPCRequest& request)
 
     // Add (cached) money supply via getsupplyinfo RPC
     UniValue supply_info = getsupplyinfo(JSONRPCRequest());
-    obj.pushKV("moneysupply", supply_info["supply"]);
+    obj.pushKV("transparentsupply", supply_info["transparentsupply"]);
+    obj.pushKV("shieldedsupply", supply_info["shieldedsupply"]);
 
     UniValue zpivObj(UniValue::VOBJ);
     for (auto denom : libzerocoin::zerocoinDenomList) {
@@ -743,4 +745,4 @@ void RegisterMiscRPCCommands(CRPCTable &tableRPC)
 {
     for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
         tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
-}
+}