Skip to content

Commit

Permalink
Merge pull request zcash#6773 from zcash/version-5.7.0
Browse files Browse the repository at this point in the history
Post-v5.7.0 release merge.
  • Loading branch information
str4d authored Sep 29, 2023
2 parents 482f120 + 7fe9a85 commit a9e2fe8
Show file tree
Hide file tree
Showing 17 changed files with 314 additions and 53 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Zcash 5.6.1
Zcash 5.7.0
<img align="right" width="120" height="80" src="doc/imgs/logo.png">
===========

Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 5)
define(_CLIENT_VERSION_MINOR, 6)
define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_MINOR, 7)
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)))
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)))
Expand Down
12 changes: 12 additions & 0 deletions contrib/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
zcash (5.7.0) stable; urgency=medium

* 5.7.0 release.

-- Electric Coin Company <team@electriccoin.co> Thu, 28 Sep 2023 18:22:50 +0000

zcash (5.7.0~rc1) stable; urgency=medium

* 5.7.0-rc1 release.

-- Electric Coin Company <team@electriccoin.co> Fri, 22 Sep 2023 20:31:30 +0000

zcash (5.6.1) stable; urgency=medium

* 5.6.1 release.
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux-parallel.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "zcash-5.6.1"
name: "zcash-5.7.0"
enable_cache: true
distro: "debian"
suites:
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "zcash-5.6.1"
name: "zcash-5.7.0"
enable_cache: true
distro: "debian"
suites:
Expand Down
4 changes: 2 additions & 2 deletions depends/packages/utfcpp.mk
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package=utfcpp
$(package)_version=3.2.4
$(package)_version=3.2.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=fde21a4c519eed25f095a1cd8490167409cc70d7b5e9c38756142e588ccb7c7e
$(package)_sha256_hash=14fd1b3c466814cb4c40771b7f207b61d2c7a0aa6a5e620ca05c00df27f25afd

define $(package)_stage_cmds
mkdir -p $($(package)_staging_dir)$(host_prefix)/include && \
Expand Down
16 changes: 9 additions & 7 deletions doc/authors.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Zcash Contributors
==================

Jack Grigg (1335)
Kris Nuttycombe (698)
Jack Grigg (1388)
Kris Nuttycombe (702)
Simon Liu (460)
Sean Bowe (404)
Daira Hopwood (396)
Sean Bowe (409)
Daira Hopwood (397)
Eirik Ogilvie-Wigley (216)
Greg Pfeil (208)
Wladimir J. van der Laan (160)
Expand All @@ -22,7 +22,7 @@ sasha (80)
Cory Fields (78)
Matt Corallo (62)
Nathan Wilcox (57)
Daira Emma Hopwood (47)
Daira Emma Hopwood (49)
practicalswift (43)
Dimitris Apostolou (43)
Kevin Gallagher (38)
Expand All @@ -35,8 +35,8 @@ Gregory Maxwell (24)
John Newbery (23)
Suhas Daftuar (20)
furszy (18)
Marius Kjærstad (18)
Jonathan "Duke" Leto (18)
Marius Kjærstad (17)
syd (16)
Patick Strateman (16)
Charlie O'Keefe (16)
Expand Down Expand Up @@ -92,6 +92,7 @@ mruddy (3)
lpescher (3)
isle2983 (3)
elbandi (3)
ebfull (3)
Thomas Snider (3)
NikVolf (3)
Martin Ankerl (3)
Expand All @@ -113,7 +114,6 @@ kpcyrd (2)
kobake (2)
hexabot (2)
face (2)
ebfull (2)
aniemerg (2)
Yuri Zhykin (2)
UdjinM6 (2)
Expand Down Expand Up @@ -180,6 +180,7 @@ avnish98 (1)
adityapk00 (1)
Za Wilcox (1)
Yasser Isa (1)
Yasser (1)
William M Peaster (1)
Vidar Holen (1)
Vasil Dimov (1)
Expand Down Expand Up @@ -240,6 +241,7 @@ Forrest Voight (1)
Florian Schmaus (1)
Eran Tromer (1)
Elliot Olds (1)
Elijah Hampton (1)
Dimitris Tsapakidis (1)
DesWurstes (1)
Denis Lukianov (1)
Expand Down
7 changes: 2 additions & 5 deletions doc/book/src/user/release-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,9 @@ 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.5.0-rc1 | 2023-04-20 | 2188024 | 2023-08-10 |
| 5.5.0-rc2 | 2023-04-25 | 2193300 | 2023-08-15 |
| 5.5.0-rc3 | 2023-04-27 | 2195224 | 2023-08-17 |
| 5.5.0 | 2023-04-27 | 2196024 | 2023-08-17 |
| 5.5.1 | 2023-05-16 | 2217487 | 2023-09-05 |
| 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 |
<!-- RELEASE_SCRIPT_END_MARKER -->
6 changes: 3 additions & 3 deletions doc/man/zcash-cli.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH ZCASH-CLI "1" "June 2023" "zcash-cli v5.6.1" "User Commands"
.TH ZCASH-CLI "1" "September 2023" "zcash-cli v5.7.0" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v5.6.1
zcash-cli \- manual page for zcash-cli v5.7.0
.SH DESCRIPTION
Zcash RPC client version v5.6.1
Zcash RPC client version v5.7.0
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
Expand Down
6 changes: 3 additions & 3 deletions doc/man/zcash-tx.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH ZCASH-TX "1" "June 2023" "zcash-tx v5.6.1" "User Commands"
.TH ZCASH-TX "1" "September 2023" "zcash-tx v5.7.0" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v5.6.1
zcash-tx \- manual page for zcash-tx v5.7.0
.SH DESCRIPTION
Zcash zcash\-tx utility version v5.6.1
Zcash zcash\-tx utility version v5.7.0
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]
Expand Down
4 changes: 2 additions & 2 deletions doc/man/zcashd-wallet-tool.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH ZCASHD-WALLET-TOOL "1" "June 2023" "zcashd-wallet-tool v5.6.1" "User Commands"
.TH ZCASHD-WALLET-TOOL "1" "September 2023" "zcashd-wallet-tool v5.7.0" "User Commands"
.SH NAME
zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.6.1
zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.7.0
.SH SYNOPSIS
.B zcashd-wallet-tool
[\fI\,OPTIONS\/\fR]
Expand Down
6 changes: 3 additions & 3 deletions doc/man/zcashd.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH ZCASHD "1" "June 2023" "zcashd v5.6.1" "User Commands"
.TH ZCASHD "1" "September 2023" "zcashd v5.7.0" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v5.6.1
zcashd \- manual page for zcashd v5.7.0
.SH DESCRIPTION
Zcash Daemon version v5.6.1
Zcash Daemon version v5.7.0
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
Expand Down
20 changes: 0 additions & 20 deletions doc/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,3 @@ release-notes at release time)
Notable changes
===============

