Migrate to orchard 0.13 + librustzcash zcash/main

Cargo.toml

@@ -6,11 +6,27 @@ members = [
 ]
 resolver = "2"
 
-# Mirrors the sapling-crypto git pin used by the librustzcash fork
-# (valargroup/librustzcash PR #43, `shielded-vote-for-zodl-3.4.0`). `zcash_primitives`
-# depends on `sapling = "0.6.2"` from crates.io; without this patch its build picks
-# up the published 0.6.2 crate, diverging from the fork's build graph and
-# producing two distinct `sapling` nodes (one for our build, one inside the fork
-# crates) that are incompatible at the type level.
+# Single-source patches for the orchard 0.13 + librustzcash zcash/main migration.
+#
+# - `orchard`: pin to the valargroup branch carrying orchard 0.13.0 plus the
+#   cherry-picks tracked by valargroup/orchard PR #19:
+#     * zcash/orchard PR #489 — SpendAuthG fixed-base multiplication, and
+#     * zcash/orchard PR #495 — `NoteValue::ZERO` public associated constant.
+#   The same pin is used by every downstream consumer so the entire dep graph
+#   collapses to a single orchard node.
+# - `voting-circuits`: pin to the matching valargroup branch (consumes the orchard
+#   git pin above; published 0.2.0 still depends on the retired valar-orchard fork
+#   and would create a duplicate orchard node in the graph).
+# - `pczt` / `zcash_*` / `transparent`: pin to the upstream zcash/librustzcash
+#   `main` HEAD now that all governance PRs (#2283, #2284, #2281) are merged
+#   upstream — the valargroup/librustzcash fork is fully retired.
 [patch.crates-io]
-sapling = { package = "sapling-crypto", git = "https://github.com/zcash/sapling-crypto.git", rev = "b8a81c22f034d68f9bbd6cba728aab807b9ba2ea" }
+orchard = { git = "https://github.com/valargroup/orchard.git", rev = "c26a6ec6860cc62bb15d208c3d790dfb616bfbe7" }
+voting-circuits = { git = "https://github.com/valargroup/voting-circuits.git", rev = "66777e27e10970c38dc1ebb93d8c7715a5b984c7" }
+pczt = { git = "https://github.com/zcash/librustzcash.git", rev = "976efa76ca2195d693f373aeaa201a2c50b6e0ab" }
+zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "976efa76ca2195d693f373aeaa201a2c50b6e0ab" }
+zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "976efa76ca2195d693f373aeaa201a2c50b6e0ab" }
+zcash_keys = { git = "https://github.com/zcash/librustzcash.git", rev = "976efa76ca2195d693f373aeaa201a2c50b6e0ab" }
+zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "976efa76ca2195d693f373aeaa201a2c50b6e0ab" }
+zcash_protocol = { git = "https://github.com/zcash/librustzcash.git", rev = "976efa76ca2195d693f373aeaa201a2c50b6e0ab" }
+transparent = { package = "zcash_transparent", git = "https://github.com/zcash/librustzcash.git", rev = "976efa76ca2195d693f373aeaa201a2c50b6e0ab" }