From 72d2ab918dc94b7236e8cdffd6ff60ffdc15b0ae Mon Sep 17 00:00:00 2001 From: Eirik Ogilvie-Wigley Date: Fri, 30 Aug 2019 17:38:50 -0600 Subject: [PATCH 1/3] make-release.py: Versioning changes for 2.0.7-2. --- 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 91a12fbad..4ab6f3513 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 2.0.7-1 +Zcash 2.0.7-2 =========== diff --git a/configure.ac b/configure.ac index 1be5bd991..5c0ee0206 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 2) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 7) -define(_CLIENT_VERSION_BUILD, 51) +define(_CLIENT_VERSION_BUILD, 52) 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 b1f39c959..57de597b6 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-2.0.7-1" +name: "zcash-2.0.7-2" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index dc8353834..0d5c394de 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 7 -#define CLIENT_VERSION_BUILD 51 +#define CLIENT_VERSION_BUILD 52 //! 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 53089969e..10bb3195d 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -8,7 +8,7 @@ // Deprecation policy: // * Shut down 16 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 = 594500; +static const int APPROX_RELEASE_HEIGHT = 588500; static const int WEEKS_UNTIL_DEPRECATION = 16; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); From 6271f7b8a6139a077e0a2ab0df24ff2358373c6f Mon Sep 17 00:00:00 2001 From: Eirik Ogilvie-Wigley Date: Fri, 30 Aug 2019 17:47:52 -0600 Subject: [PATCH 2/3] make-release.py: Updated manpages for 2.0.7-2. --- doc/man/zcash-cli.1 | 6 +++--- doc/man/zcash-tx.1 | 6 +++--- doc/man/zcashd.1 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 2a63f8f52..3f187e49c 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.6. -.TH ZCASH-CLI "1" "August 2019" "zcash-cli v2.0.7-1" "User Commands" +.TH ZCASH-CLI "1" "August 2019" "zcash-cli v2.0.7-2" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v2.0.7-1 +zcash-cli \- manual page for zcash-cli v2.0.7-2 .SH DESCRIPTION -Zcash RPC client version v2.0.7\-1 +Zcash RPC client version v2.0.7\-2 .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 039858dd4..89ac04d28 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.6. -.TH ZCASH-TX "1" "August 2019" "zcash-tx v2.0.7-1" "User Commands" +.TH ZCASH-TX "1" "August 2019" "zcash-tx v2.0.7-2" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v2.0.7-1 +zcash-tx \- manual page for zcash-tx v2.0.7-2 .SH DESCRIPTION -Zcash zcash\-tx utility version v2.0.7\-1 +Zcash zcash\-tx utility version v2.0.7\-2 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index 4e52e251a..0c3aaf84e 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.6. -.TH ZCASHD "1" "August 2019" "zcashd v2.0.7-1" "User Commands" +.TH ZCASHD "1" "August 2019" "zcashd v2.0.7-2" "User Commands" .SH NAME -zcashd \- manual page for zcashd v2.0.7-1 +zcashd \- manual page for zcashd v2.0.7-2 .SH DESCRIPTION -Zcash Daemon version v2.0.7\-1 +Zcash Daemon version v2.0.7\-2 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . From 7c7b6625cf6f469201814d7035b8d4708c608726 Mon Sep 17 00:00:00 2001 From: Eirik Ogilvie-Wigley Date: Fri, 30 Aug 2019 17:47:52 -0600 Subject: [PATCH 3/3] make-release.py: Updated release notes and changelog for 2.0.7-2. --- contrib/debian/changelog | 6 +++++ doc/authors.md | 2 +- doc/release-notes.md | 18 ------------- doc/release-notes/release-notes-2.0.7-2.md | 30 ++++++++++++++++++++++ 4 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 doc/release-notes/release-notes-2.0.7-2.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 89ca5da08..ba3a2a294 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (2.0.7+2) stable; urgency=medium + + * 2.0.7-2 release. + + -- Electric Coin Company Fri, 30 Aug 2019 17:47:52 -0600 + zcash (2.0.7+1) stable; urgency=medium * 2.0.7-1 release. diff --git a/doc/authors.md b/doc/authors.md index 603ac10cd..1583fd014 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -4,7 +4,7 @@ Zcash Contributors Jack Grigg (874) Simon Liu (459) Sean Bowe (278) -Eirik Ogilvie-Wigley (166) +Eirik Ogilvie-Wigley (169) Daira Hopwood (136) Jay Graber (89) Wladimir J. van der Laan (82) diff --git a/doc/release-notes.md b/doc/release-notes.md index 28607e121..a29094b51 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -4,21 +4,3 @@ release-notes at release time) Notable changes =============== - -Pre-Blossom EOS Halt --------------------- -v2.0.7-2 contains a shortened EOS halt so that is in alignment with v2.0.7. - - -Testnet Blossom Rewind ----------------------- -Testnet users needed to upgrade to 2.0.7 before Blossom activated. The amount -of notice given to these users was brief, so many were not able to upgrade in -time. These users may now be on the wrong branch. v2.0.7-2 adds an "intended -rewind" to prevent having to manually reindex when reconnecting to the correct -chain. - - -Insight Explorer Logging Fix ----------------------------- -Fixed an issue where `ERROR: spent index not enabled` would be logged unnecessarily. diff --git a/doc/release-notes/release-notes-2.0.7-2.md b/doc/release-notes/release-notes-2.0.7-2.md new file mode 100644 index 000000000..f135ad733 --- /dev/null +++ b/doc/release-notes/release-notes-2.0.7-2.md @@ -0,0 +1,30 @@ +Notable changes +=============== + + +Pre-Blossom EOS Halt +-------------------- +v2.0.7-2 contains a shortened EOS halt so that is in alignment with v2.0.7. + + +Testnet Blossom Rewind +---------------------- +Testnet users needed to upgrade to 2.0.7 before Blossom activated. The amount +of notice given to these users was brief, so many were not able to upgrade in +time. These users may now be on the wrong branch. v2.0.7-2 adds an "intended +rewind" to prevent having to manually reindex when reconnecting to the correct +chain. + + +Insight Explorer Logging Fix +---------------------------- +Fixed an issue where `ERROR: spent index not enabled` would be logged unnecessarily. + +Changelog +========= + +Eirik Ogilvie-Wigley (3): + Notable changes for v2.0.7-2 + make-release.py: Versioning changes for 2.0.7-2. + make-release.py: Updated manpages for 2.0.7-2. +