chore: use PublicComponentKeys (#13686)

Replaces `contains_ipa_claim` and `ipa_claim_public_input_indices` with
`ipa_claim_public_input_key` (a `PublicComponentKey`). This reduces the
rollup flavor UH VK size in fields from 139 to 129.

Note: Huge diff is due to regeneration of some Prover.toml files in
`noir-protocol-circuits/crates`

Author: ledwards2225

barretenberg/acir_tests/internal_test_programs/double_verify_honk_proof/src/main.nr

@@ -1,8 +1,9 @@
 // This circuit aggregates two Honk proof from `assert_statement`.
 global SIZE_OF_PROOF_IF_LOGN_IS_28: u32 = 456;
 global HONK_IDENTIFIER: u32 = 1;
+global HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS: u32 = 128;
 fn main(
-    verification_key: [Field; 128],
+    verification_key: [Field; HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS],
     // This is the proof without public inputs attached.
     // This means: the size of this does not change with the number of public inputs.
     proof: [Field; SIZE_OF_PROOF_IF_LOGN_IS_28],

barretenberg/acir_tests/internal_test_programs/verify_honk_proof/src/main.nr

@@ -1,8 +1,9 @@
 // This circuit aggregates a single Honk proof from `assert_statement`.
 global SIZE_OF_PROOF_IF_LOGN_IS_28: u32 = 456;
 global HONK_IDENTIFIER: u32 = 1;
+global HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS: u32 = 128;
 fn main(
-    verification_key: [Field; 128],
+    verification_key: [Field; HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS],
     // This is the proof without public inputs attached.
     // This means: the size of this does not change with the number of public inputs.
     proof: [Field; SIZE_OF_PROOF_IF_LOGN_IS_28],

barretenberg/acir_tests/internal_test_programs/verify_rollup_honk_proof/src/main.nr

@@ -1,8 +1,9 @@
 // This circuit aggregates a single Honk proof from `assert_statement`.
 global SIZE_OF_PROOF_IF_LOGN_IS_28: u32 = 466 + 69;
 global ROLLUP_HONK_IDENTIFIER: u32 = 5;
+global ROLLUP_HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS: u32 = 129;
 fn main(
-    verification_key: [Field; 139],
+    verification_key: [Field; ROLLUP_HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS],
     // This is the proof without public inputs attached.
     // This means: the size of this does not change with the number of public inputs.
     proof: [Field; SIZE_OF_PROOF_IF_LOGN_IS_28],

barretenberg/cpp/src/barretenberg/commitment_schemes/claim.hpp

@@ -74,13 +74,7 @@ template <typename Curve> class OpeningClaim {
         commitment.set_public();
 
         Builder* ctx = commitment.get_context();
-        // TODO(https://github.com/AztecProtocol/barretenberg/issues/1325): Eventually the builder/PK/VK will store
-        // public input key which should be set here and ipa_claim_public_input_indices should go away.
-        uint32_t pub_idx = start_idx;
-        for (uint32_t& idx : ctx->ipa_claim_public_input_indices) {
-            idx = pub_idx++;
-        }
-        ctx->contains_ipa_claim = true;
+        ctx->ipa_claim_public_input_key.start_idx = start_idx;
 
         return start_idx;
     }

barretenberg/cpp/src/barretenberg/dsl/acir_format/honk_recursion_constraint.cpp

@@ -70,14 +70,10 @@ void create_dummy_vkey_and_proof(typename Flavor::CircuitBuilder& builder,
     }
 
     if constexpr (HasIPAAccumulator<Flavor>) {
-        // Key field is the whether the proof contains an aggregation object.
-        builder.assert_equal(builder.add_variable(1), key_fields[offset++].witness_index);
         // We are making the assumption that the IPA claim is behind the inner public inputs and pairing point object
-        for (size_t i = 0; i < bb::IPA_CLAIM_SIZE; i++) {
-            builder.assert_equal(builder.add_variable(num_inner_public_inputs + PAIRING_POINT_ACCUMULATOR_SIZE + i),
-                                 key_fields[offset].witness_index);
-            offset++;
-        }
+        builder.assert_equal(builder.add_variable(num_inner_public_inputs + PAIRING_POINT_ACCUMULATOR_SIZE),
+                             key_fields[offset].witness_index);
+        offset++;
     }
 
     for (size_t i = 0; i < Flavor::NUM_PRECOMPUTED_ENTITIES; ++i) {

barretenberg/cpp/src/barretenberg/plonk_honk_shared/types/aggregation_object_type.hpp

@@ -14,7 +14,5 @@ using PairingPointAccumulatorIndices = std::array<uint32_t, PAIRING_POINT_ACCUMU
 // of the nested aggregation object.
 using PairingPointAccumulatorPubInputIndices = std::array<uint32_t, PAIRING_POINT_ACCUMULATOR_SIZE>;
 
-static constexpr uint32_t IPA_CLAIM_SIZE = 10;
-using IPAClaimIndices = std::array<uint32_t, IPA_CLAIM_SIZE>;
-using IPAClaimPubInputIndices = std::array<uint32_t, IPA_CLAIM_SIZE>;
-} // namespace bb
+static constexpr uint32_t IPA_CLAIM_SIZE = 10; // Size public inputs representaiton of a Grumpkin opening claim
+} // namespace bb

barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.cpp

@@ -80,8 +80,7 @@ UltraRecursiveVerifier_<Flavor>::Output UltraRecursiveVerifier_<Flavor>::verify_
 
     // Parse out the aggregation object using the key->pairing_point_accumulator_public_input_indices
     // TODO(https://github.com/AztecProtocol/barretenberg/issues/1325): Eventually vk stores public input key directly.
-    const PublicComponentKey pairing_point_public_input_key{ key->pairing_point_accumulator_public_input_indices[0],
-                                                             true };
+    const PublicComponentKey pairing_point_public_input_key{ key->pairing_point_accumulator_public_input_indices[0] };
     AggregationObject nested_agg_obj =
         PublicAggState::reconstruct(verification_key->public_inputs, pairing_point_public_input_key);
     // TODO(https://github.com/AztecProtocol/barretenberg/issues/995): generate this challenge properly.
@@ -136,15 +135,10 @@ UltraRecursiveVerifier_<Flavor>::Output UltraRecursiveVerifier_<Flavor>::verify_
     output.agg_obj = std::move(agg_obj);
 
     // Extract the IPA claim from the public inputs
-    // Parse out the nested IPA claim using key->ipa_claim_public_input_indices and run the native IPA verifier.
     if constexpr (HasIPAAccumulator<Flavor>) {
         using PublicIpaClaim = PublicInputComponent<OpeningClaim<grumpkin<Builder>>>;
-
-        if (verification_key->verification_key->contains_ipa_claim) {
-            PublicComponentKey ipa_claim_key{ verification_key->verification_key->ipa_claim_public_input_indices[0],
-                                              true };
-            output.ipa_claim = PublicIpaClaim::reconstruct(verification_key->public_inputs, ipa_claim_key);
-        }
+        output.ipa_claim = PublicIpaClaim::reconstruct(verification_key->public_inputs,
+                                                       verification_key->verification_key->ipa_claim_public_input_key);
     }
 
     return output;

barretenberg/cpp/src/barretenberg/stdlib/primitives/public_input_component/public_input_component.hpp

@@ -46,15 +46,14 @@ class PublicInputComponent {
     {
         Key key;
         key.start_idx = component.set_public();
-        key.exists_flag = true;
         return key;
     }
 
     // Reconstruct the component from the public inputs and the key indicating its location
     static ComponentType reconstruct(const std::vector<Fr>& public_inputs, const Key& key)
     {
         // Ensure that the key has been set
-        if (!key.exists_flag) {
+        if (!key.is_set()) {
             // TODO(https://github.com/AztecProtocol/barretenberg/issues/1284): determine when/whether a check of this
             // form is needed: info("WARNING: Trying to construct a PublicInputComponent from an invalid key!");
             // ASSERT(false);

barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/circuit_builder_base.hpp

@@ -43,9 +43,8 @@ template <typename FF_> class CircuitBuilderBase {
     PairingPointAccumulatorPubInputIndices pairing_point_accumulator_public_input_indices;
     bool contains_pairing_point_accumulator = false;
 
-    // Public input indices which contain the output IPA opening claim
-    IPAClaimPubInputIndices ipa_claim_public_input_indices;
-    bool contains_ipa_claim = false;
+    // Index of the IPA opening claim in the public inputs
+    PublicComponentKey ipa_claim_public_input_key;
 
     // We know from the CLI arguments during proving whether a circuit should use a prover which produces
     // proofs that are friendly to verify in a circuit themselves. A verifier does not need a full circuit

barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/public_component_key.hpp

@@ -6,11 +6,13 @@ namespace bb {
 
 // The data needed to reconstruct a public input component from its limbs stored in the public inputs
 struct PublicComponentKey {
-    uint32_t start_idx = 0;   // start index within public inputs array
-    bool exists_flag = false; // flag indicating exitence of component in the PI
+    constexpr static uint32_t DEFAULT_IDX = std::numeric_limits<uint32_t>::max();
+    uint32_t start_idx = DEFAULT_IDX; // start index within public inputs array
 
     bool operator==(const PublicComponentKey&) const = default;
 
-    MSGPACK_FIELDS(start_idx, exists_flag);
+    bool is_set() const { return start_idx != DEFAULT_IDX; }
+
+    MSGPACK_FIELDS(start_idx);
 };
 } // namespace bb