Skip to content

Commit

Permalink
Auto merge of zcash#2031 - ebfull:1.0.5-release, r=ebfull
Browse files Browse the repository at this point in the history
1.0.5 release
  • Loading branch information
zkbot committed Jan 20, 2017
2 parents 0edb3c0 + 5046d8c commit ee6d993
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Zcash 1.0.4
Zcash 1.0.5
===========

What is Zcash?
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ 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, 4)
define(_CLIENT_VERSION_REVISION, 5)
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)))
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 (1.0.5) jessie; urgency=medium

* 1.0.5 release.

-- Zcash Company <[email protected]> Thu, 19 Jan 2016 19:23:40 -0700

zcash (1.0.4) jessie; urgency=medium

* 1.0.4 release.
Expand Down
4 changes: 2 additions & 2 deletions contrib/debian/manpages/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.3.
.TH ZCASH-CLI "1" "December 2016" "Zcash RPC client version v1.0.4" "User Commands"
.TH ZCASH-CLI "1" "January 2017" "Zcash RPC client version v1.0.5" "User Commands"
.SH NAME
zcash-cli \- RPC client for the Zcash daemon
.SH DESCRIPTION
Zcash RPC client version v1.0.4
Zcash RPC client version v1.0.5
.SS "Usage:"
.TP
zcash\-cli [options] <command> [params]
Expand Down
4 changes: 2 additions & 2 deletions contrib/debian/manpages/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.3.
.TH ZCASHD "1" "December 2016" "Zcash Daemon version v1.0.4" "User Commands"
.TH ZCASHD "1" "January 2017" "Zcash Daemon version v1.0.5" "User Commands"
.SH NAME
zcashd \- Network daemon for interacting with the Zcash blockchain
.SH DESCRIPTION
Zcash Daemon version v1.0.4
Zcash Daemon version v1.0.5
.SS "Usage:"
.TP
zcashd [options]
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-1.0.4"
name: "zcash-1.0.5"
enable_cache: true
distro: "debian"
suites:
Expand Down
13 changes: 7 additions & 6 deletions doc/authors.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
Zcash Contributors
==================

Jack Grigg (301)
Simon Liu (207)
Sean Bowe (176)
Jack Grigg (323)
Simon Liu (220)
Sean Bowe (180)
Taylor Hornby (65)
Daira Hopwood (62)
Kevin Gallagher (38)
Jay Graber (34)
Jay Graber (35)
Wladimir J. van der Laan (10)
Nathan Wilcox (10)
Wladimir J. van der Laan (9)
Pieter Wuille (8)
Cory Fields (7)
Paige Peterson (5)
ITH4Coinomia (4)
David Mercer (4)
4ZEC (4)
lpescher (3)
Patrick Strateman (3)
Paige Peterson (3)
MarcoFalke (3)
Alfie John (3)
aniemerg (2)
Expand All @@ -36,6 +36,7 @@ Lars-Magnus Skog (1)
Jeffrey Walton (1)
Gaurav Rana (1)
Ethan Heilman (1)
Eran Tromer (1)
Christian von Roques (1)
Chirag Davé (1)
Cameron Boehmer (1)
Expand Down
58 changes: 58 additions & 0 deletions doc/release-notes/release-notes-1.0.5.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
Eran Tromer (1):
CreateJoinSplit: add start_profiling() call

Jack Grigg (22):
Extend createjoinsplit to benchmark parallel JoinSplits
Add total number of commitments to getblockchaininfo
Only enable getblocktemplate when wallet is enabled
Only run wallet tests when wallet is enabled
Add a tool for profiling the creation of JoinSplits
Exclude test binaries from make install
Scan the whole chain whenever a z-key is imported
Instruct users to run zcash-fetch-params if network params aren't available
Trigger metrics UI refresh on new messages
Strip out the SECURE flag in metrics UI so message style is detected
Handle newlines in UI messages
Suggest ./zcutil/fetch-params.sh as well
Update debug categories
Rename build-aux/m4/bitcoin_find_bdb48.m4 to remove version
Throw an error if zcash.conf is missing
Show a friendly message explaining why zcashd needs a zcash.conf
Fix gtest ordering broken by #1949
Debian package lint
Generate Debian control file to fix shlibs lint
Create empty zcash.conf during performance measurements
Create empty zcash.conf during coverage checks
Coverage build system tweaks

Jay Graber (1):
Update release process to check in with users who opened resolved issues

Paige Peterson (2):
Create ISSUE_TEMPLATE.md
move template to subdirectory, fix typo, include prompt under describing issue section, include uploading file directly to github ticket as option for sharing logs

Sean Bowe (4):
Add test for IncrementalMerkleTree::size().
Add 'CreateJoinSplit' standalone utility to gitignore.
Add test for z_importkey rescanning from beginning of chain.
Bump version to 1.0.5.

Simon Liu (13):
Fixes #1964 to catch general exception in z_sendmany and catch exceptions as reference-to-const.
Fixes #1967 by adding age of note to z_sendmany logging.
Fixes a bug where the unsigned transaction was logged by z_sendmany after a successful sign and send, meaning that the logged hash fragment would be different from the txid logged by "AddToWallet". This issue occured when sending from transparent addresses, as utxo inputs must be signed. It did not occur when sending from shielded addresses.
Bump COPYRIGHT_YEAR from 2016 to 2017.
Closes #1780. Result of z_getoperationstatus now sorted by creation time of operation
Remove UTF-8 BOM efbbbf from zcash.conf to avoid problems with command line tools
Closes #1097 so zcash-cli now displays license info like zcashd.
Fixes #1497 ZCA-009 by restricting data exporting to user defined folder.
Closes #1957 by adding tx serialization size to listtransactions output.
Fixes #1960: z_getoperationstatus/result now includes operation details.
Update walletbackup.py qa test to use -exportdir option
Add missing header required by std::accumulate
Increase timeout for z_sendmany transaction in wallet.py qa test

Wladimir J. van der Laan (1):
rpc: Implement random-cookie based authentication

2 changes: 1 addition & 1 deletion src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
//! 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 4
#define CLIENT_VERSION_REVISION 5
#define CLIENT_VERSION_BUILD 50

//! Set to true for release, false for prerelease or test build
Expand Down

0 comments on commit ee6d993

Please sign in to comment.