activate chainparams for changing Tip() properly - WIP

dashpay · Jul 25, 2023 · 330dcdd · 330dcdd
1 parent b3eaae3
commit 330dcdd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/evo/mnhftx.cpp b/src/evo/mnhftx.cpp
@@ -212,6 +212,7 @@ void CMNHFManager::UpdateChainParams(const CBlockIndex* const pindex)
 
 CMNHFManager::Signals CMNHFManager::GetFromCache(const CBlockIndex* const pindex)
 {
+    if (pindex == nullptr) return {};
     const uint256& blockHash = pindex->GetBlockHash();
     Signals signals{};
     {

diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -244,6 +244,7 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
     if (!::ChainstateActive().LoadGenesisBlock()) {
         throw std::runtime_error("LoadGenesisBlock failed.");
     }
+//    m_node.mnhf_manager->UpdateChainParams(m_node.chainman->ActiveTip());
 
     m_node.banman = std::make_unique<BanMan>(GetDataDir() / "banlist.dat", nullptr, DEFAULT_MISBEHAVING_BANTIME);
     m_node.peerman = PeerManager::make(chainparams, *m_node.connman, *m_node.addrman, m_node.banman.get(),

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -51,6 +51,7 @@
 #include <masternode/sync.h>
 
 #include <evo/evodb.h>
+#include <evo/mnhftx.h>
 #include <evo/specialtx.h>
 #include <evo/specialtxman.h>
 #include <governance/governance.h>
@@ -2959,6 +2960,9 @@ bool CChainState::ConnectTip(BlockValidationState& state, CBlockIndex* pindexNew
     if (!FlushStateToDisk(state, FlushStateMode::IF_NEEDED)) {
         return false;
     }
+
+    //int64_t nTime_;
+    m_mnhfManager.UpdateChainParams(pindexNew);
     int64_t nTime5 = GetTimeMicros(); nTimeChainState += nTime5 - nTime4;
     LogPrint(BCLog::BENCHMARK, "  - Writing chainstate: %.2fms [%.2fs (%.2fms/blk)]\n", (nTime5 - nTime4) * MILLI, nTimeChainState * MICRO, nTimeChainState * MILLI / nBlocksTotal);
     // Remove conflicting transactions from the mempool.;