Drop "MAY, 2018" clause for proposal validation on mainnet (#2101)
This commit is contained in:
parent
6079b860e3
commit
6c79c348ee
@ -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;
|
||||
}
|
||||
|
@ -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());
|
||||
|
Loading…
Reference in New Issue
Block a user