[BDAP] Allow sending to stealth addresses in "makecredits" RPC

AmirAbrams · AmirAbrams · commit a2e6ffa14d12 · 2019-08-04T01:15:49.000-05:00
diff --git a/src/bdap/rpcdomainentry.cpp b/src/bdap/rpcdomainentry.cpp
@@ -20,7 +20,7 @@
 #include <univalue.h>
 
 extern void SendBDAPTransaction(const CScript& bdapDataScript, const CScript& bdapOPScript, CWalletTx& wtxNew, const CAmount& nDataAmount, const CAmount& nOpAmount, const bool fUseInstantSend);
-extern void SendColorTransaction(const CScript& scriptColorCoins, CWalletTx& wtxNew, const CAmount& nColorAmount, const CCoinControl* coinControl, const bool fUseInstantSend, const bool fUsePrivateSend);
+extern void SendColorTransaction(const CScript& scriptColorCoins, const CScript& stealthDataScript, CWalletTx& wtxNew, const CAmount& nColorAmount, const CCoinControl* coinControl, const bool fUseInstantSend, const bool fUsePrivateSend);
 
 static UniValue AddDomainEntry(const JSONRPCRequest& request, BDAP::ObjectType bdapType)
 {
@@ -958,20 +958,40 @@ UniValue makecredits(const JSONRPCRequest& request)
     if (nColorAmount <= 0)
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for coloring");
 
+    CScript scriptDestination;
+    std::vector<uint8_t> vStealthData;
+    bool fStealthAddress = false;
+    if (dest.type() == typeid(CStealthAddress))
+    {
+        CStealthAddress sxAddr = boost::get<CStealthAddress>(dest);
+        std::string sError;
+        if (0 != PrepareStealthOutput(sxAddr, scriptDestination, vStealthData, sError)) {
+            LogPrintf("%s -- PrepareStealthOutput failed. Error = %s\n", __func__, sError);
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
+        }
+        fStealthAddress = true;
+        CTxDestination newDest;
+        if (ExtractDestination(scriptDestination, newDest))
+            LogPrint("bdap", "%s -- Stealth send to address: %s\n", __func__, CDynamicAddress(newDest).ToString());
+    }
+    else {
+        scriptDestination = GetScriptForDestination(dest);
+    }
+    CScript stealthScript;
+    if (fStealthAddress) {
+        stealthScript << OP_RETURN << vStealthData;
+    }
+    // Create BDAP move asset operation script
     std::vector<unsigned char> vchMoveSource = vchFromString(std::string("DYN"));
     std::vector<unsigned char> vchMoveDestination = vchFromString(std::string("BDAP"));
-
-    // Create BDAP move asset operation script
     CScript scriptColorCoins;
     scriptColorCoins << CScript::EncodeOP_N(OP_BDAP_MOVE) << CScript::EncodeOP_N(OP_BDAP_ASSET) 
                         << vchMoveSource << vchMoveDestination << OP_2DROP << OP_2DROP;
 
-    CScript scriptDestination;
-    scriptDestination = GetScriptForDestination(dest);
     scriptColorCoins += scriptDestination;
 
     CWalletTx wtx;
-    SendColorTransaction(scriptColorCoins, wtx, nColorAmount, NULL, false, false);
+    SendColorTransaction(scriptColorCoins, stealthScript, wtx, nColorAmount, NULL, false, false);
 
     return wtx.GetHash().GetHex();
 }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -552,7 +552,7 @@ void SendLinkingTransaction(const CScript& bdapDataScript, const CScript& bdapOP
     }
 }
 
-void SendColorTransaction(const CScript& scriptColorCoins, CWalletTx& wtxNew, const CAmount& nColorAmount, const CCoinControl* coinControl, const bool fUseInstantSend, const bool fUsePrivateSend)
+void SendColorTransaction(const CScript& scriptColorCoins, const CScript& stealthDataScript, CWalletTx& wtxNew, const CAmount& nColorAmount, const CCoinControl* coinControl, const bool fUseInstantSend, const bool fUsePrivateSend)
 {
     CAmount curBalance = pwalletMain->GetBalance();
 
@@ -570,11 +570,16 @@ void SendColorTransaction(const CScript& scriptColorCoins, CWalletTx& wtxNew, co
     std::vector<CRecipient> vecSend;
     int nChangePosInOut = 0;
 
-    LogPrintf("Sending color coin script: %s\n", ScriptToAsmStr(scriptColorCoins));
+    LogPrint("bdap", "Sending color coin script: %s\n", ScriptToAsmStr(scriptColorCoins));
+
+    if (stealthDataScript.size() > 0) {
+        CRecipient recStealthData = {stealthDataScript, 0, false};
+        vecSend.push_back(recStealthData);
+    }
 
     CRecipient recScript = {scriptColorCoins, nColorAmount, false};
     vecSend.push_back(recScript);
-    //
+
     if (!pwalletMain->CreateTransaction(vecSend, wtxNew, reservekey, nFeeRequired, nChangePosInOut,
             strError, coinControl, true, fUsePrivateSend ? ONLY_DENOMINATED : ALL_COINS, fUseInstantSend, true)) {
         if (nColorAmount + nFeeRequired > pwalletMain->GetBalance())
