Introduce v5.3 network upgrade.

PIVX-Project · Aug 1, 2021 · 7f8fb12 · 7f8fb12
1 parent a3ee21a
commit 7f8fb12
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -201,6 +201,8 @@ class CMainParams : public CChainParams
         consensus.vUpgrades[Consensus::UPGRADE_V4_0].nActivationHeight          = 2153200;
         consensus.vUpgrades[Consensus::UPGRADE_V5_0].nActivationHeight          = 2700500;
         consensus.vUpgrades[Consensus::UPGRADE_V5_2].nActivationHeight          = 2927000;
+        consensus.vUpgrades[Consensus::UPGRADE_V5_3].nActivationHeight =
+                Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
         consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight =
                 Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
 
@@ -340,6 +342,8 @@ class CTestNetParams : public CChainParams
         consensus.vUpgrades[Consensus::UPGRADE_V4_0].nActivationHeight          = 201;
         consensus.vUpgrades[Consensus::UPGRADE_V5_0].nActivationHeight          = 201;
         consensus.vUpgrades[Consensus::UPGRADE_V5_2].nActivationHeight          = 262525;
+        consensus.vUpgrades[Consensus::UPGRADE_V5_3].nActivationHeight =
+                Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
         consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight =
                 Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
 
@@ -472,6 +476,7 @@ class CRegTestParams : public CChainParams
                 Consensus::NetworkUpgrade::ALWAYS_ACTIVE;
         consensus.vUpgrades[Consensus::UPGRADE_V5_0].nActivationHeight          = 300;
         consensus.vUpgrades[Consensus::UPGRADE_V5_2].nActivationHeight          = 300;
+        consensus.vUpgrades[Consensus::UPGRADE_V5_3].nActivationHeight          = 251;
         consensus.vUpgrades[Consensus::UPGRADE_V6_0].nActivationHeight =
                 Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
 

diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -35,6 +35,7 @@ enum UpgradeIndex : uint32_t {
     UPGRADE_V4_0,
     UPGRADE_V5_0,
     UPGRADE_V5_2,
+    UPGRADE_V5_3,
     UPGRADE_V6_0,
     UPGRADE_TESTDUMMY,
     // NOTE: Also add new upgrades to NetworkUpgradeInfo in upgrades.cpp

diff --git a/src/consensus/upgrades.cpp b/src/consensus/upgrades.cpp
@@ -31,31 +31,35 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
         },
         {
                 /*.strName =*/ "Zerocoin_v2",
-                /*.strInfo =*/ "new zerocoin serials and zPOS start",
+                /*.strInfo =*/ "New zerocoin serials and zPOS start",
         },
         {
                 /*.strName =*/ "BIP65",
                 /*.strInfo =*/ "CLTV (BIP65) activation - start block v5",
         },
         {
                 /*.strName =*/ "Zerocoin_Public",
-                /*.strInfo =*/ "activation of zerocoin public spends (spend v3)",
+                /*.strInfo =*/ "Activation of zerocoin public spends (spend v3)",
         },
         {
                 /*.strName =*/ "PIVX_v3.4",
-                /*.strInfo =*/ "new 256-bit stake modifier - start block v6",
+                /*.strInfo =*/ "New 256-bit stake modifier - start block v6",
         },
         {
                 /*.strName =*/ "PIVX_v4.0",
-                /*.strInfo =*/ "new message sigs - start block v7 - time protocol - zc spend v4",
+                /*.strInfo =*/ "New message sigs - start block v7 - time protocol - zc spend v4",
         },
         {
                 /*.strName =*/ "v5_shield",
                 /*.strInfo =*/ "Sapling Shield - start block v8 - start transaction v3",
         },
         {
                 /*.strName =*/ "PIVX_v5.2",
-                /*.strInfo =*/ "new cold-staking rules",
+                /*.strInfo =*/ "New cold-staking rules",
+        },
+        {
+                /*.strName =*/ "PIVX_v5.3",
+                /*.strInfo =*/ "New staking rules",
         },
         {
                 /*.strName =*/ "v6_evo",