Auto merge of #4089 - Eirik0:release-v2.0.7-rc1, r=Eirik0

Release v2.0.7 rc1
This commit is contained in:
Homu 2019-08-10 10:09:43 -07:00
commit fa1b656482
10 changed files with 149 additions and 24 deletions

View File

@ -1,4 +1,4 @@
Zcash 2.0.6
Zcash 2.0.7-rc1
<img align="right" width="120" height="80" src="doc/imgs/logo.png">
===========

View File

@ -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, 6)
define(_CLIENT_VERSION_BUILD, 50)
define(_CLIENT_VERSION_REVISION, 7)
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)

View File

@ -1,3 +1,9 @@
zcash (2.0.7~rc1) stable; urgency=medium
* 2.0.7-rc1 release.
-- Electric Coin Company <team@z.cash> Fri, 09 Aug 2019 17:05:51 -0600
zcash (2.0.6) stable; urgency=medium
* 2.0.6 release.

View File

@ -1,5 +1,5 @@
---
name: "zcash-2.0.6"
name: "zcash-2.0.7-rc1"
enable_cache: true
distro: "debian"
suites:

View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH ZCASH-CLI "1" "June 2019" "zcash-cli v2.0.6" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ZCASH-CLI "1" "August 2019" "zcash-cli v2.0.7-rc1" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v2.0.6
zcash-cli \- manual page for zcash-cli v2.0.7-rc1
.SH DESCRIPTION
Zcash RPC client version v2.0.6
Zcash RPC client version v2.0.7\-rc1
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
@ -81,7 +81,7 @@ Copyright (C) 2015-2019 The Zcash Developers
This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <http://www.opensource.org/licenses/mit-license.php>.
or <https://www.opensource.org/licenses/mit-license.php>.
This product includes software developed by the OpenSSL Project for use in the
OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written

View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH ZCASH-TX "1" "June 2019" "zcash-tx v2.0.6" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ZCASH-TX "1" "August 2019" "zcash-tx v2.0.7-rc1" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v2.0.6
zcash-tx \- manual page for zcash-tx v2.0.7-rc1
.SH DESCRIPTION
Zcash zcash\-tx utility version v2.0.6
Zcash zcash\-tx utility version v2.0.7\-rc1
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]
@ -94,7 +94,7 @@ Copyright (C) 2015-2019 The Zcash Developers
This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <http://www.opensource.org/licenses/mit-license.php>.
or <https://www.opensource.org/licenses/mit-license.php>.
This product includes software developed by the OpenSSL Project for use in the
OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written

View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4.
.TH ZCASHD "1" "June 2019" "zcashd v2.0.6" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ZCASHD "1" "August 2019" "zcashd v2.0.7-rc1" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v2.0.6
zcashd \- manual page for zcashd v2.0.7-rc1
.SH DESCRIPTION
Zcash Daemon version v2.0.6
Zcash Daemon version v2.0.7\-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\-6\fR to 16, 0 = auto, <0 =
Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>
@ -276,7 +276,8 @@ confirmation on average within n blocks (default: 2)
\fB\-txexpirydelta\fR
.IP
Set the number of blocks after which a transaction that has not been
mined will become invalid (min: 4, default: 20)
mined will become invalid (min: 4, default: 20 (pre\-Blossom) or 40
(post\-Blossom))
.HP
\fB\-maxtxfee=\fR<amt>
.IP
@ -484,7 +485,7 @@ Copyright (C) 2015-2019 The Zcash Developers
This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <http://www.opensource.org/licenses/mit-license.php>.
or <https://www.opensource.org/licenses/mit-license.php>.
This product includes software developed by the OpenSSL Project for use in the
OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written

View File

