Skip to content

fix(aztec-nr): Avoid relying on unquoted integers changing types #18299

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
jfecher merged 1 commit into from
Nov 11, 2025
Merged

fix(aztec-nr): Avoid relying on unquoted integers changing types #18299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions noir-projects/aztec-nr/aztec/src/macros/notes.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ comptime fn generate_note_properties(s: TypeDefinition) -> Quoted {
let mut properties_list = &[];
for i in 0..note_fields.len() {
let (name, _, _) = note_fields[i];
let i = i as u8;
properties_list = properties_list.push_back(
quote { $name: aztec::note::note_getter_options::PropertySelector { index: $i, offset: 0, length: 32 } },
);
Expand Down
5 changes: 3 additions & 2 deletions noir-projects/aztec-nr/aztec/src/macros/storage.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ pub comptime fn storage(s: TypeDefinition) -> Quoted {
for field in s.fields_as_written() {
// FIXME: This doesn't handle field types with generics
let (name, typ, _) = field;
let slot_field = slot as Field;
let (storage_field_constructor, storage_size) =
generate_storage_field_constructor(typ, quote { $slot });
generate_storage_field_constructor(typ, quote { $slot_field });
storage_vars_constructors =
storage_vars_constructors.push_back(quote { $name: $storage_field_constructor });
// We have `Storable` in a separate `.nr` file instead of defining it in the last quote of this function
Expand All @@ -57,7 +58,7 @@ pub comptime fn storage(s: TypeDefinition) -> Quoted {
quote { pub $name: dep::aztec::state_vars::storage::Storable },
);
storage_layout_constructors = storage_layout_constructors.push_back(
quote { $name: dep::aztec::state_vars::storage::Storable { slot: $slot } },
quote { $name: dep::aztec::state_vars::storage::Storable { slot: $slot_field } },
);
//let with_context_generic = add_context_generic(typ, context_generic);
//println(with_context_generic);
Expand Down
Loading