Merge pull request #58 from stratisproject/activationheight

Update mainnet activation height and client version
stratisproject · Jul 16, 2018 · 8dd4601 · 8dd4601
2 parents c15605a + 03384a7
commit 8dd4601
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       2
 #define CLIENT_VERSION_MINOR       0
 #define CLIENT_VERSION_REVISION    0
-#define CLIENT_VERSION_BUILD       4
+#define CLIENT_VERSION_BUILD       5
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

diff --git a/src/main.h b/src/main.h
@@ -57,7 +57,7 @@ static const int64_t COIN_YEAR_REWARD = 1 * CENT; // 1% per year
 
 /** TODO: adjust to actual block heights */
 static const unsigned int MIN_CONFIRMATIONS_SF_ACTIVATION_HEIGHT_TESTNET = 436000;
-static const unsigned int MIN_CONFIRMATIONS_SF_ACTIVATION_HEIGHT_MAINNET = 940000;
+static const unsigned int MIN_CONFIRMATIONS_SF_ACTIVATION_HEIGHT_MAINNET = 1005000;
 
 inline unsigned int GetStakeMinConfirmations(unsigned int height) {
     if (TestNet())

diff --git a/stratis-qt.pro b/stratis-qt.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = stratis-qt
-VERSION = 2.0.0.4
+VERSION = 2.0.0.5
 INCLUDEPATH += src src/json src/qt
 QT += network
 DEFINES += ENABLE_WALLET