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

Added NoteType to Notes #2

Merged

PaulLaux merged 16 commits into zsa1 from zsa_value

Jun 14, 2022

Collaborator

PaulLaux commented Apr 28, 2022 •

edited

Loading

Added NoteType to Notes
Added NoteType to value commitment derivation

PaulLaux force-pushed the zsa1 branch from 790ebf7 to 0d7ecad Compare

May 12, 2022 09:40

PaulLaux force-pushed the zsa_value branch from 6d2834b to 48779d5 Compare

May 12, 2022 09:50

naure mentioned this pull request

ZSA note encryption in Orchard crate #3

Merged

PaulLaux requested review from daniben31, naure and vivek-arte

May 24, 2022 09:31

daniben31 reviewed

View reviewed changes

src/note/note_type.rs Outdated

+                  pub(super) fn derive(ak: &SpendValidatingKey, assetDesc: &[u8; 64]) -> Self {
+                      let mut s = vec![];
+                      s.extend(ak.to_bytes());

daniben31 Jun 13, 2022

I will change this to ik as soon as we merge my PR into this branch.

daniben31 reviewed

View reviewed changes

daniben31 left a comment

All is well on my end
We just need to merge my PR to this branch and change the ak -> ik for asset type generation

naure reviewed

View reviewed changes

src/note/note_type.rs

+              // the hasher used to derive the assetID
+              #[allow(non_snake_case)]
+              fn assetID_hasher(msg: Vec<u8>) -> pallas::Point {
+                  // TODO(zsa) replace personalization, will require circuit change?

naure Jun 14, 2022

--> no

naure approved these changes

View reviewed changes

PaulLaux force-pushed the zsa1 branch from 0d7ecad to ce91df1 Compare

June 14, 2022 15:32

PaulLaux added 13 commits

June 14, 2022 18:38


          Added NoteType to Notes

6ca2f9e


          reformated file

49cedd8


          updated derive for NoteType

da3c434


          added note_type to value commit derivation

69183ac


          rustfmt

56994a9


          updated ci config

393a60a


          updated ci config

6a82e1a


          updated ci config

0c5fe00


          updated derive for note_type


          added test for arb note_type

b25189e


          added test for native note type

ca693fe


          fixed clippy warrnings

4b4b660


          rustfmt

3e1020e

PaulLaux force-pushed the zsa_value branch from c4d9eea to 3e1020e Compare

June 14, 2022 15:46

PaulLaux added 3 commits

June 14, 2022 19:30


          updated note type derivation

12497af


          rustfmt

25d3c81


          fixed test

99bd12d

PaulLaux merged commit 8a6f599 into zsa1

PaulLaux added a commit that referenced this pull request


          Added NoteType to Notes (#2)

5ae5107

* Added NoteType to Notes
* Added NoteType to value commitment derivation

naure added a commit that referenced this pull request


          ZSA note encryption in Orchard crate (#3)

ac71bc7

* Circleci project setup (#1)

* Added .circleci/config.yml

* Added NoteType to Notes

* reformated file

* updated `derive` for NoteType

* added note_type to value commit derivation

* rustfmt

* updated ci config

* updated ci config

* updated ci config

* updated derive for note_type

* added test for arb note_type

* added test for `native` note type

* zsa-note-encryption: introduce AssetType and encode and decode it in note plaintexts

* zsa-note-encryption: extend the size of compact notes to include asset_type

* fixed clippy warrnings

* rustfmt

* zsa-note-encryption: document parsing requirement

* zsa-note-encryption: revert support of ZSA compact action

* zsa_value: add NoteType method is_native

* zsa-note-encryption: remove dependency on changes in the other crate

* zsa-note-encryption: extract memo of ZSA notes

* zsa-note-encryption: tests (zcash_test_vectors 77c73492)

* zsa-note-encryption: simplify roundtrip test

* zsa-note-encryption: more test vectors (zcash_test_vectors c10da464)

* Circleci project setup (#1)

* Added .circleci/config.yml

* issuer keys implementation (#5)

Implements the issuer keys as

    IssuerAuthorizingKey -> isk
    IssuerVerifyingKey -> ik

Test vectors generated with zcash_test_vectors repo

* Added NoteType to Notes (#2)

* Added NoteType to Notes
* Added NoteType to value commitment derivation

* zsa-note-encryption: use both native and ZSA in proptests

* zsa-note-encryption: test vector commit 51398c93

* zsa-note-encryption: fix after merge

Co-authored-by: Paul <[email protected]>
Co-authored-by: Paul <[email protected]>
Co-authored-by: Aurélien Nicolas <[email protected]>
Co-authored-by: Daniel Benarroch <[email protected]>

alexeykoren pushed a commit that referenced this pull request


          Added NoteType to Notes (#2)

d33b59b

* Added NoteType to Notes
* Added NoteType to value commitment derivation

alexeykoren pushed a commit that referenced this pull request


          ZSA note encryption in Orchard crate (#3)

025c35c

* Circleci project setup (#1)

* Added .circleci/config.yml

* Added NoteType to Notes

* reformated file

* updated `derive` for NoteType

* added note_type to value commit derivation

* rustfmt

* updated ci config

* updated ci config

* updated ci config

* updated derive for note_type

* added test for arb note_type

* added test for `native` note type

* zsa-note-encryption: introduce AssetType and encode and decode it in note plaintexts

* zsa-note-encryption: extend the size of compact notes to include asset_type

* fixed clippy warrnings

* rustfmt

* zsa-note-encryption: document parsing requirement

* zsa-note-encryption: revert support of ZSA compact action

* zsa_value: add NoteType method is_native

* zsa-note-encryption: remove dependency on changes in the other crate

* zsa-note-encryption: extract memo of ZSA notes

* zsa-note-encryption: tests (zcash_test_vectors 77c73492)

* zsa-note-encryption: simplify roundtrip test

* zsa-note-encryption: more test vectors (zcash_test_vectors c10da464)

* Circleci project setup (#1)

* Added .circleci/config.yml

* issuer keys implementation (#5)

Implements the issuer keys as

    IssuerAuthorizingKey -> isk
    IssuerVerifyingKey -> ik

Test vectors generated with zcash_test_vectors repo

* Added NoteType to Notes (#2)

* Added NoteType to Notes
* Added NoteType to value commitment derivation

* zsa-note-encryption: use both native and ZSA in proptests

* zsa-note-encryption: test vector commit 51398c93

* zsa-note-encryption: fix after merge

Co-authored-by: Paul <[email protected]>
Co-authored-by: Paul <[email protected]>
Co-authored-by: Aurélien Nicolas <[email protected]>
Co-authored-by: Daniel Benarroch <[email protected]>

vivek-arte pushed a commit that referenced this pull request


          Added NoteType to Notes (#2)

398b49f

* Added NoteType to Notes
* Added NoteType to value commitment derivation

vivek-arte pushed a commit that referenced this pull request


          ZSA note encryption in Orchard crate (#3)

9e57d7d

* Circleci project setup (#1)

* Added .circleci/config.yml

* Added NoteType to Notes

* reformated file

* updated `derive` for NoteType

* added note_type to value commit derivation

* rustfmt

* updated ci config

* updated ci config

* updated ci config

* updated derive for note_type

* added test for arb note_type

* added test for `native` note type

* zsa-note-encryption: introduce AssetType and encode and decode it in note plaintexts

* zsa-note-encryption: extend the size of compact notes to include asset_type

* fixed clippy warrnings

* rustfmt

* zsa-note-encryption: document parsing requirement

* zsa-note-encryption: revert support of ZSA compact action

* zsa_value: add NoteType method is_native

* zsa-note-encryption: remove dependency on changes in the other crate

* zsa-note-encryption: extract memo of ZSA notes

* zsa-note-encryption: tests (zcash_test_vectors 77c73492)

* zsa-note-encryption: simplify roundtrip test

* zsa-note-encryption: more test vectors (zcash_test_vectors c10da464)

* Circleci project setup (#1)

* Added .circleci/config.yml

* issuer keys implementation (#5)

Implements the issuer keys as

    IssuerAuthorizingKey -> isk
    IssuerVerifyingKey -> ik

Test vectors generated with zcash_test_vectors repo

* Added NoteType to Notes (#2)

* Added NoteType to Notes
* Added NoteType to value commitment derivation

* zsa-note-encryption: use both native and ZSA in proptests

* zsa-note-encryption: test vector commit 51398c93

* zsa-note-encryption: fix after merge

Co-authored-by: Paul <[email protected]>
Co-authored-by: Paul <[email protected]>
Co-authored-by: Aurélien Nicolas <[email protected]>
Co-authored-by: Daniel Benarroch <[email protected]>

vivek-arte pushed a commit that referenced this pull request


          Added NoteType to Notes (#2)

86abc31

* Added NoteType to Notes
* Added NoteType to value commitment derivation

vivek-arte pushed a commit that referenced this pull request


          ZSA note encryption in Orchard crate (#3)

ff25221

* Circleci project setup (#1)

* Added .circleci/config.yml

* Added NoteType to Notes

* reformated file

* updated `derive` for NoteType

* added note_type to value commit derivation

* rustfmt

* updated ci config

* updated ci config

* updated ci config

* updated derive for note_type

* added test for arb note_type

* added test for `native` note type

* zsa-note-encryption: introduce AssetType and encode and decode it in note plaintexts

* zsa-note-encryption: extend the size of compact notes to include asset_type

* fixed clippy warrnings

* rustfmt

* zsa-note-encryption: document parsing requirement

* zsa-note-encryption: revert support of ZSA compact action

* zsa_value: add NoteType method is_native

* zsa-note-encryption: remove dependency on changes in the other crate

* zsa-note-encryption: extract memo of ZSA notes

* zsa-note-encryption: tests (zcash_test_vectors 77c73492)

* zsa-note-encryption: simplify roundtrip test

* zsa-note-encryption: more test vectors (zcash_test_vectors c10da464)

* Circleci project setup (#1)

* Added .circleci/config.yml

* issuer keys implementation (#5)

Implements the issuer keys as

    IssuerAuthorizingKey -> isk
    IssuerVerifyingKey -> ik

Test vectors generated with zcash_test_vectors repo

* Added NoteType to Notes (#2)

* Added NoteType to Notes
* Added NoteType to value commitment derivation

* zsa-note-encryption: use both native and ZSA in proptests

* zsa-note-encryption: test vector commit 51398c93

* zsa-note-encryption: fix after merge

Co-authored-by: Paul <[email protected]>
Co-authored-by: Paul <[email protected]>
Co-authored-by: Aurélien Nicolas <[email protected]>
Co-authored-by: Daniel Benarroch <[email protected]>

PaulLaux added a commit that referenced this pull request


          Added NoteType to Notes (#2)

e6b7762

* Added NoteType to Notes
* Added NoteType to value commitment derivation

PaulLaux added a commit that referenced this pull request


          ZSA note encryption in Orchard crate (#3)

088abc6

* Circleci project setup (#1)

* Added .circleci/config.yml

* Added NoteType to Notes

* reformated file

* updated `derive` for NoteType

* added note_type to value commit derivation

* rustfmt

* updated ci config

* updated ci config

* updated ci config

* updated derive for note_type

* added test for arb note_type

* added test for `native` note type

* zsa-note-encryption: introduce AssetType and encode and decode it in note plaintexts

* zsa-note-encryption: extend the size of compact notes to include asset_type

* fixed clippy warrnings

* rustfmt

* zsa-note-encryption: document parsing requirement

* zsa-note-encryption: revert support of ZSA compact action

* zsa_value: add NoteType method is_native

* zsa-note-encryption: remove dependency on changes in the other crate

* zsa-note-encryption: extract memo of ZSA notes

* zsa-note-encryption: tests (zcash_test_vectors 77c73492)

* zsa-note-encryption: simplify roundtrip test

* zsa-note-encryption: more test vectors (zcash_test_vectors c10da464)

* Circleci project setup (#1)

* Added .circleci/config.yml

* issuer keys implementation (#5)

Implements the issuer keys as

    IssuerAuthorizingKey -> isk
    IssuerVerifyingKey -> ik

Test vectors generated with zcash_test_vectors repo

* Added NoteType to Notes (#2)

* Added NoteType to Notes
* Added NoteType to value commitment derivation

* zsa-note-encryption: use both native and ZSA in proptests

* zsa-note-encryption: test vector commit 51398c93

* zsa-note-encryption: fix after merge

Co-authored-by: Paul <[email protected]>
Co-authored-by: Paul <[email protected]>
Co-authored-by: Aurélien Nicolas <[email protected]>
Co-authored-by: Daniel Benarroch <[email protected]>

PaulLaux added a commit that referenced this pull request


          chaged from_byte to from_vec #2

2ebea7f

PaulLaux added a commit that referenced this pull request


          removed AsMut #2

8cced99

PaulLaux added a commit that referenced this pull request


          changed style for From #2

4c52098

PaulLaux added a commit that referenced this pull request


          changed AsRef to AsMut #2

82cd194

dmidem added a commit that referenced this pull request


          Synchronize Orchard with updates from zcash_note_encryption for PR #2 …

ef52f61

…issues resolve

dmidem added a commit that referenced this pull request


          Synchronize Orchard with updates from zcash_note_encryption for zcash…

6e6112c

… PR #2 issues resolve (#111)

Orchard has been synced with the changes from [PR
#10](QED-it/zcash_note_encryption#10) in the
`zcash_note_encryption` repository. This update includes the following
changes:

- Implements new `parse_note_plaintext_bytes`,
`parse_note_ciphertext_bytes`, and `parse_compact_note_plaintext_bytes`
methods of the `Domain` trait from `zcash_note_encryption`.
- Uses the `NoteBytes` trait and `NoteBytesData` structure from
`zcash_note_encryption` instead of having local definitions and
implementations.

### Note
This PR uses the `resolve_zcash_pr2_issues` branch of
`zcash_note_encryption` in `Cargo.toml`. Before merging this PR, [PR
#10](https://github.com/zcash/zcash_note_encryption/pull/10) needs to be
merged into the `zsa1` branch of `zcash_note_encryption`. Then, this
Orchard PR branch should be updated to use the `zsa1` branch of
`zcash_note_encryption` befor merging this PR.

---------

Co-authored-by: Dmitry Demin <[email protected]>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet