Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v4.2.0 #3094

Merged
merged 5 commits into from
Oct 15, 2024
Merged

v4.2.0 #3094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12ff038
v4.2.0
prasannavl Oct 15, 2024
1ab3af7
break compile for todo
prasannavl Oct 15, 2024
a5fdc50
remove old comment
prasannavl Oct 15, 2024
33baf6b
Set fork for the 29th October
Bushstar Oct 15, 2024
ef3df88
Merge branch 'master' into pvl/v4.2.0
Bushstar Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading