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

Merge pull request #4213 from str4d/release-v2.1.0-1 

Release v2.1.0-1
This commit is contained in:
str4d 2019-11-08 20:23:28 +00:00 committed by GitHub
parent cd5986c244 501ca0c2ec
commit 253fcaa997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 33 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.0
Zcash 2.1.0-1
<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, 0)
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)

6
contrib/debian/changelog
View File

@ -1,3 +1,9 @@
zcash (2.1.0+1) stable; urgency=medium
* 2.1.0-1 release.
-- Electric Coin Company <team@z.cash> Fri, 08 Nov 2019 18:56:32 +0000
zcash (2.1.0) stable; urgency=medium
* 2.1.0 release.

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

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

4
doc/authors.md
View File

@ -1,9 +1,9 @@
Zcash Contributors
==================
Jack Grigg (919)
Jack Grigg (921)
Simon Liu (459)
Sean Bowe (279)
Sean Bowe (280)
Eirik Ogilvie-Wigley (210)
Daira Hopwood (144)
Jay Graber (89)

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

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ZCASH-CLI "1" "November 2019" "zcash-cli v2.1.0" "User Commands"
.TH ZCASH-CLI "1" "November 2019" "zcash-cli v2.1.0-1" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v2.1.0
zcash-cli \- manual page for zcash-cli v2.1.0-1
.SH DESCRIPTION
Zcash RPC client version v2.1.0
Zcash RPC client version v2.1.0\-1
.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.6.
.TH ZCASH-TX "1" "November 2019" "zcash-tx v2.1.0" "User Commands"
.TH ZCASH-TX "1" "November 2019" "zcash-tx v2.1.0-1" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v2.1.0
zcash-tx \- manual page for zcash-tx v2.1.0-1
.SH DESCRIPTION
Zcash zcash\-tx utility version v2.1.0
Zcash zcash\-tx utility version v2.1.0\-1
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]

8
doc/man/zcashd.1
View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ZCASHD "1" "November 2019" "zcashd v2.1.0" "User Commands"
.TH ZCASHD "1" "November 2019" "zcashd v2.1.0-1" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v2.1.0
zcashd \- manual page for zcashd v2.1.0-1
.SH DESCRIPTION
Zcash Daemon version v2.1.0
Zcash Daemon version v2.1.0\-1
.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\-2\fR to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>

10
doc/release-notes/release-notes-2.1.0-1.md Normal file
View File

@ -0,0 +1,10 @@
Changelog
=========
Jack Grigg (2):
make-release.py: Versioning changes for 2.1.0-1.
make-release.py: Updated manpages for 2.1.0-1.
Sean Bowe (1):
Fix of CVE-2017-18350

2
src/clientversion.h
View File

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

2
src/deprecation.h
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 = 632000;
static const int APPROX_RELEASE_HEIGHT = 634650;
static const int WEEKS_UNTIL_DEPRECATION = 16;
// static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);