Skip to content

Commit

Permalink
Auto merge of zcash#3030 - str4d:release-v1.0.15, r=str4d
Browse files Browse the repository at this point in the history
Release v1.0.15
  • Loading branch information
zkbot committed Feb 28, 2018
2 parents b10aaac + 25b080a commit 93332d6
Show file tree
Hide file tree
Showing 12 changed files with 251 additions and 88 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.15-rc1
Zcash 1.0.15
=============

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 @@ -3,7 +3,7 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 15)
define(_CLIENT_VERSION_BUILD, 25)
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)
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.15) stable; urgency=medium

* 1.0.15 release.

-- Zcash Company <[email protected]> Wed, 28 Feb 2018 16:58:19 +0000

zcash (1.0.15~rc1) stable; urgency=medium

* 1.0.15-rc1 release.
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.15-rc1"
name: "zcash-1.0.15"
enable_cache: true
distro: "debian"
suites:
Expand Down
32 changes: 21 additions & 11 deletions doc/authors.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
Zcash Contributors
==================

Jack Grigg (558)
Simon Liu (286)
Jack Grigg (601)
Simon Liu (297)
Sean Bowe (193)
Daira Hopwood (102)
Wladimir J. van der Laan (71)
Taylor Hornby (65)
Jay Graber (61)
Nathan Wilcox (56)
Jay Graber (53)
Jonas Schnelli (49)
Kevin Gallagher (38)
Cory Fields (28)
Pieter Wuille (16)
syd (13)
Cory Fields (30)
Pieter Wuille (24)
syd (15)
nomnombtc (9)
Paige Peterson (9)
Matt Corallo (9)
fanquake (8)
MarcoFalke (7)
Luke Dashjr (6)
Expand All @@ -26,14 +27,16 @@ kozyilmaz (4)
Philip Kaufmann (4)
Peter Todd (4)
Patrick Strateman (4)
Matt Corallo (4)
Karl-Johan Alm (4)
Jorge Timón (4)
Jeff Garzik (4)
David Mercer (4)
Daniel Cousens (4)
lpescher (3)
Suhas Daftuar (3)
Pavel Janík (3)
João Barbosa (3)
Ariel (3)
Alfie John (3)
str4d (2)
paveljanik (2)
Expand All @@ -42,11 +45,13 @@ aniemerg (2)
Scott (2)
Robert C. Seacord (2)
Per Grön (2)
Pavel Vasin (2)
Joe Turgeon (2)
Jason Davies (2)
Jack Gavigan (2)
ITH4Coinomia (2)
Gavin Andresen (2)
Daniel Kraft (2)
Bjorn Hjortsberg (2)
Amgad Abdelhafez (2)
zathras-crypto (1)
Expand All @@ -55,6 +60,7 @@ practicalswift (1)
mruddy (1)
mrbandrews (1)
kazcw (1)
jc (1)
isle2983 (1)
instagibbs (1)
emilrus (1)
Expand All @@ -67,18 +73,21 @@ Stephen (1)
S. Matthew English (1)
Ross Nicoll (1)
René Nyffenegger (1)
Pavel Vasin (1)
Paul Georgiou (1)
Paragon Initiative Enterprises, LLC (1)
Nicolas DORIER (1)
Nathaniel Mahieu (1)
Murilo Santana (1)
Maxwell Gubler (1)
Matt Quinn (1)
Mark Friedenbach (1)
Marius Kjærstad (1)
Louis Nyffenegger (1)
Leo Arias (1)
Lars-Magnus Skog (1)
Kevin Pan (1)
Jorge Timón (1)
Jonathan "Duke" Leto (1)
Jonas Nick (1)
Jeffrey Walton (1)
Ian Kelling (1)
Gaurav Rana (1)
Expand All @@ -87,7 +96,6 @@ 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)
Expand All @@ -97,11 +105,13 @@ Bruno Arueira (1)
Boris Hajduk (1)
Bob McElrath (1)
Bitcoin Error Log (1)
Ariel (1)
Ashley Holman (1)
Anthony Towns (1)
Allan Niemerg (1)
Alex van der Peet (1)
Alex Morcos (1)
Alex (1)
Adam Weiss (1)
Adam Brown (1)
4ZEC (1)
21E14 (1)
6 changes: 3 additions & 3 deletions doc/man/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" "February 2018" "zcash-cli v1.0.15-rc1" "User Commands"
.TH ZCASH-CLI "1" "February 2018" "zcash-cli v1.0.15" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v1.0.15-rc1
zcash-cli \- manual page for zcash-cli v1.0.15
.SH DESCRIPTION
Zcash RPC client version v1.0.15\-rc1
Zcash RPC client version v1.0.15
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
Expand Down
6 changes: 3 additions & 3 deletions doc/man/zcash-tx.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-TX "1" "February 2018" "zcash-tx v1.0.15-rc1" "User Commands"
.TH ZCASH-TX "1" "February 2018" "zcash-tx v1.0.15" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v1.0.15-rc1
zcash-tx \- manual page for zcash-tx v1.0.15
.SH DESCRIPTION
Zcash zcash\-tx utility version v1.0.15\-rc1
Zcash zcash\-tx utility version v1.0.15
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]
Expand Down
8 changes: 4 additions & 4 deletions doc/man/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" "February 2018" "zcashd v1.0.15-rc1" "User Commands"
.TH ZCASHD "1" "February 2018" "zcashd v1.0.15" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v1.0.15-rc1
zcashd \- manual page for zcashd v1.0.15
.SH DESCRIPTION
Zcash Daemon version v1.0.15\-rc1
Zcash Daemon version v1.0.15
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
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.15\-rc1)
\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.15)
.HP
\fB\-exportdir=\fR<dir>
.IP
Expand Down
62 changes: 0 additions & 62 deletions doc/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,65 +4,3 @@ release-notes at release time)
Notable changes
===============

