diff --git a/src/miner.cpp b/src/miner.cpp index 9f18d94689..cdd0b038d6 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -135,7 +135,7 @@ std::unique_ptr BlockAssembler::CreateNewBlock(const CScript& sc bool fDIP0003Active_context = DeploymentActiveAfter(pindexPrev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_DIP0003); bool fDIP0008Active_context = DeploymentActiveAfter(pindexPrev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_DIP0008); - bool fV20Active_context = llmq::utils::IsV20Active(pindexPrev); + const bool fV20Active_context{DeploymentActiveAfter(pindexPrev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_V20)}; pblock->nVersion = g_versionbitscache.ComputeBlockVersion(pindexPrev, chainparams.GetConsensus()); // Non-mainnet only: allow overriding block.nVersion with @@ -402,7 +402,7 @@ void BlockAssembler::addPackageTxs(int &nPackagesSelected, int &nDescendantsUpda // This credit pool is used only to check withdrawal limits and to find // duplicates of indexes. There's used `BlockSubsidy` equaled to 0 std::optional creditPoolDiff; - if (llmq::utils::IsV20Active(pindexPrev)) { + if (DeploymentActiveAfter(pindexPrev, chainparams.GetConsensus(), Consensus::DEPLOYMENT_V20)) { CCreditPool creditPool = creditPoolManager->GetCreditPool(pindexPrev, chainparams.GetConsensus()); creditPoolDiff.emplace(std::move(creditPool), pindexPrev, chainparams.GetConsensus(), 0); }