From 50926189eee079f8dc3683dc642ceb8fe44b3c89 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 28 Jun 2023 10:29:30 +1000 Subject: [PATCH 1/7] Update license description in README for MIT-only crates --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index af14b07cd4e..e83171a7443 100644 --- a/README.md +++ b/README.md @@ -195,3 +195,7 @@ Zebra is distributed under the terms of both the MIT license and the Apache License (Version 2.0). See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT). + +Some Zebra crates are distributed under the [MIT license only](LICENSE-MIT), +because some of their code was originally from MIT-licensed projects. +See each crate's directory for details. From aff00cba35e1040eb800cf920e0e30c4cf365233 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 28 Jun 2023 11:08:04 +1000 Subject: [PATCH 2/7] Draft changelog with trivial issues --- CHANGELOG.md | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1230bb0de46..52ba5603910 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,160 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org). +## [Zebra 1.0.1](https://github.com/ZcashFoundation/zebra/releases/tag/v1.0.1) - 2023-06-29 + +Zebra's first patch release fixes multiple network peer connection security issues and panics. We recommend that all users upgrade to Zebra 1.0.1 or later. + +As of this release, Zebra requires Rust 1.70 to build. macOS builds are no longer officially supported by the Zebra team. + +If you're running `zebrad` in a terminal, you'll see a new Zebra welcome message. + +Please report bugs to [the Zebra GitHub repository](https://github.com/ZcashFoundation/zebra/issues/new?assignees=&labels=C-bug%2C+S-needs-triage&projects=&template=bug_report.yml&title=) + +### Breaking Changes + +This release has the following breaking changes: +- Zebra limits each IP address to 1 peer connection, to prevent denial of service attacks. This can be changed using the `network.max_connections_per_ip` config. ([#6980](https://github.com/ZcashFoundation/zebra/pull/6980), [#6993](https://github.com/ZcashFoundation/zebra/pull/6993), [#7013](https://github.com/ZcashFoundation/zebra/pull/7013)). + Thank you to @dimxy from komodo for reporting this bug, and the Ziggurat team for demonstrating + its impact on testnet. +- Zebra uses new APIs in Rust 1.70 to prevent concurrency bugs that could cause hangs or panics + ([#7032](https://github.com/ZcashFoundation/zebra/pull/7032)). + +### Support Changes + +These platforms are no longer supported by the Zebra team: +- macOS has been moved from tier 2 to [tier 3 support](https://github.com/ZcashFoundation/zebra/blob/main/book/src/user/supported-platforms.md#tier-3) ([#6965](https://github.com/ZcashFoundation/zebra/pull/6965)). We disabled our regular macOS builds because Rust 1.70 [causes crashes during shutdown on macOS x86_64 (#6812)](https://github.com/ZcashFoundation/zebra/issues/6812). Zebra's state uses database transactions, so it should not be corrupted by the crash. + +### Security + +- Use Arc::into\_inner() to avoid potential hangs or panics ([#7032](https://github.com/ZcashFoundation/zebra/pull/7032)) +- Replace openssl with rustls in tests and experimental features ([#7047](https://github.com/ZcashFoundation/zebra/pull/7047)) + +#### Network Security + +- Limit each IP address to 1 peer connection, to prevent denial of service attacks. ([#6980](https://github.com/ZcashFoundation/zebra/pull/6980), [#6993](https://github.com/ZcashFoundation/zebra/pull/6993)) +- Close new peer connections from the same IP and port, rather than replacing the older connection ([#6980](https://github.com/ZcashFoundation/zebra/pull/6980)) +- Reduce inbound service overloads and add a timeout ([#6950](https://github.com/ZcashFoundation/zebra/pull/6950)) +- Stop panicking when handling inbound connection handshakes ([#6984](https://github.com/ZcashFoundation/zebra/pull/6984)) + +### Added + +- Make the maximum number of connections per IP configurable ([#7013](https://github.com/ZcashFoundation/zebra/pull/7013)) +- Print a Zebra logo and welcome text if stderr is terminal ([#6945](https://github.com/ZcashFoundation/zebra/pull/6945), [#7075](https://github.com/ZcashFoundation/zebra/pull/7075)) + +### Changed + +- Move macOS to tier 3 support ([#6965](https://github.com/ZcashFoundation/zebra/pull/6965)) +- Install from crates.io in the README, rather than a git release tag ([#6977](https://github.com/ZcashFoundation/zebra/pull/6977)) +- Add extra timeout logging to peer TCP connections ([#6969](https://github.com/ZcashFoundation/zebra/pull/6969)) + +### Fixed + +- Replace or add RPC content type header to support `zcashd` RPC examples ([#6885](https://github.com/ZcashFoundation/zebra/pull/6885)) +- Make `zebra-network` licensing clearer ([#6995](https://github.com/ZcashFoundation/zebra/pull/6995)) + +#### Configuration + +- Ignore error from loading config if running the 'generate' or 'download' commands ([#7014](https://github.com/ZcashFoundation/zebra/pull/7014)) +- Apply force\_color to panic logs ([#6997](https://github.com/ZcashFoundation/zebra/pull/6997)) + +#### Logging & Error Handling + +- Log a zebra-network task cancel on shutdown, rather than panicking ([#7078](https://github.com/ZcashFoundation/zebra/pull/7078)) +- Fix incorrect function spans in some logs ([#6923](https://github.com/ZcashFoundation/zebra/pull/6923), [#6995](https://github.com/ZcashFoundation/zebra/pull/6995)) +- Replace a state validation chain length assertion with a NotReadyToBeCommitted error ([#7072](https://github.com/ZcashFoundation/zebra/pull/7072)) + +#### Experimental Feature Fixes + +- Add an elasticsearch feature to block serialize to fix experimental build failures ([#6709](https://github.com/ZcashFoundation/zebra/pull/6709)) +- Prevent progress bar from panicking by disabling limits that are never reached ([#6940](https://github.com/ZcashFoundation/zebra/pull/6940)) + +### Trivial *TODO:* put this in a PR comment, not the CHANGELOG + +- Refactor the structure of finalizable blocks, to make validation clearer ([#7035](https://github.com/ZcashFoundation/zebra/pull/7035), [#7025](https://github.com/ZcashFoundation/zebra/pull/7025)) +- refactor(app): De-duplicate and fix version handling code ([#6996](https://github.com/ZcashFoundation/zebra/pull/6996)) +- fix(release): Use correct cargo release manifest key name ([#7028](https://github.com/ZcashFoundation/zebra/pull/7028)) +- fix(build): Suppress warnings about doc links pointing to private items ([#6944](https://github.com/ZcashFoundation/zebra/pull/6944)) +- fix(docker): Stop resetting the `cargo-chef` cache in the Dockerfile ([#6934](https://github.com/ZcashFoundation/zebra/pull/6934)) +- fix(docker): Improve Dockerfile cache use by making build commands match exactly ([#6933](https://github.com/ZcashFoundation/zebra/pull/6933)) +- fix(cd): Rename a CD job with the same name as a CI job ([#7063](https://github.com/ZcashFoundation/zebra/pull/7063)) +- cleanup(test): Make test debugging output more readable ([#7027](https://github.com/ZcashFoundation/zebra/pull/7027)) +- fix(changelog): Fix a broken link in CHANGELOG.md ([#6979](https://github.com/ZcashFoundation/zebra/pull/6979)) +- change(release): Add deny.toml update details to release-checklist.md ([#7042](https://github.com/ZcashFoundation/zebra/pull/7042)) +- change(release): Add more cargo clean to the release checklist ([#6964](https://github.com/ZcashFoundation/zebra/pull/6964)) +- change(release): Change network upgrade wording in release-checklist.md ([#7010](https://github.com/ZcashFoundation/zebra/pull/7010)) +- change(rename): Update missed tower-batch-control renames ([#7011](https://github.com/ZcashFoundation/zebra/pull/7011)) +- change(docs): Add `cargo clean` step to crate publishing steps ([#6959](https://github.com/ZcashFoundation/zebra/pull/6959)) +- change(docs): Explicitly invoke --execute when bumping crate versions ([#6949](https://github.com/ZcashFoundation/zebra/pull/6949)) +- build(deps): bump tj-actions/changed-files from 36.1.0 to 36.2.1 ([#6973](https://github.com/ZcashFoundation/zebra/pull/6973)) +- build(deps): bump tj-actions/changed-files from 36.2.1 to 36.3.0 ([#6986](https://github.com/ZcashFoundation/zebra/pull/6986)) +- build(deps): bump tj-actions/changed-files from 36.3.0 to 36.4.0 ([#7004](https://github.com/ZcashFoundation/zebra/pull/7004)) +- build(deps): bump tj-actions/changed-files from 36.4.0 to 36.4.1 ([#7024](https://github.com/ZcashFoundation/zebra/pull/7024)) +- build(deps): bump tj-actions/changed-files from 36.4.1 to 37.0.3 ([#7065](https://github.com/ZcashFoundation/zebra/pull/7065)) +- fix(doc): Add `fastmod --hidden` to mass-renames.md ([#6913](https://github.com/ZcashFoundation/zebra/pull/6913)) +- change(release): Add deny.toml update details to release-checklist.md ([#7042](https://github.com/ZcashFoundation/zebra/pull/7042)) +- change(release): Add more cargo clean to the release checklist ([#6964](https://github.com/ZcashFoundation/zebra/pull/6964)) +- add(tests): Add snapshot tests for sprout database formats ([#7057](https://github.com/ZcashFoundation/zebra/pull/7057)) +- change(docs): Add `cargo clean` step to crate publishing steps ([#6959](https://github.com/ZcashFoundation/zebra/pull/6959)) +- add(ci): Run release builds and production Docker image tests on pull requests ([#7055](https://github.com/ZcashFoundation/zebra/pull/7055)) +- add(ci): Run release builds and production Docker image tests on pull requests ([#7055](https://github.com/ZcashFoundation/zebra/pull/7055)) +- add(tests): Add snapshot tests for sprout database formats ([#7057](https://github.com/ZcashFoundation/zebra/pull/7057)) +- build(deps): bump Swatinem/rust-cache from 2.4.0 to 2.5.0 ([#7002](https://github.com/ZcashFoundation/zebra/pull/7002)) +- build(deps): bump baptiste0928/cargo-install from 2.0.0 to 2.1.0 ([#6903](https://github.com/ZcashFoundation/zebra/pull/6903)) +- build(deps): bump bitflags from 2.3.1 to 2.3.2 ([#6943](https://github.com/ZcashFoundation/zebra/pull/6943)) +- build(deps): bump clap from 4.3.3 to 4.3.4 ([#6957](https://github.com/ZcashFoundation/zebra/pull/6957)) +- build(deps): bump clap from 4.3.4 to 4.3.5 ([#7038](https://github.com/ZcashFoundation/zebra/pull/7038)) +- build(deps): bump clap from 4.3.5 to 4.3.6 ([#7059](https://github.com/ZcashFoundation/zebra/pull/7059)) +- build(deps): bump clap from 4.3.6 to 4.3.8 ([#7066](https://github.com/ZcashFoundation/zebra/pull/7066)) +- build(deps): bump docker/build-push-action from 4.1.0 to 4.1.1 ([#6942](https://github.com/ZcashFoundation/zebra/pull/6942)) +- build(deps): bump docker/metadata-action from 4.5.0 to 4.6.0 ([#6941](https://github.com/ZcashFoundation/zebra/pull/6941)) +- build(deps): bump hyper from 0.14.26 to 0.14.27 ([#7082](https://github.com/ZcashFoundation/zebra/pull/7082)) +- build(deps): bump insta from 1.29.0 to 1.30.0 ([#7051](https://github.com/ZcashFoundation/zebra/pull/7051)) +- build(deps): bump itertools from 0.10.5 to 0.11.0 ([#7050](https://github.com/ZcashFoundation/zebra/pull/7050)) +- build(deps): bump log from 0.4.18 to 0.4.19 ([#6919](https://github.com/ZcashFoundation/zebra/pull/6919)) +- build(deps): bump peter-evans/dockerhub-description from 3.4.1 to 3.4.2 ([#7023](https://github.com/ZcashFoundation/zebra/pull/7023)) +- build(deps): bump reviewdog/action-actionlint from 1.37.0 to 1.37.1 ([#7003](https://github.com/ZcashFoundation/zebra/pull/7003)) +- build(deps): bump sentry from 0.31.3 to 0.31.4 ([#6958](https://github.com/ZcashFoundation/zebra/pull/6958)) +- build(deps): bump sentry from 0.31.4 to 0.31.5 ([#6988](https://github.com/ZcashFoundation/zebra/pull/6988)) +- build(deps): bump serde\_json from 1.0.96 to 1.0.97 ([#6987](https://github.com/ZcashFoundation/zebra/pull/6987)) +- build(deps): bump tj-actions/changed-files from 36.1.0 to 36.2.1 ([#6973](https://github.com/ZcashFoundation/zebra/pull/6973)) +- build(deps): bump tj-actions/changed-files from 36.2.1 to 36.3.0 ([#6986](https://github.com/ZcashFoundation/zebra/pull/6986)) +- build(deps): bump tj-actions/changed-files from 36.3.0 to 36.4.0 ([#7004](https://github.com/ZcashFoundation/zebra/pull/7004)) +- build(deps): bump tj-actions/changed-files from 36.4.0 to 36.4.1 ([#7024](https://github.com/ZcashFoundation/zebra/pull/7024)) +- build(deps): bump tj-actions/changed-files from 36.4.1 to 37.0.3 ([#7065](https://github.com/ZcashFoundation/zebra/pull/7065)) +- build(deps): bump w9jds/firebase-action from 11.30.1 to 12.4.0 ([#7005](https://github.com/ZcashFoundation/zebra/pull/7005)) +- change(commands): Ignore error from loading config if running the 'generate' or 'download' commands ([#7014](https://github.com/ZcashFoundation/zebra/pull/7014)) +- change(docs): Add `cargo clean` step to crate publishing steps ([#6959](https://github.com/ZcashFoundation/zebra/pull/6959)) +- change(docs): Explicitly invoke --execute when bumping crate versions ([#6949](https://github.com/ZcashFoundation/zebra/pull/6949)) +- change(network): Configurable maximum connections per IP ([#7013](https://github.com/ZcashFoundation/zebra/pull/7013)) +- change(release): Add deny.toml update details to release-checklist.md ([#7042](https://github.com/ZcashFoundation/zebra/pull/7042)) +- change(release): Add more cargo clean to the release checklist ([#6964](https://github.com/ZcashFoundation/zebra/pull/6964)) +- change(release): Change network upgrade wording in release-checklist.md ([#7010](https://github.com/ZcashFoundation/zebra/pull/7010)) +- change(rename): Update missed tower-batch-control renames ([#7011](https://github.com/ZcashFoundation/zebra/pull/7011)) +- change(state): Use `OrderedUtxo` in `CheckpointVerifiedBlock` ([#6971](https://github.com/ZcashFoundation/zebra/pull/6971)) +- cleanup(test): Make test debugging output more readable ([#7027](https://github.com/ZcashFoundation/zebra/pull/7027)) +- cleanup(workflow): Remove an outdated TODO in release-binaries.yml ([#6978](https://github.com/ZcashFoundation/zebra/pull/6978)) +- fix(build): Suppress warnings about doc links pointing to private items ([#6944](https://github.com/ZcashFoundation/zebra/pull/6944)) +- fix(cd): Rename a CD job with the same name as a CI job ([#7063](https://github.com/ZcashFoundation/zebra/pull/7063)) +- fix(changelog): Fix a broken link in CHANGELOG.md ([#6979](https://github.com/ZcashFoundation/zebra/pull/6979)) +- fix(cleanup): redundant configuration feature ([#6929](https://github.com/ZcashFoundation/zebra/pull/6929)) +- fix(deps): Replace openssl with rustls in tests and experimental features ([#7047](https://github.com/ZcashFoundation/zebra/pull/7047)) +- fix(docker): Improve Dockerfile cache use by making build commands match exactly ([#6933](https://github.com/ZcashFoundation/zebra/pull/6933)) +- fix(docker): Stop resetting the `cargo-chef` cache in the Dockerfile ([#6934](https://github.com/ZcashFoundation/zebra/pull/6934)) +- fix(logs): Avoid grouping logs for separate tasks ([#6923](https://github.com/ZcashFoundation/zebra/pull/6923)) +- fix(net): Clean up licensing, closure `move`, log typos, tracing spans ([#6995](https://github.com/ZcashFoundation/zebra/pull/6995)) +- fix(release): Use correct cargo release manifest key name ([#7028](https://github.com/ZcashFoundation/zebra/pull/7028)) +- fix(state): Replace a chain length assertion with a NotReadyToBeCommitted error ([#7072](https://github.com/ZcashFoundation/zebra/pull/7072)) +- refactor(app): De-duplicate and fix version handling code ([#6996](https://github.com/ZcashFoundation/zebra/pull/6996)) +- refactor(consensus): Rename router\_verifier to block\_verifier\_router ([#6998](https://github.com/ZcashFoundation/zebra/pull/6998)) +- rename(state): do additional renaming for clarification purposes ([#6967](https://github.com/ZcashFoundation/zebra/pull/6967)) + +### Contributors + +Thank you to everyone who contributed to this release, we couldn't make Zebra without you: +@arya2, @conradoplg, @dconnolly, @dimxy from komodo, @oxarbitrage, @teor2345, @upbqdn, and the Ziggurat team. + + ## [Zebra 1.0.0](https://github.com/ZcashFoundation/zebra/releases/tag/v1.0.0) - 2023-06-14 This is our 1.0.0 stable release. From e2e92b6068f38220abf334f2945b6d862e0e12c4 Mon Sep 17 00:00:00 2001 From: teor Date: Wed, 28 Jun 2023 11:09:10 +1000 Subject: [PATCH 3/7] Remove trivial issues --- CHANGELOG.md | 80 ---------------------------------------------------- 1 file changed, 80 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52ba5603910..06bf3346d20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -74,86 +74,6 @@ These platforms are no longer supported by the Zebra team: - Add an elasticsearch feature to block serialize to fix experimental build failures ([#6709](https://github.com/ZcashFoundation/zebra/pull/6709)) - Prevent progress bar from panicking by disabling limits that are never reached ([#6940](https://github.com/ZcashFoundation/zebra/pull/6940)) -### Trivial *TODO:* put this in a PR comment, not the CHANGELOG - -- Refactor the structure of finalizable blocks, to make validation clearer ([#7035](https://github.com/ZcashFoundation/zebra/pull/7035), [#7025](https://github.com/ZcashFoundation/zebra/pull/7025)) -- refactor(app): De-duplicate and fix version handling code ([#6996](https://github.com/ZcashFoundation/zebra/pull/6996)) -- fix(release): Use correct cargo release manifest key name ([#7028](https://github.com/ZcashFoundation/zebra/pull/7028)) -- fix(build): Suppress warnings about doc links pointing to private items ([#6944](https://github.com/ZcashFoundation/zebra/pull/6944)) -- fix(docker): Stop resetting the `cargo-chef` cache in the Dockerfile ([#6934](https://github.com/ZcashFoundation/zebra/pull/6934)) -- fix(docker): Improve Dockerfile cache use by making build commands match exactly ([#6933](https://github.com/ZcashFoundation/zebra/pull/6933)) -- fix(cd): Rename a CD job with the same name as a CI job ([#7063](https://github.com/ZcashFoundation/zebra/pull/7063)) -- cleanup(test): Make test debugging output more readable ([#7027](https://github.com/ZcashFoundation/zebra/pull/7027)) -- fix(changelog): Fix a broken link in CHANGELOG.md ([#6979](https://github.com/ZcashFoundation/zebra/pull/6979)) -- change(release): Add deny.toml update details to release-checklist.md ([#7042](https://github.com/ZcashFoundation/zebra/pull/7042)) -- change(release): Add more cargo clean to the release checklist ([#6964](https://github.com/ZcashFoundation/zebra/pull/6964)) -- change(release): Change network upgrade wording in release-checklist.md ([#7010](https://github.com/ZcashFoundation/zebra/pull/7010)) -- change(rename): Update missed tower-batch-control renames ([#7011](https://github.com/ZcashFoundation/zebra/pull/7011)) -- change(docs): Add `cargo clean` step to crate publishing steps ([#6959](https://github.com/ZcashFoundation/zebra/pull/6959)) -- change(docs): Explicitly invoke --execute when bumping crate versions ([#6949](https://github.com/ZcashFoundation/zebra/pull/6949)) -- build(deps): bump tj-actions/changed-files from 36.1.0 to 36.2.1 ([#6973](https://github.com/ZcashFoundation/zebra/pull/6973)) -- build(deps): bump tj-actions/changed-files from 36.2.1 to 36.3.0 ([#6986](https://github.com/ZcashFoundation/zebra/pull/6986)) -- build(deps): bump tj-actions/changed-files from 36.3.0 to 36.4.0 ([#7004](https://github.com/ZcashFoundation/zebra/pull/7004)) -- build(deps): bump tj-actions/changed-files from 36.4.0 to 36.4.1 ([#7024](https://github.com/ZcashFoundation/zebra/pull/7024)) -- build(deps): bump tj-actions/changed-files from 36.4.1 to 37.0.3 ([#7065](https://github.com/ZcashFoundation/zebra/pull/7065)) -- fix(doc): Add `fastmod --hidden` to mass-renames.md ([#6913](https://github.com/ZcashFoundation/zebra/pull/6913)) -- change(release): Add deny.toml update details to release-checklist.md ([#7042](https://github.com/ZcashFoundation/zebra/pull/7042)) -- change(release): Add more cargo clean to the release checklist ([#6964](https://github.com/ZcashFoundation/zebra/pull/6964)) -- add(tests): Add snapshot tests for sprout database formats ([#7057](https://github.com/ZcashFoundation/zebra/pull/7057)) -- change(docs): Add `cargo clean` step to crate publishing steps ([#6959](https://github.com/ZcashFoundation/zebra/pull/6959)) -- add(ci): Run release builds and production Docker image tests on pull requests ([#7055](https://github.com/ZcashFoundation/zebra/pull/7055)) -- add(ci): Run release builds and production Docker image tests on pull requests ([#7055](https://github.com/ZcashFoundation/zebra/pull/7055)) -- add(tests): Add snapshot tests for sprout database formats ([#7057](https://github.com/ZcashFoundation/zebra/pull/7057)) -- build(deps): bump Swatinem/rust-cache from 2.4.0 to 2.5.0 ([#7002](https://github.com/ZcashFoundation/zebra/pull/7002)) -- build(deps): bump baptiste0928/cargo-install from 2.0.0 to 2.1.0 ([#6903](https://github.com/ZcashFoundation/zebra/pull/6903)) -- build(deps): bump bitflags from 2.3.1 to 2.3.2 ([#6943](https://github.com/ZcashFoundation/zebra/pull/6943)) -- build(deps): bump clap from 4.3.3 to 4.3.4 ([#6957](https://github.com/ZcashFoundation/zebra/pull/6957)) -- build(deps): bump clap from 4.3.4 to 4.3.5 ([#7038](https://github.com/ZcashFoundation/zebra/pull/7038)) -- build(deps): bump clap from 4.3.5 to 4.3.6 ([#7059](https://github.com/ZcashFoundation/zebra/pull/7059)) -- build(deps): bump clap from 4.3.6 to 4.3.8 ([#7066](https://github.com/ZcashFoundation/zebra/pull/7066)) -- build(deps): bump docker/build-push-action from 4.1.0 to 4.1.1 ([#6942](https://github.com/ZcashFoundation/zebra/pull/6942)) -- build(deps): bump docker/metadata-action from 4.5.0 to 4.6.0 ([#6941](https://github.com/ZcashFoundation/zebra/pull/6941)) -- build(deps): bump hyper from 0.14.26 to 0.14.27 ([#7082](https://github.com/ZcashFoundation/zebra/pull/7082)) -- build(deps): bump insta from 1.29.0 to 1.30.0 ([#7051](https://github.com/ZcashFoundation/zebra/pull/7051)) -- build(deps): bump itertools from 0.10.5 to 0.11.0 ([#7050](https://github.com/ZcashFoundation/zebra/pull/7050)) -- build(deps): bump log from 0.4.18 to 0.4.19 ([#6919](https://github.com/ZcashFoundation/zebra/pull/6919)) -- build(deps): bump peter-evans/dockerhub-description from 3.4.1 to 3.4.2 ([#7023](https://github.com/ZcashFoundation/zebra/pull/7023)) -- build(deps): bump reviewdog/action-actionlint from 1.37.0 to 1.37.1 ([#7003](https://github.com/ZcashFoundation/zebra/pull/7003)) -- build(deps): bump sentry from 0.31.3 to 0.31.4 ([#6958](https://github.com/ZcashFoundation/zebra/pull/6958)) -- build(deps): bump sentry from 0.31.4 to 0.31.5 ([#6988](https://github.com/ZcashFoundation/zebra/pull/6988)) -- build(deps): bump serde\_json from 1.0.96 to 1.0.97 ([#6987](https://github.com/ZcashFoundation/zebra/pull/6987)) -- build(deps): bump tj-actions/changed-files from 36.1.0 to 36.2.1 ([#6973](https://github.com/ZcashFoundation/zebra/pull/6973)) -- build(deps): bump tj-actions/changed-files from 36.2.1 to 36.3.0 ([#6986](https://github.com/ZcashFoundation/zebra/pull/6986)) -- build(deps): bump tj-actions/changed-files from 36.3.0 to 36.4.0 ([#7004](https://github.com/ZcashFoundation/zebra/pull/7004)) -- build(deps): bump tj-actions/changed-files from 36.4.0 to 36.4.1 ([#7024](https://github.com/ZcashFoundation/zebra/pull/7024)) -- build(deps): bump tj-actions/changed-files from 36.4.1 to 37.0.3 ([#7065](https://github.com/ZcashFoundation/zebra/pull/7065)) -- build(deps): bump w9jds/firebase-action from 11.30.1 to 12.4.0 ([#7005](https://github.com/ZcashFoundation/zebra/pull/7005)) -- change(commands): Ignore error from loading config if running the 'generate' or 'download' commands ([#7014](https://github.com/ZcashFoundation/zebra/pull/7014)) -- change(docs): Add `cargo clean` step to crate publishing steps ([#6959](https://github.com/ZcashFoundation/zebra/pull/6959)) -- change(docs): Explicitly invoke --execute when bumping crate versions ([#6949](https://github.com/ZcashFoundation/zebra/pull/6949)) -- change(network): Configurable maximum connections per IP ([#7013](https://github.com/ZcashFoundation/zebra/pull/7013)) -- change(release): Add deny.toml update details to release-checklist.md ([#7042](https://github.com/ZcashFoundation/zebra/pull/7042)) -- change(release): Add more cargo clean to the release checklist ([#6964](https://github.com/ZcashFoundation/zebra/pull/6964)) -- change(release): Change network upgrade wording in release-checklist.md ([#7010](https://github.com/ZcashFoundation/zebra/pull/7010)) -- change(rename): Update missed tower-batch-control renames ([#7011](https://github.com/ZcashFoundation/zebra/pull/7011)) -- change(state): Use `OrderedUtxo` in `CheckpointVerifiedBlock` ([#6971](https://github.com/ZcashFoundation/zebra/pull/6971)) -- cleanup(test): Make test debugging output more readable ([#7027](https://github.com/ZcashFoundation/zebra/pull/7027)) -- cleanup(workflow): Remove an outdated TODO in release-binaries.yml ([#6978](https://github.com/ZcashFoundation/zebra/pull/6978)) -- fix(build): Suppress warnings about doc links pointing to private items ([#6944](https://github.com/ZcashFoundation/zebra/pull/6944)) -- fix(cd): Rename a CD job with the same name as a CI job ([#7063](https://github.com/ZcashFoundation/zebra/pull/7063)) -- fix(changelog): Fix a broken link in CHANGELOG.md ([#6979](https://github.com/ZcashFoundation/zebra/pull/6979)) -- fix(cleanup): redundant configuration feature ([#6929](https://github.com/ZcashFoundation/zebra/pull/6929)) -- fix(deps): Replace openssl with rustls in tests and experimental features ([#7047](https://github.com/ZcashFoundation/zebra/pull/7047)) -- fix(docker): Improve Dockerfile cache use by making build commands match exactly ([#6933](https://github.com/ZcashFoundation/zebra/pull/6933)) -- fix(docker): Stop resetting the `cargo-chef` cache in the Dockerfile ([#6934](https://github.com/ZcashFoundation/zebra/pull/6934)) -- fix(logs): Avoid grouping logs for separate tasks ([#6923](https://github.com/ZcashFoundation/zebra/pull/6923)) -- fix(net): Clean up licensing, closure `move`, log typos, tracing spans ([#6995](https://github.com/ZcashFoundation/zebra/pull/6995)) -- fix(release): Use correct cargo release manifest key name ([#7028](https://github.com/ZcashFoundation/zebra/pull/7028)) -- fix(state): Replace a chain length assertion with a NotReadyToBeCommitted error ([#7072](https://github.com/ZcashFoundation/zebra/pull/7072)) -- refactor(app): De-duplicate and fix version handling code ([#6996](https://github.com/ZcashFoundation/zebra/pull/6996)) -- refactor(consensus): Rename router\_verifier to block\_verifier\_router ([#6998](https://github.com/ZcashFoundation/zebra/pull/6998)) -- rename(state): do additional renaming for clarification purposes ([#6967](https://github.com/ZcashFoundation/zebra/pull/6967)) - ### Contributors Thank you to everyone who contributed to this release, we couldn't make Zebra without you: From ec0d9ca3d091d5fd329aa762154c8bf7e62f392e Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 30 Jun 2023 11:06:33 +1000 Subject: [PATCH 4/7] Update changelog entries as of commit 2a31972 and PR #7103 --- CHANGELOG.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06bf3346d20..572babc2d72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org). ## [Zebra 1.0.1](https://github.com/ZcashFoundation/zebra/releases/tag/v1.0.1) - 2023-06-29 -Zebra's first patch release fixes multiple network peer connection security issues and panics. We recommend that all users upgrade to Zebra 1.0.1 or later. +Zebra's first patch release fixes multiple peer connection security issues and panics. It also significantly reduces Zebra's CPU usage. We recommend that all users upgrade to Zebra 1.0.1 or later. As of this release, Zebra requires Rust 1.70 to build. macOS builds are no longer officially supported by the Zebra team. @@ -37,6 +37,7 @@ These platforms are no longer supported by the Zebra team: #### Network Security +- Fix long delays in accepting inbound handshakes, and delays in async operations throughout Zebra. ([#7103](https://github.com/ZcashFoundation/zebra/pull/7103)). Thank you to the Ziggurat Team for reporting this bug. - Limit each IP address to 1 peer connection, to prevent denial of service attacks. ([#6980](https://github.com/ZcashFoundation/zebra/pull/6980), [#6993](https://github.com/ZcashFoundation/zebra/pull/6993)) - Close new peer connections from the same IP and port, rather than replacing the older connection ([#6980](https://github.com/ZcashFoundation/zebra/pull/6980)) - Reduce inbound service overloads and add a timeout ([#6950](https://github.com/ZcashFoundation/zebra/pull/6950)) @@ -45,7 +46,8 @@ These platforms are no longer supported by the Zebra team: ### Added - Make the maximum number of connections per IP configurable ([#7013](https://github.com/ZcashFoundation/zebra/pull/7013)) -- Print a Zebra logo and welcome text if stderr is terminal ([#6945](https://github.com/ZcashFoundation/zebra/pull/6945), [#7075](https://github.com/ZcashFoundation/zebra/pull/7075)) +- Make it easier to modify Zebra's config inside the Docker image ([#7045](https://github.com/ZcashFoundation/zebra/pull/7045)) +- Print a Zebra logo and welcome text if stderr is terminal ([#6945](https://github.com/ZcashFoundation/zebra/pull/6945), [#7075](https://github.com/ZcashFoundation/zebra/pull/7075), [#7095](https://github.com/ZcashFoundation/zebra/pull/7095), [#7102](https://github.com/ZcashFoundation/zebra/pull/7102)) ### Changed @@ -55,6 +57,9 @@ These platforms are no longer supported by the Zebra team: ### Fixed +- Stop overwriting custom user configs inside Zebra's Docker image ([#7045](https://github.com/ZcashFoundation/zebra/pull/7045)) +- Stop Zebra using 100% CPU even when idle ([#7103](https://github.com/ZcashFoundation/zebra/pull/7103)), thank you to james_katz for reporting this bug +- Avoid potential hangs in the `tokio` async runtime ([#7094](https://github.com/ZcashFoundation/zebra/pull/7094)) - Replace or add RPC content type header to support `zcashd` RPC examples ([#6885](https://github.com/ZcashFoundation/zebra/pull/6885)) - Make `zebra-network` licensing clearer ([#6995](https://github.com/ZcashFoundation/zebra/pull/6995)) @@ -77,7 +82,7 @@ These platforms are no longer supported by the Zebra team: ### Contributors Thank you to everyone who contributed to this release, we couldn't make Zebra without you: -@arya2, @conradoplg, @dconnolly, @dimxy from komodo, @oxarbitrage, @teor2345, @upbqdn, and the Ziggurat team. +@arya2, @conradoplg, @dconnolly, @dimxy from komodo, james_katz, @oxarbitrage, @teor2345, @upbqdn, and the Ziggurat team. ## [Zebra 1.0.0](https://github.com/ZcashFoundation/zebra/releases/tag/v1.0.0) - 2023-06-14 From 3c044dd473f3cec49c2d174e286f4b4cde6f51bd Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 30 Jun 2023 11:13:42 +1000 Subject: [PATCH 5/7] Update mainnet and testnet checkpoints as of 2023-06-30 --- .../src/checkpoint/main-checkpoints.txt | 62 +++++++++++++++++++ .../src/checkpoint/test-checkpoints.txt | 62 +++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/zebra-consensus/src/checkpoint/main-checkpoints.txt b/zebra-consensus/src/checkpoint/main-checkpoints.txt index 79b60a72f81..89a9f940623 100644 --- a/zebra-consensus/src/checkpoint/main-checkpoints.txt +++ b/zebra-consensus/src/checkpoint/main-checkpoints.txt @@ -10889,3 +10889,65 @@ 2117616 0000000000b91c891557df28d4173766562cc455b3b5ab27e83c9a03958bbc14 2118016 00000000013eb4b6e1cd5b9f19ad032670cad97fd4837b1dd7e876358ff8752a 2118416 0000000000a5e8d0c81b4fb1036d94ac7d16d192bd068258d3aa07fe903b8736 +2118816 00000000003fb9615f739bad0dac026ed1c0f7861330737c4b55d292da4d981f +2119216 0000000000b5e61882e7e4d69c75f335c96a6c1744e8d4602e77caa46f9ee187 +2119616 0000000000d8509fe19c295db85f6001031816dc05aff2674b95925b88c8242f +2120016 0000000000dc0337c69742d294267dd2bd434017827151d6ae7965ec19fd3cef +2120416 00000000010b5fb468a019e2b9115aa0e0ec8cb92017195a4ebd4e9b5a47c6be +2120816 0000000001206742e94d9b3cb8187b4c26be13290724ef97848c62f7d01e90bb +2121216 0000000000b2531dd904338ddf602c87ac70ec14e7aca566d297dff7278648ab +2121616 0000000000b5fca10a6ff18c158d38b83369405362f97f5de4c9bf2cfd12b23c +2122016 000000000121e68a6ab027b23fb9a5e73eb38fa6af0fef88931af48dafc71821 +2122416 0000000000ee1cb21aa6d9b957578ef6f3e45b6730ce7c6e22edfa729d3301f9 +2122816 0000000000fcc1ef9a8d0e4b71f55947fd094ac9254ee0f21e2531eec099a538 +2123196 0000000000c38a681500f237539b08b8d3f75d9ab0233e2b5252b76ddc4727d9 +2123582 0000000000c4014be9b89ef009959a45e4fb48c074881c7afe1780b760853127 +2123932 0000000000e4c93f99189deadd479ecabd3660de1041ebb4a0c5ef5d7cbe5e51 +2124280 000000000127f2b6c0c0ab4048b16116e559dc9b9a934fdbd7810e1ae49b5349 +2124602 0000000001bc3445533dfc7baf59b6294ea1d4585ee928ec18c79b6b49f3dabf +2124906 00000000001e2edad0443cb8d4df1da641c3c58f2f83893e361fa37fd121c29d +2125219 0000000001280e8b6a0642a896b7b5337aac71c543cc36b26d2d296ead4af381 +2125509 00000000001d565ed9c555b1b276dccaaa87a3c0bbed390a340c799776e37be0 +2125805 00000000017827e42bf3b99f40c6ee11c8d4e56dabb802ad56e74c766a31ae2c +2126109 00000000014e149e7bbed108446e842a5c25e400423074ca891cd88c16e18bb1 +2126422 00000000005bf996c990b6124d3a93f50dd6a8403104be774a659f0c4a1ee54c +2126703 00000000010b6fb36760137accc7926c3d8c314307816f15f84c63eefdded7a8 +2127017 00000000012e0ba6b5a5f0a4ff5310b931c063098f3e96fc997c7b6fb44a24ff +2127320 000000000116fa60015d9f21754b07269703129fb4af00a7b33f7b0fb5c128bc +2127612 0000000000df367879d160aab3f1c3834462110de823b7c2e1407014b49f5544 +2127899 00000000004731b6685e37ccead8caf23b7c1b229aab4407376a07766ea1871b +2128194 00000000013eeadbf973df717320aa63ec2b3e81f0b19e521c37db25ce2ad630 +2128515 00000000002b17686a2aa58e52433e4a11fddd1172020e1464e91ba54d6bef29 +2128803 00000000017166558e5f022e46f2a476c67c69f9963f48951f421ab37426e3a4 +2129111 000000000136b194b3e7bcacf1a0222a8c7f6d3f739e42fb7db2b9ebcf1b6332 +2129418 0000000000ade562bdb165aa21fbefcc0d2e655e213e5ddf0b2bc5459c0b53c7 +2129741 0000000000408733f90084aad38ffa5a356d9f220e40ad077178d492e96ee696 +2130039 00000000015295051bce1c94530d5c8341f51b7aeabed721c26024088acc033e +2130324 000000000047140460766777a3cc6ce71bccf3d2d1aeff7b74936f21cc9f666f +2130628 000000000010fafc22180689562f6447240af96dc3645a666d88655a15509758 +2130915 0000000000ff00e5f8d3608e0549e680f32cb9eca3fe15eab2f1b43f8f5f1f38 +2131206 00000000007e0b7952afbd83aa3f8bbf5277eb025a8d7c130f750b9a75cdef40 +2131495 000000000060944b74e2badfc81d0043c4d97577450193a72c9f640bb8925b57 +2131813 0000000000eb90d10f092764603621bdc345875631ce08106e7bc5cdbea23902 +2132122 0000000000fe437b14ce7ad15b01d31f85076d84331ac0fefad44dbe81246e48 +2132410 0000000001768b04e8620bfd1de919e9ae09b04c0a962b158b106a33986b9aa8 +2132711 00000000007aadf626595d2e46ecff42d199b02849e7815fb4ab499e902b7923 +2133000 00000000012bd3092c628405bd45bd3c3ddfd9d7f282c5099047ec456a83d4dd +2133300 0000000001affcdb85411d7d2edaae4ece70497edd418b6ac5a6b61471401d69 +2133604 0000000000cbe948c19907c592e4e2704ddb155c1da1cd3a2e6db5ebc8451494 +2133905 000000000157943224c2fc9672f4456dd5babf2fd7404077d85f9136d54fe067 +2134228 0000000000663b7abc789a86bbe3cb0a8fbe5be67c74302e9d6abeda775abd98 +2134528 0000000000449198effd2777d6a2157e94916e317b13eedda1b833c633cbdfb0 +2134835 00000000006ba2705c7eaafcc186ccad35b7f934da0c765e757f76e151137b27 +2135171 00000000010460ae8510ece826a72703f77ff0e7a463e33378c22e136f8152ea +2135462 0000000001195d894fd61b555ace3d99a6c1c124d985880279d0435263941135 +2135769 000000000054b8e03388a56b73a9652f3ff23e87ade79993c76cf6d65397e353 +2136070 0000000000d350786b28b662a544fd929f02dd778b46bf73c0944bc6b0b39e2a +2136396 00000000012230ee900503937205d1b6a6899128801a75b4b1d584f3c13e2fd4 +2136700 00000000002ae376a9bf93e1909594728aebda019466440037e75d3083e0b7e7 +2137028 00000000006023df4efc2a79131181cd46109b4bd788256ad10662edabbad5d1 +2137357 000000000057627e27490f20ff6290004762a698d7d69f9d818c2df2777d9282 +2137686 0000000000f52577e5e8392873b1206ccce3d4ea25360d297d3c3476dbd982de +2138018 000000000006e84370babab79c13faa64113afb4386a92375983d3a7987619ca +2138392 00000000010a100e0d11eabd1692eac1cb93989d2cd03b355e5b0240f77cf978 +2138792 00000000001c6417d7df1be185d6b0ec0657703eebb22e68a418a565da99dbad diff --git a/zebra-consensus/src/checkpoint/test-checkpoints.txt b/zebra-consensus/src/checkpoint/test-checkpoints.txt index e26e49c6347..f6fe84e09e1 100644 --- a/zebra-consensus/src/checkpoint/test-checkpoints.txt +++ b/zebra-consensus/src/checkpoint/test-checkpoints.txt @@ -5948,3 +5948,65 @@ 2378800 00192766442c4ecade78c79653645c5fb06cc99e26a900a5b1139dfbf470d6d0 2379200 004391bd427bde706e2754f5a5f84024536b8d27d763c37b5ecb9261bef359b9 2379600 0000a22e46cc27732a84126a2de66dfbe0bd31a8fcfbd314b773cdbb0624ab99 +2380000 0001cc2c2db186634b6820310aa9f7c5a1779e8027b446c966de2d4df1db119c +2380400 00138d1e655c247f4835b23bd67637a54f325074f48a6d5d8cfd198af1dd389e +2380800 0018c3e56d80300f2c933e7d605d7328706479fbbd426985669b67986aeaf241 +2381200 001eb8a8a29d3a665d7c9dd63e055950ba5f62e8cf9fee85dcaae129f72438c3 +2381600 00169effb224e50d189a3c80e1c8e20ae9ce89dec5d231f3cb4d9ad2ef188cad +2382000 003ef4a716a195588c7946a6a5fcfdac029f4674740d5aa71d7ad5c33530ca24 +2382400 0005cc2b3dead6906263c3f61f16e03b9e9418046a3bd1f44b1057e136a45513 +2382800 00462a258adde935bb9ddb900b595d340938c0a05155c6690bd0a2959b1115d1 +2383200 00187156e8329cc8f0374c7278c53a05dcc6b9fca8320c1a11eca1ea77fca05b +2383600 000b74dac7fe5f75926959a06d00a02f8bb8025766a1f484baa055dfa18d66ac +2384000 000df197d3dc51cae497b2853c6ce5ac8221f0e8fe20d6287a7d8a4cdfa6a9d9 +2384400 000af5b611047bfd10b5fdca61ff6d70a54fc0b94088f05e070877e400d7a551 +2384800 000e34fc2f2f29a8d32b04e6c8527608ca51ed3ab764d5e413ac14d86e0cc0b1 +2385200 001dd51a0f99105c819b165aa744867a05f706daf75b43fed397a61034ca150d +2385600 002373147ea295799c286bbcea88dcac18493dd7bc88c6e8afc1d649d07be0ec +2386000 000760d50b320d2143a522402f640f06774564e39b88abfe2638c4a3c5ee85c0 +2386400 000687e79efad695c376389d7b067a74cbcf7ff01d1503f40d13db6fbcc0f044 +2386800 001dba9917f4f3f03bd2113bdfb7606b374f583b26e1274234dfb014645542e1 +2387200 000f0e7482a8f65f5a7e8cc3bf9d3bc0b352c10f309a8e3048870e4a0d3f32a2 +2387600 001a75b87be98b8fc41bec67db3d5ca41c1cc73e86ad292d5498dafc8409f325 +2388000 000681e3c3dd26646a307943bb5e46abff6422681bfeb4e059ccce1d56a68b69 +2388400 001954d674bb1468c290ce6e41c9e30499c887b609a9feb5a13907744650ce2a +2388800 0026a02c112c93a3239d05f8c02f268bb9965ff149993f33ca7c821893fdd590 +2389200 00125d3b01118461734ea74ae3a0f0fe471cc2a86687cb767717f99ec702fde9 +2389600 0005876465b0416be5f26b2c3d0f89eb2575fbfb4a2739d16983f151f00e2bfb +2390000 00165f0dd4864f342c30158a6d7ecaad6eae3617388783346926fb477f69f3fe +2390400 000a864fe4954ac591be34451389367d06d70bd1cce51f35d21b4b199b55087c +2390800 0012a95faa1c1ecbc9328337827c3dd1b317b240bea483bd59bdd2f9fedf0b03 +2391200 0015984bead0ee986c0e55621f68c8c0b4b5cc0482ee4469b3179e5dfe85f5ca +2391600 006903d70ac042330094b2571789c62af43230467c8cf7982d0d76ffe6121d3e +2392000 00161e72c469aa7f8fad67138af97f4dee0d1efbcb7cdaa76979e065c908d8c3 +2392400 00016dfe99fbbc22672d52cf62fadcbdb451c1c8280dd829ff6f930833d8a905 +2392800 000690e3c90bfb4eb82b2dcdd0353d274a60a9cad309b0fec3e7458e7b65506b +2393200 000cc40350d6872b86abe8ce159ca0d8a5f275713b4d1c0d6d6db5f3f35d1d2f +2393600 000aae4b2b7d546f42fb3b73963cfd957324245ba470eebb2debf96a1e212450 +2394000 0072ce0c882d219ee14105040dac351f6b73b4735aac0ee699b0cbac8800307d +2394400 001913cae8692b3c6b645d86d0be6f43882bc11c0568017abfeee2febbc1e58c +2394800 001cffe7c7602e64a9cf6da7fa7b21ab475975b6aac94a2b4c9d4f6ac9771582 +2395200 00179a14baa1629fb4e937cdf6280375ae16312679ca27e23b236689423c0cac +2395600 0020b3e0e96d419ea0bbe1b45c1ab21440377a973d6b063368f47bf5dc4095a7 +2396000 0048d7587504d873ff5f25a419c258984acf384a3c3b7e3c29b39905f65fc610 +2396400 000296911fcca5522ecb2a00d5abb7718afc20c984c67446a1ac1255b3adbc49 +2396800 0033e251f1671667f60576fdc4736a3540a6cd6863646833b64b90294fcfa793 +2397200 0025444202d8824a1fce2f56594b5b215b41b43dab116526aa54f6fac328ec32 +2397600 0018efea056bd7e711ff110536e1fd06d72c3bcb59808ec78ecd6a8bc6f809e9 +2398000 001a8d6641c623e2217d8c8cd0ac1a4f431a096e4d4c234a23a75248e2934a98 +2398400 004e7e1176eb92c65814b208401b258149ebdbd4fc8e70356ce133ee20846412 +2398800 00104ca6428e88d1789492a302503471b8f81ec1d74dd4484621fcd836971923 +2399200 001a192b3b9c798ec182f1385e56245d8afb55698fe6e8f9ac3cbbe7c6a18a28 +2399600 0034e7c97a1a7755e9e83a69df53a7722ca3eeb7c827ca0212cff32a6ab7d224 +2400000 0014f90b82658ecce4b29d8c4e4b755324f5b75fb85b96421074c3bae652ce1c +2400400 008495070e1d0de594ecb8c74c0d79bc07c558661fe20f9492c60adff42983e7 +2400800 0009959bf6deb71a7198df94c2e607d23b887934dc0e3bd031c19b56f7df427b +2401200 0020158fed99b7bbe09e0470edc0632d05e7559cb31767f883ae8ee9dd3c3fa8 +2401600 00177c5621ac7a61674f66aa8e9015745c4b50f4c90b6b410ee9939dc7c2f136 +2402000 00018340c3a99b95f5de82c248ac47735cad3a0fbdc6006caa094db0673b38f0 +2402400 0018c3aa759949a1280b4f865c639609e82a9a1e27332264ca6f87a9c531634a +2402800 0009715feac14163c78a68f477608f0a6424efd02ffe936d7e9731241ee67078 +2403200 00058881db360bdf0245b5be0cd6bd85ef1650388a90eaa4a2f8644221b3459e +2403600 0067d8e71caef5f552904c15d8560500b810c2cce0928b630e8ac6382055ef89 +2404000 000a309d9d8ec47ed3be870aea4a03dd75822e88790229bc9bee09de86e0ebd0 +2404400 001d29fbe998d3039b6967f944f1b50e10ce70421d60d0ed87f39cf7d5a8e350 From 5bc646d3e13fe139bcc50a4149e3bfb6a179a599 Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 30 Jun 2023 11:26:37 +1000 Subject: [PATCH 6/7] chore: Release --- Cargo.lock | 24 ++++++++++++------------ tower-batch-control/Cargo.toml | 2 +- tower-fallback/Cargo.toml | 2 +- zebra-chain/Cargo.toml | 4 ++-- zebra-consensus/Cargo.toml | 14 +++++++------- zebra-network/Cargo.toml | 4 ++-- zebra-node-services/Cargo.toml | 4 ++-- zebra-rpc/Cargo.toml | 14 +++++++------- zebra-script/Cargo.toml | 4 ++-- zebra-state/Cargo.toml | 6 +++--- zebra-test/Cargo.toml | 2 +- zebra-utils/Cargo.toml | 8 ++++---- zebrad/Cargo.toml | 16 ++++++++-------- 13 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1263f4f5603..0f66e10d266 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4736,7 +4736,7 @@ dependencies = [ [[package]] name = "tower-batch-control" -version = "0.2.41-beta.2" +version = "0.2.41-beta.3" dependencies = [ "color-eyre", "ed25519-zebra", @@ -4760,7 +4760,7 @@ dependencies = [ [[package]] name = "tower-fallback" -version = "0.2.41-beta.2" +version = "0.2.41-beta.3" dependencies = [ "futures-core", "pin-project", @@ -5665,7 +5665,7 @@ dependencies = [ [[package]] name = "zebra-chain" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" dependencies = [ "bitflags 2.3.3", "bitflags-serde-legacy", @@ -5725,7 +5725,7 @@ dependencies = [ [[package]] name = "zebra-consensus" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" dependencies = [ "bellman", "blake2b_simd", @@ -5770,7 +5770,7 @@ dependencies = [ [[package]] name = "zebra-network" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" dependencies = [ "bitflags 2.3.3", "byteorder", @@ -5811,7 +5811,7 @@ dependencies = [ [[package]] name = "zebra-node-services" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" dependencies = [ "color-eyre", "jsonrpc-core", @@ -5823,7 +5823,7 @@ dependencies = [ [[package]] name = "zebra-rpc" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" dependencies = [ "chrono", "futures", @@ -5855,7 +5855,7 @@ dependencies = [ [[package]] name = "zebra-script" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" dependencies = [ "displaydoc", "hex", @@ -5868,7 +5868,7 @@ dependencies = [ [[package]] name = "zebra-state" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" dependencies = [ "bincode", "chrono", @@ -5910,7 +5910,7 @@ dependencies = [ [[package]] name = "zebra-test" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" dependencies = [ "color-eyre", "futures", @@ -5937,7 +5937,7 @@ dependencies = [ [[package]] name = "zebra-utils" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" dependencies = [ "color-eyre", "hex", @@ -5958,7 +5958,7 @@ dependencies = [ [[package]] name = "zebrad" -version = "1.0.0" +version = "1.0.1" dependencies = [ "abscissa_core", "atty", diff --git a/tower-batch-control/Cargo.toml b/tower-batch-control/Cargo.toml index 87c7f1fa7a6..a5b7309008e 100644 --- a/tower-batch-control/Cargo.toml +++ b/tower-batch-control/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tower-batch-control" -version = "0.2.41-beta.2" +version = "0.2.41-beta.3" authors = ["Zcash Foundation ", "Tower Maintainers "] description = "Tower middleware for batch request processing" # # Legal diff --git a/tower-fallback/Cargo.toml b/tower-fallback/Cargo.toml index fd18e859eee..8bab8620c48 100644 --- a/tower-fallback/Cargo.toml +++ b/tower-fallback/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tower-fallback" -version = "0.2.41-beta.2" +version = "0.2.41-beta.3" authors = ["Zcash Foundation "] description = "A Tower service combinator that sends requests to a first service, then retries processing on a second fallback service if the first service errors." license = "MIT OR Apache-2.0" diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 18209d99ce0..d53c8410f7d 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-chain" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" authors = ["Zcash Foundation "] description = "Core Zcash data structures" license = "MIT OR Apache-2.0" @@ -119,7 +119,7 @@ rand_chacha = { version = "0.3.1", optional = true } tokio = { version = "1.28.2", features = ["tracing"], optional = true } -zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.26", optional = true } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.27", optional = true } [dev-dependencies] # Benchmarks diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index ddea30687c5..1ca9c53c3ab 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-consensus" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" authors = ["Zcash Foundation "] description = "Implementation of Zcash consensus checks" license = "MIT OR Apache-2.0" @@ -62,13 +62,13 @@ orchard = "0.4.0" zcash_proofs = { version = "0.11.0", features = ["local-prover", "multicore", "download-params"] } -tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.2" } -tower-batch-control = { path = "../tower-batch-control/", version = "0.2.41-beta.2" } +tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.3" } +tower-batch-control = { path = "../tower-batch-control/", version = "0.2.41-beta.3" } -zebra-script = { path = "../zebra-script", version = "1.0.0-beta.26" } -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.26" } -zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.26" } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.26" } +zebra-script = { path = "../zebra-script", version = "1.0.0-beta.27" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.27" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.27" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.27" } # prod feature progress-bar howudoin = { version = "0.1.2", optional = true } diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index 1527d880612..0fc27c7c882 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-network" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" authors = ["Zcash Foundation ", "Tower Maintainers "] description = "Networking code for Zebra" # # Legal @@ -83,7 +83,7 @@ howudoin = { version = "0.1.2", optional = true } proptest = { version = "1.2.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.26" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.27" } [dev-dependencies] proptest = "1.2.0" diff --git a/zebra-node-services/Cargo.toml b/zebra-node-services/Cargo.toml index 11db2015541..76b2a841cb4 100644 --- a/zebra-node-services/Cargo.toml +++ b/zebra-node-services/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-node-services" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" authors = ["Zcash Foundation "] description = "The interfaces of some Zebra node services" license = "MIT OR Apache-2.0" @@ -35,7 +35,7 @@ rpc-client = [ ] [dependencies] -zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.26"} +zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.27" } # Optional dependencies diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index a41376cdecc..a7534ccc8b4 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-rpc" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" authors = ["Zcash Foundation "] description = "A Zebra JSON Remote Procedure Call (JSON-RPC) interface" license = "MIT OR Apache-2.0" @@ -70,12 +70,12 @@ zcash_address = { version = "0.2.1", optional = true } # Test-only feature proptest-impl proptest = { version = "1.2.0", optional = true } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.26", features = ["json-conversion"] } -zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.26" } -zebra-network = { path = "../zebra-network", version = "1.0.0-beta.26" } -zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.26" } -zebra-script = { path = "../zebra-script", version = "1.0.0-beta.26" } -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.26" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.27", features = ["json-conversion"] } +zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.27" } +zebra-network = { path = "../zebra-network", version = "1.0.0-beta.27" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.27" } +zebra-script = { path = "../zebra-script", version = "1.0.0-beta.27" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.27" } [dev-dependencies] insta = { version = "1.30.0", features = ["redactions", "json", "ron"] } diff --git a/zebra-script/Cargo.toml b/zebra-script/Cargo.toml index 697dd1a0d11..d1399b0d7bf 100644 --- a/zebra-script/Cargo.toml +++ b/zebra-script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-script" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" authors = ["Zcash Foundation "] description = "Zebra script verification wrapping zcashd's zcash_script library" license = "MIT OR Apache-2.0" @@ -17,7 +17,7 @@ categories = ["api-bindings", "cryptography::cryptocurrencies"] [dependencies] zcash_script = "0.1.12" -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.26" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.27" } thiserror = "1.0.40" displaydoc = "0.2.4" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index 512d2d09d31..2fa0ad2bb46 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-state" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" authors = ["Zcash Foundation "] description = "State contextual verification and storage code for Zebra" license = "MIT OR Apache-2.0" @@ -71,13 +71,13 @@ tracing = "0.1.37" elasticsearch = { version = "8.5.0-alpha.1", default-features = false, features = ["rustls-tls"], optional = true } serde_json = { version = "1.0.99", package = "serde_json", optional = true } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.26" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.27" } # prod feature progress-bar howudoin = { version = "0.1.2", optional = true } # test feature proptest-impl -zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.26", optional = true } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.27", optional = true } proptest = { version = "1.2.0", optional = true } proptest-derive = { version = "0.3.0", optional = true } diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 04d91019581..79497b24d60 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-test" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" authors = ["Zcash Foundation "] description = "Test harnesses and test vectors for Zebra" license = "MIT OR Apache-2.0" diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml index 4bf58589c88..f7a3d1c5611 100644 --- a/zebra-utils/Cargo.toml +++ b/zebra-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-utils" -version = "1.0.0-beta.26" +version = "1.0.0-beta.27" authors = ["Zcash Foundation "] description = "Developer tools for Zebra maintenance and testing" license = "MIT OR Apache-2.0" @@ -74,11 +74,11 @@ tracing-error = "0.2.0" tracing-subscriber = "0.3.17" thiserror = "1.0.40" -zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.26" } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.26" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.27" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.27" } # These crates are needed for the block-template-to-proposal binary -zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.26", optional = true } +zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.27", optional = true } # These crates are needed for the zebra-checkpoints binary itertools = { version = "0.11.0", optional = true } diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 8353fecf6ee..c2acd72b430 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -1,7 +1,7 @@ [package] # Crate metadata name = "zebrad" -version = "1.0.0" +version = "1.0.1" authors = ["Zcash Foundation "] description = "The Zcash Foundation's independent, consensus-compatible implementation of a Zcash node" license = "MIT OR Apache-2.0" @@ -128,14 +128,14 @@ test_sync_past_mandatory_checkpoint_mainnet = [] test_sync_past_mandatory_checkpoint_testnet = [] [dependencies] -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.26" } -zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.26" } -zebra-network = { path = "../zebra-network", version = "1.0.0-beta.26" } -zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.26" } -zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.26" } -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.26" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.27" } +zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.27" } +zebra-network = { path = "../zebra-network", version = "1.0.0-beta.27" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.27" } +zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.27" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.27" } # Required for crates.io publishing, but it's only used in tests -zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.26", optional = true } +zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.27", optional = true } abscissa_core = "0.7.0" clap = { version = "4.3.8", features = ["cargo"] } From 70418bc0a8b37c3d2ed2b6edf61c61266075d4d0 Mon Sep 17 00:00:00 2001 From: teor Date: Fri, 30 Jun 2023 11:55:35 +1000 Subject: [PATCH 7/7] Estimate release height for Zebra v1.0.1 Block height 2139118 at 2023-06-30 01:55:38 UTC Release is likely to be 2023-07-01 2139118 + 1152 * 3 = 2142574 Then round up to the nearest 1000. --- zebrad/src/components/sync/end_of_support.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zebrad/src/components/sync/end_of_support.rs b/zebrad/src/components/sync/end_of_support.rs index 9e4cb2aedeb..ead7b34e03b 100644 --- a/zebrad/src/components/sync/end_of_support.rs +++ b/zebrad/src/components/sync/end_of_support.rs @@ -12,8 +12,8 @@ use zebra_chain::{ use crate::application::release_version; -/// The estimated height that this release started to run. -pub const ESTIMATED_RELEASE_HEIGHT: u32 = 2_121_200; +/// The estimated height that this release will be published. +pub const ESTIMATED_RELEASE_HEIGHT: u32 = 2_143_000; /// The maximum number of days after `ESTIMATED_RELEASE_HEIGHT` where a Zebra server will run /// without halting.