From f07dcf12abfd22d4d76a1a407e7377f028fdad9f Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sun, 22 Dec 2019 03:13:14 -0500 Subject: [PATCH] Fix some compile issues and set a timestamp fork value for completeness --- src/komodo_bitcoind.h | 2 +- src/komodo_defs.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 316172250..952291ce9 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -707,7 +707,7 @@ bool hush_hardfork_active(uint32_t time) { //This allows simulating a different height via CLI option, with hardcoded height as default uint32_t nHardForkHeight = GetArg("-hardfork-height", nHushHardforkHeight); - bool isactive = chainActive.Height() > nHardforkHeight; + bool isactive = chainActive.Height() > nHardForkHeight; fprintf(stderr, "%s: active=%d at height=%d and forkheigt=%d\n", __FUNCTION__, (int)isactive, chainActive.Height(), nHardForkHeight); return isactive; } diff --git a/src/komodo_defs.h b/src/komodo_defs.h index d398be5c2..69f6b482f 100644 --- a/src/komodo_defs.h +++ b/src/komodo_defs.h @@ -53,11 +53,11 @@ // Approximately mid-day Jan 21 EST const uint32_t nHushHardforkHeight = 162000; -extern const int32_t nDecemberHardforkHeight; //December 2019 hardfork +// No coins/code are currently using timestamp activated fork +const uint32_t nHushHardforkTimestamp = 1579680124; // Jan 22nd 8am UTC -const uint32_t nStakedDecemberHardforkTimestamp = 1576840000; //December 2019 hardfork 12/20/2019 @ 11:06am (UTC) -static const uint32_t KMD_SEASON_TIMESTAMPS[NUM_KMD_SEASONS] = {1525132800, 1563148800, nStakedDecemberHardforkTimestamp, 1751328000}; -static const int32_t KMD_SEASON_HEIGHTS[NUM_KMD_SEASONS] = {1,2,nHushHardforkHeight, 5*nHushHardforkHeight}; +static const uint32_t KMD_SEASON_TIMESTAMPS[NUM_KMD_SEASONS] = {1525132800, 1563148800, nHushHardforkTimestamp, 1751328000}; +static const int32_t KMD_SEASON_HEIGHTS[NUM_KMD_SEASONS] = {1,2,nHushHardforkHeight, 5*nHushHardforkHeight}; // Era array of pubkeys. Add extra seasons to bottom as requried, after adding appropriate info above. static const char *notaries_elected[NUM_KMD_SEASONS][NUM_KMD_NOTARIES][2] =