Overwinter network upgrade
--------------------------

The code preparations for the Overwinter network upgrade, as described in [ZIP
200](https://github.com/zcash/zips/blob/master/zip-0200.rst), [ZIP
201](https://github.com/zcash/zips/blob/master/zip-0201.rst), [ZIP
202](https://github.com/zcash/zips/blob/master/zip-0202.rst), [ZIP
203](https://github.com/zcash/zips/blob/master/zip-0203.rst), and [ZIP
143](https://github.com/zcash/zips/blob/master/zip-0143.rst) are
finished and included in this release. Overwinter will activate on testnet at
height 207500, and can also be activated at a specific height in regtest mode
by setting the config option `-nuparams=5ba81b19:HEIGHT`.

However, because the Overwinter activation height is not yet specified for
mainnet, version 1.0.15 will behave similarly as other pre-Overwinter releases
even after a future activation of Overwinter on the network. Upgrading from
1.0.15 will be required in order to follow the Overwinter network upgrade on
mainnet.

Overwinter transaction format
-----------------------------

Once Overwinter has activated, transactions must use the new v3 format
(including coinbase transactions). All RPC methods that create new transactions
(such as `createrawtransaction` and `getblocktemplate`) will create v3
transactions once the Overwinter activation height has been reached.

Overwinter transaction expiry
-----------------------------

Overwinter transactions created by `zcashd` will also have a default expiry
height set (the block height after which the transaction becomes invalid) of 20
blocks after the height of the next block. This can be configured with the
config option `-txexpirydelta`.

UTXO and note merging
---------------------

In order to simplify the process of combining many small UTXOs and notes into a
few larger ones, a new RPC method `z_mergetoaddress` has been added. It merges
funds from t-addresses, z-addresses, or both, and sends them to a single
t-address or z-address.

Unlike most other RPC methods, `z_mergetoaddress` operates over a particular
quantity of UTXOs and notes, instead of a particular amount of ZEC. By default,
it will merge 50 UTXOs and 10 notes at a time; these limits can be adjusted with
the parameters `transparent_limit` and `shielded_limit`.

`z_mergetoaddress` also returns the number of UTXOs and notes remaining in the
given addresses, which can be used to automate the merging process (for example,
merging until the number of UTXOs falls below some value).

UTXO memory accounting
----------------------

The default `-dbcache` has been changed in this release to 450MiB. Users can set
`-dbcache` to a higher value (e.g. to keep the UTXO set more fully cached in
memory). Users on low-memory systems (such as systems with 1GB or less) should
consider specifying a lower value for this parameter.

Additional information relating to running on low-memory systems can be found
here: [reducing-memory-usage.md](https://github.com/zcash/zcash/blob/master/doc/reducing-memory-usage.md).
Loading

0 comments on commit 93332d6

Please sign in to comment.