Auto merge of #3472 - bitcartel:release-v2.0.0, r=ebfull

Release v2.0.0

README.md

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

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
 define(_CLIENT_VERSION_MINOR, 0)
 define(_CLIENT_VERSION_REVISION, 0)
-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)

contrib/debian/changelog

@@ -1,3 +1,9 @@
+zcash (2.0.0) stable; urgency=medium
+
+  * 2.0.0 release.
+
+ -- Zcash Company <team@z.cash>  Wed, 15 Aug 2018 17:57:50 -0700
+
 zcash (2.0.0~rc1) stable; urgency=medium
 
   * 2.0.0-rc1 release.

contrib/gitian-descriptors/gitian-linux.yml

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

doc/authors.md

@@ -1,41 +1,43 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (719)
+Jack Grigg (760)
-Simon Liu (341)
+Simon Liu (352)
-Sean Bowe (242)
+Sean Bowe (263)
-Daira Hopwood (109)
+Daira Hopwood (110)
-Wladimir J. van der Laan (79)
+Jay Graber (84)
-Jay Graber (71)
+Wladimir J. van der Laan (81)
 Taylor Hornby (65)
 Nathan Wilcox (56)
-Jonas Schnelli (53)
+Jonas Schnelli (55)
 Pieter Wuille (50)
 Kevin Gallagher (38)
-Cory Fields (34)
+Eirik Ogilvie-Wigley (36)
+Cory Fields (35)
 syd (15)
 Matt Corallo (13)
-Eirik Ogilvie-Wigley (12)
 Paige Peterson (10)
 MarcoFalke (10)
 nomnombtc (9)
 Jonathan "Duke" Leto (9)
+kozyilmaz (8)
 fanquake (8)
-kozyilmaz (7)
 Jeff Garzik (7)
+Gregory Maxwell (7)
+Ariel Gabizon (7)
 Luke Dashjr (6)
-Ariel Gabizon (6)
+Larry Ruane (6)
+Daniel Cousens (6)
 Pavel Janík (5)
 Karl-Johan Alm (5)
 Johnathan Corgan (5)
-Gregory Maxwell (5)
 Philip Kaufmann (4)
 Peter Todd (4)
 Patrick Strateman (4)
 João Barbosa (4)
 Jorge Timón (4)
+Duke Leto (4)
 David Mercer (4)
-Daniel Cousens (4)
 lpescher (3)
 Suhas Daftuar (3)
 Per Grön (3)
@@ -55,10 +57,11 @@ aniemerg (2)
 UdjinM6 (2)
 Scott (2)
 Robert C. Seacord (2)
+Pejvan (2)
 Pavol Rusnak (2)
 Pavel Vasin (2)
 Matthew King (2)
-Larry Ruane (2)
+Kaz Wesley (2)
 Joe Turgeon (2)
 Jack Gavigan (2)
 ITH4Coinomia (2)
@@ -66,10 +69,12 @@ Gavin Andresen (2)
 Brad Miller (2)
 Bjorn Hjortsberg (2)
 Amgad Abdelhafez (2)
+Alex Morcos (2)
 zathras-crypto (1)
 unsystemizer (1)
 practicalswift (1)
 mrbandrews (1)
+mdr0id (1)
 kazcw (1)
 jc (1)
 isle2983 (1)
@@ -84,6 +89,7 @@ Tom Harding (1)
 Stephen (1)
 S. Matthew English (1)
 Ross Nicoll (1)
+Richard Littauer (1)
 René Nyffenegger (1)
 R E Broadley (1)
 Puru (1)
@@ -103,7 +109,6 @@ Leo Arias (1)
 Lauda (1)
 Lars-Magnus Skog (1)
 Kevin Pan (1)
-Kaz Wesley (1)
 Jonas Nick (1)
 Jeremy Rubin (1)
 Jeffrey Walton (1)
@@ -113,10 +118,11 @@ Forrest Voight (1)
 Florian Schmaus (1)
 Ethan Heilman (1)
 Eran Tromer (1)
-Duke Leto (1)
+Dimitris Apostolou (1)
 David Llop (1)
 Christian von Roques (1)
 Chirag Davé (1)
+Charlie OKeefe (1)
 Charlie O'Keefe (1)
 Casey Rodarmor (1)
 Cameron Boehmer (1)
@@ -129,7 +135,6 @@ Ashley Holman (1)
 Anthony Towns (1)
 Allan Niemerg (1)
 Alex van der Peet (1)
-Alex Morcos (1)
 Alex (1)
 Adam Weiss (1)
 Adam Brown (1)

doc/man/zcash-cli.1

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

doc/man/zcash-tx.1

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

doc/man/zcashd.1

@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.46.4.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH ZCASHD "1" "August 2018" "zcashd v2.0.0-rc1" "User Commands"
+.TH ZCASHD "1" "August 2018" "zcashd v2.0.0" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v2.0.0-rc1
+zcashd \- manual page for zcashd v2.0.0
 .SH DESCRIPTION
