fix: gate payout collateral reuse checks to multipayout

Author: PastaPastaPasta

src/evo/providertx.cpp

@@ -88,17 +88,20 @@ bool IsPayoutListTriviallyValid(const MasternodePayoutShares& payouts, const CKe
 }
 
 bool IsPayoutListKeySafe(const MasternodePayoutShares& payouts, const CTxDestination& collateral_dest,
-                         const CKeyID& keyIDOwner, const CKeyID& keyIDVoting, TxValidationState& state)
+                         const CKeyID& keyIDOwner, const CKeyID& keyIDVoting,
+                         bool check_payout_collateral_reuse, TxValidationState& state)
 {
     if (collateral_dest == CTxDestination(PKHash(keyIDOwner)) ||
         collateral_dest == CTxDestination(PKHash(keyIDVoting))) {
         return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-collateral-reuse");
     }
 
-    for (const auto& payout : payouts) {
-        CTxDestination payout_dest;
-        if (ExtractDestination(payout.scriptPayout, payout_dest) && payout_dest == collateral_dest) {
-            return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-payee-reuse");
+    if (check_payout_collateral_reuse) {
+        for (const auto& payout : payouts) {
+            CTxDestination payout_dest;
+            if (ExtractDestination(payout.scriptPayout, payout_dest) && payout_dest == collateral_dest) {
+                return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-payee-reuse");
+            }
         }
     }
     return true;

src/evo/providertx.h

@@ -100,7 +100,8 @@ using MasternodePayoutShares = std::vector<CMasternodePayoutShare>;
 [[nodiscard]] bool IsPayoutListTriviallyValid(const MasternodePayoutShares& payouts, const CKeyID& keyIDOwner,
                                               const CKeyID& keyIDVoting, TxValidationState& state);
 [[nodiscard]] bool IsPayoutListKeySafe(const MasternodePayoutShares& payouts, const CTxDestination& collateral_dest,
-                                       const CKeyID& keyIDOwner, const CKeyID& keyIDVoting, TxValidationState& state);
+                                       const CKeyID& keyIDOwner, const CKeyID& keyIDVoting,
+                                       bool check_payout_collateral_reuse, TxValidationState& state);
 [[nodiscard]] std::string PayoutListToString(const MasternodePayoutShares& payouts);
 [[nodiscard]] UniValue PayoutListToJson(const MasternodePayoutShares& payouts);
 

src/evo/specialtxman.cpp

@@ -1067,7 +1067,8 @@ bool CheckProRegTx(const CTransaction& tx, gsl::not_null<const CBlockIndex*> pin
     // don't allow reuse of collateral key for other keys (don't allow people to put the collateral key onto an online server)
     // this check applies to internal and external collateral, but internal collaterals are not necessarily a P2PKH
     if (!IsPayoutListKeySafe(GetOwnerPayouts(opt_ptx->nVersion, opt_ptx->scriptPayout, opt_ptx->payouts),
-                             collateralTxDest, opt_ptx->keyIDOwner, opt_ptx->keyIDVoting, state)) return false;
+                             collateralTxDest, opt_ptx->keyIDOwner, opt_ptx->keyIDVoting,
+                             opt_ptx->nVersion >= ProTxVersion::MultiPayout, state)) return false;
 
     if (pindexPrev) {
         auto mnList = dmnman.GetListForBlock(pindexPrev);
@@ -1243,7 +1244,8 @@ bool CheckProUpRegTx(const CTransaction& tx, gsl::not_null<const CBlockIndex*> p
     if (!ExtractDestination(coin.out.scriptPubKey, collateralTxDest)) {
         return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-collateral-dest");
     }
-    if (!IsPayoutListKeySafe(owner_payouts, collateralTxDest, dmn->pdmnState->keyIDOwner, opt_ptx->keyIDVoting, state)) return false;
+    if (!IsPayoutListKeySafe(owner_payouts, collateralTxDest, dmn->pdmnState->keyIDOwner, opt_ptx->keyIDVoting,
+                             opt_ptx->nVersion >= ProTxVersion::MultiPayout, state)) return false;
 
     if (mnList.HasUniqueProperty(opt_ptx->pubKeyOperator)) {
         auto otherDmn = mnList.GetUniquePropertyMN(opt_ptx->pubKeyOperator);

src/test/evo_trivialvalidation.cpp

@@ -183,14 +183,18 @@ BOOST_AUTO_TEST_CASE(multipayout_list_validation)
 
     TxValidationState state;
     BOOST_CHECK(!IsPayoutListKeySafe({{payout1, 10000}}, CTxDestination(PKHash(payout_key1.GetPubKey().GetID())),
-                                     owner_id, voting_id, state));
+                                     owner_id, voting_id, /*check_payout_collateral_reuse=*/true, state));
     BOOST_CHECK_EQUAL(state.GetRejectReason(), "bad-protx-payee-reuse");
+    state = TxValidationState{};
+    BOOST_CHECK(IsPayoutListKeySafe({{payout1, 10000}}, CTxDestination(PKHash(payout_key1.GetPubKey().GetID())),
+                                    owner_id, voting_id, /*check_payout_collateral_reuse=*/false, state));
 
     CScript p2sh_collateral = GetScriptForDestination(ScriptHash(payout1));
     CTxDestination p2sh_dest;
     BOOST_CHECK(ExtractDestination(p2sh_collateral, p2sh_dest));
     state = TxValidationState{};
-    BOOST_CHECK(!IsPayoutListKeySafe({{p2sh_collateral, 10000}}, p2sh_dest, owner_id, voting_id, state));
+    BOOST_CHECK(!IsPayoutListKeySafe({{p2sh_collateral, 10000}}, p2sh_dest, owner_id, voting_id,
+                                     /*check_payout_collateral_reuse=*/true, state));
     BOOST_CHECK_EQUAL(state.GetRejectReason(), "bad-protx-payee-reuse");
 }