From 6c79c348ee1418c1f349fe1527820487bc5e4786 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Wed, 6 Jun 2018 19:06:23 +0300 Subject: [PATCH] Drop "MAY, 2018" clause for proposal validation on mainnet (#2101) --- src/governance-object.cpp | 3 +-- src/governance.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/governance-object.cpp b/src/governance-object.cpp index 9def59a75..8ef5bf56d 100644 --- a/src/governance-object.cpp +++ b/src/governance-object.cpp @@ -470,8 +470,7 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast // Note: It's ok to have expired proposals // they are going to be cleared by CGovernanceManager::UpdateCachesAndClean() // TODO: should they be tagged as "expired" to skip vote downloading? - // DO NOT USE THIS UNTIL MAY, 2018 on mainnet - if ((GetAdjustedTime() >= 1526423380 || Params().NetworkIDString() != CBaseChainParams::MAIN) && !validator.Validate(false)) { + if (!validator.Validate(false)) { strError = strprintf("Invalid proposal data, error messages: %s", validator.GetErrorMessages()); return false; } diff --git a/src/governance.cpp b/src/governance.cpp index df62ca276..983435d3c 100644 --- a/src/governance.cpp +++ b/src/governance.cpp @@ -450,8 +450,7 @@ void CGovernanceManager::UpdateCachesAndClean() mapObjects.erase(it++); } else { // NOTE: triggers are handled via triggerman - // DO NOT USE THIS UNTIL MAY, 2018 on mainnet - if ((GetAdjustedTime() >= 1526423380 || Params().NetworkIDString() != CBaseChainParams::MAIN) && pObj->GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) { + if (pObj->GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) { CProposalValidator validator(pObj->GetDataAsHexString()); if (!validator.Validate()) { LogPrintf("CGovernanceManager::UpdateCachesAndClean -- set for deletion expired obj %s\n", (*it).first.ToString());