From 0f49863acb353fb6e082eda64970710fa66b88e5 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 28 Sep 2017 01:17:05 +0100 Subject: [PATCH 1/3] make-release.py: Versioning changes for 1.0.12. --- README.md | 2 +- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 2 +- src/deprecation.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 78e02233a..769d08e77 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 1.0.12-rc1 +Zcash 1.0.12 ============= What is Zcash? diff --git a/configure.ac b/configure.ac index 5831cb63f..9fa37ab28 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 12) -define(_CLIENT_VERSION_BUILD, 25) +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))) define(_CLIENT_VERSION_IS_RELEASE, true) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index c53211d0f..74573b757 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.12-rc1" +name: "zcash-1.0.12" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index 98ab18336..b7eab7ae5 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 12 -#define CLIENT_VERSION_BUILD 25 +#define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/deprecation.h b/src/deprecation.h index 19c63bdf2..9d5111c1f 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -8,7 +8,7 @@ // Deprecation policy: // * Shut down 18 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 = 189600; +static const int APPROX_RELEASE_HEIGHT = 192200; static const int WEEKS_UNTIL_DEPRECATION = 18; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); From eb6d25e7ab13dd80d5ec94d6bddebfc530739444 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 28 Sep 2017 01:24:59 +0100 Subject: [PATCH 2/3] make-release.py: Updated manpages for 1.0.12. --- doc/man/zcash-cli.1 | 6 +++--- doc/man/zcash-tx.1 | 6 +++--- doc/man/zcashd.1 | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index e8f42c702..582316d28 100644 --- a/doc/man/zcash-cli.1 +++ b/doc/man/zcash-cli.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASH-CLI "1" "September 2017" "zcash-cli v1.0.12-rc1" "User Commands" +.TH ZCASH-CLI "1" "September 2017" "zcash-cli v1.0.12" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v1.0.12-rc1 +zcash-cli \- manual page for zcash-cli v1.0.12 .SH DESCRIPTION -Zcash RPC client version v1.0.12\-rc1 +Zcash RPC client version v1.0.12 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1 index 9f1832090..3a502969a 100644 --- a/doc/man/zcash-tx.1 +++ b/doc/man/zcash-tx.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASH-TX "1" "September 2017" "zcash-tx v1.0.12-rc1" "User Commands" +.TH ZCASH-TX "1" "September 2017" "zcash-tx v1.0.12" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v1.0.12-rc1 +zcash-tx \- manual page for zcash-tx v1.0.12 .SH DESCRIPTION -Zcash zcash\-tx utility version v1.0.12\-rc1 +Zcash zcash\-tx utility version v1.0.12 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index f34c45066..70c6e57f1 100644 --- a/doc/man/zcashd.1 +++ b/doc/man/zcashd.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASHD "1" "September 2017" "zcashd v1.0.12-rc1" "User Commands" +.TH ZCASHD "1" "September 2017" "zcashd v1.0.12" "User Commands" .SH NAME -zcashd \- manual page for zcashd v1.0.12-rc1 +zcashd \- manual page for zcashd v1.0.12 .SH DESCRIPTION -Zcash Daemon version v1.0.12\-rc1 +Zcash Daemon version v1.0.12 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . @@ -54,7 +54,7 @@ Specify data directory \fB\-disabledeprecation=\fR .IP Disable block\-height node deprecation and automatic shutdown (example: -\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.12\-rc1) +\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.12) .HP \fB\-exportdir=\fR .IP From 898876673045fc2f7f2f4616171085f4a718c54f Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 28 Sep 2017 01:26:44 +0100 Subject: [PATCH 3/3] make-release.py: Updated release notes and changelog for 1.0.12. --- contrib/debian/changelog | 6 ++++++ doc/authors.md | 4 ++-- doc/release-notes/release-notes-1.0.12.md | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 doc/release-notes/release-notes-1.0.12.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 9837f656f..131627614 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (1.0.12) stable; urgency=medium + + * 1.0.12 release. + + -- Zcash Company Thu, 28 Sep 2017 01:26:44 +0100 + zcash (1.0.12~rc1) stable; urgency=medium * 1.0.12-rc1 release. diff --git a/doc/authors.md b/doc/authors.md index 93a30c1c2..ce6dc0e9f 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,8 +1,8 @@ Zcash Contributors ================== -Jack Grigg (465) -Simon Liu (272) +Jack Grigg (470) +Simon Liu (274) Sean Bowe (188) Daira Hopwood (102) Taylor Hornby (65) diff --git a/doc/release-notes/release-notes-1.0.12.md b/doc/release-notes/release-notes-1.0.12.md new file mode 100644 index 000000000..ca9190268 --- /dev/null +++ b/doc/release-notes/release-notes-1.0.12.md @@ -0,0 +1,14 @@ +Changelog +========= + +Jack Grigg (5): + Fix pyflakes warnings in RPC tests + Individualise performance-measurements.sh errors for debugging + Fix incorrect failure in memory benchmark + make-release.py: Versioning changes for 1.0.12. + make-release.py: Updated manpages for 1.0.12. + +Simon Liu (2): + Update which lock to synchronize on when calling GetBestAnchor(). + Closes #2637. Make z_shieldcoinbase an experimental feature where it can be enabled with: zcashd -experimentalfeatures -zshieldcoinbase. +