zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #4513 - zcash:hotfix-v2.1.2-3, r=str4d 

Merge in hotfix v2.1.2-3
This commit is contained in:
Homu 2020-05-12 00:27:26 +00:00
parent c82b3f9450 23713c87ce
commit eab938b829
11 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

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

2
configure.ac
View File

@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_REVISION, 2)
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)

6
contrib/debian/changelog
View File

@ -1,3 +1,9 @@
zcash (2.1.2+3) stable; urgency=medium
* 2.1.2-3 release.
-- Electric Coin Company <team@electriccoin.co> Fri, 08 May 2020 12:41:23 -0600
zcash (2.1.2+2) stable; urgency=medium
* 2.1.2-2 release.

2
contrib/gitian-descriptors/gitian-linux.yml
View File

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

2
doc/authors.md
View File

@ -3,7 +3,7 @@ Zcash Contributors
Jack Grigg (1022)
Simon Liu (460)
Sean Bowe (312)
Sean Bowe (314)
Eirik Ogilvie-Wigley (214)
Daira Hopwood (181)
Taylor Hornby (99)

6
doc/man/zcash-cli.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
.TH ZCASH-CLI "1" "May 2020" "zcash-cli v2.1.2-2" "User Commands"
.TH ZCASH-CLI "1" "May 2020" "zcash-cli v2.1.2-3" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v2.1.2-2
zcash-cli \- manual page for zcash-cli v2.1.2-3
.SH DESCRIPTION
Zcash RPC client version v2.1.2\-2
Zcash RPC client version v2.1.2\-3
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.

6
doc/man/zcash-tx.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
.TH ZCASH-TX "1" "May 2020" "zcash-tx v2.1.2-2" "User Commands"
.TH ZCASH-TX "1" "May 2020" "zcash-tx v2.1.2-3" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v2.1.2-2
zcash-tx \- manual page for zcash-tx v2.1.2-3
.SH DESCRIPTION
Zcash zcash\-tx utility version v2.1.2\-2
Zcash zcash\-tx utility version v2.1.2\-3
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]

6
doc/man/zcashd.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
.TH ZCASHD "1" "May 2020" "zcashd v2.1.2-2" "User Commands"
.TH ZCASHD "1" "May 2020" "zcashd v2.1.2-3" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v2.1.2-2
zcashd \- manual page for zcashd v2.1.2-3
.SH DESCRIPTION
Zcash Daemon version v2.1.2\-2
Zcash Daemon version v2.1.2\-3
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.

12
doc/release-notes/release-notes-2.1.2-3.md Normal file
View File

@ -0,0 +1,12 @@
Notable changes
===============
This release sets the EOS halt date to roughly July 14th, which was our original intention.
Changelog
=========
Sean Bowe (2):
make-release.py: Versioning changes for 2.1.2-3.
make-release.py: Updated manpages for 2.1.2-3.

2
src/clientversion.h
View File

@ -18,7 +18,7 @@
#define CLIENT_VERSION_MAJOR 2
#define CLIENT_VERSION_MINOR 1
#define CLIENT_VERSION_REVISION 2
#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

7
src/deprecation.h
View File

@ -8,9 +8,10 @@
// 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 = 824236;
static const int WEEKS_UNTIL_DEPRECATION = 16;
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 48);
static const int APPROX_RELEASE_HEIGHT = 824273;
// static const int WEEKS_UNTIL_DEPRECATION = 16;
// static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 48);
static const int DEPRECATION_HEIGHT = 901475;
// Number of blocks before deprecation to warn users
static const int DEPRECATION_WARN_LIMIT = 14 * 24 * 48; // 2 weeks