Skip to content

Commit 0aee58d

Browse files
author
limxdev
committed
Merge branch 'master' of https://github.com/LIMXTEC/BitCore into 0.9.8.x
2 parents 9846cc3 + d949d33 commit 0aee58d

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 0)
44
define(_CLIENT_VERSION_MINOR, 90)
55
define(_CLIENT_VERSION_REVISION, 8)
6-
define(_CLIENT_VERSION_BUILD, 9)
6+
define(_CLIENT_VERSION_BUILD, 10)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2020)
99
define(_COPYRIGHT_HOLDERS,[The %s developers])

‎src/masternode-payments.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,12 @@ 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+
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+
}
146152

147153
if(nBlockHeight < consensusParams.nSuperblockStartBlock) {
148154
if(mnpayments.IsTransactionValid(txNew, nBlockHeight)) {
@@ -165,7 +171,7 @@ bool IsBlockPayeeValid(const CTransactionRef txNew, int nBlockHeight, CAmount bl
165171
}
166172

167173
if(sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)) {
168-
//if (!sporkManager.IsSporkActive(SPORK_BTX_16_UNKNOW) && !sporkManager.IsSporkActive(SPORK_BTX_17_UNKNOW)) {
174+
//if (!sporkManager.IsSporkActive(SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT) && !sporkManager.IsSporkActive(SPORK_BTX_17_UNKNOW)) {
169175
LogPrintf("IsBlockPayeeValid -- ERROR: Invalid masternode payment detected at height %d: %s\n", nBlockHeight, txNew->ToString());
170176
return false;
171177
} else {

‎src/spork.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ bool CSporkManager::IsSporkActive(int nSporkID)
198198
case SPORK_BTX_15_COINBASE_MATURITY_STAGE_2: r = SPORK_BTX_15_COINBASE_MATURITY_STAGE_2_DEFAULT; break;
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;
201-
case SPORK_BTX_16_UNKNOW: r = SPORK_BTX_16_UNKNOW_DEFAULT; break;
201+
case SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT: r = SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT; break;
202202
case SPORK_BTX_17_UNKNOW: r = SPORK_BTX_17_UNKNOW_DEFAULT; break;
203203

204204
case SPORK_BTX_18_MIN_PEER_PROTO_VERSION: r = SPORK_BTX_18_MIN_PEER_PROTO_VERSION_DEFAULT; break;
@@ -245,13 +245,13 @@ 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_BTX_16_UNKNOW: return SPORK_BTX_16_UNKNOW_DEFAULT;
248+
case SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT: return SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT;
249249
case SPORK_BTX_17_UNKNOW: return SPORK_BTX_17_UNKNOW_DEFAULT;
250250

251251
case SPORK_BTX_18_MIN_PEER_PROTO_VERSION: return SPORK_BTX_18_MIN_PEER_PROTO_VERSION_DEFAULT;
252-
case SPORK_BTX_19_MIN_VERSION_COUNT: return SPORK_BTX_19_MIN_VERSION_COUNT_DEFAULT;
253-
case SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT: return SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT_DEFAULT;
254-
case SPORK_BTX_21_MAX_VERSION_COUNT: return SPORK_BTX_21_MAX_VERSION_COUNT_DEFAULT;
252+
case SPORK_BTX_19_MIN_VERSION_COUNT: return SPORK_BTX_19_MIN_VERSION_COUNT_DEFAULT;
253+
case SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT: return SPORK_BTX_20_MIN_FOR_WORK_VERSION_COUNT_DEFAULT;
254+
case SPORK_BTX_21_MAX_VERSION_COUNT: return SPORK_BTX_21_MAX_VERSION_COUNT_DEFAULT;
255255
case SPORK_BTX_22_UNKNOW: return SPORK_BTX_22_UNKNOW_DEFAULT;
256256

257257
default:
@@ -284,7 +284,7 @@ int CSporkManager::GetSporkIDByName(std::string strName)
284284
if (strName == "SPORK_BTX_15_COINBASE_MATURITY_STAGE_2") return SPORK_BTX_15_COINBASE_MATURITY_STAGE_2;
285285
if (strName == "SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK") return SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK;
286286
if (strName == "SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE") return SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE;
287-
if (strName == "SPORK_BTX_16_UNKNOW") return SPORK_BTX_16_UNKNOW;
287+
if (strName == "SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT") return SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT;
288288
if (strName == "SPORK_BTX_17_UNKNOW") return SPORK_BTX_17_UNKNOW;
289289

290290
if (strName == "SPORK_BTX_18_MIN_PEER_PROTO_VERSION") return SPORK_BTX_18_MIN_PEER_PROTO_VERSION;
@@ -321,7 +321,7 @@ std::string CSporkManager::GetSporkNameByID(int nSporkID)
321321
case SPORK_BTX_15_COINBASE_MATURITY_STAGE_2: return "SPORK_BTX_15_COINBASE_MATURITY_STAGE_2";
322322
case SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK: return "SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK";
323323
case SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE: return "SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE";
324-
case SPORK_BTX_16_UNKNOW: return "SPORK_BTX_16_UNKNOW";
324+
case SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT: return "SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT";
325325
case SPORK_BTX_17_UNKNOW: return "SPORK_BTX_17_UNKNOW";
326326

327327
case SPORK_BTX_18_MIN_PEER_PROTO_VERSION: return "SPORK_BTX_18_MIN_PEER_PROTO_VERSION";

‎src/spork.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static const int SPORK_BTX_01_HANDBRAKE_FORCE_X16R = 94680016;
5252
static const int SPORK_BTX_15_COINBASE_MATURITY_STAGE_2 = 94680021;
5353
static const int SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK = 94680022;
5454
static const int SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE = 94680023;
55-
static const int SPORK_BTX_16_UNKNOW = 94680024;
55+
static const int SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT = 94680024;
5656
static const int SPORK_BTX_17_UNKNOW = 94680025;
5757

5858
static const int SPORK_BTX_18_MIN_PEER_PROTO_VERSION = 94680031;
@@ -83,7 +83,7 @@ static const int64_t SPORK_BTX_01_HANDBRAKE_FORCE_X16R_DEFAULT = 1;
8383
static const int64_t SPORK_BTX_15_COINBASE_MATURITY_STAGE_2_DEFAULT = 4070908800ULL;// OFF
8484
static const int64_t SPORK_BTX_02_IGNORE_EXTRA_REWARD_CHECK_DEFAULT = 4070908800ULL;// OFF
8585
static const int64_t SPORK_BTX_02_IGNORE_EXTRA_REWARD_VALUE_DEFAULT = 4070908800ULL;// OFF
86-
static const int64_t SPORK_BTX_16_UNKNOW_DEFAULT = 4070908800ULL;// OFF
86+
static const int64_t SPORK_22_MASTERNODE_PAYMENT_ENFORCEMENT_DEFAULT = 4070908800ULL;// OFF
8787
static const int64_t SPORK_BTX_17_UNKNOW_DEFAULT = 4070908800ULL;// OFF
8888

8989
static const int64_t SPORK_BTX_18_MIN_PEER_PROTO_VERSION_DEFAULT = 70016;// OFF

‎src/version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* network protocol versioning
1313
*/
1414

15-
static const int PROTOCOL_VERSION = 80002;
15+
static const int PROTOCOL_VERSION = 80004;
1616

1717
//! initial proto version, to be increased after version/verack negotiation
1818
static const int INIT_PROTO_VERSION = 209;

0 commit comments

Comments
 (0)