Skip to content

Commit

Permalink
Auto merge of #2733 - str4d:release-v1.0.13-rc1, r=str4d
Browse files Browse the repository at this point in the history
Release v1.0.13-rc1
  • Loading branch information
zkbot committed Nov 15, 2017
2 parents c8ecd49 + 66a9fd8 commit c1282be
Show file tree
Hide file tree
Showing 11 changed files with 130 additions and 33 deletions.
2 changes: 1 addition & 1 deletion README.md
@@ -1,4 +1,4 @@
Zcash 1.0.12
Zcash 1.0.13-rc1
=============

What is Zcash?
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Expand Up @@ -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, 12)
define(_CLIENT_VERSION_BUILD, 50)
define(_CLIENT_VERSION_REVISION, 13)
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)
Expand Down
6 changes: 6 additions & 0 deletions contrib/debian/changelog
@@ -1,3 +1,9 @@
zcash (1.0.13~rc1) stable; urgency=medium

* 1.0.13-rc1 release.

-- Zcash Company <team@z.cash> Wed, 15 Nov 2017 00:02:21 +0000

zcash (1.0.12) stable; urgency=medium

* 1.0.12 release.
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
---
name: "zcash-1.0.12"
name: "zcash-1.0.13-rc1"
enable_cache: true
distro: "debian"
suites:
Expand Down
21 changes: 12 additions & 9 deletions doc/authors.md
@@ -1,18 +1,18 @@
Zcash Contributors
==================

Jack Grigg (470)
Simon Liu (274)
Sean Bowe (188)
Jack Grigg (506)
Simon Liu (281)
Sean Bowe (193)
Daira Hopwood (102)
Wladimir J. van der Laan (65)
Taylor Hornby (65)
Wladimir J. van der Laan (61)
Nathan Wilcox (56)
Jay Graber (49)
Jay Graber (50)
Jonas Schnelli (48)
Kevin Gallagher (38)
Pieter Wuille (16)
Cory Fields (15)
Cory Fields (16)
nomnombtc (9)
Paige Peterson (9)
fanquake (5)
Expand All @@ -27,10 +27,11 @@ Karl-Johan Alm (4)
Jeff Garzik (4)
David Mercer (4)
Daniel Cousens (4)
Ariel Gabizon (4)
lpescher (3)
kozyilmaz (3)
Pavel Janík (3)
Ariel Gabizon (3)
João Barbosa (3)
Alfie John (3)
str4d (2)
paveljanik (2)
Expand All @@ -39,8 +40,8 @@ aniemerg (2)
Scott (2)
Robert C. Seacord (2)
Luke Dashjr (2)
João Barbosa (2)
Joe Turgeon (2)
Jason Davies (2)
Jack Gavigan (2)
ITH4Coinomia (2)
Gavin Andresen (2)
Expand Down Expand Up @@ -73,20 +74,22 @@ Leo Arias (1)
Lars-Magnus Skog (1)
Kevin Pan (1)
Jorge Timón (1)
Jonathan "Duke" Leto (1)
Jeffrey Walton (1)
Jason Davies (1)
Ian Kelling (1)
Gaurav Rana (1)
Forrest Voight (1)
Florian Schmaus (1)
Ethan Heilman (1)
Eran Tromer (1)
Duke Leto (1)
Daniel Kraft (1)
Christian von Roques (1)
Chirag Davé (1)
Casey Rodarmor (1)
Cameron Boehmer (1)
Bryan Stitt (1)
Bruno Arueira (1)
Boris Hajduk (1)
Bob McElrath (1)
Bitcoin Error Log (1)
Expand Down
10 changes: 5 additions & 5 deletions doc/man/zcash-cli.1
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-CLI "1" "September 2017" "zcash-cli v1.0.12" "User Commands"
.TH ZCASH-CLI "1" "November 2017" "zcash-cli v1.0.13-rc1" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v1.0.12
zcash-cli \- manual page for zcash-cli v1.0.13-rc1
.SH DESCRIPTION
Zcash RPC client version v1.0.12
Zcash RPC client version v1.0.13\-rc1
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/index.html>.
please see <https://z.cash/support/security/>.
.SS "Usage:"
.TP
zcash\-cli [options] <command> [params]
Expand Down Expand Up @@ -68,7 +68,7 @@ Timeout in seconds during HTTP requests, or 0 for no timeout. (default:
.SH COPYRIGHT

In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/index.html>.
please see <https://z.cash/support/security/>.

Copyright (C) 2009-2017 The Bitcoin Core Developers
Copyright (C) 2015-2017 The Zcash Developers
Expand Down
8 changes: 4 additions & 4 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" "September 2017" "zcash-tx v1.0.12" "User Commands"
.TH ZCASH-TX "1" "November 2017" "zcash-tx v1.0.13-rc1" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v1.0.12
zcash-tx \- manual page for zcash-tx v1.0.13-rc1
.SH DESCRIPTION
Zcash zcash\-tx utility version v1.0.12
Zcash zcash\-tx utility version v1.0.13\-rc1
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]
Expand Down Expand Up @@ -86,7 +86,7 @@ Set register NAME to given JSON\-STRING
.SH COPYRIGHT

In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/index.html>.
please see <https://z.cash/support/security/>.

