Skip to content
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

Jump to bottom

Step 4: Refactor Orchard structures to generics and add Orchard ZSA support for Transaction V6 #11

Closed
wants to merge 18 commits into from
Closed

Step 4: Refactor Orchard structures to generics and add Orchard ZSA support for Transaction V6 #11

wants to merge 18 commits into from

Commits on Sep 16, 2024

  1. Add support for Orchard ZSA and updated generic structures for Tx V6 … 

    …(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.
    @dmidem
    dmidem committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    23e318c View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Fix compilation errors for unit tests

    @dmidem
    dmidem committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    e98bb67 View commit details
    Browse the repository at this point in the history

  2. Add missed files

    @dmidem
    dmidem committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    dd741e9 View commit details
    Browse the repository at this point in the history

  3. Fix ciphertexts.rs tests compilation error

    @dmidem
    dmidem committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    c218fc5 View commit details
    Browse the repository at this point in the history

  4. Simplify the previous fix for ciphertexts.rs test

    @dmidem
    dmidem committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    4807dd6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'switch-to-zsa-crates-nu6-txv6-gen' of https://github.co… 

    …m/QED-it/zebra into switch-to-zsa-crates-nu6-txv6-gen
    @dmidem
    dmidem committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    cccadcd View commit details
    Browse the repository at this point in the history

  6. Fix tests compilation errors for nullifiers

    @dmidem
    dmidem committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    0f9c164 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. Merge branch 'switch-to-zsa-crates-nu6-txv6' into switch-to-zsa-crate… 

    …s-nu6-txv6-gen
    @dmidem
    dmidem committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    20810ee View commit details
    Browse the repository at this point in the history

  2. Merge branch 'switch-to-zsa-crates-nu6-txv6' into switch-to-zsa-crate… 

    …s-nu6-txv6-gen
    @dmidem
    dmidem committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    986339e View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Add several FIXME comments

    @dmidem
    dmidem committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    4d8cdef View commit details
    Browse the repository at this point in the history

  2. Remove (comment out) zcash_unstable=nu6 Rust flag and sync Cargo.lock… 

    … with the upstream halo2/librustcash/orchard/sapling versions
    @dmidem
    dmidem committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    1adadb1 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' into switch-to-zsa-crates-… 

    …nu6-txv6-gen
    @dmidem
    dmidem committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    e9b0d46 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Attempt to make the code compilable when tx-v6 feature is disabled

    @dmidem
    dmidem committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    e2e160c View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Merge branch 'main' of https://github.com/QED-it/zebra into switch-to… 

    …-zsa-crates-nu6-txv6-gen
    @dmidem
    dmidem committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    5eade11 View commit details
    Browse the repository at this point in the history

  2. Use tx-v6 feature across all crates

    @dmidem
    dmidem committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    763cded View commit details
    Browse the repository at this point in the history

  3. Merge branch 'switch-to-zsa-crates-nu6-txv6-gen-txv6-disabled' into s… 

    …witch-to-zsa-crates-nu6-txv6-gen
    @dmidem
    dmidem committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    083171f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'switch-to-zsa-crates-nu6-txv6' into switch-to-zsa-crate… 

    …s-nu6-txv6-gen
    @dmidem
    dmidem committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    d2917fb View commit details
    Browse the repository at this point in the history

  5. Patch path for zcash_keys in Cargo.toml to avoid crate duplication in… 

    … the crate tree
    @dmidem
    dmidem committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    c979861 View commit details
    Browse the repository at this point in the history