Browse Source

Auto merge of #3356 - bitcartel:release-v1.1.2-rc1, r=bitcartel

Release v1.1.2 rc1
pull/4/head v1.1.2-rc1
Homu 6 years ago
parent
commit
0f091f228c
  1. 2
      README.md
  2. 4
      configure.ac
  3. 6
      contrib/debian/changelog
  4. 2
      contrib/gitian-descriptors/gitian-linux.yml
  5. 8
      doc/man/zcash-cli.1
  6. 8
      doc/man/zcash-tx.1
  7. 15
      doc/man/zcashd.1
  8. 96
      doc/release-notes/release-notes-1.1.2-rc1.md
  9. 4
      src/clientversion.h
  10. 2
      src/deprecation.h

2
README.md

@ -1,4 +1,4 @@
Zcash 1.1.1
Zcash 1.1.2-rc1
=============
What is Zcash?

4
configure.ac

@ -2,8 +2,8 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 50)
define(_CLIENT_VERSION_REVISION, 2)
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)

6
contrib/debian/changelog

@ -1,3 +1,9 @@
zcash (1.1.2~rc1) stable; urgency=medium
* 1.1.2-rc1 release.
-- Zcash Company <team@z.cash> Fri, 22 Jun 2018 17:03:41 -0700
zcash (1.1.1) stable; urgency=medium
* 1.1.1 release.

2
contrib/gitian-descriptors/gitian-linux.yml

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

8
doc/man/zcash-cli.1

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-CLI "1" "May 2018" "zcash-cli v1.1.1" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ZCASH-CLI "1" "June 2018" "zcash-cli v1.1.2-rc1" "User Commands"
.SH NAME
zcash-cli \- manual page for zcash-cli v1.1.1
zcash-cli \- manual page for zcash-cli v1.1.2-rc1
.SH DESCRIPTION
Zcash RPC client version v1.1.1
Zcash RPC client version v1.1.2\-rc1
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.

8
doc/man/zcash-tx.1

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASH-TX "1" "May 2018" "zcash-tx v1.1.1" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ZCASH-TX "1" "June 2018" "zcash-tx v1.1.2-rc1" "User Commands"
.SH NAME
zcash-tx \- manual page for zcash-tx v1.1.1
zcash-tx \- manual page for zcash-tx v1.1.2-rc1
.SH DESCRIPTION
Zcash zcash\-tx utility version v1.1.1
Zcash zcash\-tx utility version v1.1.2\-rc1
.SS "Usage:"
.TP
zcash\-tx [options] <hex\-tx> [commands]

15
doc/man/zcashd.1

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3.
.TH ZCASHD "1" "May 2018" "zcashd v1.1.1" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6.
.TH ZCASHD "1" "June 2018" "zcashd v1.1.2-rc1" "User Commands"
.SH NAME
zcashd \- manual page for zcashd v1.1.1
zcashd \- manual page for zcashd v1.1.2-rc1
.SH DESCRIPTION
Zcash Daemon version v1.1.1
Zcash Daemon version v1.1.2\-rc1
.PP
In order to ensure you are adequately protecting your privacy when using Zcash,
please see <https://z.cash/support/security/>.
@ -51,11 +51,6 @@ Run in the background as a daemon and accept commands
.IP
Specify data directory
.HP
\fB\-disabledeprecation=\fR<version>
.IP
Disable block\-height node deprecation and automatic shutdown (example:
\fB\-disabledeprecation\fR=\fI\,1\/\fR.1.1)
.HP
\fB\-exportdir=\fR<dir>
.IP
Specify directory to be used when exporting data
@ -80,7 +75,7 @@ limit applied)
.HP
\fB\-par=\fR<n>
.IP
Set the number of script verification threads (\fB\-2\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>

96
doc/release-notes/release-notes-1.1.2-rc1.md

@ -0,0 +1,96 @@
Notable changes
===============
`-disabledeprecation` removal
-----------------------------
In release 1.0.9 we implemented automatic deprecation of `zcashd` software
versions made by the Zcash Company. The configuration option
`-disabledeprecation` was added as a way for users to specifically choose to
stay on a particular software version. However, it incorrectly implied that
deprecated releases would still be supported.
This release removes the `-disabledeprecation` option, so that `zcashd` software
versions made by the Zcash Company will always shut down in accordance with the
defined deprecation policy (currently 16 weeks after release). Users who wish to
use a different policy must now specifically choose to either:
- edit and compile the source code themselves, or
- obtain a software version from someone else who has done so (and obtain
support from them).
Either way, it is much clearer that the software they are running is not
supported by the Zcash Company.
Changelog
=========
Ariel Gabizon (1):
Improve/Fix variable names
Daira Hopwood (1):
Update code_of_conduct.md
Eirik Ogilvie-Wigley (5):
Add tests for sapling anchors
Add hashFinalSaplingRoot to getblocktemplate
Fix parsing parameters in getnetworksolps
Add BOOST_TEST_CONTEXT to distinguish sprout v. sapling
Rename typename
Jack Grigg (16):
Replace boost::array with std::array
Add MacOS support to no-dot-so test
Whitespace cleanup
chainparams: Add Sapling Bech32 HRPs
ConvertBits() - convert from one power-of-2 number base to another.
Fix bech32::Encode() error handling
Implement encoding and decoding of Sapling keys and addresses
Add Mach-O 64-bit detection to security-check.py
Fix cached_witnesses_empty_chain test failure on MacOS
Skip ELF-only sec-hard checks on non-ELF binaries
Remove config option -disabledeprecation
Add release notes for -disabledeprecation removal
Add comment about size calculations for converted serialized keys
Add examples of ConvertBits transformation
Use CChainParams::Bech32HRP() in zs_address_test
Add hashFinalSaplingRoot to getblockheader and getblock output
Jay Graber (8):
Add Sapling key classes to wallet, with new librustzcash APIs
Change librustzcash dependency hash to work for new Sapling classes
Update librustzcash dependency, address comments
Minimal sapling key test
Fix default_address()
s/SaplingInViewingKey/SaplingIncomingViewingKey
Make diversifier functions return option
Add json test vectors for Sapling key components.
Jonathan "Duke" Leto (1):
Clarify help that signmessage only works on taddrs
Larry Ruane (1):
(rpc-test) accurately account for fee without rounding error
Matthew King (2):
Use portable #! in python scripts (/usr/bin/env)
Favour python over python2 as per PR #7723
Paige Peterson (1):
include note about volunteers in CoC
Pieter Wuille (2):
Generalize ConvertBits
Simplify Base32 and Base64 conversions
Simon Liu (9):
Part of #3277. Add comment about deprecated txdb prefixes.
Remove now redundant Rust call to librustzcash_xor.
Add SaplingNote class and test_sapling_note unit test.
Refactor and replace factory method random() with constructor.
Return optional for Sapling commitments and nullifiers.
Closes #3328. Send alert to put non-Overwinter nodes into safe mode.
Fix pyflakes error in test zkey_import_export.
make-release.py: Versioning changes for 1.1.2-rc1.
make-release.py: Updated manpages for 1.1.2-rc1.

4
src/clientversion.h

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

2
src/deprecation.h

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

Loading…
Cancel
Save