dzpivstate RPC call. Displays state of deterministic zpiv wallet.

presstab · Fuzzbawls · commit 623e5c82da57 · 2018-04-26T00:16:42.000-07:00
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
@@ -448,7 +448,8 @@ static const CRPCCommand vRPCCommands[] =
         {"zerocoin", "getzpivseed", &getzpivseed, false, false, true},
         {"zerocoin", "setzpivseed", &setzpivseed, false, false, true},
         {"zerocoin", "generatemintlist", &generatemintlist, false, false, true},
-        {"zerocoin", "searchdzpiv", &searchdzpiv, false, false, true}
+        {"zerocoin", "searchdzpiv", &searchdzpiv, false, false, true},
+        {"zerocoin", "dzpivstate", &dzpivstate, false, false, true}
 
 #endif // ENABLE_WALLET
 };
diff --git a/src/rpcserver.h b/src/rpcserver.h
@@ -262,6 +262,7 @@ extern UniValue setzpivseed(const UniValue& params, bool fHelp);
 extern UniValue getzpivseed(const UniValue& params, bool fHelp);
 extern UniValue generatemintlist(const UniValue& params, bool fHelp);
 extern UniValue searchdzpiv(const UniValue& params, bool fHelp);
+extern UniValue dzpivstate(const UniValue& params, bool fHelp);
 
 extern UniValue getrawtransaction(const UniValue& params, bool fHelp); // in rcprawtransaction.cpp
 extern UniValue listunspent(const UniValue& params, bool fHelp);
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
@@ -3392,6 +3392,26 @@ UniValue generatemintlist(const UniValue& params, bool fHelp)
     return arrRet;
 }
 
+UniValue dzpivstate(const UniValue& params, bool fHelp) {
+    if (fHelp || params.size() != 0)
+        throw runtime_error(
+                "dzpivstate\n"
+                        "\nThe current state of the mintpool of the deterministic zPIV wallet.\n" +
+                HelpRequiringPassphrase() + "\n"
+
+                        "\nExamples\n" +
+                HelpExampleCli("mintpoolstatus", "") + HelpExampleRpc("mintpoolstatus", ""));
+
+    CzPIVWallet* zwallet = pwalletMain->zwalletMain;
+    UniValue obj(UniValue::VOBJ);
+    int nCount, nCountLastUsed;
+    zwallet->GetState(nCount, nCountLastUsed);
+    obj.push_back(Pair("dzpiv_count", nCount));
+    obj.push_back(Pair("mintpool_count", nCountLastUsed));
+
+    return obj;
+}
+
 UniValue searchdzpiv(const UniValue& params, bool fHelp)
 {
     if(fHelp || params.size() != 2)
diff --git a/src/zpivwallet.cpp b/src/zpivwallet.cpp
@@ -164,6 +164,12 @@ void CzPIVWallet::RemoveMintsFromPool(const std::vector<uint256>& vPubcoinHashes
         mintPool.Remove(hash);
 }
 
+void CzPIVWallet::GetState(int& nCount, int& nLastGenerated)
+{
+    nCount = this->nCountLastUsed + 1;
+    nLastGenerated = mintPool.CountOfLastGenerated();
+}
+
 //Catch the counter up with the chain
 map<uint256, uint32_t> mapMissingMints;
 void CzPIVWallet::SyncWithChain(bool fGenerateMintPool)
diff --git a/src/zpivwallet.h b/src/zpivwallet.h
@@ -28,6 +28,7 @@ class CzPIVWallet
     void SyncWithChain(bool fGenerateMintPool = true);
     void GenerateDeterministicZPIV(libzerocoin::CoinDenomination denom, libzerocoin::PrivateCoin& coin, CDeterministicMint& dMint, bool fGenerateOnly = false);
     void GenerateMint(const uint32_t& nCount, const libzerocoin::CoinDenomination denom, libzerocoin::PrivateCoin& coin, CDeterministicMint& dMint);
+    void GetState(int& nCount, int& nLastGenerated);
     bool RegenerateMint(const CDeterministicMint& dMint, CZerocoinMint& mint);
     void GenerateMintPool(uint32_t nCountStart = 0, uint32_t nCountEnd = 0);
     bool LoadMintPoolFromDB();
