From 72cef60175bf53b279f00bfc6c3dfbf1cdf3e818 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sat, 3 Dec 2022 19:47:30 +0000 Subject: [PATCH 1/4] Postpone updates. Signed-off-by: Daira Hopwood --- qa/zcash/postponed-updates.txt | 92 +++++++++++++++++----------------- 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt index 32aa0713a..f26d4b7ee 100644 --- a/qa/zcash/postponed-updates.txt +++ b/qa/zcash/postponed-updates.txt @@ -4,57 +4,59 @@ # bdb 18.1.40 2020-09-01 # -native_cxxbridge 1.0.80 2022-12-03 -native_cxxbridge 1.0.81 2022-12-03 -native_cxxbridge 1.0.82 2022-12-03 -native_rust 1.65.0 2022-12-03 -rustcxx 1.0.80 2022-12-03 -rustcxx 1.0.81 2022-12-03 -rustcxx 1.0.82 2022-12-03 -utfcpp 3.2.2 2022-12-03 +native_cxxbridge 1.0.80 2022-12-10 +native_cxxbridge 1.0.81 2022-12-10 +native_cxxbridge 1.0.82 2022-12-10 +native_cxxbridge 1.0.83 2022-12-10 +native_rust 1.65.0 2022-12-10 +rustcxx 1.0.80 2022-12-10 +rustcxx 1.0.81 2022-12-10 +rustcxx 1.0.82 2022-12-10 +rustcxx 1.0.83 2022-12-10 +utfcpp 3.2.2 2022-12-10 # Ccache 4.0 requires adding CMake to the depends system. -native_ccache 4.0 2022-12-03 -native_ccache 4.1 2022-12-03 -native_ccache 4.2 2022-12-03 -native_ccache 4.2.1 2022-12-03 -native_ccache 4.3 2022-12-03 -native_ccache 4.4 2022-12-03 -native_ccache 4.4.1 2022-12-03 -native_ccache 4.4.2 2022-12-03 -native_ccache 4.5 2022-12-03 -native_ccache 4.5.1 2022-12-03 -native_ccache 4.6 2022-12-03 -native_ccache 4.6.1 2022-12-03 -native_ccache 4.6.2 2022-12-03 -native_ccache 4.6.3 2022-12-03 -native_ccache 4.7 2022-12-03 -native_ccache 4.7.1 2022-12-03 -native_ccache 4.7.2 2022-12-03 -native_ccache 4.7.3 2022-12-03 -native_ccache 4.7.4 2022-12-03 +native_ccache 4.0 2022-12-10 +native_ccache 4.1 2022-12-10 +native_ccache 4.2 2022-12-10 +native_ccache 4.2.1 2022-12-10 +native_ccache 4.3 2022-12-10 +native_ccache 4.4 2022-12-10 +native_ccache 4.4.1 2022-12-10 +native_ccache 4.4.2 2022-12-10 +native_ccache 4.5 2022-12-10 +native_ccache 4.5.1 2022-12-10 +native_ccache 4.6 2022-12-10 +native_ccache 4.6.1 2022-12-10 +native_ccache 4.6.2 2022-12-10 +native_ccache 4.6.3 2022-12-10 +native_ccache 4.7 2022-12-10 +native_ccache 4.7.1 2022-12-10 +native_ccache 4.7.2 2022-12-10 +native_ccache 4.7.3 2022-12-10 +native_ccache 4.7.4 2022-12-10 # Clang and Rust are currently pinned to LLVM 14 -libcxx 15.0.0 2022-12-03 -libcxx 15.0.1 2022-12-03 -libcxx 15.0.2 2022-12-03 -libcxx 15.0.3 2022-12-03 -libcxx 15.0.4 2022-12-03 -libcxx 15.0.5 2022-12-03 -libcxx 15.0.6 2022-12-03 -native_clang 15.0.0 2022-12-03 -native_clang 15.0.1 2022-12-03 -native_clang 15.0.2 2022-12-03 -native_clang 15.0.3 2022-12-03 -native_clang 15.0.4 2022-12-03 -native_clang 15.0.5 2022-12-03 -native_clang 15.0.6 2022-12-03 +libcxx 15.0.0 2022-12-10 +libcxx 15.0.1 2022-12-10 +libcxx 15.0.2 2022-12-10 +libcxx 15.0.3 2022-12-10 +libcxx 15.0.4 2022-12-10 +libcxx 15.0.5 2022-12-10 +libcxx 15.0.6 2022-12-10 +native_clang 15.0.0 2022-12-10 +native_clang 15.0.1 2022-12-10 +native_clang 15.0.2 2022-12-10 +native_clang 15.0.3 2022-12-10 +native_clang 15.0.4 2022-12-10 +native_clang 15.0.5 2022-12-10 +native_clang 15.0.6 2022-12-10 # We're never updating to this version bdb 18.1.40 2024-02-01 # Google Test 1.10.0 requires adding CMake to the depends system. -googletest 1.10.0 2022-12-03 -googletest 1.11.0 2022-12-03 -googletest 1.12.0 2022-12-03 -googletest 1.12.1 2022-12-03 +googletest 1.10.0 2022-12-10 +googletest 1.11.0 2022-12-10 +googletest 1.12.0 2022-12-10 +googletest 1.12.1 2022-12-10 From f7697dbdf389fe1289779460e3d0342cc315858d Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sat, 3 Dec 2022 19:49:32 +0000 Subject: [PATCH 2/4] make-release.py: Versioning changes for 5.3.2. --- README.md | 2 +- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux-parallel.yml | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 2 +- src/deprecation.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index eb58f01ea..df635786a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 5.3.1 +Zcash 5.3.2 =========== diff --git a/configure.ac b/configure.ac index 9744a6a9b..5510e89c1 100644 --- 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, 5) define(_CLIENT_VERSION_MINOR, 3) -define(_CLIENT_VERSION_REVISION, 1) +define(_CLIENT_VERSION_REVISION, 2) 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/gitian-descriptors/gitian-linux-parallel.yml b/contrib/gitian-descriptors/gitian-linux-parallel.yml index 22c5d9474..05958bb2d 100644 --- a/contrib/gitian-descriptors/gitian-linux-parallel.yml +++ b/contrib/gitian-descriptors/gitian-linux-parallel.yml @@ -1,5 +1,5 @@ --- -name: "zcash-5.3.1" +name: "zcash-5.3.2" enable_cache: true distro: "debian" suites: diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 297082bc0..eac535402 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-5.3.1" +name: "zcash-5.3.2" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index 8ce5dd199..be677a81f 100644 --- 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 5 #define CLIENT_VERSION_MINOR 3 -#define CLIENT_VERSION_REVISION 1 +#define CLIENT_VERSION_REVISION 2 #define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build diff --git a/src/deprecation.h b/src/deprecation.h index bfc3fed77..4a8f7a558 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -10,7 +10,7 @@ // Per https://zips.z.cash/zip-0200 // Shut down nodes running this version of code, 16 weeks' worth of blocks after the estimated // release block height. A warning is shown during the 14 days' worth of blocks prior to shut down. -static const int APPROX_RELEASE_HEIGHT = 1898500; +static const int APPROX_RELEASE_HEIGHT = 1900500; static const int RELEASE_TO_DEPRECATION_WEEKS = 16; static const int EXPECTED_BLOCKS_PER_HOUR = 3600 / Consensus::POST_BLOSSOM_POW_TARGET_SPACING; static_assert(EXPECTED_BLOCKS_PER_HOUR == 48, "The value of Consensus::POST_BLOSSOM_POW_TARGET_SPACING was chosen such that this assertion holds."); From dd47391112d8eac734af9bf4db9b836b8b8f520c Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sat, 3 Dec 2022 19:58:44 +0000 Subject: [PATCH 3/4] make-release.py: Updated manpages for 5.3.2. --- doc/man/zcash-cli.1 | 6 +++--- doc/man/zcash-tx.1 | 6 +++--- doc/man/zcashd-wallet-tool.1 | 4 ++-- doc/man/zcashd.1 | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 0bdc056e1..b0157bf5d 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.49.2. -.TH ZCASH-CLI "1" "December 2022" "zcash-cli v5.3.1" "User Commands" +.TH ZCASH-CLI "1" "December 2022" "zcash-cli v5.3.2" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v5.3.1 +zcash-cli \- manual page for zcash-cli v5.3.2 .SH DESCRIPTION -Zcash RPC client version v5.3.1 +Zcash RPC client version v5.3.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 94683fe57..b39e05caa 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.49.2. -.TH ZCASH-TX "1" "December 2022" "zcash-tx v5.3.1" "User Commands" +.TH ZCASH-TX "1" "December 2022" "zcash-tx v5.3.2" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v5.3.1 +zcash-tx \- manual page for zcash-tx v5.3.2 .SH DESCRIPTION -Zcash zcash\-tx utility version v5.3.1 +Zcash zcash\-tx utility version v5.3.2 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd-wallet-tool.1 b/doc/man/zcashd-wallet-tool.1 index 01ba08888..3a2fc540f 100644 --- a/doc/man/zcashd-wallet-tool.1 +++ b/doc/man/zcashd-wallet-tool.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.2. -.TH ZCASHD-WALLET-TOOL "1" "December 2022" "zcashd-wallet-tool v5.3.1" "User Commands" +.TH ZCASHD-WALLET-TOOL "1" "December 2022" "zcashd-wallet-tool v5.3.2" "User Commands" .SH NAME -zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.3.1 +zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.3.2 .SH SYNOPSIS .B zcashd-wallet-tool [\fI\,OPTIONS\/\fR] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index e9b7a3c3a..e59a2a012 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.49.2. -.TH ZCASHD "1" "December 2022" "zcashd v5.3.1" "User Commands" +.TH ZCASHD "1" "December 2022" "zcashd v5.3.2" "User Commands" .SH NAME -zcashd \- manual page for zcashd v5.3.1 +zcashd \- manual page for zcashd v5.3.2 .SH DESCRIPTION -Zcash Daemon version v5.3.1 +Zcash Daemon version v5.3.2 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . From ed0089d876fe92fee42137899373ee05af1aa1cb Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Sat, 3 Dec 2022 19:58:44 +0000 Subject: [PATCH 4/4] make-release.py: Updated release notes and changelog for 5.3.2. --- contrib/debian/changelog | 6 ++++++ doc/authors.md | 2 +- doc/release-notes.md | 12 ----------- doc/release-notes/release-notes-5.3.2.md | 26 ++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 doc/release-notes/release-notes-5.3.2.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index eb116d8be..18a5d09db 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (5.3.2) stable; urgency=medium + + * 5.3.2 release. + + -- Electric Coin Company Sat, 03 Dec 2022 19:58:44 +0000 + zcash (5.3.1) stable; urgency=medium * 5.3.1 release. diff --git a/doc/authors.md b/doc/authors.md index 3b125eb0a..949730a62 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -5,7 +5,7 @@ Jack Grigg (1244) Kris Nuttycombe (585) Simon Liu (460) Sean Bowe (389) -Daira Hopwood (364) +Daira Hopwood (369) Eirik Ogilvie-Wigley (216) Wladimir J. van der Laan (158) Pieter Wuille (143) diff --git a/doc/release-notes.md b/doc/release-notes.md index 51da82d34..a29094b51 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -4,15 +4,3 @@ release-notes at release time) Notable changes =============== -Fixed ------ - -This is a hotfix release that fixes a regression in memory usage during -Initial Block Download. The regression was indirectly caused by a change -to prioritize downloading headers (PR #6231), introduced in release 5.3.1. -It caused memory usage for new nodes to spike to roughly 11 GiB about an -hour after starting Initial Block Download. - -The issue fixed by this release does not affect nodes that start from -a fully synced chain, or that had sufficient memory available to get -past the memory usage spike. diff --git a/doc/release-notes/release-notes-5.3.2.md b/doc/release-notes/release-notes-5.3.2.md new file mode 100644 index 000000000..73d736490 --- /dev/null +++ b/doc/release-notes/release-notes-5.3.2.md @@ -0,0 +1,26 @@ +Notable changes +=============== + +Fixed +----- + +This is a hotfix release that fixes a regression in memory usage during +Initial Block Download. The regression was indirectly caused by a change +to prioritize downloading headers (PR #6231), introduced in release 5.3.1. +It caused memory usage for new nodes to spike to roughly 11 GiB about an +hour after starting Initial Block Download. + +The issue fixed by this release does not affect nodes that start from +a fully synced chain, or that had sufficient memory available to get +past the memory usage spike. + +Changelog +========= + +Daira Hopwood (5): + Revert "Headers-first fix" + Add release notes for the IBD memory spike issue. + Postpone updates. + make-release.py: Versioning changes for 5.3.2. + make-release.py: Updated manpages for 5.3.2. +