Skip to content

Commit cc5cb5d

Browse files
author
limxdev
committed
Merge branch '0.9.8.x' of https://github.com/LIMXTEC/BitCore into 0.9.8.x
2 parents f601817 + 51cdd76 commit cc5cb5d

10 files changed

Lines changed: 34 additions & 30 deletions

File tree

‎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, 7)
6+
define(_CLIENT_VERSION_BUILD, 8)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2020)
99
define(_COPYRIGHT_HOLDERS,[The %s developers])

‎contrib/seeds/nodes_main.txt‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
# List of fixed seed nodes for mainnet
22

3-
80.211.195.230:9468
4-
194.182.84.184:9468
5-
81.2.239.169:9468
6-
80.211.219.25:9468
7-
185.28.101.48:9468
8-
80.211.139.4:9468
9-
80.211.0.105:9468
10-
94.177.217.18:9468
11-
[2001:15e8:110:42e6::1]:9468
12-
[2001:15e8:110:73b8::1]:9468
13-
[2001:15e8:110:7a9::1]:9468
14-
[2001:15e8:110:5a19::1]:9468
15-
[2001:15e8:110:2930::1]:9468
16-
[2a00:6d40:72:3404::1]:9468
17-
[2a00:6d40:72:6f69::1]:9468
18-
[2a00:6d40:60:b412::1]:9468
3+
101.69.32.105:8555
4+
115.201.201.37:8555
5+
147.135.86.64:8555
6+
185.194.140.60:8555
7+
223.220.144.228:8555
8+
223.220.145.146:8555
9+
37.120.186.85:8555
10+
37.120.190.76:8555
11+
46.211.0.246:8555
12+
63.226.81.170:8555
13+
87.178.208.126:8555
14+
87.178.212.232:8555
15+
168.232.213.130:8555
16+
185.50.24.19:8555
17+
201.209.185.60:8555
18+
85.130.25.79:8555
19+
93.192.188.220:8555

‎masternode.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ Group=${user}
276276
277277
Type=forking
278278
PIDFile=${data_dir}/${name}/testnet/${name}.pid
279-
ExecStart=${daemon_dir}/${daemon} -daemon -testnet -port=9468 -pid=${data_dir}/${name}/testnet/${name}.pid -conf=${conf_dir}/${name}.conf -datadir=${data_dir}/${name}
279+
ExecStart=${daemon_dir}/${daemon} -daemon -testnet -port=8555 -pid=${data_dir}/${name}/testnet/${name}.pid -conf=${conf_dir}/${name}.conf -datadir=${data_dir}/${name}
280280
ExecStop=${cli_dir}/${cli} stop -conf=${conf_dir}/${name}.conf -datadir=${data_dir}/${name}
281281
282282
Restart=always
@@ -456,7 +456,7 @@ if [[ "$testnet" -eq 1 ]]; then
456456
sleep 30
457457
systemctl enable ${name}.testnet.service
458458
systemctl start ${name}.testnet.service
459-
sudo -u ${user} -- bash -c "${daemon_dir}/${daemon} -testnet -port=9468 -conf=${conf_dir}/${name}.conf -datadir=${data_dir}/${name}"
459+
sudo -u ${user} -- bash -c "${daemon_dir}/${daemon} -testnet -port=8555 -conf=${conf_dir}/${name}.conf -datadir=${data_dir}/${name}"
460460
else
461461
systemctl daemon-reload
462462
sleep 30

‎src/chainparams.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ class CMainParams : public CChainParams {
104104
consensus.nGovernanceFilterElements = 20000;
105105

106106
// FXTC TODO: BIP16Exception is valid for BTC blockchain only
107-
consensus.BIP16Exception = uint256S("0x88");
107+
consensus.BIP16Exception = uint256S("0x580a107e111bea326b64dc098c057a3b96622c1521c23e4f5b51647aa5e41ecb");
108108
consensus.BIP34Height = 2; // BTX
109-
consensus.BIP34Hash = uint256S("604148281e5c4b7f2487e5d03cd60d8e6f69411d613f6448034508cea52e9574"); // BTX
109+
consensus.BIP34Hash = uint256S("0x580a107e111bea326b64dc098c057a3b96622c1521c23e4f5b51647aa5e41ecb"); // BTX
110110
consensus.BIP65Height = 2; // BTX
111111
consensus.BIP66Height = 2; // BTX
112112
consensus.powLimit = uint256S("0x00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");

‎src/masternode-payments.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ bool CMasternodeBlockPayees::IsTransactionValid(const CTransactionRef txNew)
592592
}
593593
}
594594

595-
LogPrintf("CMasternodeBlockPayees::IsTransactionValid -- ERROR: Missing required payment, possible payees: '%s', amount: %f DASH\n", strPayeesPossible, (float)nMasternodePayment/COIN);
595+
LogPrintf("CMasternodeBlockPayees::IsTransactionValid -- ERROR: Missing required payment, possible payees: '%s', amount: %f BTX\n", strPayeesPossible, (float)nMasternodePayment/COIN);
596596
return false;
597597
}
598598

‎src/masternode.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,18 +244,21 @@ void CMasternode::Check(bool fForce)
244244
}
245245

246246
bool fWatchdogActive = masternodeSync.IsSynced() && mnodeman.IsWatchdogActive();
247-
bool fWatchdogExpired = (fWatchdogActive && ((GetAdjustedTime() - nTimeLastWatchdogVote) > MASTERNODE_WATCHDOG_MAX_SECONDS));
247+
//bool fWatchdogExpired = (fWatchdogActive && ((GetAdjustedTime() - nTimeLastWatchdogVote) > MASTERNODE_WATCHDOG_MAX_SECONDS));
248+
bool fWatchdogExpired = false;
248249

