From 252451e382e8ac6aa57805191988adae31000c4d Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Tue, 31 Dec 2019 08:47:35 -0500
Subject: [PATCH] Add -zdebug to more stuff

---
 src/wallet/asyncrpcoperation_sendmany.cpp | 12 ++++++++----
 src/wallet/rpcwallet.cpp                  |  9 ++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/wallet/asyncrpcoperation_sendmany.cpp b/src/wallet/asyncrpcoperation_sendmany.cpp
index 383f16a98..5762a3f36 100644
--- a/src/wallet/asyncrpcoperation_sendmany.cpp
+++ b/src/wallet/asyncrpcoperation_sendmany.cpp
@@ -465,7 +465,8 @@ bool AsyncRPCOperation_sendmany::main_impl() {
         }
 
         // Select Sapling notes
-        LogPrintf("%s: Selecting Sapling notes\n", __FUNCTION__);
+        if(fZdebug)
+            LogPrintf("%s: Selecting Sapling notes\n", __FUNCTION__);
         std::vector<SaplingOutPoint> ops;
         std::vector<SaplingNote> notes;
         CAmount sum = 0;
@@ -504,7 +505,8 @@ bool AsyncRPCOperation_sendmany::main_impl() {
             auto addr = DecodePaymentAddress(address);
             assert(boost::get<libzcash::SaplingPaymentAddress>(&addr) != nullptr);
             auto to = boost::get<libzcash::SaplingPaymentAddress>(addr);
-            LogPrintf("%s: Adding Sapling output to address %s\n", __FUNCTION__, to.GetHash().ToString().c_str());
+            if(fZdebug)
+                LogPrintf("%s: Adding Sapling output to address %s\n", __FUNCTION__, to.GetHash().ToString().c_str());
 
             auto memo = get_memo_from_hex_string(hexMemo);
 
@@ -528,7 +530,8 @@ bool AsyncRPCOperation_sendmany::main_impl() {
             throw JSONRPCError(RPC_WALLET_ERROR, "Failed to build transaction.");
         }
         tx_ = maybe_tx.get();
-        LogPrintf("%s: Raw transaction created\n", __FUNCTION__);
+        if(fZdebug)
+            LogPrintf("%s: Raw transaction created\n", __FUNCTION__);
 
         // Send the transaction
         // TODO: Use CWallet::CommitTransaction instead of sendrawtransaction
@@ -536,7 +539,8 @@ bool AsyncRPCOperation_sendmany::main_impl() {
         if (!testmode) {
             UniValue params = UniValue(UniValue::VARR);
             params.push_back(signedtxn);
-            LogPrintf("%s: Sending raw xtn\n", __FUNCTION__);
+            if(fZdebug)
+                LogPrintf("%s: Sending raw xtn with txid=\n", __FUNCTION__, tx_.GetHash().ToString().c_str());
             UniValue sendResultValue = sendrawtransaction(params, false, CPubKey());
             if (sendResultValue.isNull()) {
                 throw JSONRPCError(RPC_WALLET_ERROR, "sendrawtransaction did not return an error or a txid.");
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 4fd68f93e..fbafbf95a 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4592,7 +4592,8 @@ UniValue z_sendmany(const UniValue& params, bool fHelp, const CPubKey& mypk)
 
     // As a sanity check, estimate and verify that the size of the transaction will be valid.
     // Depending on the input notes, the actual tx size may turn out to be larger and perhaps invalid.
-    LogPrintf("%s: Verifying xtn size is valid\n", __FUNCTION__);
+    if(fZdebug)
+        LogPrintf("%s: Verifying xtn size is valid\n", __FUNCTION__);
     size_t txsize = 0;
     for (int i = 0; i < zaddrRecipients.size(); i++) {
         auto address = std::get<0>(zaddrRecipients[i]);
@@ -4657,7 +4658,8 @@ UniValue z_sendmany(const UniValue& params, bool fHelp, const CPubKey& mypk)
     o.push_back(Pair("minconf", nMinDepth));
     o.push_back(Pair("fee", std::stod(FormatMoney(nFee))));
     UniValue contextInfo = o;
-    LogPrintf("%s: Building the transaction\n", __FUNCTION__);
+    if(fZdebug)
+        LogPrintf("%s: Building the raw ztransaction\n", __FUNCTION__);
 
     // Builder (used if Sapling addresses are involved)
     boost::optional<TransactionBuilder> builder;
@@ -4677,7 +4679,8 @@ UniValue z_sendmany(const UniValue& params, bool fHelp, const CPubKey& mypk)
     std::shared_ptr<AsyncRPCQueue> q = getAsyncRPCQueue();
     std::shared_ptr<AsyncRPCOperation> operation( new AsyncRPCOperation_sendmany(builder, contextualTx, fromaddress, taddrRecipients, zaddrRecipients, nMinDepth, nFee, contextInfo) );
     q->addOperation(operation);
-    LogPrintf("%s: Submitted to queue\n", __FUNCTION__);
+    if(fZdebug)
+        LogPrintf("%s: Submitted to async queue\n", __FUNCTION__);
     AsyncRPCOperationId operationId = operation->getId();
     return operationId;
 }