Merge pull request zcash#6958 from zcash/release-v6.0.0

Release v6.0.0

.cargo/config.toml.offline

@@ -4,25 +4,5 @@ linker = "aarch64-linux-gnu-gcc"
 [source.crates-io]
 replace-with = "vendored-sources"
 
-[source."https://github.com/zcash/incrementalmerkletree"]
-git = "https://github.com/zcash/incrementalmerkletree"
-rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293"
-replace-with = "vendored-sources"
-
-[source."https://github.com/zcash/orchard"]
-git = "https://github.com/zcash/orchard"
-rev = "55fb089a335bbbc1cda186c706bc037073df8eb7"
-replace-with = "vendored-sources"
-
-[source."https://github.com/zcash/sapling-crypto"]
-git = "https://github.com/zcash/sapling-crypto"
-rev = "b1ad3694ee13a2fc5d291ad04721a6252da0993c"
-replace-with = "vendored-sources"
-
-[source."https://github.com/zcash/librustzcash.git"]
-git = "https://github.com/zcash/librustzcash.git"
-rev = "1410f1449100a417bfbc4f6c7167aa9808e38792"
-replace-with = "vendored-sources"
-
 [source.vendored-sources]
 # The directory for this source is set to RUST_VENDORED_SOURCES by src/Makefile.am

Cargo.toml

@@ -50,22 +50,22 @@ 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"
@@ -100,7 +100,7 @@ time = { version = "0.3", features = ["formatting", "macros"] }
 [dev-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"
@@ -111,16 +111,3 @@ features = ["ansi", "env-filter", "fmt", "time"]
 lto = 'thin'
 panic = 'abort'
 codegen-units = 1
-
-[patch.crates-io]
-bridgetree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" }
-incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" }
-orchard = { git = "https://github.com/zcash/orchard", rev = "55fb089a335bbbc1cda186c706bc037073df8eb7" }
-sapling-crypto = { git = "https://github.com/zcash/sapling-crypto", rev = "b1ad3694ee13a2fc5d291ad04721a6252da0993c" }
-equihash = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
-zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
-zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
-zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
-zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
-zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
-zcash_protocol = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }

README.md

@@ -1,4 +1,4 @@
-Zcash 6.0.0-rc1
+Zcash 6.0.0
 <img align="right" width="120" height="80" src="doc/imgs/logo.png">
 ===========
 

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 6)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 25)
+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)))
 define(_CLIENT_VERSION_IS_RELEASE, true)

contrib/debian/changelog

@@ -1,3 +1,9 @@
+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.

contrib/gitian-descriptors/gitian-linux-parallel.yml

@@ -1,5 +1,5 @@
 ---
-name: "zcash-6.0.0-rc1"
+name: "zcash-6.0.0"
 enable_cache: true
 distro: "debian"
 suites:

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,5 +1,5 @@
 ---
-name: "zcash-6.0.0-rc1"
+name: "zcash-6.0.0"
 enable_cache: true
 distro: "debian"
 suites:

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)

doc/book/src/user/release-support.md

@@ -45,4 +45,5 @@ time, and may shift due to changes in network solution power.
 | 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 -->

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 2024" "zcash-cli v6.0.0-rc1" "User Commands"
+.TH ZCASH-CLI "1" "October 2024" "zcash-cli v6.0.0" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v6.0.0-rc1
+zcash-cli \- manual page for zcash-cli v6.0.0
 .SH DESCRIPTION
-Zcash RPC client version v6.0.0\-rc1
+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/>.

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 2024" "zcash-tx v6.0.0-rc1" "User Commands"
+.TH ZCASH-TX "1" "October 2024" "zcash-tx v6.0.0" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v6.0.0-rc1
+zcash-tx \- manual page for zcash-tx v6.0.0
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v6.0.0\-rc1
+Zcash zcash\-tx utility version v6.0.0
 .SS "Usage:"
 .TP
 zcash\-tx [options] <hex\-tx> [commands]

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 2024" "zcashd-wallet-tool v6.0.0-rc1" "User Commands"
+.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 v6.0.0-rc1
+zcashd-wallet-tool \- manual page for zcashd-wallet-tool v6.0.0
 .SH SYNOPSIS
 .B zcashd-wallet-tool
 [\fI\,OPTIONS\/\fR]

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 2024" "zcashd v6.0.0-rc1" "User Commands"
+.TH ZCASHD "1" "October 2024" "zcashd v6.0.0" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v6.0.0-rc1
+zcashd \- manual page for zcashd v6.0.0
 .SH DESCRIPTION
-Zcash Daemon version v6.0.0\-rc1
+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

doc/release-notes.md

@@ -4,18 +4,3 @@ release-notes at release time)
 Notable changes
 ===============
 
-Mining
-------
-
-- The default setting of `-blockunpaidactionlimit` is now zero, which has
-  the effect of no longer allowing "unpaid actions" in [block production].
-  This adapts to current network conditions. If you have overridden this
-  setting as a miner, we recommend removing the override. This configuration
-  option may be removed entirely in a future release.
-
-[block production]: https://zips.z.cash/zip-0317#block-production
-
-Platform Support
-----------------
-
-- Windows builds have been fixed.