diff --git a/README.md b/README.md
index 74fdf934b..016b0b7a2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Zcash 5.0.0-rc1
+Zcash 5.0.0
===========
diff --git a/configure.ac b/configure.ac
index 15117d4a5..2d602f60f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 5)
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)
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index bcacae8b2..00834e186 100644
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,9 @@
+zcash (5.0.0) stable; urgency=medium
+
+ * 5.0.0 release.
+
+ -- Electric Coin Company Tue, 10 May 2022 19:52:28 -0600
+
zcash (5.0.0~rc1) stable; urgency=medium
* 5.0.0-rc1 release.
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 679d4de9a..9e03c1767 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
---
-name: "zcash-5.0.0-rc1"
+name: "zcash-5.0.0"
enable_cache: true
distro: "debian"
suites:
diff --git a/doc/authors.md b/doc/authors.md
index ea9874440..5700307b9 100644
--- a/doc/authors.md
+++ b/doc/authors.md
@@ -1,31 +1,31 @@
Zcash Contributors
==================
-Jack Grigg (1137)
-Kris Nuttycombe (484)
+Jack Grigg (1142)
+Kris Nuttycombe (524)
Simon Liu (460)
Sean Bowe (379)
-Daira Hopwood (316)
+Daira Hopwood (325)
Eirik Ogilvie-Wigley (216)
Wladimir J. van der Laan (150)
Alfredo Garcia (119)
-Taylor Hornby (117)
+Taylor Hornby (118)
Marshall Gaucher (112)
Pieter Wuille (106)
Jonas Schnelli (90)
Jay Graber (89)
+Larry Ruane (88)
Ying Tong Lai (87)
-Larry Ruane (86)
Marco Falke (82)
Cory Fields (75)
Nathan Wilcox (56)
Matt Corallo (52)
+sasha (51)
practicalswift (38)
Kevin Gallagher (38)
-Dimitris Apostolou (37)
+Dimitris Apostolou (38)
fanquake (36)
Carl Dong (26)
-sasha (23)
Gregory Maxwell (23)
Jorge Timón (22)
John Newbery (22)
@@ -34,10 +34,11 @@ Jonathan "Duke" Leto (18)
syd (16)
Patick Strateman (16)
furszy (15)
+Charlie O'Keefe (15)
avnish (14)
Per Grön (14)
-Charlie O'Keefe (14)
Benjamin Winston (13)
+Steven Smith (12)
Pavel Janík (12)
Patrick Strateman (12)
Ariel Gabizon (12)
@@ -45,14 +46,13 @@ Suhas Daftuar (11)
Paige Peterson (11)
Kaz Wesley (11)
Alex Morcos (11)
-Steven Smith (10)
Philip Kaufmann (10)
Peter Todd (10)
Marius Kjærstad (10)
João Barbosa (10)
ying tong (9)
+teor (9)
nomnombtc (9)
-teor (8)
kozyilmaz (8)
Zancas Wilcox (8)
Jeremy Rubin (8)
@@ -73,13 +73,13 @@ Johnathan Corgan (5)
George Tankersley (5)
Gavin Andresen (5)
Gareth Davies (5)
+Alex Wied (5)
sandakersmann (4)
gladcow (4)
WO (4)
Sjors Provoost (4)
Russell Yanofsky (4)
Nate Wilcox (4)
-Alex Wied (4)
mruddy (3)
lpescher (3)
isle2983 (3)
@@ -119,6 +119,7 @@ Pavel Vasin (2)
Mustafa (2)
Matthew King (2)
Mary Moore-Simmons (2)
+Marek (2)
Joe Turgeon (2)
Jeffrey Czyz (2)
Jack Gavigan (2)
@@ -153,6 +154,7 @@ glowang (1)
ewillbefull@gmail.com (1)
emilrus (1)
dexX7 (1)
+dependabot[bot] (1)
daniel (1)
codetriage-readme-bot (1)
calebogden (1)
diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1
index 78040192b..38c89ee81 100644
--- 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.47.13.
-.TH ZCASH-CLI "1" "May 2022" "zcash-cli v5.0.0-rc1" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
+.TH ZCASH-CLI "1" "May 2022" "zcash-cli v5.0.0" "User Commands"
.SH NAME
-zcash-cli \- manual page for zcash-cli v5.0.0-rc1
+zcash-cli \- manual page for zcash-cli v5.0.0
.SH DESCRIPTION
-Zcash RPC client version v5.0.0\-rc1
+Zcash RPC client version v5.0.0
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see .
diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1
index 4789560a7..79863fa8d 100644
--- 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.47.13.
-.TH ZCASH-TX "1" "May 2022" "zcash-tx v5.0.0-rc1" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
+.TH ZCASH-TX "1" "May 2022" "zcash-tx v5.0.0" "User Commands"
.SH NAME
-zcash-tx \- manual page for zcash-tx v5.0.0-rc1
+zcash-tx \- manual page for zcash-tx v5.0.0
.SH DESCRIPTION
-Zcash zcash\-tx utility version v5.0.0\-rc1
+Zcash zcash\-tx utility version v5.0.0
.SS "Usage:"
.TP
zcash\-tx [options] [commands]
diff --git a/doc/man/zcashd-wallet-tool.1 b/doc/man/zcashd-wallet-tool.1
index 94ed946fd..4adf72a35 100644
--- 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.47.13.
-.TH ZCASHD-WALLET-TOOL "1" "May 2022" "zcashd-wallet-tool v5.0.0-rc1" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
+.TH ZCASHD-WALLET-TOOL "1" "May 2022" "zcashd-wallet-tool v5.0.0" "User Commands"
.SH NAME
-zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.0.0-rc1
+zcashd-wallet-tool \- manual page for zcashd-wallet-tool v5.0.0
.SH SYNOPSIS
.B zcashd-wallet-tool
[\fI\,OPTIONS\/\fR]
diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1
index 9844c6f2f..186b1518a 100644
--- 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.47.13.
-.TH ZCASHD "1" "May 2022" "zcashd v5.0.0-rc1" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
+.TH ZCASHD "1" "May 2022" "zcashd v5.0.0" "User Commands"
.SH NAME
-zcashd \- manual page for zcashd v5.0.0-rc1
+zcashd \- manual page for zcashd v5.0.0
.SH DESCRIPTION
-Zcash Daemon version v5.0.0\-rc1
+Zcash Daemon version v5.0.0
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see .
@@ -31,8 +31,9 @@ long fork (%s in cmd is replaced by message)
Explicitly allow the use of the specified deprecated feature. Multiple
instances of this parameter are permitted; values for must be
selected from among {"none", "addrtype", "getnewaddress",
-"legacy_privacy", "z_getnewaddress", "zcrawjoinsplit", "zcrawkeygen",
-"zcrawreceive"}
+"getrawchangeaddress", "legacy_privacy", "z_getbalance",
+"z_getnewaddress", "z_gettotalbalance", "z_listaddresses",
+"zcrawjoinsplit", "zcrawkeygen", "zcrawreceive"}
.HP
\fB\-blocknotify=\fR
.IP
@@ -110,7 +111,7 @@ for block files)
\fB\-reindex\-chainstate\fR
.IP
Rebuild chain state from the currently indexed blocks (implies \fB\-rescan\fR
-unless pruning or unless \fB\-rescan\fR=\fI\,0\/\fR is explicitly specified
+unless pruning or unless \fB\-rescan\fR=\fI\,0\/\fR is explicitly specified)
.HP
\fB\-reindex\fR
.IP
diff --git a/doc/release-notes.md b/doc/release-notes.md
index a6f453dc7..a29094b51 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -4,107 +4,3 @@ release-notes at release time)
Notable changes
===============
-Feature Deprecation and removal
--------------------------------
-
-`zcashd` now has a [process](https://zcash.github.io/zcash/user/deprecation.html)
-for how features of the public API may be deprecated and removed. Feature
-deprecation follows a series of steps whereby, over a series of releases,
-features first remain enabled by default (but may be explicitly disabled), then
-switch to being disabled by default, and eventually are removed entirely.
-
-A new string-valued option, `-allowdeprecated` has been introduced to allow a
-user to explicitly manage the availability of deprecated `zcashd` features. This
-flag makes it possible for users to reenable deprecated methods and features
-api that are currently disabled by default, or alternately to explicitly
-disable all deprecated features if they so choose. Multiple instances of this
-argument may be provided. A user may disable deprecated features entirely
-by providing the string `none` as the argument to this parameter. In the case
-that `none` is specified, multiple invocations of `-allowdeprecated` are not
-permitted.
-
-Deprecated
-----------
-
-As of this release, the following features are deprecated, but remain
-available by default. These features may be disabled by setting
-`-allowdeprecated=none`. After release 5.3.0, these features will be
-disabled by default and the following flags to `-allowdeprecated` will
-be required to permit their continued use:
-
- - `legacy_privacy` - the default "legacy" privacy policy for z_sendmany
- is deprecated. When disabled, the default behavior of z_sendmany will
- conform to the `FullPrivacy` directive (introduced in 4.7.0) in all cases
- instead of just for transactions involving unified addresses.
- - `getnewaddress` - controls availability of the `getnewaddress` RPC method.
- - `getrawchangeaddress` - controls availability of the `getrawchangeaddress` RPC method.
- - `z_getbalance` - controls availability of the `z_getbalance` RPC method.
- - `z_gettotalbalance` - controls availability of the `z_gettotalbalance` RPC method.
- - `z_getnewaddress` - controls availability of the `z_getnewaddress` RPC method.
- - `z_listaddresses` - controls availability of the `z_listaddresses` RPC method.
- - `addrtype` - controls availability of the deprecated `type` attribute
- returned by RPC methods that return address metadata.
-
-As of this release, the following previously deprecated features are disabled
-by default, but may be be reenabled using `-allowdeprecated=`.
-
- - The `zcrawreceive` RPC method is disabled. It may be reenabled with
- `allowdeprecated=zcrawreceive`
- - The `zcrawjoinsplit` RPC method is disabled. It may be reenabled with
- `allowdeprecated=zcrawjoinsplit`
- - The `zcrawkeygen` RPC method is disabled. It may be reenabled with
- `allowdeprecated=zcrawkeygen`
-
-Option handling
----------------
-
-- The `-reindex` and `-reindex-chainstate` options now imply `-rescan`
- (provided that the wallet is enabled and pruning is disabled, and unless
- `-rescan=0` is specified explicitly).
-- A new `-anchorconfirmations` argument has been added to allow the user
- to specify the number of blocks back from the chain tip that anchors will be
- selected from when spending notes. By default, anchors will now be selected
- to have 3 confirmations. Values greater than 100 are not supported.
-- A new `-orchardactionlimit` option has been added to allow the user to
- override the default maximum of 50 Orchard actions per transaction.
- Transactions that contain large numbers of Orchard actions can use
- large amounts of memory for proving, so the 50-action default limit is
- imposed to guard against memory exhaustion. Systems with more than 16G
- of memory can safely set this parameter to allow 200 actions or more.
-
-RPC Interface
--------------
-
-- The default `minconf` value for `z_sendmany` is now 10 confirmations instead
- of 1. If `minconf` specifies a value less than that provided for
- `-anchorconfirmations`, it will also override that value as it is not
- possible to spend notes that are more recent than the anchor. Selecting
- `minconf` values less than 3 is not recommended, as it allows the transaction
- to be distinguished from transactions using the default for
- `-anchorconfirmations`.
-
-RPC Changes
------------
-
-- The deprecated `zcrawkeygen`, `zcrawreceive`, and `zcrawjoinsplit` RPC
- methods are now disabled by default. Use `-allowdeprecated=`
- to select individual features if you wish to continue using these APIs.
-
-Build system
-------------
-
-- `zcutil/build.sh` now automatically runs `zcutil/clean.sh` to remove
- files created by previous builds. We previously recommended to do this
- manually.
-
-Dependencies
-------------
-
-- The `boost` and `native_b2` dependencies have been updated to version 1.79.0
-
-Tests
------
-
-- The environment variable that allows users of the rpc (Python) tests to
- override the default path to the `zcashd` executable has been changed
- from `BITCOIND` to `ZCASHD`.
diff --git a/doc/release-notes/release-notes-5.0.0.md b/doc/release-notes/release-notes-5.0.0.md
new file mode 100644
index 000000000..50013b592
--- /dev/null
+++ b/doc/release-notes/release-notes-5.0.0.md
@@ -0,0 +1,253 @@
+Notable changes
+===============
+
+The mainnet activation of the NU5 network upgrade is supported by the 5.0.0
+release, with an activation height of 1687104, which should occur on
+approximately May 31, 2022. Please upgrade to this release, or any subsequent
+release, in order to follow the NU5 network upgrade.
+
+The following ZIPs are being deployed, or have been updated, as part of this upgrade:
+
+* [ZIP 32 : Shielded Hierarchical Deterministic Wallets (updated)](https://zips.z.cash/zip_0032)
+* [ZIP 203: Transaction Expiry (updated)](https://zips.z.cash/zip_0203)
+* [ZIP 209: Prohibit Negative Shielded Chain Value Pool Balances (updated)](https://zips.z.cash/zip_0209)
+* [ZIP 212: Allow Recipient to Derive Ephemeral Secret from Note Plaintext (updated)](https://zips.z.cash/zip_0212)
+* [ZIP 213: Shielded Coinbase (updated)](https://zips.z.cash/zip_0213)
+* [ZIP 216: Require Canonical Jubjub Point Encodings](https://zips.z.cash/zip_0216)
+* [ZIP 221: FlyClient - Consensus-Layer Changes (updated)](https://zips.z.cash/zip_0221)
+* [ZIP 224: Orchard Shielded Protocol](https://zips.z.cash/zip_0224)
+* [ZIP 225: Version 5 Transaction Format](https://zips.z.cash/zip_0225)
+* [ZIP 239: Relay of Version 5 Transactions](https://zips.z.cash/zip_0239)
+* [ZIP 244: Transaction Identifier Non-Malleability](https://zips.z.cash/zip_0244)
+* [ZIP 252: Deployment of the NU5 Network Upgrade](https://zips.z.cash/zip_0252)
+* [ZIP 316: Unified Addresses and Unified Viewing Keys](https://zips.z.cash/zip_0316)
+* [ZIP 401: Addressing Mempool Denial-of-Service (clarified)](https://zips.z.cash/zip_0401)
+
+Feature Deprecation and removal
+-------------------------------
+
+`zcashd` now has a [process](https://zcash.github.io/zcash/user/deprecation.html)
+for how features of the public API may be deprecated and removed. Feature
+deprecation follows a series of steps whereby, over a series of releases,
+features first remain enabled by default (but may be explicitly disabled), then
+switch to being disabled by default, and eventually are removed entirely.
+
+A new string-valued option, `-allowdeprecated` has been introduced to allow a
+user to explicitly manage the availability of deprecated `zcashd` features. This
+flag makes it possible for users to reenable deprecated methods and features
+api that are currently disabled by default, or alternately to explicitly
+disable all deprecated features if they so choose. Multiple instances of this
+argument may be provided. A user may disable deprecated features entirely
+by providing the string `none` as the argument to this parameter. In the case
+that `none` is specified, multiple invocations of `-allowdeprecated` are not
+permitted.
+
+Deprecated
+----------
+
+As of this release, the following features are deprecated, but remain
+available by default. These features may be disabled by setting
+`-allowdeprecated=none`. After release 5.3.0, these features will be
+disabled by default and the following flags to `-allowdeprecated` will
+be required to permit their continued use:
+
+ - `legacy_privacy` - the default "legacy" privacy policy for z_sendmany
+ is deprecated. When disabled, the default behavior of z_sendmany will
+ conform to the `FullPrivacy` directive (introduced in 4.7.0) in all cases
+ instead of just for transactions involving unified addresses.
+ - `getnewaddress` - controls availability of the `getnewaddress` RPC method.
+ - `getrawchangeaddress` - controls availability of the `getrawchangeaddress` RPC method.
+ - `z_getbalance` - controls availability of the `z_getbalance` RPC method.
+ - `z_gettotalbalance` - controls availability of the `z_gettotalbalance` RPC method.
+ - `z_getnewaddress` - controls availability of the `z_getnewaddress` RPC method.
+ - `z_listaddresses` - controls availability of the `z_listaddresses` RPC method.
+ - `addrtype` - controls availability of the deprecated `type` attribute
+ returned by RPC methods that return address metadata.
+
+As of this release, the following previously deprecated features are disabled
+by default, but may be be reenabled using `-allowdeprecated=`.
+
+ - The `zcrawreceive` RPC method is disabled. It may be reenabled with
+ `allowdeprecated=zcrawreceive`
+ - The `zcrawjoinsplit` RPC method is disabled. It may be reenabled with
+ `allowdeprecated=zcrawjoinsplit`
+ - The `zcrawkeygen` RPC method is disabled. It may be reenabled with
+ `allowdeprecated=zcrawkeygen`
+
+Option handling
+---------------
+
+- The `-reindex` and `-reindex-chainstate` options now imply `-rescan`
+ (provided that the wallet is enabled and pruning is disabled, and unless
+ `-rescan=0` is specified explicitly).
+- A new `-anchorconfirmations` argument has been added to allow the user
+ to specify the number of blocks back from the chain tip that anchors will be
+ selected from when spending notes. By default, anchors will now be selected
+ to have 3 confirmations. Values greater than 100 are not supported.
+- A new `-orchardactionlimit` option has been added to allow the user to
+ override the default maximum of 50 Orchard actions per transaction.
+ Transactions that contain large numbers of Orchard actions can use
+ large amounts of memory for proving, so the 50-action default limit is
+ imposed to guard against memory exhaustion. Systems with more than 16G
+ of memory can safely set this parameter to allow 200 actions or more.
+
+RPC Interface
+-------------
+
+- The default `minconf` value for `z_sendmany` is now 10 confirmations instead
+ of 1. If `minconf` specifies a value less than that provided for
+ `-anchorconfirmations`, it will also override that value as it is not
+ possible to spend notes that are more recent than the anchor. Selecting
+ `minconf` values less than 3 is not recommended, as it allows the transaction
+ to be distinguished from transactions using the default for
+ `-anchorconfirmations`.
+
+RPC Changes
+-----------
+
+- The deprecated `zcrawkeygen`, `zcrawreceive`, and `zcrawjoinsplit` RPC
+ methods are now disabled by default. Use `-allowdeprecated=`
+ to select individual features if you wish to continue using these APIs.
+
+Build system
+------------
+
+- `zcutil/build.sh` now automatically runs `zcutil/clean.sh` to remove
+ files created by previous builds. We previously recommended to do this
+ manually.
+
+Dependencies
+------------
+
+- The `boost` and `native_b2` dependencies have been updated to version 1.79.0
+
+Tests
+-----
+
+- The environment variable that allows users of the rpc (Python) tests to
+ override the default path to the `zcashd` executable has been changed
+ from `BITCOIND` to `ZCASHD`.
+
+Changelog
+=========
+
+Alex Wied (1):
+ Cargo.toml: Rename hdwallet source
+
+Charlie O'Keefe (1):
+ Use bullseye apt source in Dockerfile to match debian:11 base image
+
+Daira Hopwood (9):
+ Fix to 4.7.0 release notes: testnet nodes that upgrade prior to height 1,842,420 actually still need to run with -reindex and -rescan.
+ zcutil/build.sh: Run zcutil/clean.sh before building. fixes #3625
+ Make `-reindex` and `-reindex-chainstate` imply `-rescan` (provided that the wallet is enabled and pruning is disabled, and unless `-rescan=0` is specified explicitly).
+ zcutil/build-debian-package.sh: copy executable and man page for zcashd-wallet-tool.
+ zcashd-wallet-tool: improve the error message for an invalid logging filter directive.
+ Change the numbering convention for hotfixes to increment the patch number, not the hyphen number. fixes #4364
+ Rename nOrchardAnchorConfirmations -> nAnchorConfirmations
+ Select an anchor and notes that have 10 confirmations.
+ Fix WalletTests.CachedWitnessesEmptyChain for new anchor selection.
+
+Dimitris Apostolou (1):
+ Fix typo
+
+Jack Grigg (5):
+ Update minimum chain work and set NU5 activation block hash for testnet
+ make-release.py: Versioning changes for 5.0.0-rc1.
+ make-release.py: Updated manpages for 5.0.0-rc1.
+ make-release.py: Updated release notes and changelog for 5.0.0-rc1.
+ Migrate to `zcash_primitives 0.6` et al
+
+Kris Nuttycombe (40):
+ Update boost dependencies to version 1.79.0
+ Default to error logging if we can't parse the log filter.
+ Fix boolean initialization in Orchard transaction builder.
+ Use fallible version parsing for tags.
+ Allow deprecated wallet features to be preemptively disabled.
+ Remove zcrawreceive, zcrawjoinsplit, zcrawkeygen from default-allowed deprecated methods.
+ Add deprecation policy to the zcashd book.
+ Use ERROR level logging for fatal errors in main/init
+ Remove `-allowdeprecated=all`
+ Clarify documentation of the deprecation process.
+ Select Orchard anchors at `-orchardanchorconfirmations` depth.
+ Add anchor depth parameter to Get*NoteWitnesses
+ Disallow -anchorconfirmations values > 100
+ Add -anchorconfirmations to the release notes
+ Fix RPC tests that depend upon -anchorconfirmations=1
+ Add z_get(total)balance to deprecation flags.
+ Apply suggestions from code review
+ Gracefully handle Get(Sprout/Sapling)NoteWitnesses failure.
+ Add parity-scale-codec licenses to contrib/debian/copyright
+ Ensure transaction integer fields are zero-initialized.
+ Build releases from a commit hash, rather than a named branch.
+ Apply suggestions from code review
+ Update release process documentation to clarify the use of release stabilization branches.
+ Fix missing handling for imported transparent multisig addresses.
+ Change default anchor depth from 10 confirmations to 3
+ Use default anchor confirmations for minconf in z_mergetoaddress.
+ Add -orchardactionlimit parameter to guard against memory exhaustion.
+ Add -orchardactionlimit help text.
+ Postpone dependency updates prior to v5.0.0-rc1
+ Set RELEASE_TO_DEPRECATION_WEEKS to 2 weeks to provide RC EOS halt.
+ Fix a typo in the release script.
+ Fix typos in release notes & Orchard wallet internal API doc.
+ Add missing parenthesis to -reindex help.
+ Include getbalance in recommendations for z_getbalance and z_gettotalbalance replacements.
+ Add tests to check auth data commitments committing to Orchard actions.
+ Deprecate `getrawchangeaddress` and `z_listaddresses`
+ Update rpcwallet help to better distinguish transparent-only APIs.
+ Revert "Set RELEASE_TO_DEPRECATION_WEEKS to 2 weeks to provide RC EOS halt."
+ make-release.py: Versioning changes for 5.0.0.
+ make-release.py: Updated manpages for 5.0.0.
+
+Larry Ruane (2):
+ Allow rpc python tests to be run standalone
+ ThreadStartWalletNotifier: wait until !IBD, rather than !reindex
+
+Marek (2):
+ Document the block time in the `z_gettreestate` RPC response
+ Specify the format and epoch
+
+Steven Smith (2):
+ Add orchard pool metrics
+ Require wallet recovery phrase to be backed up for z_getnewaccount and z_getaddressforaccount
+
+Taylor Hornby (1):
+ Reproduce an assertion failure in the listaddresses RPC
+
+dependabot[bot] (1):
+ Bump actions/checkout from 2 to 3
+
+sasha (28):
+ Move LoadProofParameters to gtest/utils.cpp
+ add tx-orchard-duplicate-nullifiers.h to Makefile.gtest.include
+ Closing #1539 simplifies gtest Makefile.
+ remove JoinSplitTestingSetup from sighash_tests -- it doesn't need it
+ Make a LoadGlobalWallet and UnloadGlobalWallet for gtests
+ Remove proof parameter loading from btests
+ Separate test suite from tests, inspired by upstream's #12926
+ Allow parallel btest runs using make as the parallelization tool.
+ btest parallelization work: tag #if'd out test suites
+ Port btest test_basic_joinsplit_verification to gtest suite Joinsplit
+ Create a new gtest group WalletRPCTests
+ Port btest rpc_z_shieldcoinbase_internals to gtest suite WalletRPCTests
+ Port btest rpc_z_mergetoaddress_internals to gtest suite WalletRPCTests
+ Port btest rpc_z_sendmany_taddr_to_sapling to gtest suite WalletRPCTests
+ Downgrade btest suite coins_test to BasicTestingSetup
+ Make [seed_]insecure_rand available to the gtests
+ Create a new gtest suite CoinsTests
+ Port CCoinsViewTest to gtest suite CoinsTests
+ Port nullifier_regression_test to gtest suite CoinsTests
+ Port anchor_pop_regression_test to gtest suite CoinsTests
+ Port anchor_regression_test to gtest suite CoinsTests
+ Port nullifiers_test to gtest suite CoinsTests
+ Port anchors_flush_test to gtest suite CoinsTests
+ Port anchors_test to gtest suite CoinsTests
+ Update copyright header
+ Update comments in newly-ported gtests to be more consistent with current codebase
+ Tidy up spacing in newly-ported gtests
+ Remove -developersapling since it hasn't been implemented for a long time
+
+teor (1):
+ Fix typo in getaddressbalance RPC help
+
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 8975c53bc..8bfb35718 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -134,8 +134,8 @@ public:
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].hashActivationBlock =
uint256S("00000000002038016f976744c369dce7419fca30e7171dfac703af5e5f7ad1d4");
consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170100;
- consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight =
- Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
+ consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight = 1687104;
+
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
diff --git a/src/clientversion.h b/src/clientversion.h
index 5f03033f2..8c436b625 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -18,7 +18,7 @@
#define CLIENT_VERSION_MAJOR 5
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 25
+#define CLIENT_VERSION_BUILD 50
//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
diff --git a/src/deprecation.h b/src/deprecation.h
index e080b4cf8..7f8ea5e84 100644
--- a/src/deprecation.h
+++ b/src/deprecation.h
@@ -10,8 +10,8 @@
// Per https://zips.z.cash/zip-0200
// Shut down nodes running this version of code, 16 weeks' worth of blocks after the estimated
// release block height. A warning is shown during the 14 days' worth of blocks prior to shut down.
-static const int APPROX_RELEASE_HEIGHT = 1661960;
-static const int RELEASE_TO_DEPRECATION_WEEKS = 2;
+static const int APPROX_RELEASE_HEIGHT = 1663550;
+static const int RELEASE_TO_DEPRECATION_WEEKS = 16;
static const int EXPECTED_BLOCKS_PER_HOUR = 3600 / Consensus::POST_BLOSSOM_POW_TARGET_SPACING;
static_assert(EXPECTED_BLOCKS_PER_HOUR == 48, "The value of Consensus::POST_BLOSSOM_POW_TARGET_SPACING was chosen such that this assertion holds.");
static const int ACTIVATION_TO_DEPRECATION_BLOCKS = (RELEASE_TO_DEPRECATION_WEEKS * 7 * 24 * EXPECTED_BLOCKS_PER_HOUR);
diff --git a/src/version.h b/src/version.h
index 276b815ef..9c83e079a 100644
--- a/src/version.h
+++ b/src/version.h
@@ -9,7 +9,7 @@
* network protocol versioning
*/
-static const int PROTOCOL_VERSION = 170050;
+static const int PROTOCOL_VERSION = 170100;
//! initial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209;