Additional zerocoin leftover

magnetwork · Nov 10, 2018 · 5f95b65 · 5f95b65
1 parent ccf64f0
commit 5f95b65
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 29 deletions.
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -123,7 +123,6 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
         zmagObj.push_back(Pair(to_string(denom), ValueFromAmount(blockindex->mapZerocoinSupply.at(denom) * (denom*COIN))));
     }
     zmagObj.push_back(Pair("total", ValueFromAmount(blockindex->GetZerocoinSupply())));
-    result.push_back(Pair("zMAGsupply", zmagObj));
 
     return result;
 }
@@ -323,18 +322,6 @@ UniValue getblock(const UniValue& params, bool fHelp)
             "  \"previousblockhash\" : \"hash\",  (string) The hash of the previous block\n"
             "  \"nextblockhash\" : \"hash\"       (string) The hash of the next block\n"
             "  \"moneysupply\" : \"supply\"       (numeric) The money supply when this block was added to the blockchain\n"
-            "  \"zMAGsupply\" :\n"
-            "  {\n"
-            "     \"1\" : n,            (numeric) supply of 1 zMAG denomination\n"
-            "     \"5\" : n,            (numeric) supply of 5 zMAG denomination\n"
-            "     \"10\" : n,           (numeric) supply of 10 zMAG denomination\n"
-            "     \"50\" : n,           (numeric) supply of 50 zMAG denomination\n"
-            "     \"100\" : n,          (numeric) supply of 100 zMAG denomination\n"
-            "     \"500\" : n,          (numeric) supply of 500 zMAG denomination\n"
-            "     \"1000\" : n,         (numeric) supply of 1000 zMAG denomination\n"
-            "     \"5000\" : n,         (numeric) supply of 5000 zMAG denomination\n"
-            "     \"total\" : n,        (numeric) The total supply of all zMAG denominations\n"
-            "  }\n"
             "}\n"
 
             "\nResult (for verbose=false):\n"

diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
@@ -57,26 +57,13 @@ UniValue getinfo(const UniValue& params, bool fHelp)
             "  \"protocolversion\": xxxxx,   (numeric) the protocol version\n"
             "  \"walletversion\": xxxxx,     (numeric) the wallet version\n"
             "  \"balance\": xxxxxxx,         (numeric) the total mag balance of the wallet (excluding zerocoins)\n"
-            "  \"zerocoinbalance\": xxxxxxx, (numeric) the total zerocoin balance of the wallet\n"
             "  \"blocks\": xxxxxx,           (numeric) the current number of blocks processed in the server\n"
             "  \"timeoffset\": xxxxx,        (numeric) the time offset\n"
             "  \"connections\": xxxxx,       (numeric) the number of connections\n"
             "  \"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 money supply when this block was added to the blockchain\n"
-            "  \"zMAGsupply\" :\n"
-            "  {\n"
-            "     \"1\" : n,            (numeric) supply of 1 zMAG denomination\n"
-            "     \"5\" : n,            (numeric) supply of 5 zMAG denomination\n"
-            "     \"10\" : n,           (numeric) supply of 10 zMAG denomination\n"
-            "     \"50\" : n,           (numeric) supply of 50 zMAG denomination\n"
-            "     \"100\" : n,          (numeric) supply of 100 zMAG denomination\n"
-            "     \"500\" : n,          (numeric) supply of 500 zMAG denomination\n"
-            "     \"1000\" : n,         (numeric) supply of 1000 zMAG denomination\n"
-            "     \"5000\" : n,         (numeric) supply of 5000 zMAG denomination\n"
-            "     \"total\" : n,        (numeric) The total supply of all zMAG denominations\n"
-            "  }\n"
+            "  \"moneysupply\" : \"supply\"  (numeric) The money supply when this block was added to the blockchain\n"
             "  \"keypoololdest\": xxxxxx,    (numeric) the timestamp (seconds since GMT epoch) of the oldest pre-generated key in the key pool\n"
             "  \"keypoolsize\": xxxx,        (numeric) how many new keys are pre-generated\n"
             "  \"unlocked_until\": ttt,      (numeric) the timestamp in seconds since epoch (midnight Jan 1 1970 GMT) that the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
@@ -105,7 +92,6 @@ UniValue getinfo(const UniValue& params, bool fHelp)
     if (pwalletMain) {
         obj.push_back(Pair("walletversion", pwalletMain->GetVersion()));
         obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance())));
-        obj.push_back(Pair("zerocoinbalance", ValueFromAmount(pwalletMain->GetZerocoinBalance(true))));
     }
 #endif
     obj.push_back(Pair("blocks", (int)chainActive.Height()));
@@ -127,7 +113,6 @@ UniValue getinfo(const UniValue& params, bool fHelp)
         zmagObj.push_back(Pair(to_string(denom), ValueFromAmount(chainActive.Tip()->mapZerocoinSupply.at(denom) * (denom*COIN))));
     }
     zmagObj.push_back(Pair("total", ValueFromAmount(chainActive.Tip()->GetZerocoinSupply())));
-    obj.push_back(Pair("zMAGsupply", zmagObj));
 
 #ifdef ENABLE_WALLET
     if (pwalletMain) {