Minimize orchard fork: move voting-only code out, revert unnecessary changes#12
Merged
czarcas7ic merged 5 commits intoApr 10, 2026
Merged
Conversation
czarcas7ic
added a commit
that referenced
this pull request
Apr 10, 2026
Mark P2 action items 1-4 and Tier 3 queue items 8-12 as done, referencing #12. Update executive summary, verification checklist, and last-updated timestamp.
…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.
czarcas7ic
force-pushed
the
adam/minimize-orchard-fork
branch
from
b0e2d4e to
6f2f32d
Compare
p0mvn
approved these changes
Apr 10, 2026
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
2 participants
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
MulChip/MulInstructionandprove_spend_authorityout of the orchard fork into voting-circuits, where their only consumers liveopt-level,debug) to match upstream v0.11.0pub(crate)→pubvisibility widenings back topub(crate)(constants, keys, nullifier, tree, spec utilities)circuit/README.md(documented voting-circuits gadgets, not orchard internals)UPSTREAM.mddocumenting every remaining fork change that needs to be upstreamed tozcash/orchardbefore the fork can be deletedTest plan
cargo test --workspacepasses after each commit (125 tests, 0 failures)zcash/orchardv0.11.0 tag — remaining diff is only necessary visibility widenings and structural additions