From f5658923edcba0b225b0e399c9e727fdd286ed1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:31:31 +0000 Subject: [PATCH 1/4] build(deps): bump zcash_protocol from 0.4.0 to 0.4.1 in the ecc group Bumps the ecc group with 1 update: [zcash_protocol](https://github.com/zcash/librustzcash). Updates `zcash_protocol` from 0.4.0 to 0.4.1 - [Release notes](https://github.com/zcash/librustzcash/releases) - [Commits](https://github.com/zcash/librustzcash/compare/zcash_protocol-0.4.0...zcash_protocol-0.4.1) --- updated-dependencies: - dependency-name: zcash_protocol dependency-type: direct:production update-type: version-update:semver-patch dependency-group: ecc ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c9e9dcbcb5e..78d694df99b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6010,9 +6010,9 @@ dependencies = [ [[package]] name = "zcash_protocol" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bc22b9155b2c7eb20105cd06de170d188c1bc86489b92aa3fda7b8da8d96acf" +checksum = "d4bbb28b59321f47454e69c2d95c11c227bb1a21bfa3381bd43c4ac98f5caee1" dependencies = [ "document-features", "memuse", diff --git a/Cargo.toml b/Cargo.toml index c50c93ad414..1f6fec65e96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ zcash_history = "0.4.0" zcash_keys = "0.4.0" zcash_primitives = "0.19.0" zcash_proofs = "0.19.0" -zcash_protocol = "0.4.0" +zcash_protocol = "0.4.1" [workspace.metadata.release] From 06430ca1d73077add81d57329885f263cfc43c9c Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Thu, 5 Dec 2024 16:45:04 -0300 Subject: [PATCH 2/4] update zcash_client_backend --- Cargo.lock | 98 +++++++++++++++++++++++++++++++++++++++++++++--------- Cargo.toml | 2 +- 2 files changed, 84 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 78d694df99b..2699147dd1d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5549,14 +5549,14 @@ dependencies = [ [[package]] name = "which" -version = "4.4.2" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" dependencies = [ "either", "home", - "once_cell", "rustix", + "winsafe", ] [[package]] @@ -5806,6 +5806,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + [[package]] name = "wyz" version = "0.5.1" @@ -5848,9 +5854,9 @@ dependencies = [ [[package]] name = "zcash_client_backend" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbeeede366fdb642710d3c59fc2090489affd075f66db53ed11bb7138d2d0258" +checksum = "e29a9975a741754e9d68c1326df809049712d3d3e831df9983eb631b8c2c2257" dependencies = [ "base64 0.22.1", "bech32", @@ -5878,9 +5884,9 @@ dependencies = [ "which", "zcash_address", "zcash_encoding", - "zcash_keys", + "zcash_keys 0.5.0", "zcash_note_encryption", - "zcash_primitives", + "zcash_primitives 0.20.0", "zcash_protocol", "zip32", "zip321", @@ -5928,7 +5934,33 @@ dependencies = [ "tracing", "zcash_address", "zcash_encoding", - "zcash_primitives", + "zcash_primitives 0.19.0", + "zcash_protocol", + "zip32", +] + +[[package]] +name = "zcash_keys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf15baad7e4a87cca57af718766a0d5bb03e0cbf118e3ef6462697a4664b88c" +dependencies = [ + "bech32", + "blake2b_simd", + "bls12_381", + "bs58", + "document-features", + "group", + "memuse", + "nonempty", + "rand_core 0.6.4", + "sapling-crypto", + "secrecy", + "subtle", + "tracing", + "zcash_address", + "zcash_encoding", + "zcash_primitives 0.20.0", "zcash_protocol", "zip32", ] @@ -5985,6 +6017,42 @@ dependencies = [ "zip32", ] +[[package]] +name = "zcash_primitives" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c1573280a8d545009381af602c714ab53c43088d089e0d17e89740184f1712b" +dependencies = [ + "aes", + "blake2b_simd", + "bs58", + "byteorder", + "document-features", + "equihash", + "ff", + "fpe", + "group", + "hex", + "incrementalmerkletree", + "jubjub", + "memuse", + "nonempty", + "orchard", + "rand 0.8.5", + "rand_core 0.6.4", + "redjubjub", + "sapling-crypto", + "sha2", + "subtle", + "tracing", + "zcash_address", + "zcash_encoding", + "zcash_note_encryption", + "zcash_protocol", + "zcash_spec", + "zip32", +] + [[package]] name = "zcash_proofs" version = "0.19.0" @@ -6005,7 +6073,7 @@ dependencies = [ "sapling-crypto", "tracing", "xdg", - "zcash_primitives", + "zcash_primitives 0.19.0", ] [[package]] @@ -6097,7 +6165,7 @@ dependencies = [ "zcash_encoding", "zcash_history", "zcash_note_encryption", - "zcash_primitives", + "zcash_primitives 0.19.0", "zcash_protocol", "zebra-test", ] @@ -6163,7 +6231,7 @@ dependencies = [ "tonic-build", "tonic-reflection", "tower 0.4.13", - "zcash_primitives", + "zcash_primitives 0.19.0", "zebra-chain", "zebra-node-services", "zebra-state", @@ -6253,7 +6321,7 @@ dependencies = [ "tower 0.4.13", "tracing", "zcash_address", - "zcash_primitives", + "zcash_primitives 0.19.0", "zebra-chain", "zebra-consensus", "zebra-network", @@ -6297,9 +6365,9 @@ dependencies = [ "tracing-subscriber", "zcash_address", "zcash_client_backend", - "zcash_keys", + "zcash_keys 0.4.0", "zcash_note_encryption", - "zcash_primitives", + "zcash_primitives 0.19.0", "zebra-chain", "zebra-grpc", "zebra-node-services", @@ -6418,7 +6486,7 @@ dependencies = [ "tracing-error", "tracing-subscriber", "zcash_client_backend", - "zcash_primitives", + "zcash_primitives 0.19.0", "zcash_protocol", "zebra-chain", "zebra-node-services", diff --git a/Cargo.toml b/Cargo.toml index 1f6fec65e96..0a9166e51ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ 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_client_backend = "0.15.0" zcash_encoding = "0.2.1" zcash_history = "0.4.0" zcash_keys = "0.4.0" From 90ee578f9ddd9a79eb49fd43c37b89aab7df0141 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Thu, 5 Dec 2024 16:47:44 -0300 Subject: [PATCH 3/4] update denies --- deny.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deny.toml b/deny.toml index 6c809cabd12..bd8cfbb02e4 100644 --- a/deny.toml +++ b/deny.toml @@ -114,8 +114,8 @@ skip-tree = [ { name = "f4jumble", version = "=0.1.0" }, { name = "incrementalmerkletree", version = "=0.6.0" }, { name = "zcash_address", version = "=0.4.0" }, - { name = "zcash_keys", version = "=0.3.0" }, - { name = "zcash_primitives", version = "=0.16.0" }, + { name = "zcash_keys", version = "=0.4.0" }, + { name = "zcash_primitives", version = "=0.19.0" }, { name = "zcash_protocol", version = "=0.2.0" } ] From 4bfd4a285887f8e6fde34368cc3efc6e1d735189 Mon Sep 17 00:00:00 2001 From: Alfredo Garcia Date: Fri, 6 Dec 2024 15:58:12 -0300 Subject: [PATCH 4/4] update zcash_primitives for zebra-scan only --- Cargo.lock | 2 +- zebra-scan/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2699147dd1d..7f4c361df22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6367,7 +6367,7 @@ dependencies = [ "zcash_client_backend", "zcash_keys 0.4.0", "zcash_note_encryption", - "zcash_primitives 0.19.0", + "zcash_primitives 0.20.0", "zebra-chain", "zebra-grpc", "zebra-node-services", diff --git a/zebra-scan/Cargo.toml b/zebra-scan/Cargo.toml index c939700727e..2c3601b2990 100644 --- a/zebra-scan/Cargo.toml +++ b/zebra-scan/Cargo.toml @@ -73,7 +73,7 @@ futures = "0.3.31" # ECC dependencies. zcash_client_backend.workspace = true zcash_keys = { workspace = true, features = ["sapling"] } -zcash_primitives.workspace = true +zcash_primitives = "0.20.0" zcash_address.workspace = true sapling-crypto.workspace = true