Skip to content

Commit 17c792c

Browse files
committed
Remove MN upgrade check in ComputeBlockVersion
Has to be replaced with something new in the future.
1 parent 71a6951 commit 17c792c

File tree

1 file changed

+1
-29
lines changed

1 file changed

+1
-29
lines changed

src/validation.cpp

+1-29
Original file line numberDiff line numberDiff line change
@@ -1828,35 +1828,7 @@ int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Para
18281828
ThresholdState state = VersionBitsState(pindexPrev, params, pos, versionbitscache);
18291829
const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];
18301830
if (vbinfo.check_mn_protocol && state == THRESHOLD_STARTED && fCheckMasternodesUpgraded) {
1831-
if (deterministicMNManager->IsDIP3Active()) {
1832-
auto mnList = deterministicMNManager->GetListForBlock(pindexPrev->GetBlockHash());
1833-
auto payee = mnList.GetMNPayee();
1834-
if (!payee) {
1835-
continue;
1836-
}
1837-
} else {
1838-
std::vector<CTxOut> voutMasternodePayments;
1839-
masternode_info_t mnInfo;
1840-
if (!mnpayments.GetBlockTxOuts(pindexPrev->nHeight + 1, 0, voutMasternodePayments)) {
1841-
// no votes for this block
1842-
continue;
1843-
}
1844-
bool mnKnown = false;
1845-
for (const auto& txout : voutMasternodePayments) {
1846-
if (mnodeman.GetMasternodeInfo(txout.scriptPubKey, mnInfo)) {
1847-
mnKnown = true;
1848-
break;
1849-
}
1850-
}
1851-
if (!mnKnown) {
1852-
// unknown masternode
1853-
continue;
1854-
}
1855-
if (mnInfo.nProtocolVersion < DMN_PROTO_VERSION) {
1856-
// masternode is not upgraded yet
1857-
continue;
1858-
}
1859-
}
1831+
// TODO implement new logic for MN upgrade checks (e.g. with LLMQ based feature/version voting)
18601832
}
18611833
if (state == THRESHOLD_LOCKED_IN || state == THRESHOLD_STARTED) {
18621834
nVersion |= VersionBitsMask(params, (Consensus::DeploymentPos)i);

0 commit comments

Comments
 (0)