chore: minimize orchard fork + switch imt-tree to crates.io#13
Merged
Conversation
Replace the floating `branch = "main"` git dependency on vote-nullifier-pir with the now-published crates.io version. Eliminates the URL-form mismatch that caused imt-tree to be double-compiled in the iOS SDK build (P4/P6).
…ting-circuits These types are voting-circuits helpers with no consumers inside orchard itself. Moving them shrinks the fork diff vs upstream v0.11.0.
…-circuits Revert orchard/src/circuit.rs back to the upstream inline [alpha] SpendAuthG + ak_P block, and move the extracted prove_spend_authority() function into voting-circuits where its only consumers live (delegation and vote-proof circuits).
Revert [profile.dev] opt-level and [profile.release/bench] debug settings to match upstream zcash/orchard v0.11.0.
…ate)
Revert visibility widenings that voting-circuits does not import:
T_Q, T_P, L_ORCHARD_SCALAR, L_VALUE, NullifierDerivingKey::{prf_nf,
to_bytes, from_bytes}, CommitIvkRandomness::{to_bytes, from_bytes},
Nullifier::dummy, Anchor::inner, value_commit_orchard, lebs2ip,
lebs2ip_field, i2lebsp. Also remove circuit/README.md which documented
voting-circuits gadgets, not orchard internals.
Comprehensive checklist of visibility widenings and structural additions that need to be upstreamed to zcash/orchard before the fork can be removed entirely.
Minimize orchard fork: move voting-only code out, revert unnecessary changes
chore: switch imt-tree to crates.io v0.1.0
czarcas7ic
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Orchard fork minimization:
mul_chip(MulChip + MulInstruction) andspend_authoritygadgets out of orchard intovoting-circuits/src/circuit/circuit.rsspend authority to upstream v0.11.0 inline blockorchard/Cargo.tomlto match upstreampub(crate)orchard/src/circuit/README.md,orchard/src/shared_primitives/UPSTREAM.mddocumenting the remaining fork diff (visibility widenings + structural additions) needed to eliminate the fork entirelyDependency cleanup:
imt-treedev-dep from floatingbranch = "main"git dep to published crates.io v0.1.0Related PRs
Test plan
cargo test— 125 tests pass (121 unit + 4 integration)mul_chip.rsandshared_primitives/removed, dev profiles match upstream v0.11.0UPSTREAM.mddocuments all remaining fork changes for upstreaming