Skip to content

Commit

Permalink
Release 5.0.5 backport
Browse files Browse the repository at this point in the history
  • Loading branch information
drgora committed Dec 5, 2024
2 parents 1c1ce23 + 0be2364 commit 3983d01
Show file tree
Hide file tree
Showing 6 changed files with 183 additions and 10 deletions.
2 changes: 1 addition & 1 deletion contrib/debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ zen (5.0.99) stable; urgency=medium

* new release

-- Zen Blockchain Foundation <[email protected]> Thu, 29 Aug 2024 18:30:00 +0000
-- Zen Blockchain Foundation <[email protected]> Mon, 25 Nov 2024 18:30:00 +0000
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# path to zend project root
repository_root: "./"
# release version to be backported (format "major.minor.patch", suffix must not be included if beta or candidate or alpha)
version: "5.0.5"
# build number (0-24 for beta (1-25), 25-49 for candidate (1-25), 50 for official, 51+ for alpha (1+))
build_number: "50"
# script steps flow
script_steps:
# initialize_check_main_checked_out (sub)step
initialize_check_main_checked_out:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# initialize_check_no_pending_changes (sub)step
initialize_check_no_pending_changes:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# initialize_create_branch (sub)step
initialize_create_branch:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# initialize_merge_branch (sub)step
initialize_merge_branch:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# reset_client_version step
reset_client_version:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# reset_checkpoints step
reset_checkpoints:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# reset_changelog step
reset_changelog:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# build_zend step
build_zend:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# reset_man_pages step
reset_man_pages:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# reset_release_notes step
reset_release_notes:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# path to zend project root
repository_root: "./"
# new release version (format "major.minor.patch", suffix must not be included if beta or candidate or alpha)
version: "5.0.5"
# build number (0-24 for beta (1-25), 25-49 for candidate (1-25), 50 for official, 51+ for alpha (1+))
build_number: "50"
# mainnet config
mainnet:
# height for checkpoint (if empty, current last block is used)
checkpoint_height: "1668200"
# total transaction from genesis block up to checkpoint (can be found in "debug.log" file)
total_transactions: "38360457"
# testnet config
testnet:
# height for checkpoint (if empty, current last block is used)
checkpoint_height: "1582300"
# total transaction from genesis block up to checkpoint (can be found in "debug.log" file)
total_transactions: "2528784"
# release date (format "%a, %d %b %Y", e.g. "Mon, 2 Jan 2023")
release_date: "Mon, 25 Nov 2024"
# approximated release height (mainnet)
approx_release_height: "1670200"
# weeks until deprecation
weeks_until_deprecation: "15"
# script steps flow
script_steps:
# initialize_check_main_checked_out (sub)step
initialize_check_main_checked_out:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# initialize_check_no_pending_changes (sub)step
initialize_check_no_pending_changes:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# initialize_create_branch (sub)step
initialize_create_branch:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# set_client_version step
set_client_version:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# update_checkpoints step
update_checkpoints:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# update_changelog step
update_changelog:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# update_deprecation_height step
update_deprecation_height:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# build_zend step
build_zend:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# update_man_pages step
update_man_pages:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# update_release_notes step
update_release_notes:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
# check_dependencies step
check_dependencies:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
11 changes: 11 additions & 0 deletions doc/release-notes/release-notes-5.0.5.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
zend v5.0.5
=========

## Important Notes

## Bugfixes and Minor Changes
- PR [#651](https://github.com/HorizenOfficial/zen/pull/651) Add an audit folder and relevant files to the doc directory


## Contributors
* [@devopsbo3](https://github.com/devopsbo3)
18 changes: 10 additions & 8 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,12 @@ class CMainParams : public CChainParams {
( 1511300, uint256S("0x00000000023fd9742aa11f6b62a3c8f2ae4884130de24d691b0566e9d62c517d"))
( 1536300, uint256S("0x000000000280a09437552d0fda2bc6473988e3254222f326c32875c8e43c5d2f"))
( 1569500, uint256S("0x00000000007901da2a6050d0ad7e2a6598ca6c7409209ab2b3b5e881f5c4f9b1"))
( 1614500, uint256S("0x000000000424fddeb3ae90a4decf180eaceb61397cd1b0a0a24adde538cd6f67")),
1724155664, // * UNIX timestamp of last checkpoint block
38280435, // * total number of transactions between genesis and last checkpoint
( 1614500, uint256S("0x000000000424fddeb3ae90a4decf180eaceb61397cd1b0a0a24adde538cd6f67"))
( 1668200, uint256S("0x00000000026f923e8714b7107c88d0a7cbaad2acf87d9fe089f2bd4d2a9b4b4f")),
1732263007, // * UNIX timestamp of last checkpoint block
38360457, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
13657 // * estimated number of transactions per day after checkpoint
13245 // * estimated number of transactions per day after checkpoint
// total number of tx / (checkpoint block height / (24 * 24))
};

Expand Down Expand Up @@ -286,11 +287,12 @@ class CTestNetParams : public CMainParams {
( 1425300, uint256S("0x0005830d3cc95017da5f5ab2ce9846925f3c34ca7c60ea886cc09a6b97858c8d"))
( 1453200, uint256S("0x000311dd646c1e74902f56be31c241e37f9e452c774ea8a88729e9b25f4fe16c"))
( 1483500, uint256S("0x000654110f87f10f8638be34d85a52d4535dc4e6ae7ebd597a6977e212ebdd8b"))
( 1528500, uint256S("0x0006f8cd5b90d5dd8027123be8025d3e8ff5ff3e20ecbbd4482874ec2fdfb35d")),
1724148284, // * UNIX timestamp of last checkpoint block
2473069, // * total number of transactions between genesis and last checkpoint
( 1528500, uint256S("0x0006f8cd5b90d5dd8027123be8025d3e8ff5ff3e20ecbbd4482874ec2fdfb35d"))
( 1582300, uint256S("0x000f1341912640b8c68d9b6ae21983df52c23ecd69b00ed533d14aea820fb499")),
1732260276, // * UNIX timestamp of last checkpoint block
2528784, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
932 // * estimated number of transactions per day after checkpoint
921 // * estimated number of transactions per day after checkpoint
// total number of tx / (checkpoint block height / (24 * 24))
};

Expand Down
2 changes: 1 addition & 1 deletion src/deprecation.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#ifndef ZCASH_DEPRECATION_H
#define ZCASH_DEPRECATION_H

static const int APPROX_RELEASE_HEIGHT = 1619400;
static const int APPROX_RELEASE_HEIGHT = 1670200;
static const int WEEKS_UNTIL_DEPRECATION = 15;
static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);

Expand Down

0 comments on commit 3983d01

Please sign in to comment.