Merge pull request zcash#6872 from zcash/version-5.9.0

Version 5.9.0 post-release merge
ssuangchen · Apr 23, 2024 · 25b1b1e · 25b1b1e
2 parents 771bc67 + 8934c9a
commit 25b1b1e
Show file tree

Hide file tree

Showing 17 changed files with 181 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Zcash 5.8.0
+Zcash 5.9.0
 <img align="right" width="120" height="80" src="doc/imgs/logo.png">
 ===========
 

diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 5)
-define(_CLIENT_VERSION_MINOR, 8)
+define(_CLIENT_VERSION_MINOR, 9)
 define(_CLIENT_VERSION_REVISION, 0)
 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)))

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
@@ -1,3 +1,15 @@
+zcash (5.9.0) stable; urgency=medium
+
+  * 5.9.0 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Fri, 19 Apr 2024 18:30:48 +0000
+
+zcash (5.9.0~rc1) stable; urgency=medium
+
+  * 5.9.0-rc1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Wed, 17 Apr 2024 22:49:17 +0000
+
 zcash (5.8.0) stable; urgency=medium
 
   * 5.8.0 release.

diff --git a/contrib/gitian-descriptors/gitian-linux-parallel.yml b/contrib/gitian-descriptors/gitian-linux-parallel.yml
@@ -1,5 +1,5 @@
 ---
-name: "zcash-5.8.0"
+name: "zcash-5.9.0"
 enable_cache: true
 distro: "debian"
 suites:

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

diff --git a/doc/authors.md b/doc/authors.md
@@ -1,7 +1,7 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (1416)
+Jack Grigg (1430)
 Kris Nuttycombe (702)
 Simon Liu (460)
 Sean Bowe (409)
@@ -22,7 +22,7 @@ sasha (80)
 Cory Fields (78)
 Matt Corallo (62)
 Nathan Wilcox (57)
-Daira Emma Hopwood (51)
+Daira Emma Hopwood (54)
 practicalswift (43)
 Dimitris Apostolou (43)
 Kevin Gallagher (38)
@@ -37,6 +37,7 @@ Suhas Daftuar (20)
 furszy (18)
 Marius Kjærstad (18)
 Jonathan "Duke" Leto (18)
+Yasser Isa (17)
 syd (16)
 Patick Strateman (16)
 Charlie O'Keefe (16)
@@ -69,6 +70,7 @@ Alex Wied (7)
 David Mercer (6)
 Daniel Kraft (6)
 Daniel Cousens (6)
+Daira-Emma Hopwood (6)
 Casey Rodarmor (6)
 jnewbery (5)
 ca333 (5)
@@ -77,10 +79,10 @@ Johnathan Corgan (5)
 George Tankersley (5)
 Gavin Andresen (5)
 Gareth Davies (5)
+Conrado Gouvea (5)
 sandakersmann (4)
 instagibbs (4)
 gladcow (4)
-Yasser Isa (4)
 WO (4)
 Sjors Provoost (4)
 Nate Wilcox (4)
@@ -102,12 +104,12 @@ Jason Davies (3)
 Ethan Heilman (3)
 Eric Lombrozo (3)
 Danny Willems (3)
-Conrado Gouvea (3)
 Anthony Towns (3)
 Alfie John (3)
 Aditya Kulkarni (3)
 ANISH M (3)
 whythat (2)
+shuoer86 (2)
 rofl0r (2)
 ptschip (2)
 noname45688@gmail.com (2)

diff --git a/doc/book/src/user/platform-support.md b/doc/book/src/user/platform-support.md
@@ -17,6 +17,7 @@ be removed from tier 1. These dates are subject to change.
 | ----------------------- | ------------ | -------------- |
 | `x86_64-pc-linux-gnu`   | Debian 10    | June 2024      |
 |                         | Debian 11    | June 2026      |
+|                         | Debian 12    | June 2028      |
 |                         | Ubuntu 20.04 | April 2025     |
 
 ## Tier 2

diff --git a/doc/book/src/user/release-support.md b/doc/book/src/user/release-support.md
@@ -42,8 +42,7 @@ time, and may shift due to changes in network solution power.
 <!-- RELEASE_SCRIPT_START_MARKER - If you make changes here, check make-release.py -->
 | `zcashd` version | Release date | Halt height | End of Support |
 | ---------------- | ------------ | ----------- | -------------- |
-| 5.7.0-rc1 | 2023-09-22 | 2365300 | 2024-01-12 |
-| 5.7.0 | 2023-09-28 | 2372200 | 2024-01-18 |
-| 5.8.0-rc1 | 2023-12-21 | 2468300 | 2024-04-11 |
 | 5.8.0 | 2024-01-02 | 2482200 | 2024-04-23 |
