Merge pull request zcash#6811 from zcash/version-5.8.0

Version 5.8.0 post-release merge
ssuangchen · Jan 3, 2024 · 6fdd9f1 · 6fdd9f1
2 parents 977eba2 + a8542e8
commit 6fdd9f1
Show file tree

Hide file tree

Showing 25 changed files with 479 additions and 165 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,15 +63,15 @@ zcash_address = "0.3"
 zcash_encoding = "0.2"
 zcash_history = "0.3"
 zcash_note_encryption = "0.4"
-zcash_primitives = { version = "=0.13.0-rc.1", features = ["temporary-zcashd", "transparent-inputs"] }
-zcash_proofs = { version = "=0.13.0-rc.1", features = ["directories"] }
+zcash_primitives = { version = "0.13", features = ["temporary-zcashd", "transparent-inputs"] }
+zcash_proofs = { version = "0.13", features = ["directories"] }
 ed25519-zebra = "4"
 zeroize = "1.4.2"
 wagyu-zcash-parameters = "0.2"
 
 # Rust/C++ interop
 # The version needs to match depends/packages/native_cxxbridge.mk
-cxx = { version = "=1.0.111", features = ["c++17"] }
+cxx = { version = "=1.0.113", features = ["c++17"] }
 
 # Rust threading
 rayon = "1.5"
@@ -109,7 +109,7 @@ time = { version = "0.3", features = ["formatting", "macros"] }
 [dev-dependencies]
 incrementalmerkletree = { version = "0.5", features = ["test-dependencies"] }
 proptest = "1.0.0"
-zcash_primitives = { version = "=0.13.0-rc.1", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
+zcash_primitives = { version = "0.13", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
 
 [dependencies.tracing-subscriber]
 version = "0.3"

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Zcash 5.7.0
+Zcash 5.8.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, 7)
+define(_CLIENT_VERSION_MINOR, 8)
 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.8.0) stable; urgency=medium
+
+  * 5.8.0 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Tue, 02 Jan 2024 19:19:15 +0000
+
+zcash (5.8.0~rc1) stable; urgency=medium
+
+  * 5.8.0-rc1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Thu, 21 Dec 2023 16:56:50 +0000
+
 zcash (5.7.0) stable; urgency=medium
 
   * 5.7.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.7.0"
+name: "zcash-5.8.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.7.0"
+name: "zcash-5.8.0"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/depends/packages/native_ccache.mk b/depends/packages/native_ccache.mk
@@ -1,8 +1,8 @@
 package=native_ccache
-$(package)_version=4.8.3
+$(package)_version=4.9
 $(package)_download_path=https://github.com/ccache/ccache/releases/download/v$($(package)_version)
 $(package)_file_name=ccache-$($(package)_version).tar.gz
-$(package)_sha256_hash=d59dd569ad2bbc826c0bc335c8ebd73e78ed0f2f40ba6b30069347e63585d9ef
+$(package)_sha256_hash=866b2223d59333640f0e7a003cbb85b32d9ca3c9445bd9e3cf142942e69dd3ec
 $(package)_build_subdir=build
 $(package)_dependencies=native_cmake native_zstd
 

diff --git a/depends/packages/native_cxxbridge.mk b/depends/packages/native_cxxbridge.mk
@@ -1,14 +1,14 @@
 package=native_cxxbridge
 # The version needs to match cxx in Cargo.toml
-$(package)_version=1.0.111
+$(package)_version=1.0.113
 $(package)_download_path=https://github.com/dtolnay/cxx/archive/refs/tags
 $(package)_file_name=native_cxxbridge-$($(package)_version).tar.gz
 $(package)_download_file=$($(package)_version).tar.gz
-$(package)_sha256_hash=89b80c4b50410b28e4a78db99cd2764cd017bfbffed0c7ca91f8e01ba9539cd4
+$(package)_sha256_hash=0760e02a1faf3357b28f0ee759ffaae05299092d8d3081a23ec2557e55aaf947
 $(package)_build_subdir=gen/cmd
 $(package)_dependencies=native_rust
 # This file is somewhat annoying to update, but can be done like so from the repo base:
