Skip to content

Commit

Permalink
Merge pull request #130 from zelcash/release-v5.0.0
Browse files Browse the repository at this point in the history
Release v5.0.0
  • Loading branch information
TheTrunk authored Mar 27, 2021
2 parents 400f019 + c2c69dd commit 5f95bb0
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 19 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)
<img align="right" height=112 width=562 src="doc/imgs/kamata.png">

Expand Down
6 changes: 6 additions & 0 deletions contrib/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
zelcash (5.0.0) stable; urgency=medium

* 5.0.0 release.

-- Zel Foundation <info@zel.cash> Sat, 27 Mar 2021 11:19:58 +0800

zelcash (4.0.5) stable; urgency=medium

* 4.0.5 release.
Expand Down
2 changes: 1 addition & 1 deletion contrib/gitian-descriptors/gitian-linux.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "zelcash-4.0.5"
name: "zelcash-5.0.0"
enable_cache: true
distro: "debian"
suites:
Expand Down
4 changes: 2 additions & 2 deletions doc/authors.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
8 changes: 4 additions & 4 deletions doc/man/zelcash-cli.1
Original file line number Diff line number Diff line change
@@ -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 <https://z.cash/support/security/>.
Expand Down
8 changes: 4 additions & 4 deletions doc/man/zelcash-tx.1
Original file line number Diff line number Diff line change
@@ -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] <hex\-tx> [commands]
Expand Down
8 changes: 4 additions & 4 deletions doc/man/zelcashd.1
Original file line number Diff line number Diff line change
@@ -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 <https://z.cash/support/security/>.
Expand Down
29 changes: 29 additions & 0 deletions doc/release-notes/release-notes-5.0.0.md
Original file line number Diff line number Diff line change
@@ -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

4 changes: 2 additions & 2 deletions src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/deprecation.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 5f95bb0

Please sign in to comment.