+| 5.9.0-rc1 | 2024-04-17 | 2603900 | 2024-08-07 |
+| 5.9.0 | 2024-04-19 | 2606000 | 2024-08-09 |
 <!-- RELEASE_SCRIPT_END_MARKER -->
diff --git 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.1.
-.TH ZCASH-CLI "1" "January 2024" "zcash-cli v5.8.0" "User Commands"
+.TH ZCASH-CLI "1" "April 2024" "zcash-cli v5.9.0" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v5.8.0
+zcash-cli \- manual page for zcash-cli v5.9.0
 .SH DESCRIPTION
-Zcash RPC client version v5.8.0
+Zcash RPC client version v5.9.0
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.

diff --git 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.1.
-.TH ZCASH-TX "1" "January 2024" "zcash-tx v5.8.0" "User Commands"
+.TH ZCASH-TX "1" "April 2024" "zcash-tx v5.9.0" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v5.8.0
+zcash-tx \- manual page for zcash-tx v5.9.0
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v5.8.0
+Zcash zcash\-tx utility version v5.9.0
 .SS "Usage:"
 .TP
 zcash\-tx [options] <hex\-tx> [commands]

diff --git 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.1.
-.TH ZCASHD-WALLET-TOOL "1" "January 2024" "zcashd-wallet-tool v5.8.0" "User Commands"
+.TH ZCASHD-WALLET-TOOL "1" "April 2024" "zcashd-wallet-tool v5.9.0" "User Commands"
 .SH NAME
-zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.8.0
+zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.9.0
 .SH SYNOPSIS
 .B zcashd-wallet-tool
 [\fI\,OPTIONS\/\fR]

diff --git 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.1.
-.TH ZCASHD "1" "January 2024" "zcashd v5.8.0" "User Commands"
+.TH ZCASHD "1" "April 2024" "zcashd v5.9.0" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v5.8.0
+zcashd \- manual page for zcashd v5.9.0
 .SH DESCRIPTION
-Zcash Daemon version v5.8.0
+Zcash Daemon version v5.9.0
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.

diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -4,5 +4,3 @@ release-notes at release time)
 Notable changes
 ===============
 
