Auto merge of zcash#3363 - bitcartel:release-v1.1.2, r=str4d

Release v1.1.2
salisbury-espinosa · Jul 2, 2018 · bbee5e2 · bbee5e2
2 parents 0f091f2 + 720b8ac
commit bbee5e2
Show file tree

Hide file tree

Showing 12 changed files with 133 additions and 47 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Zcash 1.1.2-rc1
+Zcash 1.1.2
 =============
 
 What is Zcash?

diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 1)
 define(_CLIENT_VERSION_REVISION, 2)
-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)

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
@@ -1,3 +1,9 @@
+zcash (1.1.2) stable; urgency=medium
+
+  * 1.1.2 release.
+
+ -- Zcash Company <[email protected]>  Sun, 01 Jul 2018 20:12:33 -0700
+
 zcash (1.1.2~rc1) stable; urgency=medium
 
   * 1.1.2-rc1 release.

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
 ---
-name: "zcash-1.1.2-rc1"
+name: "zcash-1.1.2"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/doc/authors.md b/doc/authors.md
@@ -1,34 +1,34 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (703)
-Simon Liu (329)
+Jack Grigg (719)
+Simon Liu (341)
 Sean Bowe (242)
-Daira Hopwood (108)
+Daira Hopwood (109)
 Wladimir J. van der Laan (79)
+Jay Graber (71)
 Taylor Hornby (65)
-Jay Graber (63)
 Nathan Wilcox (56)
 Jonas Schnelli (53)
-Pieter Wuille (48)
+Pieter Wuille (50)
 Kevin Gallagher (38)
 Cory Fields (34)
 syd (15)
 Matt Corallo (13)
+Eirik Ogilvie-Wigley (12)
+Paige Peterson (10)
 MarcoFalke (10)
 nomnombtc (9)
-Paige Peterson (9)
+Jonathan "Duke" Leto (9)
 fanquake (8)
-Jonathan "Duke" Leto (8)
 kozyilmaz (7)
 Jeff Garzik (7)
-Eirik Ogilvie-Wigley (7)
 Luke Dashjr (6)
+Ariel Gabizon (6)
 Pavel Janík (5)
 Karl-Johan Alm (5)
 Johnathan Corgan (5)
 Gregory Maxwell (5)
-Ariel Gabizon (5)
 Philip Kaufmann (4)
 Peter Todd (4)
 Patrick Strateman (4)
@@ -57,6 +57,8 @@ Scott (2)
 Robert C. Seacord (2)
 Pavol Rusnak (2)
 Pavel Vasin (2)
+Matthew King (2)
+Larry Ruane (2)
 Joe Turgeon (2)
 Jack Gavigan (2)
 ITH4Coinomia (2)
@@ -100,7 +102,6 @@ Louis Nyffenegger (1)
 Leo Arias (1)
 Lauda (1)
 Lars-Magnus Skog (1)
-Larry Ruane (1)
 Kevin Pan (1)
 Kaz Wesley (1)
 Jonas Nick (1)

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

diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1
@@ -1,9 +1,9 @@
-.\" 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"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.TH ZCASH-TX "1" "July 2018" "zcash-tx v1.1.2" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v1.1.2-rc1
+zcash-tx \- manual page for zcash-tx v1.1.2
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v1.1.2\-rc1
+Zcash zcash\-tx utility version v1.1.2
 .SS "Usage:"
 .TP
 zcash\-tx [options] <hex\-tx> [commands]

diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1
@@ -1,9 +1,9 @@
-.\" 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"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.TH ZCASHD "1" "July 2018" "zcashd v1.1.2" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v1.1.2-rc1
+zcashd \- manual page for zcashd v1.1.2
 .SH DESCRIPTION
-Zcash Daemon version v1.1.2\-rc1
+Zcash Daemon version v1.1.2
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/>.

diff --git a/doc/release-notes.md b/doc/release-notes.md
@@ -4,23 +4,3 @@ release-notes at release time)
 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.
diff --git a/doc/release-notes/release-notes-1.1.2.md b/doc/release-notes/release-notes-1.1.2.md
@@ -0,0 +1,99 @@
+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 (12):
+      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.
+      make-release.py: Updated release notes and changelog for 1.1.2-rc1.
+      make-release.py: Versioning changes for 1.1.2.
+      make-release.py: Updated manpages for 1.1.2.
+
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -18,7 +18,7 @@
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 1
 #define CLIENT_VERSION_REVISION 2
-#define CLIENT_VERSION_BUILD 25
+#define CLIENT_VERSION_BUILD 50
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

diff --git a/src/deprecation.h b/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 = 345750;
+static const int APPROX_RELEASE_HEIGHT = 351500;
 static const int WEEKS_UNTIL_DEPRECATION = 16;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);