Skip to content

Commit

Permalink
Updated kernel spork names
Browse files Browse the repository at this point in the history
  • Loading branch information
tohsnoom committed Oct 11, 2021
1 parent 066b185 commit a5580c8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/kernel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ bool CheckProofOfStake(const CBlock block, uint256& hashProofOfStake, std::uniqu
if (!pindexfrom)
return error("%s: Failed to find the block index for stake origin", __func__);

if(GetSporkValue(SPORK_20_KERNAL_EXTRA_STAKING_CHECK) >= pindexfrom->nHeight) {
if(GetSporkValue(SPORK_20_KERNEL_EXTRA_STAKING_CHECK) >= pindexfrom->nHeight) {
const CTxIn& txin = tx.vin[0];
uint256 hashBlock;
CTransaction txPrev;
Expand Down
6 changes: 3 additions & 3 deletions src/spork.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ int64_t GetSporkValue(int nSporkID)
if (nSporkID == SPORK_17_SEGWIT_ACTIVATION) r = SPORK_17_SEGWIT_ACTIVATION_DEFAULT;
//if (nSporkID == SPORK_18_NEW_PROTOCOL_ENFORCEMENT_3) r = SPORK_18_NEW_PROTOCOL_ENFORCEMENT_3_DEFAULT;
if (nSporkID == SPORK_19_SEGWIT_ON_COINBASE) r = SPORK_19_SEGWIT_ON_COINBASE_DEFAULT;
if (nSporkID == SPORK_20_KERNAL_EXTRA_STAKING_CHECK) r = SPORK_20_KERNAL_EXTRA_STAKING_CHECK_DEFAULT;
if (nSporkID == SPORK_20_KERNEL_EXTRA_STAKING_CHECK) r = SPORK_20_KERNEL_EXTRA_STAKING_CHECK_DEFAULT;

if (r == -1) LogPrintf("GetSpork::Unknown Spork %d\n", nSporkID);
}
Expand Down Expand Up @@ -281,7 +281,7 @@ int CSporkManager::GetSporkIDByName(std::string strName)
if (strName == "SPORK_17_SEGWIT_ACTIVATION") return SPORK_17_SEGWIT_ACTIVATION;
//if (strName == "SPORK_18_NEW_PROTOCOL_ENFORCEMENT_3") return SPORK_18_NEW_PROTOCOL_ENFORCEMENT_3;
if (strName == "SPORK_19_SEGWIT_ON_COINBASE") return SPORK_19_SEGWIT_ON_COINBASE;
if (strName == "SPORK_20_KERNAL_EXTRA_STAKING_CHECK") return SPORK_20_KERNAL_EXTRA_STAKING_CHECK;
if (strName == "SPORK_20_KERNEL_EXTRA_STAKING_CHECK") return SPORK_20_KERNEL_EXTRA_STAKING_CHECK;

return -1;
}
Expand All @@ -302,7 +302,7 @@ std::string CSporkManager::GetSporkNameByID(int id)
if (id == SPORK_17_SEGWIT_ACTIVATION) return "SPORK_17_SEGWIT_ACTIVATION";
//if (id == SPORK_18_NEW_PROTOCOL_ENFORCEMENT_3) return "SPORK_18_NEW_PROTOCOL_ENFORCEMENT_3";
if (id == SPORK_19_SEGWIT_ON_COINBASE) return "SPORK_19_SEGWIT_ON_COINBASE";
if (id == SPORK_20_KERNAL_EXTRA_STAKING_CHECK) return "SPORK_20_KERNAL_EXTRA_STAKING_CHECK";
if (id == SPORK_20_KERNEL_EXTRA_STAKING_CHECK) return "SPORK_20_KERNEL_EXTRA_STAKING_CHECK";

return "Unknown";
}
4 changes: 2 additions & 2 deletions src/spork.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ using namespace boost;
#define SPORK_17_SEGWIT_ACTIVATION 10016
//#define SPORK_18_NEW_PROTOCOL_ENFORCEMENT_3 10017
#define SPORK_19_SEGWIT_ON_COINBASE 10018
#define SPORK_20_KERNAL_EXTRA_STAKING_CHECK 10019
#define SPORK_20_KERNEL_EXTRA_STAKING_CHECK 10019

#define SPORK_2_SWIFTTX_DEFAULT 978307200 //2001-1-1
#define SPORK_3_SWIFTTX_BLOCK_FILTERING_DEFAULT 1424217600 //2015-2-18
Expand All @@ -62,7 +62,7 @@ using namespace boost;
#define SPORK_17_SEGWIT_ACTIVATION_DEFAULT 4070908800 //OFF
//#define SPORK_18_NEW_PROTOCOL_ENFORCEMENT_3_DEFAULT 4070908800 //OFF
#define SPORK_19_SEGWIT_ON_COINBASE_DEFAULT 4070908800 //OFF
#define SPORK_20_KERNAL_EXTRA_STAKING_CHECK_DEFAULT 9999999999 //OFF
#define SPORK_20_KERNEL_EXTRA_STAKING_CHECK_DEFAULT 9999999999 //OFF

class CSporkMessage;
class CSporkManager;
Expand Down

0 comments on commit a5580c8

Please sign in to comment.