Skip to content

fix: partially revert 6730 #6767

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

Merged
merged 1 commit into from
Jul 22, 2025
Merged

fix: partially revert 6730 #6767

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/evo/specialtxman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,9 +587,8 @@ bool CSpecialTxProcessor::ProcessSpecialTxsInBlock(const CBlock& block, const CB
LogPrint(BCLog::BENCHMARK, " - m_qblockman: %.2fms [%.2fs]\n", 0.001 * (nTime5 - nTime4),
nTimeQuorum * 0.000001);


if (opt_cbTx.has_value() && pindex->pprev) {
CDeterministicMNList mn_list;
CDeterministicMNList mn_list;
if (DeploymentActiveAt(*pindex, m_consensus_params, Consensus::DEPLOYMENT_DIP0003)) {
if (!BuildNewListFromBlock(block, pindex->pprev, view, true, state, mn_list)) {
// pass the state returned by the function above
return false;
Expand All @@ -600,13 +599,15 @@ bool CSpecialTxProcessor::ProcessSpecialTxsInBlock(const CBlock& block, const CB
// pass the state returned by the function above
return false;
}
}

int64_t nTime5_1 = GetTimeMicros();
nTimeDMN += nTime5_1 - nTime5;

LogPrint(BCLog::BENCHMARK, " - m_dmnman: %.2fms [%.2fs]\n", 0.001 * (nTime5_1 - nTime5),
nTimeDMN * 0.000001);

if (opt_cbTx.has_value()) {
uint256 calculatedMerkleRoot;
if (!CalcCbTxMerkleRootMNList(calculatedMerkleRoot, CSimplifiedMNList{std::move(mn_list)}, state)) {
// pass the state returned by the function above
Expand Down
Loading