Merge pull request zcash#6966 from zcash/version-6.0.0

Version 6.0.0 post-release merge.
sircsq · Oct 7, 2024 · 238ffa4 · 238ffa4
2 parents 1c0c425 + 857bd0d
commit 238ffa4
Show file tree

Hide file tree

Showing 95 changed files with 1,741 additions and 1,150 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,33 +39,33 @@ bip0039 = { version = "0.10.1", features = ["std", "all-languages"] }
 blake2b_simd = "1"
 blake2s_simd = "1"
 bls12_381 = "0.8"
-bridgetree = "0.5"
+bridgetree = "0.6"
 byteorder = "1"
 crossbeam-channel = "0.5"
 getrandom = "0.2"
 group = "0.13"
 hex = "0.4"
-incrementalmerkletree = "0.6"
+incrementalmerkletree = "0.7"
 libc = "0.2"
 jubjub = "0.10"
 memuse = "0.2"
 nonempty = "0.7"
-orchard = "0.9"
-sapling = { package = "sapling-crypto", version = "0.2", features = ["temporary-zcashd"] }
+orchard = "0.10"
+sapling = { package = "sapling-crypto", version = "0.3", features = ["temporary-zcashd"] }
 secp256k1 = "0.27"
 subtle = "2.2"
 rand_core = "0.6"
 redjubjub = "0.7"
 tracing = "0.1"
 tracing-core = "0.1"
 tracing-appender = "0.2"
-zcash_address = "0.5"
+zcash_address = "0.6"
 zcash_encoding = "0.2.1"
 zcash_history = "0.4"
 zcash_note_encryption = "0.4"
-zcash_primitives = { version = "0.17", features = ["temporary-zcashd", "transparent-inputs"] }
-zcash_proofs = { version = "0.17", features = ["directories"] }
-zcash_protocol = { version = "0.3", features = ["local-consensus"] }
+zcash_primitives = { version = "0.19", features = ["temporary-zcashd", "transparent-inputs"] }
+zcash_proofs = { version = "0.19", features = ["directories"] }
+zcash_protocol = { version = "0.4", features = ["local-consensus"] }
 ed25519-zebra = "4"
 zeroize = "1.4.2"
 wagyu-zcash-parameters = "0.2"
@@ -98,9 +98,9 @@ thiserror = "1"
 time = { version = "0.3", features = ["formatting", "macros"] }
 
 [dev-dependencies]
-incrementalmerkletree = { version = "0.6", features = ["test-dependencies"] }
+incrementalmerkletree = { version = "0.7", features = ["test-dependencies"] }
 proptest = "1.0.0"
-zcash_primitives = { version = "0.17", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
+zcash_primitives = { version = "0.19", 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.10.0
+Zcash 6.0.0
 <img align="right" width="120" height="80" src="doc/imgs/logo.png">
 ===========
 

diff --git a/code_of_conduct.md b/code_of_conduct.md
@@ -47,13 +47,14 @@ is deemed necessary and appropriate to the circumstances. Maintainers are
 obligated to maintain confidentiality with regard to the reporter of an
 incident.
 
-You may send reports to [our Conduct email](mailto:conduct@z.cash).
+You may send reports to [our Conduct email](mailto:conduct@electriccoin.co).
 
 If you wish to contact specific maintainers directly, the following have made
 themselves available for conduct issues:
 
-- Daira Hopwood (daira at z.cash)
-- Sean Bowe (sean at z.cash)
+- Daira-Emma Hopwood (daira-emma at electriccoin.co)
+- Kris Nuttycombe (kris at electriccoin.co)
+- Jack Grigg (jack at electriccoin.co)
 
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],

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, 10)
+define(_CLIENT_VERSION_MAJOR, 6)
+define(_CLIENT_VERSION_MINOR, 0)
 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 (6.0.0) stable; urgency=high
+
+  * 6.0.0 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Wed, 02 Oct 2024 20:45:09 +0000
+
+zcash (6.0.0~rc1) stable; urgency=medium
+
+  * 6.0.0-rc1 release.
+
+ -- Electric Coin Company <team@electriccoin.co>  Fri, 27 Sep 2024 19:51:34 +0000
+
 zcash (5.10.0) stable; urgency=medium
 
   * 5.10.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.10.0"
+name: "zcash-6.0.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.10.0"
+name: "zcash-6.0.0"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/depends/packages/native_cmake.mk b/depends/packages/native_cmake.mk
@@ -1,8 +1,8 @@
 package=native_cmake
-$(package)_version=3.30.3
+$(package)_version=3.30.4
 $(package)_download_path=https://github.com/Kitware/CMake/releases/download/v$($(package)_version)
 $(package)_file_name=cmake-$($(package)_version).tar.gz
-$(package)_sha256_hash=6d5de15b6715091df7f5441007425264bdd477809f80333fdf95f846aaff88e4
+$(package)_sha256_hash=c759c97274f1e7aaaafcb1f0d261f9de9bf3a5d6ecb7e2df616324a46fe704b2
 
 define $(package)_set_vars
 $(package)_config_opts += -DCMAKE_BUILD_TYPE:STRING=Release

diff --git a/doc/authors.md b/doc/authors.md
@@ -1,9 +1,9 @@
 Zcash Contributors
 ==================
 
