Skip to content

Commit f1c1d98

Browse files
author
Chris
committed
Patch 2.1.0.1
Add command -killdebug, You can now add "-killdebug=1" or in the bitcloud.conf "killdebug=1" to stop any writing from logs. Add checkpoint and small changes.
1 parent 3287f75 commit f1c1d98

File tree

8 files changed

+22
-9
lines changed

8 files changed

+22
-9
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, 2)
44
define(_CLIENT_VERSION_MINOR, 1)
55
define(_CLIENT_VERSION_REVISION, 0)
6-
define(_CLIENT_VERSION_BUILD, 0)
6+
define(_CLIENT_VERSION_BUILD, 1)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2018)
99
AC_INIT([Bitcloud Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://bit-cloud.info],[bitcloud])

src/chainparams.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ static Checkpoints::MapCheckpoints mapCheckpoints =
5959
(82499, uint256("0x812232aa0007f1e2a5f03aa4738ecc7cb6e0a60a8bf83e9a3a7c8ac78ede46d2"))
6060
(82500, uint256("0x855b1b87bfc850560126dbc3a4e10bc3e6b38b2a99e49cdc95a86fa570871256"))
6161
(100000, uint256("0x4789e3f2559025345c2d5e819b97b236605fb2da2ecd917a00cb79d71ee075b2"))
62-
(108000, uint256("0x4d5d78d85b007599426fca0522279c31770fe7178e8b453526425b97c4878e43"));
62+
(108000, uint256("0x4d5d78d85b007599426fca0522279c31770fe7178e8b453526425b97c4878e43"))
63+
(144560, uint256("0x3cfbbaa9a2a4e37f901bb6d4dc87cb48b11baf035a8022faf1e9672021764ace"));
6364

6465
static const Checkpoints::CCheckpointData data = {
6566
&mapCheckpoints,
66-
1535830674, // * UNIX timestamp of last checkpoint block
67+
1547062532, // * UNIX timestamp of last checkpoint block
6768
291584, // * total number of transactions between genesis and last checkpoint
6869
// (the tx=... number in the SetBestChain debug.log lines)
6970
2000 // * estimated number of transactions per day after checkpoint

src/init.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,11 +432,12 @@ std::string HelpMessage(HelpMessageMode mode)
432432
}
433433
strUsage += HelpMessageOpt("-minrelaytxfee=<amt>", strprintf(_("Fees (in BTDX/Kb) smaller than this are considered zero fee for relaying (default: %s)"), FormatMoney(::minRelayTxFee.GetFeePerK())));
434434
strUsage += HelpMessageOpt("-printtoconsole", strprintf(_("Send trace/debug info to console instead of debug.log file (default: %u)"), 0));
435+
strUsage += HelpMessageOpt("-killdebug", strprintf(_("Stop any writing in debug.log (default: %u)"), 0));
435436
if (GetBoolArg("-help-debug", false)) {
436437
strUsage += HelpMessageOpt("-printpriority", strprintf(_("Log transaction priority and fee per kB when mining blocks (default: %u)"), 0));
437438
strUsage += HelpMessageOpt("-privdb", strprintf(_("Sets the DB_PRIVATE flag in the wallet db environment (default: %u)"), 1));
438439
strUsage += HelpMessageOpt("-regtest", _("Enter regression test mode, which uses a special chain in which blocks can be solved instantly.") + " " +
439-
_("This is intended for regression testing tools and app development.") + " " +
440+
_("This is intended for regression testing tools and app developmenFprintt.") + " " +
440441
_("In this mode -genproclimit controls how many blocks are generated immediately."));
441442
}
442443
strUsage += HelpMessageOpt("-shrinkdebugfile", _("Shrink debug.log file on client startup (default: 1 when no -debug)"));
@@ -691,6 +692,7 @@ bool AppInit2(boost::thread_group& threadGroup)
691692
fPrintToConsole = GetBoolArg("-printtoconsole", false);
692693
fLogTimestamps = GetBoolArg("-logtimestamps", true);
693694
fLogIPs = GetBoolArg("-logips", false);
695+
fkilldebug = !GetBoolArg("-killdebug", true);
694696

695697
if (mapArgs.count("-bind") || mapArgs.count("-whitebind")) {
696698
// when specifying an explicit binding address, you want to listen on it

src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4931,7 +4931,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
49314931
if (pindex)
49324932
pindex = chainActive.Next(pindex);
49334933
int nLimit = 500;
4934-
//LogPrintf("getblocks %d to %s limit %d from peer=%d\n", (pindex ? pindex->nHeight : -1), hashStop == uint256(0) ? "end" : hashStop.ToString(), nLimit, pfrom->id);
4934+
LogPrintf("getblocks %d to %s limit %d from peer=%d\n", (pindex ? pindex->nHeight : -1), hashStop == uint256(0) ? "end" : hashStop.ToString(), nLimit, pfrom->id);
49354935
for (; pindex; pindex = chainActive.Next(pindex)) {
49364936
if (pindex->GetBlockHash() == hashStop) {
49374937
LogPrint("net", " getblocks stopping at %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());

src/masternode-payments.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Copyright (c) 2014-2015 The Dash developers
2-
// Copyright (c) 2015-2017 The PIVX developers
2+
// Copyright (c) 2015-2017 The PIVX developers
33
// Copyright (c) 2015-2017 The BTDX developers
44
// Distributed under the MIT/X11 software license, see the accompanying
55
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -301,7 +301,7 @@ void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, int64_t nFe
301301

302302
CAmount blockValue = GetBlockValue(pindexPrev->nHeight +1 );
303303
CAmount masternodePayment = GetMasternodePayment(pindexPrev->nHeight +1, blockValue);
304-
304+
305305

306306
if (hasPayment) {
307307
if (fProofOfStake) {
@@ -333,10 +333,18 @@ void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, int64_t nFe
333333

334334
LogPrintf("Masternode payment of %s to %s\n", FormatMoney(masternodePayment).c_str(), address2.ToString().c_str());
335335
}
336+
else
337+
{
338+
if( pindexPrev->nHeight + 1 <= Params().LAST_POW_BLOCK())
339+
{
340+
txNew.vout[0].nValue = nFees + blockValue;
341+
LogPrintf("POW Modus:CreateNewBlock: blockvalue to pay value %u\n", blockValue);
342+
}
343+
}
336344
}
337345

338346
int CMasternodePayments::GetMinMasternodePaymentsProto()
339-
{
347+
{
340348
if (IsSporkActive(SPORK_10_MASTERNODE_PAY_UPDATED_NODES))
341349
return ActiveProtocol(); // Allow only updated peers
342350
else

src/masternodeman.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ int CMasternodeMan::GetMasternodeRank(const CTxIn& vin, int64_t nBlockHeight, in
588588
if (IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)) {
589589
nMasternode_Age = mn.lastPing.sigTime - mn.sigTime;
590590
if ((nMasternode_Age) < nMasternode_Min_Age) {
591-
//LogPrintf("Skipping just activated Masternode. Age: %ld\n", nMasternode_Age);
591+
LogPrintf("Skipping just activated Masternode. Age: %ld\n", nMasternode_Age);
592592
continue; // Skip masternodes younger than (default) 1 hour
593593
}
594594
}

src/util.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ map<string, vector<string> > mapMultiArgs;
129129
bool fDebug = false;
130130
bool fPrintToConsole = false;
131131
bool fPrintToDebugLog = true;
132+
bool fkilldebug = false;
132133
bool fDaemon = false;
133134
bool fServer = false;
134135
string strMiscWarning;

src/util.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ extern std::map<std::string, std::vector<std::string> > mapMultiArgs;
5252
extern bool fDebug;
5353
extern bool fPrintToConsole;
5454
extern bool fPrintToDebugLog;
55+
extern bool fkilldebug;
5556
extern bool fServer;
5657
extern std::string strMiscWarning;
5758
extern bool fLogTimestamps;

0 commit comments

Comments
 (0)