Merge #6126: feat: enable EHF activation of MN_RR on mainnet

a8a3ea0e90 feat: enable EHF activation of MN_RR on mainnet (Konstantin Akimov)

Pull request description:

  ## Issue being fixed or feature implemented
  https://github.com/dashpay/dash/issues/6081

  ## What was done?
  Removed a code, that disabled MN_RR activation with EHF on Main Net

  ## How Has This Been Tested?
  This code is tested on devnet, is in process of testing on testnet.

  ## Breaking Changes
  It make MN_RR possible to get active on mainnet.

  ## Checklist:
  - [x] 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
  - [x] I have assigned this pull request to a milestone

ACKs for top commit:
  UdjinM6:
    utACK a8a3ea0e90
  PastaPastaPasta:
    utACK a8a3ea0e90

Tree-SHA512: 0ae7aecca8463436e952154210cf564333cd77dd1149f7ff88ca144f3b7c434e75e473ea3a6850da1b126efd8a9cece34e46b4bf2b37f5937bcf1f5780e18f50
This commit is contained in:
pasta 2024-07-18 10:54:29 -05:00
parent e780b3d48d
commit 024d272eb9
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984

View File

@ -52,10 +52,6 @@ void CEHFSignalsHandler::UpdatedBlockTip(const CBlockIndex* const pindexNew, boo
return; return;
} }
if (Params().NetworkIDString() == CBaseChainParams::MAIN) {
// TODO: v20 will never attempt to create EHF messages on main net; if this is needed it will be done by v20.1 or v21 nodes
return;
}
const auto ehfSignals = mnhfman.GetSignalsStage(pindexNew); const auto ehfSignals = mnhfman.GetSignalsStage(pindexNew);
for (const auto& deployment : Params().GetConsensus().vDeployments) { for (const auto& deployment : Params().GetConsensus().vDeployments) {
// Skip deployments that do not use dip0023 // Skip deployments that do not use dip0023
@ -102,10 +98,6 @@ void CEHFSignalsHandler::trySignEHFSignal(int bit, const CBlockIndex* const pind
void CEHFSignalsHandler::HandleNewRecoveredSig(const CRecoveredSig& recoveredSig) void CEHFSignalsHandler::HandleNewRecoveredSig(const CRecoveredSig& recoveredSig)
{ {
if (Params().NetworkIDString() == CBaseChainParams::MAIN) {
// TODO: v20 will never attempt to create EHF messages on main net; if this is needed it will be done by v20.1 or v21 nodes
return;
}
if (g_txindex) { if (g_txindex) {
g_txindex->BlockUntilSyncedToCurrentChain(); g_txindex->BlockUntilSyncedToCurrentChain();
} }