From fe0507761a5bd1c35dbc657c6f9ed7f553e55662 Mon Sep 17 00:00:00 2001 From: mdr0id Date: Mon, 11 Feb 2019 09:04:13 -0800 Subject: [PATCH 1/4] Update nMinimumChainWork with information from the getblockchaininfo RPC --- src/chainparams.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 32aca7718..1303e6681 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -108,7 +108,7 @@ public: consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 419200; // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000006f31c0e1f30221"); + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000a95cc5099213e3"); /** * The message start string should be awesome! ⓩ❤ From 81fbf49883ebb5cf66db5cbb678a52f532d18eef Mon Sep 17 00:00:00 2001 From: mdr0id Date: Mon, 11 Feb 2019 09:05:39 -0800 Subject: [PATCH 2/4] make-release.py: Versioning changes for 2.0.3. --- README.md | 2 +- configure.ac | 2 +- contrib/gitian-descriptors/gitian-linux.yml | 2 +- src/clientversion.h | 2 +- src/deprecation.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c065ded7a..8d5118a73 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Zcash 2.0.3-rc1 +Zcash 2.0.3 =========== diff --git a/configure.ac b/configure.ac index bce803725..e6a9ea3f3 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, 3) -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/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index 3ed2b54e3..df664e097 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zcash-2.0.3-rc1" +name: "zcash-2.0.3" enable_cache: true distro: "debian" suites: diff --git a/src/clientversion.h b/src/clientversion.h index 7f89c78e2..421fab61a 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 3 -#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 index c75cecc2a..5605d4e8e 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 = 476063; +static const int APPROX_RELEASE_HEIGHT = 480623; static const int WEEKS_UNTIL_DEPRECATION = 16; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24); From b22a364a2a0f578f4a239549375eef957b7fab24 Mon Sep 17 00:00:00 2001 From: mdr0id Date: Mon, 11 Feb 2019 09:16:09 -0800 Subject: [PATCH 3/4] make-release.py: Updated manpages for 2.0.3. --- doc/man/zcash-cli.1 | 6 +++--- doc/man/zcash-tx.1 | 6 +++--- doc/man/zcashd.1 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/man/zcash-cli.1 b/doc/man/zcash-cli.1 index 74b308ded..9c5bceeea 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" "February 2019" "zcash-cli v2.0.3-rc1" "User Commands" +.TH ZCASH-CLI "1" "February 2019" "zcash-cli v2.0.3" "User Commands" .SH NAME -zcash-cli \- manual page for zcash-cli v2.0.3-rc1 +zcash-cli \- manual page for zcash-cli v2.0.3 .SH DESCRIPTION -Zcash RPC client version v2.0.3\-rc1 +Zcash RPC client version v2.0.3 .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 e0da5e975..41685816c 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" "February 2019" "zcash-tx v2.0.3-rc1" "User Commands" +.TH ZCASH-TX "1" "February 2019" "zcash-tx v2.0.3" "User Commands" .SH NAME -zcash-tx \- manual page for zcash-tx v2.0.3-rc1 +zcash-tx \- manual page for zcash-tx v2.0.3 .SH DESCRIPTION -Zcash zcash\-tx utility version v2.0.3\-rc1 +Zcash zcash\-tx utility version v2.0.3 .SS "Usage:" .TP zcash\-tx [options] [commands] diff --git a/doc/man/zcashd.1 b/doc/man/zcashd.1 index e5ac75336..5cb050784 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" "February 2019" "zcashd v2.0.3-rc1" "User Commands" +.TH ZCASHD "1" "February 2019" "zcashd v2.0.3" "User Commands" .SH NAME -zcashd \- manual page for zcashd v2.0.3-rc1 +zcashd \- manual page for zcashd v2.0.3 .SH DESCRIPTION -Zcash Daemon version v2.0.3\-rc1 +Zcash Daemon version v2.0.3 .PP In order to ensure you are adequately protecting your privacy when using Zcash, please see . From f4fe8542c7578c7c9d661c8327c2b451b499fd84 Mon Sep 17 00:00:00 2001 From: mdr0id Date: Mon, 11 Feb 2019 09:16:09 -0800 Subject: [PATCH 4/4] make-release.py: Updated release notes and changelog for 2.0.3. --- contrib/debian/changelog | 6 +++ doc/authors.md | 22 ++++----- doc/release-notes/release-notes-2.0.3.md | 61 ++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 11 deletions(-) create mode 100644 doc/release-notes/release-notes-2.0.3.md diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 18fcfa98d..2ae1ca700 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zcash (2.0.3) stable; urgency=medium + + * 2.0.3 release. + + -- Zcash Company Mon, 11 Feb 2019 09:16:09 -0800 + zcash (2.0.3~rc1) stable; urgency=medium * 2.0.3-rc1 release. diff --git a/doc/authors.md b/doc/authors.md index 989b35b98..d12f0b2ec 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,22 +1,22 @@ Zcash Contributors ================== -Jack Grigg (850) +Jack Grigg (855) Simon Liu (434) -Sean Bowe (264) +Sean Bowe (265) Daira Hopwood (110) Jay Graber (89) +Eirik Ogilvie-Wigley (88) Wladimir J. van der Laan (81) -Eirik Ogilvie-Wigley (77) Taylor Hornby (65) Jonas Schnelli (58) Nathan Wilcox (56) -Pieter Wuille (50) +Pieter Wuille (53) Kevin Gallagher (38) Cory Fields (35) +mdr0id (22) +Larry Ruane (16) syd (15) -mdr0id (15) -Larry Ruane (15) Matt Corallo (13) Jonathan "Duke" Leto (12) Paige Peterson (10) @@ -34,6 +34,8 @@ Suhas Daftuar (5) Pavel Janík (5) Karl-Johan Alm (5) Johnathan Corgan (5) +Charlie O'Keefe (5) +Alex Morcos (5) WO (4) Philip Kaufmann (4) Peter Todd (4) @@ -41,9 +43,10 @@ Patrick Strateman (4) Marius Kjærstad (4) João Barbosa (4) Jorge Timón (4) +George Tankersley (4) Duke Leto (4) -Charlie O'Keefe (4) lpescher (3) +ca333 (3) Per Grön (3) Patick Strateman (3) Jason Davies (3) @@ -56,7 +59,6 @@ rofl0r (2) paveljanik (2) mruddy (2) kpcyrd (2) -ca333 (2) aniemerg (2) UdjinM6 (2) Scott (2) @@ -69,13 +71,12 @@ Kaz Wesley (2) Joe Turgeon (2) Jack Gavigan (2) ITH4Coinomia (2) -George Tankersley (2) Gavin Andresen (2) Gareth Davies (2) +Dimitris Apostolou (2) Brad Miller (2) Bjorn Hjortsberg (2) Amgad Abdelhafez (2) -Alex Morcos (2) zathras-crypto (1) unsystemizer (1) tpantin (1) @@ -124,7 +125,6 @@ Forrest Voight (1) Florian Schmaus (1) Ethan Heilman (1) Eran Tromer (1) -Dimitris Apostolou (1) David Llop (1) Christian von Roques (1) Chirag Davé (1) diff --git a/doc/release-notes/release-notes-2.0.3.md b/doc/release-notes/release-notes-2.0.3.md new file mode 100644 index 000000000..9b59be0e3 --- /dev/null +++ b/doc/release-notes/release-notes-2.0.3.md @@ -0,0 +1,61 @@ +Changelog +========= + +Alex Morcos (3): + ModifyNewCoins saves database lookups + Make CCoinsViewTest behave like CCoinsViewDB + Add unit test for UpdateCoins + +Charlie O'Keefe (1): + initialize pCurrentParams in TransactionBuilder tests + +Dimitris Apostolou (1): + Update zmq to 4.3.1 + +Eirik Ogilvie-Wigley (11): + Remove --disable-libs flag from help output + Update z_mergetoaddress documentation + flake8 cleanup + Move common code to helper + Make variables local + Check entire contents of mempool + fail test if pong is not received + Extract helper methods + Strategically sync to prevent intermittent failures + Return more information when building a transaction fails + throw an exception rather than returning false when building invalid transactions + +George Tankersley (2): + zmq: add flag to publish all checked blocks + zmq: remove extraneous space from zmq_sub.py + +Jack Grigg (5): + Remove the testing of duplicate coinbase transactions + wallet: Skip transactions with no shielded data in CWallet::SetBestChain() + Use nullptr instead of NULL in wallet tests + Add Sapling test cases + Set Sprout note data in WalletTest.WriteWitnessCache + +Larry Ruane (1): + wait for miner threads to exit (join them) + +Pieter Wuille (3): + Make sigcache faster and more efficient + Evict sigcache entries that are seen in a block + Don't wipe the sigcache in TestBlockValidity + +Sean Bowe (1): + Allow user to ask server to save the Sprout R1CS out during startup. + +ca333 (1): + update libsodium dl-path + +mdr0id (7): + Make pythonisms consistent + make-release.py: Versioning changes for 2.0.3-rc1. + make-release.py: Updated manpages for 2.0.3-rc1. + make-release.py: Updated release notes and changelog for 2.0.3-rc1. + Update nMinimumChainWork with information from the getblockchaininfo RPC + make-release.py: Versioning changes for 2.0.3. + make-release.py: Updated manpages for 2.0.3. +