diff --git a/README.md b/README.md index 0dea83296..bbf7295ab 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 1.0.5 +Zcash 1.0.6 =========== What is Zcash? diff --git a/configure.ac b/configure.ac index 63f9b75fe..3db6cdf42 100644 --- a/configure.ac +++ b/configure.ac @@ -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, 5) +define(_CLIENT_VERSION_REVISION, 6) 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))) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index ef0701804..4ae3c4aea 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (1.0.6) jessie; urgency=medium + + * 1.0.6 release. + + -- Zcash Company Fri, 10 Feb 2017 10:23:00 -0800 + zcash (1.0.5) jessie; urgency=medium * 1.0.5 release. diff --git a/contrib/debian/manpages/zcash-cli.1 b/contrib/debian/manpages/zcash-cli.1 index bb0611eb7..490c40fee 100644 --- a/contrib/debian/manpages/zcash-cli.1 +++ b/contrib/debian/manpages/zcash-cli.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASH-CLI "1" "January 2017" "Zcash RPC client version v1.0.5" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH ZCASH-CLI "1" "February 2017" "Zcash RPC client version v1.0.6" "User Commands" .SH NAME zcash-cli \- RPC client for the Zcash daemon .SH DESCRIPTION -Zcash RPC client version v1.0.5 +Zcash RPC client version v1.0.6 .SS "Usage:" .TP zcash\-cli [options] [params] @@ -63,6 +63,19 @@ SSL options: (see the Bitcoin Wiki for SSL setup instructions) \fB\-rpcssl\fR .IP Use OpenSSL (https) for JSON\-RPC connections +.SH COPYRIGHT +Copyright \(co 2009\-2017 The Bitcoin Core Developers +.br +Copyright \(co 2015\-2017 The Zcash Developers +.PP +This is experimental software. +.PP +Distributed under the MIT software license, see the accompanying file COPYING +or . +.PP +This product includes software developed by the OpenSSL Project for use in the +OpenSSL Toolkit and cryptographic software written +by Eric Young and UPnP software written by Thomas Bernard. .SH "SEE ALSO" The full documentation for .B Zcash diff --git a/contrib/debian/manpages/zcashd.1 b/contrib/debian/manpages/zcashd.1 index eece9c6e5..5326d4ca4 100644 --- a/contrib/debian/manpages/zcashd.1 +++ b/contrib/debian/manpages/zcashd.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. -.TH ZCASHD "1" "January 2017" "Zcash Daemon version v1.0.5" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. +.TH ZCASHD "1" "February 2017" "Zcash Daemon version v1.0.6" "User Commands" .SH NAME zcashd \- Network daemon for interacting with the Zcash blockchain .SH DESCRIPTION -Zcash Daemon version v1.0.5 +Zcash Daemon version v1.0.6 .SS "Usage:" .TP zcashd [options] @@ -48,6 +48,10 @@ Run in the background as a daemon and accept commands .IP Specify data directory .HP +\fB\-exportdir=\fR +.IP +Specify directory to be used when exporting data +.HP \fB\-dbcache=\fR .IP Set database cache size in megabytes (4 to 16384, default: 100) @@ -62,7 +66,7 @@ Keep at most unconnectable transactions in memory (default: 100) .HP \fB\-par=\fR .IP -Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 = +Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 = leave that many cores free, default: 0) .HP \fB\-pid=\fR @@ -266,27 +270,38 @@ Delete all wallet transactions and only recover those parts of the blockchain through \fB\-rescan\fR on startup (1 = keep tx meta data e.g. account owner and payment request information, 2 = drop tx meta data) .PP +ZeroMQ notification options: +.HP +\fB\-zmqpubhashblock=\fR
+.IP +Enable publish hash block in
+.HP +\fB\-zmqpubhashtx=\fR
+.IP +Enable publish hash transaction in
+.HP +\fB\-zmqpubrawblock=\fR
+.IP +Enable publish raw block in
+.HP +\fB\-zmqpubrawtx=\fR
+.IP +Enable publish raw transaction in
+.PP Debugging/Testing options: .HP \fB\-debug=\fR .IP Output debugging information (default: 0, supplying is optional). If is not supplied or if = 1, output -all debugging information. can be: addrman, alert, bench, -coindb, db, lock, rand, rpc, selectcoins, mempool, net, proxy, prune. +all debugging information. can be: addrman, alert, bench, +coindb, db, estimatefee, lock, mempool, net, partitioncheck, pow, proxy, +prune, rand, reindex, rpc, selectcoins, zmq, zrpc, zrpcunsafe (implies +zrpc). .HP -\fB\-gen\fR +\fB\-experimentalfeatures\fR .IP -Generate coins (default: 0) -.HP -\fB\-genproclimit=\fR -.IP -Set the number of threads for coin generation if enabled (\fB\-1\fR = all -cores, default: 1) -.HP -\fB\-equihashsolver=\fR -.IP -Specify the Equihash solver to be used if enabled (default: "default") +Enable use of experimental features .HP \fB\-help\-debug\fR .IP @@ -343,6 +358,30 @@ Set maximum block size in bytes (default: 2000000) Set maximum size of high\-priority/low\-fee transactions in bytes (default: 1000000) .PP +Mining options: +.HP +\fB\-gen\fR +.IP +Generate coins (default: 0) +.HP +\fB\-genproclimit=\fR +.IP +Set the number of threads for coin generation if enabled (\fB\-1\fR = all +cores, default: 1) +.HP +\fB\-equihashsolver=\fR +.IP +Specify the Equihash solver to be used if enabled (default: "default") +.HP +\fB\-mineraddress=\fR +.IP +Send mined coins to a specific single address +.HP +\fB\-minetolocalwallet\fR +.IP +Require that mined blocks use a coinbase address in the local wallet +(default: 1) +.PP RPC server options: .HP \fB\-server\fR @@ -418,9 +457,9 @@ output (default: 1 if running in a console, 0 otherwise) Number of seconds between metrics refreshes (default: 1 if running in a console, 600 otherwise) .SH COPYRIGHT -Copyright \(co 2009\-2016 The Bitcoin Core Developers +Copyright \(co 2009\-2017 The Bitcoin Core Developers .br -Copyright \(co 2015\-2016 The Zcash Developers +Copyright \(co 2015\-2017 The Zcash Developers .PP This is experimental software. .PP diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index b5a7c2cb7..156667612 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-1.0.5" +name: "zcash-1.0.6" enable_cache: true distro: "debian" suites: diff --git a/doc/authors.md b/doc/authors.md index c57a4631a..9ac74117a 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,36 +1,44 @@ Zcash Contributors ================== -Jack Grigg (323) -Simon Liu (220) -Sean Bowe (180) +Jack Grigg (356) +Simon Liu (236) +Sean Bowe (183) Taylor Hornby (65) -Daira Hopwood (62) +Daira Hopwood (64) Kevin Gallagher (38) Jay Graber (35) -Wladimir J. van der Laan (10) +Jonas Schnelli (24) +Wladimir J. van der Laan (20) +Cory Fields (11) Nathan Wilcox (10) Pieter Wuille (8) -Cory Fields (7) Paige Peterson (5) -ITH4Coinomia (4) +Johnathan Corgan (5) +fanquake (4) +Jeff Garzik (4) David Mercer (4) -4ZEC (4) lpescher (3) Patrick Strateman (3) MarcoFalke (3) +Daniel Cousens (3) Alfie John (3) aniemerg (2) +Scott (2) Robert C. Seacord (2) +João Barbosa (2) Joe Turgeon (2) +ITH4Coinomia (2) Gregory Maxwell (2) +paveljanik (1) +mrbandrews (1) kazcw (1) -fanquake (1) +isle2983 (1) ayleph (1) Tom Ritter (1) -Scott (1) S. Matthew English (1) Philip Kaufmann (1) +Paragon Initiative Enterprises, LLC (1) Louis Nyffenegger (1) Lars-Magnus Skog (1) Jeffrey Walton (1) @@ -43,3 +51,4 @@ Cameron Boehmer (1) Bryan Stitt (1) Bitcoin Error Log (1) Alex (1) +4ZEC (1) diff --git a/src/clientversion.h b/src/clientversion.h index 33056403b..124050296 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -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 5 +#define CLIENT_VERSION_REVISION 6 #define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build @@ -26,7 +26,7 @@ * Copyright year (2009-this) * Todo: update this when changing our copyright comments in the source */ -#define COPYRIGHT_YEAR 2016 +#define COPYRIGHT_YEAR 2017 #endif //HAVE_CONFIG_H diff --git a/zcutil/release-notes.py b/zcutil/release-notes.py index f56e8c22d..93daf63f8 100644 --- a/zcutil/release-notes.py +++ b/zcutil/release-notes.py @@ -17,7 +17,7 @@ def apply_author_aliases(name): return name def parse_authors(line): - commit_search = re.search('(\d+)', line) + commit_search = re.search('\((\d+)\)', line) if commit_search: commits = commit_search.group(1) else: