Hooked up the "walletdeniabilizecoin" to the RPC commands.

Cleaned up the input json parsing.

Author: denavila

src/rpc/client.cpp

@@ -130,6 +130,9 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "walletcreatefundedpsbt", 2, "locktime" },
     { "walletcreatefundedpsbt", 3, "options" },
     { "walletcreatefundedpsbt", 4, "bip32derivs" },
+    { "walletdeniabilizecoin", 0, "inputs" },
+    { "walletdeniabilizecoin", 1, "conf_target" },
+    { "walletdeniabilizecoin", 2, "add_to_wallet" },
     { "walletprocesspsbt", 1, "sign" },
     { "walletprocesspsbt", 3, "bip32derivs" },
     { "walletprocesspsbt", 4, "finalize" },

src/wallet/rpc/spend.cpp

@@ -1732,9 +1732,12 @@ RPCHelpMan walletdeniabilizecoin()
         {
             {"inputs", RPCArg::Type::ARR, RPCArg::Optional::NO, "Specify inputs (must share the same address). A JSON array of JSON objects",
                 {
-                    {"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The transaction id"},
-                    {"vout", RPCArg::Type::NUM, RPCArg::Optional::NO, "The output number"},
-                    {"sequence", RPCArg::Type::NUM, RPCArg::Optional::NO, "The sequence number"},
+                    {"", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
+                        {
+                            {"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The transaction id"},
+                            {"vout", RPCArg::Type::NUM, RPCArg::Optional::NO, "The output number"},
+                        }
+                    }
                 },
             },
             {"conf_target", RPCArg::Type::NUM, RPCArg::DefaultHint{"wallet -txconfirmtarget"}, "Confirmation target in blocks"},
@@ -1748,24 +1751,29 @@ RPCHelpMan walletdeniabilizecoin()
                     {RPCResult::Type::STR_HEX, "hex", /*optional=*/true, "If add_to_wallet is false, the hex-encoded raw transaction with signature(s)"},
                 }
         },
-        RPCExamples{""
+        RPCExamples{
+            "\nDeniabilize a single UTXO\n"
+            + HelpExampleCli("walletdeniabilizecoin", "\"[{\"txid\":\"4c14d20709daef476854fe7ef75bdfcfd5a7636a431b4622ec9481f297e12e8c\", \"vout\": 0}]\"")
         },
         [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
         {
             std::shared_ptr<CWallet> const pwallet = GetWalletForJSONRPCRequest(request);
             if (!pwallet) return UniValue::VNULL;
 
-            CMutableTransaction rawTx;
-            AddInputs(rawTx, request.params[0], true);
-
-            unsigned int confirm_target = !request.params[1].isNull() ? request.params[1].getInt<unsigned int>() : 6;
-            const bool add_to_wallet = !request.params[2].isNull() ? request.params[2].get_bool() : true;
-
             std::optional<CTxDestination> shared_address;
             std::set<COutPoint> inputs;
             unsigned int deniabilization_cycles = 0;
-            for (const auto& txIn: rawTx.vin) {
-                const auto& outpoint = txIn.prevout;
+            for (const UniValue& input : request.params[0].get_array().getValues()) {
+                uint256 txid = ParseHashO(input, "txid");
+
+                const UniValue& vout_v = input.find_value("vout");
+                if (!vout_v.isNum())
+                    throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing vout key");
+                int nOutput = vout_v.getInt<int>();
+                if (nOutput < 0)
+                    throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, vout cannot be negative");
+
+                COutPoint outpoint(txid, nOutput);
                 LOCK(pwallet->cs_wallet);
                 auto walletTx = pwallet->GetWalletTx(outpoint.hash);
                 if (!walletTx) {
@@ -1797,6 +1805,9 @@ RPCHelpMan walletdeniabilizecoin()
                 deniabilization_cycles = std::min(deniabilization_cycles, cycles_res.first);
             }
 
+            unsigned int confirm_target = !request.params[1].isNull() ? request.params[1].getInt<unsigned int>() : 6;
+            const bool add_to_wallet = !request.params[2].isNull() ? request.params[2].get_bool() : true;
+
             CTransactionRef tx;
             CAmount tx_fee = 0;
             {

src/wallet/rpc/wallet.cpp

@@ -869,6 +869,7 @@ RPCHelpMan send();
 RPCHelpMan sendall();
 RPCHelpMan walletprocesspsbt();
 RPCHelpMan walletcreatefundedpsbt();
+RPCHelpMan walletdeniabilizecoin();
 RPCHelpMan signrawtransactionwithwallet();
 
 // signmessage
@@ -956,6 +957,7 @@ Span<const CRPCCommand> GetWalletRPCCommands()
         {"wallet", &walletpassphrase},
         {"wallet", &walletpassphrasechange},
         {"wallet", &walletprocesspsbt},
+        {"wallet", &walletdeniabilizecoin},
     };
     return commands;
 }