diff --git a/pinkcoin-qt.pro b/pinkcoin-qt.pro index c41f669..c9abf55 100644 --- a/pinkcoin-qt.pro +++ b/pinkcoin-qt.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = Pinkcoin-Qt -VERSION = 2.2.0.2 +VERSION = 2.2.0.3 INCLUDEPATH += src src/json src/qt src/qt/plugins/mrichtexteditor DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE CONFIG += no_include_pwd diff --git a/share/qt/Info.plist b/share/qt/Info.plist index f8430ab..f36a13c 100644 --- a/share/qt/Info.plist +++ b/share/qt/Info.plist @@ -7,11 +7,11 @@ CFBundlePackageType APPL CFBundleGetInfoString - 2.2.0.2 CryptoROX, Copyright © 2016-2018 The Pinkcoin developers + 2.2.0.3 CryptoROX, Copyright © 2016-2018 The Pinkcoin developers CFBundleShortVersionString - 2.2.0.2 + 2.2.0.3 CFBundleVersion - 2.2.0.2 + 2.2.0.3 CFBundleSignature ???? CFBundleExecutable diff --git a/src/clientversion.h b/src/clientversion.h index 5217ffc..aadc6a7 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -9,7 +9,7 @@ #define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 2 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 2 +#define CLIENT_VERSION_BUILD 3 // Converts the parameter X to a string after macro replacement on X has been performed. // Don't merge these into one macro! diff --git a/src/main.cpp b/src/main.cpp index 440e21e..6b9dd61 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2443,7 +2443,7 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock) // trying to replace have less than desirable spacing or our best blocks are less than 2 minutes seconds old. int64_t nNow = GetAdjustedTime(); int heightDiff = pindexBest->nHeight - nHeight; - if(pindexBest->nTime > 1537340400 && heightDiff > -1) { // Tuesday, September 19, 2018 7:00:00 AM UTC, can get rid of the time after the fork as it only applies to live blockchain updates. + if(pindexBest->nTime > 1537340400 && heightDiff > -1 && !Checkpoints::WantedByPendingSyncCheckpoint(hash)) { // Tuesday, September 19, 2018 7:00:00 AM UTC, can get rid of the time after the fork as it only applies to live blockchain updates. printf("We're checking this one out. \n"); CBlockIndex *pindexBestCheck; for (pindexBestCheck = pindexBest ; pindexBestCheck->nHeight + 1 > nHeight; pindexBestCheck = pindexBestCheck->pprev) @@ -2466,7 +2466,6 @@ bool ProcessBlock(CNode* pfrom, CBlock* pblock) } } - // Store to disk if (!pblock->AcceptBlock()) return error("ProcessBlock() : AcceptBlock FAILED");