Merge branch 'main' into regtest-internal-miner

Author: arya2

.github/workflows/scripts/release-crates-dry-run.sh

@@ -23,8 +23,8 @@ fi
 cargo release version --verbose --execute --no-confirm --allow-branch '*' --workspace --exclude zebrad --exclude zebra-scan --exclude zebra-grpc beta
 
 # 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.6
-cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-grpc 0.1.0-alpha.4
+cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-scan 0.1.0-alpha.7
+cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-grpc 0.1.0-alpha.5
 
 # Update zebrad:
 cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebrad patch

CHANGELOG.md

@@ -5,6 +5,32 @@ 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 1.7.0](https://github.com/ZcashFoundation/zebra/releases/tag/v1.7.0) - 2024-05-07
+
+In this release we introduce Regtest functionality to Zebra and restored Windows support. Also adjusted our Zebra release interval from 2 weeks to 6 weeks approximately.
+
+### Added
+
+- Preparing for upstream `zcash_client_backend` API changes ([#8425](https://github.com/ZcashFoundation/zebra/pull/8425))
+- Regtest support ([#8383](https://github.com/ZcashFoundation/zebra/pull/8383), [#8421](https://github.com/ZcashFoundation/zebra/pull/8421), [#8368](https://github.com/ZcashFoundation/zebra/pull/8368), [#8413](https://github.com/ZcashFoundation/zebra/pull/8413), [#8474](https://github.com/ZcashFoundation/zebra/pull/8474), [#8475](https://github.com/ZcashFoundation/zebra/pull/8475))
+- Allow Zebra users to contribute to the P2P network even if behind NAT or firewall ([#8488](https://github.com/ZcashFoundation/zebra/pull/8488))
+
+### Changed
+
+- Adjust estimated release interval to once every 6 weeks and the end of support from 16 to 20 weeks ([#8429](https://github.com/ZcashFoundation/zebra/pull/8429))
+
+### Fixed
+
+- Bump zcash script v0.1.15 and restore Windows support ([#8393](https://github.com/ZcashFoundation/zebra/pull/8393))
+- Avoid possibly returning data from different blocks in `z_get_treestate` RPC method ([#8460](https://github.com/ZcashFoundation/zebra/pull/8460))
+- Zebra panics with all features and no elasticsearch server available ([#8409](https://github.com/ZcashFoundation/zebra/pull/8409))
+
+### Contributors
+
+Thank you to everyone who contributed to this release, we couldn't make Zebra without you:
+@arya2, @oxarbitrage and @upbqdn
+
+
 ## [Zebra 1.6.1](https://github.com/ZcashFoundation/zebra/releases/tag/v1.6.1) - 2024-04-15
 
 This release adds an OpenAPI specification for Zebra's RPC methods and startup logs about Zebra's storage usage and other database information. 

Cargo.lock

@@ -1696,7 +1696,7 @@ dependencies = [
  "indexmap 2.2.6",
  "slab",
  "tokio",
- "tokio-util 0.7.10",
+ "tokio-util 0.7.11",
  "tracing",
 ]
 
@@ -1715,7 +1715,7 @@ dependencies = [
  "indexmap 2.2.6",
  "slab",
  "tokio",
- "tokio-util 0.7.10",
+ "tokio-util 0.7.11",
  "tracing",
 ]
 
@@ -3695,7 +3695,7 @@ dependencies = [
  "system-configuration",
  "tokio",
  "tokio-rustls",
- "tokio-util 0.7.10",
+ "tokio-util 0.7.11",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -4669,7 +4669,7 @@ dependencies = [
  "futures-core",
  "pin-project-lite",
  "tokio",
- "tokio-util 0.7.10",
+ "tokio-util 0.7.11",
 ]
 
 [[package]]
@@ -4701,16 +4701,15 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -4875,15 +4874,15 @@ dependencies = [
  "rand 0.8.5",
  "slab",
  "tokio",
- "tokio-util 0.7.10",
+ "tokio-util 0.7.11",
  "tower-layer",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "tower-batch-control"
-version = "0.2.41-beta.12"
+version = "0.2.41-beta.13"
 dependencies = [
  "color-eyre",
  "ed25519-zebra",
@@ -4895,7 +4894,7 @@ dependencies = [
  "tinyvec",
  "tokio",
  "tokio-test",
- "tokio-util 0.7.10",
+ "tokio-util 0.7.11",
  "tower",
  "tower-fallback",
  "tower-test",
@@ -4906,7 +4905,7 @@ dependencies = [
 
 [[package]]
 name = "tower-fallback"
-version = "0.2.41-beta.12"
+version = "0.2.41-beta.13"
 dependencies = [
  "futures-core",
  "pin-project",
@@ -5987,7 +5986,7 @@ dependencies = [
 
 [[package]]
 name = "zebra-chain"
-version = "1.0.0-beta.36"
+version = "1.0.0-beta.37"
 dependencies = [
  "bitflags 2.5.0",
  "bitflags-serde-legacy",
@@ -6050,7 +6049,7 @@ dependencies = [
 
 [[package]]
 name = "zebra-consensus"
-version = "1.0.0-beta.36"
+version = "1.0.0-beta.37"
 dependencies = [
  "bellman",
  "blake2b_simd",
@@ -6096,7 +6095,7 @@ dependencies = [
 
 [[package]]
 name = "zebra-grpc"
-version = "0.1.0-alpha.3"
+version = "0.1.0-alpha.4"
 dependencies = [
  "color-eyre",
  "futures-util",
@@ -6118,7 +6117,7 @@ dependencies = [
 
 [[package]]
 name = "zebra-network"
-version = "1.0.0-beta.36"
+version = "1.0.0-beta.37"
 dependencies = [
  "bitflags 2.5.0",
  "byteorder",
@@ -6147,7 +6146,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
- "tokio-util 0.7.10",
+ "tokio-util 0.7.11",
  "toml 0.8.12",
  "tower",
  "tracing",
@@ -6159,7 +6158,7 @@ dependencies = [
 
 [[package]]
 name = "zebra-node-services"
-version = "1.0.0-beta.36"
+version = "1.0.0-beta.37"
 dependencies = [
  "color-eyre",
  "jsonrpc-core",
@@ -6172,7 +6171,7 @@ dependencies = [
 
 [[package]]
 name = "zebra-rpc"
-version = "1.0.0-beta.36"
+version = "1.0.0-beta.37"
 dependencies = [
  "chrono",
  "futures",
@@ -6203,7 +6202,7 @@ dependencies = [
 
 [[package]]
 name = "zebra-scan"
-version = "0.1.0-alpha.5"
+version = "0.1.0-alpha.6"
 dependencies = [
  "bls12_381",
  "chrono",
@@ -6235,7 +6234,7 @@ dependencies = [
 
 [[package]]
 name = "zebra-script"
-version = "1.0.0-beta.36"
+version = "1.0.0-beta.37"
 dependencies = [
  "displaydoc",
  "hex",
@@ -6248,7 +6247,7 @@ dependencies = [
 
 [[package]]
 name = "zebra-state"
-version = "1.0.0-beta.36"
+version = "1.0.0-beta.37"
 dependencies = [
  "bincode",
  "chrono",
@@ -6293,7 +6292,7 @@ dependencies = [
 
 [[package]]
 name = "zebra-test"
-version = "1.0.0-beta.36"
+version = "1.0.0-beta.37"
 dependencies = [
  "color-eyre",
  "futures",
@@ -6321,7 +6320,7 @@ dependencies = [
 
 [[package]]
 name = "zebra-utils"
-version = "1.0.0-beta.36"
+version = "1.0.0-beta.37"
 dependencies = [
  "color-eyre",
  "hex",
@@ -6350,7 +6349,7 @@ dependencies = [
 
 [[package]]
 name = "zebrad"
-version = "1.6.1"
+version = "1.7.0"
 dependencies = [
  "abscissa_core",
  "atty",

README.md

@@ -68,7 +68,7 @@ Zebra is tested with the latest `stable` Rust version. Earlier versions are not
 supported or tested. Any Zebra release can start depending on new features in the
 latest stable Rust.
 
-Around every 4 weeks, we release a [new Zebra version](https://github.com/ZcashFoundation/zebra/releases).
+Around every 6 weeks, we release a [new Zebra version](https://github.com/ZcashFoundation/zebra/releases).
 
 Below are quick summaries for installing the dependencies on your machine.
 
@@ -185,8 +185,6 @@ There are a few bugs in Zebra that we're still working on fixing:
 
 - Block download and verification sometimes times out during Zebra's initial sync [#5709](https://github.com/ZcashFoundation/zebra/issues/5709). The full sync still finishes reasonably quickly.
 
-- No Windows support [#3801](https://github.com/ZcashFoundation/zebra/issues/3801). We used to test with Windows Server 2019, but not any more; `zcash_script` has recently been updated to compile with MSVC, we're now waiting on a `zcash_script` release and dependency update, see the issue for details.
-
 - Experimental Tor support is disabled until Zebra upgrades to the latest `arti-client`. This happened due to a Rust dependency conflict ([#5492](https://github.com/ZcashFoundation/zebra/issues/5492)) and is still an issue due to [another dependency conflict](https://github.com/ZcashFoundation/zebra/issues/8328#issuecomment-1969989648).
 
 ## Documentation

book/src/dev/release-process.md

@@ -95,7 +95,7 @@ In general, expect the following release cycle:
 
 * A major release for each network upgrade, whenever there are breaking changes to Zebra (by API, severe bugs or other kind of upgrades)
 * Minor releases for significant new Zebra features or severe bug fixes
-* A patch release around every 4 weeks
+* A patch release around every 6 weeks
 
 This cadence of releases gives eager developers access to new features as soon as they are fully developed and pass through our code review and integration testing processes, while maintaining the stability and reliability of the platform for production users that prefer to receive features after they have been validated by Zcash and other developers that use the pre-release builds.
 

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.6.1 https://github.com/ZcashFoundation/zebra.git
+git clone --depth 1 --branch v1.7.0 https://github.com/ZcashFoundation/zebra.git
 docker build --file docker/Dockerfile --target runtime --tag zebra:local .
 docker run --detach zebra:local
 ```

book/src/user/install.md

@@ -19,7 +19,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.6.1
+git checkout v1.7.0
 ```
 
 3. Build and Run `zebrad`
@@ -32,7 +32,7 @@ target/release/zebrad start
 ### Compiling from git using cargo install
 
 ```sh
-cargo install --git https://github.com/ZcashFoundation/zebra --tag v1.6.1 zebrad
+cargo install --git https://github.com/ZcashFoundation/zebra --tag v1.7.0 zebrad
 ```
 
 ### Compiling on ARM

tower-batch-control/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tower-batch-control"
-version = "0.2.41-beta.12"
+version = "0.2.41-beta.13"
 authors = ["Zcash Foundation <[email protected]>", "Tower Maintainers <[email protected]>"]
 description = "Tower middleware for batch request processing"
 # # Legal
@@ -27,7 +27,7 @@ futures-core = "0.3.28"
 pin-project = "1.1.5"
 rayon = "1.10.0"
 tokio = { version = "1.37.0", features = ["time", "sync", "tracing", "macros"] }
-tokio-util = "0.7.10"
+tokio-util = "0.7.11"
 tower = { version = "0.4.13", features = ["util", "buffer"] }
 tracing = "0.1.39"
 tracing-futures = "0.2.5"
@@ -43,7 +43,7 @@ rand = "0.8.5"
 
 tokio = { version = "1.37.0", features = ["full", "tracing", "test-util"] }
 tokio-test = "0.4.4"
-tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.12" }
+tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.13" }
 tower-test = "0.4.0"
 
-zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.36" }
+zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.37" }

tower-fallback/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tower-fallback"
-version = "0.2.41-beta.12"
+version = "0.2.41-beta.13"
 authors = ["Zcash Foundation <[email protected]>"]
 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.37.0", features = ["full", "tracing", "test-util"] }
 
-zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.36" }
+zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.37" }

zebra-chain/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zebra-chain"
-version = "1.0.0-beta.36"
+version = "1.0.0-beta.37"
 authors = ["Zcash Foundation <[email protected]>"]
 description = "Core Zcash data structures"
 license = "MIT OR Apache-2.0"
@@ -143,7 +143,7 @@ proptest-derive = { version = "0.4.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.36", optional = true }
+zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.37", optional = true }
 
 [dev-dependencies]
 # Benchmarks
@@ -166,7 +166,7 @@ rand_chacha = "0.3.1"
 
 tokio = { version = "1.37.0", features = ["full", "tracing", "test-util"] }
 
-zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.36" }
+zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.37" }
 
 [[bench]]
 name = "block"

zebra-chain/src/parameters.rs

@@ -12,6 +12,7 @@
 //! Typically, consensus parameters are accessed via a function that takes a
 //! `Network` and `block::Height`.
 
+pub mod constants;
 mod genesis;
 mod network;
 mod network_upgrade;

zebra-chain/src/parameters/constants.rs

@@ -0,0 +1,17 @@
+//! Definitions of Zebra chain constants, including:
+//! - slow start interval,
+//! - slow start shift
+
+use crate::block::Height;
+
+/// An initial period from Genesis to this Height where the block subsidy is gradually incremented. [What is slow-start mining][slow-mining]
+///
+/// [slow-mining]: https://z.cash/support/faq/#what-is-slow-start-mining
+pub const SLOW_START_INTERVAL: Height = Height(20_000);
+
+/// `SlowStartShift()` as described in [protocol specification §7.8][7.8]
+///
+/// [7.8]: https://zips.z.cash/protocol/protocol.pdf#subsidies
+///
+/// This calculation is exact, because `SLOW_START_INTERVAL` is divisible by 2.
+pub const SLOW_START_SHIFT: Height = Height(SLOW_START_INTERVAL.0 / 2);