refactor: use std::chrono for governance time constants

Author: kwvg

src/governance/governance.cpp

@@ -31,10 +31,13 @@
 int nSubmittedFinalBudget;
 
 const std::string GovernanceStore::SERIALIZATION_VERSION_STRING = "CGovernanceManager-Version-16";
-const int CGovernanceManager::MAX_TIME_FUTURE_DEVIATION = 60 * 60;
-const int CGovernanceManager::RELIABLE_PROPAGATION_TIME = 60;
 
 namespace {
+constexpr std::chrono::seconds GOVERNANCE_DELETION_DELAY{10min};
+constexpr std::chrono::seconds GOVERNANCE_ORPHAN_EXPIRATION_TIME{10min};
+constexpr std::chrono::seconds MAX_TIME_FUTURE_DEVIATION{1h};
+constexpr std::chrono::seconds RELIABLE_PROPAGATION_TIME{1min};
+
 class ScopedLockBool
 {
     bool& ref;
@@ -490,7 +493,7 @@ void CGovernanceManager::CheckAndRemove()
             strHash, pObj->GetDeletionTime(), nTimeSinceDeletion, pObj->IsSetCachedDelete(), pObj->IsSetExpired());
 
         if ((pObj->IsSetCachedDelete() || pObj->IsSetExpired()) &&
-            (nTimeSinceDeletion >= GOVERNANCE_DELETION_DELAY)) {
+            (nTimeSinceDeletion >= count_seconds(GOVERNANCE_DELETION_DELAY))) {
             LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- erase obj %s\n", (*it).first.ToString());
             m_mn_metaman.RemoveGovernanceObject(pObj->GetHash());
 
@@ -514,7 +517,7 @@ void CGovernanceManager::CheckAndRemove()
                 nTimeExpired = std::numeric_limits<int64_t>::max();
             } else {
                 int64_t nSuperblockCycleSeconds = Params().GetConsensus().nSuperblockCycle * Params().GetConsensus().nPowTargetSpacing;
-                nTimeExpired = pObj->GetCreationTime() + 2 * nSuperblockCycleSeconds + GOVERNANCE_DELETION_DELAY;
+                nTimeExpired = pObj->GetCreationTime() + 2 * nSuperblockCycleSeconds + count_seconds(GOVERNANCE_DELETION_DELAY);
             }
 
             mapErasedGovernanceObjects.insert(std::make_pair(nHash, nTimeExpired));
@@ -694,7 +697,7 @@ bool CGovernanceManager::ConfirmInventoryRequest(const CInv& inv)
         return false;
     }
 
