From 024d272eb9701c9230edfd53d6addcf5c73e3f04 Mon Sep 17 00:00:00 2001 From: pasta Date: Thu, 18 Jul 2024 10:54:29 -0500 Subject: [PATCH] Merge #6126: feat: enable EHF activation of MN_RR on mainnet a8a3ea0e90ef469453d8d470a6028870f919a6bf 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 a8a3ea0e90ef469453d8d470a6028870f919a6bf PastaPastaPasta: utACK a8a3ea0e90ef469453d8d470a6028870f919a6bf Tree-SHA512: 0ae7aecca8463436e952154210cf564333cd77dd1149f7ff88ca144f3b7c434e75e473ea3a6850da1b126efd8a9cece34e46b4bf2b37f5937bcf1f5780e18f50 --- src/llmq/ehf_signals.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/llmq/ehf_signals.cpp b/src/llmq/ehf_signals.cpp index d4bb632403..7dd42bf2a4 100644 --- a/src/llmq/ehf_signals.cpp +++ b/src/llmq/ehf_signals.cpp @@ -52,10 +52,6 @@ void CEHFSignalsHandler::UpdatedBlockTip(const CBlockIndex* const pindexNew, boo 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); for (const auto& deployment : Params().GetConsensus().vDeployments) { // 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) { - 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) { g_txindex->BlockUntilSyncedToCurrentChain(); }