diff --git a/README.md b/README.md index c736b4755..ddd0e52e2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Zel 4.0.5 +# Zel 5.0.0 [![Build Status](https://travis-ci.com/zelcash/zelcash.svg?branch=master)](https://travis-ci.com/zelcash/zelcash) diff --git a/contrib/debian/changelog b/contrib/debian/changelog index 11c922d98..471fbf6d1 100644 --- a/contrib/debian/changelog +++ b/contrib/debian/changelog @@ -1,3 +1,9 @@ +zelcash (5.0.0) stable; urgency=medium + + * 5.0.0 release. + + -- Zel Foundation Sat, 27 Mar 2021 11:19:58 +0800 + zelcash (4.0.5) stable; urgency=medium * 4.0.5 release. diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index d9fb27771..69339a6ec 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -1,5 +1,5 @@ --- -name: "zelcash-4.0.5" +name: "zelcash-5.0.0" enable_cache: true distro: "debian" suites: diff --git a/doc/authors.md b/doc/authors.md index 9e85b407a..5452067d5 100644 --- a/doc/authors.md +++ b/doc/authors.md @@ -1,8 +1,8 @@ Zel Contributors ================== -Jeremy "Blondfrogs" Anderson (59) -Tadeas Kmenta (31) +Jeremy "Blondfrogs" Anderson (70) +Tadeas Kmenta (42) Miles Manley (18) Cabecinha84 (5) Jack Grigg (4) diff --git a/doc/man/zelcash-cli.1 b/doc/man/zelcash-cli.1 index 7f178272a..cf0ff4133 100644 --- a/doc/man/zelcash-cli.1 +++ b/doc/man/zelcash-cli.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH ZELCASH-CLI "1" "December 2020" "zelcash-cli v4.0.5-e1608d2ea" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. +.TH ZELCASH-CLI "1" "March 2021" "zelcash-cli v5.0.0-eeb72452b" "User Commands" .SH NAME -zelcash-cli \- manual page for zelcash-cli v4.0.5-e1608d2ea +zelcash-cli \- manual page for zelcash-cli v5.0.0-eeb72452b .SH DESCRIPTION -Zelcash RPC client version v4.0.5\-e1608d2ea +Zelcash RPC client version v5.0.0\-eeb72452b .PP In order to ensure you are adequately protecting your privacy when using Zelcash, please see . diff --git a/doc/man/zelcash-tx.1 b/doc/man/zelcash-tx.1 index 402af86c1..b598a749c 100644 --- a/doc/man/zelcash-tx.1 +++ b/doc/man/zelcash-tx.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH ZELCASH-TX "1" "December 2020" "zelcash-tx v4.0.5-e1608d2ea" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. +.TH ZELCASH-TX "1" "March 2021" "zelcash-tx v5.0.0-eeb72452b" "User Commands" .SH NAME -zelcash-tx \- manual page for zelcash-tx v4.0.5-e1608d2ea +zelcash-tx \- manual page for zelcash-tx v5.0.0-eeb72452b .SH DESCRIPTION -Zelcash zelcash\-tx utility version v4.0.5\-e1608d2ea +Zelcash zelcash\-tx utility version v5.0.0\-eeb72452b .SS "Usage:" .TP zelcash\-tx [options] [commands] diff --git a/doc/man/zelcashd.1 b/doc/man/zelcashd.1 index 474e093a6..5c060f422 100644 --- a/doc/man/zelcashd.1 +++ b/doc/man/zelcashd.1 @@ -1,9 +1,9 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH ZELCASHD "1" "December 2020" "zelcashd v4.0.5-e1608d2ea" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. +.TH ZELCASHD "1" "March 2021" "zelcashd v5.0.0-eeb72452b" "User Commands" .SH NAME -zelcashd \- manual page for zelcashd v4.0.5-e1608d2ea +zelcashd \- manual page for zelcashd v5.0.0-eeb72452b .SH DESCRIPTION -Zelcash Daemon version v4.0.5\-e1608d2ea +Zelcash Daemon version v5.0.0\-eeb72452b .PP In order to ensure you are adequately protecting your privacy when using Zelcash, please see . diff --git a/doc/release-notes/release-notes-5.0.0.md b/doc/release-notes/release-notes-5.0.0.md new file mode 100644 index 000000000..24cf6637e --- /dev/null +++ b/doc/release-notes/release-notes-5.0.0.md @@ -0,0 +1,29 @@ +Changelog +========= + +Tadeas Kmenta (11): + add network upgrade info + consistent rename + fix upgrade tests + adjust dns seeeds + bump protocol version + remove space + adjust z_sendmany for flux upgrade + readjust for release script + make-release.py: Versioning changes for 5.0.0. + make-release.py: Updated manpages for 5.0.0. + Travis setup (#126) + +Jeremy "Blondfrogs" Anderson (11): + Remove T->Z, Add Exchange Fund, Add Swap Pool Fund + Add foundation fund + Add ability to change benchmarking key based on timestamp + Begin rename of node types + Add zelcash optional dir migration + Add new public key, and rpc call + Add new interval for ip address changes + Add flux creation addresses, and heights + Bump version 5.0.0 + Create new testnet that is easy to mine + Update rpc calls, change the requirments for spending zpool after flux fork + diff --git a/src/clientversion.h b/src/clientversion.h index 53ecd7476..aaa213a7d 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -15,9 +15,9 @@ */ //! These need to be macros, as clientversion.cpp's and bitcoin*-res.rc's voodoo requires it -#define CLIENT_VERSION_MAJOR 4 +#define CLIENT_VERSION_MAJOR 5 #define CLIENT_VERSION_MINOR 0 -#define CLIENT_VERSION_REVISION 5 +#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 50 //! Set to true for release, false for prerelease or test build diff --git a/src/deprecation.h b/src/deprecation.h index ae6c21b46..19c302777 100644 --- a/src/deprecation.h +++ b/src/deprecation.h @@ -10,7 +10,7 @@ // * Shut down 52 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 = 755000; +static const int APPROX_RELEASE_HEIGHT = 825000; static const int WEEKS_UNTIL_DEPRECATION = 52; static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 30);