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

Include z2z fork height in our future seasons

Browse Source
This commit is contained in:
Duke Leto
2020-06-13 22:38:38 -04:00
parent 0a999c8497
commit a9d04b1e3f
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/komodo_defs.h
View File

@@ -1,4 +1,4 @@
// Copyright (c) 2019 The Hush developers // Copyright (c) 2019-2020 The Hush developers
/****************************************************************************** /******************************************************************************
* Copyright © 2014-2019 The SuperNET Developers. * * Copyright © 2014-2019 The SuperNET Developers. *
* * * *
@@ -42,12 +42,12 @@
// KMD Notary Seasons // KMD Notary Seasons
// 1: May 1st 2018 1530921600 // 1: May 1st 2018 1530921600
// 2: July 15th 2019 1563148800 -> estimated height 1444000 // 2: July 15th 2019 1563148800 -> estimated height 1444000
// 3: 3rd season ending isnt known, so use very far times in future. // 3: 3rd season
// 1751328000 = dummy timestamp, 1 July 2025! // 1751328000 = dummy timestamp, 1 July 2025!
// 7113400 = 5x current KMD blockheight. // 7113400 = 5x current KMD blockheight.
// to add 4th season, change NUM_KMD_SEASONS to 4, and add timestamp and height of activation to these arrays. // to add seasons, change NUM_KMD_SEASONS, and add timestamp and height of activation to these arrays.
#define NUM_KMD_SEASONS 5 #define NUM_KMD_SEASONS 6
#define NUM_KMD_NOTARIES 64 #define NUM_KMD_NOTARIES 64
// $ ./contrib/block_time.pl 166250 // $ ./contrib/block_time.pl 166250
@@ -64,9 +64,10 @@ const uint32_t nHushHardforkHeight2 = 255555;
// No coins/code are currently using timestamp activated fork // No coins/code are currently using timestamp activated fork
const uint32_t nHushHardforkTimestamp = 1580303652; // Jan 29nd 1pm GMT const uint32_t nHushHardforkTimestamp = 1580303652; // Jan 29nd 1pm GMT
const uint32_t nHushHardforkTimestamp2 = 1594425600; // Jul 11th 12a GMT const uint32_t nHushHardforkTimestamp2 = 1594425600; // Jul 11th 12a GMT
extern const uint32_t z2zForkHeight;
static const uint32_t KMD_SEASON_TIMESTAMPS[NUM_KMD_SEASONS] = {1525132800, 1563148800, nHushHardforkTimestamp, nHushHardforkTimestamp2, nHushHardforkTimestamp2*5}; static const uint32_t KMD_SEASON_TIMESTAMPS[NUM_KMD_SEASONS] = {1525132800, 1563148800, nHushHardforkTimestamp, nHushHardforkTimestamp2, nHushHardforkTimestamp2*5, nHushHardforkTimestamp2*6};
static const int32_t KMD_SEASON_HEIGHTS[NUM_KMD_SEASONS] = {1,2,nHushHardforkHeight, nHushHardforkHeight2, 5*nHushHardforkHeight2}; static const int32_t KMD_SEASON_HEIGHTS[NUM_KMD_SEASONS] = {1,2,nHushHardforkHeight, nHushHardforkHeight2, (int)z2zForkHeight, 5*nHushHardforkHeight2};
// 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] =

8
src/main.cpp
View File

@@ -115,7 +115,7 @@ bool fAlerts = DEFAULT_ALERTS;
*/ */
int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE; int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
bool ishush3 = strncmp(ASSETCHAINS_SYMBOL, "HUSH3",5) == 0 ? true : false; bool ishush3 = strncmp(ASSETCHAINS_SYMBOL, "HUSH3",5) == 0 ? true : false;
unsigned int z2zForkHeight = GetArg("-z2zforkheight",340000); const uint32_t z2zForkHeight = GetArg("-z2zforkheight",340000);
unsigned int expiryDelta = DEFAULT_TX_EXPIRY_DELTA; unsigned int expiryDelta = DEFAULT_TX_EXPIRY_DELTA;
extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN]; extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
@@ -1735,9 +1735,9 @@ CAmount GetMinRelayFee(const CTransaction& tx, unsigned int nBytes, bool fAllowF
bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,bool* pfMissingInputs, bool fRejectAbsurdFee, int dosLevel) bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransaction &tx, bool fLimitFree,bool* pfMissingInputs, bool fRejectAbsurdFee, int dosLevel)
{ {
AssertLockHeld(cs_main); AssertLockHeld(cs_main);
uint32_t z2zTransitionWindow = 10; const uint32_t z2zTransitionWindow = 10;
uint32_t z2zTransitionStart = z2zForkHeight - z2zTransitionWindow; const uint32_t z2zTransitionStart = z2zForkHeight - z2zTransitionWindow;
uint32_t nHeight = chainActive.Height(); const uint32_t nHeight = chainActive.Height();
// This only applies to HUSH3, other chains can start off z2z via ac_private=1 // This only applies to HUSH3, other chains can start off z2z via ac_private=1
if(ishush3) { if(ishush3) {