-# $ export VERSION=1.0.111
+# $ export VERSION=1.0.113
 # $ rm .cargo/config .cargo/.configured-for-offline
 # $ mkdir tmp
 # $ cd tmp

diff --git a/depends/packages/utfcpp.mk b/depends/packages/utfcpp.mk
@@ -1,9 +1,9 @@
 package=utfcpp
-$(package)_version=4.0.4
+$(package)_version=4.0.5
 $(package)_download_path=https://github.com/nemtrif/$(package)/archive/refs/tags
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_download_file=v$($(package)_version).tar.gz
-$(package)_sha256_hash=7c8a403d0c575d52473c8644cd9eb46c6ba028d2549bc3e0cdc2d45f5cfd78a0
+$(package)_sha256_hash=ffc668a310e77607d393f3c18b32715f223da1eac4c4d6e0579a11df8e6b59cf
 
 define $(package)_stage_cmds
   mkdir -p $($(package)_staging_dir)$(host_prefix)/include && \

diff --git a/depends/patches/native_cxxbridge/Cargo.lock b/depends/patches/native_cxxbridge/Cargo.lock
diff --git a/doc/authors.md b/doc/authors.md
@@ -1,7 +1,7 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (1388)
+Jack Grigg (1416)
 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 (49)
+Daira Emma Hopwood (51)
 practicalswift (43)
 Dimitris Apostolou (43)
 Kevin Gallagher (38)
@@ -80,6 +80,7 @@ Gareth Davies (5)
 sandakersmann (4)
 instagibbs (4)
 gladcow (4)
+Yasser Isa (4)
 WO (4)
 Sjors Provoost (4)
 Nate Wilcox (4)
@@ -114,6 +115,7 @@ kpcyrd (2)
 kobake (2)
 hexabot (2)
 face (2)
+dependabot[bot] (2)
 aniemerg (2)
 Yuri Zhykin (2)
 UdjinM6 (2)
@@ -170,7 +172,6 @@ ewillbefull@gmail.com (1)
 emilrus (1)
 dismad (1)
 dexX7 (1)
-dependabot[bot] (1)
 daniel (1)
 cronicc (1)
 codetriage-readme-bot (1)
@@ -179,7 +180,6 @@ ayleph (1)
 avnish98 (1)
 adityapk00 (1)
 Za Wilcox (1)
-Yasser Isa (1)
 Yasser (1)
 William M Peaster (1)
 Vidar Holen (1)

diff --git a/doc/book/src/user/release-support.md b/doc/book/src/user/release-support.md
@@ -42,9 +42,8 @@ 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.6.0-rc1 | 2023-06-08 | 2243024 | 2023-09-28 |
-| 5.6.0 | 2023-06-14 | 2250924 | 2023-10-04 |
-| 5.6.1 | 2023-06-21 | 2258800 | 2023-10-11 |
 | 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 |
 <!-- 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" "September 2023" "zcash-cli v5.7.0" "User Commands"
+.TH ZCASH-CLI "1" "January 2024" "zcash-cli v5.8.0" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v5.7.0
+zcash-cli \- manual page for zcash-cli v5.8.0
 .SH DESCRIPTION
-Zcash RPC client version v5.7.0
+Zcash RPC client version v5.8.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" "September 2023" "zcash-tx v5.7.0" "User Commands"
+.TH ZCASH-TX "1" "January 2024" "zcash-tx v5.8.0" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v5.7.0
+zcash-tx \- manual page for zcash-tx v5.8.0
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v5.7.0
+Zcash zcash\-tx utility version v5.8.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" "September 2023" "zcashd-wallet-tool v5.7.0" "User Commands"
+.TH ZCASHD-WALLET-TOOL "1" "January 2024" "zcashd-wallet-tool v5.8.0" "User Commands"
 .SH NAME
-zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.7.0
+zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.8.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" "September 2023" "zcashd v5.7.0" "User Commands"
+.TH ZCASHD "1" "January 2024" "zcashd v5.8.0" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v5.7.0
+zcashd \- manual page for zcashd v5.8.0
 .SH DESCRIPTION
-Zcash Daemon version v5.7.0
+Zcash Daemon version v5.8.0
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.