From 39cb7df90911c030b077e68be953e01ebd89d13f Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 23 Sep 2017 10:42:23 +0100 Subject: [PATCH 1/3] make-release.py: Versioning changes for 1.0.12-rc1. --- README.md | 2 +- configure.ac | 4 ++-- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 4 ++-- src/deprecation.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 818fd4380..78e02233a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 1.0.11 +Zcash 1.0.12-rc1 ============= What is Zcash? diff --git a/configure.ac b/configure.ac index a94e0dbd7..5831cb63f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N) AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 1) define(_CLIENT_VERSION_MINOR, 0) -define(_CLIENT_VERSION_REVISION, 11) -define(_CLIENT_VERSION_BUILD, 50) +define(_CLIENT_VERSION_REVISION, 12) +define(_CLIENT_VERSION_BUILD, 25) 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 892de5287..c53211d0f 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.11" +name: "zcash-1.0.12-rc1" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index 61813106f..98ab18336 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -17,8 +17,8 @@ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it #define CLIENT_VERSION_MAJOR 1 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 11 -#define CLIENT_VERSION_BUILD 50 +#define CLIENT_VERSION_REVISION 12 +#define CLIENT_VERSION_BUILD 25 //! 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 78e15380e..19c63bdf2 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -8,7 +8,7 @@ // Deprecation policy: // * Shut down 18 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 = 167200; +static const int APPROX_RELEASE_HEIGHT = 189600; static const int WEEKS_UNTIL_DEPRECATION = 18; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); From 94183b63600c8959c56ce4cba642bc3d620b1c42 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 23 Sep 2017 10:50:00 +0100 Subject: [PATCH 2/3] make-release.py: Updated manpages for 1.0.12-rc1. --- doc/man/zcash-cli.1 | 6 +++--- doc/man/zcash-tx.1 | 6 +++--- doc/man/zcashd.1 | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 398f8feea..e8f42c702 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" "August 2017" "zcash-cli v1.0.11" "User Commands" +.TH ZCASH-CLI "1" "September 2017" "zcash-cli v1.0.12-rc1" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v1.0.11 +zcash-cli \- manual page for zcash-cli v1.0.12-rc1 .SH DESCRIPTION -Zcash RPC client version v1.0.11 +Zcash RPC client version v1.0.12\-rc1 .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 f40e4a345..9f1832090 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" "August 2017" "zcash-tx v1.0.11" "User Commands" +.TH ZCASH-TX "1" "September 2017" "zcash-tx v1.0.12-rc1" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v1.0.11 +zcash-tx \- manual page for zcash-tx v1.0.12-rc1 .SH DESCRIPTION -Zcash zcash\-tx utility version v1.0.11 +Zcash zcash\-tx utility version v1.0.12\-rc1 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index df1a35b14..f34c45066 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" "August 2017" "zcashd v1.0.11" "User Commands" +.TH ZCASHD "1" "September 2017" "zcashd v1.0.12-rc1" "User Commands" .SH NAME -zcashd \- manual page for zcashd v1.0.11 +zcashd \- manual page for zcashd v1.0.12-rc1 .SH DESCRIPTION -Zcash Daemon version v1.0.11 +Zcash Daemon version v1.0.12\-rc1 .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.11) +\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.12\-rc1) .HP \fB\-exportdir=\fR .IP @@ -241,11 +241,11 @@ Set key pool size to (default: 100) .HP \fB\-paytxfee=\fR .IP -Fee (in BTC/kB) to add to transactions you send (default: 0.00) +Fee (in ZEC/kB) to add to transactions you send (default: 0.00) .HP \fB\-rescan\fR .IP -Rescan the blockchain for missing wallet transactions on startup +Rescan the block chain for missing wallet transactions on startup .HP \fB\-salvagewallet\fR .IP @@ -266,8 +266,8 @@ confirmation on average within n blocks (default: 2) .HP \fB\-maxtxfee=\fR .IP -Maximum total fees to use in a single wallet transaction; setting this -too low may abort large transactions (default: 0.10) +Maximum total fees (in ZEC) to use in a single wallet transaction; +setting this too low may abort large transactions (default: 0.10) .HP \fB\-upgradewallet\fR .IP @@ -339,7 +339,7 @@ Prepend debug output with timestamp (default: 1) .HP \fB\-minrelaytxfee=\fR .IP -Fees (in BTC/Kb) smaller than this are considered zero fee for relaying +Fees (in ZEC/kB) smaller than this are considered zero fee for relaying (default: 0.000001) .HP \fB\-printtoconsole\fR From 29a2ee49587d9c088d59dfcc0bf69c1cb3ec704a Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Sat, 23 Sep 2017 10:51:36 +0100 Subject: [PATCH 3/3] make-release.py: Updated release notes and changelog for 1.0.12-rc1. --- contrib/debian/changelog | 6 ++ doc/authors.md | 13 +++-- doc/release-notes/release-notes-1.0.12-rc1.md | 57 +++++++++++++++++++ 3 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 doc/release-notes/release-notes-1.0.12-rc1.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 1da00f690..9837f656f 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (1.0.12~rc1) stable; urgency=medium + + * 1.0.12-rc1 release. + + -- Zcash Company Sat, 23 Sep 2017 10:51:36 +0100 + zcash (1.0.11) stable; urgency=medium * 1.0.11 release. diff --git a/doc/authors.md b/doc/authors.md index 8d3010dc6..93a30c1c2 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,13 +1,13 @@ Zcash Contributors ================== -Jack Grigg (445) -Simon Liu (269) +Jack Grigg (465) +Simon Liu (272) Sean Bowe (188) Daira Hopwood (102) Taylor Hornby (65) Wladimir J. van der Laan (61) -Nathan Wilcox (51) +Nathan Wilcox (56) Jay Graber (49) Jonas Schnelli (48) Kevin Gallagher (38) @@ -30,9 +30,11 @@ Daniel Cousens (4) lpescher (3) kozyilmaz (3) Pavel Janík (3) +Ariel Gabizon (3) Alfie John (3) str4d (2) paveljanik (2) +kpcyrd (2) aniemerg (2) Scott (2) Robert C. Seacord (2) @@ -42,7 +44,7 @@ Joe Turgeon (2) Jack Gavigan (2) ITH4Coinomia (2) Gavin Andresen (2) -Ariel Gabizon (2) +Bjorn Hjortsberg (2) Amgad Abdelhafez (2) zathras-crypto (1) unsystemizer (1) @@ -59,6 +61,7 @@ ayleph (1) Tom Ritter (1) Stephen (1) S. Matthew English (1) +Ross Nicoll (1) Pavel Vasin (1) Paul Georgiou (1) Paragon Initiative Enterprises, LLC (1) @@ -71,6 +74,7 @@ Lars-Magnus Skog (1) Kevin Pan (1) Jorge Timón (1) Jeffrey Walton (1) +Jason Davies (1) Ian Kelling (1) Gaurav Rana (1) Forrest Voight (1) @@ -86,6 +90,7 @@ Bryan Stitt (1) Boris Hajduk (1) Bob McElrath (1) Bitcoin Error Log (1) +Ariel (1) Allan Niemerg (1) Alex van der Peet (1) Alex (1) diff --git a/doc/release-notes/release-notes-1.0.12-rc1.md b/doc/release-notes/release-notes-1.0.12-rc1.md new file mode 100644 index 000000000..27d36b7e7 --- /dev/null +++ b/doc/release-notes/release-notes-1.0.12-rc1.md @@ -0,0 +1,57 @@ +Changelog +========= + +Ariel (1): + add examples to z_getoperationresult + +Ariel Gabizon (1): + add load-wallet benchmark + +Bjorn Hjortsberg (2): + Do not warn on built in declaration mismatch + Remove deprecated exception specification + +Jack Grigg (20): + ci-workers: Enable pipelining, and use root to set admin and host details + Variable overrides for Arch Linux + Rationalize currency unit to "ZEC" + ci-workers: Fail if Python is not version 2.7 + ci-workers: Variable overrides and process tweaks for CentOS 7 + Add build progress to the release script if progressbar module is available + Add hotfix support to release script + Document the hotfix release process + Enforce sequential hotfix versioning + Benchmark time to call sendtoaddress with many UTXOs + Fix bug in benchmark data generation script + Adjust instructions for UTXO dataset creation + Add GitHub release notes to release process + Clarify branching and force-building operations in hotfix process + Update user guide translations as part of release process + make-release.py: Send stderr to stdout + List dependencies for release script in release process doc + Additional test cases for importprivkey RPC test + make-release.py: Versioning changes for 1.0.12-rc1. + make-release.py: Updated manpages for 1.0.12-rc1. + +Jason Davies (1): + Fix deprecation policy comment. + +Nathan Wilcox (5): + key_import_export rpc-test: verify that UTXO view co-evolves for nodes sharing a key. + Add a new rpc-test-specified requirement: `importprivkey` outputs the associated address. (Test fails.) + [tests pass] Output address on new key import. + Add a new requirement that `importprivkey` API is idempotent. + [tests pass] Ensure `importprivkey` outputs the address in case key is already imported. + +Ross Nicoll (1): + Rationalize currency unit to "BTC" + +Simon Liu (3): + Closes #2583. Exclude watch-only utxos from z_sendmany coin selection. + Set up a clean chain. Delete redundant method wait_until_miner_sees() via use of sync_all(). + Implement RPC shield_coinbase #2448. + +kpcyrd (2): + Fetch params from ipfs if possible + Prefer wget over ipfs +