Skip to content

Separate OrchardZSA from Orchard #13

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

Merged
vivek-arte merged 32 commits into from
Apr 30, 2024
Merged

Separate OrchardZSA from Orchard #13

Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
99cfb32
Initial separation of Orchard and OrchardZSA material -- currently ha…
vivek-arte Feb 29, 2024
c31d37a
reverting orchard code to original (without QEDIT ZSA additions and r…
vivek-arte Mar 3, 2024
6ce2272
adding orchardzsa changes
vivek-arte Mar 13, 2024
749d104
changes to transaction.py
vivek-arte Mar 13, 2024
c10ffeb
changes to zip_0244.py
vivek-arte Mar 13, 2024
0b3015f
changes to pyproject.toml and regenerate.sh
vivek-arte Mar 13, 2024
2990c1d
minor fixes
vivek-arte Mar 18, 2024
295875a
refactoring orchardzsa to orchard_zsa
vivek-arte Mar 24, 2024
6277a33
inheriting OrchardNote in OrchardZSANote to reduce code redundancy
vivek-arte Mar 25, 2024
e9ae4ab
inheriting OrchardNotePlaintext in OrchardZSANotePlaintext to reduce …
vivek-arte Mar 25, 2024
d4e3925
changes to TransmittedNoteCipherText for Orchard (refactoring to allo…
vivek-arte Mar 26, 2024
ac8878c
changes to TransmittedZSANoteCipherText to inherit TransmittedNoteCip…
vivek-arte Mar 26, 2024
7c21a62
changes to OrchardZSANoteEncryption to inherit OrchardNoteEncryption …
vivek-arte Mar 26, 2024
ca6d758
small improvement to add NU6_VERSION_GROUP_ID as a fixed value which …
vivek-arte Mar 30, 2024
6d59c52
reverting test vector files to pre-ZSA material
vivek-arte Mar 30, 2024
353b10d
adding new files for OrchardZSA test vectors
vivek-arte Mar 30, 2024
98feb96
Merge branch 'master' into separate_zsa
vivek-arte Mar 30, 2024
758fe2f
regenerating json test vectors
vivek-arte Mar 30, 2024
a9fe4b6
fixing random seed to get unchanged values
vivek-arte Mar 30, 2024
0e77f66
adding missing newline at the end of file
vivek-arte Mar 30, 2024
72748be
rregenerating somee more files
vivek-arte Mar 30, 2024
06599ae
adding poetry.lock file
vivek-arte Mar 30, 2024
dc0bf67
removing unnecessary file
vivek-arte Mar 31, 2024
2b3039e
updating the existing test vectors files
vivek-arte Apr 8, 2024
046ddff
using the super() function to make the use of inheritance clearer
vivek-arte Apr 9, 2024
02db7a4
removing orchard_key_components in favour of orchard_zsa_key_components
vivek-arte Apr 9, 2024
ae490f9
Merge branch 'zsa1' into separate_zsa
vivek-arte Apr 17, 2024
96eb605
updating based on review comments
vivek-arte Apr 17, 2024
1618543
removing TxV6 generation, will be done in separate PR
vivek-arte Apr 23, 2024
f071920
removing Transaction V6 class, and reverting to NU5 computation of ZI…
vivek-arte Apr 24, 2024
9aba8df
removing unused imports
vivek-arte Apr 26, 2024
e67e933
updating and removing comments
vivek-arte Apr 26, 2024
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
138 changes: 59 additions & 79 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,14 @@ orchard_empty_roots = "zcash_test_vectors.orchard.empty_roots:main"
orchard_generators = "zcash_test_vectors.orchard.generators:main"
orchard_group_hash = "zcash_test_vectors.orchard.group_hash:main"
orchard_map_to_curve = "zcash_test_vectors.orchard.group_hash:map_to_curve_test_vectors"
orchard_key_components = "zcash_test_vectors.orchard.key_components:main"
orchard_merkle_tree = "zcash_test_vectors.orchard.merkle_tree:main"
orchard_note_encryption = "zcash_test_vectors.orchard.note_encryption:main"
orchard_poseidon = "zcash_test_vectors.orchard.poseidon:main"
orchard_poseidon_hash = "zcash_test_vectors.orchard.poseidon:hash_test_vectors"
orchard_sinsemilla = "zcash_test_vectors.orchard.sinsemilla:main"

# OrchardZSA test vectors
orchard_zsa_asset_base="zcash_test_vectors.orchard_zsa.asset_base:main"
orchard_zsa_issuance_auth_sig="zcash_test_vectors.orchard_zsa.issuance_auth_sig:main"
orchard_zsa_key_components = "zcash_test_vectors.orchard_zsa.key_components:main"
orchard_zsa_note_encryption = "zcash_test_vectors.orchard_zsa.note_encryption:main"
5 changes: 4 additions & 1 deletion regenerate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ tv_scripts=(
orchard_empty_roots
orchard_generators
orchard_group_hash
orchard_key_components
orchard_map_to_curve
orchard_merkle_tree
orchard_note_encryption
orchard_poseidon
orchard_poseidon_hash
orchard_sinsemilla
orchard_zsa_asset_base
orchard_zsa_issuance_auth_sig
orchard_zsa_key_components
orchard_zsa_note_encryption
sapling_generators
sapling_key_components
sapling_note_encryption
Expand Down
14 changes: 0 additions & 14 deletions test-vectors/json/orchard_key_components.json
View file
Open in desktop

This file was deleted.

Loading