feat: enable EHF activation of MN_RR on mainnet

knst · knst · commit a8a3ea0e90ef · 2024-07-18T12:48:55.000+07:00
diff --git 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();
     }

Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,6 @@ void CEHFSignalsHandler::UpdatedBlockTip(const CBlockIndex* const pindexNew, boo`
`52`	`52`	`return;`
`53`	`53`	`}`
`54`	`54`
`55`		`- if (Params().NetworkIDString() == CBaseChainParams::MAIN) {`
`56`		`- // 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`
`57`		`- return;`
`58`		`- }`
`59`	`55`	`const auto ehfSignals = mnhfman.GetSignalsStage(pindexNew);`
`60`	`56`	`for (const auto& deployment : Params().GetConsensus().vDeployments) {`
`61`	`57`	`// Skip deployments that do not use dip0023`
`@@ -102,10 +98,6 @@ void CEHFSignalsHandler::trySignEHFSignal(int bit, const CBlockIndex* const pind`
`102`	`98`
`103`	`99`	`void CEHFSignalsHandler::HandleNewRecoveredSig(const CRecoveredSig& recoveredSig)`
`104`	`100`	`{`
`105`		`- if (Params().NetworkIDString() == CBaseChainParams::MAIN) {`
`106`		`- // 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`
`107`		`- return;`
`108`		`- }`
`109`	`101`	`if (g_txindex) {`
`110`	`102`	`g_txindex->BlockUntilSyncedToCurrentChain();`
`111`	`103`	`}`