-
Notifications
You must be signed in to change notification settings - Fork 595
fix: subfield note selectors #22211
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.
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
Merged
fix: subfield note selectors #22211
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
fdfffec
fix
Thunkar 0b0e6cd
comment
Thunkar 69cb981
Merge branch 'merge-train/fairies' of github.com:AztecProtocol/aztec-…
Thunkar 68a9ed6
Merge branch 'merge-train/fairies' of github.com:AztecProtocol/aztec-…
Thunkar 15dae2c
comment from review
Thunkar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
61 changes: 61 additions & 0 deletions
61
noir-projects/noir-contracts/contracts/test/note_getter_contract/src/packed_note.nr
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| use aztec::{ | ||
| macros::notes::note, | ||
| note::note_getter_options::PropertySelector, | ||
| protocol::traits::{Deserialize, Packable, Serialize}, | ||
| }; | ||
|
|
||
| /// A note that packs two u8 fields (high, low) into a single Field. | ||
| /// The layout in the packed Field is: (high << 8) + low. | ||
| /// This means in the big-endian 32-byte representation: | ||
| /// - low occupies offset=0, length=1 (the least significant byte) | ||
| /// - high occupies offset=1, length=1 (the second least significant byte) | ||
| #[derive(Deserialize, Eq, Serialize)] | ||
| #[note] | ||
| pub struct PackedNote { | ||
| pub high: u8, | ||
| pub low: u8, | ||
| } | ||
|
|
||
| impl Packable for PackedNote { | ||
| let N: u32 = 1; | ||
|
|
||
| fn pack(self) -> [Field; Self::N] { | ||
| [(self.high as Field) * 256 + (self.low as Field)] | ||
| } | ||
|
|
||
| fn unpack(packed: [Field; Self::N]) -> Self { | ||
| let low = packed[0] as u8; | ||
| let high = ((packed[0] - low as Field) / 256) as u8; | ||
| Self { high, low } | ||
| } | ||
| } | ||
|
|
||
| impl PackedNote { | ||
| pub fn high_selector() -> PropertySelector { | ||
| PropertySelector { index: 0, offset: 1, length: 1 } | ||
| } | ||
|
|
||
| pub fn low_selector() -> PropertySelector { | ||
| PropertySelector { index: 0, offset: 0, length: 1 } | ||
| } | ||
| } | ||
|
|
||
| mod test { | ||
| use super::{Packable, PackedNote}; | ||
|
|
||
| #[test] | ||
| fn test_pack_unpack() { | ||
| let note = PackedNote { high: 42, low: 7 }; | ||
| let unpacked = PackedNote::unpack(note.pack()); | ||
| assert_eq(unpacked.high, 42); | ||
| assert_eq(unpacked.low, 7); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_pack_unpack_max() { | ||
| let note = PackedNote { high: 255, low: 255 }; | ||
| let unpacked = PackedNote::unpack(note.pack()); | ||
| assert_eq(unpacked.high, 255); | ||
| assert_eq(unpacked.low, 255); | ||
| } | ||
| } |
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
First time I see this code, so might be redundant or unnecessary, but shouldn't we place a bunch of bounds check assertions here?