-    const auto valid_until = GetTime<std::chrono::seconds>() + std::chrono::seconds(RELIABLE_PROPAGATION_TIME);
+    const auto valid_until = GetTime<std::chrono::seconds>() + RELIABLE_PROPAGATION_TIME;
     const auto& [_itr, inserted] = m_requested_hash_time.emplace(inv.hash, valid_until);
 
     if (inserted) {
@@ -820,7 +823,7 @@ void CGovernanceManager::MasternodeRateUpdate(const CGovernanceObject& govobj)
     int64_t nTimestamp = govobj.GetCreationTime();
     it->second.triggerBuffer.AddTimestamp(nTimestamp);
 
-    if (nTimestamp > GetTime() + MAX_TIME_FUTURE_DEVIATION - RELIABLE_PROPAGATION_TIME) {
+    if (nTimestamp > GetTime() + count_seconds(MAX_TIME_FUTURE_DEVIATION) - count_seconds(RELIABLE_PROPAGATION_TIME)) {
         // schedule additional relay for the object
         setAdditionalRelayObjects.insert(govobj.GetHash());
     }
@@ -861,7 +864,7 @@ bool CGovernanceManager::MasternodeRateCheck(const CGovernanceObject& govobj, bo
         return false;
     }
 
-    if (nTimestamp > nNow + MAX_TIME_FUTURE_DEVIATION) {
+    if (nTimestamp > nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION)) {
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::MasternodeRateCheck -- object %s rejected due to too new (future) timestamp, masternode = %s, timestamp = %d, current time = %d\n",
             strHash, masternodeOutpoint.ToStringShort(), nTimestamp, nNow);
         return false;
@@ -935,7 +938,7 @@ bool CGovernanceManager::ProcessVote(CNode* pfrom, const CGovernanceVote& vote,
         std::string msg{strprintf("CGovernanceManager::%s -- Unknown parent object %s, MN outpoint = %s", __func__,
             nHashGovobj.ToString(), vote.GetMasternodeOutpoint().ToStringShort())};
         exception = CGovernanceException(msg, GOVERNANCE_EXCEPTION_WARNING);
-        if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, GetTime<std::chrono::seconds>().count() + GOVERNANCE_ORPHAN_EXPIRATION_TIME))) {
+        if (cmmapOrphanVotes.Insert(nHashGovobj, vote_time_pair_t(vote, count_seconds(GetTime<std::chrono::seconds>() + GOVERNANCE_ORPHAN_EXPIRATION_TIME)))) {
             LEAVE_CRITICAL_SECTION(cs);
             RequestGovernanceObject(pfrom, nHashGovobj, connman);
             LogPrint(BCLog::GOBJECT, "%s\n", msg);
@@ -1006,8 +1009,8 @@ void CGovernanceManager::CheckPostponedObjects()
 
             int64_t nTimestamp = govobj.GetCreationTime();
 
-            bool fValid = (nTimestamp <= nNow + MAX_TIME_FUTURE_DEVIATION) && (nTimestamp >= nNow - 2 * nSuperblockCycleSeconds);
-            bool fReady = (nTimestamp <= nNow + MAX_TIME_FUTURE_DEVIATION - RELIABLE_PROPAGATION_TIME);
+            bool fValid = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION)) && (nTimestamp >= nNow - 2 * nSuperblockCycleSeconds);
+            bool fReady = (nTimestamp <= nNow + count_seconds(MAX_TIME_FUTURE_DEVIATION) - count_seconds(RELIABLE_PROPAGATION_TIME));
 
             if (fValid) {
                 if (fReady) {

src/governance/governance.h

@@ -246,10 +246,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
 private:
     using db_type = CFlatDB<GovernanceStore>;
 
-private:
-    static const int MAX_TIME_FUTURE_DEVIATION;
-    static const int RELIABLE_PROPAGATION_TIME;
-
 private:
     const std::unique_ptr<db_type> m_db;
     bool is_valid{false};

src/governance/object.h

@@ -27,16 +27,10 @@ class CNode;
 extern RecursiveMutex cs_main;
 
 static constexpr double GOVERNANCE_FILTER_FP_RATE = 0.001;
-
-
 static constexpr CAmount GOVERNANCE_PROPOSAL_FEE_TX = (1 * COIN);
-
 static constexpr int64_t GOVERNANCE_FEE_CONFIRMATIONS = 6;
 static constexpr int64_t GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS = 1;
 static constexpr int64_t GOVERNANCE_UPDATE_MIN = 60 * 60;
-static constexpr int64_t GOVERNANCE_DELETION_DELAY = 10 * 60;
-static constexpr int64_t GOVERNANCE_ORPHAN_EXPIRATION_TIME = 10 * 60;
-static constexpr int64_t GOVERNANCE_FUDGE_WINDOW = 60 * 60 * 2;
 
 // FOR SEEN MAP ARRAYS - GOVERNANCE OBJECTS AND VOTES
 enum class SeenObjectStatus {

src/governance/signing.cpp

@@ -8,13 +8,18 @@
 #include <logging.h>
 #include <timedata.h>
 #include <util/check.h>
+#include <util/time.h>
 #include <validation.h>
 
 #include <evo/deterministicmns.h>
 #include <governance/classes.h>
 #include <masternode/node.h>
 #include <masternode/sync.h>
 
+namespace {
+constexpr std::chrono::seconds GOVERNANCE_FUDGE_WINDOW{2h};
+} // anonymous namespace
+
 GovernanceSigner::GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
                                    const CActiveMasternodeManager& mn_activeman, const ChainstateManager& chainman,
                                    const CMasternodeSync& mn_sync) :
@@ -74,8 +79,8 @@ std::optional<const CSuperblock> GovernanceSigner::CreateSuperblockCandidate(int
         // Skip proposals that are too expensive
         if (budgetAllocated + payment.nAmount > governanceBudget) continue;
 
-        int64_t windowStart = jproposal["start_epoch"].getInt<int64_t>() - GOVERNANCE_FUDGE_WINDOW;
-        int64_t windowEnd = jproposal["end_epoch"].getInt<int64_t>() + GOVERNANCE_FUDGE_WINDOW;
+        int64_t windowStart = jproposal["start_epoch"].getInt<int64_t>() - count_seconds(GOVERNANCE_FUDGE_WINDOW);
+        int64_t windowEnd = jproposal["end_epoch"].getInt<int64_t>() + count_seconds(GOVERNANCE_FUDGE_WINDOW);
 
         // Skip proposals if the SB isn't within the proposal time window
         if (SBEpochTime < windowStart) {