Auto merge of zcash#2627 - str4d:release-v1.0.12-rc1, r=str4d

Release v1.0.12-rc1

README.md

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

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, 0)
-define(_CLIENT_VERSION_REVISION, 11)
-define(_CLIENT_VERSION_BUILD, 50)
+define(_CLIENT_VERSION_REVISION, 12)
+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)

contrib/debian/changelog

@@ -1,3 +1,9 @@
+zcash (1.0.12~rc1) stable; urgency=medium
+
+  * 1.0.12-rc1 release.
+
+ -- Zcash Company <[email protected]>  Sat, 23 Sep 2017 10:51:36 +0100
+
 zcash (1.0.11) stable; urgency=medium
 
   * 1.0.11 release.

contrib/gitian-descriptors/gitian-linux.yml

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

doc/authors.md

@@ -1,13 +1,13 @@
 Zcash Contributors
 ==================
 
-Jack Grigg (445)
-Simon Liu (269)
+Jack Grigg (465)
+Simon Liu (272)
 Sean Bowe (188)
 Daira Hopwood (102)
 Taylor Hornby (65)
 Wladimir J. van der Laan (61)
-Nathan Wilcox (51)
+Nathan Wilcox (56)
 Jay Graber (49)
 Jonas Schnelli (48)
 Kevin Gallagher (38)
@@ -30,9 +30,11 @@ Daniel Cousens (4)
 lpescher (3)
 kozyilmaz (3)
 Pavel Janík (3)
+Ariel Gabizon (3)
 Alfie John (3)
 str4d (2)
 paveljanik (2)
+kpcyrd (2)
 aniemerg (2)
 Scott (2)
 Robert C. Seacord (2)
@@ -42,7 +44,7 @@ Joe Turgeon (2)
 Jack Gavigan (2)
 ITH4Coinomia (2)
 Gavin Andresen (2)
-Ariel Gabizon (2)
+Bjorn Hjortsberg (2)
 Amgad Abdelhafez (2)
 zathras-crypto (1)
 unsystemizer (1)
@@ -59,6 +61,7 @@ ayleph (1)
 Tom Ritter (1)
 Stephen (1)
 S. Matthew English (1)
+Ross Nicoll (1)
 Pavel Vasin (1)
 Paul Georgiou (1)
 Paragon Initiative Enterprises, LLC (1)
@@ -71,6 +74,7 @@ Lars-Magnus Skog (1)
 Kevin Pan (1)
 Jorge Timón (1)
 Jeffrey Walton (1)
+Jason Davies (1)
 Ian Kelling (1)
 Gaurav Rana (1)
 Forrest Voight (1)
@@ -86,6 +90,7 @@ Bryan Stitt (1)
 Boris Hajduk (1)
 Bob McElrath (1)
 Bitcoin Error Log (1)
+Ariel (1)
 Allan Niemerg (1)
 Alex van der Peet (1)
 Alex (1)

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" "August 2017" "zcash-cli v1.0.11" "User Commands"
+.TH ZCASH-CLI "1" "September 2017" "zcash-cli v1.0.12-rc1" "User Commands"
 .SH NAME
-zcash-cli \- manual page for zcash-cli v1.0.11
+zcash-cli \- manual page for zcash-cli v1.0.12-rc1
 .SH DESCRIPTION
-Zcash RPC client version v1.0.11
+Zcash RPC client version v1.0.12\-rc1
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/index.html>.

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" "August 2017" "zcash-tx v1.0.11" "User Commands"
+.TH ZCASH-TX "1" "September 2017" "zcash-tx v1.0.12-rc1" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v1.0.11
+zcash-tx \- manual page for zcash-tx v1.0.12-rc1
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v1.0.11
+Zcash zcash\-tx utility version v1.0.12\-rc1
 .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.47.3.
-.TH ZCASHD "1" "August 2017" "zcashd v1.0.11" "User Commands"
+.TH ZCASHD "1" "September 2017" "zcashd v1.0.12-rc1" "User Commands"
 .SH NAME
-zcashd \- manual page for zcashd v1.0.11
+zcashd \- manual page for zcashd v1.0.12-rc1
 .SH DESCRIPTION
-Zcash Daemon version v1.0.11
+Zcash Daemon version v1.0.12\-rc1
 .PP
 In order to ensure you are adequately protecting your privacy when using Zcash,
 please see <https://z.cash/support/security/index.html>.