Deprecation of `fetch-params.sh`
--------------------------------

The `fetch-params.sh` script (also `zcash-fetch-params`) is now deprecated. The
zcashd binary now bundles zk-SNARK parameters directly and so parameters do not
need to be downloaded or stored separately. The script will now do nothing but
state that it is deprecated; it will be removed in a future release.

Previously, parameters were stored by default in these locations:

* `~/.zcash-params` (on Linux); or
* `~/Library/Application Support/ZcashParams` (on Mac); or
* `C:\Users\Username\AppData\Roaming\ZcashParams` (on Windows)

Unless you need to generate transactions using the deprecated Sprout shielded
pool, you can delete the parameter files stored in these directories to save
space as they are no longer read or used by zcashd. If you do wish to use the
Sprout pool, you will need the `sprout-groth16.params` file in the
aforementioned directory. This file is currently available for download
[here](https://download.z.cash/downloads/sprout-groth16.params).
132 changes: 132 additions & 0 deletions doc/release-notes/release-notes-5.7.0-rc1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
Notable changes
===============

Deprecation of `fetch-params.sh`
--------------------------------

The `fetch-params.sh` script (also `zcash-fetch-params`) is now deprecated. The
`zcashd` binary now bundles zk-SNARK parameters directly and so parameters do not
need to be downloaded or stored separately. The script will now do nothing but
state that it is deprecated; it will be removed in a future release.

Previously, parameters were stored by default in these locations:

* `~/.zcash-params` (on Linux); or
* `~/Library/Application Support/ZcashParams` (on Mac); or
* `C:\Users\Username\AppData\Roaming\ZcashParams` (on Windows)

Unless you need to generate transactions using the deprecated Sprout shielded
pool, you can delete the parameter files stored in these directories to save
space as they are no longer read or used by `zcashd`. If you do wish to use the
Sprout pool, you will need the `sprout-groth16.params` file in the
aforementioned directory. This file is currently available for download
[here](https://download.z.cash/downloads/sprout-groth16.params).

Mempool metrics
---------------

`zcashd` now reports the following new metrics when `-prometheusport` is set:

- (gauge) `zcash.mempool.actions.unpaid { "bk" = ["< 0.2", "< 0.4", "< 0.6", "< 0.8", "< 1"] }`
- (gauge) `zcash.mempool.actions.paid`
- (gauge) `zcash.mempool.size.weighted { "bk" = ["< 1", "1", "> 1", "> 2", "> 3"] }`

The `zcash.mempool.actions` metrics count the number of [logical actions] across
the transactions in the mempool, while `zcash.mempool.size.weighted` is a
weight-bucketed version of the `zcash.mempool.size.bytes` metric.

The [ZIP 317 weight ratio][weight_ratio] of a transaction is used to bucket its
logical actions and byte size. A weight ratio of at least 1 means that the
transaction's fee is at least the ZIP 317 conventional fee, and all of its
logical actions are considered "paid". A weight ratio lower than 1 corresponds
to the fraction of the transaction's logical actions that are "paid". The
remaining fraction (i.e. 1 - weight ratio) are subject to the unpaid action
limit that miners configure for their blocks with `-blockunpaidactionlimit`.

[logical actions]: https://zips.z.cash/zip-0317#fee-calculation
[weight_ratio]: https://zips.z.cash/zip-0317#recommended-algorithm-for-block-template-construction

Changelog
=========

Daira Emma Hopwood (2):
wallet_listreceived.py: fix an assertion message and remove unnecessary use of LEGACY_DEFAULT_FEE.
Update ed25519-zebra to 4.0.0. This deduplicates sha2, rand-core, block-buffer, digest, and ahash. (It adds duplications for hashbrown and libm which are less important.)

Daira Hopwood (1):
Ensure that the panic when Sprout parameters cannot be loaded says how to fix it by downloading them.

Elijah Hampton (1):
Updates getblockcount help message to the appropriate message.

Jack Grigg (48):
CI: Update `apt` before installing build dependencies
CI: De-duplicate logic to get the number of available processing cores
CI: Use `hw.logicalcpu` instead of `hw.ncpu` on macOS
Move mempool metrics updates into a `CTxMemPool::UpdateMetrics` method
metrics: Track mempool actions and size bucketed by weight
contrib: Update Grafana dashboard to show mempool composition
CI: Add a lint that checks for headers missing from makefiles
Retroactively use Rust to decrypt shielded coinbase before soft fork
Remove now-unused C++ Sapling note encryption logic
test: Skip `WalletTests.WalletNetworkSerialization`
Rename reject reason for invalid shielded coinbase ciphertexts
test: Set `-limitdescendantcount` to match viable iteration limit
qa: Migrate to `cargo-vet 0.8`
qa: Remove audit policies for crates we no longer patch
qa: Replace Windows crate audits with a trust policy for Microsoft
depends: native_ccache 4.8.2
depends: cxx 1.0.97
cargo update
CI: Add `cargo deny check licenses` job
depends: tl_expected 1.1.0
cargo update again
Use `cxx::bridge` for Sprout proofs
Use `cxx::bridge` for `zcash_history`
Use `cxx::bridge` for initialization functions
Use `cxx::bridge` to load ZKP parameters
Use `cxx::bridge` for Sapling specification components
Remove unused Sapling logic
Use `cxx::bridge` for Sapling ZIP 32 wrappers
Use `cxx::bridge` for `getrandom`
rust: Rename modules that no longer contain raw FFI functions
depends: libsodium 1.0.19
depends: utfcpp 3.2.4
depends: native_ccache 4.8.3
depends: Boost 1.83.0
depends: native_cmake 3.27.4
qa: Bump postponed dependencies
qa: cargo vet prune
cargo update
depends: cxx 1.0.107
depends: native_cmake 3.27.5
qa: Postpone Clang and Rust updates
depends: native_cmake 3.27.6
qa: Replace `cargo vet` ECC self-audits with trust declarations
rust: Upgrade Zcash Rust crates
Remove CentOS 8 from CI builder files
doc: Update release notes for 5.7.0
make-release.py: Versioning changes for 5.7.0-rc1.
make-release.py: Updated manpages for 5.7.0-rc1.

Kris Nuttycombe (3):
Update network upgrade golden tests for serialization to include nu5.
Make a few small improvements to the release process doc.
Remove audit claim for allocator-api2

Marius Kjærstad (1):
New checkpoint at block 2200000 for mainnet

Sean Bowe (5):
Bundle the Sprout (Groth16) verification key in librustzcash.
Bundle the Sapling zk-SNARK parameters using the `wagyu-zcash-parameters` crate.
Deprecate the `fetch-params.sh` script.
cargo fmt
Hash the Sprout parameter file during proving before deserialization.

Yasser (1):
Update ZCASH_SIGNING_KEY_ID in Dockerfile

ebfull (1):
Update zcutil/fetch-params.sh

Loading

0 comments on commit a9e2fe8

Please sign in to comment.