From f45f6f282c7b1b3e82594de328a2d4f1849bc99a Mon Sep 17 00:00:00 2001 From: Marek Date: Sat, 26 Oct 2024 00:52:19 +0200 Subject: [PATCH] chore: Release v2.0.0 (#8974) * Update `CHANGELOG.md` * Update EOS * Update CHANGELOG.md Co-authored-by: Arya * Update `release crates` script * chore: Release --------- Co-authored-by: Arya --- .../scripts/release-crates-dry-run.sh | 11 ++++--- CHANGELOG.md | 23 ++++++++++++++ Cargo.lock | 28 ++++++++--------- book/src/user/docker.md | 2 +- book/src/user/install.md | 4 +-- tower-batch-control/Cargo.toml | 6 ++-- tower-fallback/Cargo.toml | 4 +-- zebra-chain/Cargo.toml | 6 ++-- zebra-consensus/Cargo.toml | 20 ++++++------- zebra-grpc/Cargo.toml | 6 ++-- zebra-network/Cargo.toml | 4 +-- zebra-node-services/Cargo.toml | 4 +-- zebra-rpc/Cargo.toml | 24 +++++++-------- zebra-scan/Cargo.toml | 20 ++++++------- zebra-script/Cargo.toml | 6 ++-- zebra-state/Cargo.toml | 10 +++---- zebra-test/Cargo.toml | 2 +- zebra-utils/Cargo.toml | 8 ++--- zebrad/Cargo.toml | 30 +++++++++---------- zebrad/src/components/sync/end_of_support.rs | 10 +++---- 20 files changed, 125 insertions(+), 103 deletions(-) diff --git a/.github/workflows/scripts/release-crates-dry-run.sh b/.github/workflows/scripts/release-crates-dry-run.sh index 434e2156acb..9935e23a947 100755 --- a/.github/workflows/scripts/release-crates-dry-run.sh +++ b/.github/workflows/scripts/release-crates-dry-run.sh @@ -2,7 +2,7 @@ set -ex # Check if necessary tools are installed -if ! command -v git &> /dev/null || ! command -v cargo &> /dev/null; then +if ! command -v git &>/dev/null || ! command -v cargo &>/dev/null; then echo "ERROR: Required tools (git, cargo) are not installed." exit 1 fi @@ -11,7 +11,7 @@ git config --global user.email "release-tests-no-reply@zfnd.org" git config --global user.name "Automated Release Test" # Ensure cargo-release is installed -if ! cargo release --version &> /dev/null; then +if ! cargo release --version &>/dev/null; then echo "ERROR: cargo release must be installed." exit 1 fi @@ -23,12 +23,11 @@ fi cargo release version --verbose --execute --no-confirm --allow-branch '*' --workspace --exclude zebrad --exclude zebra-scan --exclude zebra-grpc patch # Due to a bug in cargo-release, we need to pass exact versions for alpha crates: -cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-scan 0.1.0-alpha.9 -cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-grpc 0.1.0-alpha.7 +cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-scan 0.1.0-alpha.10 +cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-grpc 0.1.0-alpha.8 # Update zebrad: -# TODO: Revert `2.0.0-rc.0` to `patch` in the next release candidate. -cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebrad 2.0.0-rc.0 +cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebrad patch # Continue with the release process: cargo release replace --verbose --execute --no-confirm --allow-branch '*' --package zebrad cargo release commit --verbose --execute --no-confirm --allow-branch '*' diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b7d53e5c31..e5565429f8a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,29 @@ All notable changes to Zebra are documented in this file. 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 2.0.0](https://github.com/ZcashFoundation/zebra/releases/tag/v2.0.0) - 2024-10-25 + +This release brings full support for NU6. + +### Breaking Changes + +- Zebra now supports NU6 on Mainnet. +- The JSON RPC endpoint has a cookie-based authentication enabled by default. + +### Added + +- NU6-related documentation ([#8949](https://github.com/ZcashFoundation/zebra/pull/8949)) +- A cookie-based authentication system for the JSON RPC endpoint ([#8900](https://github.com/ZcashFoundation/zebra/pull/8900), [#8965](https://github.com/ZcashFoundation/zebra/pull/8965)) + +### Changed + +- Set the activation height of NU6 for Mainnet and bumped Zebra's current network protocol version ([#8960](https://github.com/ZcashFoundation/zebra/pull/8960)) + +### Contributors + +Thank you to everyone who contributed to this release, we couldn't make Zebra without you: +@arya2, @gustavovalverde, @oxarbitrage and @upbqdn. + ## [Zebra 2.0.0-rc.0](https://github.com/ZcashFoundation/zebra/releases/tag/v2.0.0-rc.0) - 2024-10-11 This version is a release candidate for the Zcash NU6 network upgrade on the Mainnet. While this version does not yet include the NU6 Mainnet activation height or current protocol version, all required functionality and tests are in place. diff --git a/Cargo.lock b/Cargo.lock index 5a5767b3c5a..14220da0ea0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4962,7 +4962,7 @@ dependencies = [ [[package]] name = "tower-batch-control" -version = "0.2.41-beta.16" +version = "0.2.41-beta.17" dependencies = [ "color-eyre", "ed25519-zebra", @@ -4985,7 +4985,7 @@ dependencies = [ [[package]] name = "tower-fallback" -version = "0.2.41-beta.16" +version = "0.2.41-beta.17" dependencies = [ "futures-core", "pin-project", @@ -6137,7 +6137,7 @@ dependencies = [ [[package]] name = "zebra-chain" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" dependencies = [ "bitflags 2.6.0", "bitflags-serde-legacy", @@ -6202,7 +6202,7 @@ dependencies = [ [[package]] name = "zebra-consensus" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" dependencies = [ "bellman", "blake2b_simd", @@ -6248,7 +6248,7 @@ dependencies = [ [[package]] name = "zebra-grpc" -version = "0.1.0-alpha.7" +version = "0.1.0-alpha.8" dependencies = [ "color-eyre", "futures-util", @@ -6270,7 +6270,7 @@ dependencies = [ [[package]] name = "zebra-network" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -6311,7 +6311,7 @@ dependencies = [ [[package]] name = "zebra-node-services" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" dependencies = [ "color-eyre", "jsonrpc-core", @@ -6324,7 +6324,7 @@ dependencies = [ [[package]] name = "zebra-rpc" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" dependencies = [ "base64 0.22.1", "chrono", @@ -6363,7 +6363,7 @@ dependencies = [ [[package]] name = "zebra-scan" -version = "0.1.0-alpha.9" +version = "0.1.0-alpha.10" dependencies = [ "bls12_381", "chrono", @@ -6409,7 +6409,7 @@ dependencies = [ [[package]] name = "zebra-script" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" dependencies = [ "hex", "lazy_static", @@ -6421,7 +6421,7 @@ dependencies = [ [[package]] name = "zebra-state" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" dependencies = [ "bincode", "chrono", @@ -6466,7 +6466,7 @@ dependencies = [ [[package]] name = "zebra-test" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" dependencies = [ "color-eyre", "futures", @@ -6494,7 +6494,7 @@ dependencies = [ [[package]] name = "zebra-utils" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" dependencies = [ "color-eyre", "hex", @@ -6525,7 +6525,7 @@ dependencies = [ [[package]] name = "zebrad" -version = "2.0.0-rc.0" +version = "2.0.0" dependencies = [ "abscissa_core", "atty", diff --git a/book/src/user/docker.md b/book/src/user/docker.md index bcd33b30794..90491024df3 100644 --- a/book/src/user/docker.md +++ b/book/src/user/docker.md @@ -37,7 +37,7 @@ docker run -d --platform linux/amd64 \ ### Build it locally ```shell -git clone --depth 1 --branch v1.9.0 https://github.com/ZcashFoundation/zebra.git +git clone --depth 1 --branch v2.0.0 https://github.com/ZcashFoundation/zebra.git docker build --file docker/Dockerfile --target runtime --tag zebra:local . docker run --detach zebra:local ``` diff --git a/book/src/user/install.md b/book/src/user/install.md index 710ee1fdbf5..6648339f743 100644 --- a/book/src/user/install.md +++ b/book/src/user/install.md @@ -76,7 +76,7 @@ To compile Zebra directly from GitHub, or from a GitHub release source archive: ```sh git clone https://github.com/ZcashFoundation/zebra.git cd zebra -git checkout v1.9.0 +git checkout v2.0.0 ``` 3. Build and Run `zebrad` @@ -89,7 +89,7 @@ target/release/zebrad start ### Compiling from git using cargo install ```sh -cargo install --git https://github.com/ZcashFoundation/zebra --tag v1.9.0 zebrad +cargo install --git https://github.com/ZcashFoundation/zebra --tag v2.0.0 zebrad ``` ### Compiling on ARM diff --git a/tower-batch-control/Cargo.toml b/tower-batch-control/Cargo.toml index 993b4cbc7d3..398a2baddbc 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.16" +version = "0.2.41-beta.17" authors = ["Zcash Foundation ", "Tower Maintainers "] description = "Tower middleware for batch request processing" # # Legal @@ -43,10 +43,10 @@ rand = "0.8.5" tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } tokio-test = "0.4.4" -tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.16" } +tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.17" } tower-test = "0.4.0" -zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.40" } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.41" } [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] } diff --git a/tower-fallback/Cargo.toml b/tower-fallback/Cargo.toml index 9ca8691b135..5919b1bc632 100644 --- a/tower-fallback/Cargo.toml +++ b/tower-fallback/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tower-fallback" -version = "0.2.41-beta.16" +version = "0.2.41-beta.17" 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" @@ -24,4 +24,4 @@ tracing = "0.1.39" [dev-dependencies] tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } -zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.40" } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.41" } diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 50779cb0359..4ab99fd8857 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-chain" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" authors = ["Zcash Foundation "] description = "Core Zcash data structures" license = "MIT OR Apache-2.0" @@ -145,7 +145,7 @@ proptest-derive = { version = "0.5.0", optional = true } rand = { version = "0.8.5", optional = true } rand_chacha = { version = "0.3.1", optional = true } -zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.40", optional = true } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.41", optional = true } [dev-dependencies] # Benchmarks @@ -168,7 +168,7 @@ rand_chacha = "0.3.1" tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } -zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.40" } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.41" } [[bench]] name = "block" diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index 2a680d144b9..2dd58ed562d 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-consensus" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" authors = ["Zcash Foundation "] description = "Implementation of Zcash consensus checks" license = "MIT OR Apache-2.0" @@ -63,13 +63,13 @@ orchard.workspace = true zcash_proofs = { workspace = true, features = ["multicore" ] } wagyu-zcash-parameters = "0.2.0" -tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.16" } -tower-batch-control = { path = "../tower-batch-control/", version = "0.2.41-beta.16" } +tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.17" } +tower-batch-control = { path = "../tower-batch-control/", version = "0.2.41-beta.17" } -zebra-script = { path = "../zebra-script", version = "1.0.0-beta.40" } -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.40" } -zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.40" } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40" } +zebra-script = { path = "../zebra-script", version = "1.0.0-beta.41" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.41" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.41" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41" } # prod feature progress-bar howudoin = { version = "0.1.2", optional = true } @@ -94,6 +94,6 @@ tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } tracing-error = "0.2.0" tracing-subscriber = "0.3.18" -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.40", features = ["proptest-impl"] } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40", features = ["proptest-impl"] } -zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.40" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.41", features = ["proptest-impl"] } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41", features = ["proptest-impl"] } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.41" } diff --git a/zebra-grpc/Cargo.toml b/zebra-grpc/Cargo.toml index ab273b66e97..cc57da114a1 100644 --- a/zebra-grpc/Cargo.toml +++ b/zebra-grpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-grpc" -version = "0.1.0-alpha.7" +version = "0.1.0-alpha.8" authors = ["Zcash Foundation "] description = "Zebra gRPC interface" license = "MIT OR Apache-2.0" @@ -28,8 +28,8 @@ color-eyre = "0.6.3" zcash_primitives.workspace = true -zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.40", features = ["shielded-scan"] } -zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.40" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.41", features = ["shielded-scan"] } +zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.41" } [build-dependencies] tonic-build = "0.12.3" diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index ae02c4a6a5b..77eb565c0d1 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-network" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" 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.4.0", optional = true } proptest-derive = { version = "0.5.0", optional = true } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40", features = ["async-error"] } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41", features = ["async-error"] } [dev-dependencies] proptest = "1.4.0" diff --git a/zebra-node-services/Cargo.toml b/zebra-node-services/Cargo.toml index aa0fb7e902e..130f6da481f 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.40" +version = "1.0.0-beta.41" authors = ["Zcash Foundation "] description = "The interfaces of some Zebra node services" license = "MIT OR Apache-2.0" @@ -37,7 +37,7 @@ rpc-client = [ shielded-scan = [] [dependencies] -zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.40" } +zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.41" } # Optional dependencies diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index da909de70fc..1562a77677e 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-rpc" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" authors = ["Zcash Foundation "] description = "A Zebra JSON Remote Procedure Call (JSON-RPC) interface" license = "MIT OR Apache-2.0" @@ -104,16 +104,16 @@ zcash_address = { workspace = true, optional = true} # Test-only feature proptest-impl proptest = { version = "1.4.0", optional = true } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40", features = [ +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41", features = [ "json-conversion", ] } -zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.40" } -zebra-network = { path = "../zebra-network", version = "1.0.0-beta.40" } -zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.40", features = [ +zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.41" } +zebra-network = { path = "../zebra-network", version = "1.0.0-beta.41" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.41", features = [ "rpc-client", ] } -zebra-script = { path = "../zebra-script", version = "1.0.0-beta.40" } -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.40" } +zebra-script = { path = "../zebra-script", version = "1.0.0-beta.41" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.41" } [build-dependencies] tonic-build = { version = "0.12.3", optional = true } @@ -126,17 +126,17 @@ proptest = "1.4.0" thiserror = "1.0.64" tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40", features = [ +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41", features = [ "proptest-impl", ] } -zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.40", features = [ +zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.41", features = [ "proptest-impl", ] } -zebra-network = { path = "../zebra-network", version = "1.0.0-beta.40", features = [ +zebra-network = { path = "../zebra-network", version = "1.0.0-beta.41", features = [ "proptest-impl", ] } -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.40", features = [ +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.41", features = [ "proptest-impl", ] } -zebra-test = { path = "../zebra-test", version = "1.0.0-beta.40" } +zebra-test = { path = "../zebra-test", version = "1.0.0-beta.41" } diff --git a/zebra-scan/Cargo.toml b/zebra-scan/Cargo.toml index b66f38520cc..4c13ed02050 100644 --- a/zebra-scan/Cargo.toml +++ b/zebra-scan/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-scan" -version = "0.1.0-alpha.9" +version = "0.1.0-alpha.10" authors = ["Zcash Foundation "] description = "Shielded transaction scanner for the Zcash blockchain" license = "MIT OR Apache-2.0" @@ -77,11 +77,11 @@ zcash_primitives.workspace = true zcash_address.workspace = true sapling-crypto.workspace = true -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40", features = ["shielded-scan"] } -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.40", features = ["shielded-scan"] } -zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.40", features = ["shielded-scan"] } -zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.7" } -zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.40" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41", features = ["shielded-scan"] } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.41", features = ["shielded-scan"] } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.41", features = ["shielded-scan"] } +zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.8" } +zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.41" } chrono = { version = "0.4.38", default-features = false, features = ["clock", "std", "serde"] } @@ -96,7 +96,7 @@ jubjub = { version = "0.10.0", optional = true } rand = { version = "0.8.5", optional = true } zcash_note_encryption = { version = "0.4.0", optional = true } -zebra-test = { path = "../zebra-test", version = "1.0.0-beta.40", optional = true } +zebra-test = { path = "../zebra-test", version = "1.0.0-beta.41", optional = true } # zebra-scanner binary dependencies tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } @@ -107,7 +107,7 @@ serde_json = "1.0.132" jsonrpc = { version = "0.18.0", optional = true } hex = { version = "0.4.3", optional = true } -zebrad = { path = "../zebrad", version = "2.0.0-rc.0" } +zebrad = { path = "../zebrad", version = "2.0.0" } [dev-dependencies] insta = { version = "1.40.0", features = ["ron", "redactions"] } @@ -125,6 +125,6 @@ zcash_note_encryption = "0.4.0" toml = "0.8.19" tonic = "0.12.3" -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.40", features = ["proptest-impl"] } -zebra-test = { path = "../zebra-test", version = "1.0.0-beta.40" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.41", features = ["proptest-impl"] } +zebra-test = { path = "../zebra-test", version = "1.0.0-beta.41" } diff --git a/zebra-script/Cargo.toml b/zebra-script/Cargo.toml index 28d748c8eff..92fdf77077a 100644 --- a/zebra-script/Cargo.toml +++ b/zebra-script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-script" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" authors = ["Zcash Foundation "] description = "Zebra script verification wrapping zcashd's zcash_script library" license = "MIT OR Apache-2.0" @@ -16,11 +16,11 @@ categories = ["api-bindings", "cryptography::cryptocurrencies"] [dependencies] zcash_script = "0.2.0" -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41" } thiserror = "1.0.64" [dev-dependencies] hex = "0.4.3" lazy_static = "1.4.0" -zebra-test = { path = "../zebra-test", version = "1.0.0-beta.40" } +zebra-test = { path = "../zebra-test", version = "1.0.0-beta.41" } diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index 3ed659f2a6d..6bdfdaaeb66 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-state" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" authors = ["Zcash Foundation "] description = "State contextual verification and storage code for Zebra" license = "MIT OR Apache-2.0" @@ -77,13 +77,13 @@ tracing = "0.1.39" elasticsearch = { version = "8.5.0-alpha.1", default-features = false, features = ["rustls-tls"], optional = true } serde_json = { version = "1.0.132", package = "serde_json", optional = true } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40", features = ["async-error"] } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41", features = ["async-error"] } # 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.40", optional = true } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.41", optional = true } proptest = { version = "1.4.0", optional = true } proptest-derive = { version = "0.5.0", optional = true } @@ -108,5 +108,5 @@ jubjub = "0.10.0" tokio = { version = "1.41.0", features = ["full", "tracing", "test-util"] } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40", features = ["proptest-impl"] } -zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.40" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41", features = ["proptest-impl"] } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.41" } diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 837c5f685a5..c430257f5ef 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-test" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" 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 3d925649aec..0c46395b072 100644 --- a/zebra-utils/Cargo.toml +++ b/zebra-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-utils" -version = "1.0.0-beta.40" +version = "1.0.0-beta.41" authors = ["Zcash Foundation "] description = "Developer tools for Zebra maintenance and testing" license = "MIT OR Apache-2.0" @@ -94,11 +94,11 @@ tracing-error = "0.2.0" tracing-subscriber = "0.3.18" thiserror = "1.0.64" -zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.40" } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.41" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41" } # These crates are needed for the block-template-to-proposal binary -zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.40", optional = true } +zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.41", optional = true } # These crates are needed for the zebra-checkpoints binary itertools = { version = "0.13.0", optional = true } diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 73a5139395f..2bea0392f9d 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -1,7 +1,7 @@ [package] # Crate metadata name = "zebrad" -version = "2.0.0-rc.0" +version = "2.0.0" authors = ["Zcash Foundation "] description = "The Zcash Foundation's independent, consensus-compatible implementation of a Zcash node" license = "MIT OR Apache-2.0" @@ -157,15 +157,15 @@ test_sync_past_mandatory_checkpoint_mainnet = [] test_sync_past_mandatory_checkpoint_testnet = [] [dependencies] -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40" } -zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.40" } -zebra-network = { path = "../zebra-network", version = "1.0.0-beta.40" } -zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.40", features = ["rpc-client"] } -zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.40" } -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.40" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41" } +zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.41" } +zebra-network = { path = "../zebra-network", version = "1.0.0-beta.41" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.41", features = ["rpc-client"] } +zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.41" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.41" } # Required for crates.io publishing, but it's only used in tests -zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.40", optional = true } +zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.41", optional = true } abscissa_core = "0.7.0" clap = { version = "4.5.20", features = ["cargo"] } @@ -279,13 +279,13 @@ proptest-derive = "0.5.0" # enable span traces and track caller in tests color-eyre = { version = "0.6.3" } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.40", features = ["proptest-impl"] } -zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.40", features = ["proptest-impl"] } -zebra-network = { path = "../zebra-network", version = "1.0.0-beta.40", features = ["proptest-impl"] } -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.40", features = ["proptest-impl"] } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41", features = ["proptest-impl"] } +zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.41", features = ["proptest-impl"] } +zebra-network = { path = "../zebra-network", version = "1.0.0-beta.41", features = ["proptest-impl"] } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.41", features = ["proptest-impl"] } -zebra-test = { path = "../zebra-test", version = "1.0.0-beta.40" } -zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.7" } +zebra-test = { path = "../zebra-test", version = "1.0.0-beta.41" } +zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.8" } # Used by the checkpoint generation tests via the zebra-checkpoints feature # (the binaries in this crate won't be built unless their features are enabled). @@ -296,7 +296,7 @@ zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.7" } # When `-Z bindeps` is stabilised, enable this binary dependency instead: # https://github.com/rust-lang/cargo/issues/9096 # zebra-utils { path = "../zebra-utils", artifact = "bin:zebra-checkpoints" } -zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.40" } +zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.41" } [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] } diff --git a/zebrad/src/components/sync/end_of_support.rs b/zebrad/src/components/sync/end_of_support.rs index 1ba3c1863c8..0e54a978d04 100644 --- a/zebrad/src/components/sync/end_of_support.rs +++ b/zebrad/src/components/sync/end_of_support.rs @@ -13,17 +13,17 @@ use zebra_chain::{ use crate::application::release_version; /// The estimated height that this release will be published. -pub const ESTIMATED_RELEASE_HEIGHT: u32 = 2_678_363; +pub const ESTIMATED_RELEASE_HEIGHT: u32 = 2_694_000; /// The maximum number of days after `ESTIMATED_RELEASE_HEIGHT` where a Zebra server will run /// without halting. /// /// Notes: /// -/// - Zebra will exit with a panic if the current tip height is bigger than the `ESTIMATED_RELEASE_HEIGHT` -/// plus this number of days. -/// - Currently set to 5 weeks to end support before Mainnet Nu6 activation at block [`2_726_400`](https://zips.z.cash/zip-0253). -pub const EOS_PANIC_AFTER: u32 = 35; +/// - Zebra will exit with a panic if the current tip height is bigger than the +/// `ESTIMATED_RELEASE_HEIGHT` plus this number of days. +/// - Currently set to 16 weeks. +pub const EOS_PANIC_AFTER: u32 = 112; /// The number of days before the end of support where Zebra will display warnings. pub const EOS_WARN_AFTER: u32 = EOS_PANIC_AFTER - 14;