Merge pull request zcash#6595 from str4d/merge-v5.5.0-rc1

Merge v5.5.0-rc1 into the main branch

Cargo.toml

@@ -19,7 +19,7 @@ repository = "https://github.com/zcash/zcash"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 edition = "2018"
-rust-version = "1.68"
+rust-version = "1.69"
 
 [package.metadata.vet]
 store = { path = "./qa/supply-chain" }

README.md

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

configure.ac

@@ -1,9 +1,9 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 5)
-define(_CLIENT_VERSION_MINOR, 4)
-define(_CLIENT_VERSION_REVISION, 2)
-define(_CLIENT_VERSION_BUILD, 50)
+define(_CLIENT_VERSION_MINOR, 5)
+define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_BUILD, 25)
 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 (5.5.0~rc1) stable; urgency=medium
+
+  * 5.5.0-rc1 release.
+
+ -- Electric Coin Company <[email protected]>  Thu, 20 Apr 2023 22:19:50 +0000
+
 zcash (5.4.2) stable; urgency=high
 
   * 5.4.2 release.

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

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

contrib/gitian-descriptors/gitian-linux.yml

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

depends/packages/native_rust.mk

@@ -3,16 +3,16 @@ package=native_rust
 # ./contrib/devtools/update-rust-hashes.sh
 # The Rust compiler should use the same LLVM version as the Clang compiler; you
 # can check this with `rustc --version -v`.
