v4.2.0 (#3094)

* v4.2.0 * break compile for todo * remove old comment * Set fork for the 29th October --------- Co-authored-by: Bushstar <[email protected]>
DeFiCh · Oct 15, 2024 · 98bb78f · 98bb78f
1 parent fbae367
commit 98bb78f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
-define(_CLIENT_VERSION_MINOR, 1)
-define(_CLIENT_VERSION_REVISION, 12)
+define(_CLIENT_VERSION_MINOR, 2)
+define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -142,8 +142,8 @@ class CMainParams : public CChainParams {
         consensus.DF20GrandCentralHeight = 2479000; // Dec 8th, 2022.
         consensus.DF21GrandCentralEpilogueHeight = 2574000; // Jan 10th, 2023.
         consensus.DF22MetachainHeight = 3462000; // Nov 15th, 2023.
-        consensus.DF23Height = 4006000; // May 23th, 2024. Tentative date, might change on stable release.
-        consensus.DF24Height = std::numeric_limits<int>::max();
+        consensus.DF23Height = 4006000; // May 23th, 2024.
+        consensus.DF24Height = 4463000; // Oct 29th, 2024.
 
         consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 //        consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks

diff --git a/src/version.h b/src/version.h
@@ -14,7 +14,7 @@ static const int INIT_PROTO_VERSION = 209;
 
 // TODO: Alias this to the latest network upgrade height that the node supports 
 // as they are synonymous.
-static const int PROTOCOL_VERSION = 70038;
+static const int PROTOCOL_VERSION = 70039;
 
 // TODO: Set this as the previous successful network upgrade height 
 // pre-node release. Each version can supports connecting from