Skip to content

Commit

Permalink
Auto merge of zcash#3602 - bitcartel:release-v2.0.1, r=ebfull
Browse files Browse the repository at this point in the history
Release v2.0.1
  • Loading branch information
zkbot committed Oct 14, 2018
2 parents 5893430 + 472f7fa commit e8f5e59
Show file tree
Hide file tree
Showing 12 changed files with 310 additions and 54 deletions.
2 changes: 1 addition & 1 deletion README.md
@@ -1,4 +1,4 @@
Zcash 2.0.1-rc1
Zcash 2.0.1
<img align="right" width="120" height="80" src="doc/imgs/logo.png">
===========

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 25)
define(_CLIENT_VERSION_BUILD, 50)
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)
Expand Down
6 changes: 6 additions & 0 deletions contrib/debian/changelog
@@ -1,3 +1,9 @@
zcash (2.0.1) stable; urgency=medium

* 2.0.1 release.

-- Zcash Company <team@z.cash> Sun, 14 Oct 2018 13:40:30 -0700

zcash (2.0.1~rc1) stable; urgency=medium

* 2.0.1-rc1 release.
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
---
name: "zcash-2.0.1-rc1"
name: "zcash-2.0.1"
enable_cache: true
distro: "debian"
suites:
Expand Down
25 changes: 14 additions & 11 deletions doc/authors.md
@@ -1,43 +1,46 @@
Zcash Contributors
==================

Jack Grigg (760)
Simon Liu (352)
Sean Bowe (263)
Jack Grigg (843)
Simon Liu (420)
Sean Bowe (264)
Daira Hopwood (110)
Jay Graber (84)
Jay Graber (89)
Wladimir J. van der Laan (81)
Taylor Hornby (65)
Eirik Ogilvie-Wigley (60)
Jonas Schnelli (58)
Nathan Wilcox (56)
Jonas Schnelli (55)
Pieter Wuille (50)
Kevin Gallagher (38)
Eirik Ogilvie-Wigley (36)
Cory Fields (35)
syd (15)
Matt Corallo (13)
Larry Ruane (11)
mdr0id (10)
Paige Peterson (10)
MarcoFalke (10)
Jonathan "Duke" Leto (10)
nomnombtc (9)
Jonathan "Duke" Leto (9)
kozyilmaz (8)
fanquake (8)
Jeff Garzik (7)
Gregory Maxwell (7)
Ariel Gabizon (7)
Luke Dashjr (6)
Larry Ruane (6)
David Mercer (6)
Daniel Cousens (6)
Pavel Janík (5)
Karl-Johan Alm (5)
Johnathan Corgan (5)
WO (4)
Philip Kaufmann (4)
Peter Todd (4)
Patrick Strateman (4)
Marius Kjærstad (4)
João Barbosa (4)
Jorge Timón (4)
Duke Leto (4)
David Mercer (4)
lpescher (3)
Suhas Daftuar (3)
Per Grön (3)
Expand Down Expand Up @@ -65,6 +68,7 @@ Kaz Wesley (2)
Joe Turgeon (2)
Jack Gavigan (2)
ITH4Coinomia (2)
George Tankersley (2)
Gavin Andresen (2)
Brad Miller (2)
Bjorn Hjortsberg (2)
Expand All @@ -74,7 +78,6 @@ zathras-crypto (1)
unsystemizer (1)
practicalswift (1)
mrbandrews (1)
mdr0id (1)
kazcw (1)
jc (1)
isle2983 (1)
Expand All @@ -84,6 +87,7 @@ dexX7 (1)
daniel (1)
calebogden (1)
ayleph (1)
Za Wilcox (1)
Tom Ritter (1)
Tom Harding (1)
Stephen (1)
Expand All @@ -103,7 +107,6 @@ Murilo Santana (1)
Maxwell Gubler (1)
Matt Quinn (1)
Mark Friedenbach (1)
Marius Kjærstad (1)
Louis Nyffenegger (1)
Leo Arias (1)
Lauda (1)
Expand Down
6 changes: 3 additions & 3 deletions doc/man/zcash-cli.1
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-CLI "1" "October 2018" "zcash-cli v2.0.1-rc1" "User Commands"
.TH ZCASH-CLI "1" "October 2018" "zcash-cli v2.0.1" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v2.0.1-rc1
zcash-cli \- manual page for zcash-cli v2.0.1
.SH DESCRIPTION
Zcash RPC client version v2.0.1\-rc1
Zcash RPC client version v2.0.1
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
Expand Down
6 changes: 3 additions & 3 deletions doc/man/zcash-tx.1
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-TX "1" "October 2018" "zcash-tx v2.0.1-rc1" "User Commands"
.TH ZCASH-TX "1" "October 2018" "zcash-tx v2.0.1" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v2.0.1-rc1
zcash-tx \- manual page for zcash-tx v2.0.1
.SH DESCRIPTION
Zcash zcash\-tx utility version v2.0.1\-rc1
Zcash zcash\-tx utility version v2.0.1
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]
Expand Down
6 changes: 3 additions & 3 deletions doc/man/zcashd.1
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASHD "1" "October 2018" "zcashd v2.0.1-rc1" "User Commands"
.TH ZCASHD "1" "October 2018" "zcashd v2.0.1" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v2.0.1-rc1
zcashd \- manual page for zcashd v2.0.1
.SH DESCRIPTION
Zcash Daemon version v2.0.1\-rc1
Zcash Daemon version v2.0.1
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
Expand Down
29 changes: 0 additions & 29 deletions doc/release-notes.md
Expand Up @@ -4,32 +4,3 @@ release-notes at release time)
Notable changes
===============

