diff --git a/configure.ac b/configure.ac index 373c9356..9eefbc29 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 9) define(_CLIENT_VERSION_REVISION, 9) -define(_CLIENT_VERSION_BUILD, 3) +define(_CLIENT_VERSION_BUILD, 4) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2020) define(_COPYRIGHT_HOLDERS,[The %s developers]) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 179aa09d..db22d7e4 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -215,14 +215,15 @@ class CMainParams : public CChainParams { { 1001795, uint256S("0x0555327b8f542a4b1fb3de8c4d988ea46e687b9bd8ce406e1b2aea49fe959391")}, { 1253244, uint256S("0x058403d520ee00f1f2651eddb1e9a105145481cdfdc9a1b4eb0f8bd8ba68fa9f")}, { 1269715, uint256S("0xab6b610ec05a663343e635a54213f4f4eac13c4d0703a104ae1ea9b72cf2a9b8")}, + { 1299115, uint256S("0x93ebdcb6c6378bf9c19f47aa3a1ffb1d18d8325636507c159f2ac90afb247ecc")}, } }; // MEC for faster loading - consensus.nlastValidPowHashHeight = 1269715; + consensus.nlastValidPowHashHeight = 1299115; chainTxData = ChainTxData{ // Megacoin: data as of block 0x8da1c7f79018fac8acac69a57b2f8b5d2743af67976a4525fdedc8c85a3a1418 (height 410476). - 1521658394, // * UNIX timestamp of last known number of transactions + 1595274616, // * UNIX timestamp of last known number of transactions 1000000, // * total number of transactions between genesis and that timestamp // (the tx=... number in the SetBestChain debug.log lines) 1 // * estimated number of transactions per second after that timestamp diff --git a/src/validation.cpp b/src/validation.cpp index 675729ff..8f68aeed 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2257,12 +2257,12 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl std::string strError = ""; //if (!sporkManager.IsSporkActive(SPORK_MEGACOIN_99_IGNORE_MASTERNODE_REWARD_VALUE) && !IsBlockValueValid(block, pindex->nHeight, block.vtx[0]->GetValueOut(), strError)) { if (!IsBlockValueValid(block, pindex->nHeight, block.vtx[0]->GetValueOut(), strError)) { - return state.DoS(0, error("ConnectBlock(DASH): %s", strError), REJECT_INVALID, "bad-cb-amount"); + return state.DoS(0, error("ConnectBlock(MEC): %s", strError), REJECT_INVALID, "bad-cb-amount"); } //if (!sporkManager.IsSporkActive(SPORK_MEGACOIN_99_IGNORE_MASTERNODE_REWARD_PAYEE) && !IsBlockPayeeValid(block.vtx[0], pindex->nHeight, block.vtx[0]->GetValueOut(), pindex->GetBlockHeader())) { if (!IsBlockPayeeValid(block.vtx[0], pindex->nHeight, block.vtx[0]->GetValueOut(), pindex->GetBlockHeader())) { mapRejectedBlocks.insert(make_pair(block.GetHash(), GetTime())); - return state.DoS(0, error("ConnectBlock(DASH): couldn't find masternode or superblock payments"), + return state.DoS(0, error("ConnectBlock(MEC): couldn't find masternode or superblock payments"), REJECT_INVALID, "bad-cb-payee"); } // END DASH @@ -2466,7 +2466,7 @@ void static UpdateTip(const CBlockIndex *pindexNew, const CChainParams& chainPar if (state == ThresholdState::ACTIVE || state == ThresholdState::LOCKED_IN) { const std::string strWarning = strprintf(_("Warning: unknown new rules activated (versionbit %i)"), bit); if (state == ThresholdState::ACTIVE) { - DoWarning(strWarning); + //DoWarning(strWarning); } else { AppendWarning(warningMessages, strWarning); }