@@ -54,7 +54,7 @@ Specify data directory
 \fB\-disabledeprecation=\fR<version>
 .IP
 Disable block\-height node deprecation and automatic shutdown (example:
-\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.11)
+\fB\-disabledeprecation\fR=\fI\,1\/\fR.0.12\-rc1)
 .HP
 \fB\-exportdir=\fR<dir>
 .IP
@@ -241,11 +241,11 @@ Set key pool size to <n> (default: 100)
 .HP
 \fB\-paytxfee=\fR<amt>
 .IP
-Fee (in BTC/kB) to add to transactions you send (default: 0.00)
+Fee (in ZEC/kB) to add to transactions you send (default: 0.00)
 .HP
 \fB\-rescan\fR
 .IP
-Rescan the blockchain for missing wallet transactions on startup
+Rescan the block chain for missing wallet transactions on startup
 .HP
 \fB\-salvagewallet\fR
 .IP
@@ -266,8 +266,8 @@ confirmation on average within n blocks (default: 2)
 .HP
 \fB\-maxtxfee=\fR<amt>
 .IP
-Maximum total fees to use in a single wallet transaction; setting this
-too low may abort large transactions (default: 0.10)
+Maximum total fees (in ZEC) to use in a single wallet transaction;
+setting this too low may abort large transactions (default: 0.10)
 .HP
 \fB\-upgradewallet\fR
 .IP
@@ -339,7 +339,7 @@ Prepend debug output with timestamp (default: 1)
 .HP
 \fB\-minrelaytxfee=\fR<amt>
 .IP
-Fees (in BTC/Kb) smaller than this are considered zero fee for relaying
+Fees (in ZEC/kB) smaller than this are considered zero fee for relaying
 (default: 0.000001)
 .HP
 \fB\-printtoconsole\fR

doc/release-notes/release-notes-1.0.12-rc1.md

@@ -0,0 +1,57 @@
+Changelog
+=========
+
+Ariel (1):
+      add examples to z_getoperationresult
+
+Ariel Gabizon (1):
+      add load-wallet benchmark
+
+Bjorn Hjortsberg (2):
+      Do not warn on built in declaration mismatch
+      Remove deprecated exception specification
+
+Jack Grigg (20):
+      ci-workers: Enable pipelining, and use root to set admin and host details
+      Variable overrides for Arch Linux
+      Rationalize currency unit to "ZEC"
+      ci-workers: Fail if Python is not version 2.7
+      ci-workers: Variable overrides and process tweaks for CentOS 7
+      Add build progress to the release script if progressbar module is available
+      Add hotfix support to release script
+      Document the hotfix release process
+      Enforce sequential hotfix versioning
+      Benchmark time to call sendtoaddress with many UTXOs
+      Fix bug in benchmark data generation script
+      Adjust instructions for UTXO dataset creation
+      Add GitHub release notes to release process
+      Clarify branching and force-building operations in hotfix process
+      Update user guide translations as part of release process
+      make-release.py: Send stderr to stdout
+      List dependencies for release script in release process doc
+      Additional test cases for importprivkey RPC test
+      make-release.py: Versioning changes for 1.0.12-rc1.
+      make-release.py: Updated manpages for 1.0.12-rc1.
+
+Jason Davies (1):
+      Fix deprecation policy comment.
+
+Nathan Wilcox (5):
+      key_import_export rpc-test: verify that UTXO view co-evolves for nodes sharing a key.
+      Add a new rpc-test-specified requirement: `importprivkey` outputs the associated address. (Test fails.)
+      [tests pass] Output address on new key import.
+      Add a new requirement that `importprivkey` API is idempotent.
+      [tests pass] Ensure `importprivkey` outputs the address in case key is already imported.
+
+Ross Nicoll (1):
+      Rationalize currency unit to "BTC"
+
+Simon Liu (3):
+      Closes #2583. Exclude watch-only utxos from z_sendmany coin selection.
+      Set up a clean chain.     Delete redundant method wait_until_miner_sees() via use of sync_all().
+      Implement RPC shield_coinbase #2448.
+
+kpcyrd (2):
+      Fetch params from ipfs if possible
+      Prefer wget over ipfs
+

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 0
-#define CLIENT_VERSION_REVISION 11
-#define CLIENT_VERSION_BUILD 50
+#define CLIENT_VERSION_REVISION 12
+#define CLIENT_VERSION_BUILD 25
 
 //! 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 18 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 = 167200;
+static const int APPROX_RELEASE_HEIGHT = 189600;
 static const int WEEKS_UNTIL_DEPRECATION = 18;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);