From 1909d28213b2a5771c1ea2b13cca10e11aece15c Mon Sep 17 00:00:00 2001 From: Andrea Suisani Date: Fri, 2 Mar 2018 18:30:19 +0100 Subject: [PATCH] Add May 15, 2018 HF activation time to consensus params According to the draft specification for the upcoming May 15, 2018 Bitcoin Cash HF (https://github.com/bitcoincashorg/spec/pull/53) the activation time is 1526400000, i.e. Tue May 15 18:00:00 CEST 2018 --- src/chainparams.cpp | 8 +++++++- src/consensus/params.h | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index fda91b2a2d2..df87b60da4a 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -118,8 +118,10 @@ class CMainParams : public CChainParams // Aug, 1 2017 hard fork consensus.uahfHeight = 478559; - // Nov, 13 hard fork + // Nov, 13 2017 hard fork consensus.daaHeight = 504031; + // May, 15 2018 hard fork + consensus.may2018activationTime = 1526400000; /** * The message start string is designed to be unlikely to occur in normal data. @@ -244,6 +246,8 @@ class CUnlParams : public CChainParams consensus.uahfHeight = 0; // Nov, 13 hard fork consensus.daaHeight = 0; + // May, 15 2018 hard fork + consensus.may2018activationTime = 1526400000; vFixedSeeds.clear(); vSeeds.clear(); @@ -309,6 +313,8 @@ class CTestNetParams : public CChainParams consensus.uahfHeight = 1155876; // Nov, 13 hard fork consensus.daaHeight = 1188697; + // May, 15 2018 hard fork + consensus.may2018activationTime = 1526400000; pchMessageStart[0] = 0x0b; pchMessageStart[1] = 0x11; diff --git a/src/consensus/params.h b/src/consensus/params.h index 1f93ca277e7..f22b6e0d869 100644 --- a/src/consensus/params.h +++ b/src/consensus/params.h @@ -70,6 +70,8 @@ struct Params int uahfHeight; /** Block height at which the new DAA becomes active */ int daaHeight; + /** May 15, 2018 Activation time */ + int may2018activationTime; }; } // namespace Consensus