fix: preserve multipayout state across revocation

Author: PastaPastaPasta

src/evo/providertx.cpp

@@ -76,7 +76,8 @@ bool IsPayoutListTriviallyValid(const MasternodePayoutShares& payouts, const CKe
         if (!ExtractDestination(payout.scriptPayout, payout_dest)) {
             return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-payee-dest");
         }
-        if (payout_dest == CTxDestination(PKHash(keyIDOwner)) || payout_dest == CTxDestination(PKHash(keyIDVoting))) {
+        if ((!keyIDOwner.IsNull() && payout_dest == CTxDestination(PKHash(keyIDOwner))) ||
+            payout_dest == CTxDestination(PKHash(keyIDVoting))) {
             return state.Invalid(TxValidationResult::TX_BAD_SPECIAL, "bad-protx-payee-reuse");
         }
     }

src/evo/specialtxman.cpp

@@ -492,7 +492,11 @@ bool CSpecialTxProcessor::RebuildListFromBlock(const CBlock& block, gsl::not_nul
                 return state.Invalid(BlockValidationResult::BLOCK_CONSENSUS, "bad-protx-hash");
             }
             auto newState = std::make_shared<CDeterministicMNState>(*dmn->pdmnState);
+            const uint16_t old_version{static_cast<uint16_t>(newState->nVersion)};
             newState->ResetOperatorFields();
+            if (old_version >= ProTxVersion::MultiPayout && !SetStateVersion(*newState, old_version, dmn->nType, state)) {
+                return false;
+            }
             newState->BanIfNotBanned(nHeight);
             newState->nRevocationReason = opt_proTx->nReason;
 

src/test/evo_trivialvalidation.cpp

@@ -180,6 +180,7 @@ BOOST_AUTO_TEST_CASE(multipayout_list_validation)
     CheckPayouts({{CScript() << OP_RETURN, 10000}}, owner_id, voting_id, "bad-protx-payee");
     CheckPayouts({{GetScriptForDestination(PKHash(owner_id)), 10000}}, owner_id, voting_id, "bad-protx-payee-reuse");
     CheckPayouts({{GetScriptForDestination(PKHash(voting_id)), 10000}}, owner_id, voting_id, "bad-protx-payee-reuse");
+    CheckPayouts({{GetScriptForDestination(PKHash(CKeyID{})), 10000}}, CKeyID{}, voting_id, std::nullopt);
 
     TxValidationState state;
     BOOST_CHECK(!IsPayoutListKeySafe({{payout1, 10000}}, CTxDestination(PKHash(payout_key1.GetPubKey().GetID())),

test/functional/feature_masternode_payout_shares.py

@@ -216,6 +216,18 @@ def shortpay_payout2(coinbase):
             assert_equal(payee["amount"], expected_amount)
             paid_owner_total += payee["amount"]
 
+        node.sendtoaddress(mn.fundsAddr, 1)
+        self.bump_mocktime(10 * 60 + 1)
+        self.generate(node, 1, sync_fun=self.no_op)
+        revoke_hash = mn.revoke(node, submit=True, reason=1, fundsAddr=mn.fundsAddr)
+        assert revoke_hash is not None
+        self.bump_mocktime(10 * 60 + 1)
+        self.generate(node, 1, sync_fun=self.no_op)
+
+        info = node.protx("info", protx_hash)
+        assert_equal(info["state"]["version"], 4)
+        assert_equal(payout_address_rewards(info["state"]["payouts"]), updated_payouts)
+
 
 if __name__ == '__main__':
     MasternodePayoutSharesTest().main()