Auto merge of #3714 - mdr0id:release-v2.0.2, r=bitcartel

Release v2.0.2
zcash · Nov 30, 2018 · 8e2ca4d · 8e2ca4d
2 parents 62aacb5 + 6f8d182
commit 8e2ca4d
Show file tree

Hide file tree

Showing 13 changed files with 143 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Zcash 2.0.2-rc1
+Zcash 2.0.2
 <img align="right" width="120" height="80" src="doc/imgs/logo.png">
 ===========
 

diff --git a/configure.ac b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 0)
 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 (2.0.2) stable; urgency=medium
+
+  * 2.0.2 release.
+
+ -- Zcash Company <team@z.cash>  Wed, 28 Nov 2018 11:09:08 -0800
+
 zcash (2.0.2~rc1) stable; urgency=medium
 
   * 2.0.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-2.0.2-rc1"
+name: "zcash-2.0.2"
 enable_cache: true
 distro: "debian"
 suites:

diff --git a/doc/authors.md b/doc/authors.md
@@ -1,26 +1,26 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (843)
-Simon Liu (420)
+Jack Grigg (850)
+Simon Liu (434)
 Sean Bowe (264)
 Daira Hopwood (110)
 Jay Graber (89)
 Wladimir J. van der Laan (81)
+Eirik Ogilvie-Wigley (77)
 Taylor Hornby (65)
-Eirik Ogilvie-Wigley (60)
 Jonas Schnelli (58)
 Nathan Wilcox (56)
 Pieter Wuille (50)
 Kevin Gallagher (38)
 Cory Fields (35)
 syd (15)
+mdr0id (15)
+Larry Ruane (15)
 Matt Corallo (13)
-Larry Ruane (11)
-mdr0id (10)
+Jonathan "Duke" Leto (12)
 Paige Peterson (10)
 MarcoFalke (10)
-Jonathan "Duke" Leto (10)
 nomnombtc (9)
 kozyilmaz (8)
 fanquake (8)
@@ -30,6 +30,7 @@ Ariel Gabizon (7)
 Luke Dashjr (6)
 David Mercer (6)
 Daniel Cousens (6)
+Suhas Daftuar (5)
 Pavel Janík (5)
 Karl-Johan Alm (5)
 Johnathan Corgan (5)
@@ -42,12 +43,12 @@ João Barbosa (4)
 Jorge Timón (4)
 Duke Leto (4)
 lpescher (3)
-Suhas Daftuar (3)
 Per Grön (3)
 Patick Strateman (3)
 Jason Davies (3)
 James O'Beirne (3)
 Daniel Kraft (3)
+Charlie O'Keefe (3)
 Ariel (3)
 Alfie John (3)
 str4d (2)
@@ -56,6 +57,7 @@ paveljanik (2)
 mruddy (2)
 kpcyrd (2)
 ca333 (2)
+arielgabizon (2)
 aniemerg (2)
 UdjinM6 (2)
 Scott (2)
@@ -70,12 +72,14 @@ Jack Gavigan (2)
 ITH4Coinomia (2)
 George Tankersley (2)
 Gavin Andresen (2)
+Gareth Davies (2)
 Brad Miller (2)
 Bjorn Hjortsberg (2)
 Amgad Abdelhafez (2)
 Alex Morcos (2)
 zathras-crypto (1)
 unsystemizer (1)
+tpantin (1)
 practicalswift (1)
 mrbandrews (1)
 kazcw (1)
@@ -126,7 +130,6 @@ David Llop (1)
 Christian von Roques (1)
 Chirag Davé (1)
 Charlie OKeefe (1)
-Charlie O'Keefe (1)
 Casey Rodarmor (1)
 Cameron Boehmer (1)
 Bryan Stitt (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" "November 2018" "zcash-cli v2.0.2-rc1" "User Commands"
+.TH ZCASH-CLI "1" "November 2018" "zcash-cli v2.0.2" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v2.0.2-rc1
+zcash-cli \- manual page for zcash-cli v2.0.2
 .SH DESCRIPTION
-Zcash RPC client version v2.0.2\-rc1
+Zcash RPC client version v2.0.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" "November 2018" "zcash-tx v2.0.2-rc1" "User Commands"
+.TH ZCASH-TX "1" "November 2018" "zcash-tx v2.0.2" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v2.0.2-rc1
+zcash-tx \- manual page for zcash-tx v2.0.2
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v2.0.2\-rc1
+Zcash zcash\-tx utility version v2.0.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" "November 2018" "zcashd v2.0.2-rc1" "User Commands"
+.TH ZCASHD "1" "November 2018" "zcashd v2.0.2" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v2.0.2-rc1
+zcashd \- manual page for zcashd v2.0.2
 .SH DESCRIPTION
-Zcash Daemon version v2.0.2\-rc1
+Zcash Daemon version v2.0.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,26 +4,3 @@ release-notes at release time)
 Notable changes
 ===============
 
