Skip to content

Commit b253389

Browse files
author
limxdev
committed
Merge branch 'master' of https://github.com/LIMXTEC/BitCore into 0.9.8.x
2 parents f918b64 + 19e4dac commit b253389

File tree

10 files changed

+79
-77
lines changed

10 files changed

+79
-77
lines changed

‎Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
5454
$(top_srcdir)/contrib/devtools/security-check.py
5555

5656
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcore.ico \
57-
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
58-
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
57+
$(top_srcdir)/share/pixmaps/bitcore-nsis-header.bmp \
58+
$(top_srcdir)/share/pixmaps/bitcore-nsis-wizard.bmp \
5959
$(top_srcdir)/doc/README_windows.txt
6060

6161
OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \

‎configure.ac‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
22
AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 0)
44
define(_CLIENT_VERSION_MINOR, 90)
5-
define(_CLIENT_VERSION_REVISION, 8)
6-
define(_CLIENT_VERSION_BUILD, 11)
5+
define(_CLIENT_VERSION_REVISION, 9)
6+
define(_CLIENT_VERSION_BUILD, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2020)
99
define(_COPYRIGHT_HOLDERS,[The %s developers])

share/pixmaps/nsis-header.bmp renamed to share/pixmaps/bitcore-nsis-header.bmp

File renamed without changes.

share/pixmaps/nsis-wizard.bmp renamed to share/pixmaps/bitcore-nsis-wizard.bmp

File renamed without changes.

‎share/setup.nsi.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ Var StartMenuGroup
5151
# Installer attributes
5252
OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-${VERSION}-win@[email protected]
5353
!if "@WINDOWS_BITS@" == "64"
54-
InstallDir $PROGRAMFILES64\Bitcoin
54+
InstallDir $PROGRAMFILES64\Bitcore
5555
!else
56-
InstallDir $PROGRAMFILES\Bitcoin
56+
InstallDir $PROGRAMFILES\Bitcore
5757
!endif
5858
CRCCheck on
5959
XPStyle on

‎src/chainparams.cpp‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,13 @@ class CMainParams : public CChainParams {
172172
// service bits we want, but we should get them updated to support all service bits wanted by any
173173
// release ASAP to avoid it where possible.
174174
// BTX
175-
vSeeds.emplace_back("seed.bitcore.biz", true);
176-
vSeeds.emplace_back("37.120.190.76", false);
177-
vSeeds.emplace_back("37.120.186.85", false);
178-
vSeeds.emplace_back("185.194.140.60", false);
179-
vSeeds.emplace_back("188.71.223.206", false);
180-
vSeeds.emplace_back("185.194.142.122", false);
175+
vSeeds.emplace_back("seed.bitcore.biz");
176+
vSeeds.emplace_back("37.120.190.76");
177+
vSeeds.emplace_back("37.120.186.85");
178+
vSeeds.emplace_back("185.194.140.60");
179+
vSeeds.emplace_back("188.71.223.206");
180+
vSeeds.emplace_back("185.194.142.122");
181+
//vSeeds.emplace_back("185.194.142.122", false);
181182

182183
// BTX prefix '2'
183184
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,3);
@@ -328,12 +329,12 @@ class CTestNetParams : public CChainParams {
328329
vFixedSeeds.clear();
329330
vSeeds.clear();
330331
*/
331-
vSeeds.emplace_back("188.68.52.172", true);
332-
vSeeds.emplace_back("37.120.186.85", true);
333-
vSeeds.emplace_back("37.120.186.85", true);
334-
vSeeds.emplace_back("188.71.223.206", true);
335-
vSeeds.emplace_back("185.194.142.122", false);
336-
vSeeds.emplace_back("51.15.84.165", true);
332+
vSeeds.emplace_back("188.68.52.172");
333+
vSeeds.emplace_back("37.120.186.85");
334+
vSeeds.emplace_back("37.120.186.85");
335+
vSeeds.emplace_back("188.71.223.206");
336+
vSeeds.emplace_back("185.194.142.122");
337+
vSeeds.emplace_back("51.15.84.165");
337338

338339
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,111);
339340
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196);

