Define constants for sizes of special public inputs

Author: federicobarbacovi

barretenberg/cpp/src/barretenberg/honk/types/public_inputs_type.hpp

@@ -38,4 +38,29 @@ static constexpr std::size_t GRUMPKIN_OPENING_CLAIM_SIZE = 2 * FR_PUBLIC_INPUTS_
 // Invalid public input size, used in OpeningClaim<Curve> when Curve is not Grumpkin
 static constexpr std::size_t INVALID_PUBLIC_INPUTS_SIZE = 0;
 
+// Number of wires in the Mega execution trace, they must be re-defined to avoid circular dependencies
+static constexpr std::size_t MEGA_EXECUTION_TRACE_NUM_WIRES = 4;
+
+// Number of bb::fr elements used to represent the public inputs of an INIT/INNER/RESET/TAIL kernel
+static constexpr std::size_t KERNEL_PUBLIC_INPUTS_SIZE =
+    /*pairing_inputs*/ PAIRING_POINTS_SIZE +
+    /*kernel_return_data*/ GOBLIN_GROUP_PUBLIC_INPUTS_SIZE +
+    /*app_return_data*/ GOBLIN_GROUP_PUBLIC_INPUTS_SIZE +
+    /*table_commitments*/ MEGA_EXECUTION_TRACE_NUM_WIRES * GOBLIN_GROUP_PUBLIC_INPUTS_SIZE;
+
+// Number of bb::fr elements used to represent the default public inputs, i.e., the pairing points
+static constexpr std::size_t DEFAULT_PUBLIC_INPUTS_SIZE = PAIRING_POINTS_SIZE;
+
+// Number of bb::fr elements used to represent the public inputs of an App circuit
+static constexpr std::size_t APP_PUBLIC_INPUTS_SIZE = PAIRING_POINTS_SIZE;
+
+// Number of bb::fr elements used to represent the public inputs of the HIDING kernel
+static constexpr std::size_t HIDING_KERNEL_PUBLIC_INPUTS_SIZE =
+    /*pairing_inputs*/ PAIRING_POINTS_SIZE +
+    /*table_commitments*/ MEGA_EXECUTION_TRACE_NUM_WIRES * GOBLIN_GROUP_PUBLIC_INPUTS_SIZE;
+
+// Number of bb::fr elements used to represent the public inputs of a ROLLUP circuit
+static constexpr std::size_t ROLLUP_PUBLIC_INPUTS_SIZE =
+    /*pairing_inputs*/ PAIRING_POINTS_SIZE + /*ipa_claim*/ GRUMPKIN_OPENING_CLAIM_SIZE;
+
 } // namespace bb

barretenberg/cpp/src/barretenberg/special_public_inputs/special_public_inputs.hpp

@@ -21,7 +21,7 @@ class DefaultIO {
     using FF = curve::BN254::ScalarField;
     using PublicPairingPoints = PublicInputComponent<PairingPoints>;
 
-    static constexpr size_t PUBLIC_INPUTS_SIZE = PairingPoints::PUBLIC_INPUTS_SIZE;
+    static constexpr size_t PUBLIC_INPUTS_SIZE = DEFAULT_PUBLIC_INPUTS_SIZE;
 
     PairingPoints pairing_inputs;
 
@@ -44,18 +44,14 @@ class DefaultIO {
  */
 class HidingKernelIO {
   public:
-    // Number of columns that jointly constitute the op_queue, should be the same as the number of wires in the
-    // MegaCircuitBuilder
-    static constexpr size_t NUM_WIRES = 4;
-
     using FF = curve::BN254::ScalarField;
     using G1 = curve::BN254::AffineElement;
-    using TableCommitments = std::array<G1, NUM_WIRES>;
+    using TableCommitments = std::array<G1, MegaCircuitBuilder::NUM_WIRES>;
 
     using PublicPairingPoints = PublicInputComponent<PairingPoints>;
     using PublicPoint = PublicInputComponent<G1>;
 
-    static constexpr size_t PUBLIC_INPUTS_SIZE = PairingPoints::PUBLIC_INPUTS_SIZE + NUM_WIRES * G1::PUBLIC_INPUTS_SIZE;
+    static constexpr size_t PUBLIC_INPUTS_SIZE = HIDING_KERNEL_PUBLIC_INPUTS_SIZE;
 
     PairingPoints pairing_inputs;
     TableCommitments ecc_op_tables;
@@ -90,7 +86,7 @@ class RollupIO {
     using PublicPairingPoints = PublicInputComponent<PairingPoints>;
     using PublicIpaClaim = PublicInputComponent<IpaClaim>;
 
-    static constexpr size_t PUBLIC_INPUTS_SIZE = PairingPoints::PUBLIC_INPUTS_SIZE + IpaClaim::PUBLIC_INPUTS_SIZE;
+    static constexpr size_t PUBLIC_INPUTS_SIZE = ROLLUP_PUBLIC_INPUTS_SIZE;
 
     PairingPoints pairing_inputs;
     IpaClaim ipa_claim;

barretenberg/cpp/src/barretenberg/stdlib/special_public_inputs/special_public_inputs.hpp

@@ -46,8 +46,7 @@ class KernelIO {
     // FF pg_acc_hash;
 
     // Total size of the kernel IO public inputs
-    static constexpr size_t PUBLIC_INPUTS_SIZE = PairingInputs::PUBLIC_INPUTS_SIZE + G1::PUBLIC_INPUTS_SIZE +
-                                                 G1::PUBLIC_INPUTS_SIZE + Builder::NUM_WIRES * G1::PUBLIC_INPUTS_SIZE;
+    static constexpr size_t PUBLIC_INPUTS_SIZE = KERNEL_PUBLIC_INPUTS_SIZE;
 
     /**
      * @brief Reconstructs the IO components from a public inputs array.
@@ -126,7 +125,7 @@ template <typename Builder> class DefaultIO {
     PairingInputs pairing_inputs;
 
     // Total size of the IO public inputs
-    static constexpr size_t PUBLIC_INPUTS_SIZE = PairingInputs::PUBLIC_INPUTS_SIZE;
+    static constexpr size_t PUBLIC_INPUTS_SIZE = DEFAULT_PUBLIC_INPUTS_SIZE;
 
     /**
      * @brief Reconstructs the IO components from a public inputs array.
@@ -184,8 +183,7 @@ template <class Builder_> class HidingKernelIO {
     TableCommitments ecc_op_tables; // commitments to merged tables obtained from final Merge verification
 
     // Total size of the IO public inputs
-    static constexpr size_t PUBLIC_INPUTS_SIZE =
-        PairingInputs::PUBLIC_INPUTS_SIZE + Builder::NUM_WIRES * G1::PUBLIC_INPUTS_SIZE;
+    static constexpr size_t PUBLIC_INPUTS_SIZE = HIDING_KERNEL_PUBLIC_INPUTS_SIZE;
 
     /**
      * @brief Reconstructs the IO components from a public inputs array.
@@ -282,7 +280,7 @@ class RollupIO {
     IpaClaim ipa_claim;
 
     // Total size of the IO public inputs
-    static constexpr size_t PUBLIC_INPUTS_SIZE = PairingInputs::PUBLIC_INPUTS_SIZE + IpaClaim::PUBLIC_INPUTS_SIZE;
+    static constexpr size_t PUBLIC_INPUTS_SIZE = ROLLUP_PUBLIC_INPUTS_SIZE;
 
     /**
      * @brief Reconstructs the IO components from a public inputs array.