Merge branch 'next' of github.com:AztecProtocol/aztec-packages into gj/the_great_wallet_refactor

Thunkar · Thunkar · commit a2310d9927d0 · 2025-08-13T05:07:40.000Z
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.87.6"
+  ".": "1.2.1"
 }
diff --git a/.test_patterns.yml b/.test_patterns.yml
@@ -137,6 +137,10 @@ tests:
   - regex: "src/e2e_p2p/preferred_gossip_network.test.ts"
     owners:
       - *palla
+  - regex: "src/e2e_p2p/gossip_network.test.ts"
+    error_regex: "Block 5 not yet synced"
+    owners:
+      - *palla
   - regex: "src/e2e_fees/private_payments"
     owners:
       - *phil
diff --git a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/protogalaxy.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/protogalaxy.bench.cpp
@@ -17,7 +17,7 @@ using FF = typename Flavor::FF;
 
 void vector_of_evaluations(State& state) noexcept
 {
-    using RelationEvaluations = typename Flavor::TupleOfArraysOfValues;
+    using RelationEvaluations = decltype(create_tuple_of_arrays_of_values<typename Flavor::Relations>());
 
     for (auto _ : state) {
         std::vector<RelationEvaluations> evals(1 << state.range(0));
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/avm2_recursion_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/avm2_recursion_constraint.cpp
@@ -4,6 +4,7 @@
 // external_2:  { status: not started, auditors: [], date: YYYY-MM-DD }
 // =====================
 
+#include "barretenberg/numeric/bitop/get_msb.hpp"
 #ifndef DISABLE_AZTEC_VM
 
 #include "avm2_recursion_constraint.hpp"
@@ -16,6 +17,7 @@
 #include "barretenberg/stdlib/primitives/pairing_points.hpp"
 #include "barretenberg/vm2/common/avm_inputs.hpp"
 #include "barretenberg/vm2/common/aztec_constants.hpp"
+#include "barretenberg/vm2/common/constants.hpp"
 #include "barretenberg/vm2/constraining/recursion/goblin_avm_recursive_verifier.hpp"
 #include "barretenberg/vm2/constraining/recursion/recursive_flavor.hpp"
 #include "barretenberg/vm2/constraining/recursion/recursive_verifier.hpp"
@@ -63,7 +65,7 @@ void create_dummy_vkey_and_proof(Builder& builder,
     //     (proof_size - Flavor::NUM_WITNESS_ENTITIES * Flavor::NUM_FRS_COM -
     //      (Flavor::NUM_ALL_ENTITIES + 1) * Flavor::NUM_FRS_FR - Flavor::NUM_FRS_COM) /
     //     (Flavor::NUM_FRS_COM + Flavor::NUM_FRS_FR * (Flavor::BATCHED_RELATION_PARTIAL_LENGTH + 1));
-    const auto log_circuit_size = CONST_PROOF_SIZE_LOG_N;
+    const auto log_circuit_size = numeric::get_msb(avm2::CIRCUIT_SUBGROUP_SIZE);
 
     // First key field is log circuit size
     builder.set_variable(key_fields[0].witness_index, log_circuit_size);
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_flavor.hpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_flavor.hpp
@@ -149,16 +149,10 @@ class ECCVMFlavor {
         /* 29 Shplonk Q commitment */ (num_frs_comm) +
         /* 30 IPA proof */ IPA_PROOF_LENGTH;
 
-    // Instantiate the BarycentricData needed to extend each Relation Univariate
-
-    // define the containers for storing the contributions from each relation in Sumcheck
-    using SumcheckTupleOfTuplesOfUnivariates = decltype(create_sumcheck_tuple_of_tuples_of_univariates<Relations>());
-
     // The sub-protocol `compute_translation_opening_claims` outputs an opening claim for the batched univariate
     // evaluation of `op`, `Px`, `Py`, `z1`, and `z2`, and an array of opening claims for the evaluations of the
     // SmallSubgroupIPA witness polynomials.
     static constexpr size_t NUM_TRANSLATION_OPENING_CLAIMS = NUM_SMALL_IPA_EVALUATIONS + 1;
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
 
     // TODO(https://github.com/AztecProtocol/barretenberg/issues/989): refine access specifiers in flavors, this is
     // public as it is also used in the recursive flavor but the two could possibly me unified eventually
diff --git a/barretenberg/cpp/src/barretenberg/flavor/mega_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/mega_flavor.hpp
@@ -131,8 +131,6 @@ class MegaFlavor {
         decltype(create_protogalaxy_tuple_of_tuples_of_univariates<Relations,
                                                                    NUM_KEYS,
                                                                    /*optimised=*/true>());
-    using SumcheckTupleOfTuplesOfUnivariates = decltype(create_sumcheck_tuple_of_tuples_of_univariates<Relations>());
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
 
     // Whether or not the first row of the execution trace is reserved for 0s to enable shifts
     static constexpr bool has_zero_row = true;
diff --git a/barretenberg/cpp/src/barretenberg/flavor/mega_recursive_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/mega_recursive_flavor.hpp
@@ -92,9 +92,6 @@ template <typename BuilderType> class MegaRecursiveFlavor_ {
     static constexpr size_t NUM_SUBRELATIONS = MegaFlavor::NUM_SUBRELATIONS;
     using SubrelationSeparators = std::array<FF, NUM_SUBRELATIONS - 1>;
 
-    // define the container for storing the univariate contribution from each relation in Sumcheck
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
-
     /**
      * @brief A field element for each entity of the flavor. These entities represent the prover polynomials evaluated
      * at one point.
@@ -179,6 +176,20 @@ template <typename BuilderType> class MegaRecursiveFlavor_ {
             }
             return VerificationKey(builder, vk_fields);
         }
+
+        /**
+         * @brief Fixes witnesses of VK to be constants.
+         *
+         */
+        void fix_witness()
+        {
+            this->log_circuit_size.fix_witness();
+            this->num_public_inputs.fix_witness();
+            this->pub_inputs_offset.fix_witness();
+            for (Commitment& commitment : this->get_all()) {
+                commitment.fix_witness();
+            }
+        }
     };
 
     /**
diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra_flavor.hpp
@@ -137,8 +137,6 @@ class UltraFlavor {
         decltype(create_protogalaxy_tuple_of_tuples_of_univariates<Relations,
                                                                    NUM_KEYS,
                                                                    /*optimised=*/true>());
-    using SumcheckTupleOfTuplesOfUnivariates = decltype(create_sumcheck_tuple_of_tuples_of_univariates<Relations>());
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
 
     // Whether or not the first row of the execution trace is reserved for 0s to enable shifts
     static constexpr bool has_zero_row = true;
diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive_flavor.hpp
@@ -103,9 +103,6 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
     static constexpr size_t NUM_SUBRELATIONS = NativeFlavor::NUM_SUBRELATIONS;
     using SubrelationSeparators = std::array<FF, NUM_SUBRELATIONS - 1>;
 
-    // define the container for storing the univariate contribution from each relation in Sumcheck
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
-
     /**
      * @brief The verification key is responsible for storing the commitments to the precomputed (non-witnessk)
      * polynomials used by the verifier.
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp
@@ -355,7 +355,8 @@ TEST(Protogalaxy, CombinerOptimizationConsistency)
             RelationParameters<FF> relation_parameters;
             // Temporary accumulator to compute the sumcheck on the second key
             // Note: {} is required to initialize the tuple contents. Otherwise the values contain garbage.
-            typename Flavor::TupleOfArraysOfValues temporary_accumulator{};
+            using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<typename Flavor::Relations>());
+            TupleOfArraysOfValues temporary_accumulator{};
 
             // Accumulate arithmetic relation over 2 rows on the second key
             for (size_t i = 0; i < 2; i++) {
@@ -391,7 +392,7 @@ TEST(Protogalaxy, CombinerOptimizationConsistency)
             // Compute the sum for each index separately, treating each extended key independently
             for (size_t idx = 0; idx < UNIVARIATE_LENGTH; idx++) {
                 // Note: {} is required to initialize the tuple contents. Otherwise the values contain garbage.
-                typename Flavor::TupleOfArraysOfValues accumulator{};
+                TupleOfArraysOfValues accumulator{};
                 if (idx < NUM_KEYS) {
                     for (size_t i = 0; i < 2; i++) {
                         UltraArithmeticRelation::accumulate(std::get<0>(accumulator),
diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_internal.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_internal.hpp
@@ -83,7 +83,7 @@ template <class DeciderProvingKeys_> class ProtogalaxyProverInternal {
     using TupleOfTuplesOfUnivariatesNoOptimisticSkipping =
         typename Flavor::template ProtogalaxyTupleOfTuplesOfUnivariatesNoOptimisticSkipping<DeciderPKs::NUM>;
 
-    using RelationEvaluations = typename Flavor::TupleOfArraysOfValues;
+    using RelationEvaluations = decltype(create_tuple_of_arrays_of_values<typename Flavor::Relations>());
 
     static constexpr size_t NUM_SUBRELATIONS = DeciderPKs::NUM_SUBRELATIONS;
 
diff --git a/barretenberg/cpp/src/barretenberg/relations/utils.hpp b/barretenberg/cpp/src/barretenberg/relations/utils.hpp
@@ -23,7 +23,7 @@ template <typename Flavor> class RelationUtils {
     using FF = typename Flavor::FF;
     using Relations = typename Flavor::Relations;
     using PolynomialEvaluations = typename Flavor::AllValues;
-    using RelationEvaluations = typename Flavor::TupleOfArraysOfValues;
+    using RelationEvaluations = decltype(create_tuple_of_arrays_of_values<typename Flavor::Relations>());
     using SubrelationSeparators = typename Flavor::SubrelationSeparators;
 
     static constexpr size_t NUM_RELATIONS = Flavor::NUM_RELATIONS;
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp
@@ -72,11 +72,6 @@ class ECCVMRecursiveFlavor {
     static constexpr size_t BATCHED_RELATION_PARTIAL_LENGTH = ECCVMFlavor::BATCHED_RELATION_PARTIAL_LENGTH;
     static constexpr size_t NUM_RELATIONS = std::tuple_size<Relations>::value;
 
-    // Instantiate the BarycentricData needed to extend each Relation Univariate
-
-    // define the containers for storing the contributions from each relation in Sumcheck
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
-
     /**
      * @brief A field element for each entity of the flavor.  These entities represent the prover polynomials
      * evaluated at one point.
diff --git a/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp
@@ -85,9 +85,6 @@ class TranslatorRecursiveFlavor {
     static constexpr size_t BATCHED_RELATION_PARTIAL_LENGTH = NativeFlavor::BATCHED_RELATION_PARTIAL_LENGTH;
     static constexpr size_t NUM_RELATIONS = std::tuple_size_v<Relations>;
 
-    // define the containers for storing the contributions from each relation in Sumcheck
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
-
     /**
      * @brief A field element for each entity of the flavor.  These entities represent the prover polynomials
      * evaluated at one point.
diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp
@@ -46,7 +46,7 @@ template <typename Flavor> class SumcheckProverRound {
 
     using Utils = bb::RelationUtils<Flavor>;
     using Relations = typename Flavor::Relations;
-    using SumcheckTupleOfTuplesOfUnivariates = typename Flavor::SumcheckTupleOfTuplesOfUnivariates;
+    using SumcheckTupleOfTuplesOfUnivariates = decltype(create_sumcheck_tuple_of_tuples_of_univariates<Relations>());
     using SubrelationSeparators = typename Flavor::SubrelationSeparators;
 
   public:
@@ -705,7 +705,7 @@ template <typename Flavor> class SumcheckProverRound {
 template <typename Flavor> class SumcheckVerifierRound {
     using Utils = bb::RelationUtils<Flavor>;
     using Relations = typename Flavor::Relations;
-    using TupleOfArraysOfValues = typename Flavor::TupleOfArraysOfValues;
+    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<typename Flavor::Relations>());
     using SubrelationSeparators = typename Flavor::SubrelationSeparators;
 
   public:
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/translator_flavor.hpp b/barretenberg/cpp/src/barretenberg/translator_vm/translator_flavor.hpp
@@ -195,10 +195,6 @@ class TranslatorFlavor {
         /* 16. Shplonk Q commitment */ (num_frs_comm) +
         /* 17. KZG W commitment */ (num_frs_comm);
 
-    // define the containers for storing the contributions from each relation in Sumcheck
-    using SumcheckTupleOfTuplesOfUnivariates = decltype(create_sumcheck_tuple_of_tuples_of_univariates<Relations>());
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
-
     /**
      * @brief A base class labelling precomputed entities and (ordered) subsets of interest.
      * @details Used to build the proving key and verification key.
diff --git a/barretenberg/cpp/src/barretenberg/vm2/constraining/flavor.hpp b/barretenberg/cpp/src/barretenberg/vm2/constraining/flavor.hpp
@@ -93,9 +93,6 @@ class AvmFlavor {
     static constexpr size_t BATCHED_RELATION_PARTIAL_LENGTH = MAX_PARTIAL_RELATION_LENGTH + 1;
     static constexpr size_t NUM_RELATIONS = std::tuple_size_v<Relations>;
 
-    using SumcheckTupleOfTuplesOfUnivariates = decltype(create_sumcheck_tuple_of_tuples_of_univariates<Relations>());
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
-
     static constexpr bool has_zero_row = true;
 
     static constexpr size_t NUM_FRS_COM = field_conversion::calc_num_bn254_frs<Commitment>();
diff --git a/barretenberg/cpp/src/barretenberg/vm2/constraining/recursion/goblin_avm_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/vm2/constraining/recursion/goblin_avm_recursive_verifier.hpp
@@ -131,8 +131,10 @@ class AvmGoblinRecursiveVerifier {
         // Recursively verify the Mega proof \pi_M in the Ultra circuit
         // All verifier components share a single transcript
         auto transcript = std::make_shared<MegaRecursiveFlavor::Transcript>();
-        // TODO(https://github.com/AztecProtocol/barretenberg/issues/1305): Mega + Goblin VKs must be circuit constants.
         auto mega_vk_and_hash = std::make_shared<MegaRecursiveVKAndHash>(ultra_builder, inner_output.mega_vk);
+        // Fix the inner mega vk and vk hash to be constants in the outer circuit.
+        mega_vk_and_hash->vk->fix_witness();
+        mega_vk_and_hash->hash.fix_witness();
         MegaRecursiveVerifier mega_verifier(&ultra_builder, mega_vk_and_hash, transcript);
         stdlib::Proof<UltraBuilder> mega_proof(ultra_builder, inner_output.mega_proof);
         auto mega_verifier_output = mega_verifier.template verify_proof<IO>(mega_proof);
diff --git a/barretenberg/cpp/src/barretenberg/vm2/constraining/recursion/recursive_flavor.hpp b/barretenberg/cpp/src/barretenberg/vm2/constraining/recursion/recursive_flavor.hpp
@@ -49,9 +49,6 @@ class AvmRecursiveFlavor {
     // and Shplemini
     static constexpr bool USE_PADDING = true;
 
-    // define the containers for storing the contributions from each relation in Sumcheck
-    using TupleOfArraysOfValues = decltype(create_tuple_of_arrays_of_values<Relations>());
-
     /**
      * @brief A field element for each entity of the flavor. These entities represent the prover polynomials
      * evaluated at one point.
diff --git a/l1-contracts/test/governance/scenario/slashing/Slashing.t.sol b/l1-contracts/test/governance/scenario/slashing/Slashing.t.sol
@@ -43,7 +43,7 @@ contract SlashingTest is TestBase {
   SlashingProposer internal slashingProposer;
   TimeCheater internal timeCheater;
 
-  function _createPayloadAndSignalForSlashing(address[] memory _attesters, uint96 _slashAmount)
+  function _createPayloadAndSignalForSlashing(address[] memory _attesters, uint96 _slashAmount, uint256 _howMany)
     internal
     returns (uint256, IPayload)
   {
@@ -54,13 +54,15 @@ contract SlashingTest is TestBase {
     timeCheater.cheat__jumpToSlot(desiredSlot);
     uint256 round = slashingProposer.getCurrentRound();
 
-    uint96[] memory amounts = new uint96[](_attesters.length);
-    uint256[] memory offenses = new uint256[](_attesters.length);
-    for (uint256 i = 0; i < _attesters.length; i++) {
+    address[] memory offenders = new address[](_howMany);
+    uint96[] memory amounts = new uint96[](_howMany);
+    uint256[] memory offenses = new uint256[](_howMany);
+    for (uint256 i = 0; i < _howMany; i++) {
+      offenders[i] = _attesters[i];
       amounts[i] = _slashAmount;
     }
 
-    IPayload payload = slashFactory.createSlashPayload(_attesters, amounts, offenses);
+    IPayload payload = slashFactory.createSlashPayload(offenders, amounts, offenses);
 
     for (uint256 i = 0; i < 10; i++) {
       address proposer = rollup.getCurrentProposer();
@@ -135,7 +137,7 @@ contract SlashingTest is TestBase {
     _setupCommitteeForSlashing(_lifetimeInRounds, _executionDelayInRounds);
     address[] memory attesters = rollup.getEpochCommittee(Epoch.wrap(2));
     uint96 slashAmount = 10e18;
-    (uint256 firstSlashingRound,) = _createPayloadAndSignalForSlashing(attesters, slashAmount);
+    (uint256 firstSlashingRound,) = _createPayloadAndSignalForSlashing(attesters, slashAmount, attesters.length);
 
     uint256 firstExecutableSlot = (firstSlashingRound + _executionDelayInRounds + 1) * slashingProposer.ROUND_SIZE();
     _jumpToSlot = bound(_jumpToSlot, timeCheater.currentSlot(), firstExecutableSlot - 1);
@@ -159,7 +161,7 @@ contract SlashingTest is TestBase {
     _setupCommitteeForSlashing(_lifetimeInRounds, _executionDelayInRounds);
     address[] memory attesters = rollup.getEpochCommittee(Epoch.wrap(2));
     uint96 slashAmount = 10e18;
-    (uint256 firstSlashingRound,) = _createPayloadAndSignalForSlashing(attesters, slashAmount);
+    (uint256 firstSlashingRound,) = _createPayloadAndSignalForSlashing(attesters, slashAmount, attesters.length);
 
     uint256 firstExecutableSlot = (firstSlashingRound + _executionDelayInRounds + 1) * slashingProposer.ROUND_SIZE();
     uint256 lastExecutableSlot = (firstSlashingRound + _lifetimeInRounds) * slashingProposer.ROUND_SIZE();
@@ -191,7 +193,8 @@ contract SlashingTest is TestBase {
     _setupCommitteeForSlashing(_lifetimeInRounds, _executionDelayInRounds);
     address[] memory attesters = rollup.getEpochCommittee(Epoch.wrap(2));
     uint96 slashAmount = 10e18;
-    (uint256 firstSlashingRound, IPayload payload) = _createPayloadAndSignalForSlashing(attesters, slashAmount);
+    (uint256 firstSlashingRound, IPayload payload) =
+      _createPayloadAndSignalForSlashing(attesters, slashAmount, attesters.length);
 
     vm.prank(address(slasher.VETOER()));
     slasher.vetoPayload(payload);
@@ -208,6 +211,7 @@ contract SlashingTest is TestBase {
 
   function test_Slashing() public {
     _setupCommitteeForSlashing();
+    uint256 howManyToSlash = 4;
 
     address[] memory attesters = rollup.getEpochCommittee(Epoch.wrap(2));
     uint256[] memory stakes = new uint256[](attesters.length);
@@ -219,10 +223,10 @@ contract SlashingTest is TestBase {
 
     // We slash a small amount and see that they are all still validating, but less stake
     uint96 slashAmount1 = 10e18;
-    (uint256 firstSlashingRound,) = _createPayloadAndSignalForSlashing(attesters, slashAmount1);
+    (uint256 firstSlashingRound,) = _createPayloadAndSignalForSlashing(attesters, slashAmount1, howManyToSlash);
     slashingProposer.submitRoundWinner(firstSlashingRound);
 
-    for (uint256 i = 0; i < attesters.length; i++) {
+    for (uint256 i = 0; i < howManyToSlash; i++) {
       AttesterView memory attesterView = rollup.getAttesterView(attesters[i]);
       assertEq(attesterView.effectiveBalance, stakes[i] - slashAmount1);
       assertEq(attesterView.exit.amount, 0, "Invalid stake");
@@ -233,10 +237,10 @@ contract SlashingTest is TestBase {
     // Why we doing it in two steps explicitly here? To make sure that it is clear
     // that it works like this.
     uint96 slashAmount2 = 40e18 + 1;
-    (uint256 secondSlashingRound,) = _createPayloadAndSignalForSlashing(attesters, slashAmount2);
+    (uint256 secondSlashingRound,) = _createPayloadAndSignalForSlashing(attesters, slashAmount2, howManyToSlash);
     slashingProposer.submitRoundWinner(secondSlashingRound);
 
-    for (uint256 i = 0; i < attesters.length; i++) {
+    for (uint256 i = 0; i < howManyToSlash; i++) {
       AttesterView memory attesterView = rollup.getAttesterView(attesters[i]);
       assertEq(attesterView.effectiveBalance, 0);
       assertEq(attesterView.exit.amount, stakes[i] - slashAmount1 - slashAmount2, "Invalid stake");
diff --git a/noir-projects/noir-contracts/contracts/app/token_blacklist_contract/src/types/roles.nr b/noir-projects/noir-contracts/contracts/app/token_blacklist_contract/src/types/roles.nr
@@ -15,6 +15,7 @@ pub struct UserFlags {
 impl Packable for UserFlags {
     let N: u32 = 1;
 
+    #[inline_always]
     fn pack(self) -> [Field; Self::N] {
         let mut value: u64 = 0;
 
@@ -33,6 +34,7 @@ impl Packable for UserFlags {
         [value.to_field()]
     }
 
+    #[inline_always]
     fn unpack(fields: [Field; Self::N]) -> Self {
         let value: u64 = fields[0] as u64;
         let is_admin = value & ADMIN_FLAG == ADMIN_FLAG;
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/meta/mod.nr b/noir-projects/noir-protocol-circuits/crates/types/src/meta/mod.nr
@@ -491,10 +491,12 @@ pub comptime fn derive_packable(s: TypeDefinition) -> Quoted {
         {
             let N: u32 = $right_hand_side_of_definition_of_n;
 
+            #[inline_always]
             fn pack(self) -> [Field; Self::N] {
                 $pack_function_body
             }
 
+            #[inline_always]
             fn unpack(packed: [Field; Self::N]) -> Self {
                 $unpack_function_body
             }
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/type_packing.nr b/noir-projects/noir-protocol-circuits/crates/types/src/type_packing.nr
diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/type_serialization.nr b/noir-projects/noir-protocol-circuits/crates/types/src/type_serialization.nr
diff --git a/noir/noir-repo-ref b/noir/noir-repo-ref

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "0.87.6"`
	`2`	`+ ".": "1.2.1"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ using FF = typename Flavor::FF;`
`17`	`17`
`18`	`18`	`void vector_of_evaluations(State& state) noexcept`
`19`	`19`	`{`
`20`		`- using RelationEvaluations = typename Flavor::TupleOfArraysOfValues;`
	`20`	`+ using RelationEvaluations = decltype(create_tuple_of_arrays_of_values<typename Flavor::Relations>());`
`21`	`21`
`22`	`22`	`for (auto _ : state) {`
`23`	`23`	`std::vector<RelationEvaluations> evals(1 << state.range(0));`