Skip to content

Rename valar-orchard back to orchard, bump to 0.12.1 #19

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

Closed
p0mvn wants to merge 1 commit into from
Closed

Rename valar-orchard back to orchard, bump to 0.12.1 #19

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
82 changes: 41 additions & 41 deletions orchard/Cargo.lock
View file
Open in desktop

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

17 changes: 3 additions & 14 deletions orchard/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "valar-orchard"
version = "0.12.0"
name = "orchard"
version = "0.12.1"
authors = [
"Sean Bowe",
"Jack Grigg <jack@electriccoin.co>",
Expand All @@ -10,19 +10,12 @@ authors = [
]
edition = "2021"
rust-version = "1.70"
description = "Valar Group fork of the Orchard shielded transaction protocol, maintained until governance-visibility changes are upstreamed to zcash/orchard."
description = "The Orchard shielded transaction protocol (Valar Group fork with governance-visibility additions for the Zcash shielded-voting protocol)."
license = "MIT OR Apache-2.0"
repository = "https://github.com/valargroup/voting-circuits"
documentation = "https://docs.rs/valar-orchard"
readme = "README.md"
categories = ["cryptography::cryptocurrencies"]
keywords = ["zcash"]
# `book/` contains an mdBook source tree with symlinks into an out-of-repo
# sibling repo (shielded_vote_book). Those symlinks resolve only on the
# maintainers' machines and would otherwise break `cargo publish` archiving.
# The rendered book is published separately; consumers of this crate on
# crates.io don't need the source.
exclude = ["book"]

[package.metadata.docs.rs]
all-features = true
Expand Down Expand Up @@ -85,10 +78,6 @@ inferno = { version = "0.11", default-features = false, features = ["multithread
pprof = { version = "0.11", features = ["criterion", "flamegraph"] }

[lib]
# Keep the Rust identifier as `orchard` so consumer code using
# `use orchard::...` continues to work via cargo's `package = "valar-orchard"`
# rename trick.
name = "orchard"
bench = false

[features]
Expand Down
72 changes: 36 additions & 36 deletions voting-circuits/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 voting-circuits/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "voting-circuits"
version = "0.2.0"
version = "0.12.1"
edition = "2021"
description = "Governance ZKP circuits (delegation, vote proof, share reveal) for the Zcash shielded-voting protocol."
license = "MIT OR Apache-2.0"
repository = "https://github.com/valargroup/voting-circuits"
readme = "README.md"

[dependencies]
orchard = { path = "../orchard", version = "0.12.0", package = "valar-orchard", features = ["circuit"] }
orchard = { path = "../orchard", version = "0.12.1", features = ["circuit"] }
halo2_proofs = { version = "0.3", default-features = false, features = ["batch", "floor-planner-v1-legacy-pdqsort"] }
halo2_gadgets = { version = "0.4", default-features = false }
pasta_curves = "0.5"
Expand Down
4 changes: 2 additions & 2 deletions voting-circuits/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ use voting_circuits::vote_proof::circuit::VoteProofCircuit;
// ... assemble public/private inputs and run halo2_proofs
```

## Dependency on `valar-orchard`
## Dependency on the Valar `orchard` fork

This crate depends on `valar-orchard`, a Valar Group fork of the upstream `orchard` crate that adds the governance-visibility methods the voting circuits rely on. When the relevant changes land in upstream `zcash/orchard`, this crate's dependency will flip back to the real upstream and `valar-orchard` will be yanked. See [the shielded-voting plan](https://github.com/valargroup/vote-sdk) for status.
This crate depends on `orchard` from a Valar Group fork that adds the governance-visibility methods the voting circuits rely on. The fork lives alongside this crate in the [`valargroup/voting-circuits`](https://github.com/valargroup/voting-circuits) repository at the `orchard/` path and is consumed via git tag (not crates.io, since the name is taken by upstream `zcash/orchard`). When the relevant changes land in upstream `zcash/orchard`, this crate's dependency will flip back to the real upstream. See [the shielded-voting plan](https://github.com/valargroup/vote-sdk) for status.

## License

Expand Down