Skip to content

Commit

Permalink
Auto merge of zcash#3922 - bitcartel:release-v2.0.4, r=bitcartel
Browse files Browse the repository at this point in the history
Release v2.0.4
  • Loading branch information
zkbot committed Mar 26, 2019
2 parents 756e924 + 0a378eb commit be1d68e
Show file tree
Hide file tree
Showing 12 changed files with 172 additions and 68 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Zcash 2.0.4-rc1
Zcash 2.0.4
<img align="right" width="120" height="80" src="doc/imgs/logo.png">
===========

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 4)
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
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
zcash (2.0.4) stable; urgency=medium

* 2.0.4 release.

-- Electric Coin Company <[email protected]> Tue, 26 Mar 2019 11:29:21 -0700

zcash (2.0.4~rc1) stable; urgency=medium

* 2.0.4-rc1 release.
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "zcash-2.0.4-rc1"
name: "zcash-2.0.4"
enable_cache: true
distro: "debian"
suites:
Expand Down
24 changes: 13 additions & 11 deletions doc/authors.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
Zcash Contributors
==================

Jack Grigg (856)
Simon Liu (434)
Sean Bowe (265)
Jack Grigg (862)
Simon Liu (443)
Sean Bowe (278)
Daira Hopwood (110)
Eirik Ogilvie-Wigley (102)
Jay Graber (89)
Eirik Ogilvie-Wigley (88)
Wladimir J. van der Laan (81)
Taylor Hornby (65)
Jonas Schnelli (58)
Taylor Hornby (73)
Jonas Schnelli (62)
Nathan Wilcox (56)
Pieter Wuille (53)
Pieter Wuille (54)
Kevin Gallagher (38)
Cory Fields (35)
mdr0id (22)
Jonathan "Duke" Leto (17)
Larry Ruane (16)
syd (15)
Jonathan "Duke" Leto (15)
Matt Corallo (13)
Paige Peterson (11)
Ariel Gabizon (11)
Paige Peterson (10)
MarcoFalke (10)
nomnombtc (9)
kozyilmaz (8)
Expand All @@ -32,6 +32,7 @@ David Mercer (6)
Daniel Cousens (6)
Suhas Daftuar (5)
Pavel Janík (5)
Marius Kjærstad (5)
Karl-Johan Alm (5)
Johnathan Corgan (5)
Charlie O'Keefe (5)
Expand All @@ -40,7 +41,6 @@ WO (4)
Philip Kaufmann (4)
Peter Todd (4)
Patrick Strateman (4)
Marius Kjærstad (4)
João Barbosa (4)
Jorge Timón (4)
George Tankersley (4)
Expand All @@ -50,8 +50,10 @@ Per Grön (3)
Patick Strateman (3)
Jason Davies (3)
James O'Beirne (3)
Gareth Davies (3)
Daniel Kraft (3)
Alfie John (3)
zebambam (2)
rofl0r (2)
paveljanik (2)
mruddy (2)
Expand All @@ -69,14 +71,14 @@ Joe Turgeon (2)
Jack Gavigan (2)
ITH4Coinomia (2)
Gavin Andresen (2)
Gareth Davies (2)
Dimitris Apostolou (2)
Brad Miller (2)
Bjorn Hjortsberg (2)
Amgad Abdelhafez (2)
zathras-crypto (1)
unsystemizer (1)
tpantin (1)
sandakersmann (1)
practicalswift (1)
mrbandrews (1)
kazcw (1)
Expand Down
6 changes: 3 additions & 3 deletions doc/man/zcash-cli.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ZCASH-CLI "1" "March 2019" "zcash-cli v2.0.4-rc1" "User Commands"
.TH ZCASH-CLI "1" "March 2019" "zcash-cli v2.0.4" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v2.0.4-rc1
zcash-cli \- manual page for zcash-cli v2.0.4
.SH DESCRIPTION
Zcash RPC client version v2.0.4\-rc1
Zcash RPC client version v2.0.4
.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
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ZCASH-TX "1" "March 2019" "zcash-tx v2.0.4-rc1" "User Commands"
.TH ZCASH-TX "1" "March 2019" "zcash-tx v2.0.4" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v2.0.4-rc1
zcash-tx \- manual page for zcash-tx v2.0.4
.SH DESCRIPTION
Zcash zcash\-tx utility version v2.0.4\-rc1
Zcash zcash\-tx utility version v2.0.4
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]
Expand Down
6 changes: 3 additions & 3 deletions doc/man/zcashd.1
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ZCASHD "1" "March 2019" "zcashd v2.0.4-rc1" "User Commands"
.TH ZCASHD "1" "March 2019" "zcashd v2.0.4" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v2.0.4-rc1
zcashd \- manual page for zcashd v2.0.4
.SH DESCRIPTION
Zcash Daemon version v2.0.4\-rc1
Zcash Daemon version v2.0.4
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
Expand Down
43 changes: 0 additions & 43 deletions doc/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,3 @@ release-notes at release time)
Notable changes
===============

