From 8f56306359a1f5870c8339d0b1363b9d483074eb Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Mon, 26 Oct 2020 14:12:57 +0000
Subject: [PATCH] Add txid to "shielded requirements not met" messages

---
 src/main.cpp | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 4fe2df808..f06bf7e87 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1567,10 +1567,14 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
         // Are the shielded spends' requirements met?
         auto unmetShieldedReq = view.HaveShieldedRequirements(tx);
         if (unmetShieldedReq) {
+            auto txid = tx.GetHash().ToString();
             auto rejectCode = ShieldedReqRejectCode(*unmetShieldedReq);
             auto rejectReason = ShieldedReqRejectReason(*unmetShieldedReq);
-            return state.Invalid(error("AcceptToMemoryPool: shielded requirements not met (%s)", rejectReason),
-                                 rejectCode, rejectReason);
+            TracingError(
+                "main", "AcceptToMemoryPool(): shielded requirements not met",
+                "txid", txid.c_str(),
+                "reason", rejectReason.c_str());
+            return state.Invalid(false, rejectCode, rejectReason);
         }
 
         // Bring the best block into scope
@@ -2205,10 +2209,14 @@ bool CheckTxInputs(const CTransaction& tx, CValidationState& state, const CCoins
         // Are the shielded spends' requirements met?
         auto unmetShieldedReq = inputs.HaveShieldedRequirements(tx);
         if (unmetShieldedReq) {
+            auto txid = tx.GetHash().ToString();
             auto rejectCode = ShieldedReqRejectCode(*unmetShieldedReq);
             auto rejectReason = ShieldedReqRejectReason(*unmetShieldedReq);
-            return state.Invalid(error("CheckInputs(): %s shielded requirements not met (%s)", tx.GetHash().ToString(), rejectReason),
-                                 rejectCode, rejectReason);
+            TracingError(
+                "main", "CheckInputs(): shielded requirements not met",
+                "txid", txid.c_str(),
+                "reason", rejectReason.c_str());
+            return state.Invalid(false, rejectCode, rejectReason);
         }
 
         CAmount nValueIn = 0;
@@ -2895,10 +2903,14 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
             // Are the shielded spends' requirements met?
             auto unmetShieldedReq = view.HaveShieldedRequirements(tx);
             if (unmetShieldedReq) {
+                auto txid = tx.GetHash().ToString();
                 auto rejectCode = ShieldedReqRejectCode(*unmetShieldedReq);
                 auto rejectReason = ShieldedReqRejectReason(*unmetShieldedReq);
-                return state.DoS(100, error("ConnectBlock(): shielded requirements not met (%s)", rejectReason),
-                                 rejectCode, rejectReason);
+                TracingError(
+                    "main", "ConnectBlock(): shielded requirements not met",
+                    "txid", txid.c_str(),
+                    "reason", rejectReason.c_str());
+                return state.DoS(100, false, rejectCode, rejectReason);
             }
 
             // insightexplorer