DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix some compile issues and set a timestamp fork value for completeness

Browse Source
This commit is contained in:
Duke Leto
2019-12-22 03:13:14 -05:00
parent d837ed7358
commit f07dcf12ab
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/komodo_bitcoind.h
View File

@@ -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 //This allows simulating a different height via CLI option, with hardcoded height as default
uint32_t nHardForkHeight = GetArg("-hardfork-height", nHushHardforkHeight); 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); fprintf(stderr, "%s: active=%d at height=%d and forkheigt=%d\n", __FUNCTION__, (int)isactive, chainActive.Height(), nHardForkHeight);
return isactive; return isactive;
} }

8
src/komodo_defs.h
View File

@@ -53,11 +53,11 @@
// Approximately mid-day Jan 21 EST // Approximately mid-day Jan 21 EST
const uint32_t nHushHardforkHeight = 162000; 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, nHushHardforkTimestamp, 1751328000};
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 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. // 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] = static const char *notaries_elected[NUM_KMD_SEASONS][NUM_KMD_NOTARIES][2] =