-Zcash Daemon version v2.0.0\-rc1
+Zcash Daemon version v2.0.0
 .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\-8\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>

doc/release-notes.md

@@ -4,14 +4,3 @@ release-notes at release time)
 Notable changes
 ===============
 
-Sapling network upgrade
------------------------
-
-The activation height for the Sapling network upgrade on mainnet is included
-in this release. Sapling will activate on mainnet at height 419200, which is
-expected to be mined on the 28th of October 2018. Please upgrade to this release,
-or any subsequent release, in order to follow the Sapling network upgrade.
-
-The testnet is being rolled back in this release to Overwinter. Sapling will
-activate on testnet at height 280000. Please update your testnet nodes before
-then.

doc/release-notes/release-notes-2.0.0.md

@@ -0,0 +1,199 @@
+Notable changes
+===============
+
+Sapling network upgrade
+-----------------------
+
+The activation height for the Sapling network upgrade on mainnet is included
+in this release. Sapling will activate on mainnet at height 419200, which is
+expected to be mined on the 28th of October 2018. Please upgrade to this release,
+or any subsequent release, in order to follow the Sapling network upgrade.
+
+The testnet is being rolled back in this release to Overwinter. Sapling will
+activate on testnet at height 280000. Please update your testnet nodes before
+then.
+
+Changelog
+=========
+
+Alex Morcos (1):
+      Output line to debug.log when IsInitialBlockDownload latches to false
+
+Ariel Gabizon (1):
+      Extend Joinsplit tests to Groth
+
+Charlie OKeefe (1):
+      Remove extra slash from lockfile path
+
+Cory Fields (1):
+      crypter: shuffle Makefile so that crypto can be used by the wallet
+
+Daira Hopwood (1):
+      Support testnet rollback.
+
+Daniel Cousens (2):
+      move rpc* to rpc/
+      rpc: update inline comments to refer to new file paths
+
+Dimitris Apostolou (1):
+      Fix typos
+
+Duke Leto (3):
+      Fix absurd fee bug reported in #3281, with tests
+      Update comment as per @arielgabizon
+      Improve error message
+
+Eirik Ogilvie-Wigley (24):
+      Add more options when asserting in RPC tests
+      Add change indicator for notes
+      Fix test broken by change indicator
+      Rename note data to include sprout
+      Remove redundant curly braces
+      Consolidate for loops
+      Add out point for sapling note data
+      Add sapling note data and map
+      Decrement sapling note witnesses
+      Clear sapling witness cache
+      Extract method for copying previous witnesses
+      Extract methods for incrementing witnesses
+      Extract method for incrementing witness heights
+      Pass sapling merkle tree when incrementing witnesses
+      Increment sapling note witnesses
+      Rename sprout specific methods
+      Remove extra indentation
+      Add getter and setter for sapling note data and update tests
+      Add parameter for version in GetValidReceive
+      Rename Merkle Trees to include sprout or sapling
+      Rename Witnesses to include sprout or sapling
+      Rename test objects to include sprout or sapling
+      Only include the change field if we have a spending key
+      Fix assertion and comment
+
+Gregory Maxwell (2):
+      IBD check uses minimumchain work instead of checkpoints.
+      IsInitialBlockDownload no longer uses header-only timestamps.
+
+Jack Grigg (41):
+      Add some more checkpoints, up to the 1.1.0 release
+      Add Sapling support to z_validateaddress
+      Update payment-api.md with type field of z_validateaddress
+      Alter SaplingNote::nullifier() to take a SaplingFullViewingKey
+      Expose note position in IncrementalMerkleWitness
+      TransactionBuilder with support for creating Sapling-only transactions
+      TransactionBuilder: Check that all anchors in a transaction are identical
+      Formatting
+      test: Move ECC_Start() call into src/gtest/main.cpp
+      TransactionBuilder: Add support for transparent inputs and outputs
+      TransactionBuilder: Add change output to transaction
+      TransactionBuilder: Make fee configurable
+      Rename xsk to expsk
+      Implement CKeyStore::GetSaplingPaymentAddresses()
+      Raise the 90-character limit on Bech32 encodings
+      Add Sapling support to z_getnewaddress and z_listaddresses
+      Fix block hash for checkpoint at height 270000
+      Formatting
+      test: Deduplicate logic in wallet_addresses RPC test
+      test: Another assert in wallet_zkeys_tests.store_and_load_sapling_zkeys
+      test: Fix permissions of wallet_addresses
+      test: Update rpc_wallet_z_importexport to account for Sapling changes
+      Rename DecryptSpendingKey -> DecryptSproutSpendingKey
+      Rename CryptedSpendingKeyMap -> CryptedSproutSpendingKeyMap
+      Add Sapling decryption check to CCryptoKeyStore::Unlock()
+      Check for unencrypted Sapling keys in CCryptoKeyStore::SetCrypted()
+      Remove outdated comment
+      Add CWallet::AddCryptedSaplingSpendingKey() hook
+      Pass SaplingPaymentAddress to store through the CKeyStore
+      Rename SpendingKeyMap -> SproutSpendingKeyMap
+      Rename Serialized*Size -> SerializedSprout*Size
+      Rename *ViewingKey* -> *SproutViewingKey*
+      Formatting nits
+      Rename *SpendingKey -> *SproutSpendingKey
+      chainparams: Add BIP 44 coin type (as registered in SLIP 44)
+      Upgrade Rust to 1.28.0 stable
+      Adjust Makefile so that common can be used by the wallet
+      Move RewindBlockIndex log message inside rewindLength check
+      test: gtest for Sapling encoding and decoding
+      test: Use regtest in key_tests/zs_address_test
+      Disable Sapling features on mainnet
+
+Jay Graber (13):
+      Add Sapling Add/Have/Get to keystore
+      Add SaplingIncomingViewingKeys map, SaplingFullViewingKey methods
+      Add StoreAndRetrieveSaplingSpendingKey test
+      Change default_address to return SaplingPaymentAddr and not boost::optional
+      Add crypted keystore sapling add key
+      Discard sk if ivk == 0
+      Add Sapling support to z_exportkey
+      Add Sapling support to z_importkey
+      Add Sapling to rpc_wallet_z_importexport test
+      Refactor into visitors and throw errors for invalid key or address.
+      Take expiryheight as param to createrawtransaction
+      Add Sapling have/get sk crypter overrides
+      Add Sapling keys to CCryptoKeyStore::EncryptKeys
+
+Jonas Schnelli (2):
+      [RPC, Wallet] Move RPC dispatch table registration to wallet/ code
+      Fix test_bitcoin circular dependency issue
+
+Kaz Wesley (1):
+      IsInitialBlockDownload: usually avoid locking
+
+Larry Ruane (4):
+      Disable libsnark debug logging in Boost tests
+      add extra help how to enable experimental features
+      Add call to sync_all() after (z_sendmany, wait)
+      don't ban peers when loading pre-overwinter blocks
+
+Pejvan (2):
+      Update README.md
+      Update README.md
+
+Richard Littauer (1):
+      docs(LICENSE): update license year to 2018
+
+Sean Bowe (21):
+      Update librustzcash
+      Implementation of Sapling in-band secret distribution.
+      Swap types in OutputDescription to use new NoteEncryption interfaces.
+      Prevent nonce reuse in Sapling note encryption API.
+      Add get_esk() function to Sapling note encryption.
+      Minor edits
+      Decryption and tests of note/outgoing encryption.
+      Update librustzcash and sapling-crypto.
+      Fix bug in return value.
+      Ensure sum of valueBalance and all vpub_new's does not exceed MAX_MONEY inside of CheckTransactionWithoutProofVerification.
+      Move `extern params` to beginning of `test_checktransaction`.
+      Relocate ECC_Start() to avoid test failures.
+      Don't call ECC_Start/ECC_Stop outside the test harness.
+      Make changes to gtest ECC behavior suggested by @str4d.
+      Check the hash of the (Sapling+) zk-SNARK parameters during initialization.
+      Switch to use the official Sapling parameters.
+      make-release.py: Versioning changes for 2.0.0-rc1.
+      make-release.py: Updated manpages for 2.0.0-rc1.
+      make-release.py: Updated release notes and changelog for 2.0.0-rc1.
+      Always write the empty root down as the best root, since we may roll back.
+      Sapling mainnet activation height
+
+Simon Liu (11):
+      Add encryption of SaplingNotePlaintext and SaplingOutgoingPlaintext classes.
+      Update and fix per review comments, the test for absurd fee.
+      Minor update to address nits in review.
+      Implement Sapling note decryption using full viewing key.
+      Rename AttemptSaplingEncDecryptionUsingFullViewingKey and use function overloading.
+      Only check for a valid Sapling anchor after Sapling activation.
+      Clean up for rebase: rename mapNoteData to mapSproutNoteData.
+      Clean up help messages for RPC createrawtransaction.
+      Add tests for expiryheight parameter of RPC createrawtransaction.
+      make-release.py: Versioning changes for 2.0.0.
+      make-release.py: Updated manpages for 2.0.0.
+
+Wladimir J. van der Laan (2):
+      Make max tip age an option instead of chainparam
+      rpc: Register calls where they are defined
+
+kozyilmaz (1):
+      Add -Wl,-pie linker option for macOS and use it instead of -pie
+
+mdr0id (1):
+      Fix minor references to auto-senescence in code
+

src/clientversion.h

@@ -18,7 +18,7 @@
 #define CLIENT_VERSION_MAJOR 2
 #define CLIENT_VERSION_MINOR 0
 #define CLIENT_VERSION_REVISION 0
-#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

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