Merge pull request #179 from AXErunners/1.4.0.2

Release 1.4.0.2
AXErunners · Jun 10, 2019 · 7f3ca5a · 7f3ca5a
2 parents bf77327 + 8edfc56
commit 7f3ca5a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 4)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_BUILD, 2)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2019)
 define(_COPYRIGHT_HOLDERS,[The %s developers])

diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -41,7 +41,7 @@ PROJECT_NAME = "Axe Core"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = 1.4.0.1
+PROJECT_NUMBER = 1.4.0.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 4
 #define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 1
+#define CLIENT_VERSION_BUILD 2
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

diff --git a/src/spork.cpp b/src/spork.cpp
@@ -26,7 +26,7 @@ std::map<int, int64_t> mapSporkDefaults = {
  {SPORK_12_RECONSIDER_BLOCKS, 0}, // 0 BLOCKS
  {SPORK_15_DETERMINISTIC_MNS_ENABLED, 0}, // ON
  {SPORK_16_INSTANTSEND_AUTOLOCKS, 0}, // ON
- {SPORK_17_QUORUM_DKG_ENABLED, 4070908800ULL}, // OFF
+ {SPORK_17_QUORUM_DKG_ENABLED, 289023},  // Hardcoded to mainnet
  {SPORK_19_CHAINLOCKS_ENABLED, 4070908800ULL}, // OFF
  {SPORK_20_INSTANTSEND_LLMQ_BASED, 4070908800ULL}, // OFF
 };