@ -0,0 +1,118 @@
Changelog
=========
Daira Hopwood (10):
Add MIT license to Makefiles
Add MIT license to build-aux/m4/bitcoin_* scripts, and a permissive license to build-aux/m4/l_atomic.m4 .
Update copyright information for Zcash, leveldb, and libsnark.
Add license information for Autoconf macros. refs #2827
Update contrib/debian/copyright for ax_boost_thread.m4
Replace http with https: in links to the MIT license. Also change MIT/X11 to just MIT, since no distinction was intended.
qa/zcash/checksec.sh is under a BSD license, with a specialized non-endorsement clause.
Link to ticket #2827 using URL
Release process doc: add step to set the gpg key id.
Release process doc: mention the commit message.
Dimitris Apostolou (5):
Rename vjoinsplit to vJoinSplit
Fix naming inconsistency
Rename joinsplit to shielded
Rename FindWalletTx to FindWalletTxToZap
Fix RPC undefined behavior.
Eirik Ogilvie-Wigley (47):
Make nextHeight required in CalculateNextWorkRequired
Fix nondeterministic failure in sapling migration test
Clean up and fix typo
Apply suggestions from code review
Shorter block times rpc test
Update pow_tests for shorter block times
Update test_pow for shorter block times
Update block subsidy halving for zip208
Make NetworkUpgradeAvailable a method of Params
Temporarily disable test
Simplify PartitionCheck
Use static_assert
Add missing new line at end of file
pow test cleanup
Add message to static_assert
Update expiry height for shorter block times
Fix zip208 founders reward calculation and update test
PartitionCheck tests for shorter block times
Add test for Blossom default tx expiry delta
Update metrics block height estimation for shorter block times
Do not create transactions that will expire after the next epoch
Do not send migration transactions that would expire after a network upgrade
Fix integer truncation in Blossom halving calculation
Update main_tests for shorter block times
Use pre-Blossom max FR height when calculating address change interval
Make founders reward tests pass before and after Blossom activation height is set
Extract Halvings method and add tests
Add comments and fix typos
Improve EstimateNetHeight calculation
Fix check transaction tests
Make sure to deactivate blossom in test case
Fix parsing txexpirydelta argument
Do not add expiring soon threshold to expiry height of txs near NU activation
Fix/update comments
Make sure that expiry height is not less than height
Clarify documentation
Update PoW related assertions
Remove DefaultExpiryDelta method
Algebraic improvements related to halving
Distinguish between height and current header height on metrics screen
Test clean up and fixes
Add copyright info
NPE defense in metrics screen
Do not estimate height if there is no best header
Rename method and use int64_t
make-release.py: Versioning changes for 2.0.7-rc1.
make-release.py: Updated manpages for 2.0.7-rc1.
Eirik Ogilvie-Wigley (8):
Use CommitTransaction() rather than sendrawtransaction()
Move reused async rpc send logic to separate file
Move reused sign and send logic
Do not shadow the return value when testmode is true
Inline sign_send_raw_transaction
Allow passing optional reserve key as a parameter to SendTransaction
Use reserve key for transparent change when sending to Sapling
Fix comment in mergetoaddress RPC test
Jack Grigg (4):
test: Check for change t-addr reuse in z_sendmany
Use reserve key for transparent change when sending to Sprout
test: Fix permissions on wallet_changeaddresses RPC test
test: Fix pyflakes warnings
Larry Ruane (6):
add addressindex related RPCs
add spentindex RPC for bitcore block explorer
add timestampindex related RPC getblockhashes
fix getblockdeltas documentation formatting
insightexplorer minor bug fixes
insightexplorer fix LogPrintf
Luke Dashjr (2):
Add MIT license to autogen.sh and share/genbuild.sh
Trivial: build-aux/m4/l_atomic: Fix typo
Simon Liu (8):
Redefine PoW functions to accept height parameter.
Remove use of redundant member nPowTargetSpacing.
Replace nPoWTargetSpacing -> PoWTargetSpacing()
Update PoW function calls to pass in height.
Update GetBlockTimeout() to take height parameter.
Replace nPoWTargetSpacing -> PoWTargetSpacing() in ProcessMessage()
Replace nPoWTargetSpacing -> PoWTargetSpacing() in tests
Modify PartitionCheck to be aware of pre & post Blossom target spacing.
William M Peaster (1):
Handful of copyedits to README.md
codetriage-readme-bot (1):
Link to development guidelines in CONTRIBUTING.md
Jack Grigg (1):
Update README.md

View File

@ -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 6
#define CLIENT_VERSION_BUILD 50
#define CLIENT_VERSION_REVISION 7
#define CLIENT_VERSION_BUILD 25
//! Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true

View File

@ -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 = 553000;
static const int APPROX_RELEASE_HEIGHT = 584200;
static const int WEEKS_UNTIL_DEPRECATION = 16;
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);