Skip to content

Commit 6c79c34

Browse files
authored
Drop "MAY, 2018" clause for proposal validation on mainnet (#2101)
1 parent 6079b86 commit 6c79c34

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/governance-object.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,7 @@ bool CGovernanceObject::IsValidLocally(std::string& strError, bool& fMissingMast
470470
// Note: It's ok to have expired proposals
471471
// they are going to be cleared by CGovernanceManager::UpdateCachesAndClean()
472472
// TODO: should they be tagged as "expired" to skip vote downloading?
473-
// DO NOT USE THIS UNTIL MAY, 2018 on mainnet
474-
if ((GetAdjustedTime() >= 1526423380 || Params().NetworkIDString() != CBaseChainParams::MAIN) && !validator.Validate(false)) {
473+
if (!validator.Validate(false)) {
475474
strError = strprintf("Invalid proposal data, error messages: %s", validator.GetErrorMessages());
476475
return false;
477476
}

src/governance.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,8 +450,7 @@ void CGovernanceManager::UpdateCachesAndClean()
450450
mapObjects.erase(it++);
451451
} else {
452452
// NOTE: triggers are handled via triggerman
453-
// DO NOT USE THIS UNTIL MAY, 2018 on mainnet
454-
if ((GetAdjustedTime() >= 1526423380 || Params().NetworkIDString() != CBaseChainParams::MAIN) && pObj->GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
453+
if (pObj->GetObjectType() == GOVERNANCE_OBJECT_PROPOSAL) {
455454
CProposalValidator validator(pObj->GetDataAsHexString());
456455
if (!validator.Validate()) {
457456
LogPrintf("CGovernanceManager::UpdateCachesAndClean -- set for deletion expired obj %s\n", (*it).first.ToString());

0 commit comments

Comments
 (0)