Skip to content

Commit 23e04ca

Browse files
committed
Spork 22 Implemented
1 parent 2dd5cec commit 23e04ca

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/spork.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ int64_t GetSporkValue(int nSporkID)
141141
if (nSporkID == SPORK_19_NEW_PROTOCOL_ENFORCEMENT_3) r = SPORK_19_NEW_PROTOCOL_ENFORCEMENT_3_DEFAULT;
142142
if (nSporkID == SPORK_20_MN_WINNER_MINIMUM_AGE) r = SPORK_20_MN_WINNER_MINIMUM_AGE_DEFAULT;
143143
if (nSporkID == SPORK_21_NEW_PROTOCOL_ENFORCEMENT_4) r = SPORK_21_NEW_PROTOCOL_ENFORCEMENT_4_DEFAULT;
144+
if (nSporkID == SPORK_22_NEW_PROTOCOL_ENFORCEMENT_5) r = SPORK_22_NEW_PROTOCOL_ENFORCEMENT_5_DEFAULT;
144145

145146
if (r == -1) LogPrintf("%s : Unknown Spork %d\n", __func__, nSporkID);
146147
}
@@ -293,6 +294,7 @@ int CSporkManager::GetSporkIDByName(std::string strName)
293294
if (strName == "SPORK_19_NEW_PROTOCOL_ENFORCEMENT_3" ) return SPORK_19_NEW_PROTOCOL_ENFORCEMENT_3;
294295
if (strName == "SPORK_20_MN_WINNER_MINIMUM_AGE" ) return SPORK_20_MN_WINNER_MINIMUM_AGE;
295296
if (strName == "SPORK_21_NEW_PROTOCOL_ENFORCEMENT_4" ) return SPORK_21_NEW_PROTOCOL_ENFORCEMENT_4;
297+
if (strName == "SPORK_22_NEW_PROTOCOL_ENFORCEMENT_5" ) return SPORK_22_NEW_PROTOCOL_ENFORCEMENT_5;
296298

297299
return -1;
298300
}
@@ -315,6 +317,7 @@ std::string CSporkManager::GetSporkNameByID(int id)
315317
if (id == SPORK_19_NEW_PROTOCOL_ENFORCEMENT_3 ) return "SPORK_19_NEW_PROTOCOL_ENFORCEMENT_3";
316318
if (id == SPORK_20_MN_WINNER_MINIMUM_AGE ) return "SPORK_20_MN_WINNER_MINIMUM_AGE";
317319
if (id == SPORK_21_NEW_PROTOCOL_ENFORCEMENT_4 ) return "SPORK_21_NEW_PROTOCOL_ENFORCEMENT_4";
320+
if (id == SPORK_22_NEW_PROTOCOL_ENFORCEMENT_5 ) return "SPORK_22_NEW_PROTOCOL_ENFORCEMENT_5";
318321

319322
return "Unknown";
320323
}

src/spork.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ using namespace boost;
2727
Sporks 11,12, and 16 to be removed with 1st zerocoin release
2828
*/
2929
#define SPORK_START 10001
30-
#define SPORK_END 10020
30+
#define SPORK_END 10021
3131

3232
#define SPORK_2_SWIFTTX 10001
3333
#define SPORK_3_SWIFTTX_BLOCK_FILTERING 10002
@@ -45,6 +45,7 @@ using namespace boost;
4545
#define SPORK_19_NEW_PROTOCOL_ENFORCEMENT_3 10018
4646
#define SPORK_20_MN_WINNER_MINIMUM_AGE 10019
4747
#define SPORK_21_NEW_PROTOCOL_ENFORCEMENT_4 10020
48+
#define SPORK_22_NEW_PROTOCOL_ENFORCEMENT_5 10021
4849

4950
//#define SPORK_11_LOCK_INVALID_UTXO 10010
5051
//#define SPORK_12_RECONSIDER_BLOCKS 10011
@@ -65,6 +66,7 @@ using namespace boost;
6566
#define SPORK_19_NEW_PROTOCOL_ENFORCEMENT_3_DEFAULT 4070908800 // OFF
6667
#define SPORK_20_MN_WINNER_MINIMUM_AGE_DEFAULT 8000 // Age in seconds. This should be > MASTERNODE_REMOVAL_SECONDS to avoid misconfigured new nodes in the list. Set this to zero to emulate classic behaviour
6768
#define SPORK_21_NEW_PROTOCOL_ENFORCEMENT_4_DEFAULT 4070908800 // OFF
69+
#define SPORK_22_NEW_PROTOCOL_ENFORCEMENT_5_DEFAULT 4070908800 // OFF
6870

6971
//#define SPORK_11_LOCK_INVALID_UTXO_DEFAULT 4070908800 // OFF - NOTE: this is block height not time!
7072

0 commit comments

Comments
 (0)