Enabled Sapling features for mainnet
------------------------------------
This release adds significant support for Sapling to the wallet and RPC interface. Sapling will activate at block 419200, which is expected to be mined on the 28th of October 2018. Users running v2.0.0 nodes (which are consensus-compatible with Sapling) will follow the network upgrade, but must upgrade to v2.0.1 in order to send Sapling shielded transactions.

Minimum Difficulty Blocks allowed on testnet
--------------------------------------------
Sapling activated on testnet at block 280000. Users running v2.0.1 nodes no longer need to specify `-experimentalfeatures` and `-developersapling` to use Sapling functionality on testnet. Users running v2.0.0 nodes should upgrade to v2.0.1 which introduces a consensus rule change to allow minimum difficulty blocks to be mined from block 299188, thereby splitting the chain.

[Pull request](https://github.com/zcash/zcash/pull/3559)

Hierarchical Deterministic Key Generation for Sapling
-----------------------------------------------------
All Sapling addresses will use hierarchical deterministic key generation
according to ZIP 32 (keypath m/32'/133'/k' on mainnet). Transparent and
Sprout addresses will still use traditional key generation.

Backups of HD wallets, regardless of when they have been created, can
therefore be used to re-generate all possible Sapling private keys, even the
ones which haven't already been generated during the time of the backup.
Regular backups are still necessary, however, in order to ensure that
transparent and Sprout addresses are not lost.

[Pull request](https://github.com/zcash/zcash/pull/3492), [ZIP 32](https://github.com/zcash/zips/blob/master/zip-0032.mediawiki)

Fix Signing Raw Transactions with Unsynced Offline Nodes
--------------------------------------------------------
With v2.0.0, in `signrawtransaction` the consensus branch ID (which is used to construct the transaction) was estimated using the chain height. With v2.0.1 this has been improved by also considering the `APPROX_RELEASE_HEIGHT` of the release, and a new parameter to allow the caller to manually override the consensus branch ID that zcashd will use.

[Pull request](https://github.com/zcash/zcash/pull/3520)

0 comments on commit e8f5e59

Please sign in to comment.