Sprout note validation bug fixed in wallet
------------------------------------------
We include a fix for a bug in the Zcashd wallet which could result in Sprout
z-addresses displaying an incorrect balance. Sapling z-addresses are not
impacted by this issue. This would occur if someone sending funds to a Sprout
z-address intentionally sent a different amount in the note commitment of a
Sprout output than the value provided in the ciphertext (the encrypted message
from the sender).

Users should install this update and then rescan the blockchain by invoking
“zcashd -rescan”. Sprout address balances shown by the zcashd wallet should
then be correct.

Thank you to Alexis Enston for bringing this to our attention.

[Security Announcement 2019-03-19](https://z.cash/support/security/announcements/security-announcement-2019-03-19/)

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

Miner address selection behaviour fixed
---------------------------------------
Zcash inherited a bug from upstream Bitcoin Core where both the internal miner
and RPC call `getblocktemplate` would use a fixed transparent address, until RPC
`getnewaddress` was called, instead of using a new transparent address for each
mined block. This was fixed in Bitcoin 0.12 and we have now merged the change.

Miners who wish to use the same address for every mined block, should use the
`-mineraddress` option.

[Mining Guide](https://zcash.readthedocs.io/en/latest/rtd_pages/zcash_mining_guide.html)


New consensus rule: Reject blocks that violate turnstile (Testnet only)
-----------------------------------------------------------------------
Testnet nodes will now enforce a consensus rule which marks blocks as invalid
if they would lead to a turnstile violation in the Sprout or Sapling value
pools. The motivations and deployment details can be found in the accompanying
[ZIP draft](https://github.com/zcash/zips/pull/210).

The consensus rule will be enforced on mainnet in a future release.

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

139 changes: 139 additions & 0 deletions doc/release-notes/release-notes-2.0.4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
Notable changes
===============

Sprout note validation bug fixed in wallet
------------------------------------------
We include a fix for a bug in the Zcashd wallet which could result in Sprout
z-addresses displaying an incorrect balance. Sapling z-addresses are not
impacted by this issue. This would occur if someone sending funds to a Sprout
z-address intentionally sent a different amount in the note commitment of a
Sprout output than the value provided in the ciphertext (the encrypted message
from the sender).

Users should install this update and then rescan the blockchain by invoking
“zcashd -rescan”. Sprout address balances shown by the zcashd wallet should
then be correct.

Thank you to Alexis Enston for bringing this to our attention.

[Security Announcement 2019-03-19](https://z.cash/support/security/announcements/security-announcement-2019-03-19/)

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

Miner address selection behaviour fixed
---------------------------------------
Zcash inherited a bug from upstream Bitcoin Core where both the internal miner
and RPC call `getblocktemplate` would use a fixed transparent address, until RPC
`getnewaddress` was called, instead of using a new transparent address for each
mined block. This was fixed in Bitcoin 0.12 and we have now merged the change.

Miners who wish to use the same address for every mined block, should use the
`-mineraddress` option.

[Mining Guide](https://zcash.readthedocs.io/en/latest/rtd_pages/zcash_mining_guide.html)


New consensus rule: Reject blocks that violate turnstile (Testnet only)
-----------------------------------------------------------------------
Testnet nodes will now enforce a consensus rule which marks blocks as invalid
if they would lead to a turnstile violation in the Sprout or Sapling value
pools. The motivations and deployment details can be found in the accompanying
[ZIP draft](https://github.com/zcash/zips/pull/210).

The consensus rule will be enforced on mainnet in a future release.

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


Changelog
=========

Eirik Ogilvie-Wigley (14):
Rename methods to include Sprout
Add benchmark for decrypting sapling notes
Move reusable Sapling test setup to utiltest
Move test SaplingNote creation to utiltest
Add test method for generating master Sapling extended spending keys
Include Sapling transactions in increment note witness benchmark
Prevent header from being included multiple times
benchmarks do not require updating network parameters
FakeCoinsViewDB can inherit directly from CCoinsView
Add a method for generating a test CKey
Change to t->z transaction and create separate benchmark for sapling
Renaming and other minor cleanup
Improve some error messages when building a transaction fails
Add missing author aliases

Gareth Davies (1):
Correcting logo on README

Jack Grigg (6):
Add Sapling benchmarks to benchmark runner
test: Fetch coinbase address from coinbase UTXOs
test: Make expected_utxos optional in get_coinbase_address()
Add comments
Move utiltest.cpp from wallet to common
Move payment disclosure code and tests into wallet

Jonas Schnelli (4):
detach wallet from miner
fix GetScriptForMining() CReserveKey::keepKey() issue
add CReserveScript to allow modular script keeping/returning
miner: rename UpdateRequestCount signal to ResetRequestCount

Jonathan "Duke" Leto (2):
Backport size_on_disk to RPC call getblockchaininfo.
Add size_on_disk test

Marius Kjærstad (1):
Update COPYRIGHT_YEAR in clientversion.h to 2019

Paige Peterson (1):
redirect and update source documentation

Pieter Wuille (1):
Simplify DisconnectBlock arguments/return value

Sean Bowe (13):
(testnet) Fall back to hardcoded shielded pool balance to avoid reorgs.
(testnet) Reject blocks that result in turnstile violations
(testnet/regtest) Avoid mining transactions that would violate the turnstile.
Fix tallying for Sprout/Sapling value pools.
Consolidate logic to enable turnstile auditing for testnet/regtest/mainnet.
Use existing chainparams variable
Add newlines to turntile log messages for miner
Check blockhash of fallback block for Sprout value pool balance
Change SproutValuePoolCheckpointEnabled to ZIP209Activated
Only enforce Sapling turnstile if balance values have been populated.
Do not enable ZIP209 on regtest right now.
(minor) Remove added newline.
(wallet) Check that the commitment matches the note plaintext provided by the sender.

Simon Liu (9):
Update nMinimumChainWork using block 497000.
Add checkpoint for block 497000.
Update release notes for 2.0.4
make-release.py: Versioning changes for 2.0.4-rc1.
make-release.py: Updated manpages for 2.0.4-rc1.
make-release.py: Updated release notes and changelog for 2.0.4-rc1.
Fix typo in release notes.
make-release.py: Versioning changes for 2.0.4.
make-release.py: Updated manpages for 2.0.4.

Taylor Hornby (8):
Update OpenSSL from 1.1.0h to 1.1.1a. #3786
Update boost from v1.66.0 to v1.69.0. #3786
Update Rust from v1.28.0 to v1.32.0. #3786
Update Proton from 0.17.0 to 0.26.0. #3816, #3786
Patch Proton for a minimal build. #3786
Fix proton patch regression. #3916
Fix OpenSSL reproducible build regression
Patch out proton::url deprecation as workaround for build warnings

sandakersmann (1):
Update of copyright year to 2019

zebambam (2):
Added documentation warnings about DNS rebinding attacks, issue #3841
Added responsible disclosure statement for issue #3869

2 changes: 1 addition & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define CLIENT_VERSION_MAJOR 2
#define CLIENT_VERSION_MINOR 0
#define CLIENT_VERSION_REVISION 4
#define CLIENT_VERSION_BUILD 25
#define CLIENT_VERSION_BUILD 50

//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down
2 changes: 1 addition & 1 deletion src/deprecation.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 500953;
static const int APPROX_RELEASE_HEIGHT = 504600;
static const int WEEKS_UNTIL_DEPRECATION = 16;
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);

Expand Down

0 comments on commit be1d68e

Please sign in to comment.