-Other issues
-============
-
-Revoked key error when upgrading on Debian
-------------------------------------------
-
-If you see the following error when updating to a new version of zcashd:
-
-`The following signatures were invalid: REVKEYSIG AEFD26F966E279CD`
-
-Remove the key marked as revoked:
-
-`sudo apt-key del AEFD26F966E279CD`
-
-Then retrieve the updated key:
-
-`wget -qO - https://apt.z.cash/zcash.asc | sudo apt-key add -`
-
-Then update the package lists:
-
-`sudo apt-get update`
-
-[Issue](https://github.com/zcash/zcash/issues/3612)
diff --git a/doc/release-notes/release-notes-2.0.2.md b/doc/release-notes/release-notes-2.0.2.md
@@ -0,0 +1,110 @@
+Notable changes
+===============
+
+Other issues
+============
+
+Revoked key error when upgrading on Debian
+------------------------------------------
+
+If you see the following error when updating to a new version of zcashd:
+
+`The following signatures were invalid: REVKEYSIG AEFD26F966E279CD`
+
+Remove the key marked as revoked:
+
+`sudo apt-key del AEFD26F966E279CD`
+
+Then retrieve the updated key:
+
+`wget -qO - https://apt.z.cash/zcash.asc | sudo apt-key add -`
+
+Then update the package lists:
+
+`sudo apt-get update`
+
+[Issue](https://github.com/zcash/zcash/issues/3612)
+
+Changelog
+=========
+
+Charlie O'Keefe (2):
+      Save and restore current_path in TestingSetup constructor/destructor
+      Add a call to SetupNetworking in BasicTestingSetup
+
+Eirik Ogilvie-Wigley (17):
+      Rename GenerateNewZKey to include Sprout
+      GenerateNewSproutZKey can return a SproutPaymentAddress
+      Remove unnecessary call to IsValidPaymentAddress
+      Remove unspent note entry structs
+      Add functionality from GetUnspentFilteredNotes to GetFilteredNotes
+      Remove GetUnspentFilteredNotes
+      Wrap long line and update comments
+      Fix error message
+      Fix potentially misleading test failures
+      Fix z_mergetoaddress parameter tests
+      Add fail method to rpc test utils
+      Extend Sprout mergetoaddress rpc test to also work for Sapling
+      Add Sapling support to z_mergetoaddress
+      Add locking for Sapling notes
+      Better error messages when sending between Sprout and Sapling
+      Add additional z_mergetoaddress parameter tests
+      Adjust z_mergetoaddress assertions in Sapling rpc test
+
+Gareth Davies (2):
+      Add clarifying text for parameter size
+      Cleaning up RPC output
+
+Jack Grigg (7):
+      Update IncrementalMerkleTree test vectors to use valid commitments
+      Migrate to current librustzcash
+      Pass parameter paths as native strings to librustzcash
+      Build librustzcash package without changing directory
+      Set nSaplingValue in-memory when loading block index from disk
+      Comment in CDiskBlockIndex that LoadBlockIndexGuts also needs updating
+      Test Sapling value pool accounting
+
+Jonathan "Duke" Leto (2):
+      Clarify in sendmany/z_sendmany rpc docs that amounts are not floating point
+      Fix another instance of incorrectly saying amount is double precision, and s/ZC/ZEC/
+
+Larry Ruane (4):
+      sapling z_sendmany default memo 0xf6 + zeros
+      update bug in wallet_listreceived.py, now it highlights the fix
+      don't ban peers when loading pre-sapling (and pre-blossom) blocks
+      remove non-ascii characters from help text
+
+Simon Liu (14):
+      Add test to verify final sapling root in block header is updated.
+      Closes #3467. Add benchmarks for Sapling spends and outputs.
+      Closes #3616.  Document revoked key error when upgrading on Debian.
+      Closes #3329. Send alert to put non-Sapling nodes into safe mode.
+      Closes #3597. TransactionBuilder checks tx version before adding Sapling spends and outputs.
+      Closes #3671 to make "sapling" the default for z_getnewaddress RPC.
+      Update rpc_wallet_tests for new "sapling" default for z_getnewaddress.
+      Update qa tests for new "sapling" default for z_getnewaddress.
+      Add support for "notfound" message to mininode.
+      For ZEC-013. Mitigate potential tx expiry height related DoS vector.
+      For ZEC-013. Don't propagate txs which are expiring soon in p2p messages.
+      For ZEC-013. RPC createrawtransaction returns error if tx expiring soon.
+      For ZEC-013. Update qa tests broken by expiring soon threshold.
+      For ZEC-013. RPC sendrawtransaction returns error if tx expiring soon.
+
+Suhas Daftuar (2):
+      Do not inv old or missing blocks when pruning
+      Enable block relay when pruning
+
+arielgabizon (2):
+      add test for sapling spend with transparent recipient
+      rename HaveJoinSplitRequirements for Sapling
+
+mdr0id (5):
+      make-release.py: Versioning changes for 2.0.2-rc1.
+      make-release.py: Updated manpages for 2.0.2-rc1.
+      make-release.py: Updated release notes and changelog for 2.0.2-rc1.
+      make-release.py: Versioning changes for 2.0.2.
+      make-release.py: Updated manpages for 2.0.2.
+
+tpantin (1):
+      Updating copyright year from 2017 to 2018
+
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -18,7 +18,7 @@
 #define CLIENT_VERSION_MAJOR 2
 #define CLIENT_VERSION_MINOR 0
 #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 = 431247;
+static const int APPROX_RELEASE_HEIGHT = 438196;
 static const int WEEKS_UNTIL_DEPRECATION = 16;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);
 

diff --git a/zcutil/release-notes.py b/zcutil/release-notes.py
@@ -23,6 +23,8 @@
     'Simon': 'Simon Liu',
     'bitcartel': 'Simon Liu',
     'EthanHeilman': 'Ethan Heilman',
+    'arielgabizon' : 'Ariel Gabizon',
+    'Charlie OKeefe' : 'Charlie O\'Keefe',
 }
 
 def apply_author_aliases(name):