Skip to content

fix: resolve flaky verify_db_legacy test and skip unspendable outputs in test UTXO map #7266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
UdjinM6 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix: resolve flaky verify_db_legacy test and skip unspendable outputs in test UTXO map #7266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bd5e8d
fix: sync txindex in FuncVerifyDB before querying non-coinbase tx
UdjinM6 Apr 3, 2026
74056e9
fix: skip unspendable outputs in BuildSimpleUtxoMap
UdjinM6 Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/test/block_reward_reallocation_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
Expand Down
6 changes: 6 additions & 0 deletions src/test/evo_deterministicmns_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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));
}
}
Expand Down Expand Up @@ -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());
Expand Down
Loading