Skip to content

Commit

Permalink
Merge branch 'prepare_release/4.1.0' into release/v4.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Paolo Tagliaferri committed Aug 30, 2023
2 parents 2a660dc + 098cd82 commit 89a00b8
Show file tree
Hide file tree
Showing 22 changed files with 396 additions and 65 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 4)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_REVISION, 0)
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-alpha$1))
define(_CLIENT_VERSION_IS_RELEASE, false)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2023)
AC_INIT([Zcash],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_SUFFIX(_ZC_BUILD_VAL)],[https://github.com/zcash/zcash/issues],[zcash])
AC_CONFIG_SRCDIR([src/main.cpp])
Expand Down
4 changes: 2 additions & 2 deletions contrib/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
zen (4.1.0-rc1) stable; urgency=medium
zen (4.1.0) stable; urgency=medium

* new release

-- Zen Blockchain Foundation <[email protected]> Fri, 28 Jul 2023 18:30:00 +0000
-- Zen Blockchain Foundation <[email protected]> Tue, 05 Sep 2023 18:30:00 +0000
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# 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: "4.1.0"
# 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: "1410300"
# total transaction from genesis block up to checkpoint (can be found in "debug.log" file)
total_transactions: "37236784"
# testnet config
testnet:
# height for checkpoint (if empty, current last block is used)
checkpoint_height: "1324900"
# total transaction from genesis block up to checkpoint (can be found in "debug.log" file)
total_transactions: "2233591"
# release date (format "%a, %d %b %Y", e.g. "Fri, 14 Apr 2023")
release_date: "Tue, 05 Sep 2023"
# approximated release height (mainnet)
approx_release_height: "1414300"
# weeks until deprecation
weeks_until_deprecation: "13"
# script steps flow
script_steps:
# initialize_check_main_checked_out (sub)step
initialize_check_main_checked_out:
# skip step
skip: True
# 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: True
# 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
# update_readme step
update_readme:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: True
# check_dependencies step
check_dependencies:
# skip step
skip: False
# stop before step (user interaction for proceeding)
stop: False
6 changes: 3 additions & 3 deletions doc/man/zen-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.49.1.
.TH ZEN-CLI "1" "July 2023" "zen-cli v4.1.0-rc1" "User Commands"
.TH ZEN-CLI "1" "August 2023" "zen-cli v4.1.0" "User Commands"
.SH NAME
zen-cli \- manual page for zen-cli v4.1.0-rc1
zen-cli \- manual page for zen-cli v4.1.0
.SH DESCRIPTION
Horizen RPC client version v4.1.0\-rc1
Horizen RPC client version v4.1.0
.SS "Usage:"
.TP
zen\-cli [options] <command> [params]
Expand Down
6 changes: 3 additions & 3 deletions doc/man/zen-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.49.1.
.TH ZEN-TX "1" "July 2023" "zen-tx v4.1.0-rc1" "User Commands"
.TH ZEN-TX "1" "August 2023" "zen-tx v4.1.0" "User Commands"
.SH NAME
zen-tx \- manual page for zen-tx v4.1.0-rc1
zen-tx \- manual page for zen-tx v4.1.0
.SH DESCRIPTION
Horizen zen\-tx utility version v4.1.0\-rc1
Horizen zen\-tx utility version v4.1.0
.SS "Usage:"
.TP
zen\-tx [options] <hex\-tx> [commands]
Expand Down
10 changes: 5 additions & 5 deletions doc/man/zend.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.49.1.
.TH ZEND "1" "July 2023" "zend v4.1.0-rc1" "User Commands"
.TH ZEND "1" "August 2023" "zend v4.1.0" "User Commands"
.SH NAME
zend \- manual page for zend v4.1.0-rc1
zend \- manual page for zend v4.1.0
.SH DESCRIPTION
Zen Daemon version v4.1.0\-rc1
Zen Daemon version v4.1.0
.SS "Usage:"
.TP
zend [options]
Expand Down Expand Up @@ -47,7 +47,7 @@ Specify data directory
\fB\-disabledeprecation=\fR<version>
.IP
Disable block\-height node deprecation and automatic shutdown (example:
\fB\-disabledeprecation\fR=\fI\,4\/\fR.1.0\-rc1)
\fB\-disabledeprecation\fR=\fI\,4\/\fR.1.0)
.HP
\fB\-exportdir=\fR<dir>
.IP
Expand Down Expand Up @@ -76,7 +76,7 @@ Keep the transaction memory pool below <n> megabytes (default: 400)
.HP
\fB\-par=\fR<n>
.IP
Set the number of script verification threads (\fB\-4\fR to 16, 0 = auto, <0 =
Set the number of script verification threads (\fB\-8\fR to 16, 0 = auto, <0 =
leave that many cores free, default: 0)
.HP
\fB\-pid=\fR<file>
Expand Down
63 changes: 63 additions & 0 deletions doc/release-notes/release-notes-4.1.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
zend v4.1.0
=========

This version is expected to deprecate on Mainnet at block **#1466716**, which will occur on **December 6th 2023 at approximately 02:00 PM UTC**. Please, update to a newer version before December 6th.

A **hard fork** is going to activate on Mainnet at block **#1426200**, on **September 26th 2023 at approximately 10:00 AM UTC**.

## Important Notes
- PR [#526](https://github.com/HorizenOfficial/zen/pull/526) implements [ZenIP-42204](https://github.com/HorizenOfficial/ZenIPs/blob/master/zenip-42204.md), which introduces a hard fork disabling the possibility to move transparent funds to shield addresses. After the hard fork, only shielded-to-shielded and shielded-to-transparent transactions will be allowed. For this reason, the following RPC commands have been (partially or fully) deprecated: `z_sendmany`, `z_shieldcoinbase` and `z_mergetoaddress` (check inline documentation for additional details).
- PR [#539](https://github.com/HorizenOfficial/zen/pull/539) modifies the data structure returned by RPC method `getrawmempool`
- PR [#541](https://github.com/HorizenOfficial/zen/pull/541) fixes an issue that made explorers, relying on `zend` RPC commands, not to show old transactions including P2PK scripts. The fix has an effect only on transactions processed after the update, so in case of explorers it is recommended to run a (fast) reindex to properly handle also previously received transactions. However, reindexing is not mandatory.
- Zend `4.0.0` was the last version supporting Ubuntu Bionic, whose End of Life started on May 31, 2023. PR [#553](https://github.com/HorizenOfficial/zen/pull/553) removes Ubuntu Bionic from Travis, and from that date the minimal supported version will be Ubuntu Focal.

## New Features and Improvements
- Implementation of [ZenIP-42204](https://github.com/HorizenOfficial/ZenIPs/blob/master/zenip-42204.md): a hard-fork is introduced which results in shielding txs being deprecated [#526](https://github.com/HorizenOfficial/zen/pull/526)
- Removal of the p2p alert system [#540](https://github.com/HorizenOfficial/zen/pull/540)
- Added support for Pay-To-Public-Key (P2PK) scripts [#541](https://github.com/HorizenOfficial/zen/pull/541)
- Set a maximum limit to the size of the mempool (400 MB by default, configurable through `-maxmempool` startup parameter)[#574](https://github.com/HorizenOfficial/zen/pull/574)

## Bugfixes and Minor Changes
- Fix compilation warnings for GCC (v12) and clang (v15), update boost to v1.81 [#513](https://github.com/HorizenOfficial/zen/pull/513)
- Refactoring of error code handling for proof verifier, UI improvements for reindex (fast) [#504](https://github.com/HorizenOfficial/zen/pull/504)
- Fix compilation errors for recent macOS versions [#536](https://github.com/HorizenOfficial/zen/pull/536)
- Fix for preventing already received and spent txs to be asked for again [#537](https://github.com/HorizenOfficial/zen/pull/537)
- Fix for limitedmap [#538](https://github.com/HorizenOfficial/zen/pull/538)
- Fix for return value of function mempoolToJSON [#539](https://github.com/HorizenOfficial/zen/pull/539)
- Fix logfile output for "Leaving block file" statement [#530](https://github.com/HorizenOfficial/zen/pull/530)
- Fix undefined behavior of a bitshift executed on a signed integer [#552](https://github.com/HorizenOfficial/zen/pull/552)
- Improve `debug.log` file reopening procedure [#552](https://github.com/HorizenOfficial/zen/pull/552)
- Introduce a maximum dns look up for one entry [#561](https://github.com/HorizenOfficial/zen/pull/561)
- Fix `shieldedpooldeprecation_rpc.py` and `wallet_mergetoaddress_2.py` Python tests [#544](https://github.com/HorizenOfficial/zen/pull/544)
- Make `fReindex` and `fReindexFast` flag variables thread safe [#555](https://github.com/HorizenOfficial/zen/pull/555)
- Remove `zencash-apple` as a dependency to build Zend on MacOS [#558](https://github.com/HorizenOfficial/zen/pull/558)
- Remove some unnecessary log lines from the command line interface [#559](https://github.com/HorizenOfficial/zen/pull/559)
- Update "contributing" documentation and the GitHub issue template [#562](https://github.com/HorizenOfficial/zen/pull/562)
- Remove the need to manually specify libzendoo dependencies one by one [#565](https://github.com/HorizenOfficial/zen/pull/565)
- General cleaning of code (static analysis) [#564](https://github.com/HorizenOfficial/zen/pull/564)
- Minor refactoring of `sc_cert_getblocktemplate.py` [#568](https://github.com/HorizenOfficial/zen/pull/568)
- Refactoring of the network functions in the Python test framework [#563](https://github.com/HorizenOfficial/zen/pull/563)
- Update `cargo` version from `1.51` to `1.70` [#569](https://github.com/HorizenOfficial/zen/pull/569)
- Remove `pyblake2` Python dependency [#570](https://github.com/HorizenOfficial/zen/pull/570)
- Avoid unnecessary copies when passing parameters to functions (static analysis) [#567](https://github.com/HorizenOfficial/zen/pull/567)
- Improve syntax of `autogen.sh` (static analysis) [#571](https://github.com/HorizenOfficial/zen/pull/571)
- Updated MacOS version on Travis CI from `12.3` to `14.2` [#572](https://github.com/HorizenOfficial/zen/pull/572)
- Minor performance improvement during the processing of `inv` and `getdata` P2P messages [#575](https://github.com/HorizenOfficial/zen/pull/575)
- Minor change of the P2P inactivity timeout check [#579](https://github.com/HorizenOfficial/zen/pull/579)
- Improved the management of SSL disconnections [#566](https://github.com/HorizenOfficial/zen/pull/566)
- Added the possibility to pass parameters to the `run_until_fails.py` helper script [#578](https://github.com/HorizenOfficial/zen/pull/578)
- Avoid relaying transactions coming from whitelisted peers that would make the local node be banned [#580](https://github.com/HorizenOfficial/zen/pull/580)
- Remove stale transactions when a hard fork activates [#594](https://github.com/HorizenOfficial/zen/pull/594)
- Fix for GUI when reindexing procedure is interrupted [#597](https://github.com/HorizenOfficial/zen/pull/597)

## Contributors
[@JackPiri](https://github.com/JackPiri)
[@a-petrini](https://github.com/a-petrini)
[@drgora](https://github.com/drgora)
[@dullerino](https://github.com/dullerino)
[@titusen](https://github.com/titusen)
[@la10736](https://github.com/la10736)
[@AndreaLanfranchi](https://github.com/AndreaLanfranchi)
[@ptagl](https://github.com/ptagl)

Special thanks to [dullerino](https://github.com/dullerino) for the first contribution to Zen!
8 changes: 7 additions & 1 deletion doc/release-notes/release-notes-current.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
zend v4.0.99
zend v4.1.0
=========

This version is expected to deprecate on Mainnet at block **#1466716**, which will occur on **December 6th 2023 at approximately 02:00 PM UTC**. Please, update to a newer version before December 6th.

A **hard fork** is going to activate on Mainnet at block **#1426200**, on **September 26th 2023 at approximately 10:00 AM UTC**.

## Important Notes
- PR [#526](https://github.com/HorizenOfficial/zen/pull/526) implements [ZenIP-42204](https://github.com/HorizenOfficial/ZenIPs/blob/master/zenip-42204.md), which introduces a hard fork disabling the possibility to move transparent funds to shield addresses. After the hard fork, only shielded-to-shielded and shielded-to-transparent transactions will be allowed. For this reason, the following RPC commands have been (partially or fully) deprecated: `z_sendmany`, `z_shieldcoinbase` and `z_mergetoaddress` (check inline documentation for additional details).
- PR [#539](https://github.com/HorizenOfficial/zen/pull/539) modifies the data structure returned by RPC method `getrawmempool`
Expand Down Expand Up @@ -43,6 +47,8 @@ zend v4.0.99
- Improved the management of SSL disconnections [#566](https://github.com/HorizenOfficial/zen/pull/566)
- Added the possibility to pass parameters to the `run_until_fails.py` helper script [#578](https://github.com/HorizenOfficial/zen/pull/578)
- Avoid relaying transactions coming from whitelisted peers that would make the local node be banned [#580](https://github.com/HorizenOfficial/zen/pull/580)
- Remove stale transactions when a hard fork activates [#594](https://github.com/HorizenOfficial/zen/pull/594)
- Fix for GUI when reindexing procedure is interrupted [#597](https://github.com/HorizenOfficial/zen/pull/597)

## Contributors
[@JackPiri](https://github.com/JackPiri)
Expand Down
1 change: 1 addition & 0 deletions qa/pull-tester/rpc-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ testScripts=(
'p2p_ignore_spent_tx.py',215,455
'shieldedpooldeprecation_rpc.py',558,1794
'mempool_size_limit.py',121,203
'mempool_hard_fork_cleaning.py',34,60
);

testScriptsExt=(
Expand Down
Loading

0 comments on commit 89a00b8

Please sign in to comment.