From 45a5d25230a1668d20f616fe17bbe188ae2871c4 Mon Sep 17 00:00:00 2001 From: Duke Date: Wed, 22 Nov 2023 08:00:26 -0500 Subject: [PATCH] Update next consensus hardfork to be block 1605555 on Dec 16th 2023 --- src/hush_defs.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/hush_defs.h b/src/hush_defs.h index 672d3cec3..26dc57f73 100644 --- a/src/hush_defs.h +++ b/src/hush_defs.h @@ -55,8 +55,11 @@ const uint32_t nHushHardforkHeight2 = 245055; // This height begins Hush DPoW from Hush notaries const uint32_t nHushHardforkHeight3 = 340420; // This height begins Hush Decentralized Devtax -const uint32_t nHushHardforkHeight4 = 99999999; // TODO - +// ./contrib/block_time.pl 1605555 +// Hush Block 1605555 will happen at roughly: +// Sat Dec 16 10:30:42 2023 Eastern # 1702740642 +// Sat Dec 16 15:30:42 2023 GMT # 1702740642 +const uint32_t nHushHardforkHeight4 = 1605555; const uint32_t nHushHardforkTimestamp = 1580303652; // Jan 29nd 1pm GMT const uint32_t nHushHardforkTimestamp2 = 1594425600; // Jul 11th 12a GMT @@ -64,8 +67,7 @@ const uint32_t nHushHardforkTimestamp2 = 1594425600; // Jul 11th 12a GMT static const uint32_t HUSH_SEASON_TIMESTAMPS[NUM_HUSH_SEASONS] = {1525132800, 1563148800, nHushHardforkTimestamp, nHushHardforkTimestamp2, nHushHardforkTimestamp2*5, nHushHardforkTimestamp2*6, nHushHardforkTimestamp2*7}; // Used by HUSH3+TUSH -// Block 1702100 = nHushHardforkHeight3*5 -static const int32_t HUSH_SEASON_HEIGHTS[NUM_HUSH_SEASONS] = {1,2,nHushHardforkHeight, nHushHardforkHeight2, (int)340000, nHushHardforkHeight3, nHushHardforkHeight3*5}; +static const int32_t HUSH_SEASON_HEIGHTS[NUM_HUSH_SEASONS] = {1,2,nHushHardforkHeight, nHushHardforkHeight2, (int)340000, nHushHardforkHeight3, nHushHardforkHeight4}; // Era array of pubkeys. Add extra seasons to bottom as requried, after adding appropriate info above. static const char *notaries_elected[NUM_HUSH_SEASONS][NUM_HUSH_NOTARIES][2] =