From 2091cf23ae5569be2174a7ff5c23c56a4a8415f8 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 3 Jan 2018 23:44:51 +0100 Subject: [PATCH 1/3] make-release.py: Versioning changes for 1.0.14. --- README.md | 2 +- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 2 +- src/deprecation.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 28e50f21a..3b8f56c2c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 1.0.14-rc1 +Zcash 1.0.14 ============= What is Zcash? diff --git a/configure.ac b/configure.ac index 11a729fb8..df8d3fdbe 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_REVISION, 14) -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) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 52de67b0a..558d386e1 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.14-rc1" +name: "zcash-1.0.14" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index 6be622218..6873c1a39 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -18,7 +18,7 @@ #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 0 #define CLIENT_VERSION_REVISION 14 -#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 diff --git a/src/deprecation.h b/src/deprecation.h index 0272c26fe..eb9899c1b 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -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 = 241200; +static const int APPROX_RELEASE_HEIGHT = 249000; static const int WEEKS_UNTIL_DEPRECATION = 16; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); From d3c1949cf1caa83c4341235cb09b9969b51092a4 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 3 Jan 2018 23:54:00 +0100 Subject: [PATCH 2/3] make-release.py: Updated manpages for 1.0.14. --- doc/man/zcash-cli.1 | 6 +++--- doc/man/zcash-tx.1 | 6 +++--- doc/man/zcashd.1 | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index aecbadd33..52af9437f 100644 --- a/doc/man/zcash-cli.1 +++ b/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" "December 2017" "zcash-cli v1.0.14-rc1" "User Commands" +.TH ZCASH-CLI "1" "January 2018" "zcash-cli v1.0.14" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v1.0.14-rc1 +zcash-cli \- manual page for zcash-cli v1.0.14 .SH DESCRIPTION -Zcash RPC client version v1.0.14\-rc1 +Zcash RPC client version v1.0.14 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1 index 37a7c6bad..a065ca04a 100644 --- a/doc/man/zcash-tx.1 +++ b/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" "December 2017" "zcash-tx v1.0.14-rc1" "User Commands" +.TH ZCASH-TX "1" "January 2018" "zcash-tx v1.0.14" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v1.0.14-rc1 +zcash-tx \- manual page for zcash-tx v1.0.14 .SH DESCRIPTION -Zcash zcash\-tx utility version v1.0.14\-rc1 +Zcash zcash\-tx utility version v1.0.14 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index 6bf56c315..91917eece 100644 --- a/doc/man/zcashd.1 +++ b/doc/man/zcashd.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASHD "1" "December 2017" "zcashd v1.0.14-rc1" "User Commands" +.TH ZCASHD "1" "January 2018" "zcashd v1.0.14" "User Commands" .SH NAME -zcashd \- manual page for zcashd v1.0.14-rc1 +zcashd \- manual page for zcashd v1.0.14 .SH DESCRIPTION -Zcash Daemon version v1.0.14\-rc1 +Zcash Daemon version v1.0.14 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . @@ -54,7 +54,7 @@ Specify data directory \fB\-disabledeprecation=\fR .IP Disable block\-height node deprecation and automatic shutdown (example: -\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.14\-rc1) +\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.14) .HP \fB\-exportdir=\fR .IP From 6bfa0fb79dc9988e10e30fc98bb8f6b8e740b7a7 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 3 Jan 2018 23:54:16 +0100 Subject: [PATCH 3/3] make-release.py: Updated release notes and changelog for 1.0.14. --- contrib/debian/changelog | 6 + doc/authors.md | 25 ++-- doc/release-notes.md | 28 ---- doc/release-notes/release-notes-1.0.14.md | 160 ++++++++++++++++++++++ 4 files changed, 181 insertions(+), 38 deletions(-) create mode 100644 doc/release-notes/release-notes-1.0.14.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 66e6a3a42..606b33b90 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (1.0.14) stable; urgency=medium + + * 1.0.14 release. + + -- Zcash Company Wed, 03 Jan 2018 23:54:16 +0100 + zcash (1.0.14~rc1) stable; urgency=medium * 1.0.14-rc1 release. diff --git a/doc/authors.md b/doc/authors.md index a6dedffbc..e576a5e2c 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,25 +1,28 @@ Zcash Contributors ================== -Jack Grigg (518) -Simon Liu (281) +Jack Grigg (558) +Simon Liu (286) Sean Bowe (193) Daira Hopwood (102) -Wladimir J. van der Laan (65) +Wladimir J. van der Laan (71) Taylor Hornby (65) Nathan Wilcox (56) -Jay Graber (50) -Jonas Schnelli (48) +Jay Graber (53) +Jonas Schnelli (49) Kevin Gallagher (38) +Cory Fields (28) Pieter Wuille (16) -Cory Fields (16) +syd (13) nomnombtc (9) Paige Peterson (9) -fanquake (5) -MarcoFalke (5) +fanquake (8) +MarcoFalke (7) +Luke Dashjr (6) Johnathan Corgan (5) Gregory Maxwell (5) Ariel Gabizon (5) +kozyilmaz (4) Philip Kaufmann (4) Peter Todd (4) Patrick Strateman (4) @@ -29,7 +32,6 @@ Jeff Garzik (4) David Mercer (4) Daniel Cousens (4) lpescher (3) -kozyilmaz (3) Pavel Janík (3) João Barbosa (3) Alfie John (3) @@ -39,7 +41,7 @@ kpcyrd (2) aniemerg (2) Scott (2) Robert C. Seacord (2) -Luke Dashjr (2) +Per Grön (2) Joe Turgeon (2) Jason Davies (2) Jack Gavigan (2) @@ -57,12 +59,14 @@ isle2983 (1) instagibbs (1) emilrus (1) dexX7 (1) +daniel (1) calebogden (1) ayleph (1) Tom Ritter (1) Stephen (1) S. Matthew English (1) Ross Nicoll (1) +René Nyffenegger (1) Pavel Vasin (1) Paul Georgiou (1) Paragon Initiative Enterprises, LLC (1) @@ -94,6 +98,7 @@ Boris Hajduk (1) Bob McElrath (1) Bitcoin Error Log (1) Ariel (1) +Anthony Towns (1) Allan Niemerg (1) Alex van der Peet (1) Alex (1) diff --git a/doc/release-notes.md b/doc/release-notes.md index 21c31787b..a29094b51 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -4,31 +4,3 @@ release-notes at release time) Notable changes =============== -Incoming viewing keys ---------------------- - -Support for incoming viewing keys, as described in -[the Zcash protocol spec](https://github.com/zcash/zips/blob/master/protocol/protocol.pdf), -has been added to the wallet. - -Use the `z_exportviewingkey` RPC method to obtain the incoming viewing key for a -z-address in a node's wallet. For Sprout z-addresses, these always begin with -"ZiVK" (or "ZiVt" for testnet z-addresses). Use `z_importviewingkey` to import -these into another node. - -A node that possesses an incoming viewing key for a z-address can view all past -transactions received by that address, as well as all future transactions sent -to it, by using `z_listreceivedbyaddress`. They cannot spend any funds from the -address. This is similar to the behaviour of "watch-only" t-addresses. - -`z_gettotalbalance` now has an additional boolean parameter for including the -balance of "watch-only" addresses (both transparent and shielded), which is set -to `false` by default. `z_getbalance` has also been updated to work with -watch-only addresses. - -- **Caution:** for z-addresses, these balances will **not** be accurate if any - funds have been sent from the address. This is because incoming viewing keys - cannot detect spends, and so the "balance" is just the sum of all received - notes, including ones that have been spent. Some future use-cases for incoming - viewing keys will include synchronization data to keep their balances accurate - (e.g. [#2542](https://github.com/zcash/zcash/issues/2542)). diff --git a/doc/release-notes/release-notes-1.0.14.md b/doc/release-notes/release-notes-1.0.14.md new file mode 100644 index 000000000..4b9cd0810 --- /dev/null +++ b/doc/release-notes/release-notes-1.0.14.md @@ -0,0 +1,160 @@ +Notable changes +=============== + +Incoming viewing keys +--------------------- + +Support for incoming viewing keys, as described in +[the Zcash protocol spec](https://github.com/zcash/zips/blob/master/protocol/protocol.pdf), +has been added to the wallet. + +Use the `z_exportviewingkey` RPC method to obtain the incoming viewing key for a +z-address in a node's wallet. For Sprout z-addresses, these always begin with +"ZiVK" (or "ZiVt" for testnet z-addresses). Use `z_importviewingkey` to import +these into another node. + +A node that possesses an incoming viewing key for a z-address can view all past +transactions received by that address, as well as all future transactions sent +to it, by using `z_listreceivedbyaddress`. They cannot spend any funds from the +address. This is similar to the behaviour of "watch-only" t-addresses. + +`z_gettotalbalance` now has an additional boolean parameter for including the +balance of "watch-only" addresses (both transparent and shielded), which is set +to `false` by default. `z_getbalance` has also been updated to work with +watch-only addresses. + +- **Caution:** for z-addresses, these balances will **not** be accurate if any + funds have been sent from the address. This is because incoming viewing keys + cannot detect spends, and so the "balance" is just the sum of all received + notes, including ones that have been spent. Some future use-cases for incoming + viewing keys will include synchronization data to keep their balances accurate + (e.g. [#2542](https://github.com/zcash/zcash/issues/2542)). + +Changelog +========= + +Anthony Towns (1): + Add configure check for -latomic + +Cory Fields (12): + c++11: don't throw from the reverselock destructor + c++11: CAccountingEntry must be defined before use in a list + c++11: fix libbdb build against libc++ in c++11 mode + depends: use c++11 + depends: bump OSX toolchain + build: Split hardening/fPIE options out + build: define base filenames for use elsewhere in the buildsystem + build: quiet annoying warnings without adding new ones + build: fix Windows builds without pkg-config + build: force a c++ standard to be specified + build: warn about variable length arrays + build: add --enable-werror option + +Jack Grigg (40): + Squashed 'src/secp256k1/' changes from 84973d3..6ad5cdb + Use g-prefixed coreutils commands if they are available + Replace hard-coded defaults for HOST and BUILD with config.guess + Remove manual -std=c++11 flag + Replace "install -D" with "mkdir -p && install" + Check if OpenMP is available before using it + [libsnark] Use POSIX-compliant ar arguments + Include endian-ness compatibility layer in Equihash implementation + build: Split hardening/fPIE options out in Zcash-specific binaries + Change --enable-werror to apply to all warnings, use it in build.sh + Move Zcash flags into configure.ac + ViewingKey -> ReceivingKey per zcash/zips#117 + Implement viewing key storage in the keystore + Factor out common logic from CZCPaymentAddress and CZCSpendingKey + Track net value entering and exiting the Sprout circuit + Add Sprout value pool to getblock and getblockchaininfo + Apply -fstack-protector-all to libsnark + Add Rust and Proton to configure options printout + Clarify operator precedence in serialization of nSproutValue + Remove nSproutValue TODO from CDiskBlockIndex + Add Base58 encoding of viewing keys + Implement viewing key storage in the wallet + Add RPC methods for exporting/importing viewing keys + Update wallet logic to account for viewing keys + Add watch-only support to Zcash RPC methods + Modify zcrawkeygen RPC method to set "zcviewingkey" to the viewing key + Cleanup: Add braces for clarity + Add cautions to z_getbalance and z_gettotalbalance help text about viewing keys + Add release notes for incoming viewing keys + Create release notes starting from the previous non-beta non-RC release + release-notes.py: Remove unnecessary parameter + Regenerate previous release notes to conform to new format + Exclude beta and RC release notes from author tallies + Fix pyflakes warnings in zkey_import_export RPC test + make-release.py: Versioning changes for 1.0.14-rc1. + make-release.py: Updated manpages for 1.0.14-rc1. + make-release.py: Updated release notes and changelog for 1.0.14-rc1. + Update release process + make-release.py: Versioning changes for 1.0.14. + make-release.py: Updated manpages for 1.0.14. + +Jay Graber (3): + Add cli and rpc examples for z_sendmany + Fix cli help result for z_shieldcoinbase + Add rpc test that exercises z_importkey + +Jonas Schnelli (1): + Add compile and link options echo to configure + +Luke Dashjr (4): + depends: Use curl for fetching on Linux + Travis: Use curl rather than wget for Mac SDK + Bugfix: depends/Travis: Use --location (follow redirects) and --fail [on HTTP error response] with curl + Travis: Use Blue Box VMs for IPv6 loopback support + +MarcoFalke (2): + Fix url in .travis.yml + [depends] builders: No need to set -L and --location for curl + +Per Grön (2): + Deduplicate test utility method wait_and_assert_operationid_status + Print result of RPC call in test only when PYTHON_DEBUG is set + +René Nyffenegger (1): + Use AC_ARG_VAR to set ARFLAGS. + +Simon Liu (5): + RPC dumpwallet and z_exportwallet updated to no longer allow overwriting an existing file. + Add documentation for shielding coinbase utxos. + Add documentation for payment disclosure. + Closes #2759. Fixes broken pipe error with QA test wallet.py. + Closes #2746. Payment disclosure blobs now use 'zpd:' prefix. + +Wladimir J. van der Laan (6): + build: Enable C++11 build, require C++11 compiler + build: update ax_cxx_compile_stdcxx to serial 4 + test: Remove java comparison tool + build: Remove check for `openssl/ec.h` + devtools: Check for high-entropy ASLR in 64-bit PE executables + build: supply `-Wl,--high-entropy-va` + +daniel (1): + add powerpc build support for openssl lib + +fanquake (3): + [build-aux] Update Boost & check macros to latest serials + [depends] Add -stdlib=libc++ to darwin CXX flags + [depends] Set OSX_MIN_VERSION to 10.8 + +kozyilmaz (1): + empty spaces in PATH variable cause build failure + +syd (13): + Upgrade googletest to 1.8.0 + Get the sec-hard tests to run correctly. + Update libsodium from 1.0.11 to 1.0.15 + Remove Boost conditional compilation. + Update to address @daira comments wrt fixing configure.ac + Get rid of consensus.fPowAllowMinDifficultyBlocks. + Don't compile libgtest.a when building libsnark. + Add gtests to .gitignore + Get rid of fp3 from libsnark, it is not used. + InitGoogleMock instead of InitGoogleTest per CR + Get rid of underscore prefixes for include guards. + Rename bash completion files so that they refer to zcash and not bitcoin. + Fix libsnark test failure. +