Skip to content

Commit

Permalink
Add checkpoints and bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
turcol committed Apr 25, 2018
1 parent dd2cc10 commit 22d1b4c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion civx-qt.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = civx-qt
VERSION = 1.0.0.2
VERSION = 1.0.0.3
INCLUDEPATH += src src/json src/qt
QT += network
DEFINES += ENABLE_WALLET
Expand Down
6 changes: 5 additions & 1 deletion src/checkpoints.cpp
Expand Up @@ -33,7 +33,11 @@ namespace Checkpoints
( 50, uint256("0x71b54f5cb27d2b0b1dd34ba89c7ff4fa8e8b37da727373cf98134069fb84803e") )
( 100, uint256("0xf1fbdb26299ca5bac77963cc2ffd9e1830c3f106b87b235b5c731b4b3259d383") )
( 500, uint256("0x72bc96ba513fb55431f335de897bb8ce80d898e17a3d4d5e05c48d1670d5f234") )
( 1000, uint256("0xf8f562cd694b5ca517aca2e1cd5b953c22a185e715209bfc2a6ae8eb0a524289") )
( 1000, uint256("0xf8f562cd694b5ca517aca2e1cd5b953c22a185e715209bfc2a6ae8eb0a524289") ) // v1.0.0.2
( 5000, uint256("0x9fbc9dc45a507a287d043b43a55e0623aca4368ca5c655bc1a7a97eef4951d1a") )
( 10000, uint256("0x45e01c13af7625b7289ed12f687864d485f603c2b5dcccfff26789bcbbc20439") )
( 14000, uint256("0xecd5ae5e58ddde01087a4c7f2033252acc7237a7aa958f4cd0eb016b3c11cd0e") )
( 18000, uint256("0x42ee388a72f85e8a63ed81bdaa4d87040a009cff8471f15e5711ab824faedaa7") ) // v1.0.0.3
;

// TestNet has no checkpoints
Expand Down
2 changes: 1 addition & 1 deletion src/clientversion.h
Expand Up @@ -9,7 +9,7 @@
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 2
#define CLIENT_VERSION_BUILD 3

// Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down
2 changes: 1 addition & 1 deletion src/main.h
Expand Up @@ -59,7 +59,7 @@ inline bool IsProtocolV1RetargetingFixed(int nHeight) { return TestNet() || nHei
inline bool IsProtocolV2(int nHeight) { return TestNet() || nHeight > 0; }
inline bool IsProtocolV3(int64_t nTime) { return TestNet() || nTime > 1523205120; }

inline bool IsDriftReduced(int64_t nTime) { return TestNet() || nTime > 1525910400; } // PoS - Thu May 10,2018 00:00:00 GMT
inline bool IsDriftReduced(int64_t nTime) { return TestNet() || nTime > 1526428800; } // PoS - Wed May 16,2018 00:00:00 GMT

inline int64_t TestingDrift(int64_t nTime) { return nTime + 128 * 60 * 60; }
inline int64_t MainNetDrift(int64_t nTime) { return nTime + 15; }
Expand Down

0 comments on commit 22d1b4c

Please sign in to comment.