Skip to content

Bump valar-orchard to 0.12 and voting-circuits to 0.2 #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
p0mvn merged 1 commit into from
Apr 24, 2026
Merged

Bump valar-orchard to 0.12 and voting-circuits to 0.2 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 51 additions & 13 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vote-commitment-tree/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ libc = "0.2"

[dev-dependencies]
rand = "0.8"
orchard = { version = "0.11.0", package = "valar-orchard" }
voting-circuits = "0.1.0"
orchard = { version = "0.12.0", package = "valar-orchard" }
voting-circuits = "0.2.0"
8 changes: 5 additions & 3 deletions zcash_voting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,13 @@ thiserror = "2"
# Dual orchard: voting-circuits takes valar-orchard in its public API; zcash_keys,
# valar-pczt, and zcash_primitives expose upstream orchard. Both must be namable
# here until the valar visibility changes land in zcash/orchard upstream;
# orchard_compat.rs bridges them via byte-round-trip (wire formats are identical).
# orchard_compat.rs bridges them via byte-round-trip (FullViewingKey and
# SpendingKey wire formats are unchanged across the 0.11 → 0.12 bump and
# between upstream orchard and valar-orchard).
subtle = "2.6"
orchard = { version = "0.11.0", package = "valar-orchard" }
orchard = { version = "0.12.0", package = "valar-orchard" }
orchard_upstream = { version = "0.11.0", package = "orchard" }
voting-circuits = "0.1.0"
voting-circuits = { version = "0.2.0", features = ["share-reveal"] }
zcash_keys = { version = "0.12", features = ["orchard"] }
zcash_protocol = "0.7"
nonempty = "0.11"
Expand Down
12 changes: 7 additions & 5 deletions zcash_voting/src/orchard_compat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
//! Byte-round-trip conversions between upstream orchard and valar-orchard types.
//!
//! valar-orchard is a pure superset of upstream orchard 0.11 — same wire
//! formats, additive governance-visibility methods only. Conversions here
//! serialize through the public byte APIs and cannot fail for well-formed
//! inputs. Delete this module (and the `orchard_upstream` dep) when the
//! governance-visibility changes land in zcash/orchard upstream.
//! valar-orchard 0.12 is a pure superset of upstream orchard 0.12 with the
//! governance-visibility additions, and the `FullViewingKey` / `SpendingKey`
//! wire formats are unchanged all the way back to upstream orchard 0.11 — no
//! key-format-affecting changes landed between 0.11 and 0.12. The conversions
//! here serialize through the public byte APIs and cannot fail for
//! well-formed inputs. Delete this module (and the `orchard_upstream` dep)
//! when the governance-visibility changes land in zcash/orchard upstream.

pub fn fvk_upstream_to_valar(
upstream: &orchard_upstream::keys::FullViewingKey,
Expand Down
Loading