[RPC] fix spendrawzerocoin string parsing

random-zebra · random-zebra · commit bf0cf52d3725 · 2019-03-14T14:45:40.000+01:00
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
@@ -139,11 +139,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
         {"spendzerocoin", 1},
         {"spendzerocoin", 2},
         {"spendzerocoin", 3},
-        {"spendrawzerocoin", 0},
-        {"spendrawzerocoin", 1},
         {"spendrawzerocoin", 2},
-        {"spendrawzerocoin", 3},
-        {"spendrawzerocoin", 4},
         {"spendzerocoinmints", 0},
         {"importzerocoins", 0},
         {"exportzerocoins", 0},
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
@@ -3707,33 +3707,27 @@ UniValue spendrawzerocoin(const UniValue& params, bool fHelp)
             "\nArguments:\n"
             "1. \"serialHex\"        (string, required) A zerocoin serial number (hex)\n"
             "2. \"randomnessHex\"    (string, required) A zerocoin randomness value (hex)\n"
-            "3. denom                (numberic, required) A zerocoin denomination (decimal)\n"
+            "3. denom                (numeric, required) A zerocoin denomination (decimal)\n"
             "4. \"priv key\"         (string, required) The private key associated with this coin (hex)\n"
             "5. \"address\"          (string, optional) PIVX address to spend to. If not specified, spend to change add.\n"
 
             "\nResult:\n"
                 "\"txid\"             (string) The transaction txid in hex\n"
 
             "\nExamples\n" +
-            HelpExampleCli("spendrawzerocoin", "f80892e78c30a393ef4ab4d5a9d5a2989de6ebc7b976b241948c7f489ad716a2 a4fd4d7248e6a51f1d877ddd2a4965996154acc6b8de5aa6c83d4775b283b600") +
-            HelpExampleRpc("createrawtransaction", "f80892e78c30a393ef4ab4d5a9d5a2989de6ebc7b976b241948c7f489ad716a2, a4fd4d7248e6a51f1d877ddd2a4965996154acc6b8de5aa6c83d4775b283b600"));
+            HelpExampleCli("spendrawzerocoin", "\"f80892e78c30a393ef4ab4d5a9d5a2989de6ebc7b976b241948c7f489ad716a2\" \"a4fd4d7248e6a51f1d877ddd2a4965996154acc6b8de5aa6c83d4775b283b600\" 100 \"xxx\"") +
+            HelpExampleRpc("spendrawzerocoin", "\"f80892e78c30a393ef4ab4d5a9d5a2989de6ebc7b976b241948c7f489ad716a2\", \"a4fd4d7248e6a51f1d877ddd2a4965996154acc6b8de5aa6c83d4775b283b600\", 100, \"xxx\""));
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
     if (GetAdjustedTime() > GetSporkValue(SPORK_16_ZEROCOIN_MAINTENANCE_MODE))
             throw JSONRPCError(RPC_WALLET_ERROR, "zPIV is currently disabled due to maintenance.");
 
-    std::string serial_str = params[0].get_str();
-    if (!IsHex(serial_str))
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected hex serial");
     CBigNum serial;
-    serial.SetHex(serial_str);
+    serial.SetHex(params[0].get_str());
 
-    std::string randomness_str = params[1].get_str();
-    if (!IsHex(randomness_str))
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected hex randomness");
     CBigNum randomness;
-    randomness.SetHex(randomness_str);
+    randomness.SetHex(params[1].get_str());
 
     const int denom_int = params[2].get_int();
     libzerocoin::CoinDenomination denom = libzerocoin::IntToZerocoinDenomination(denom_int);
