refactor: restructuring function macros + migration notes#18289
Merged
refactor: restructuring function macros + migration notes#18289
Conversation
This was referenced Nov 8, 2025
Contributor
Author
benesjan
force-pushed
the
11-08-refactor_restructuring_function_macros
branch
from
6768d36 to
08e2889
Compare
benesjan
force-pushed
the
11-07-feat_new_external_function_call_interface
branch
from
1b0eb6f to
50e1222
Compare
benesjan
force-pushed
the
11-08-refactor_restructuring_function_macros
branch
from
6b1c439 to
08e2889
Compare
benesjan
force-pushed
the
11-07-feat_new_external_function_call_interface
branch
from
8bb0e31 to
4463791
Compare
benesjan
force-pushed
the
11-08-refactor_restructuring_function_macros
branch
from
08e2889 to
31d7349
Compare
benesjan
commented
Nov 10, 2025
|
|
||
| /// Checks if each function in the module is marked with either #[external(...)], #[contract_library_method], or #[test]. | ||
| /// Non-macroified functions are not allowed in contracts. | ||
| comptime fn check_each_fn_macroified(m: Module) { |
Contributor
Author
There was a problem hiding this comment.
Move here from noir-projects/aztec-nr/aztec/src/macros/functions/utils.nr
benesjan
commented
Nov 10, 2025
| @@ -1,527 +0,0 @@ | |||
| // TODO(benesjan): Move this whole file to `noir-projects/aztec-nr/aztec/src/macros/internals_functions_generation`. | |||
Contributor
Author
There was a problem hiding this comment.
Having this here no longer made any sense. Also having all this functionality in the same file was too messy as these functions are quite complex. All the functionality here has been moved over to macros/internals_functions_generation/external directory.
benesjan
commented
Nov 10, 2025
| /// Gathers all attributes relevant to the function's ABI and returns a quote that can be applied to the newly generated | ||
| /// function. We apply the abi marker attributes instead of the original ones (e.g. abi_view instead of view) to avoid | ||
| /// the relevant attribute's functionality from getting triggered. | ||
| comptime fn get_abi_relevant_attributes(f: FunctionDefinition) -> Quoted { |
Contributor
Author
There was a problem hiding this comment.
Moved to macros/internals_functions_generation/external/helpers.nr
benesjan
commented
Nov 10, 2025
| attributes | ||
| } | ||
|
|
||
| pub(crate) comptime fn transform_private(f: FunctionDefinition) -> Quoted { |
Contributor
Author
There was a problem hiding this comment.
Moved to macros/internals_functions_generation/external/private.nr
benesjan
commented
Nov 10, 2025
| } | ||
| } | ||
|
|
||
| pub(crate) comptime fn transform_public(f: FunctionDefinition) -> Quoted { |
Contributor
Author
There was a problem hiding this comment.
Moved to macros/internals_functions_generation/external/public.nr
benesjan
commented
Nov 10, 2025
| } | ||
| } | ||
|
|
||
| pub(crate) comptime fn transform_utility(f: FunctionDefinition) -> Quoted { |
Contributor
Author
There was a problem hiding this comment.
Moved to macros/internals_functions_generation/external/utility.nr
benesjan
commented
Nov 10, 2025
|
|
||
| /// Injects a call to `aztec::messages::discovery::discover_new_messages`, causing for new notes to be added to PXE and made | ||
| /// available for the current execution. | ||
| pub(crate) comptime fn create_message_discovery_call() -> Quoted { |
Contributor
Author
There was a problem hiding this comment.
Moved to macros/internals_functions_generation/external/helpers.nr
benesjan
commented
Nov 10, 2025
| /// * `is_private` - Whether the function is a private function (`true`) or a public function (`false`). This determines | ||
| /// which authwit verification method to use: `assert_current_call_valid_authwit` for private functions | ||
| /// or `assert_current_call_valid_authwit_public` for public functions. | ||
| pub(crate) comptime fn create_authorize_once_check( |
Contributor
Author
There was a problem hiding this comment.
Moved to macros/internals_functions_generation/external/helpers.nr
benesjan
commented
Nov 10, 2025
|
|
||
| /// Checks if each function in the module is marked with either #[external(...)], #[contract_library_method], or #[test]. | ||
| /// Non-macroified functions are not allowed in contracts. | ||
| pub(crate) comptime fn check_each_fn_macroified(m: Module) { |
Contributor
Author
There was a problem hiding this comment.
Moved to macros/aztec.nr - it was the only place where it was used
benesjan
commented
Nov 10, 2025
| use protocol_types::meta::utils::derive_serialization_quotes; | ||
| use std::meta::{ctstring::AsCtString, type_of}; | ||
|
|
||
| pub(crate) comptime fn generate_private_external(f: FunctionDefinition) -> Quoted { |
Contributor
Author
There was a problem hiding this comment.
Renamed the transform_private function to this to follow the naming of the internal functions (there it's called generate_private_internal.
benesjan
commented
Nov 10, 2025
| }; | ||
| use std::meta::ctstring::AsCtString; | ||
|
|
||
| pub(crate) comptime fn generate_public_external(f: FunctionDefinition) -> Quoted { |
Contributor
Author
There was a problem hiding this comment.
Same here. Renamed this.
benesjan
commented
Nov 10, 2025
| utils::module_has_storage, | ||
| }; | ||
|
|
||
| pub(crate) comptime fn generate_utility_external(f: FunctionDefinition) -> Quoted { |
Contributor
Author
There was a problem hiding this comment.
Same here. Renamed this.
benesjan
force-pushed
the
11-08-refactor_restructuring_function_macros
branch
from
31d7349 to
d7294cc
Compare
benesjan
force-pushed
the
11-07-feat_new_external_function_call_interface
branch
from
4463791 to
39a98d3
Compare
benesjan
changed the title
benesjan
force-pushed
the
11-07-feat_new_external_function_call_interface
branch
from
39a98d3 to
26b8165
Compare
benesjan
force-pushed
the
11-08-refactor_restructuring_function_macros
branch
from
d7294cc to
384c442
Compare
AztecBot
force-pushed
the
11-07-feat_new_external_function_call_interface
branch
from
26b8165 to
7de49f6
Compare
Base automatically changed from
11-07-feat_new_external_function_call_interface
to
next
November 10, 2025 20:01
benesjan
force-pushed
the
11-08-refactor_restructuring_function_macros
branch
2 times, most recently
from
bc4c8d7 to
4989b0d
Compare
Collaborator
Flakey Tests🤖 says: This CI run detected 1 tests that failed, but were tolerated due to a .test_patterns.yml entry. |
benesjan
force-pushed
the
11-08-refactor_restructuring_function_macros
branch
from
4989b0d to
48cdb09
Compare
This was referenced Nov 13, 2025
benesjan
force-pushed
the
11-08-refactor_restructuring_function_macros
branch
from
38b4974 to
296e47c
Compare
In the past core of the macro logic was handled by the external macro code. This has changed and now it's all done by Aztec macro. This resulted in a lot of the macro functionality now being placed in a way that made no sense. In the PR diff I comment on where each function was moved to. I also update migration notes and I describe there all the new contract API.
AztecBot
force-pushed
the
11-08-refactor_restructuring_function_macros
branch
from
296e47c to
ecd4088
Compare
ludamad
pushed a commit
that referenced
this pull request
Dec 16, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
In the past core of the macro logic was handled by the external macro code. This has changed and now it's all done by Aztec macro.
This resulted in a lot of the macro functionality now being placed in a way that made no sense. In the PR diff I comment on where each function was moved to.
I also update migration notes and I describe there all the new contract API.