Merge dashpay#6767: fix: partially revert 6730

b0416e2 fix: we must always build new mn lists from blocks once dip0003 is active (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  dashpay@1011f6b broke `develop` - can't sync from genesis or reindex atm. The reason is that `opt_cbTx == nullopt` below `assumevalid` but we must always build/process mn lists after dip0003 activation.

  ## What was done?
  Partially revert that commit. I'm keeping it small intentionally, will refactor in a follow-up PR.

  ## How Has This Been Tested?
  reindex, sync from scratch

  ## Breaking Changes
  n/a

  ## Checklist:
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  knst:
    utACK b0416e2
  PastaPastaPasta:
    utACK b0416e2

Tree-SHA512: 958a6282c404f0adb18c7f8e7110544e564a3df7228023930c59adfc8930bf826e8aff73c507950ef9032fcda9c955332b48939ca7e4d280b6b0ff5f15821ea9

Author: PastaPastaPasta

src/evo/specialtxman.cpp

@@ -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;
@@ -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