Merge branch 'KYAN-develop' of https://github.com/decenomy/DSW

decenomy · May 29, 2023 · b1bc197 · b1bc197
2 parents 1069d0e + 687d810
commit b1bc197
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -1,8 +1,8 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
-define(_CLIENT_VERSION_MINOR, 2)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_REVISION, 4)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_RC, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)

diff --git a/src/chain.h b/src/chain.h
@@ -283,7 +283,7 @@ class CBlockIndex
 // New serialization introduced on PIVX
 static const int DBI_SER_VERSION_NO_MS = 0;   // removes nMoneySupply from persisted block index
 // New serialization introduced on DSW
-static const int DBI_SER_VERSION_MS = 1020000;   // reintroduces the nMoneySupply to the persisted block index
+static const int DBI_SER_VERSION_MS = 1010400;   // reintroduces the nMoneySupply to the persisted block index
 
 class CDiskBlockIndex : public CBlockIndex
 {

diff --git a/src/version.h b/src/version.h
@@ -12,7 +12,7 @@
  * network protocol versioning
  */
 
-static const int PROTOCOL_VERSION = 70226;
+static const int PROTOCOL_VERSION = 70225;
 
 //! initial proto version, to be increased after version/verack negotiation
 static const int INIT_PROTO_VERSION = 209;