Merge pull request zcash#5349 from str4d/release-v4.5.1-1

Release v4.5.1-1
centromere · Oct 8, 2021 · 3ac39a5 · 3ac39a5
2 parents 5860151 + d397f4e
commit 3ac39a5
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Zcash 4.5.1
+Zcash 4.5.1-1
 <img align="right" width="120" height="80" src="doc/imgs/logo.png">
 ===========
 

diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 4)
 define(_CLIENT_VERSION_MINOR, 5)
 define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 50)
+define(_CLIENT_VERSION_BUILD, 51)
 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
@@ -1,3 +1,9 @@
+zcash (4.5.1+1) stable; urgency=medium
+
+  * 4.5.1-1 release.
+
+ -- Electric Coin Company <[email protected]>  Fri, 08 Oct 2021 17:03:31 +0000
+
 zcash (4.5.1) stable; urgency=medium
 
   * 4.5.1 release.

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "zcash-4.5.1"
+name: "zcash-4.5.1-1"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/doc/authors.md b/doc/authors.md
@@ -1,12 +1,12 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (1117)
+Jack Grigg (1123)
 Simon Liu (460)
 Sean Bowe (367)
 Daira Hopwood (270)
 Eirik Ogilvie-Wigley (216)
-Kris Nuttycombe (163)
+Kris Nuttycombe (174)
 Wladimir J. van der Laan (150)
 Alfredo Garcia (116)
 Taylor Hornby (114)

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.47.13.
-.TH ZCASH-CLI "1" "September 2021" "zcash-cli v4.5.1" "User Commands"
+.TH ZCASH-CLI "1" "October 2021" "zcash-cli v4.5.1-1" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v4.5.1
+zcash-cli \- manual page for zcash-cli v4.5.1-1
 .SH DESCRIPTION
-Zcash RPC client version v4.5.1
+Zcash RPC client version v4.5.1\-1
 .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.47.13.
-.TH ZCASH-TX "1" "September 2021" "zcash-tx v4.5.1" "User Commands"
+.TH ZCASH-TX "1" "October 2021" "zcash-tx v4.5.1-1" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v4.5.1
+zcash-tx \- manual page for zcash-tx v4.5.1-1
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v4.5.1
+Zcash zcash\-tx utility version v4.5.1\-1
 .SS "Usage:"
 .TP
 zcash\-tx [options] <hex\-tx> [commands]

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.47.13.
-.TH ZCASHD "1" "September 2021" "zcashd v4.5.1" "User Commands"
+.TH ZCASHD "1" "October 2021" "zcashd v4.5.1-1" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v4.5.1
+zcashd \- manual page for zcashd v4.5.1-1
 .SH DESCRIPTION
-Zcash Daemon version v4.5.1
+Zcash Daemon version v4.5.1\-1
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.
@@ -84,7 +84,7 @@ Keep at most <n> unconnectable transactions in memory (default: 100)
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-16\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>

diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -4,9 +4,3 @@ release-notes at release time)
 Notable changes
 ===============
 
-The `listaddresses` endpoint has been added to the RPC API. This method
-allows the caller to obtain addresses managed by the wallet, grouped
-by the source of the address, including both those addresses generated
-by the wallet and those associated with imported viewing or spending
-keys. This provides functionality that replaces and subsumes the 
-previously-removed `getaddressesbyaccount` method.
diff --git a/doc/release-notes/release-notes-4.5.1-1.md b/doc/release-notes/release-notes-4.5.1-1.md
@@ -0,0 +1,46 @@
+Notable changes
+===============
+
+Added v5 transactions to standard rules
+---------------------------------------
+
+In v4.5.0 we added the v5 transaction format to the NU5 consensus rules for
+testnet. However, it was omitted from the standard rules, which meant that
+`zcashd` testnet nodes would not accept v5 transactions into their mempools,
+causing them to not be propagated or mined. This release updates the `zcashd`
+standard rules to accept v5 transactions alongside v4 transactions.
+
+New `listaddresses` RPC method
+------------------------------
+
+The `listaddresses` endpoint has been added to the RPC API. This method
+allows the caller to obtain addresses managed by the wallet, grouped
+by the source of the address, including both those addresses generated
+by the wallet and those associated with imported viewing or spending
+keys. This provides functionality that replaces and subsumes the 
+previously-removed `getaddressesbyaccount` method.
+
+Changelog
+=========
+
+Jack Grigg (6):
+      Mark v5 transaction format as standard for NU5
+      Fix comment
+      cargo update
+      depends: Postpone dependency updates
+      make-release.py: Versioning changes for 4.5.1-1.
+      make-release.py: Updated manpages for 4.5.1-1.
+
+Kris Nuttycombe (11):
+      Add `listaddresses` RPC method.
+      Categorize listaddresses result by source type.
+      Correctly handle imported Sapling addresses
+      Apply suggestions from code review
+      Apply suggestions from code review
+      Group legacy_hdseed Sapling addresses by account ID.
+      Update release notes for v4.5.1-1 to reflect the addition of `listaddresses`
+      Include `ImportedWatchOnly` as a PaymentAddressSource result.
+      Add listaddresses check to wallet_addresses.py
+      Consistently group Sapling addresses by IVK for every source.
+      Use lowerCamelCase for listaddresses JSON
+
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -18,7 +18,7 @@
 #define CLIENT_VERSION_MAJOR 4
 #define CLIENT_VERSION_MINOR 5
 #define CLIENT_VERSION_REVISION 1
-#define CLIENT_VERSION_BUILD 50
+#define CLIENT_VERSION_BUILD 51
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true