ZSA integration (cumulative steps 1–7): up to Orchard ZSA consensus modifications (copy 2)#43
Closed
dmidem wants to merge 258 commits into
Closed
ZSA integration (cumulative steps 1–7): up to Orchard ZSA consensus modifications (copy 2)#43dmidem wants to merge 258 commits into
dmidem wants to merge 258 commits into
Conversation
…(without unit tests fixing for now). - Refactored `ShieldedData` and `Action` structures to be generics parameterized by Orchard flavor (`OrchardVanilla` or `OrchardZSA`), enabling support for both Orchard protocols in Tx V6. - Introduced a `burn` field in `ShieldedData` to support ZSA, with unit type for Tx V5 and a vector of burn items for Tx V6. - Modified `Transaction` enum methods (orchard_...) to handle generics properly, ensuring compatibility with both Orchard flavors. - Implemented serialization and deserialization for Tx V6 while avoiding code redundancy with Tx V5 wherever possible.
…m/QED-it/zebra into switch-to-zsa-crates-nu6-txv6-gen
…rgo/config.toml settings
…and panic if V6 passed into it
…action/arbitrary.rs
… explicit imlps as const generic are stabilized
dmidem
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.
This pull request merges the changes from several incremental PRs into one cumulative set of updates on top of the
zsa1branch. It introduces ZSA-compatible crates, Network Upgrade 7 (Nu7), initial Transaction V6 support, Orchard generics for ZSA, property-based testing enhancements, note commitment handling for ZSA issuance, and initial consensus modifications for Orchard ZSA.It does not include the final state management changes or additional tests — those come in subsequent PRs.
Below is a high-level overview of the merged changes:
ZSA-Compatible Crates Integration (Step 1)
ZSA integration (step 1): Integrate ZSA-compatible crates into Zebra while maintaining original Orchard (Vanilla) support for now [to upstream] #24:
halo2,zcash_note_encryption, etc.) with QED-it’s ZSA-compatible forks.Network Upgrade 7 (Nu7) Support (Step 2)
ZSA integration (step 2): Add Network Upgrade 7 (Nu7) support to Zebra #15
FIXMEcomments where final activation heights and other specifics must be filled in.Transaction V6 Foundations (Step 3)
ZSA integration (step 3): Add initial Transaction V6 support to Zebra (currently copies V5 behavior) #16
V6variant to Zebra’sTransactionenum, initially mirroringV5logic.Refactor Orchard Structures to Generics (Step 4)
ZSA integration (step 4): Refactor Orchard structures to generics and add Orchard ZSA support for Transaction V6 #17
ShieldedData) to generics, enabling a single code path for both Orchard Vanilla and Orchard ZSA.V6transactions, including aburnfield in the ZSA flavor.Orchard Proptests with ZSA Enhancements (Step 5)
ZSA integration (step 5): Modify Orchard proptest implementations to support ZSA #18
Transaction V6.Burntypes) for better clarity and future expansion.Integration of ZSA Issuance Commitments (Step 6)
ZSA integration (step 6): Integrate Orchard ZSA Issuance note commitments with Shielded Data action commitments for V6 transactions #25
V6transactions.Transaction::orchard_note_commitmentsincludes issuance note commitments when present, preservingV5behavior.Initial ZSA Consensus Support (Step 7)
ZSA integration (step 7): Modify zebra-consensus to support Orchard ZSA #28
zebra-consensusto support Orchard ZSA.Next Steps
By consolidating these first several steps into a single PR, we aim to simplify the review process .