Skip to content

Commit

Permalink
Add May 15, 2018 HF activation time to consensus params
Browse files Browse the repository at this point in the history
According to the draft specification for the upcoming May 15, 2018
Bitcoin Cash HF (bitcoincashorg/spec#53) the
activation time is 1526400000, i.e. Tue May 15 18:00:00 CEST 2018
  • Loading branch information
sickpig committed Mar 2, 2018
1 parent dbe1288 commit 1909d28
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/consensus/params.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 1909d28

Please sign in to comment.