From 0bd5e8d01b60e496f1fa516610b2dc7d253a2f25 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 3 Apr 2026 23:58:12 +0300
Subject: [PATCH 1/2] fix: sync txindex in FuncVerifyDB before querying
 non-coinbase tx

FuncVerifyDB mines tx_collateral in a block via ProcessNewBlock, then
later CreateProUpRevTx looks it up via GetTransaction/g_txindex.
Unlike coinbase txns (indexed during initial chain setup), tx_collateral
is only indexed asynchronously by the txindex background thread. Without
an explicit IndexWaitSynced, the lookup can race and intermittently fail
with "critical check txFrom has failed".

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/test/evo_deterministicmns_tests.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/evo_deterministicmns_tests.cpp b/src/test/evo_deterministicmns_tests.cpp
index af286a51f148..5e29f7466332 100644
--- a/src/test/evo_deterministicmns_tests.cpp
+++ b/src/test/evo_deterministicmns_tests.cpp
@@ -6,6 +6,7 @@
 
 #include <chainparams.h>
 #include <consensus/validation.h>
+#include <index/txindex.h>
 #include <deploymentstatus.h>
 #include <evo/deterministicmns.h>
 #include <evo/providertx.h>
@@ -20,6 +21,7 @@
 #include <script/sign.h>
 #include <script/signingprovider.h>
 #include <script/standard.h>
+#include <test/util/index.h>
 #include <test/util/txmempool.h>
 #include <txmempool.h>
 #include <validation.h>
@@ -38,6 +40,7 @@ static SimpleUTXOMap BuildSimpleUtxoMap(const std::vector<CTransactionRef>& txs)
     for (size_t i = 0; i < txs.size(); i++) {
         auto& tx = txs[i];
         for (size_t j = 0; j < tx->vout.size(); j++) {
+            if (tx->vout[j].scriptPubKey.IsUnspendable()) continue;
             utxos.emplace(COutPoint(tx->GetHash(), j), std::make_pair((int)i + 1, tx->vout[j].nValue));
         }
     }
@@ -782,6 +785,9 @@ void FuncVerifyDB(TestChainSetup& setup)
 
     auto block = std::make_shared<CBlock>(setup.CreateBlock({tx_collateral}, coinbase_pk, chainman.ActiveChainstate()));
     BOOST_REQUIRE(chainman.ProcessNewBlock(block, true, nullptr));
+    // tx_collateral is looked up later via GetTransaction/g_txindex (in CreateProUpRevTx),
+    // ensure the txindex has indexed this block before that happens
+    IndexWaitSynced(*g_txindex);
     dmnman.UpdatedBlockTip(chainman.ActiveChain().Tip());
     BOOST_CHECK_EQUAL(chainman.ActiveChain().Height(), nHeight + 1);
     BOOST_CHECK_EQUAL(block->GetHash(), chainman.ActiveChain().Tip()->GetBlockHash());

From 74056e951bdf708affea792f1ad35c4840030bee Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Fri, 3 Apr 2026 23:59:01 +0300
Subject: [PATCH 2/2] fix: skip unspendable outputs in BuildSimpleUtxoMap

Dash coinbase transactions can include OP_RETURN outputs (e.g. credit
pool payments when V20+MN_RR are active). BuildSimpleUtxoMap was adding
these to the UTXO map, allowing SelectUTXOs to pick them as transaction
inputs which would then fail signature verification.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 src/test/block_reward_reallocation_tests.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/block_reward_reallocation_tests.cpp b/src/test/block_reward_reallocation_tests.cpp
index 97c29c62c9d0..35c0ce19b884 100644
--- a/src/test/block_reward_reallocation_tests.cpp
+++ b/src/test/block_reward_reallocation_tests.cpp
@@ -47,6 +47,7 @@ static SimpleUTXOMap BuildSimpleUtxoMap(const std::vector<CTransactionRef>& txs)
     SimpleUTXOMap utxos;
     for (auto [i, tx] : std23::views::enumerate(txs)) {
         for (auto [j, output] : std23::views::enumerate(tx->vout)) {
+            if (output.scriptPubKey.IsUnspendable()) continue;
             utxos.try_emplace(COutPoint(tx->GetHash(), j), std::make_pair((int)i + 1, output.nValue));
         }
     }