Merge pull request #302 from graft-project/release-1.8.0-version-bump

Release 1.8.0
graft-project · May 30, 2019 · 7a274c2 · 7a274c2
2 parents 743e9ce + 589235e
commit 7a274c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
@@ -123,8 +123,8 @@ static const struct {
   { 12, 299200, 0, 1551934800 },
   // hf 13 - RTA transactions, RTA mining, ~2019-03-20T14:00:00+00
   { 13, 308460, 0, 1553090400 },
-  // hf 14 Bullet proof
-  { 14, 500000, 0, 1560000000 },
+  // hf 14 Bullet proof, ~2019-06-06T15:00:00+00
+  { 14, 364590, 0, 1559833200 },
 };
 // static const uint64_t mainnet_hard_fork_version_1_till = 1009826;
 static const uint64_t mainnet_hard_fork_version_1_till = 1;

diff --git a/src/version.cpp.in b/src/version.cpp.in
@@ -1,5 +1,5 @@
 #define DEF_GRAFT_VERSION_TAG "@VERSIONTAG@"
-#define DEF_GRAFT_VERSION "1.8.0-rc"
+#define DEF_GRAFT_VERSION "1.8.0"
 #define DEF_GRAFT_RELEASE_NAME "Vela Pulsar"
 #define DEF_GRAFT_VERSION_FULL DEF_GRAFT_VERSION "-" DEF_GRAFT_VERSION_TAG