Final timestamp, blockheight for P2SH Fork

RunOnFlux · Nov 22, 2023 · c930367 · c930367
1 parent 097c47a
commit c930367
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -142,7 +142,7 @@ class CMainParams : public CChainParams {
                 uint256S("000000111f8643ce24d9753dbc324220877299075a8a6102da61ef4460296325");
 
         consensus.vUpgrades[Consensus::UPGRADE_P2SHNODES].nProtocolVersion = 170019;
-        consensus.vUpgrades[Consensus::UPGRADE_P2SHNODES].nActivationHeight = 2000000; // TODO set this before release
+        consensus.vUpgrades[Consensus::UPGRADE_P2SHNODES].nActivationHeight = 1549500;
 
 
         consensus.nZawyLWMAAveragingWindow = 60;
@@ -222,7 +222,7 @@ class CMainParams : public CChainParams {
         vecBenchmarkingPublicKeys[0] = std::make_pair("042e79d7dd1483996157df6b16c831be2b14b31c69944ea2a585c63b5101af1f9517ba392cee5b1f45a62e9d936488429374535a2f76870bfa8eea6667b13eb39e", 0);
         vecBenchmarkingPublicKeys[1] = std::make_pair("04517413e51fa9b2e94f200b254cca69beb86f2d74bf66ca53854ba66bc376dde9b52e9b4403731d9a4f3e8edd9687f1e1824b688fe26454bd9fb823a3307b4682", 1618113600); // Sun Apr 11 2021 04:00:00 UTC
         vecBenchmarkingPublicKeys[2] = std::make_pair("0480dff65aa9d4b4c4234e4723a5e7c5bf527ca683b53aa26a7225cc5eb16e6e79f9629eb5f96c12b173de7a20e9823b2d36575759f3490864922f7ed04e171fad", 1647262800); // Mon Mar 14 2022 13:00:00 UTC
-        vecBenchmarkingPublicKeys[3] = std::make_pair("0437d58236a849ebe0e6558c1517e1f5c56749e04a2f7a7daedd4ef7c9fb6a773f32a33fe5ddad88b9af3ff496ee5ce79ce245c258bafa4e8d287baa3d54c6c65f", 1704654000); // Sun Jan 07 2024 19:00:00 UTC
+        vecBenchmarkingPublicKeys[3] = std::make_pair("0437d58236a849ebe0e6558c1517e1f5c56749e04a2f7a7daedd4ef7c9fb6a773f32a33fe5ddad88b9af3ff496ee5ce79ce245c258bafa4e8d287baa3d54c6c65f", 1706209200); // Thu Jan 25 2024 19:00:00 UTC
 
         assert(vecBenchmarkingPublicKeys.size() > 0);
 
@@ -246,11 +246,12 @@ class CMainParams : public CChainParams {
             (1040577, uint256S("0x000000071fe89682ac260bc0a49621344eb28ae01659c9e7ce86e3762e45f52d"))
             (1042126, uint256S("0x0000000295e4663178fd9e533787e74206645910a2bfb61938db5f67796eaad0"))
             (1060000, uint256S("0x0000000fd721d8d381c4b24a4f78fc036955d7a0f98d2765b8c7badad8b66c1b"))
-            (1442798, uint256S("0x0000000cc561fecb2ecfd22ba7af09450ca8cf270f407ce8b948195ff2aa0d13")),
-            1691509510,     // * UNIX timestamp of last checkpoint block
-            17772234,              // * total number of transactions between genesis and last checkpoint
+            (1442798, uint256S("0x0000000cc561fecb2ecfd22ba7af09450ca8cf270f407ce8b948195ff2aa0d13"))
+            (1518503, uint256S("0x0000000dba41dc84c52a3933af49d316fff49a76b49d42bd5b6d20c4e451a0ef")),
+            1700669818,     // * UNIX timestamp of last checkpoint block
+            66906216,              // * total number of transactions between genesis and last checkpoint
                             //   (the tx=... number in the SetBestChain debug.log lines)
-            24683            // * estimated number of transactions per day
+            31723            // * estimated number of transactions per day
                             //   total number of tx / (checkpoint block height / (24 * 30))
         };