Activate new protocol with fork.

This defines a new time-activated "fork", Fork::CustomRewardAddresses.
For now, it is scheduled at timestamp 2000000000; that will be set to
the actual activation time once it is determined.

When this fork becomes active (i.e. the current best block's timestamp
goes beyond the activation time), we require peers to use the new protocol
version that supports custom reward addresses.  The fork has no other
(in particular, no consensus-level) consequences.

Author: domob1812

divi/src/ForkActivation.cpp

@@ -22,12 +22,14 @@ const std::set<Fork> manualOverrides = {Fork::StakingVaults,Fork::HardenedStakeM
  * activation times.
  */
 const std::unordered_map<Fork, int64_t,std::hash<int>> ACTIVATION_TIMES = {
-  /* FIXME: Set real activation height for staking vaults once
-     the schedule has been finalised.  */
-  {Fork::TestByTimestamp, 1000000000},
   {Fork::StakingVaults, unixTimestampForDec31stMidnight},
   {Fork::HardenedStakeModifier, unixTimestampForDec31stMidnight},
   {Fork::UniformLotteryWinners, unixTimestampForDec31stMidnight},
+
+  /** FIXME: Set actual time once scheduled.  */
+  {Fork::CustomRewardAddresses, 2000000000},
+
+  {Fork::TestByTimestamp, 1000000000},
 };
 
 } // anonymous namespace

divi/src/ForkActivation.h

@@ -18,15 +18,23 @@ class CBlockIndex;
  */
 enum Fork
 {
-  /* Test forks not actually deployed / active but used for unit tests.  */
-  TestByTimestamp,
   /**
    * Staking vaults with SCRIPT_REQUIRE_COINSTAKE and a couple of other,
    * related changes.
    */
   StakingVaults,
   HardenedStakeModifier,
   UniformLotteryWinners,
+
+  /**
+   * Custom reward addresses for masternodes.  This is activated like other
+   * forks based on block time; but it only affects the network protocol
+   * we require from peers, not the actual consensus logic.
+   */
+  CustomRewardAddresses,
+
+  /* Test forks not actually deployed / active but used for unit tests.  */
+  TestByTimestamp,
 };
 
 /**

divi/src/main.cpp

@@ -4872,15 +4872,24 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
     return true;
 }
 
-// Note: whenever a protocol update is needed toggle between both implementations (comment out the formerly active one)
-//       so we can leave the existing clients untouched (old SPORK will stay on so they don't see even older clients).
-//       Those old clients won't react to the changes of the other (new) SPORK because at the time of their implementation
-//       it was the one which was commented out
 int ActiveProtocol()
 {
+    /* On regtest, we set the new protocol as active without any further
+       ado.  This allows proper testing of the changed logic.  */
     if (Params().NetworkID() == CBaseChainParams::REGTEST)
         return MN_REWARD_SCRIPT_VERSION;
 
+    /* Otherwise, the protocol update is tied to time-based activation of
+       a network fork (which in fact does not fork consensus but just the
+       network protocol).  */
+    const CBlockIndex* tip;
+    {
+        LOCK(cs_main);
+        tip = chainActive.Tip();
+    }
+    if (tip != nullptr && ActivationState(tip).IsActive(Fork::CustomRewardAddresses))
+        return MN_REWARD_SCRIPT_VERSION;
+
     return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT;
 }