From efb60075030c11dc3027c4d7d3948f09551ee687 Mon Sep 17 00:00:00 2001 From: pacu Date: Tue, 10 Feb 2026 17:11:18 -0300 Subject: [PATCH 1/3] [#218] Support Zebra 4.1.0 closes #218 depends on https://github.com/zingolabs/zingo-common/pull/22 --- CHANGELOG.md | 18 ++++++++++++++++++ Cargo.lock | 51 +++++++++++++++++++++++++++------------------------ Cargo.toml | 8 ++++---- 3 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..6039866 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,18 @@ +# Changelog + +All notable changes to this project will be 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/spec/v2.0.0.html). + +## [Unreleased] + +### Deprecated + +### Added +- support for Zebra 4.1.0 +- support for Zebra 4 +### Changed + +### Removed + diff --git a/Cargo.lock b/Cargo.lock index 48943a9..15428a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -441,6 +441,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09dc0086e469182132244e9b8d313a0742e1132da43a08c24b9dd3c18e0faf3a" dependencies = [ + "serde", "thiserror 2.0.17", ] @@ -937,7 +938,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1046,7 +1047,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2032,7 +2033,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d463f34ca3c400fde3a054da0e0b8c6ffa21e4590922f3e18281bb5eeef4cbdc" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2286,7 +2287,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2742,7 +2743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.12.1", + "itertools 0.14.0", "log", "multimap", "petgraph", @@ -2763,7 +2764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.114", @@ -2873,7 +2874,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -3281,7 +3282,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -3743,7 +3744,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5057,9 +5058,9 @@ dependencies = [ [[package]] name = "zebra-chain" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b41d733382b3ecbf892f816ab9c1e448c9ae868d2bbb9f12a55b80c4e21fee2" +checksum = "a15c1b579eb4d25214fa15839a74f4b9599806bc8addb910cfbec50dd59fb97f" dependencies = [ "bech32", "bitflags", @@ -5067,6 +5068,7 @@ dependencies = [ "bitvec", "blake2b_simd", "blake2s_simd", + "bounded-vec", "bs58", "byteorder", "chrono", @@ -5118,9 +5120,9 @@ dependencies = [ [[package]] name = "zebra-consensus" -version = "3.1.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11221f1e778bda63ec3e412dc29322a5293e517a24710ec0bc65aea26f1e55c8" +checksum = "dacc49c94870e0c956b11a21aa4e0422f5aa77ca67927d7c45c389c6b80e9201" dependencies = [ "bellman", "blake2b_simd", @@ -5157,9 +5159,9 @@ dependencies = [ [[package]] name = "zebra-network" -version = "3.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3a34b04cb134997950b1ad0138aef9a6320f7aec16cab082419652ae3fcac8e" +checksum = "90569b97fa9ce8d09f4b8e9dfe97c36fb673aa5869191d17abf69e880034a8e9" dependencies = [ "bitflags", "byteorder", @@ -5194,9 +5196,9 @@ dependencies = [ [[package]] name = "zebra-node-services" -version = "2.1.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30236040805a4ae868e0f3f810ee92db08925307e21ee7d1b6d480cb4b8b5efc" +checksum = "18f8ad0371557d76c8ed0f81c3e2762082b57cb9c1b9bc1069b4a0bc897bd266" dependencies = [ "color-eyre", "jsonrpsee-types", @@ -5210,9 +5212,9 @@ dependencies = [ [[package]] name = "zebra-rpc" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afcfc310a775b123a9f27e32e50b25f2b02b80051bce5e4be3ced786d83e808" +checksum = "7365982d89029998aa37f69b055a260d3e9da208fd76f5b48179a1c5a1410096" dependencies = [ "base64", "chrono", @@ -5227,6 +5229,7 @@ dependencies = [ "jsonrpsee", "jsonrpsee-proc-macros", "jsonrpsee-types", + "metrics", "nix", "prost", "rand 0.8.5", @@ -5260,9 +5263,9 @@ dependencies = [ [[package]] name = "zebra-script" -version = "3.0.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a0327411bde3e0ecd8212ddecfc003d214d3be966229ae675258a402e4ca04" +checksum = "2857e5d0692ad1fd597b096ccc700107489c72a9c7e2e7a883479aa0d02ec173" dependencies = [ "libzcash_script", "thiserror 2.0.17", @@ -5273,9 +5276,9 @@ dependencies = [ [[package]] name = "zebra-state" -version = "3.1.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a110993e61b6057f20cb4abef92abe811f7d8a8957ee40688a1c30f23e2009a" +checksum = "47f0e0b14ced6153d21aa65a23b9b3f90080c3b434d93384a3395ae658657733" dependencies = [ "bincode", "chrono", @@ -5406,7 +5409,7 @@ dependencies = [ [[package]] name = "zingo_common_components" version = "0.1.0" -source = "git+https://github.com/zingolabs/zingo-common.git?branch=dev#7de9f9e8a261f95a632df2c57d2c9cbe68fc0ae8" +source = "git+https://github.com/zingolabs/zingo-common.git?branch=dev#ae5aaad38af3a962fe125c8fd99cbcc4f1ded562" dependencies = [ "zebra-chain", ] diff --git a/Cargo.toml b/Cargo.toml index 4ac8361..1e23705 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,11 +6,11 @@ resolver = "2" # workspace zingo_test_vectors = { path = "zingo_test_vectors" } - +zcash_local_net = { path = "zcash_local_net" } # zebra -zebra-chain = "4.0" -zebra-node-services = "2.0" -zebra-rpc = "4.0" +zebra-chain = "5.0.0" +zebra-node-services = "3.0.0" +zebra-rpc = "5.0.0" # other http = "1.1.0" From 9afac44f317a32d0bb106bbc57a3f316f71b0e0b Mon Sep 17 00:00:00 2001 From: Pacu Date: Thu, 12 Feb 2026 16:21:54 -0300 Subject: [PATCH 2/3] update zingo_common_components --- Cargo.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 15428a1..f3a8ae9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -938,7 +938,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -1047,7 +1047,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2033,7 +2033,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d463f34ca3c400fde3a054da0e0b8c6ffa21e4590922f3e18281bb5eeef4cbdc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2287,7 +2287,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -2743,7 +2743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.14.0", + "itertools 0.12.1", "log", "multimap", "petgraph", @@ -2764,7 +2764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.114", @@ -2874,7 +2874,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.52.0", ] [[package]] @@ -3282,7 +3282,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -3744,7 +3744,7 @@ dependencies = [ "getrandom 0.3.4", "once_cell", "rustix", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5408,8 +5408,8 @@ dependencies = [ [[package]] name = "zingo_common_components" -version = "0.1.0" -source = "git+https://github.com/zingolabs/zingo-common.git?branch=dev#ae5aaad38af3a962fe125c8fd99cbcc4f1ded562" +version = "0.2.0" +source = "git+https://github.com/zingolabs/zingo-common.git?branch=dev#096a79e2b3eb8b12d642e3380044bac00e7c855d" dependencies = [ "zebra-chain", ] From 605895ccc9ea439c6b1557772e99a2c974e030b5 Mon Sep 17 00:00:00 2001 From: pacu Date: Tue, 10 Feb 2026 18:22:36 -0300 Subject: [PATCH 3/3] Fix cargo deny workflow --- .github/workflows/ci-pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pr.yaml b/.github/workflows/ci-pr.yaml index fe039c0..812e36a 100644 --- a/.github/workflows/ci-pr.yaml +++ b/.github/workflows/ci-pr.yaml @@ -25,7 +25,7 @@ jobs: uses: Swatinem/rust-cache@v2 - name: Run cargo-deny - uses: EmbarkStudios/cargo-deny-action@v1 + uses: EmbarkStudios/cargo-deny-action@v2 with: command: check