[Refactoring] Skip expensive ContainsZerocoins/HasZerocoinSpendInputs

random-zebra · random-zebra · commit f91e4df947c7 · 2021-07-25T20:31:54.000+02:00
...calls in ConnectBlock when possible.

The check at line 2798 in CheckBlock ensures that no zc tx (either mint
or spend) is accepted in the chain after v5 activation.
`ContainsZerocoins`/`HasZerocoinSpendInputs` are expensive functions,
especially when they return `false` (as they need to go through all
inputs and outputs).
Therefore avoid the duplicated check in ConnectBlock, and, instead, use
the shortcut operator to skip HasZerocoinSpendInputs call after v5
enforcement.
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1549,12 +1549,9 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
             return state.DoS(100, error("%s : shielded transactions are currently in maintenance mode", __func__));
         }
 
-        // If v5 is active, bye bye zerocoin
-        if (isV5UpgradeEnforced && tx.ContainsZerocoins()) {
-            return state.DoS(100, error("%s : v5 upgrade enforced, zerocoin disabled", __func__));
-        }
-
-        if (tx.HasZerocoinSpendInputs()) {
+        // When v5 is enforced CheckBlock rejects zerocoin transactions.
+        // Therefore no need to call HasZerocoinSpendInputs after the enforcement.
+        if (!isV5UpgradeEnforced && tx.HasZerocoinSpendInputs()) {
             auto opCoinSpendValues = ParseAndValidateZerocoinSpends(consensus, tx, pindex->nHeight, state);
             if (!opCoinSpendValues) {
                 return false; // Invalidity/DoS is handled by ParseAndValidateZerocoinSpends.
