Merge pull request #125 from zelcash/release-v4.0.5

Release v4.0.5
RunOnFlux · Dec 18, 2020 · 306e4f2 · 306e4f2
2 parents a020019 + da7cda6
commit 306e4f2
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Zel 4.0.4
+# Zel 4.0.5
 [![Build Status](https://travis-ci.com/zelcash/zelcash.svg?branch=master)](https://travis-ci.com/zelcash/zelcash)
 <img align="right" height=112 width=562 src="doc/imgs/kamata.png">
 

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 4)
+define(_CLIENT_VERSION_REVISION, 5)
 define(_CLIENT_VERSION_BUILD, 50)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
@@ -1,3 +1,9 @@
+zelcash (4.0.5) stable; urgency=medium
+
+  * 4.0.5 release.
+
+ -- Zel Foundation <info@zel.cash>  Fri, 18 Dec 2020 03:22:05 +0100
+
 zelcash (4.0.4) stable; urgency=medium
 
   * 4.0.4 release.

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "zelcash-4.0.4"
+name: "zelcash-4.0.5"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/doc/authors.md b/doc/authors.md
@@ -2,10 +2,10 @@ Zel Contributors
 ==================
 
 Jeremy "Blondfrogs" Anderson (59)
-Tadeas Kmenta (29)
+Tadeas Kmenta (31)
 Miles Manley (18)
+Cabecinha84 (5)
 Jack Grigg (4)
-Cabecinha84 (4)
 Dimitris Apostolou (2)
 Wilke "Lolliedieb" Trei (1)
 Sean Bowe (1)

diff --git a/doc/man/zelcash-cli.1 b/doc/man/zelcash-cli.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZELCASH-CLI "1" "December 2020" "zelcash-cli v4.0.4-aad478e48" "User Commands"
+.TH ZELCASH-CLI "1" "December 2020" "zelcash-cli v4.0.5-e1608d2ea" "User Commands"
 .SH NAME
-zelcash-cli \- manual page for zelcash-cli v4.0.4-aad478e48
+zelcash-cli \- manual page for zelcash-cli v4.0.5-e1608d2ea
 .SH DESCRIPTION
-Zelcash RPC client version v4.0.4\-aad478e48
+Zelcash RPC client version v4.0.5\-e1608d2ea
 .PP
 In order to ensure you are adequately protecting your privacy when using
 Zelcash, please see <https://z.cash/support/security/>.

diff --git a/doc/man/zelcash-tx.1 b/doc/man/zelcash-tx.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZELCASH-TX "1" "December 2020" "zelcash-tx v4.0.4-aad478e48" "User Commands"
+.TH ZELCASH-TX "1" "December 2020" "zelcash-tx v4.0.5-e1608d2ea" "User Commands"
 .SH NAME
-zelcash-tx \- manual page for zelcash-tx v4.0.4-aad478e48
+zelcash-tx \- manual page for zelcash-tx v4.0.5-e1608d2ea
 .SH DESCRIPTION
-Zelcash zelcash\-tx utility version v4.0.4\-aad478e48
+Zelcash zelcash\-tx utility version v4.0.5\-e1608d2ea
 .SS "Usage:"
 .TP
 zelcash\-tx [options] <hex\-tx> [commands]

diff --git a/doc/man/zelcashd.1 b/doc/man/zelcashd.1
@@ -1,9 +1,9 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH ZELCASHD "1" "December 2020" "zelcashd v4.0.4-aad478e48" "User Commands"
+.TH ZELCASHD "1" "December 2020" "zelcashd v4.0.5-e1608d2ea" "User Commands"
 .SH NAME
-zelcashd \- manual page for zelcashd v4.0.4-aad478e48
+zelcashd \- manual page for zelcashd v4.0.5-e1608d2ea
 .SH DESCRIPTION
-Zelcash Daemon version v4.0.4\-aad478e48
+Zelcash Daemon version v4.0.5\-e1608d2ea
 .PP
 In order to ensure you are adequately protecting your privacy when using
 Zelcash, please see <https://z.cash/support/security/>.

diff --git a/doc/release-notes/release-notes-4.0.5.md b/doc/release-notes/release-notes-4.0.5.md
@@ -0,0 +1,10 @@
+Changelog
+=========
+
+Cabecinha84 (1):
+      Fix Possible cause of daemon crash
+
+Tadeas Kmenta (2):
+      make-release.py: Versioning changes for 4.0.5.
+      make-release.py: Updated manpages for 4.0.5.
+
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -17,7 +17,7 @@
 //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR 4
 #define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 4
+#define CLIENT_VERSION_REVISION 5
 #define CLIENT_VERSION_BUILD 50
 
 //! Set to true for release, false for prerelease or test build

diff --git a/src/config/bitcoin-config.h b/src/config/bitcoin-config.h
@@ -21,7 +21,7 @@
 #define CLIENT_VERSION_MINOR 0
 
 /* Build revision */
-#define CLIENT_VERSION_REVISION 4
+#define CLIENT_VERSION_REVISION 5
 
 /* Version is release */
 #define COPYRIGHT_YEAR 2019
@@ -290,7 +290,7 @@
 #define PACKAGE_NAME "Zelcash"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Zelcash 4.0.4"
+#define PACKAGE_STRING "Zelcash 4.0.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "zelcash"
@@ -299,7 +299,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "4.0.4"
+#define PACKAGE_VERSION "4.0.5"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */

diff --git a/src/deprecation.h b/src/deprecation.h
@@ -10,7 +10,7 @@
 // * Shut down 52 weeks' worth of blocks after the estimated release block height.
 // * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
 
-static const int APPROX_RELEASE_HEIGHT = 745000;
+static const int APPROX_RELEASE_HEIGHT = 755000;
 static const int WEEKS_UNTIL_DEPRECATION = 52;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 30);