-$(package)_version=1.68.2
+$(package)_version=1.69.0
 $(package)_download_path=https://static.rust-lang.org/dist
 $(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_linux=df7c7466ef35556e855c0d35af7ff08e133040400452eb3427c53202b6731926
+$(package)_sha256_hash_linux=2ca4a306047c0b8b4029c382910fcbc895badc29680e0332c9df990fd1c70d4f
 $(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
-$(package)_sha256_hash_darwin=632540d3d83758cb048dc45fcfbc0b29f6f170161a3051be22b0a2962a566fb9
+$(package)_sha256_hash_darwin=9818dab2c3726d63dfbfde12c9273e62e484ef6d6f6e05a6431a3e089c335454
 $(package)_file_name_freebsd=rust-$($(package)_version)-x86_64-unknown-freebsd.tar.gz
-$(package)_sha256_hash_freebsd=3b824f662c48ed3a5117bad7992d467837cbf6fa93ac18c4816a175034eee178
+$(package)_sha256_hash_freebsd=2985d98910b4a1dd336bfc7a1ac3b18082ed917cff097b4db6f0d6602016c289
 $(package)_file_name_aarch64_linux=rust-$($(package)_version)-aarch64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_aarch64_linux=b24d0df852490d80791a228f18c2b75f24b1e6437e6e745f85364edab245f7fa
+$(package)_sha256_hash_aarch64_linux=88af5aa7a40c8f1b40416a1f27de8ffbe09c155d933f69d3e109c0ccee92353b
 
 # Mapping from GCC canonical hosts to Rust targets
 # If a mapping is not present, we assume they are identical, unless $host_os is
@@ -21,10 +21,10 @@ $(package)_rust_target_x86_64-pc-linux-gnu=x86_64-unknown-linux-gnu
 $(package)_rust_target_x86_64-w64-mingw32=x86_64-pc-windows-gnu
 
 # Mapping from Rust targets to SHA-256 hashes
-$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=74c2cca31e34cbc0913fc2445c4853acb20c52dba2d0c3012a007cc5decc3bb1
-$(package)_rust_std_sha256_hash_x86_64-apple-darwin=5d6a7d62ae67c2f7aae6eabb782a3125cf9fed6bbc2993d59b3714f4f832e797
-$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=4598f3f44f84353dcf64aab9669b7c3982fccc1e7840f3ef1aa90cadc37864a4
-$(package)_rust_std_sha256_hash_x86_64-unknown-freebsd=c94334345413a28669b271584b385ed0c0d6c410458103d7242353dd8fb9048d
+$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=8f42b40c0a0658ee75ce758652c9821fac7db3fbd8d20f7fb2483ec2c57ee0ac
+$(package)_rust_std_sha256_hash_x86_64-apple-darwin=e44d71250dc5a238da0dc4784dad59d562862653adecd31ea52e0920b85c6a7c
+$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=09ded4a4c27c16aff9c9911640b1bdf6e1172237ce540ed4dc3e166e9438f0d7
+$(package)_rust_std_sha256_hash_x86_64-unknown-freebsd=eed4b3f3358a8887b0f6a62e021469878a8990af9b94c2fe87d3c1b0220913bb
 
 define rust_target
 $(if $($(1)_rust_target_$(2)),$($(1)_rust_target_$(2)),$(if $(findstring darwin,$(3)),x86_64-apple-darwin,$(if $(findstring freebsd,$(3)),x86_64-unknown-freebsd,$(2))))

doc/authors.md

@@ -2,13 +2,13 @@ Zcash Contributors
 ==================
 
 Jack Grigg (1297)
-Kris Nuttycombe (622)
+Kris Nuttycombe (626)
 Simon Liu (460)
 Sean Bowe (389)
-Daira Hopwood (379)
+Daira Hopwood (382)
 Eirik Ogilvie-Wigley (216)
 Wladimir J. van der Laan (159)
-Pieter Wuille (146)
+Pieter Wuille (149)
 Alfredo Garcia (120)
 Taylor Hornby (118)
 Marshall Gaucher (118)
@@ -17,10 +17,10 @@ Marco Falke (90)
 Jonas Schnelli (90)
 Jay Graber (89)
 Larry Ruane (88)
-Greg Pfeil (84)
+Greg Pfeil (85)
 Cory Fields (78)
-sasha (62)
-Matt Corallo (61)
+sasha (67)
+Matt Corallo (62)
 Nathan Wilcox (57)
 practicalswift (42)
 Dimitris Apostolou (40)
@@ -71,7 +71,6 @@ Daniel Cousens (6)
 Casey Rodarmor (6)
 jnewbery (5)
 ca333 (5)
-Sasha (5)
 MeshCollider (5)
 Johnathan Corgan (5)
 George Tankersley (5)
@@ -128,6 +127,7 @@ Matthew King (2)
 Mary Moore-Simmons (2)
 Mark Friedenbach (2)
 Marek (2)
+Jon Atack (2)
 Joe Turgeon (2)
 Jesse Cohen (2)
 Jeffrey Czyz (2)
@@ -219,7 +219,6 @@ Josh Lehan (1)
 Josh Ellithorpe (1)
 Jonas Nick (1)
 Jon Layton (1)
-Jon Atack (1)
 Jeffrey Walton (1)
 Janito Vaqueiro Ferreira Filho (1)
 James White (1)

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

@@ -42,10 +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.3.1 | 2022-12-02 | 2027524 | 2023-03-24 |
-| 5.3.2 | 2022-12-03 | 2029524 | 2023-03-25 |
 | 5.4.0 | 2023-02-09 | 2106524 | 2023-06-01 |
 | 5.4.1 | 2023-02-13 | 2112024 | 2023-06-05 |
 | 5.3.3 | 2023-03-13 | 2121024 | 2023-06-13 |
 | 5.4.2 | 2023-03-13 | 2121024 | 2023-06-13 |
+| 5.5.0-rc1 | 2023-04-20 | 2059000 | 2023-08-10 |
 <!-- 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" "February 2023" "zcash-cli v5.4.2" "User Commands"
+.TH ZCASH-CLI "1" "April 2023" "zcash-cli v5.5.0-rc1" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v5.4.2
+zcash-cli \- manual page for zcash-cli v5.5.0-rc1
 .SH DESCRIPTION
-Zcash RPC client version v5.4.2
+Zcash RPC client version v5.5.0\-rc1
 .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" "February 2023" "zcash-tx v5.4.2" "User Commands"
+.TH ZCASH-TX "1" "April 2023" "zcash-tx v5.5.0-rc1" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v5.4.2
+zcash-tx \- manual page for zcash-tx v5.5.0-rc1
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v5.4.2
+Zcash zcash\-tx utility version v5.5.0\-rc1
 .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" "February 2023" "zcashd-wallet-tool v5.4.2" "User Commands"
+.TH ZCASHD-WALLET-TOOL "1" "April 2023" "zcashd-wallet-tool v5.5.0-rc1" "User Commands"
 .SH NAME
-zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.4.2
+zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.5.0-rc1
 .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" "February 2023" "zcashd v5.4.2" "User Commands"
+.TH ZCASHD "1" "April 2023" "zcashd v5.5.0-rc1" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v5.4.2
+zcashd \- manual page for zcashd v5.5.0-rc1
 .SH DESCRIPTION
-Zcash Daemon version v5.4.2
+Zcash Daemon version v5.5.0\-rc1
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.
@@ -34,10 +34,10 @@ long fork (%s in cmd is replaced by message)
 .IP
 Explicitly allow the use of the specified deprecated feature. Multiple
 instances of this parameter are permitted; values for <feature> must be
-selected from among {"none", "gbt_oldhashes", "z_getbalance",
-"z_gettotalbalance", "addrtype", "getnewaddress", "getrawchangeaddress",
-"legacy_privacy", "wallettxvjoinsplit", "z_getnewaddress",
-"z_listaddresses"}
+selected from among {"none", "deprecationinfo_deprecationheight",
+"gbt_oldhashes", "z_getbalance", "z_gettotalbalance", "addrtype",
+"getnewaddress", "getrawchangeaddress", "legacy_privacy",
+"wallettxvjoinsplit", "z_getnewaddress", "z_listaddresses"}
 .HP
 \fB\-blocknotify=\fR<cmd>
 .IP
@@ -316,7 +316,11 @@ Set the maximum number of Orchard actions permitted in a transaction
 .HP
 \fB\-paytxfee=\fR<amt>
 .IP
-Fee (in ZEC/kB) to add to transactions you send (default: 0.00)
+The preferred fee rate (in ZEC per 1000 bytes) used for transactions
+created by legacy APIs (sendtoaddress, sendmany, and
+fundrawtransaction). If the transaction is less than 1000 bytes then the
+fee rate is applied as though it were 1000 bytes. When this option is
+not set, the ZIP 317 fee calculation is used.
 .HP
 \fB\-rescan\fR
 .IP
@@ -327,10 +331,6 @@ Rescan the block chain for missing wallet transactions on startup
 Attempt to recover private keys from a corrupt wallet on startup
 (implies \fB\-rescan\fR)
 .HP
-\fB\-sendfreetransactions\fR
-.IP
-Send transactions as zero\-fee transactions if possible (default: 0)
-.HP
 \fB\-spendzeroconfchange\fR
 .IP
 Spend unconfirmed change when sending transactions (default: 1)
@@ -450,8 +450,9 @@ Prepend debug output with timestamp (default: 1)
 .HP
 \fB\-minrelaytxfee=\fR<amt>
 .IP
-Fees (in ZEC/kB) smaller than this are considered zero fee for relaying,
-mining and transaction creation (default: 0.000001)
+Transactions must have at least this fee rate (in ZEC per 1000 bytes)
+for relaying, mining and transaction creation (default: 0.000001). This
+is not the only fee constraint.
 .HP
 \fB\-maxtxfee=\fR<amt>
 .IP
@@ -482,18 +483,14 @@ Maximum size of data in data carrier transactions we relay and mine
 .PP
 Block creation options:
 .HP
-\fB\-blockminsize=\fR<n>
-.IP
-Set minimum block size in bytes (default: 0)
-.HP
 \fB\-blockmaxsize=\fR<n>
 .IP
 Set maximum block size in bytes (default: 2000000)
 .HP
-\fB\-blockprioritysize=\fR<n>
+\fB\-blockunpaidactionlimit=\fR<n>
 .IP
-Set maximum size of high\-priority/low\-fee transactions in bytes
-(default: 1000000)
+Set the limit on unpaid actions that will be accepted in a block for
+transactions paying less than the ZIP 317 fee (default: 50)
 .PP
 Mining options:
 .HP

doc/release-notes.md

@@ -4,83 +4,4 @@ release-notes at release time)
 Notable changes
 ===============
 
-RPC Changes
------------
 
-- `getdeprecationinfo` has several changes:
-  - It now returns additional information about currently deprecated and
-    disabled features.
-  - A new `end_of_service` object that contains both the block height for
-    end-of-service and the estimated time that the end-of-service halt is
-    expected to occur. Note that this height is just an approximation and
-    will change over time as the end-of-service block height approaches,
-    due to the variability in block times. The
-    `end_of_service` object is intended to replace the `deprecationheight`
-    field; see the [Deprecations](#deprecations) section for additional detail.
-  - This RPC method was previously only available for mainnet nodes; it is now
-    also available for testnet and regtest nodes, in which case it does not
-    return end-of-service halt information (as testnet and regtest nodes do not
-    have an end-of-service halt feature.)
-- Several `z_sendmany`, `z_shieldcoinbase` and `z_mergetoaddress` failures have
-  moved from synchronous to asynchronous, so while you should already be
-  checking the async operation status, there are now more cases that may trigger
-  failure at that stage.
-- The `AllowRevealedRecipients` privacy policy is now required in order to choose a
-  transparent change address for a transaction. This will only occur when the wallet
-  is unable to construct the transaction without selecting funds from the transparent
-  pool, so the impact of this change is that for such transactions, the user must specify
-  `AllowFullyTransparent`.
-- The `z_shieldcoinbase` and `z_mergetoaddress` RPC methods now support an
-  optional privacy policy.
-- The `estimatepriority` RPC call has been removed.
-- The `priority_delta` argument to the `prioritisetransaction` RPC call now has
-  no effect and must be set to a dummy value (0 or null).
-
-Changes to Transaction Fee Selection
-------------------------------------
-
-- The `-mintxfee` and `-sendfreetransactions` options have been removed. These
-  options used to instruct the wallet's legacy transaction creation APIs
-  (`sendtoaddress`, `sendmany`, and `fundrawtransaction`) to increase fees to
-  this limit and to use a zero fee for "small" transactions that spend "old"
-  inputs, respectively. They will now cause a warning on node startup if used.
-
-Changes to Block Template Construction
---------------------------------------
-
-We now use a new block template construction algorithm documented in
-[ZIP 317](https://zips.z.cash/zip-0317#recommended-algorithm-for-block-template-construction).
-
-- This algorithm no longer favours transactions that were previously considered
-  "high priority" because they spent older inputs. The `-blockprioritysize` config
-  option, which configured the portion of the block reserved for these transactions,
-  has been removed and will now cause a warning if used.
-- The `-blockminsize` option, which configured the size of a portion of the block
-  to be filled regardless of transaction fees or priority, has also been removed
-  and will cause a warning if used.
-- A `-blockunpaidactionlimit` option has been added to control the limit on
-  "unpaid actions" that will be accepted in a block for transactions paying less
-  than the ZIP 317 fee. This defaults to 50.
-
-Removal of Priority Estimation
-------------------------------
-
-- Estimation of "priority" needed for a transaction to be included within a target
-  number of blocks, and the associated `estimatepriority` RPC call, have been
-  removed. The format for `fee_estimates.dat` has also changed to no longer save
-  these priority estimates. It will automatically be converted to the new format
-  which is not readable by prior versions of the software. The `-txconfirmtarget`
-  config option is now obsolete and has also been removed. It will cause a
-  warning if used.
-
-[Deprecations](https://zcash.github.io/zcash/user/deprecation.html)
---------------
-
-The following features have been deprecated, but remain available by default.
-These features may be disabled by setting `-allowdeprecated=none`. 18 weeks
-after this release, these features will be disabled by default and the following
-flags to `-allowdeprecated` will be required to permit their continued use:
-
-- `deprecationinfo_deprecationheight`: The `deprecationheight` field of
-  `getdeprecationinfo` has been deprecated and replaced by the `end_of_service`
-  object.