Copyright (C) 2009-2017 The Bitcoin Core Developers
Copyright (C) 2015-2017 The Zcash Developers
Expand Down
12 changes: 6 additions & 6 deletions doc/man/zcashd.1
@@ -1,12 +1,12 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASHD "1" "September 2017" "zcashd v1.0.12" "User Commands"
.TH ZCASHD "1" "November 2017" "zcashd v1.0.13-rc1" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v1.0.12
zcashd \- manual page for zcashd v1.0.13-rc1
.SH DESCRIPTION
Zcash Daemon version v1.0.12
Zcash Daemon version v1.0.13\-rc1
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/index.html>.
please see <https://z.cash/support/security/>.
.SS "Usage:"
.TP
zcashd [options]
Expand Down Expand Up @@ -54,7 +54,7 @@ Specify data directory
\fB\-disabledeprecation=\fR<version>
.IP
Disable block\-height node deprecation and automatic shutdown (example:
\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.12)
\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.13\-rc1)
.HP
\fB\-exportdir=\fR<dir>
.IP
Expand Down Expand Up @@ -462,7 +462,7 @@ console, 600 otherwise)
.SH COPYRIGHT

In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/index.html>.
please see <https://z.cash/support/security/>.

Copyright (C) 2009-2017 The Bitcoin Core Developers
Copyright (C) 2015-2017 The Zcash Developers
Expand Down
88 changes: 88 additions & 0 deletions doc/release-notes/release-notes-1.0.13-rc1.md
@@ -0,0 +1,88 @@
Changelog
=========

Ariel Gabizon (1):
boost::format -> tinyformat

Bruno Arueira (1):
Removes out bitcoin mention in favor for zcash

Cory Fields (1):
httpserver: explicitly detach worker threads

Duke Leto (1):
Update performance-measurements.sh

Jack Grigg (36):
Squashed 'src/snark/' content from commit 9ada3f8
Add libsnark compile flag to not copy DEPINST to PREFIX
Add Ansible playbook for grind workers
Add connections in BIP65 and BIP66 tests to the test manager
Add benchmark for listunspent
[Test] MiniNode: Implement JSDescription parsing
[Test] MiniNode: Implement v2 CTransaction parsing
[Test] MiniNode: Implement Zcash block parsing
[Test] MiniNode: Update protocol version and network magics
[Test] MiniNode: Use Zcash PoW
[Test] MiniNode: Fix coinbase creation
[Test] MiniNode: Coerce OP_PUSHDATA bytearrays to bytes
[Test] MiniNode: Implement Zcash coinbase
Fix BIP65 and BIP66 tests
Un-indent RPC test output in test runner
Replace full-test-suite.sh with a new test suite driver script
Move ensure-no-dot-so-in-depends.py into full_test_suite.py
Move check-security-hardening.sh into full_test_suite.py
Add memory benchmark for validatelargetx
Migrate libsnark test code to Google Test
Remove test code corresponding to removed code
Add alt_bn128 to QAP and Merkle tree gadget tests
Update libsnark LDLIBS
Add "make check" to libsnark that runs the Google Tests
Add "make libsnark-tests" that runs libsnark's "make check"
Changes to get test_r1cs_ppzksnark passing
Add bitcoin-util-test.py to full_test_suite.py
Add stdout notice if any stage fails
Add libsnark to "make clean"
Ensure that libsnark is built first, so its headers are available
Remove OpenSSL libraries from libsnark LDLIBS
Add libsnark tests to full_test_suite.py
Add --list-stages argument to full_test_suite.py
Fix NPE in rpc_wallet_tests
make-release.py: Versioning changes for 1.0.13-rc1.
make-release.py: Updated manpages for 1.0.13-rc1.
Change auto-senescence cycle to 16 weeks

Jason Davies (1):
Replace "bitcoin" with "Zcash".

Jay Graber (1):
s/zcash/Zcash

Jonathan "Duke" Leto (1):
Fix bug where performance-measurements.sh fails hards when given no args

João Barbosa (1):
Improve shutdown process

Sean Bowe (5):
Remove libsnark from depends system and integrate it into build system.
Remove crusty old "loadVerifyingKey"/"loadProvingKey" APIs and associated invariants.
Refactor proof generation function.
Add streaming prover.
Integrate low memory prover.

Simon Liu (7):
Replace 'bitcoin address' with 'zcash address'.
Closes #2639. z_shieldcoinbase is now supported, no longer experimental.
Closes #2263 fixing broken pipe error.
Closes #2576. Update link to security info on z.cash website.
Closes #2639. Adds optional limit parameter with a default value of 50.
Fix an issue where qa test wallet_shieldcoinbase could hang.
Add payment disclosure as experimental feature.

Wladimir J. van der Laan (4):
Make HTTP server shutdown more graceful
http: Wait for worker threads to exit
http: Force-exit event loop after predefined time
http: speed up shutdown

4 changes: 2 additions & 2 deletions src/clientversion.h
Expand Up @@ -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 12
#define CLIENT_VERSION_BUILD 50
#define CLIENT_VERSION_REVISION 13
#define CLIENT_VERSION_BUILD 25

//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down
6 changes: 3 additions & 3 deletions src/deprecation.h
Expand Up @@ -6,10 +6,10 @@
#define ZCASH_DEPRECATION_H

// Deprecation policy:
// * Shut down 18 weeks' worth of blocks after the estimated release block height.
// * 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 = 192200;
static const int WEEKS_UNTIL_DEPRECATION = 18;
static const int APPROX_RELEASE_HEIGHT = 219700;
static const int WEEKS_UNTIL_DEPRECATION = 16;
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);

// Number of blocks before deprecation to warn users
Expand Down

0 comments on commit c1282be

Please sign in to comment.