From 12ff038eae1c54752dc5d3328606c6fb0d99c72a Mon Sep 17 00:00:00 2001 From: Prasanna Loganathar Date: Tue, 15 Oct 2024 13:32:23 +0800 Subject: [PATCH 1/4] v4.2.0 --- configure.ac | 4 ++-- src/chainparams.cpp | 2 +- src/version.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index c69cb1ca72..cbb09fcbf4 100644 --- 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 index 34bcf99ffe..fc4225069e 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -143,7 +143,7 @@ class CMainParams : public CChainParams { 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::max(); + consensus.DF24Height = std::numeric_limits::max(); // TODO: Target in 2 weeks consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks diff --git a/src/version.h b/src/version.h index 70eef849d0..0dfb457cff 100644 --- 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 From 1ab3af78c052185d76c7bcb471591b462087ea19 Mon Sep 17 00:00:00 2001 From: Prasanna Loganathar Date: Tue, 15 Oct 2024 14:21:28 +0800 Subject: [PATCH 2/4] break compile for todo --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index fc4225069e..c03b58f83a 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -143,7 +143,7 @@ class CMainParams : public CChainParams { 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::max(); // TODO: Target in 2 weeks + consensus.DF24Height = [[ TODO: INTENTIONALLY BREAK COMPILE ]]; // TODO: Target in 2 weeks consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks From a5fdc5068568359c150eff2f16616d1f8201d995 Mon Sep 17 00:00:00 2001 From: Prasanna Loganathar Date: Tue, 15 Oct 2024 14:23:07 +0800 Subject: [PATCH 3/4] remove old comment --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index c03b58f83a..2d982867a2 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -142,7 +142,7 @@ 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.DF23Height = 4006000; // May 23th, 2024. consensus.DF24Height = [[ TODO: INTENTIONALLY BREAK COMPILE ]]; // TODO: Target in 2 weeks consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); From 33baf6bd4959656207ed4378ffd538e372a2310d Mon Sep 17 00:00:00 2001 From: Bushstar Date: Tue, 15 Oct 2024 12:28:06 +0100 Subject: [PATCH 4/4] Set fork for the 29th October --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 2d982867a2..38b466dbf0 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -143,7 +143,7 @@ class CMainParams : public CChainParams { consensus.DF21GrandCentralEpilogueHeight = 2574000; // Jan 10th, 2023. consensus.DF22MetachainHeight = 3462000; // Nov 15th, 2023. consensus.DF23Height = 4006000; // May 23th, 2024. - consensus.DF24Height = [[ TODO: INTENTIONALLY BREAK COMPILE ]]; // TODO: Target in 2 weeks + consensus.DF24Height = 4463000; // Oct 29th, 2024. consensus.pos.diffLimit = uint256S("00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // consensus.pos.nTargetTimespan = 14 * 24 * 60 * 60; // two weeks