diff --git a/README.md b/README.md index 5fcb48e7e..91a12fbad 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 2.0.7 +Zcash 2.0.7-1 =========== diff --git a/configure.ac b/configure.ac index 90dd4e445..1be5bd991 100644 --- 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, 7) -define(_CLIENT_VERSION_BUILD, 50) +define(_CLIENT_VERSION_BUILD, 51) 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 index fda422551..89ca5da08 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (2.0.7+1) stable; urgency=medium + + * 2.0.7-1 release. + + -- Electric Coin Company Thu, 29 Aug 2019 13:07:52 -0600 + zcash (2.0.7) stable; urgency=medium * 2.0.7 release. diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 335365667..b1f39c959 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-2.0.7" +name: "zcash-2.0.7-1" enable_cache: true distro: "debian" suites: diff --git a/doc/authors.md b/doc/authors.md index 68291ff73..603ac10cd 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -4,8 +4,8 @@ Zcash Contributors Jack Grigg (874) Simon Liu (459) Sean Bowe (278) -Eirik Ogilvie-Wigley (160) -Daira Hopwood (135) +Eirik Ogilvie-Wigley (166) +Daira Hopwood (136) Jay Graber (89) Wladimir J. van der Laan (82) Taylor Hornby (73) @@ -14,7 +14,7 @@ Nathan Wilcox (56) Pieter Wuille (54) Kevin Gallagher (38) Cory Fields (35) -Larry Ruane (29) +Larry Ruane (31) Marshall Gaucher (22) Jonathan "Duke" Leto (17) syd (15) @@ -76,6 +76,7 @@ Gavin Andresen (2) Brad Miller (2) Bjorn Hjortsberg (2) Amgad Abdelhafez (2) +Alex Tsankov (2) zathras-crypto (1) unsystemizer (1) tpantin (1) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 777624816..2a63f8f52 100644 --- 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" "August 2019" "zcash-cli v2.0.7" "User Commands" +.TH ZCASH-CLI "1" "August 2019" "zcash-cli v2.0.7-1" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v2.0.7 +zcash-cli \- manual page for zcash-cli v2.0.7-1 .SH DESCRIPTION -Zcash RPC client version v2.0.7 +Zcash RPC client version v2.0.7\-1 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . diff --git a/doc/man/zcash-tx.1 b/doc/man/zcash-tx.1 index 16df92b2f..039858dd4 100644 --- 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" "August 2019" "zcash-tx v2.0.7" "User Commands" +.TH ZCASH-TX "1" "August 2019" "zcash-tx v2.0.7-1" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v2.0.7 +zcash-tx \- manual page for zcash-tx v2.0.7-1 .SH DESCRIPTION -Zcash zcash\-tx utility version v2.0.7 +Zcash zcash\-tx utility version v2.0.7\-1 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index b0c77f3c5..4e52e251a 100644 --- 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" "August 2019" "zcashd v2.0.7" "User Commands" +.TH ZCASHD "1" "August 2019" "zcashd v2.0.7-1" "User Commands" .SH NAME -zcashd \- manual page for zcashd v2.0.7 +zcashd \- manual page for zcashd v2.0.7-1 .SH DESCRIPTION -Zcash Daemon version v2.0.7 +Zcash Daemon version v2.0.7\-1 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . diff --git a/doc/release-notes.md b/doc/release-notes.md index f65b98552..a29094b51 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -4,15 +4,3 @@ release-notes at release time) Notable changes =============== -Testnet Blossom Rewind ----------------------- -Testnet users needed to upgrade to 2.0.7 before Blossom activated. The amount -of notice given to these users was brief, so many were not able to upgrade in -time. These users may now be on the wrong branch. v2.0.7-1 adds an "intended -rewind" to prevent having to manually reindex when reconnecting to the correct -chain. - - -Insight Explorer Logging Fix ----------------------------- -Fixed an issue where `ERROR: spent index not enabled` would be logged unnecessarily. diff --git a/doc/release-notes/release-notes-2.0.7-1.md b/doc/release-notes/release-notes-2.0.7-1.md new file mode 100644 index 000000000..997d4b9f4 --- /dev/null +++ b/doc/release-notes/release-notes-2.0.7-1.md @@ -0,0 +1,38 @@ +Notable changes +=============== + +Testnet Blossom Rewind +---------------------- +Testnet users needed to upgrade to 2.0.7 before Blossom activated. The amount +of notice given to these users was brief, so many were not able to upgrade in +time. These users may now be on the wrong branch. v2.0.7-1 adds an "intended +rewind" to prevent having to manually reindex when reconnecting to the correct +chain. + + +Insight Explorer Logging Fix +---------------------------- +Fixed an issue where `ERROR: spent index not enabled` would be logged unnecessarily. + +Changelog +========= + +Alex Tsankov (2): + Update INSTALL + Typo Fix + +Daira Hopwood (1): + Add intended rewind for Blossom on testnet. + +Eirik Ogilvie-Wigley (6): + Notable changes for v2.0.7-1 + fix typo + Add note about logging fix + Better wording in release notes + make-release.py: Versioning changes for 2.0.7-1. + make-release.py: Updated manpages for 2.0.7-1. + +Larry Ruane (2): + #4114 don't call error() from GetSpentIndex() + better fix: make GetSpentIndex() consistent with others... + diff --git a/src/clientversion.h b/src/clientversion.h index 0c5e47fd8..dc8353834 100644 --- 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 7 -#define CLIENT_VERSION_BUILD 50 +#define CLIENT_VERSION_BUILD 51 //! 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 index 10bb3195d..53089969e 100644 --- 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 = 588500; +static const int APPROX_RELEASE_HEIGHT = 594500; static const int WEEKS_UNTIL_DEPRECATION = 16; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);