feat: Sync from aztec-packages

.aztec-sync-commit

@@ -0,0 +1 @@
+2799f1fe1718fadd4bc0705449a8b4c79bc391b6

aztec_macros/src/lib.rs

@@ -63,12 +63,12 @@
 }
 
 const FUNCTION_TREE_HEIGHT: u32 = 5;
-const MAX_CONTRACT_FUNCTIONS: usize = 2_usize.pow(FUNCTION_TREE_HEIGHT);
+const MAX_CONTRACT_PRIVATE_FUNCTIONS: usize = 2_usize.pow(FUNCTION_TREE_HEIGHT);
 
 #[derive(Debug, Clone)]
 pub enum AztecMacroError {
     AztecDepNotFound,
-    ContractHasTooManyFunctions { span: Span },
+    ContractHasTooManyPrivateFunctions { span: Span },
     ContractConstructorMissing { span: Span },
     UnsupportedFunctionArgumentType { span: Span, typ: UnresolvedTypeData },
     UnsupportedStorageType { span: Option<Span>, typ: UnresolvedTypeData },
@@ -84,8 +84,8 @@
                 secondary_message: None,
                 span: None,
             },
-            AztecMacroError::ContractHasTooManyFunctions { span } => MacroError {
-                primary_message: format!("Contract can only have a maximum of {} functions", MAX_CONTRACT_FUNCTIONS),
+            AztecMacroError::ContractHasTooManyPrivateFunctions { span } => MacroError {
+                primary_message: format!("Contract can only have a maximum of {} private functions", MAX_CONTRACT_PRIVATE_FUNCTIONS),
                 secondary_message: None,
                 span: Some(span),
             },
@@ -456,10 +456,22 @@
     if has_transformed_module {
         // We only want to run these checks if the macro processor has found the module to be an Aztec contract.
 
-        if module.functions.len() > MAX_CONTRACT_FUNCTIONS {
+        let private_functions_count = module
+            .functions
+            .iter()
+            .filter(|func| {
+                func.def
+                    .attributes
+                    .secondary
+                    .iter()
+                    .any(|attr| is_custom_attribute(attr, "aztec(private)"))
+            })
+            .count();
+
+        if private_functions_count > MAX_CONTRACT_PRIVATE_FUNCTIONS {
             let crate_graph = &context.crate_graph[crate_id];
             return Err((
-                AztecMacroError::ContractHasTooManyFunctions { span: Span::default() },
+                AztecMacroError::ContractHasTooManyPrivateFunctions { span: Span::default() },
                 crate_graph.root_file_id,
             ));
         }
@@ -1644,8 +1656,8 @@
     // If compute_note_hash_and_nullifier is already defined by the user, we skip auto-generation in order to provide an
     // escape hatch for this mechanism.
     // TODO(#4647): improve this diagnosis and error messaging.
     if collected_functions.iter().any(|coll_funcs_data| {
         check_for_compute_note_hash_and_nullifier_definition(&coll_funcs_data.functions, module_id)
     }) {
         return Ok(());
     }
@@ -1699,7 +1711,7 @@
     unresolved_traits_impls: &[UnresolvedTraitImpl],
     trait_name: &str,
 ) -> Vec<String> {
     let mut struct_typenames: Vec<String> = Vec::new();
 
     // These structs can be declared in either external crates or the current one. External crates that contain
     // dependencies have already been processed and resolved, but are available here via the NodeInterner. Note that
@@ -1709,7 +1721,7 @@
 
         if trait_impl.borrow().ident.0.contents == *trait_name {
             if let Type::Struct(s, _) = &trait_impl.borrow().typ {
                 struct_typenames.push(s.borrow().name.0.contents.clone());
             } else {
                 panic!("Found impl for {} on non-Struct", trait_name);
             }

test_programs/execution_success/3_add/src/main.nr

@@ -5,4 +5,4 @@ fn main(mut x: u32, y: u32, z: u32) {
 
     x *= 8;
     assert(x > 9);
-}
+}