diff --git a/README.md b/README.md index 61bc85bac..6ad2f1b38 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 1.0.8-1 +Zcash 1.0.9 ============= What is Zcash? diff --git a/configure.ac b/configure.ac index 9aee14148..724ae6e17 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, 8) -define(_CLIENT_VERSION_BUILD, 51) +define(_CLIENT_VERSION_REVISION, 9) +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/debian/changelog b/contrib/debian/changelog index cffa58070..43ef18295 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (1.0.9) stable; urgency=medium + + * 1.0.9 release. + + -- Zcash Company Wed, 24 May 2017 12:51:06 -0700 + zcash (1.0.8+1) jessie; urgency=high * 1.0.8-1 release. diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 4799bb476..9281d4378 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.8-1" +name: "zcash-1.0.9" enable_cache: true distro: "debian" suites: diff --git a/doc/authors.md b/doc/authors.md index 03a92cb24..a2336391b 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,21 +1,21 @@ Zcash Contributors ================== -Jack Grigg (393) -Simon Liu (254) -Sean Bowe (185) -Daira Hopwood (83) +Jack Grigg (407) +Simon Liu (259) +Sean Bowe (186) +Daira Hopwood (87) Taylor Hornby (65) Wladimir J. van der Laan (58) +Nathan Wilcox (51) +Jay Graber (49) Jonas Schnelli (48) -Jay Graber (47) Kevin Gallagher (38) Cory Fields (15) Pieter Wuille (14) -Nathan Wilcox (12) nomnombtc (9) +Paige Peterson (9) fanquake (5) -Paige Peterson (5) MarcoFalke (5) Johnathan Corgan (5) Gregory Maxwell (5) @@ -41,6 +41,7 @@ Joe Turgeon (2) Jack Gavigan (2) ITH4Coinomia (2) Gavin Andresen (2) +Amgad Abdelhafez (2) zathras-crypto (1) unsystemizer (1) mruddy (1) @@ -48,6 +49,7 @@ mrbandrews (1) kazcw (1) isle2983 (1) instagibbs (1) +emilrus (1) dexX7 (1) calebogden (1) ayleph (1) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index b66838b65..ab37c76f8 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.4. -.TH ZCASH-CLI "1" "April 2017" "zcash-cli v1.0.8-1" "User Commands" +.TH ZCASH-CLI "1" "May 2017" "zcash-cli v1.0.9" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v1.0.8 +zcash-cli \- manual page for zcash-cli v1.0.9 .SH DESCRIPTION -Zcash RPC client version v1.0.8\-1 +Zcash RPC client version v1.0.9 .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 73d80230d..a7468d7a8 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.4. -.TH ZCASH-TX "1" "April 2017" "zcash-tx v1.0.8-1" "User Commands" +.TH ZCASH-TX "1" "May 2017" "zcash-tx v1.0.9" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v1.0.8 +zcash-tx \- manual page for zcash-tx v1.0.9 .SH DESCRIPTION -Zcash zcash\-tx utility version v1.0.8\-1 +Zcash zcash\-tx utility version v1.0.9 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index f9e976a19..eed39a4e2 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.4. -.TH ZCASHD "1" "April 2017" "zcashd v1.0.8-1" "User Commands" +.TH ZCASHD "1" "May 2017" "zcashd v1.0.9" "User Commands" .SH NAME -zcashd \- manual page for zcashd v1.0.8 +zcashd \- manual page for zcashd v1.0.9 .SH DESCRIPTION -Zcash Daemon version v1.0.8\-1 +Zcash Daemon version v1.0.9 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . @@ -51,6 +51,11 @@ Run in the background as a daemon and accept commands .IP Specify data directory .HP +\fB\-disabledeprecation=\fR +.IP +Disable block\-height node deprecation and automatic shutdown (example: +\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.9) +.HP \fB\-exportdir=\fR .IP Specify directory to be used when exporting data diff --git a/doc/release-notes/release-notes-1.0.9.md b/doc/release-notes/release-notes-1.0.9.md new file mode 100644 index 000000000..a1335ec97 --- /dev/null +++ b/doc/release-notes/release-notes-1.0.9.md @@ -0,0 +1,90 @@ +Amgad Abdelhafez (2): + Update timedata.cpp + Update timedata.cpp + +Daira Hopwood (4): + Fix an error reporting bug due to BrokenPipeError and ConnectionResetError not existing in Python 2. refs #2263 + Alert 1002 (versions 1.0.0-1.0.2 inclusive). + Alert 1003 (versions 1.0.3-1.0.8 inclusive). + Disable building Proton by default. + +Jack Grigg (14): + Fix prioritisetransaction RPC test + torcontrol: Handle escapes in Tor QuotedStrings + torcontrol: Add missing copyright header + Convert Zcash versions to Debian format + [manpage] Handle build numbers in versions + Address Daira's comments + Address Daira's further comments + Correctly handle three-digit octals with leading digit 4-7 + Check that >3-digit octals are truncated. + Implement automatic shutdown of deprecated Zcash versions + Wrap messages nicely on metrics screen + Regenerate miner tests + Add a benchmark for calling ConnectBlock on a block with many inputs + Remove additional sources of determinism from benchmark archive + +Jay Graber (2): + Change help text examples to use Zcash addresses + Poll on getblocktemplate result rather than use bare sleep to avoid race condition. + +Nathan Wilcox (39): + [Direct master commit] Fix a release snafu in debian version string. + Show toolchain versions in build.sh. + Start on a make-release.py script; currently just arg parsing and unittests [unittests fail]. + Update version spec by altering test; also update regex to pass single 0 digits in major/minor/patch. + Add another case from debian-style versions. + Add all of the zcash release tags in my current repo as positive test vector. + Add support for beta/rc release versions. + Add version sorting, assert that RELEASE_PREV is the most recent release. + Make SystemExit errors less redundant in output; verify clean git status on master. + Always run unittests prior to actual runs. + Make --help output clean by not running self-test. + Add an option to run against a different repo directory. + Make sure to pull the latest master. + Exit instead of raising an unexpected exception, since it's already logged. + Implement `PathPatcher` abstraction, `clientversion.h` rewrite, and build numbering w/ unittests. + Implement the IS_RELEASE rule for betas. + Generalize buildnum patching for both `clientversion.h` and `configure.ac`. + Modify the `APPROX_RELEASE_HEIGHT`. + Remove portions of `./doc/release-process.md` now implemented in `make-release.py`. + Switch from `sh_out_logged` to `sh_log`. + Shorten the arg log line. + Commit the version changes and build. + Generate manpages; commit that; improve error output in sh_log. + Polish logging a bit more. + Tidy up / systematize logging output a bit more. + First full-release-branch version of script; rewrite large swatch of release-process.md. [Manually tested.] + Enable set -u mode. + Fix a variable name typo. + Reuse zcash_rpc. + Do not use `-rpcwait` on all `zcash_rpc` invocations, only block when starting zcashd. + Fix `release-process.md` doc usage for `make-release.py` to have correct arguments and order. + Include release version in commit comments. + Examine all future versions which are assumed to follow the same Version parser schema. + Consider both beta and rc versions to be `IS_RELEASE == false`. + Add a few more version strings to positive parser test. + Define the deprecation policy for 1.0.9. + Clarify that the feature is automated *shutdown*. + make-release.py: Versioning changes for 1.0.9. + make-release.py: Updated manpages for 1.0.9. + +Paige Peterson (4): + wallet backup instructions + typo and rewording edits + str4d and Ariel's suggestions + specify exportdir being within homedirectory + +Sean Bowe (1): + Check that pairings work properly when the G1 point is at infinity. + +Simon Liu (5): + Add AMQP 1.0 support via Apache Qpid Proton C++ API 0.17.0 + Add --disable-proton flag to build.sh. Proton has build/linker issues with gcc 4.9.2 and requires gcc 5.x. + Fix proton build issue with debian jessie, as used on CI servers. + Change regtest port to 18344. Closes #2269. + Patch to build Proton with minimal dependencies. + +emilrus (1): + Replace bitcoind with zcashd + diff --git a/src/clientversion.h b/src/clientversion.h index b739ed73a..3bd8540c3 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 8 -#define CLIENT_VERSION_BUILD 51 +#define CLIENT_VERSION_REVISION 9 +#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 f109384a9..0b8e20b92 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -6,7 +6,7 @@ #define ZCASH_DEPRECATION_H // Deprecation policy is 4th third-Tuesday after a release -static const int APPROX_RELEASE_HEIGHT = 115000; +static const int APPROX_RELEASE_HEIGHT = 120500; static const int WEEKS_UNTIL_DEPRECATION = 18; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);