Merge pull request #21 from zcash/release-v2.0.7-3

Release v2.0.7-3
zcash · Sep 24, 2019 · e3983af · e3983af
2 parents 1ef3f7b + dffdbcf
commit e3983af
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Zcash 2.0.7-2
+Zcash 2.0.7-3
 <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, 2)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 7)
-define(_CLIENT_VERSION_BUILD, 52)
+define(_CLIENT_VERSION_BUILD, 53)
 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 (2.0.7+3) stable; urgency=critical
+
+  * 2.0.7-3 release.
+
+ -- Electric Coin Company <team@z.cash>  Tue, 24 Sep 2019 21:01:13 +0100
+
 zcash (2.0.7+2) stable; urgency=medium
 
   * 2.0.7-2 release.

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

diff --git a/doc/authors.md b/doc/authors.md
@@ -1,11 +1,11 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (874)
+Jack Grigg (880)
 Simon Liu (459)
 Sean Bowe (278)
 Eirik Ogilvie-Wigley (169)
-Daira Hopwood (136)
+Daira Hopwood (140)
 Jay Graber (89)
 Wladimir J. van der Laan (82)
 Taylor Hornby (73)

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.6.
-.TH ZCASH-CLI "1" "August 2019" "zcash-cli v2.0.7-2" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH ZCASH-CLI "1" "September 2019" "zcash-cli v2.0.7-3" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v2.0.7-2
+zcash-cli \- manual page for zcash-cli v2.0.7-3
 .SH DESCRIPTION
-Zcash RPC client version v2.0.7\-2
+Zcash RPC client version v2.0.7\-3
 .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.6.
-.TH ZCASH-TX "1" "August 2019" "zcash-tx v2.0.7-2" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH ZCASH-TX "1" "September 2019" "zcash-tx v2.0.7-3" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v2.0.7-2
+zcash-tx \- manual page for zcash-tx v2.0.7-3
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v2.0.7\-2
+Zcash zcash\-tx utility version v2.0.7\-3
 .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.6.
-.TH ZCASHD "1" "August 2019" "zcashd v2.0.7-2" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH ZCASHD "1" "September 2019" "zcashd v2.0.7-3" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v2.0.7-2
+zcashd \- manual page for zcashd v2.0.7-3
 .SH DESCRIPTION
-Zcash Daemon version v2.0.7\-2
+Zcash Daemon version v2.0.7\-3
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.
@@ -75,7 +75,7 @@ limit applied)
 .HP
 \fB\-par=\fR<n>
 .IP
-Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
+Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 =
 leave that many cores free, default: 0)
 .HP
 \fB\-pid=\fR<file>
@@ -361,10 +361,6 @@ Fees (in ZEC/kB) smaller than this are considered zero fee for relaying
 .IP
 Send trace/debug info to console instead of debug.log file
 .HP
-\fB\-shrinkdebugfile\fR
-.IP
-Shrink debug.log file on client startup (default: 1 when no \fB\-debug\fR)
-.HP
 \fB\-testnet\fR
 .IP
 Use the test network

diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -4,17 +4,3 @@ release-notes at release time)
 Notable changes
 ===============
 
-This release fixes a security issue described at
-https://z.cash/support/security/announcements/security-announcement-2019-09-24/ .
-
-The service period of this release is shorter than normal due to the upcoming
-v2.1.0 Blossom release. The End-of-Service of v2.0.7-3 will occur at block height
-653012, expected to be on 2019-12-10.
-
-
-Shrinking of debug.log files is temporarily disabled
-----------------------------------------------------
-
-In previous versions, `zcashd` would shrink the `debug.log` file to 200 KB on
-startup if it was larger than 10 MB. This behaviour, and the `-shrinkdebugfile`
-option that controlled it, has been disabled.
diff --git a/doc/release-notes/release-notes-2.0.7-3.md b/doc/release-notes/release-notes-2.0.7-3.md
@@ -0,0 +1,35 @@
+Notable changes
+===============
+
+This release fixes a security issue described at
+https://z.cash/support/security/announcements/security-announcement-2019-09-24/ .
+
+The service period of this release is shorter than normal due to the upcoming
+v2.1.0 Blossom release. The End-of-Service of v2.0.7-3 will occur at block height
+653012, expected to be on 2019-12-10.
+
+
+Shrinking of debug.log files is temporarily disabled
+----------------------------------------------------
+
+In previous versions, `zcashd` would shrink the `debug.log` file to 200 KB on
+startup if it was larger than 10 MB. This behaviour, and the `-shrinkdebugfile`
+option that controlled it, has been disabled.
+
+Changelog
+=========
+
+Daira Hopwood (4):
+      Add hotfix release notes.
+      Make a note of the shorter service period in the release notes.
+      make-release.py: Versioning changes for 2.0.7-3.
+      make-release.py: Updated manpages for 2.0.7-3.
+
+Jack Grigg (6):
+      Disable -shrinkdebugfile command
+      SetMerkleBranch: remove unused code, remove cs_main lock requirement
+      Remove cs_main lock requirement from CWallet::SyncTransaction
+      Ignore exceptions when deserializing note plaintexts
+      Move mempool SyncWithWallets call into its own thread
+      Enable RPC tests to wait on mempool notifications
+
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -18,7 +18,7 @@
 #define CLIENT_VERSION_MAJOR 2
 #define CLIENT_VERSION_MINOR 0
 #define CLIENT_VERSION_REVISION 7
-#define CLIENT_VERSION_BUILD 52
+#define CLIENT_VERSION_BUILD 53
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true