From d9300300874e8267355c164b44e0d48b7b901e76 Mon Sep 17 00:00:00 2001 From: Marek Date: Wed, 30 Oct 2024 00:33:44 +0100 Subject: [PATCH 1/8] change(deps): Use ECC deps with activation height for NU6 (#8978) * Remove temporary dependency patches We need to enable the `legacy-api` feature of `incrementalmerkletree` to be able to serialize note commitment trees using an old serialization format for the `z_gettreestate` RPC. * Use spaces instead of a tab * Bump ECC deps to match `zcashd` --- Cargo.lock | 230 +++++++++++++++-------------------------------------- Cargo.toml | 34 +++----- 2 files changed, 76 insertions(+), 188 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 14220da0ea0..c1fe19bc718 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -566,7 +566,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cef977c7f8e75aa81fc589064c121ab8d32448b7939d34d58df479aa93e65ea5" dependencies = [ - "incrementalmerkletree 0.7.0", + "incrementalmerkletree", ] [[package]] @@ -1343,15 +1343,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "equihash" -version = "0.2.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792#1410f1449100a417bfbc4f6c7167aa9808e38792" -dependencies = [ - "blake2b_simd", - "byteorder", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -1387,14 +1378,6 @@ dependencies = [ "blake2b_simd", ] -[[package]] -name = "f4jumble" -version = "0.1.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792#1410f1449100a417bfbc4f6c7167aa9808e38792" -dependencies = [ - "blake2b_simd", -] - [[package]] name = "fastrand" version = "2.1.1" @@ -2157,19 +2140,11 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "incrementalmerkletree" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75346da3bd8e3d8891d02508245ed2df34447ca6637e343829f8d08986e9cde2" -dependencies = [ - "either", -] - [[package]] name = "incrementalmerkletree" version = "0.7.0" -source = "git+https://github.com/zcash/incrementalmerkletree?rev=ffe4234788fd22662b937ba7c6ea01535fcc1293#ffe4234788fd22662b937ba7c6ea01535fcc1293" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d45063fbc4b0a37837f6bfe0445f269d13d730ad0aa3b5a7f74aa7bf27a0f4df" dependencies = [ "either", ] @@ -2876,8 +2851,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orchard" -version = "0.9.1" -source = "git+https://github.com/zcash/orchard?rev=55fb089a335bbbc1cda186c706bc037073df8eb7#55fb089a335bbbc1cda186c706bc037073df8eb7" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f18e997fa121de5c73e95cdc7e8512ae43b7de38904aeea5e5713cc48f3c0ba" dependencies = [ "aes", "bitvec", @@ -2888,7 +2864,7 @@ dependencies = [ "halo2_gadgets", "halo2_proofs", "hex", - "incrementalmerkletree 0.7.0", + "incrementalmerkletree", "lazy_static", "memuse", "nonempty", @@ -4006,8 +3982,9 @@ dependencies = [ [[package]] name = "sapling-crypto" -version = "0.2.0" -source = "git+https://github.com/zcash/sapling-crypto?rev=b1ad3694ee13a2fc5d291ad04721a6252da0993c#b1ad3694ee13a2fc5d291ad04721a6252da0993c" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfff8cfce16aeb38da50b8e2ed33c9018f30552beff2210c266662a021b17f38" dependencies = [ "aes", "bellman", @@ -4021,7 +3998,7 @@ dependencies = [ "fpe", "group", "hex", - "incrementalmerkletree 0.7.0", + "incrementalmerkletree", "jubjub", "lazy_static", "memuse", @@ -4342,12 +4319,13 @@ dependencies = [ [[package]] name = "shardtree" -version = "0.4.0" -source = "git+https://github.com/zcash/incrementalmerkletree?rev=ffe4234788fd22662b937ba7c6ea01535fcc1293#ffe4234788fd22662b937ba7c6ea01535fcc1293" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5f2390975ebfe8838f9e861f7a588123d49a7a7a0a08568ea831d8ad53fc9b4" dependencies = [ "bitflags 2.6.0", "either", - "incrementalmerkletree 0.7.0", + "incrementalmerkletree", "tracing", ] @@ -5856,33 +5834,22 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "zcash_address" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6d26f21381dc220836dd8d2a9a10dbe85928a26232b011bc6a42b611789b743" +checksum = "4ff95eac82f71286a79c750e674550d64fb2b7aadaef7b89286b2917f645457d" dependencies = [ "bech32", "bs58", - "f4jumble 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "f4jumble", "zcash_encoding", - "zcash_protocol 0.2.0", -] - -[[package]] -name = "zcash_address" -version = "0.5.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792#1410f1449100a417bfbc4f6c7167aa9808e38792" -dependencies = [ - "bech32", - "bs58", - "f4jumble 0.1.0 (git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792)", - "zcash_encoding", - "zcash_protocol 0.3.0", + "zcash_protocol", ] [[package]] name = "zcash_client_backend" -version = "0.13.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792#1410f1449100a417bfbc4f6c7167aa9808e38792" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbeeede366fdb642710d3c59fc2090489affd075f66db53ed11bb7138d2d0258" dependencies = [ "base64 0.22.1", "bech32", @@ -5892,7 +5859,7 @@ dependencies = [ "document-features", "group", "hex", - "incrementalmerkletree 0.7.0", + "incrementalmerkletree", "memuse", "nom", "nonempty", @@ -5908,12 +5875,12 @@ dependencies = [ "tonic-build", "tracing", "which", - "zcash_address 0.5.0", + "zcash_address", "zcash_encoding", - "zcash_keys 0.3.0 (git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792)", + "zcash_keys", "zcash_note_encryption", - "zcash_primitives 0.17.0", - "zcash_protocol 0.3.0", + "zcash_primitives", + "zcash_protocol", "zip32", "zip321", ] @@ -5921,7 +5888,8 @@ dependencies = [ [[package]] name = "zcash_encoding" version = "0.2.1" -source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792#1410f1449100a417bfbc4f6c7167aa9808e38792" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052d8230202f0a018cd9b5d1b56b94cd25e18eccc2d8665073bcea8261ab87fc" dependencies = [ "byteorder", "nonempty", @@ -5930,7 +5898,8 @@ dependencies = [ [[package]] name = "zcash_history" version = "0.4.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792#1410f1449100a417bfbc4f6c7167aa9808e38792" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fde17bf53792f9c756b313730da14880257d7661b5bfc69d0571c3a7c11a76d" dependencies = [ "blake2b_simd", "byteorder", @@ -5939,34 +5908,9 @@ dependencies = [ [[package]] name = "zcash_keys" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712faf4070107ab0b2828d0eda6aeaf4c3cb02564109832d95b97ad3467c95a5" -dependencies = [ - "bech32", - "blake2b_simd", - "bls12_381", - "bs58", - "document-features", - "group", - "memuse", - "nonempty", - "rand_core 0.6.4", - "sapling-crypto", - "secrecy", - "subtle", - "tracing", - "zcash_address 0.4.0", - "zcash_encoding", - "zcash_primitives 0.16.0", - "zcash_protocol 0.2.0", - "zip32", -] - -[[package]] -name = "zcash_keys" -version = "0.3.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792#1410f1449100a417bfbc4f6c7167aa9808e38792" +checksum = "e8162c94957f1e379b8e2fb30f97b95cfa93ac9c6bc02895946ca6392d1abb81" dependencies = [ "bech32", "blake2b_simd", @@ -5981,10 +5925,10 @@ dependencies = [ "secrecy", "subtle", "tracing", - "zcash_address 0.5.0", + "zcash_address", "zcash_encoding", - "zcash_primitives 0.17.0", - "zcash_protocol 0.3.0", + "zcash_primitives", + "zcash_protocol", "zip32", ] @@ -6003,44 +5947,9 @@ dependencies = [ [[package]] name = "zcash_primitives" -version = "0.16.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f044bc9cf2887ec408196fbafb44749e5581f57cc18d8da7aabaeb60cc40c64" -dependencies = [ - "aes", - "blake2b_simd", - "bs58", - "byteorder", - "document-features", - "equihash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ff", - "fpe", - "group", - "hex", - "incrementalmerkletree 0.6.0", - "jubjub", - "memuse", - "nonempty", - "orchard", - "rand 0.8.5", - "rand_core 0.6.4", - "redjubjub", - "sapling-crypto", - "sha2", - "subtle", - "tracing", - "zcash_address 0.4.0", - "zcash_encoding", - "zcash_note_encryption", - "zcash_protocol 0.2.0", - "zcash_spec", - "zip32", -] - -[[package]] -name = "zcash_primitives" -version = "0.17.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792#1410f1449100a417bfbc4f6c7167aa9808e38792" +checksum = "6ab47d526d7fd6f88b3a2854ad81b54757a80c2aeadd1d8b06f690556af9743c" dependencies = [ "aes", "bip32", @@ -6048,12 +5957,12 @@ dependencies = [ "bs58", "byteorder", "document-features", - "equihash 0.2.0 (git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792)", + "equihash", "ff", "fpe", "group", "hex", - "incrementalmerkletree 0.7.0", + "incrementalmerkletree", "jubjub", "memuse", "nonempty", @@ -6067,18 +5976,19 @@ dependencies = [ "sha2", "subtle", "tracing", - "zcash_address 0.5.0", + "zcash_address", "zcash_encoding", "zcash_note_encryption", - "zcash_protocol 0.3.0", + "zcash_protocol", "zcash_spec", "zip32", ] [[package]] name = "zcash_proofs" -version = "0.17.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792#1410f1449100a417bfbc4f6c7167aa9808e38792" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daba607872e60d91a09248d8e1ea3d6801c819fb80d67016d9de02d81323c10d" dependencies = [ "bellman", "blake2b_simd", @@ -6094,23 +6004,14 @@ dependencies = [ "sapling-crypto", "tracing", "xdg", - "zcash_primitives 0.17.0", + "zcash_primitives", ] [[package]] name = "zcash_protocol" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f35eac659fdbba614333d119217c5963c0d7cea43aee33176c4f2f95e5460d8d" -dependencies = [ - "document-features", - "memuse", -] - -[[package]] -name = "zcash_protocol" -version = "0.3.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792#1410f1449100a417bfbc4f6c7167aa9808e38792" +checksum = "6bc22b9155b2c7eb20105cd06de170d188c1bc86489b92aa3fda7b8da8d96acf" dependencies = [ "document-features", "memuse", @@ -6152,13 +6053,13 @@ dependencies = [ "criterion", "dirs", "ed25519-zebra", - "equihash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "equihash", "futures", "group", "halo2_proofs", "hex", "humantime", - "incrementalmerkletree 0.7.0", + "incrementalmerkletree", "itertools 0.13.0", "jubjub", "lazy_static", @@ -6190,13 +6091,13 @@ dependencies = [ "tracing", "uint 0.10.0", "x25519-dalek", - "zcash_address 0.5.0", + "zcash_address", "zcash_client_backend", "zcash_encoding", "zcash_history", "zcash_note_encryption", - "zcash_primitives 0.17.0", - "zcash_protocol 0.3.0", + "zcash_primitives", + "zcash_protocol", "zebra-test", ] @@ -6261,7 +6162,7 @@ dependencies = [ "tonic-build", "tonic-reflection", "tower 0.4.13", - "zcash_primitives 0.17.0", + "zcash_primitives", "zebra-chain", "zebra-node-services", "zebra-state", @@ -6350,8 +6251,8 @@ dependencies = [ "tonic-reflection", "tower 0.4.13", "tracing", - "zcash_address 0.5.0", - "zcash_primitives 0.17.0", + "zcash_address", + "zcash_primitives", "zebra-chain", "zebra-consensus", "zebra-network", @@ -6393,11 +6294,11 @@ dependencies = [ "tower 0.4.13", "tracing", "tracing-subscriber", - "zcash_address 0.5.0", + "zcash_address", "zcash_client_backend", - "zcash_keys 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "zcash_keys", "zcash_note_encryption", - "zcash_primitives 0.17.0", + "zcash_primitives", "zebra-chain", "zebra-grpc", "zebra-node-services", @@ -6516,8 +6417,8 @@ dependencies = [ "tracing-error", "tracing-subscriber", "zcash_client_backend", - "zcash_primitives 0.17.0", - "zcash_protocol 0.3.0", + "zcash_primitives", + "zcash_protocol", "zebra-chain", "zebra-node-services", "zebra-rpc", @@ -6650,12 +6551,13 @@ dependencies = [ [[package]] name = "zip321" -version = "0.1.0" -source = "git+https://github.com/zcash/librustzcash.git?rev=1410f1449100a417bfbc4f6c7167aa9808e38792#1410f1449100a417bfbc4f6c7167aa9808e38792" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3e613defb0940acef1f54774b51c7f48f2fa705613dd800870dc69f35cd2ea" dependencies = [ "base64 0.22.1", "nom", "percent-encoding", - "zcash_address 0.5.0", - "zcash_protocol 0.3.0", + "zcash_address", + "zcash_protocol", ] diff --git a/Cargo.toml b/Cargo.toml index 976c259130d..c50c93ad414 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ "zebra-test", "zebra-utils", "zebra-scan", - "zebra-grpc", + "zebra-grpc", "tower-batch-control", "tower-fallback", ] @@ -22,17 +22,17 @@ resolver = "2" # `cargo release` settings [workspace.dependencies] -incrementalmerkletree = "0.7.0" -orchard = "0.9.0" -sapling-crypto = "0.2.0" -zcash_address = "0.5.0" -zcash_client_backend = "0.13.0" +incrementalmerkletree = { version = "0.7.0", features = ["legacy-api"] } +orchard = "0.10.0" +sapling-crypto = "0.3.0" +zcash_address = "0.6.0" +zcash_client_backend = "0.14.0" zcash_encoding = "0.2.1" zcash_history = "0.4.0" -zcash_keys = "0.3.0" -zcash_primitives = "0.17.0" -zcash_proofs = "0.17.0" -zcash_protocol = "0.3.0" +zcash_keys = "0.4.0" +zcash_primitives = "0.19.0" +zcash_proofs = "0.19.0" +zcash_protocol = "0.4.0" [workspace.metadata.release] @@ -103,17 +103,3 @@ panic = "abort" # - see https://doc.rust-lang.org/rustc/linker-plugin-lto.html#cc-code-as-a-dependency-in-rust lto = "thin" -# We can remove this patches after we get out of 2.0 release candidate and upgrade the ECC dependencies above. -# This revisions are at the commit just before setting mainnet activation heights. -[patch.crates-io] -zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" } -zcash_client_backend = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" } -zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" } -zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" } -zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" } -zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" } -zcash_protocol = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" } -sapling-crypto = { git = "https://github.com/zcash/sapling-crypto", rev = "b1ad3694ee13a2fc5d291ad04721a6252da0993c" } -orchard = { git = "https://github.com/zcash/orchard", rev = "55fb089a335bbbc1cda186c706bc037073df8eb7" } -incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" } -shardtree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" } From fef500a72840d4b7c89d68e14980eeda43869873 Mon Sep 17 00:00:00 2001 From: Marek Date: Wed, 30 Oct 2024 15:41:41 +0100 Subject: [PATCH 2/8] chore: Release v2.0.1 (#8979) * Run `cargo update` * chore: Release * Update `release-crates-dry-run.sh` * Update `ESTIMATED_RELEASE_HEIGHT` * Update `CHANGELOG.md` * Update `ESTIMATED_RELEASE_HEIGHT` --- .../scripts/release-crates-dry-run.sh | 4 +- CHANGELOG.md | 28 +++++++ Cargo.lock | 79 ++++++++++--------- 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 | 2 +- 20 files changed, 149 insertions(+), 120 deletions(-) diff --git a/.github/workflows/scripts/release-crates-dry-run.sh b/.github/workflows/scripts/release-crates-dry-run.sh index 9935e23a947..32fc0e671c7 100755 --- a/.github/workflows/scripts/release-crates-dry-run.sh +++ b/.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 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.10 -cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-grpc 0.1.0-alpha.8 +cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-scan 0.1.0-alpha.11 +cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebra-grpc 0.1.0-alpha.9 # Update zebrad: cargo release version --verbose --execute --no-confirm --allow-branch '*' --package zebrad patch diff --git a/CHANGELOG.md b/CHANGELOG.md index e5565429f8a..17b898a38dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,34 @@ 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.1](https://github.com/ZcashFoundation/zebra/releases/tag/v2.0.1) - 2024-10-30 + +- Zebra now supports NU6 on Mainnet. This patch release updates dependencies + required for NU6. + +### Breaking Changes + +- The JSON RPC endpoint has 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 bump 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](https://github.com/ZcashFoundation/zebra/releases/tag/v2.0.0) - 2024-10-25 This release brings full support for NU6. diff --git a/Cargo.lock b/Cargo.lock index c1fe19bc718..c9e9dcbcb5e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2041,7 +2041,7 @@ dependencies = [ "http 1.1.0", "hyper 1.5.0", "hyper-util", - "rustls 0.23.15", + "rustls 0.23.16", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -2064,9 +2064,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-channel", @@ -2218,9 +2218,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" +checksum = "a1f72d3e19488cf7d8ea52d2fc0f8754fc933398b337cd3cbdb28aaeb35159ef" dependencies = [ "console", "lazy_static", @@ -2455,9 +2455,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libredox" @@ -3406,7 +3406,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.15", + "rustls 0.23.16", "socket2", "thiserror", "tokio", @@ -3423,7 +3423,7 @@ dependencies = [ "rand 0.8.5", "ring", "rustc-hash 2.0.0", - "rustls 0.23.15", + "rustls 0.23.16", "slab", "thiserror", "tinyvec", @@ -3432,10 +3432,11 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +checksum = "e346e016eacfff12233c243718197ca12f148c84e1e84268a896699b41c71780" dependencies = [ + "cfg_aliases", "libc", "once_cell", "socket2", @@ -3716,9 +3717,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.8" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f" dependencies = [ "base64 0.22.1", "bytes", @@ -3739,7 +3740,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.15", + "rustls 0.23.16", "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", @@ -3864,9 +3865,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a" dependencies = [ "bitflags 2.6.0", "errno", @@ -3889,9 +3890,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.15" +version = "0.23.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" +checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" dependencies = [ "log", "once_cell", @@ -4088,7 +4089,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00421ed8fa0c995f07cde48ba6c89e80f2b312f74ff637326f392fbfd23abe02" dependencies = [ "httpdate", - "reqwest 0.12.8", + "reqwest 0.12.9", "rustls 0.21.12", "sentry-backtrace", "sentry-contexts", @@ -4169,9 +4170,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.213" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] @@ -4187,9 +4188,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.213" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", @@ -4746,7 +4747,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.15", + "rustls 0.23.16", "rustls-pki-types", "tokio", ] @@ -4940,7 +4941,7 @@ dependencies = [ [[package]] name = "tower-batch-control" -version = "0.2.41-beta.17" +version = "0.2.41-beta.18" dependencies = [ "color-eyre", "ed25519-zebra", @@ -4963,7 +4964,7 @@ dependencies = [ [[package]] name = "tower-fallback" -version = "0.2.41-beta.17" +version = "0.2.41-beta.18" dependencies = [ "futures-core", "pin-project", @@ -5274,7 +5275,7 @@ dependencies = [ "base64 0.22.1", "log", "once_cell", - "rustls 0.23.15", + "rustls 0.23.16", "rustls-pki-types", "url", "webpki-roots 0.26.6", @@ -6038,7 +6039,7 @@ dependencies = [ [[package]] name = "zebra-chain" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" dependencies = [ "bitflags 2.6.0", "bitflags-serde-legacy", @@ -6103,7 +6104,7 @@ dependencies = [ [[package]] name = "zebra-consensus" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" dependencies = [ "bellman", "blake2b_simd", @@ -6149,7 +6150,7 @@ dependencies = [ [[package]] name = "zebra-grpc" -version = "0.1.0-alpha.8" +version = "0.1.0-alpha.9" dependencies = [ "color-eyre", "futures-util", @@ -6171,7 +6172,7 @@ dependencies = [ [[package]] name = "zebra-network" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" dependencies = [ "bitflags 2.6.0", "byteorder", @@ -6212,7 +6213,7 @@ dependencies = [ [[package]] name = "zebra-node-services" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" dependencies = [ "color-eyre", "jsonrpc-core", @@ -6225,7 +6226,7 @@ dependencies = [ [[package]] name = "zebra-rpc" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" dependencies = [ "base64 0.22.1", "chrono", @@ -6264,7 +6265,7 @@ dependencies = [ [[package]] name = "zebra-scan" -version = "0.1.0-alpha.10" +version = "0.1.0-alpha.11" dependencies = [ "bls12_381", "chrono", @@ -6310,7 +6311,7 @@ dependencies = [ [[package]] name = "zebra-script" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" dependencies = [ "hex", "lazy_static", @@ -6322,7 +6323,7 @@ dependencies = [ [[package]] name = "zebra-state" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" dependencies = [ "bincode", "chrono", @@ -6367,7 +6368,7 @@ dependencies = [ [[package]] name = "zebra-test" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" dependencies = [ "color-eyre", "futures", @@ -6395,7 +6396,7 @@ dependencies = [ [[package]] name = "zebra-utils" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" dependencies = [ "color-eyre", "hex", @@ -6426,7 +6427,7 @@ dependencies = [ [[package]] name = "zebrad" -version = "2.0.0" +version = "2.0.1" dependencies = [ "abscissa_core", "atty", diff --git a/book/src/user/docker.md b/book/src/user/docker.md index 90491024df3..dbaf726cf9a 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 v2.0.0 https://github.com/ZcashFoundation/zebra.git +git clone --depth 1 --branch v2.0.1 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 6648339f743..5903adf4337 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 v2.0.0 +git checkout v2.0.1 ``` 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 v2.0.0 zebrad +cargo install --git https://github.com/ZcashFoundation/zebra --tag v2.0.1 zebrad ``` ### Compiling on ARM diff --git a/tower-batch-control/Cargo.toml b/tower-batch-control/Cargo.toml index 398a2baddbc..517c9cfca9c 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.17" +version = "0.2.41-beta.18" 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.17" } +tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.18" } tower-test = "0.4.0" -zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.41" } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.42" } [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] } diff --git a/tower-fallback/Cargo.toml b/tower-fallback/Cargo.toml index 5919b1bc632..a3d504ed691 100644 --- a/tower-fallback/Cargo.toml +++ b/tower-fallback/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tower-fallback" -version = "0.2.41-beta.17" +version = "0.2.41-beta.18" 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.41" } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.42" } diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index 4ab99fd8857..b43e77f149a 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-chain" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" 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.41", optional = true } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.42", 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.41" } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.42" } [[bench]] name = "block" diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index 2dd58ed562d..cf8424d1606 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-consensus" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" 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.17" } -tower-batch-control = { path = "../tower-batch-control/", version = "0.2.41-beta.17" } +tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.18" } +tower-batch-control = { path = "../tower-batch-control/", version = "0.2.41-beta.18" } -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" } +zebra-script = { path = "../zebra-script", version = "1.0.0-beta.42" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.42" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.42" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.42" } # 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.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" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.42", features = ["proptest-impl"] } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.42", features = ["proptest-impl"] } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.42" } diff --git a/zebra-grpc/Cargo.toml b/zebra-grpc/Cargo.toml index cc57da114a1..4f825686d52 100644 --- a/zebra-grpc/Cargo.toml +++ b/zebra-grpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-grpc" -version = "0.1.0-alpha.8" +version = "0.1.0-alpha.9" 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.41", features = ["shielded-scan"] } -zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.41" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.42", features = ["shielded-scan"] } +zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.42" } [build-dependencies] tonic-build = "0.12.3" diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index 77eb565c0d1..e4967cc66f2 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-network" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" 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.41", features = ["async-error"] } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.42", features = ["async-error"] } [dev-dependencies] proptest = "1.4.0" diff --git a/zebra-node-services/Cargo.toml b/zebra-node-services/Cargo.toml index 130f6da481f..cba315f1efa 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.41" +version = "1.0.0-beta.42" 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.41" } +zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.42" } # Optional dependencies diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index 1562a77677e..85be248bc76 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-rpc" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" 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.41", features = [ +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.42", features = [ "json-conversion", ] } -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 = [ +zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.42" } +zebra-network = { path = "../zebra-network", version = "1.0.0-beta.42" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.42", features = [ "rpc-client", ] } -zebra-script = { path = "../zebra-script", version = "1.0.0-beta.41" } -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.41" } +zebra-script = { path = "../zebra-script", version = "1.0.0-beta.42" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.42" } [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.41", features = [ +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.42", features = [ "proptest-impl", ] } -zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.41", features = [ +zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.42", features = [ "proptest-impl", ] } -zebra-network = { path = "../zebra-network", version = "1.0.0-beta.41", features = [ +zebra-network = { path = "../zebra-network", version = "1.0.0-beta.42", features = [ "proptest-impl", ] } -zebra-state = { path = "../zebra-state", version = "1.0.0-beta.41", features = [ +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.42", features = [ "proptest-impl", ] } -zebra-test = { path = "../zebra-test", version = "1.0.0-beta.41" } +zebra-test = { path = "../zebra-test", version = "1.0.0-beta.42" } diff --git a/zebra-scan/Cargo.toml b/zebra-scan/Cargo.toml index 4c13ed02050..c939700727e 100644 --- a/zebra-scan/Cargo.toml +++ b/zebra-scan/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-scan" -version = "0.1.0-alpha.10" +version = "0.1.0-alpha.11" 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.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" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.42", features = ["shielded-scan"] } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.42", features = ["shielded-scan"] } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.42", features = ["shielded-scan"] } +zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.9" } +zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.42" } 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.41", optional = true } +zebra-test = { path = "../zebra-test", version = "1.0.0-beta.42", 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" } +zebrad = { path = "../zebrad", version = "2.0.1" } [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.41", features = ["proptest-impl"] } -zebra-test = { path = "../zebra-test", version = "1.0.0-beta.41" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.42", features = ["proptest-impl"] } +zebra-test = { path = "../zebra-test", version = "1.0.0-beta.42" } diff --git a/zebra-script/Cargo.toml b/zebra-script/Cargo.toml index 92fdf77077a..1f3050ca53a 100644 --- a/zebra-script/Cargo.toml +++ b/zebra-script/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-script" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" 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.41" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.42" } 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.41" } +zebra-test = { path = "../zebra-test", version = "1.0.0-beta.42" } diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index 6bdfdaaeb66..55f4f2e1556 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-state" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" 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.41", features = ["async-error"] } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.42", 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.41", optional = true } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.42", 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.41", features = ["proptest-impl"] } -zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.41" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.42", features = ["proptest-impl"] } +zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.42" } diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index c430257f5ef..86daa264305 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-test" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" 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 0c46395b072..e8f81cb088e 100644 --- a/zebra-utils/Cargo.toml +++ b/zebra-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zebra-utils" -version = "1.0.0-beta.41" +version = "1.0.0-beta.42" 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.41" } -zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.41" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.42" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.42" } # These crates are needed for the block-template-to-proposal binary -zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.41", optional = true } +zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.42", 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 2bea0392f9d..768f68dfcb3 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -1,7 +1,7 @@ [package] # Crate metadata name = "zebrad" -version = "2.0.0" +version = "2.0.1" 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.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" } +zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.42" } +zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.42" } +zebra-network = { path = "../zebra-network", version = "1.0.0-beta.42" } +zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.42", features = ["rpc-client"] } +zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.42" } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.42" } # Required for crates.io publishing, but it's only used in tests -zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.41", optional = true } +zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.42", 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.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-chain = { path = "../zebra-chain", version = "1.0.0-beta.42", features = ["proptest-impl"] } +zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.42", features = ["proptest-impl"] } +zebra-network = { path = "../zebra-network", version = "1.0.0-beta.42", features = ["proptest-impl"] } +zebra-state = { path = "../zebra-state", version = "1.0.0-beta.42", features = ["proptest-impl"] } -zebra-test = { path = "../zebra-test", version = "1.0.0-beta.41" } -zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.8" } +zebra-test = { path = "../zebra-test", version = "1.0.0-beta.42" } +zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.9" } # 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.8" } # 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.41" } +zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.42" } [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 0e54a978d04..36586678bdf 100644 --- a/zebrad/src/components/sync/end_of_support.rs +++ b/zebrad/src/components/sync/end_of_support.rs @@ -13,7 +13,7 @@ use zebra_chain::{ use crate::application::release_version; /// The estimated height that this release will be published. -pub const ESTIMATED_RELEASE_HEIGHT: u32 = 2_694_000; +pub const ESTIMATED_RELEASE_HEIGHT: u32 = 2_699_000; /// The maximum number of days after `ESTIMATED_RELEASE_HEIGHT` where a Zebra server will run /// without halting. From 54fe39a91bac0c4cd6ed6e6affa8024378139d3c Mon Sep 17 00:00:00 2001 From: Conrado Gouvea Date: Wed, 30 Oct 2024 16:14:44 -0300 Subject: [PATCH 3/8] book: add section about private testnet testing (#8937) * book: add section about private testnet testing * Apply suggestions from code review Co-authored-by: Pili Guerra * Apply suggestions from code review Co-authored-by: Arya --------- Co-authored-by: Pili Guerra Co-authored-by: Arya --- book/src/SUMMARY.md | 1 + book/src/dev/private-testnet.md | 181 ++++++++++++++++++++++++++++++++ 2 files changed, 182 insertions(+) create mode 100644 book/src/dev/private-testnet.md diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md index 1ec8dc35d67..a7b018a2b9a 100644 --- a/book/src/SUMMARY.md +++ b/book/src/SUMMARY.md @@ -36,6 +36,7 @@ - [Generating Zebra Checkpoints](dev/zebra-checkpoints.md) - [Doing Mass Renames](dev/mass-renames.md) - [Updating the ECC dependencies](dev/ecc-updates.md) + - [Running a Private Testnet Test](dev/private-testnet.md) - [Zebra RFCs](dev/rfcs.md) - [Pipelinable Block Lookup](dev/rfcs/0001-pipelinable-block-lookup.md) - [Parallel Verification](dev/rfcs/0002-parallel-verification.md) diff --git a/book/src/dev/private-testnet.md b/book/src/dev/private-testnet.md new file mode 100644 index 00000000000..92386d2c47b --- /dev/null +++ b/book/src/dev/private-testnet.md @@ -0,0 +1,181 @@ +# Private Testnet Test + +The objective of a private Testnet test is to test Testnet activation of an upcoming +network upgrade in an isolated fashion, before the actual Testnet activation. +It is usually done using the current state of the existing Testnet. For NU6, it was done +by ZF and ECC engineers over a call. + +## Steps + +### Make Backup + +Make a backup of your current Testnet state. Rename/copy the `testnet` folder in +Zebra's state cache directory to the lowercase version of the configured network name, +or the default `unknowntestnet` if no network name is explicitly configured. + +### Set Protocol Version + +Double check that Zebra has bumped its protocol version. + +### Set Up Lightwalletd Server + +It's a good idea to set up a lightwalletd server connected to your node, and +have a (Testnet) wallet connected to your lightwalletd server. + +### Connect to Peers + +Make sure everyone can connect to each other. You can **use Tailscale** to do +that. Everyone needs to send invites to everyone else. Note that being able to +access someone's node does not imply that they can access yours, it needs to be +enabled both ways. + +### Choose an Activation Height + +Choose an activation height with the other participants. It should be in +the near future, but with enough time for people to set things up; something +like 30 minutes in the future? + +### Ensure the Activation Height is Set in Code + +While Zebra allows creating a private Testnet in the config file, the height is +also set in some librustzcash crates. For this reason, someone will need to +**create a branch of librustzcash** with the chosen height set and you will need +to **change Zebra to use that**. However, double check if that's still +necessary. + +### Configure Zebra to use a custom testnet + +See sample config file below. The critical part is setting the activation +height. It is good to enable verbose logging to help debug things. Some of the +participants must enable mining also. It's not a huge deal to keep the DNS +seeders; the blockchain will fork when the activation happens and only the +participants will stay connected. On the other hand, if you want to ensure you +won't connect to anyone else, set `cache_dir = false` in the `[network]` section +and delete the peers file (`~/.cache/zebra/network/unknowntestnet.peers`). + +### Run Nodes + +Everyone runs their nodes, and checks if they connect to other nodes. You can use +e.g. `curl --data-binary '{"jsonrpc": "1.0", "id":"curltest", "method": +"getpeerinfo", "params": [] }' -H 'Content-Type: application/json' +http://127.0.0.1:8232` to check that. See "Getting Peers" section below. + +### Wait Until Activation Happens + +And monitor logs for behaviour. + +### Do Tests + +Do tests, including sending transactions if possible (which will require the +lightwalletd server). Check if whatever activated in the upgrade works. + + +## Zebra + +Relevant information about Zebra for the testing process. + +### Getting peers + +It seems Zebra is not very reliable at returning its currently connected peers; +you can use `getpeerinfo` RPC as above or check the peers file +(`~/.cache/zebra/network/unknowntestnet.peers`) if `cache_dir = true` in the +`[network]` section. You might want to sort this out before the next private +testnet test. + +### Unredact IPs + +Zebra redacts IPs when logging for privacy reasons. However, for a test like +this it can be annoying. You can disable that by editing `peer_addr.rs` +with something like + + +```diff +--- a/zebra-network/src/meta_addr/peer_addr.rs ++++ b/zebra-network/src/meta_addr/peer_addr.rs +@@ -30,7 +30,7 @@ impl fmt::Display for PeerSocketAddr { + let ip_version = if self.is_ipv4() { "v4" } else { "v6" }; + + // The port is usually not sensitive, and it's useful for debugging. +- f.pad(&format!("{}redacted:{}", ip_version, self.port())) ++ f.pad(&format!("{}:{}", self.ip(), self.port())) + } + } +``` + +### Sample config file + +Note: Zebra's db path will end in "unknowntestnet" instead of "testnet" with +this configuration. + +``` +[consensus] +checkpoint_sync = true + +[mempool] +eviction_memory_time = "1h" +tx_cost_limit = 80000000 + +[metrics] + +[mining] +debug_like_zcashd = true +miner_address = "t27eWDgjFYJGVXmzrXeVjnb5J3uXDM9xH9v" +# if you want to enable mining, which also requires selecting the `internal-miner` compilation feature +internal_miner = true + +[network] +# This will save peers to a file. Take care that it also reads peers from it; +# if you want to be truly isolated and only connect to the other participants, +# either disable this or delete the peers file before starting. +cache_dir = true +crawl_new_peer_interval = "1m 1s" + +initial_mainnet_peers = [] + +initial_testnet_peers = [ + # List the other participant's Tailscale IPs here. + # You can also keep the default DNS seeders if you wish. + "100.10.0.1:18233", +] + +listen_addr = "0.0.0.0:18233" +max_connections_per_ip = 1 +network = "Testnet" +peerset_initial_target_size = 25 + +[network.testnet_parameters] + +[network.testnet_parameters.activation_heights] +BeforeOverwinter = 1 +Overwinter = 207_500 +Sapling = 280_000 +Blossom = 584_000 +Heartwood = 903_800 +Canopy = 1_028_500 +NU5 = 1_842_420 +NU6 = 2_969_920 + +[rpc] +debug_force_finished_sync = false +parallel_cpu_threads = 0 +listen_addr = "127.0.0.1:8232" +indexer_listen_addr = "127.0.0.1:8231" + +[state] +delete_old_database = true +ephemeral = false + +[sync] +checkpoint_verify_concurrency_limit = 1000 +download_concurrency_limit = 50 +full_verify_concurrency_limit = 20 +parallel_cpu_threads = 0 + +[tracing] +buffer_limit = 128000 +force_use_color = false +use_color = true +use_journald = false +# This enables debug network logging. It can be useful but it's very verbose! +filter = 'info,zebra_network=debug' +``` \ No newline at end of file From 83921bc01a5ee8d262384cfed6fd87e0a94ffbc3 Mon Sep 17 00:00:00 2001 From: Arya Date: Fri, 1 Nov 2024 05:23:42 -0400 Subject: [PATCH 4/8] Adds rust-toolchain.toml (#8985) --- rust-toolchain.toml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 00000000000..292fe499e3b --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "stable" From 7b317113060db699f7ec0d32aeaffe4eeaca2f28 Mon Sep 17 00:00:00 2001 From: Gustavo Valverde Date: Mon, 4 Nov 2024 10:44:58 +0000 Subject: [PATCH 5/8] ref: adjust GCP instances resources to better fit requirements (#8986) Previously, most of our deployed instances needed to sync the whole blockchain from genesis, but after implementing the mounting of cached states for the release instances, this is no longer required. Main changes: - Reduce the boot disk size for CD images to 10GB (in CI Zebra might need to rebuild based on test flags, requiring more disk space) - Use `pd-standard` instead of `pd-ssd` for the boot disk - Use `pd-balanced` instead of `pd-ssd` for the mounted disk (where most of the reads and writes happens) - Change our `GCP_SMALL_MACHINE` from `c2-standard-4` (vCPUs: 4, RAM: 16 GiB) to `c2d-standard-2` (vCPUs: 2, RAM: 8 GiB) - Keep long running tests `is_long_test` with `GCP_LARGE_MACHINE` (`c2d-standard-16`) and other with the new `GCP_SMALL_MACHINE` configuration (`c2d-standard-2`) --- .github/workflows/cd-deploy-nodes-gcp.yml | 12 ++++++------ .github/workflows/manual-zcashd-deploy.yml | 4 ++-- .../workflows/sub-deploy-integration-tests-gcp.yml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cd-deploy-nodes-gcp.yml b/.github/workflows/cd-deploy-nodes-gcp.yml index 1333816530f..01bad9142c0 100644 --- a/.github/workflows/cd-deploy-nodes-gcp.yml +++ b/.github/workflows/cd-deploy-nodes-gcp.yml @@ -276,7 +276,7 @@ jobs: - name: Create instance template for ${{ matrix.network }} run: | DISK_NAME="zebrad-cache-${{ env.GITHUB_HEAD_REF_SLUG_URL || env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK}" - DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-ssd" + DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-balanced" if [ -n "${{ env.CACHED_DISK_NAME }}" ]; then DISK_PARAMS+=",image=${{ env.CACHED_DISK_NAME }}" elif [ ${{ inputs.no_cached_disk && github.event_name == 'workflow_dispatch' }} ]; then @@ -287,8 +287,8 @@ jobs: fi gcloud compute instance-templates create-with-container zebrad-${{ needs.versioning.outputs.major_version || env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK} \ --machine-type ${{ vars.GCP_SMALL_MACHINE }} \ - --boot-disk-size 50GB \ - --boot-disk-type=pd-ssd \ + --boot-disk-size=10GB \ + --boot-disk-type=pd-standard \ --image-project=cos-cloud \ --image-family=cos-stable \ --network-interface=subnet=${{ vars.GCP_SUBNETWORK }} \ @@ -388,7 +388,7 @@ jobs: - name: Manual deploy of a single ${{ inputs.network }} instance running zebrad run: | DISK_NAME="zebrad-cache-${{ env.GITHUB_HEAD_REF_SLUG_URL || env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK}" - DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-ssd" + DISK_PARAMS="name=${DISK_NAME},device-name=${DISK_NAME},size=400GB,type=pd-balanced" if [ -n "${{ env.CACHED_DISK_NAME }}" ]; then DISK_PARAMS+=",image=${{ env.CACHED_DISK_NAME }}" elif [ ${{ inputs.no_cached_disk && github.event_name == 'workflow_dispatch' }} ]; then @@ -399,8 +399,8 @@ jobs: fi gcloud compute instances create-with-container "zebrad-${{ env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}-${NETWORK}" \ --machine-type ${{ vars.GCP_SMALL_MACHINE }} \ - --boot-disk-size 50GB \ - --boot-disk-type=pd-ssd \ + --boot-disk-size=10GB \ + --boot-disk-type=pd-standard \ --image-project=cos-cloud \ --image-family=cos-stable \ --network-interface=subnet=${{ vars.GCP_SUBNETWORK }} \ diff --git a/.github/workflows/manual-zcashd-deploy.yml b/.github/workflows/manual-zcashd-deploy.yml index 05872f2532d..dfde89b3e86 100644 --- a/.github/workflows/manual-zcashd-deploy.yml +++ b/.github/workflows/manual-zcashd-deploy.yml @@ -64,8 +64,8 @@ jobs: - name: Create instance template run: | gcloud compute instance-templates create-with-container zcashd-${{ env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }} \ - --boot-disk-size 10GB \ - --boot-disk-type=pd-ssd \ + --boot-disk-size=10GB \ + --boot-disk-type=pd-standard \ --image-project=cos-cloud \ --image-family=cos-stable \ --container-stdin \ diff --git a/.github/workflows/sub-deploy-integration-tests-gcp.yml b/.github/workflows/sub-deploy-integration-tests-gcp.yml index 7266f60ea54..26c13e6044c 100644 --- a/.github/workflows/sub-deploy-integration-tests-gcp.yml +++ b/.github/workflows/sub-deploy-integration-tests-gcp.yml @@ -188,18 +188,18 @@ jobs: shell: /usr/bin/bash -x {0} run: | NAME="${{ inputs.test_id }}-${{ env.GITHUB_SHA_SHORT }}" - DISK_PARAMS="size=400GB,type=pd-ssd,name=${NAME},device-name=${NAME}" + DISK_PARAMS="size=400GB,type=pd-balanced,name=${NAME},device-name=${NAME}" if [ -n "${{ env.CACHED_DISK_NAME }}" ]; then DISK_PARAMS+=",image=${{ env.CACHED_DISK_NAME }}" fi gcloud compute instances create-with-container "${{ inputs.test_id }}-${{ env.GITHUB_REF_SLUG_URL }}-${{ env.GITHUB_SHA_SHORT }}" \ - --boot-disk-size 50GB \ - --boot-disk-type pd-ssd \ + --boot-disk-size=50GB \ + --boot-disk-type=pd-ssd \ --image-project=cos-cloud \ --image-family=cos-stable \ --create-disk="${DISK_PARAMS}" \ --container-image=gcr.io/google-containers/busybox \ - --machine-type ${{ vars.GCP_LARGE_MACHINE }} \ + --machine-type ${{ inputs.is_long_test && vars.GCP_LARGE_MACHINE || vars.GCP_SMALL_MACHINE }} \ --network-interface=subnet=${{ vars.GCP_SUBNETWORK }} \ --scopes cloud-platform \ --metadata=google-monitoring-enabled=TRUE,google-logging-enabled=TRUE \ From 75fae66dc6e4258fe8ac84a1e03117bdde7a3aff Mon Sep 17 00:00:00 2001 From: Gustavo Valverde Date: Mon, 4 Nov 2024 18:42:51 +0000 Subject: [PATCH 6/8] fix(ci): fail cache disk creation if no db version is found (#8987) In some cases Zebra logs might not output the database version, and thus we should avoid creating a disk without a version. Before this change, a disk was created without a db version number, just indicating a `-v-`, that caused other tests to fail as an actual version was not found in their regexes. --- .../workflows/sub-deploy-integration-tests-gcp.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sub-deploy-integration-tests-gcp.yml b/.github/workflows/sub-deploy-integration-tests-gcp.yml index 26c13e6044c..600153e6c32 100644 --- a/.github/workflows/sub-deploy-integration-tests-gcp.yml +++ b/.github/workflows/sub-deploy-integration-tests-gcp.yml @@ -503,18 +503,19 @@ jobs: ) if [[ -z "$INITIAL_DISK_DB_VERSION" ]]; then + # Check for new database creation + if echo "$DOCKER_LOGS" | grep -q "creating.new.database"; then + INITIAL_DISK_DB_VERSION="new" + else echo "Checked logs:" echo "" echo "$DOCKER_LOGS" echo "" - echo "Missing initial disk database version in logs: $INITIAL_DISK_DB_VERSION" + echo "Missing initial disk database version in logs" # Fail the tests, because Zebra didn't log the initial disk database version, # or the regex in this step is wrong. - false + exit 1 fi - - if [[ "$INITIAL_DISK_DB_VERSION" = "creating.new.database" ]]; then - INITIAL_DISK_DB_VERSION="new" else INITIAL_DISK_DB_VERSION="v${INITIAL_DISK_DB_VERSION//./-}" fi @@ -538,7 +539,7 @@ jobs: echo "Missing running database version in logs: $RUNNING_DB_VERSION" # Fail the tests, because Zebra didn't log the running database version, # or the regex in this step is wrong. - false + exit 1 fi RUNNING_DB_VERSION="v${RUNNING_DB_VERSION//./-}" From 6a825315855a108ec17f31bcff3b0bca65bf5dd9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:47:35 +0000 Subject: [PATCH 7/8] build(deps): bump the devops group across 1 directory with 5 updates (#8993) Bumps the devops group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/checkout](https://github.com/actions/checkout) | `4.2.1` | `4.2.2` | | [google-github-actions/auth](https://github.com/google-github-actions/auth) | `2.1.6` | `2.1.7` | | [google-github-actions/setup-gcloud](https://github.com/google-github-actions/setup-gcloud) | `2.1.1` | `2.1.2` | | [jontze/action-mdbook](https://github.com/jontze/action-mdbook) | `3.0.0` | `3.0.1` | | [docker/scout-action](https://github.com/docker/scout-action) | `1.14.0` | `1.15.0` | Updates `actions/checkout` from 4.2.1 to 4.2.2 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.2.1...v4.2.2) Updates `google-github-actions/auth` from 2.1.6 to 2.1.7 - [Release notes](https://github.com/google-github-actions/auth/releases) - [Changelog](https://github.com/google-github-actions/auth/blob/main/CHANGELOG.md) - [Commits](https://github.com/google-github-actions/auth/compare/v2.1.6...v2.1.7) Updates `google-github-actions/setup-gcloud` from 2.1.1 to 2.1.2 - [Release notes](https://github.com/google-github-actions/setup-gcloud/releases) - [Changelog](https://github.com/google-github-actions/setup-gcloud/blob/main/CHANGELOG.md) - [Commits](https://github.com/google-github-actions/setup-gcloud/compare/v2.1.1...v2.1.2) Updates `jontze/action-mdbook` from 3.0.0 to 3.0.1 - [Release notes](https://github.com/jontze/action-mdbook/releases) - [Changelog](https://github.com/jontze/action-mdbook/blob/master/CHANGELOG.md) - [Commits](https://github.com/jontze/action-mdbook/compare/v3.0.0...v3.0.1) Updates `docker/scout-action` from 1.14.0 to 1.15.0 - [Release notes](https://github.com/docker/scout-action/releases) - [Commits](https://github.com/docker/scout-action/compare/v1.14.0...v1.15.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: devops - dependency-name: google-github-actions/auth dependency-type: direct:production update-type: version-update:semver-patch dependency-group: devops - dependency-name: google-github-actions/setup-gcloud dependency-type: direct:production update-type: version-update:semver-patch dependency-group: devops - dependency-name: jontze/action-mdbook dependency-type: direct:production update-type: version-update:semver-patch dependency-group: devops - dependency-name: docker/scout-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: devops ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cd-deploy-nodes-gcp.yml | 12 ++++++------ .../workflows/chore-delete-gcp-resources.yml | 10 +++++----- .github/workflows/ci-build-crates.patch.yml | 2 +- .github/workflows/ci-build-crates.yml | 4 ++-- .github/workflows/ci-coverage.yml | 2 +- .github/workflows/ci-lint.yml | 10 +++++----- .github/workflows/ci-unit-tests-os.yml | 10 +++++----- .github/workflows/docs-deploy-firebase.yml | 10 +++++----- .../workflows/docs-dockerhub-description.yml | 2 +- .github/workflows/manual-zcashd-deploy.yml | 6 +++--- .github/workflows/release-crates-io.yml | 2 +- .github/workflows/sub-build-docker-image.yml | 6 +++--- .../sub-deploy-integration-tests-gcp.yml | 18 +++++++++--------- .github/workflows/sub-find-cached-disks.yml | 6 +++--- .github/workflows/sub-test-zebra-config.yml | 2 +- 15 files changed, 51 insertions(+), 51 deletions(-) diff --git a/.github/workflows/cd-deploy-nodes-gcp.yml b/.github/workflows/cd-deploy-nodes-gcp.yml index 01bad9142c0..54259760227 100644 --- a/.github/workflows/cd-deploy-nodes-gcp.yml +++ b/.github/workflows/cd-deploy-nodes-gcp.yml @@ -242,7 +242,7 @@ jobs: if: ${{ !cancelled() && !failure() && ((github.event_name == 'push' && github.ref_name == 'main') || github.event_name == 'release') }} steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false @@ -265,13 +265,13 @@ jobs: # Setup gcloud CLI - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}' - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v2.1.1 + uses: google-github-actions/setup-gcloud@v2.1.2 - name: Create instance template for ${{ matrix.network }} run: | @@ -353,7 +353,7 @@ jobs: if: ${{ !failure() && github.event_name == 'workflow_dispatch' }} steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false @@ -376,13 +376,13 @@ jobs: # Setup gcloud CLI - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}' - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v2.1.1 + uses: google-github-actions/setup-gcloud@v2.1.2 # Create instance template from container image - name: Manual deploy of a single ${{ inputs.network }} instance running zebrad diff --git a/.github/workflows/chore-delete-gcp-resources.yml b/.github/workflows/chore-delete-gcp-resources.yml index 4470d244029..b4e9eda2f64 100644 --- a/.github/workflows/chore-delete-gcp-resources.yml +++ b/.github/workflows/chore-delete-gcp-resources.yml @@ -39,20 +39,20 @@ jobs: contents: 'read' id-token: 'write' steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false # Setup gcloud CLI - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}' - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v2.1.1 + uses: google-github-actions/setup-gcloud@v2.1.2 # Deletes all mainnet and testnet instances older than $DELETE_INSTANCE_DAYS days. # @@ -106,14 +106,14 @@ jobs: contents: 'read' id-token: 'write' steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false # Setup gcloud CLI - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}' diff --git a/.github/workflows/ci-build-crates.patch.yml b/.github/workflows/ci-build-crates.patch.yml index c4333a86aba..525904507e8 100644 --- a/.github/workflows/ci-build-crates.patch.yml +++ b/.github/workflows/ci-build-crates.patch.yml @@ -23,7 +23,7 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 # Setup Rust with stable toolchain and minimal profile - name: Setup Rust diff --git a/.github/workflows/ci-build-crates.yml b/.github/workflows/ci-build-crates.yml index 67404f75972..ca66a2bf2c0 100644 --- a/.github/workflows/ci-build-crates.yml +++ b/.github/workflows/ci-build-crates.yml @@ -60,7 +60,7 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 - uses: r7kamura/rust-problem-matchers@v1.5.0 # Setup Rust with stable toolchain and minimal profile @@ -122,7 +122,7 @@ jobs: matrix: ${{ fromJson(needs.matrix.outputs.matrix) }} steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false - uses: r7kamura/rust-problem-matchers@v1.5.0 diff --git a/.github/workflows/ci-coverage.yml b/.github/workflows/ci-coverage.yml index 057cc1cf916..3d1e3b946c5 100644 --- a/.github/workflows/ci-coverage.yml +++ b/.github/workflows/ci-coverage.yml @@ -69,7 +69,7 @@ jobs: runs-on: ubuntu-latest-xl steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false diff --git a/.github/workflows/ci-lint.yml b/.github/workflows/ci-lint.yml index b9966de9058..22ec5089c37 100644 --- a/.github/workflows/ci-lint.yml +++ b/.github/workflows/ci-lint.yml @@ -37,7 +37,7 @@ jobs: rust: ${{ steps.changed-files-rust.outputs.any_changed == 'true' }} workflows: ${{ steps.changed-files-workflows.outputs.any_changed == 'true' }} steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false fetch-depth: 0 @@ -69,7 +69,7 @@ jobs: if: ${{ needs.changed-files.outputs.rust == 'true' }} steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false @@ -119,7 +119,7 @@ jobs: if: ${{ needs.changed-files.outputs.rust == 'true' }} steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false - uses: r7kamura/rust-problem-matchers@v1.5.0 @@ -149,7 +149,7 @@ jobs: needs: changed-files if: ${{ needs.changed-files.outputs.workflows == 'true' }} steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 - name: actionlint uses: reviewdog/action-actionlint@v1.48.0 with: @@ -166,7 +166,7 @@ jobs: runs-on: ubuntu-latest needs: changed-files steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 - uses: codespell-project/actions-codespell@v2.1 with: only_warn: 1 diff --git a/.github/workflows/ci-unit-tests-os.yml b/.github/workflows/ci-unit-tests-os.yml index 7c194c51c5e..6fe7238bc29 100644 --- a/.github/workflows/ci-unit-tests-os.yml +++ b/.github/workflows/ci-unit-tests-os.yml @@ -94,7 +94,7 @@ jobs: rust: beta steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false - uses: r7kamura/rust-problem-matchers@v1.5.0 @@ -183,7 +183,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false - uses: r7kamura/rust-problem-matchers@v1.5.0 @@ -205,7 +205,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false - uses: r7kamura/rust-problem-matchers@v1.5.0 @@ -248,7 +248,7 @@ jobs: continue-on-error: ${{ matrix.checks == 'advisories' }} steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false - uses: r7kamura/rust-problem-matchers@v1.5.0 @@ -269,7 +269,7 @@ jobs: steps: - name: Checkout git repository - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 with: persist-credentials: false - uses: r7kamura/rust-problem-matchers@v1.5.0 diff --git a/.github/workflows/docs-deploy-firebase.yml b/.github/workflows/docs-deploy-firebase.yml index 1c8ce7fd773..72ffb5c6534 100644 --- a/.github/workflows/docs-deploy-firebase.yml +++ b/.github/workflows/docs-deploy-firebase.yml @@ -85,14 +85,14 @@ jobs: pull-requests: write steps: - name: Checkout the source code - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 with: persist-credentials: false - uses: r7kamura/rust-problem-matchers@v1.5.0 - name: Setup mdBook - uses: jontze/action-mdbook@v3.0.0 + uses: jontze/action-mdbook@v3.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} mdbook-version: '~0.4' @@ -106,7 +106,7 @@ jobs: # Setup gcloud CLI - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_FIREBASE_SA }}' @@ -138,7 +138,7 @@ jobs: pull-requests: write steps: - name: Checkout the source code - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 with: persist-credentials: false @@ -164,7 +164,7 @@ jobs: # Setup gcloud CLI - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_FIREBASE_SA }}' diff --git a/.github/workflows/docs-dockerhub-description.yml b/.github/workflows/docs-dockerhub-description.yml index b96a2e2fb1c..754208d6651 100644 --- a/.github/workflows/docs-dockerhub-description.yml +++ b/.github/workflows/docs-dockerhub-description.yml @@ -17,7 +17,7 @@ jobs: dockerHubDescription: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false diff --git a/.github/workflows/manual-zcashd-deploy.yml b/.github/workflows/manual-zcashd-deploy.yml index dfde89b3e86..6553bdf5ba5 100644 --- a/.github/workflows/manual-zcashd-deploy.yml +++ b/.github/workflows/manual-zcashd-deploy.yml @@ -29,7 +29,7 @@ jobs: id-token: 'write' steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false @@ -52,13 +52,13 @@ jobs: # Setup gcloud CLI - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}' - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v2.1.1 + uses: google-github-actions/setup-gcloud@v2.1.2 # Create instance template from container image - name: Create instance template diff --git a/.github/workflows/release-crates-io.yml b/.github/workflows/release-crates-io.yml index 60db739b236..4f08917230f 100644 --- a/.github/workflows/release-crates-io.yml +++ b/.github/workflows/release-crates-io.yml @@ -70,7 +70,7 @@ jobs: - uses: r7kamura/rust-problem-matchers@v1.5.0 - name: Checkout git repository - uses: actions/checkout@v4.2.1 + uses: actions/checkout@v4.2.2 with: persist-credentials: false diff --git a/.github/workflows/sub-build-docker-image.yml b/.github/workflows/sub-build-docker-image.yml index 11b6399d625..02444c6e427 100644 --- a/.github/workflows/sub-build-docker-image.yml +++ b/.github/workflows/sub-build-docker-image.yml @@ -80,7 +80,7 @@ jobs: env: DOCKER_BUILD_SUMMARY: ${{ vars.DOCKER_BUILD_SUMMARY }} steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false - uses: r7kamura/rust-problem-matchers@v1.5.0 @@ -126,7 +126,7 @@ jobs: - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_ARTIFACTS_SA }}' @@ -193,7 +193,7 @@ jobs: # - `dev` for a pull request event - name: Docker Scout id: docker-scout - uses: docker/scout-action@v1.14.0 + uses: docker/scout-action@v1.15.0 # We only run Docker Scout on the `runtime` target, as the other targets are not meant to be released # and are commonly used for testing, and thus are ephemeral. # TODO: Remove the `contains` check once we have a better way to determine if just new vulnerabilities are present. diff --git a/.github/workflows/sub-deploy-integration-tests-gcp.yml b/.github/workflows/sub-deploy-integration-tests-gcp.yml index 600153e6c32..d121ee9ab20 100644 --- a/.github/workflows/sub-deploy-integration-tests-gcp.yml +++ b/.github/workflows/sub-deploy-integration-tests-gcp.yml @@ -140,7 +140,7 @@ jobs: contents: 'read' id-token: 'write' steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false fetch-depth: '2' @@ -172,13 +172,13 @@ jobs: # Setup gcloud CLI - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}' - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v2.1.1 + uses: google-github-actions/setup-gcloud@v2.1.2 # Create a Compute Engine virtual machine and attach a cached state disk using the # $CACHED_DISK_NAME env as the source image to populate the disk cached state @@ -390,7 +390,7 @@ jobs: contents: 'read' id-token: 'write' steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false fetch-depth: '2' @@ -434,13 +434,13 @@ jobs: # Setup gcloud CLI - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}' - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v2.1.1 + uses: google-github-actions/setup-gcloud@v2.1.2 # Sets the $UPDATE_SUFFIX env var to "-u" if updating a previous cached state, # and the empty string otherwise. @@ -688,7 +688,7 @@ jobs: contents: 'read' id-token: 'write' steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false fetch-depth: '2' @@ -702,13 +702,13 @@ jobs: # Setup gcloud CLI - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}' - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v2.1.1 + uses: google-github-actions/setup-gcloud@v2.1.2 # Deletes the instances that has been recently deployed in the actual commit after all # previous jobs have run, no matter the outcome of the job. diff --git a/.github/workflows/sub-find-cached-disks.yml b/.github/workflows/sub-find-cached-disks.yml index a71237887e2..9c2ee919d32 100644 --- a/.github/workflows/sub-find-cached-disks.yml +++ b/.github/workflows/sub-find-cached-disks.yml @@ -58,7 +58,7 @@ jobs: contents: 'read' id-token: 'write' steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false fetch-depth: 0 @@ -66,13 +66,13 @@ jobs: # Setup gcloud CLI - name: Authenticate to Google Cloud id: auth - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: workload_identity_provider: '${{ vars.GCP_WIF }}' service_account: '${{ vars.GCP_DEPLOYMENTS_SA }}' - name: Set up Cloud SDK - uses: google-github-actions/setup-gcloud@v2.1.1 + uses: google-github-actions/setup-gcloud@v2.1.2 # Performs formatting on disk name components. # diff --git a/.github/workflows/sub-test-zebra-config.yml b/.github/workflows/sub-test-zebra-config.yml index 1f8c455b4b9..c0d2532b220 100644 --- a/.github/workflows/sub-test-zebra-config.yml +++ b/.github/workflows/sub-test-zebra-config.yml @@ -38,7 +38,7 @@ jobs: timeout-minutes: 30 runs-on: ubuntu-latest-m steps: - - uses: actions/checkout@v4.2.1 + - uses: actions/checkout@v4.2.2 with: persist-credentials: false From d7fbde3176416613b8710c0ffeb89501f62e86ab Mon Sep 17 00:00:00 2001 From: Gustavo Valverde Date: Tue, 5 Nov 2024 12:30:00 +0000 Subject: [PATCH 8/8] fix(actions): do not require the `get-disk-name` job for forks (#8988) --- .github/workflows/cd-deploy-nodes-gcp.patch-external.yml | 6 ++++++ .github/workflows/cd-deploy-nodes-gcp.patch.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/cd-deploy-nodes-gcp.patch-external.yml b/.github/workflows/cd-deploy-nodes-gcp.patch-external.yml index 8381f0011a0..3b1e2c066cb 100644 --- a/.github/workflows/cd-deploy-nodes-gcp.patch-external.yml +++ b/.github/workflows/cd-deploy-nodes-gcp.patch-external.yml @@ -43,3 +43,9 @@ jobs: runs-on: ubuntu-latest steps: - run: 'echo "Skipping job on fork"' + + get-disk-name: + name: Get disk name + runs-on: ubuntu-latest + steps: + - run: 'echo "Skipping job on fork"' diff --git a/.github/workflows/cd-deploy-nodes-gcp.patch.yml b/.github/workflows/cd-deploy-nodes-gcp.patch.yml index fb963ec3726..6f88cf2cfe2 100644 --- a/.github/workflows/cd-deploy-nodes-gcp.patch.yml +++ b/.github/workflows/cd-deploy-nodes-gcp.patch.yml @@ -52,3 +52,9 @@ jobs: runs-on: ubuntu-latest steps: - run: 'echo "No build required"' + + get-disk-name: + name: Get disk name + runs-on: ubuntu-latest + steps: + - run: 'echo "No build required"'