-License documentation has been updated to account for the `orchard` crate
-now being licensed under "MIT OR Apache-2.0".
diff --git a/doc/release-notes/release-notes-5.9.0-rc1.md b/doc/release-notes/release-notes-5.9.0-rc1.md
@@ -0,0 +1,64 @@
+This is a maintenance release that updates dependencies and sets a new
+end-of-service height to help ensure continuity of services.
+
+Notable changes
+===============
+
+License documentation has been updated to account for the `orchard` crate
+now being licensed under "MIT OR Apache-2.0".
+
+Platform Support
+----------------
+
+- Debian 11 (Bookworm) is now a Tier 1 platform.
+
+Changelog
+=========
+
+Conrado Gouvea (2):
+      make cache.cpp compile with MSVC
+      Update src/zcash/cache.h
+
+Daira Emma Hopwood (3):
+      Lead with "Zcash is HTTPS for money" in both the README and the Debian package description. (This also fixes a typo in the latter.)
+      Change my name in Cargo.toml and remove old email addresses for Ying Tong Lai, Greg Pfeil, and Steven Smith.
+      Remove references to the BOSL license, which will no longer be used by any dependency as of the next release.
+
+Daira-Emma Hopwood (6):
+      Update or postpone dependencies for zcashd 5.9.0.
+      deny.toml: remove license exception for orchard.
+      deny.toml: migrate to version 2 to avoid some warnings.
+      Additional updated and postponed dependencies for zcashd 5.9.0.
+      * cargo update * cargo update -p home@0.5.9 --precise 0.5.5
+      Update audits.
+
+Jack Grigg (9):
+      CI: Migrate to `{upload, download}-artifact@v4`
+      CI: Fix name for gtest job
+      CI: Run bitrot build jobs in parallel
+      CI: Run Rust tests
+      rust: Migrate to `zcash_primitives 0.14.0`
+      depends: Postpone LLVM 18.1.4
+      docs: Document Debian 12 as a Tier 1 platform
+      make-release.py: Versioning changes for 5.9.0-rc1.
+      make-release.py: Updated manpages for 5.9.0-rc1.
+
+Yasser Isa (13):
+      CI: Specify `HOST` for every build instead of just cross-compiles
+      CI: Cache Sprout parameters during setup phase
+      CI: Store build artifacts in GCS instead of GitHub
+      CI: Add `no-dot-so` lint
+      CI: Add `sec-hard` test
+      CI: Add remaining unit tests
+      add pull_request_target in the CI
+      Revert "Update the CI to include `pull_request_target`"
+      ADD support to Bookworm
+      Create docker-release.yaml in Github Actions
+      Allow running CI from a fork
+      Debian CI in Github Actions
+      fix CI - cache sprout params
+
+shuoer86 (2):
+      Fix typos
+      Fix typos
+
diff --git a/doc/release-notes/release-notes-5.9.0.md b/doc/release-notes/release-notes-5.9.0.md
@@ -0,0 +1,79 @@
+This is a maintenance release that updates dependencies and sets a new
+end-of-service height to help ensure continuity of services.
+
+Notable changes
+===============
+
+License documentation has been updated to account for the `orchard` crate
+now being licensed under "MIT OR Apache-2.0".
+
+Platform Support
+----------------
+
+- Debian 11 (Bookworm) is now a Tier 1 platform.
+
+- Intel macOS will be formally downgraded to a Tier 3 platform in the next
+  release. Previously it has informally been at both Tier 1 (because builds and
+  tests were run in CI) and Tier 3 (because no packages were provided). However,
+  we are currently unable to update the Clang and Rust compilers due to there
+  being no Clang release built for Intel macOS from LLVM 16 onwards. Combined
+  with the fact that the Intel Macbook was discontinued in 2021, this decision
+  means that we will no longer be building `zcashd` natively on Intel macOS in
+  CI for testing purposes. We will not be removing build system support (so
+  builds may still function, and community patches to fix issues are welcomed).
+
+Changelog
+=========
+
+Conrado Gouvea (2):
+      make cache.cpp compile with MSVC
+      Update src/zcash/cache.h
+
+Daira Emma Hopwood (3):
+      Lead with "Zcash is HTTPS for money" in both the README and the Debian package description. (This also fixes a typo in the latter.)
+      Change my name in Cargo.toml and remove old email addresses for Ying Tong Lai, Greg Pfeil, and Steven Smith.
+      Remove references to the BOSL license, which will no longer be used by any dependency as of the next release.
+
+Daira-Emma Hopwood (6):
+      Update or postpone dependencies for zcashd 5.9.0.
+      deny.toml: remove license exception for orchard.
+      deny.toml: migrate to version 2 to avoid some warnings.
+      Additional updated and postponed dependencies for zcashd 5.9.0.
+      * cargo update * cargo update -p home@0.5.9 --precise 0.5.5
+      Update audits.
+
+Jack Grigg (14):
+      CI: Migrate to `{upload, download}-artifact@v4`
+      CI: Fix name for gtest job
+      CI: Run bitrot build jobs in parallel
+      CI: Run Rust tests
+      rust: Migrate to `zcash_primitives 0.14.0`
+      depends: Postpone LLVM 18.1.4
+      docs: Document Debian 12 as a Tier 1 platform
+      make-release.py: Versioning changes for 5.9.0-rc1.
+      make-release.py: Updated manpages for 5.9.0-rc1.
+      make-release.py: Updated release notes and changelog for 5.9.0-rc1.
+      make-release.py: Updated book for 5.9.0-rc1.
+      Document that Intel macOS will be formally moved to Tier 3 in 5.10.0
+      make-release.py: Versioning changes for 5.9.0.
+      make-release.py: Updated manpages for 5.9.0.
+
+Yasser Isa (13):
+      CI: Specify `HOST` for every build instead of just cross-compiles
+      CI: Cache Sprout parameters during setup phase
+      CI: Store build artifacts in GCS instead of GitHub
+      CI: Add `no-dot-so` lint
+      CI: Add `sec-hard` test
+      CI: Add remaining unit tests
+      add pull_request_target in the CI
+      Revert "Update the CI to include `pull_request_target`"
+      ADD support to Bookworm
+      Create docker-release.yaml in Github Actions
+      Allow running CI from a fork
+      Debian CI in Github Actions
+      fix CI - cache sprout params
+
+shuoer86 (2):
+      Fix typos
+      Fix typos
+
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -16,7 +16,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 8
+#define CLIENT_VERSION_MINOR 9
 #define CLIENT_VERSION_REVISION 0
 #define CLIENT_VERSION_BUILD 50
 

diff --git a/src/deprecation.h b/src/deprecation.h
@@ -13,7 +13,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 = 2353176;
+static const int APPROX_RELEASE_HEIGHT = 2476976;
 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.");