From f9d4405c09700d6a1dc0f56399e93ed2c0030dbc Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Fri, 8 May 2020 12:39:13 -0600 Subject: [PATCH 1/5] make-release.py: Versioning changes for 2.1.2-3. --- 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 ee5ad09d2..bacf4dadc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 2.1.2-2 +Zcash 2.1.2-3 =========== diff --git a/configure.ac b/configure.ac index 61bf88fe4..25f05e792 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 2) define(_CLIENT_VERSION_MINOR, 1) define(_CLIENT_VERSION_REVISION, 2) -define(_CLIENT_VERSION_BUILD, 52) +define(_CLIENT_VERSION_BUILD, 53) 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 26b8d2f46..fa57abe4e 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-2.1.2-2" +name: "zcash-2.1.2-3" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index b3b681f6f..3e1640d72 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 2 #define CLIENT_VERSION_MINOR 1 #define CLIENT_VERSION_REVISION 2 -#define CLIENT_VERSION_BUILD 52 +#define CLIENT_VERSION_BUILD 53 //! 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 2aa54b671..ae020c266 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 = 824236; +static const int APPROX_RELEASE_HEIGHT = 824273; static const int WEEKS_UNTIL_DEPRECATION = 16; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 48); From 8b5365e127a33ef9cceec18e622e465ee8cd108f Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Fri, 8 May 2020 12:41:23 -0600 Subject: [PATCH 2/5] make-release.py: Updated manpages for 2.1.2-3. --- 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 519ad4bfa..21591b308 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.13. -.TH ZCASH-CLI "1" "May 2020" "zcash-cli v2.1.2-2" "User Commands" +.TH ZCASH-CLI "1" "May 2020" "zcash-cli v2.1.2-3" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v2.1.2-2 +zcash-cli \- manual page for zcash-cli v2.1.2-3 .SH DESCRIPTION -Zcash RPC client version v2.1.2\-2 +Zcash RPC client version v2.1.2\-3 .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 a857da403..763c71e6f 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.13. -.TH ZCASH-TX "1" "May 2020" "zcash-tx v2.1.2-2" "User Commands" +.TH ZCASH-TX "1" "May 2020" "zcash-tx v2.1.2-3" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v2.1.2-2 +zcash-tx \- manual page for zcash-tx v2.1.2-3 .SH DESCRIPTION -Zcash zcash\-tx utility version v2.1.2\-2 +Zcash zcash\-tx utility version v2.1.2\-3 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index 8e0ea6b72..6f8228c71 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.13. -.TH ZCASHD "1" "May 2020" "zcashd v2.1.2-2" "User Commands" +.TH ZCASHD "1" "May 2020" "zcashd v2.1.2-3" "User Commands" .SH NAME -zcashd \- manual page for zcashd v2.1.2-2 +zcashd \- manual page for zcashd v2.1.2-3 .SH DESCRIPTION -Zcash Daemon version v2.1.2\-2 +Zcash Daemon version v2.1.2\-3 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . From ca7b2dbd8ecf66085872160a8e948eb9e8aec249 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Fri, 8 May 2020 12:41:23 -0600 Subject: [PATCH 3/5] make-release.py: Updated release notes and changelog for 2.1.2-3. --- contrib/debian/changelog | 6 ++++++ doc/authors.md | 2 +- doc/release-notes/release-notes-2.1.2-3.md | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 doc/release-notes/release-notes-2.1.2-3.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index dc01d45e6..e38f21542 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (2.1.2+3) stable; urgency=medium + + * 2.1.2-3 release. + + -- Electric Coin Company Fri, 08 May 2020 12:41:23 -0600 + zcash (2.1.2+2) stable; urgency=medium * 2.1.2-2 release. diff --git a/doc/authors.md b/doc/authors.md index 5da148bde..a664093ca 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -3,7 +3,7 @@ Zcash Contributors Jack Grigg (1022) Simon Liu (460) -Sean Bowe (312) +Sean Bowe (314) Eirik Ogilvie-Wigley (214) Daira Hopwood (181) Taylor Hornby (99) diff --git a/doc/release-notes/release-notes-2.1.2-3.md b/doc/release-notes/release-notes-2.1.2-3.md new file mode 100644 index 000000000..7e51f7bb2 --- /dev/null +++ b/doc/release-notes/release-notes-2.1.2-3.md @@ -0,0 +1,7 @@ +Changelog +========= + +Sean Bowe (2): + make-release.py: Versioning changes for 2.1.2-3. + make-release.py: Updated manpages for 2.1.2-3. + From 98345b2eadc72777b20fcc30584262f8c101f17d Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Fri, 8 May 2020 13:28:44 -0600 Subject: [PATCH 4/5] Update release notes for v2.1.2-3. --- doc/release-notes/release-notes-2.1.2-3.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/release-notes/release-notes-2.1.2-3.md b/doc/release-notes/release-notes-2.1.2-3.md index 7e51f7bb2..02c66637e 100644 --- a/doc/release-notes/release-notes-2.1.2-3.md +++ b/doc/release-notes/release-notes-2.1.2-3.md @@ -1,3 +1,8 @@ +Notable changes +=============== + +This release sets the EOS halt date to roughly July 14th, which was our original intention. + Changelog ========= From 1e945ee82ac0f5e6a1fb0ecd7ea9f523fb04c3b6 Mon Sep 17 00:00:00 2001 From: Sean Bowe Date: Fri, 8 May 2020 13:28:55 -0600 Subject: [PATCH 5/5] Set the deprecation height manually to roughly July 14th. --- src/deprecation.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/deprecation.h b/src/deprecation.h index ae020c266..3ff90b1ed 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -9,8 +9,9 @@ // * 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 = 824273; -static const int WEEKS_UNTIL_DEPRECATION = 16; -static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 48); +// static const int WEEKS_UNTIL_DEPRECATION = 16; +// static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 48); +static const int DEPRECATION_HEIGHT = 901475; // Number of blocks before deprecation to warn users static const int DEPRECATION_WARN_LIMIT = 14 * 24 * 48; // 2 weeks