Auto merge of #4046 - daira:release-v2.0.6-rc1, r=mdr0id
Release v2.0.6-rc1
This commit is contained in:
commit
11b3168e74
|
@ -1,4 +1,4 @@
|
|||
Zcash 2.0.5-2
|
||||
Zcash 2.0.6-rc1
|
||||
<img align="right" width="120" height="80" src="doc/imgs/logo.png">
|
||||
===========
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
|
|||
AC_PREREQ([2.60])
|
||||
define(_CLIENT_VERSION_MAJOR, 2)
|
||||
define(_CLIENT_VERSION_MINOR, 0)
|
||||
define(_CLIENT_VERSION_REVISION, 5)
|
||||
define(_CLIENT_VERSION_BUILD, 52)
|
||||
define(_CLIENT_VERSION_REVISION, 6)
|
||||
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)
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
zcash (2.0.6~rc1) stable; urgency=medium
|
||||
|
||||
* 2.0.6-rc1 release.
|
||||
|
||||
-- Electric Coin Company <team@z.cash> Wed, 12 Jun 2019 16:36:57 +0100
|
||||
|
||||
zcash (2.0.5+2) stable; urgency=medium
|
||||
|
||||
* 2.0.5-2 release.
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
name: "zcash-2.0.5-2"
|
||||
name: "zcash-2.0.6-rc1"
|
||||
enable_cache: true
|
||||
distro: "debian"
|
||||
suites:
|
||||
|
|
|
@ -4,18 +4,17 @@ Zcash Contributors
|
|||
Jack Grigg (863)
|
||||
Simon Liu (450)
|
||||
Sean Bowe (278)
|
||||
Eirik Ogilvie-Wigley (145)
|
||||
Daira Hopwood (115)
|
||||
Eirik Ogilvie-Wigley (102)
|
||||
Jay Graber (89)
|
||||
Wladimir J. van der Laan (81)
|
||||
Taylor Hornby (73)
|
||||
Jonas Schnelli (62)
|
||||
Nathan Wilcox (56)
|
||||
Pieter Wuille (54)
|
||||
Eirik0 (43)
|
||||
Kevin Gallagher (38)
|
||||
Cory Fields (35)
|
||||
mdr0id (22)
|
||||
Marshall Gaucher (22)
|
||||
Larry Ruane (22)
|
||||
Jonathan "Duke" Leto (17)
|
||||
syd (15)
|
||||
|
@ -46,7 +45,6 @@ João Barbosa (4)
|
|||
Jorge Timón (4)
|
||||
George Tankersley (4)
|
||||
Gareth Davies (4)
|
||||
zebambam (3)
|
||||
lpescher (3)
|
||||
ca333 (3)
|
||||
Per Grön (3)
|
||||
|
@ -55,9 +53,9 @@ Jason Davies (3)
|
|||
James O'Beirne (3)
|
||||
Dimitris Apostolou (3)
|
||||
Daniel Kraft (3)
|
||||
Benjamin Winston (3)
|
||||
Alfie John (3)
|
||||
rofl0r (2)
|
||||
paveljanik (2)
|
||||
mruddy (2)
|
||||
kpcyrd (2)
|
||||
aniemerg (2)
|
||||
|
@ -67,6 +65,7 @@ Robert C. Seacord (2)
|
|||
Pejvan (2)
|
||||
Pavol Rusnak (2)
|
||||
Pavel Vasin (2)
|
||||
Pavel Janik (2)
|
||||
Matthew King (2)
|
||||
Kaz Wesley (2)
|
||||
Joe Turgeon (2)
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
|
||||
.TH ZCASH-CLI "1" "May 2019" "zcash-cli v2.0.5-2" "User Commands"
|
||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
|
||||
.TH ZCASH-CLI "1" "June 2019" "zcash-cli v2.0.6-rc1" "User Commands"
|
||||
.SH NAME
|
||||
zcash-cli \- manual page for zcash-cli v2.0.5-2
|
||||
zcash-cli \- manual page for zcash-cli v2.0.6-rc1
|
||||
.SH DESCRIPTION
|
||||
Zcash RPC client version v2.0.5\-2
|
||||
Zcash RPC client version v2.0.6\-rc1
|
||||
.PP
|
||||
In order to ensure you are adequately protecting your privacy when using Zcash,
|
||||
please see <https://z.cash/support/security/>.
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
|
||||
.TH ZCASH-TX "1" "May 2019" "zcash-tx v2.0.5-2" "User Commands"
|
||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
|
||||
.TH ZCASH-TX "1" "June 2019" "zcash-tx v2.0.6-rc1" "User Commands"
|
||||
.SH NAME
|
||||
zcash-tx \- manual page for zcash-tx v2.0.5-2
|
||||
zcash-tx \- manual page for zcash-tx v2.0.6-rc1
|
||||
.SH DESCRIPTION
|
||||
Zcash zcash\-tx utility version v2.0.5\-2
|
||||
Zcash zcash\-tx utility version v2.0.6\-rc1
|
||||
.SS "Usage:"
|
||||
.TP
|
||||
zcash\-tx [options] <hex\-tx> [commands]
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
|
||||
.TH ZCASHD "1" "May 2019" "zcashd v2.0.5-2" "User Commands"
|
||||
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
|
||||
.TH ZCASHD "1" "June 2019" "zcashd v2.0.6-rc1" "User Commands"
|
||||
.SH NAME
|
||||
zcashd \- manual page for zcashd v2.0.5-2
|
||||
zcashd \- manual page for zcashd v2.0.6-rc1
|
||||
.SH DESCRIPTION
|
||||
Zcash Daemon version v2.0.5\-2
|
||||
Zcash Daemon version v2.0.6\-rc1
|
||||
.PP
|
||||
In order to ensure you are adequately protecting your privacy when using Zcash,
|
||||
please see <https://z.cash/support/security/>.
|
||||
|
@ -75,7 +75,7 @@ limit applied)
|
|||
.HP
|
||||
\fB\-par=\fR<n>
|
||||
.IP
|
||||
Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
|
||||
Set the number of script verification threads (\fB\-6\fR to 16, 0 = auto, <0 =
|
||||
leave that many cores free, default: 0)
|
||||
.HP
|
||||
\fB\-pid=\fR<file>
|
||||
|
|
|
@ -0,0 +1,62 @@
|
|||
Changelog
|
||||
=========
|
||||
|
||||
Daira Hopwood (3):
|
||||
Closes #3992. Remove obsolete warning message.
|
||||
make-release.py: Versioning changes for 2.0.6-rc1.
|
||||
make-release.py: Updated manpages for 2.0.6-rc1.
|
||||
|
||||
Daniel Kraft (1):
|
||||
Add some const declarations where they are appropriate.
|
||||
|
||||
Eirik Ogilvie-Wigley (7):
|
||||
Fix tree depth in comment
|
||||
Update author aliases
|
||||
Remove old mergetoaddress RPC test
|
||||
Replace CSproutNotePlaintextEntry with SproutNoteEntry to match Sapling
|
||||
z_getmigrationstatus help message wording change
|
||||
Fix z_mergetoaddress sending from ANY_SPROUT/ANY_SAPLING when the wallet contains both note types
|
||||
Clarify what combinations of from addresses can be used in z_mergetoaddress
|
||||
|
||||
Jack Grigg (10):
|
||||
Move Equihash parameters into consensus params
|
||||
Globals: Remove Zcash-specific Params() calls from main.cpp
|
||||
Globals: Explicitly pass const CChainParams& to IsStandardTx()
|
||||
Globals: Explicit const CChainParams& arg for main:
|
||||
Globals: Explicitly pass const CChainParams& to ContextualCheckTransaction()
|
||||
Globals: Explicit const CChainParams& arg for main:
|
||||
Globals: Explicitly pass const CChainParams& to DisconnectBlock()
|
||||
Consistently use chainparams and consensusParams
|
||||
Globals: Explicitly pass const CChainParams& to IsInitialBlockDownload()
|
||||
Globals: Explicitly pass const CChainParams& to ReceivedBlockTransactions()
|
||||
|
||||
Jorge Timón (6):
|
||||
Globals: Explicit Consensus::Params arg for main:
|
||||
Globals: Make AcceptBlockHeader static (Fix #6163)
|
||||
Chainparams: Explicit CChainParams arg for main (pre miner):
|
||||
Chainparams: Explicit CChainParams arg for miner:
|
||||
Globals: Remove a bunch of Params() calls from main.cpp:
|
||||
Globals: Explicitly pass const CChainParams& to UpdateTip()
|
||||
|
||||
Larry Ruane (1):
|
||||
add spentindex to getrawtransaction RPC results
|
||||
|
||||
MarcoFalke (1):
|
||||
[doc] Fix doxygen comments for members
|
||||
|
||||
Peter Todd (1):
|
||||
Improve block validity/ConnectBlock() comments
|
||||
|
||||
Simon Liu (1):
|
||||
Fix typo and clean up help message for RPC z_getmigrationstatus.
|
||||
|
||||
Wladimir J. van der Laan (1):
|
||||
Break circular dependency main ↔ txdb
|
||||
|
||||
face (2):
|
||||
Pass CChainParams to DisconnectTip()
|
||||
Explicitly pass CChainParams to ConnectBlock
|
||||
|
||||
Benjamin Winston (1):
|
||||
Fixes #4013, added BitcoinABC as a disclosure partner
|
||||
|
|
@ -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 2
|
||||
#define CLIENT_VERSION_MINOR 0
|
||||
#define CLIENT_VERSION_REVISION 5
|
||||
#define CLIENT_VERSION_BUILD 52
|
||||
#define CLIENT_VERSION_REVISION 6
|
||||
#define CLIENT_VERSION_BUILD 25
|
||||
|
||||
//! Set to true for release, false for prerelease or test build
|
||||
#define CLIENT_VERSION_IS_RELEASE true
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
// Deprecation policy:
|
||||
// * 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 = 533500;
|
||||
static const int APPROX_RELEASE_HEIGHT = 549200;
|
||||
static const int WEEKS_UNTIL_DEPRECATION = 16;
|
||||
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);
|
||||
|
||||
|
|
Loading…
Reference in New Issue