deps: upgrade ECC dependencies (#4699)

Cargo.toml

@@ -66,4 +66,4 @@ lto = "thin"
 [patch.crates-io]
 
 # Currently pointing to `download-sprout-params` branch.
-zcash_proofs = { git = "https://github.com/ZcashFoundation/librustzcash.git", rev = "6d75718076e592a41b6bd6ec916dc15420e4cc3c" }
+zcash_proofs = { git = "https://github.com/ZcashFoundation/librustzcash.git", rev = "4567a37ceccbd506a58aaaded39ba14c952c1510" }

deny.toml

@@ -26,10 +26,16 @@ allow = [
 skip = [
     #  wait for zcash_proofs fork be merged back into upstream
     # https://github.com/ZcashFoundation/zebra/issues/3831
-    { name = "equihash", version = "=0.1.0" },
+    { name = "equihash", version = "=0.2.0" },
     { name = "zcash_encoding", version = "=0.1.0" },
     { name = "zcash_note_encryption", version = "=0.1.0" },
-    { name = "zcash_primitives", version = "=0.6.0" },
+    { name = "zcash_primitives", version = "=0.7.0" },
+
+    # wait until zcash updates its halo2, orchard, etc. dependencies
+    # (which is likely to happen in the release after 5.0.0)
+    { name = "halo2_gadgets", version = "=0.1.0" },
+    { name = "halo2_proofs", version = "=0.1.0" },
+    { name = "orchard", version = "=0.1.0" },
 ]
 # Similarly to `skip` allows you to skip certain crates during duplicate
 # detection. Unlike skip, it also includes the entire tree of transitive

zebra-chain/Cargo.toml

@@ -27,7 +27,7 @@ displaydoc = "0.2.3"
 fpe = "0.5.1"
 futures = "0.3.21"
 group = "0.12.0"
-halo2 = { package = "halo2_proofs", version = "0.1.0" }
+halo2 = { package = "halo2_proofs", version = "0.2.0" }
 hex = { version = "0.4.3", features = ["serde"] }
 incrementalmerkletree = "0.3.0"
 itertools = "0.10.3"
@@ -49,11 +49,11 @@ thiserror = "1.0.31"
 uint = "0.9.1"
 x25519-dalek = { version = "1.2.0", features = ["serde"] }
 
-orchard = "0.1.0"
+orchard = "0.2.0"
 
 equihash = "0.1.0"
 zcash_note_encryption = "0.1"
-zcash_primitives = { version = "0.6.0", features = ["transparent-inputs"] }
+zcash_primitives = { version = "0.7.0", features = ["transparent-inputs"] }
 zcash_encoding = "0.1.0"
 zcash_history = "0.3.0"
 

zebra-consensus/Cargo.toml

@@ -16,7 +16,7 @@ bls12_381 = "0.7.0"
 jubjub = "0.9.0"
 rand = { version = "0.8.5", package = "rand" }
 
-halo2 = { package = "halo2_proofs", version = "0.1.0" }
+halo2 = { package = "halo2_proofs", version = "0.2.0" }
 
 chrono = "0.4.19"
 dirs = "4.0.0"
@@ -34,11 +34,11 @@ tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
 tracing = "0.1.31"
 tracing-futures = "0.2.5"
 
-orchard = "0.1.0"
+orchard = "0.2.0"
 
 # TODO: replace with upstream librustzcash when these changes are merged (#3037)
 # Currently pointing to `download-sprout-params` branch.
-zcash_proofs = { git = "https://github.com/ZcashFoundation/librustzcash.git", rev = "6d75718076e592a41b6bd6ec916dc15420e4cc3c", features = ["local-prover", "multicore", "download-params"] }
+zcash_proofs = { git = "https://github.com/ZcashFoundation/librustzcash.git", rev = "4567a37ceccbd506a58aaaded39ba14c952c1510", features = ["local-prover", "multicore", "download-params"] }
 
 tower-fallback = { path = "../tower-fallback/" }
 tower-batch = { path = "../tower-batch/" }

zebra-state/Cargo.toml

@@ -46,7 +46,7 @@ insta = { version = "1.15.0", features = ["ron"] }
 proptest = "0.10.1"
 proptest-derive = "0.3.0"
 
-halo2 = { package = "halo2_proofs", version = "0.1.0" }
+halo2 = { package = "halo2_proofs", version = "0.2.0" }
 jubjub = "0.9.0"
 
 tokio = { version = "1.19.2", features = ["full", "tracing", "test-util"] }