Auto merge of #4125 - Eirik0:release-v2.0.7-2, r=daira

Release v2.0.7-2
This commit is contained in:
Homu 2019-08-31 13:46:45 -07:00
commit 87c45fcaeb
12 changed files with 51 additions and 33 deletions

View File

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

View File

@ -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, 51)
define(_CLIENT_VERSION_BUILD, 52)
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)

View File

@ -1,3 +1,9 @@
zcash (2.0.7+2) stable; urgency=medium
* 2.0.7-2 release.
-- Electric Coin Company <team@z.cash> Fri, 30 Aug 2019 17:47:52 -0600
zcash (2.0.7+1) stable; urgency=medium
* 2.0.7-1 release.

View File

@ -1,5 +1,5 @@
---
name: "zcash-2.0.7-1"
name: "zcash-2.0.7-2"
enable_cache: true
distro: "debian"
suites:

View File

@ -4,7 +4,7 @@ Zcash Contributors
Jack Grigg (874)
Simon Liu (459)
Sean Bowe (278)
Eirik Ogilvie-Wigley (166)
Eirik Ogilvie-Wigley (169)
Daira Hopwood (136)
Jay Graber (89)
Wladimir J. van der Laan (82)

View File

@ -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-1" "User Commands"
.TH ZCASH-CLI "1" "August 2019" "zcash-cli v2.0.7-2" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v2.0.7-1
zcash-cli \- manual page for zcash-cli v2.0.7-2
.SH DESCRIPTION
Zcash RPC client version v2.0.7\-1
Zcash RPC client version v2.0.7\-2
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.

View File

@ -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-1" "User Commands"
.TH ZCASH-TX "1" "August 2019" "zcash-tx v2.0.7-2" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v2.0.7-1
zcash-tx \- manual page for zcash-tx v2.0.7-2
.SH DESCRIPTION
Zcash zcash\-tx utility version v2.0.7\-1
Zcash zcash\-tx utility version v2.0.7\-2
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]

View File

@ -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-1" "User Commands"
.TH ZCASHD "1" "August 2019" "zcashd v2.0.7-2" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v2.0.7-1
zcashd \- manual page for zcashd v2.0.7-2
.SH DESCRIPTION
Zcash Daemon version v2.0.7\-1
Zcash Daemon version v2.0.7\-2
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.

View File

@ -4,21 +4,3 @@ release-notes at release time)
Notable changes
===============
Pre-Blossom EOS Halt
--------------------
v2.0.7-2 contains a shortened EOS halt so that is in alignment with v2.0.7.
Testnet Blossom Rewind
----------------------
Testnet users needed to upgrade to 2.0.7 before Blossom activated. The amount
of notice given to these users was brief, so many were not able to upgrade in
time. These users may now be on the wrong branch. v2.0.7-2 adds an "intended
rewind" to prevent having to manually reindex when reconnecting to the correct
chain.
Insight Explorer Logging Fix
----------------------------
Fixed an issue where `ERROR: spent index not enabled` would be logged unnecessarily.

View File

@ -0,0 +1,30 @@
Notable changes
===============
Pre-Blossom EOS Halt
--------------------
v2.0.7-2 contains a shortened EOS halt so that is in alignment with v2.0.7.
Testnet Blossom Rewind
----------------------
Testnet users needed to upgrade to 2.0.7 before Blossom activated. The amount
of notice given to these users was brief, so many were not able to upgrade in
time. These users may now be on the wrong branch. v2.0.7-2 adds an "intended
rewind" to prevent having to manually reindex when reconnecting to the correct
chain.
Insight Explorer Logging Fix
----------------------------
Fixed an issue where `ERROR: spent index not enabled` would be logged unnecessarily.
Changelog
=========
Eirik Ogilvie-Wigley (3):
Notable changes for v2.0.7-2
make-release.py: Versioning changes for 2.0.7-2.
make-release.py: Updated manpages for 2.0.7-2.

View File

@ -18,7 +18,7 @@
#define CLIENT_VERSION_MAJOR 2
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 7
#define CLIENT_VERSION_BUILD 51
#define CLIENT_VERSION_BUILD 52
//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true

View File

@ -8,7 +8,7 @@
// Deprecation policy:
// * Shut down 16 weeks' worth of blocks after the estimated release block height.
// * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
static const int APPROX_RELEASE_HEIGHT = 594500;
static const int APPROX_RELEASE_HEIGHT = 588500;
static const int WEEKS_UNTIL_DEPRECATION = 16;
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);