sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: early EHF and buried EHF are indistinguish

Browse Source
This commit is contained in:
Konstantin Akimov 2024-11-27 17:13:30 +07:00
parent 8a05f0caaa
commit 7a7c9f12a4
No known key found for this signature in database
GPG Key ID: 2176C4A5D01EA524
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/evo/mnhftx.cpp
View File

@ -23,7 +23,7 @@
#include <vector> #include <vector>
static const std::string MNEHF_REQUESTID_PREFIX = "mnhf"; static const std::string MNEHF_REQUESTID_PREFIX = "mnhf";
static const std::string DB_SIGNALS = "mnhf_s"; static const std::string DB_SIGNALS_v2 = "mnhf_s2";
uint256 MNHFTxPayload::GetRequestId() const uint256 MNHFTxPayload::GetRequestId() const
{ {
@ -57,34 +57,32 @@ CMNHFManager::Signals CMNHFManager::GetSignalsStage(const CBlockIndex* const pin
{ {
if (!DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V20)) return {}; if (!DeploymentActiveAfter(pindexPrev, Params().GetConsensus(), Consensus::DEPLOYMENT_V20)) return {};
Signals signals = GetForBlock(pindexPrev); Signals signals_tmp = GetForBlock(pindexPrev);
if (pindexPrev == nullptr) return {}; if (pindexPrev == nullptr) return {};
const int height = pindexPrev->nHeight + 1; const int height = pindexPrev->nHeight + 1;
for (auto it = signals.begin(); it != signals.end(); ) {
bool found{false}; Signals signals_ret;
const auto signal_pindex = pindexPrev->GetAncestor(it->second);
for (auto signal : signals_tmp) {
bool expired{false};
const auto signal_pindex = pindexPrev->GetAncestor(signal.second);
assert(signal_pindex != nullptr); assert(signal_pindex != nullptr);
const int64_t signal_time = signal_pindex->GetMedianTimePast(); const int64_t signal_time = signal_pindex->GetMedianTimePast();
for (int index = 0; index < Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++index) { for (int index = 0; index < Consensus::MAX_VERSION_BITS_DEPLOYMENTS; ++index) {
const auto& deployment = Params().GetConsensus().vDeployments[index]; const auto& deployment = Params().GetConsensus().vDeployments[index];
if (deployment.bit != it->first) continue; if (deployment.bit != signal.first) continue;
if (signal_time < deployment.nStartTime) { if (signal_time < deployment.nStartTime) {
// new deployment is using the same bit as the old one // new deployment is using the same bit as the old one
LogPrintf("CMNHFManager::GetSignalsStage: mnhf signal bit=%d height:%d is expired at height=%d\n", it->first, it->second, height); LogPrintf("CMNHFManager::GetSignalsStage: mnhf signal bit=%d height:%d is expired at height=%d\n", signal.first, signal.second, height);
it = signals.erase(it); expired = true;
} else {
++it;
}
found = true;
break;
}
if (!found) {
// no deployment means we buried it and aren't using the same bit (yet)
LogPrintf("CMNHFManager::GetSignalsStage: mnhf signal bit=%d height:%d is not known at height=%d\n", it->first, it->second, height);
it = signals.erase(it);
} }
} }
return signals; if (!expired) {
signals_ret.insert(signal);
}
}
return signals_ret;
} }
bool MNHFTx::Verify(const llmq::CQuorumManager& qman, const uint256& quorumHash, const uint256& requestId, const uint256& msgHash, TxValidationState& state) const bool MNHFTx::Verify(const llmq::CQuorumManager& qman, const uint256& quorumHash, const uint256& requestId, const uint256& msgHash, TxValidationState& state) const
@ -287,6 +285,9 @@ CMNHFManager::Signals CMNHFManager::GetForBlock(const CBlockIndex* pindex)
const Consensus::Params& consensusParams{Params().GetConsensus()}; const Consensus::Params& consensusParams{Params().GetConsensus()};
while (!to_calculate.empty()) { while (!to_calculate.empty()) {
const CBlockIndex* pindex_top{to_calculate.top()}; const CBlockIndex* pindex_top{to_calculate.top()};
if (pindex_top->nHeight % 1000 == 0) {
LogPrintf("re-index EHF signals at block %d\n", pindex_top->nHeight);
}
CBlock block; CBlock block;
if (!ReadBlockFromDisk(block, pindex_top, consensusParams)) { if (!ReadBlockFromDisk(block, pindex_top, consensusParams)) {
throw std::runtime_error("failed-getehfforblock-read"); throw std::runtime_error("failed-getehfforblock-read");
@ -328,7 +329,7 @@ std::optional<CMNHFManager::Signals> CMNHFManager::GetFromCache(const CBlockInde
return signals; return signals;
} }
} }
if (m_evoDb.Read(std::make_pair(DB_SIGNALS, blockHash), signals)) { if (m_evoDb.Read(std::make_pair(DB_SIGNALS_v2, blockHash), signals)) {
LOCK(cs_cache); LOCK(cs_cache);
mnhfCache.insert(blockHash, signals); mnhfCache.insert(blockHash, signals);
return signals; return signals;
@ -346,7 +347,7 @@ void CMNHFManager::AddToCache(const Signals& signals, const CBlockIndex* const p
} }
if (!DeploymentActiveAt(*pindex, Params().GetConsensus(), Consensus::DEPLOYMENT_V20)) return; if (!DeploymentActiveAt(*pindex, Params().GetConsensus(), Consensus::DEPLOYMENT_V20)) return;
m_evoDb.Write(std::make_pair(DB_SIGNALS, blockHash), signals); m_evoDb.Write(std::make_pair(DB_SIGNALS_v2, blockHash), signals);
} }
void CMNHFManager::AddSignal(const CBlockIndex* const pindex, int bit) void CMNHFManager::AddSignal(const CBlockIndex* const pindex, int bit)