Merge branch 'master' into feature/masternode-debug-log-output

chrizog · Dec 30, 2021 · 4bdd206 · 4bdd206
2 parents 3d2ca99 + 0b63d4f
commit 4bdd206
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -128,6 +128,7 @@ class CMainParams : public CChainParams {
         consensus.EunosPayaHeight = 1072000; // Aug 05, 2021.
         consensus.FortCanningHeight = 1367000; // Nov 15, 2021.
         consensus.FortCanningMuseumHeight = 1430640;
+        consensus.FortCanningHillHeight = std::numeric_limits<int>::max();
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 //        consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
@@ -348,6 +349,7 @@ class CTestNetParams : public CChainParams {
         consensus.EunosPayaHeight = 463300;
         consensus.FortCanningHeight = 686200;
         consensus.FortCanningMuseumHeight = 724000;
+        consensus.FortCanningHillHeight = std::numeric_limits<int>::max();
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 //        consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
@@ -530,6 +532,7 @@ class CDevNetParams : public CChainParams {
         consensus.EunosPayaHeight = 300;
         consensus.FortCanningHeight = std::numeric_limits<int>::max();
         consensus.FortCanningMuseumHeight = std::numeric_limits<int>::max();
+        consensus.FortCanningHillHeight = std::numeric_limits<int>::max();
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
         consensus.pos.nTargetTimespan = 5 * 60; // 5 min == 10 blocks
@@ -704,6 +707,7 @@ class CRegTestParams : public CChainParams {
         consensus.EunosPayaHeight = 10000000;
         consensus.FortCanningHeight = 10000000;
         consensus.FortCanningMuseumHeight = 10000000;
+        consensus.FortCanningHillHeight = 10000000;
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
         consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks
@@ -915,8 +919,9 @@ void CRegTestParams::UpdateActivationParametersFromArgs(const ArgsManager& args)
         consensus.EunosKampungHeight = static_cast<int>(eunosHeight.get());
     }
     UpdateHeightValidation("Eunos Paya", "-eunospayaheight", consensus.EunosPayaHeight);
-    UpdateHeightValidation("Fork canning", "-fortcanningheight", consensus.FortCanningHeight);
-    UpdateHeightValidation("Fork canning museum", "-fortcanningmuseumheight", consensus.FortCanningMuseumHeight);
+    UpdateHeightValidation("Fort canning", "-fortcanningheight", consensus.FortCanningHeight);
+    UpdateHeightValidation("Fort canning museum", "-fortcanningmuseumheight", consensus.FortCanningMuseumHeight);
+    UpdateHeightValidation("Fort canning hill", "-fortcanninghillheight", consensus.FortCanningHillHeight);
 
     if (!args.IsArgSet("-vbparams")) return;
 

diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -91,6 +91,7 @@ struct Params {
     int EunosPayaHeight;
     int FortCanningHeight;
     int FortCanningMuseumHeight;
+    int FortCanningHillHeight;
 
     /** Foundation share after AMK, normalized to COIN = 100% */
     CAmount foundationShareDFIP1;

diff --git a/src/init.cpp b/src/init.cpp
@@ -473,6 +473,7 @@ void SetupServerArgs()
     gArgs.AddArg("-eunospayaheight", "EunosPaya fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-fortcanningheight", "Fort Canning fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-fortcanningmuseumheight", "Fort Canning Museum fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
+    gArgs.AddArg("-fortcanninghillheight", "Fort Canning Hill fork activation height (regtest only)", ArgsManager::ALLOW_ANY, OptionsCategory::CHAINPARAMS);
     gArgs.AddArg("-jellyfish_regtest", "Configure the regtest network for jellyfish testing", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 #ifdef USE_UPNP
 #if USE_UPNP

diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -1362,6 +1362,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
     BuriedForkDescPushBack(softforks, "eunospaya", consensusParams.EunosPayaHeight);
     BuriedForkDescPushBack(softforks, "fortcanning", consensusParams.FortCanningHeight);
     BuriedForkDescPushBack(softforks, "fortcanningmuseum", consensusParams.FortCanningMuseumHeight);
+    BuriedForkDescPushBack(softforks, "fortcanninghill", consensusParams.FortCanningHillHeight);
     BIP9SoftForkDescPushBack(softforks, "testdummy", consensusParams, Consensus::DEPLOYMENT_TESTDUMMY);
     obj.pushKV("softforks",             softforks);
 

diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py
@@ -133,6 +133,7 @@ def _test_getblockchaininfo(self):
             'eunospaya': {'type': 'buried', 'active': False, 'height': 10000000},
             'fortcanning': {'type': 'buried', 'active': False, 'height': 10000000},
             'fortcanningmuseum': {'type': 'buried', 'active': False, 'height': 10000000},
+            'fortcanninghill': {'type': 'buried', 'active': False, 'height': 10000000},
             'testdummy': {
                 'type': 'bip9',
                 'bip9': {