‎src/masternode-payments.cpp‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,6 @@ bool IsBlockPayeeValid(const CTransactionRef txNew, int nBlockHeight, CAmount bl
143143
// we can only check masternode payments
144144

145145
const Consensus::Params& consensusParams = Params().GetConsensus();
146-
//We should leave that here until we start the Superblocksystem. The second stage is the Spork 8 only if Superblock are online - Chris 2020
147-
if(sporkManager.IsSporkActive(SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT))
148-
{
149-
LogPrintf("IsBlockPayeeValid SPORK_22 -- ERROR: Invalid masternode payment detected at height %d: %s\n", nBlockHeight, txNew->ToString());
150-
return false;
151-
}
152146

153147
if(nBlockHeight < consensusParams.nSuperblockStartBlock) {
154148
if(mnpayments.IsTransactionValid(txNew, nBlockHeight)) {
@@ -171,7 +165,7 @@ bool IsBlockPayeeValid(const CTransactionRef txNew, int nBlockHeight, CAmount bl
171165
}
172166

173167
if(sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)) {
174-
//if (!sporkManager.IsSporkActive(SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT) && !sporkManager.IsSporkActive(SPORK_BTX_17_UNKNOW)) {
168+
//if (!sporkManager.IsSporkActive(SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT) && !sporkManager.IsSporkActive(SPORK_BTX_23_MASTERNODE_PAYMENT_LOW_VOTING)) {
175169
LogPrintf("IsBlockPayeeValid -- ERROR: Invalid masternode payment detected at height %d: %s\n", nBlockHeight, txNew->ToString());
176170
return false;
177171
} else {
@@ -589,7 +583,14 @@ bool CMasternodeBlockPayees::IsTransactionValid(const CTransactionRef txNew)
589583
}
590584

591585
// if we don't have at least MNPAYMENTS_SIGNATURES_REQUIRED signatures on a payee, approve whichever is the longest chain
592-
if(nMaxSignatures < MNPAYMENTS_SIGNATURES_REQUIRED) return true;
586+
if(sporkManager.IsSporkActive(SPORK_BTX_23_MASTERNODE_PAYMENT_LOW_VOTING))
587+
{
588+
if(nMaxSignatures < MNPAYMENTS_SIGNATURES_REQUIRED/3) return true;
589+
}
590+
else
591+
{
592+
if(nMaxSignatures < MNPAYMENTS_SIGNATURES_REQUIRED) return true;
593+
}
593594

594595
for (auto& payee : vecPayees) {
595596
if (payee.GetVoteCount() >= MNPAYMENTS_SIGNATURES_REQUIRED) {

‎src/spork.cpp‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ bool CSporkManager::IsSporkActive(int nSporkID)
182182
case SPORK_5_INSTANTSEND_MAX_VALUE: r = SPORK_5_INSTANTSEND_MAX_VALUE_DEFAULT; break;
183183
case SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT: r = SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT; break;
184184
case SPORK_9_SUPERBLOCKS_ENABLED: r = SPORK_9_SUPERBLOCKS_ENABLED_DEFAULT; break;
185-
case SPORK_10_MASTERNODE_PAY_UPDATED_NODES: r = SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT; break;
185+
case SPORK_10_UNKNOW: r = SPORK_10_UNKNOW_DEFAULT; break;
186186
case SPORK_12_RECONSIDER_BLOCKS: r = SPORK_12_RECONSIDER_BLOCKS_DEFAULT; break;
187187
case SPORK_13_OLD_SUPERBLOCK_FLAG: r = SPORK_13_OLD_SUPERBLOCK_FLAG_DEFAULT; break;
188188
case SPORK_14_UNKNOW: r = SPORK_14_UNKNOW_DEFAULT; break;
@@ -199,13 +199,13 @@ bool CSporkManager::IsSporkActive(int nSporkID)
199199
case SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK: r = SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK_DEFAULT; break;
200200
case SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE: r = SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE_DEFAULT; break;
201201
case SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT: r = SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT; break;
202-
case SPORK_BTX_17_UNKNOW: r = SPORK_BTX_17_UNKNOW_DEFAULT; break;
202+
case SPORK_BTX_23_MASTERNODE_PAYMENT_LOW_VOTING: r = SPORK_BTX_23_MASTERNODE_PAYMENT_LOW_VOTING_DEFAULT; break;
203203

204204
case SPORK_BTX_18_MIN_PEER_PROTO_VERSION: r = SPORK_BTX_18_MIN_PEER_PROTO_VERSION_DEFAULT; break;
205205
case SPORK_BTX_19_MIN_VERSION_COUNT: r = SPORK_BTX_19_MIN_VERSION_COUNT_DEFAULT; break;
206206
case SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT: r = SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT_DEFAULT; break;
207207
case SPORK_BTX_21_MAX_VERSION_COUNT: r = SPORK_BTX_21_MAX_VERSION_COUNT_DEFAULT; break;
208-
case SPORK_22_FACTOR_ENFORCEMENT: r = SPORK_22_FACTOR_ENFORCEMENT_DEFAULT; break;
208+
case SPORK_22_FACTOR_ENFORCEMENT: r = SPORK_22_FACTOR_ENFORCEMENT_DEFAULT; break;
209209
// FXTC END
210210
default:
211211
LogPrint(BCLog::SPORK, "CSporkManager::IsSporkActive -- Unknown Spork ID %d\n", nSporkID);
@@ -229,7 +229,7 @@ int64_t CSporkManager::GetSporkValue(int nSporkID)
229229
case SPORK_5_INSTANTSEND_MAX_VALUE: return SPORK_5_INSTANTSEND_MAX_VALUE_DEFAULT;
230230
case SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT: return SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT;
231231
case SPORK_9_SUPERBLOCKS_ENABLED: return SPORK_9_SUPERBLOCKS_ENABLED_DEFAULT;
232-
case SPORK_10_MASTERNODE_PAY_UPDATED_NODES: return SPORK_10_MASTERNODE_PAY_UPDATED_NODES_DEFAULT;
232+
case SPORK_10_UNKNOW: return SPORK_10_UNKNOW_DEFAULT;
233233
case SPORK_12_RECONSIDER_BLOCKS: return SPORK_12_RECONSIDER_BLOCKS_DEFAULT;
234234
case SPORK_13_OLD_SUPERBLOCK_FLAG: return SPORK_13_OLD_SUPERBLOCK_FLAG_DEFAULT;
235235
case SPORK_14_UNKNOW: return SPORK_14_UNKNOW_DEFAULT;
@@ -245,14 +245,14 @@ int64_t CSporkManager::GetSporkValue(int nSporkID)
245245
case SPORK_BTX_15_COINBASE_MATURITY_STAGE_2: return SPORK_BTX_15_COINBASE_MATURITY_STAGE_2_DEFAULT;
246246
case SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK: return SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK_DEFAULT;
247247
case SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE: return SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE_DEFAULT;
248-
case SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT: return SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT;
249-
case SPORK_BTX_17_UNKNOW: return SPORK_BTX_17_UNKNOW_DEFAULT;
248+
case SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT: return SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT;
249+
case SPORK_BTX_23_MASTERNODE_PAYMENT_LOW_VOTING: return SPORK_BTX_23_MASTERNODE_PAYMENT_LOW_VOTING_DEFAULT;
250250

251251
case SPORK_BTX_18_MIN_PEER_PROTO_VERSION: return SPORK_BTX_18_MIN_PEER_PROTO_VERSION_DEFAULT;
252252
case SPORK_BTX_19_MIN_VERSION_COUNT: return SPORK_BTX_19_MIN_VERSION_COUNT_DEFAULT;
253253
case SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT: return SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT_DEFAULT;
254254
case SPORK_BTX_21_MAX_VERSION_COUNT: return SPORK_BTX_21_MAX_VERSION_COUNT_DEFAULT;
255-
case SPORK_22_FACTOR_ENFORCEMENT: return SPORK_22_FACTOR_ENFORCEMENT_DEFAULT;
255+
case SPORK_22_FACTOR_ENFORCEMENT: return SPORK_22_FACTOR_ENFORCEMENT_DEFAULT;
256256

257257
default:
258258
LogPrint(BCLog::SPORK, "CSporkManager::GetSporkValue -- Unknown Spork ID %d\n", nSporkID);
@@ -263,35 +263,35 @@ int64_t CSporkManager::GetSporkValue(int nSporkID)
263263

264264
int CSporkManager::GetSporkIDByName(std::string strName)
265265
{
266-
if (strName == "SPORK_2_INSTANTSEND_ENABLED") return SPORK_2_INSTANTSEND_ENABLED;
267-
if (strName == "SPORK_3_INSTANTSEND_BLOCK_FILTERING") return SPORK_3_INSTANTSEND_BLOCK_FILTERING;
268-
if (strName == "SPORK_5_INSTANTSEND_MAX_VALUE") return SPORK_5_INSTANTSEND_MAX_VALUE;
269-
if (strName == "SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT") return SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT;
270-
if (strName == "SPORK_9_SUPERBLOCKS_ENABLED") return SPORK_9_SUPERBLOCKS_ENABLED;
271-
if (strName == "SPORK_10_MASTERNODE_PAY_UPDATED_NODES") return SPORK_10_MASTERNODE_PAY_UPDATED_NODES;
272-
if (strName == "SPORK_12_RECONSIDER_BLOCKS") return SPORK_12_RECONSIDER_BLOCKS;
273-
if (strName == "SPORK_13_OLD_SUPERBLOCK_FLAG") return SPORK_13_OLD_SUPERBLOCK_FLAG;
274-
if (strName == "SPORK_14_UNKNOW") return SPORK_14_UNKNOW;
275-
276-
if (strName == "SPORK_BTX_01_HANDBRAKE_HEIGHT") return SPORK_BTX_01_HANDBRAKE_HEIGHT;
277-
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D") return SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D;
278-
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_SCRYPT") return SPORK_BTX_01_HANDBRAKE_FORCE_SCRYPT;
279-
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_NIST5") return SPORK_BTX_01_HANDBRAKE_FORCE_NIST5;
280-
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_LYRA2Z") return SPORK_BTX_01_HANDBRAKE_FORCE_LYRA2Z;
281-
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_X11") return SPORK_BTX_01_HANDBRAKE_FORCE_X11;
282-
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_X16R") return SPORK_BTX_01_HANDBRAKE_FORCE_X16R;
283-
284-
if (strName == "SPORK_BTX_15_COINBASE_MATURITY_STAGE_2") return SPORK_BTX_15_COINBASE_MATURITY_STAGE_2;
285-
if (strName == "SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK") return SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK;
286-
if (strName == "SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE") return SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE;
287-
if (strName == "SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT") return SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT;
288-
if (strName == "SPORK_BTX_17_UNKNOW") return SPORK_BTX_17_UNKNOW;
266+
if (strName == "SPORK_2_INSTANTSEND_ENABLED") return SPORK_2_INSTANTSEND_ENABLED;
267+
if (strName == "SPORK_3_INSTANTSEND_BLOCK_FILTERING") return SPORK_3_INSTANTSEND_BLOCK_FILTERING;
268+
if (strName == "SPORK_5_INSTANTSEND_MAX_VALUE") return SPORK_5_INSTANTSEND_MAX_VALUE;
269+
if (strName == "SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT") return SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT;
270+
if (strName == "SPORK_9_SUPERBLOCKS_ENABLED") return SPORK_9_SUPERBLOCKS_ENABLED;
271+
if (strName == "SPORK_10_UNKNOW") return SPORK_10_UNKNOW;
272+
if (strName == "SPORK_12_RECONSIDER_BLOCKS") return SPORK_12_RECONSIDER_BLOCKS;
273+
if (strName == "SPORK_13_OLD_SUPERBLOCK_FLAG") return SPORK_13_OLD_SUPERBLOCK_FLAG;
274+
if (strName == "SPORK_14_UNKNOW") return SPORK_14_UNKNOW;
275+
276+
if (strName == "SPORK_BTX_01_HANDBRAKE_HEIGHT") return SPORK_BTX_01_HANDBRAKE_HEIGHT;
277+
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D") return SPORK_BTX_01_HANDBRAKE_FORCE_SHA256D;
278+
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_SCRYPT") return SPORK_BTX_01_HANDBRAKE_FORCE_SCRYPT;
279+
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_NIST5") return SPORK_BTX_01_HANDBRAKE_FORCE_NIST5;
280+
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_LYRA2Z") return SPORK_BTX_01_HANDBRAKE_FORCE_LYRA2Z;
281+
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_X11") return SPORK_BTX_01_HANDBRAKE_FORCE_X11;
282+
if (strName == "SPORK_BTX_01_HANDBRAKE_FORCE_X16R") return SPORK_BTX_01_HANDBRAKE_FORCE_X16R;
283+
284+
if (strName == "SPORK_BTX_15_COINBASE_MATURITY_STAGE_2") return SPORK_BTX_15_COINBASE_MATURITY_STAGE_2;
285+
if (strName == "SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK") return SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK;
286+
if (strName == "SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE") return SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE;
287+
if (strName == "SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT") return SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT;
288+
if (strName == "SPORK_BTX_23_MASTERNODE_PAYMENT_LOW_VOTING") return SPORK_BTX_23_MASTERNODE_PAYMENT_LOW_VOTING;
289289

290290
if (strName == "SPORK_BTX_18_MIN_PEER_PROTO_VERSION") return SPORK_BTX_18_MIN_PEER_PROTO_VERSION;
291-
if (strName == "SPORK_BTX_19_MIN_VERSION_COUNT") return SPORK_BTX_19_MIN_VERSION_COUNT;
292-
if (strName == "SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT") return SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT;
293-
if (strName == "SPORK_BTX_21_MAX_VERSION_COUNT") return SPORK_BTX_21_MAX_VERSION_COUNT;
294-
if (strName == "SPORK_22_FACTOR_ENFORCEMENT") return SPORK_22_FACTOR_ENFORCEMENT;
291+
if (strName == "SPORK_BTX_19_MIN_VERSION_COUNT") return SPORK_BTX_19_MIN_VERSION_COUNT;
292+
if (strName == "SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT") return SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT;
293+
if (strName == "SPORK_BTX_21_MAX_VERSION_COUNT") return SPORK_BTX_21_MAX_VERSION_COUNT;
294+
if (strName == "SPORK_22_FACTOR_ENFORCEMENT") return SPORK_22_FACTOR_ENFORCEMENT;
295295

296296
LogPrint(BCLog::SPORK, "CSporkManager::GetSporkIDByName -- Unknown Spork name '%s'\n", strName);
297297
return -1;
@@ -305,7 +305,7 @@ std::string CSporkManager::GetSporkNameByID(int nSporkID)
305305
case SPORK_5_INSTANTSEND_MAX_VALUE: return "SPORK_5_INSTANTSEND_MAX_VALUE";
306306
case SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT: return "SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT";
307307
case SPORK_9_SUPERBLOCKS_ENABLED: return "SPORK_9_SUPERBLOCKS_ENABLED";
308-
case SPORK_10_MASTERNODE_PAY_UPDATED_NODES: return "SPORK_10_MASTERNODE_PAY_UPDATED_NODES";
308+
case SPORK_10_UNKNOW: return "SPORK_10_UNKNOW";
309309
case SPORK_12_RECONSIDER_BLOCKS: return "SPORK_12_RECONSIDER_BLOCKS";
310310
case SPORK_13_OLD_SUPERBLOCK_FLAG: return "SPORK_13_OLD_SUPERBLOCK_FLAG";
311311
case SPORK_14_UNKNOW: return "SPORK_14_UNKNOW";
@@ -318,17 +318,17 @@ std::string CSporkManager::GetSporkNameByID(int nSporkID)
318318
case SPORK_BTX_01_HANDBRAKE_FORCE_X11: return "SPORK_BTX_01_HANDBRAKE_FORCE_X11";
319319
case SPORK_BTX_01_HANDBRAKE_FORCE_X16R: return "SPORK_BTX_01_HANDBRAKE_FORCE_X16R";
320320

321-
case SPORK_BTX_15_COINBASE_MATURITY_STAGE_2: return "SPORK_BTX_15_COINBASE_MATURITY_STAGE_2";
322-
case SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK: return "SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK";
323-
case SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE: return "SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE";
324-
case SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT: return "SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT";
325-
case SPORK_BTX_17_UNKNOW: return "SPORK_BTX_17_UNKNOW";
326-
327-
case SPORK_BTX_18_MIN_PEER_PROTO_VERSION: return "SPORK_BTX_18_MIN_PEER_PROTO_VERSION";
328-
case SPORK_BTX_19_MIN_VERSION_COUNT: return "SPORK_BTX_19_MIN_VERSION_COUNT";
329-
case SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT: return "SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT";
330-
case SPORK_BTX_21_MAX_VERSION_COUNT: return "SPORK_BTX_21_MAX_VERSION_COUNT";
331-
case SPORK_22_FACTOR_ENFORCEMENT: return "SPORK_22_FACTOR_ENFORCEMENT";
321+
case SPORK_BTX_15_COINBASE_MATURITY_STAGE_2: return "SPORK_BTX_15_COINBASE_MATURITY_STAGE_2";
322+
case SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK: return "SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK";
323+
case SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE: return "SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE";
324+
case SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT: return "SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT";
325+
case SPORK_BTX_23_MASTERNODE_PAYMENT_LOW_VOTING: return "SPORK_BTX_23_MASTERNODE_PAYMENT_LOW_VOTING";
326+
327+
case SPORK_BTX_18_MIN_PEER_PROTO_VERSION: return "SPORK_BTX_18_MIN_PEER_PROTO_VERSION";
328+
case SPORK_BTX_19_MIN_VERSION_COUNT: return "SPORK_BTX_19_MIN_VERSION_COUNT";
329+
case SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT: return "SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT";
330+
case SPORK_BTX_21_MAX_VERSION_COUNT: return "SPORK_BTX_21_MAX_VERSION_COUNT";
331+
case SPORK_22_FACTOR_ENFORCEMENT: return "SPORK_22_FACTOR_ENFORCEMENT";
332332

333333
default:
334334
LogPrint(BCLog::SPORK, "CSporkManager::GetSporkNameByID -- Unknown Spork ID %d\n", nSporkID);

0 commit comments

Comments
 (0)