249-
LogPrint(BCLog::MASTERNODE, "CMasternode::Check -- outpoint=%s, nTimeLastWatchdogVote=%d, GetAdjustedTime()=%d, fWatchdogExpired=%d\n",
250+
//LogPrint(BCLog::MASTERNODE, "CMasternode::Check -- outpoint=%s, nTimeLastWatchdogVote=%d, GetAdjustedTime()=%d, fWatchdogExpired=%d\n",
250251
vin.prevout.ToStringShort(), nTimeLastWatchdogVote, GetAdjustedTime(), fWatchdogExpired);
251252

253+
252254
if(fWatchdogExpired) {
253255
nActiveState = MASTERNODE_WATCHDOG_EXPIRED;
254256
if(nActiveStatePrev != nActiveState) {
255257
LogPrint(BCLog::MASTERNODE, "CMasternode::Check -- Masternode %s is in %s state now\n", vin.prevout.ToStringShort(), GetStateString());
256258
}
257259
return;
258260
}
261+
259262

260263
if(!IsPingedWithin(MASTERNODE_EXPIRATION_SECONDS)) {
261264
nActiveState = MASTERNODE_EXPIRED;

‎src/masternodeconfig.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ bool CMasternodeConfig::read(std::string& strErr) {
6767
if (configFile != NULL) {
6868
std::string strHeader2 = "# Masternode config file\n"
6969
"# Format: alias IP:port masternodeprivkey collateral_output_txid collateral_output_index\n"
70-
"# Example: mn1 127.0.0.2:9468 7y9mBodVbq5nytRyZNg169ABTeKffDNqekCPiXKWGP2ZYDRHYbk ddaa0ebeed10aef980adbf9579718aed85b533eb5816adde661221f656382dd60\n";
70+
"# Example: mn1 127.0.0.2:8555 7y9mBodVbq5nytRyZNg169ABTeKffDNqekCPiXKWGP2ZYDRHYbk ddaa0ebeed10aef980adbf9579718aed85b533eb5816adde661221f656382dd60\n";
7171
fwrite(strHeader2.c_str(), std::strlen(strHeader2.c_str()), 1, configFile);
7272
fclose(configFile);
7373
}

‎src/qt/bitcoin.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ int main(int argc, char *argv[])
582582
/// 7a. parse masternode.conf
583583
std::string strErr;
584584
if(!masternodeConfig.read(strErr)) {
585-
QMessageBox::critical(0, QObject::tr("Dash Core"),
585+
QMessageBox::critical(0, QObject::tr("BitCore Core"),
586586
QObject::tr("Error reading masternode configuration file: %1").arg(strErr.c_str()));
587587
return EXIT_FAILURE;
588588
}

‎src/rpc/mining.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,13 +568,13 @@ static UniValue getblocktemplate(const JSONRPCRequest& request)
568568
if (sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)
569569
&& !masternodeSync.IsWinnersListSynced()
570570
&& !mnpayments.GetBlockPayee(chainActive.Height() + 1, payee))
571-
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Dash Core is downloading masternode winners...");
571+
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcore is downloading masternode winners...");
572572

573573
// next bock is a superblock and we need governance info to correctly construct it
574574
if (sporkManager.IsSporkActive(SPORK_9_SUPERBLOCKS_ENABLED)
575575
&& !masternodeSync.IsSynced()
576576
&& CSuperblock::IsValidBlockHeight(chainActive.Height() + 1))
577-
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Dash Core is syncing with network...");
577+
throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, "Bitcore is syncing with network...");
578578
//
579579

580580
static unsigned int nTransactionsUpdatedLast;

‎src/validation.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2259,12 +2259,12 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
22592259
std::string strError = "";
22602260
//if (!sporkManager.IsSporkActive(SPORK_BTX_99_IGNORE_MASTERNODE_REWARD_VALUE) && !IsBlockValueValid(block, pindex->nHeight, block.vtx[0]->GetValueOut(), strError)) {
22612261
if (!IsBlockValueValid(block, pindex->nHeight, block.vtx[0]->GetValueOut(), strError)) {
2262-
return state.DoS(0, error("ConnectBlock(DASH): %s", strError), REJECT_INVALID, "bad-cb-amount");
2262+
return state.DoS(0, error("ConnectBlock(BTX): %s", strError), REJECT_INVALID, "bad-cb-amount");
22632263
}
22642264
//if (!sporkManager.IsSporkActive(SPORK_BTX_99_IGNORE_MASTERNODE_REWARD_PAYEE) && !IsBlockPayeeValid(block.vtx[0], pindex->nHeight, block.vtx[0]->GetValueOut(), pindex->GetBlockHeader())) {
22652265
if (!IsBlockPayeeValid(block.vtx[0], pindex->nHeight, block.vtx[0]->GetValueOut(), pindex->GetBlockHeader())) {
22662266
mapRejectedBlocks.insert(make_pair(block.GetHash(), GetTime()));
2267-
return state.DoS(0, error("ConnectBlock(DASH): couldn't find masternode or superblock payments"),
2267+
return state.DoS(0, error("ConnectBlock(BTX): couldn't find masternode or superblock payments"),
22682268
REJECT_INVALID, "bad-cb-payee");
22692269
}
22702270
// END DASH

0 commit comments

Comments
 (0)