-* Jack Grigg (2157)
-* Kris Nuttycombe (750)
-* Daira-Emma Hopwood (483)
+* Jack Grigg (2181)
+* Kris Nuttycombe (751)
+* Daira-Emma Hopwood (492)
 * Simon Liu (464)
 * Sean Bowe (413)
 * Eirik Ogilvie-Wigley (273)
@@ -88,6 +88,7 @@ Zcash Contributors
 * Evan Klitzke (4)
 * DeckerSU (4)
 * Ben Woosley (4)
+* y4ssi (3)
 * mruddy (3)
 * lpescher (3)
 * isle2983 (3)
@@ -152,7 +153,6 @@ Zcash Contributors
 * Akio Nakamura (2)
 * ロハン ダル (1)
 * zathras-crypto (1)
-* y4ssi (1)
 * vim88 (1)
 * user (1)
 * unsystemizer (1)

diff --git a/doc/book/src/user/release-support.md b/doc/book/src/user/release-support.md
@@ -42,8 +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.9.1-rc1 | 2024-05-22 | 2643624 | 2024-09-11 |
-| 5.9.1 | 2024-05-23 | 2644900 | 2024-09-12 |
 | 5.10.0-rc1 | 2024-08-22 | 2700600 | 2024-10-31 |
 | 5.10.0 | 2024-08-27 | 2706540 | 2024-11-05 |
+| 6.0.0-rc1 | 2024-09-27 | 2710272 | 2024-11-08 |
+| 6.0.0 | 2024-10-02 | 2796400 | 2025-01-22 |
 <!-- 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.3.
-.TH ZCASH-CLI "1" "August 2024" "zcash-cli v5.10.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
+.TH ZCASH-CLI "1" "October 2024" "zcash-cli v6.0.0" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v5.10.0
+zcash-cli \- manual page for zcash-cli v6.0.0
 .SH DESCRIPTION
-Zcash RPC client version v5.10.0
+Zcash RPC client version v6.0.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.3.
-.TH ZCASH-TX "1" "August 2024" "zcash-tx v5.10.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
+.TH ZCASH-TX "1" "October 2024" "zcash-tx v6.0.0" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v5.10.0
+zcash-tx \- manual page for zcash-tx v6.0.0
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v5.10.0
+Zcash zcash\-tx utility version v6.0.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.3.
-.TH ZCASHD-WALLET-TOOL "1" "August 2024" "zcashd-wallet-tool v5.10.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
+.TH ZCASHD-WALLET-TOOL "1" "October 2024" "zcashd-wallet-tool v6.0.0" "User Commands"
 .SH NAME
-zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.10.0
+zcashd-wallet-tool \- manual page for zcashd-wallet-tool v6.0.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.3.
-.TH ZCASHD "1" "August 2024" "zcashd v5.10.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.1.
+.TH ZCASHD "1" "October 2024" "zcashd v6.0.0" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v5.10.0
+zcashd \- manual page for zcashd v6.0.0
 .SH DESCRIPTION
-Zcash Daemon version v5.10.0
+Zcash Daemon version v6.0.0
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.
@@ -484,7 +484,7 @@ Maximum size of data in data carrier transactions we relay and mine
 \fB\-txunpaidactionlimit=\fR<n>
 .IP
 Transactions with more than this number of unpaid actions will not be
-accepted to the mempool or relayed (default: 50)
+accepted to the mempool or relayed (default: 0)
 .PP
 Block creation options:
 .HP
@@ -495,7 +495,7 @@ Set maximum block size in bytes (default: 2000000)
 \fB\-blockunpaidactionlimit=\fR<n>
 .IP
 Set the limit on unpaid actions that will be accepted in a block for
-transactions paying less than the ZIP 317 fee (default: 50)
+transactions paying less than the ZIP 317 fee (default: 0)
 .PP
 Mining options:
 .HP

diff --git a/doc/release-notes/release-notes-6.0.0-rc1.md b/doc/release-notes/release-notes-6.0.0-rc1.md
@@ -0,0 +1,37 @@
+Notable changes
+===============
+
+- Windows builds have been fixed.
+
+Changelog
+=========
+
+Daira-Emma Hopwood (2):
+      Ensure out-reference parameters of `CWallet::CreateTransaction` are initialized.
+      Rename ecc_addresses to bp_addresses in chainparams.cpp.
+
+Jack Grigg (16):
+      depends: Update Rust to 1.81.0
+      depends: native_cmake 3.30.3
+      depends: cxx 1.0.128
+      cargo vet prune
+      cargo update
+      qa: Postpone Boost, LevelDB, and Clang updates
+      Fix clippy lints for 1.81
+      Remove `#[should_panic]` tests of `extern "C"` functions
+      depends: Fix incompatibility between libsodium 1.0.20 and Clang 18
+      depends: Downgrade libc++ for MinGW to 18.1.6-1
+      Migrate to latest revision of Zcash Rust crates
+      depends: native_cmake 3.30.4
+      Update release notes
+      Decrease support window to 6 weeks for 6.0.0-rc1
+      make-release.py: Versioning changes for 6.0.0-rc1.
+      make-release.py: Updated manpages for 6.0.0-rc1.
+
+Kris Nuttycombe (1):
+      Use scopes to make it more obvious that certain variables are never used.
+
+y4ssi (2):
+      fix gitian-descriptors
+      Simplify Dockerfile (#6906)
+