chore!: Remove circuit_size from all VKs

barretenberg/cpp/scripts/test_civc_standalone_vks_havent_changed.sh

@@ -11,7 +11,7 @@ cd ..
 # - Generate a hash for versioning: sha256sum bb-civc-inputs.tar.gz
 # - Upload the compressed results: aws s3 cp bb-civc-inputs.tar.gz s3://aztec-ci-artifacts/protocol/bb-civc-inputs-[hash(0:8)].tar.gz
 # Note: In case of the "Test suite failed to run ... Unexpected token 'with' " error, need to run: docker pull aztecprotocol/build:3.0
-pinned_civc_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-79e2c5e0.tar.gz"
+pinned_civc_inputs_url="https://aztec-ci-artifacts.s3.us-east-2.amazonaws.com/protocol/bb-civc-inputs-ff124547.tar.gz"
 
 # For easily rerunning the inputs generation
 if [[ "${1:-}" == "--update_inputs" ]]; then

barretenberg/cpp/src/barretenberg/dsl/acir_format/avm2_recursion_constraint.cpp

@@ -65,8 +65,8 @@ void create_dummy_vkey_and_proof(Builder& builder,
     //     (Flavor::NUM_FRS_COM + Flavor::NUM_FRS_FR * (Flavor::BATCHED_RELATION_PARTIAL_LENGTH + 1));
     const auto log_circuit_size = CONST_PROOF_SIZE_LOG_N;
 
-    // First key field is circuit size
-    builder.set_variable(key_fields[0].witness_index, 1 << log_circuit_size);
+    // First key field is log circuit size
+    builder.set_variable(key_fields[0].witness_index, log_circuit_size);
     // Second key field is number of public inputs
     builder.set_variable(key_fields[1].witness_index, public_inputs_size);
 

barretenberg/cpp/src/barretenberg/dsl/acir_format/mock_verifier_inputs.cpp

@@ -219,7 +219,7 @@ std::shared_ptr<typename Flavor::VerificationKey> create_mock_honk_vk(const size
 {
     // Set relevant VK metadata and commitments
     auto honk_verification_key = std::make_shared<typename Flavor::VerificationKey>();
-    honk_verification_key->circuit_size = dyadic_size;
+    honk_verification_key->log_circuit_size = bb::numeric::get_msb(dyadic_size);
     honk_verification_key->num_public_inputs = num_public_inputs;
     honk_verification_key->pub_inputs_offset = pub_inputs_offset; // must be set correctly
 

barretenberg/cpp/src/barretenberg/eccvm/eccvm_flavor.hpp

@@ -824,7 +824,6 @@ class ECCVMFlavor {
 
         VerificationKey(const std::shared_ptr<ProvingKey>& proving_key)
         {
-            this->circuit_size = 1UL << CONST_ECCVM_LOG_N;
             this->log_circuit_size = CONST_ECCVM_LOG_N;
             this->num_public_inputs = 0;
             this->pub_inputs_offset = 0;
@@ -877,13 +876,8 @@ class ECCVMFlavor {
         // from MSGPACK and the verification key.
         // Don't statically check for object completeness.
         using MSGPACK_NO_STATIC_CHECK = std::true_type;
-        MSGPACK_FIELDS(circuit_size,
-                       log_circuit_size,
-                       num_public_inputs,
-                       pub_inputs_offset,
-                       lagrange_first,
-                       lagrange_second,
-                       lagrange_last);
+        MSGPACK_FIELDS(
+            log_circuit_size, num_public_inputs, pub_inputs_offset, lagrange_first, lagrange_second, lagrange_last);
     };
 
     /**

barretenberg/cpp/src/barretenberg/flavor/flavor.hpp

@@ -151,7 +151,6 @@ template <typename PrecomputedCommitments, typename Transcript>
 class NativeVerificationKey_ : public PrecomputedCommitments {
   public:
     using Commitment = typename PrecomputedCommitments::DataType;
-    uint64_t circuit_size = 0;
     uint64_t log_circuit_size = 0;
     uint64_t num_public_inputs = 0;
     uint64_t pub_inputs_offset = 0;
@@ -161,7 +160,6 @@ class NativeVerificationKey_ : public PrecomputedCommitments {
     NativeVerificationKey_() = default;
     NativeVerificationKey_(const size_t circuit_size, const size_t num_public_inputs)
     {
-        this->circuit_size = circuit_size;
         this->log_circuit_size = numeric::get_msb(circuit_size);
         this->num_public_inputs = num_public_inputs;
     };
@@ -182,7 +180,7 @@ class NativeVerificationKey_ : public PrecomputedCommitments {
 
         std::vector<fr> elements;
 
-        serialize_to_field_buffer(this->circuit_size, elements);
+        serialize_to_field_buffer(this->log_circuit_size, elements);
         serialize_to_field_buffer(this->num_public_inputs, elements);
         serialize_to_field_buffer(this->pub_inputs_offset, elements);
 
@@ -218,7 +216,7 @@ class NativeVerificationKey_ : public PrecomputedCommitments {
      */
     virtual fr add_hash_to_transcript(const std::string& domain_separator, Transcript& transcript) const
     {
-        transcript.add_to_independent_hash_buffer(domain_separator + "vk_circuit_size", this->circuit_size);
+        transcript.add_to_independent_hash_buffer(domain_separator + "vk_log_circuit_size", this->log_circuit_size);
         transcript.add_to_independent_hash_buffer(domain_separator + "vk_num_public_inputs", this->num_public_inputs);
         transcript.add_to_independent_hash_buffer(domain_separator + "vk_pub_inputs_offset", this->pub_inputs_offset);
 
@@ -244,7 +242,6 @@ class StdlibVerificationKey_ : public PrecomputedCommitments {
     using FF = stdlib::field_t<Builder>;
     using Commitment = typename PrecomputedCommitments::DataType;
     using Transcript = BaseTranscript<stdlib::recursion::honk::StdlibTranscriptParams<Builder>>;
-    FF circuit_size;
     FF log_circuit_size;
     FF num_public_inputs;
     FF pub_inputs_offset = 0;
@@ -254,7 +251,6 @@ class StdlibVerificationKey_ : public PrecomputedCommitments {
     StdlibVerificationKey_() = default;
     StdlibVerificationKey_(const size_t circuit_size, const size_t num_public_inputs)
     {
-        this->circuit_size = circuit_size;
         this->log_circuit_size = numeric::get_msb(circuit_size);
         this->num_public_inputs = num_public_inputs;
     };
@@ -275,7 +271,7 @@ class StdlibVerificationKey_ : public PrecomputedCommitments {
 
         std::vector<FF> elements;
 
-        serialize_to_field_buffer(this->circuit_size, elements);
+        serialize_to_field_buffer(this->log_circuit_size, elements);
         serialize_to_field_buffer(this->num_public_inputs, elements);
         serialize_to_field_buffer(this->pub_inputs_offset, elements);
 
@@ -312,7 +308,7 @@ class StdlibVerificationKey_ : public PrecomputedCommitments {
      */
     virtual FF add_hash_to_transcript(const std::string& domain_separator, Transcript& transcript) const
     {
-        transcript.add_to_independent_hash_buffer(domain_separator + "vk_circuit_size", this->circuit_size);
+        transcript.add_to_independent_hash_buffer(domain_separator + "vk_log_circuit_size", this->log_circuit_size);
         transcript.add_to_independent_hash_buffer(domain_separator + "vk_num_public_inputs", this->num_public_inputs);
         transcript.add_to_independent_hash_buffer(domain_separator + "vk_pub_inputs_offset", this->pub_inputs_offset);
         for (const Commitment& commitment : this->get_all()) {

barretenberg/cpp/src/barretenberg/flavor/mega_flavor.hpp

@@ -431,7 +431,7 @@ class MegaFlavor {
       public:
         // Serialized Verification Key length in fields
         static constexpr size_t VERIFICATION_KEY_LENGTH =
-            /* 1. Metadata (circuit_size, num_public_inputs, pub_inputs_offset) */ (3 * num_frs_fr) +
+            /* 1. Metadata (log_circuit_size, num_public_inputs, pub_inputs_offset) */ (3 * num_frs_fr) +
             /* 2. NUM_PRECOMPUTED_ENTITIES commitments */ (NUM_PRECOMPUTED_ENTITIES * num_frs_comm);
 
         VerificationKey() = default;
@@ -443,8 +443,7 @@ class MegaFlavor {
 
         void set_metadata(const MetaData& metadata)
         {
-            this->circuit_size = metadata.dyadic_size;
-            this->log_circuit_size = numeric::get_msb(this->circuit_size);
+            this->log_circuit_size = numeric::get_msb(metadata.dyadic_size);
             this->num_public_inputs = metadata.num_public_inputs;
             this->pub_inputs_offset = metadata.pub_inputs_offset;
         }
@@ -461,8 +460,7 @@ class MegaFlavor {
 
         // Don't statically check for object completeness.
         using MSGPACK_NO_STATIC_CHECK = std::true_type;
-        MSGPACK_FIELDS(circuit_size,
-                       log_circuit_size,
+        MSGPACK_FIELDS(log_circuit_size,
                        num_public_inputs,
                        pub_inputs_offset,
                        q_m,

barretenberg/cpp/src/barretenberg/flavor/mega_recursive_flavor.hpp

@@ -126,9 +126,7 @@ template <typename BuilderType> class MegaRecursiveFlavor_ {
          */
         VerificationKey(CircuitBuilder* builder, const std::shared_ptr<NativeVerificationKey>& native_key)
         {
-            this->circuit_size = FF::from_witness(builder, native_key->circuit_size);
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/1283): Use stdlib get_msb.
-            this->log_circuit_size = FF::from_witness(builder, numeric::get_msb(native_key->circuit_size));
+            this->log_circuit_size = FF::from_witness(builder, native_key->log_circuit_size);
             this->num_public_inputs = FF::from_witness(builder, native_key->num_public_inputs);
             this->pub_inputs_offset = FF::from_witness(builder, native_key->pub_inputs_offset);
 
@@ -150,9 +148,7 @@ template <typename BuilderType> class MegaRecursiveFlavor_ {
 
             size_t num_frs_read = 0;
 
-            this->circuit_size = deserialize_from_frs<FF>(builder, elements, num_frs_read);
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/1283): Use stdlib get_msb.
-            this->log_circuit_size = numeric::get_msb(static_cast<uint32_t>(this->circuit_size.get_value()));
+            this->log_circuit_size = deserialize_from_frs<FF>(builder, elements, num_frs_read);
             this->num_public_inputs = deserialize_from_frs<FF>(builder, elements, num_frs_read);
             this->pub_inputs_offset = deserialize_from_frs<FF>(builder, elements, num_frs_read);
 

barretenberg/cpp/src/barretenberg/flavor/ultra_flavor.hpp

@@ -468,7 +468,7 @@ class UltraFlavor {
       public:
         // Serialized Verification Key length in fields
         static constexpr size_t VERIFICATION_KEY_LENGTH =
-            /* 1. Metadata (circuit_size, num_public_inputs, pub_inputs_offset) */ (3 * num_frs_fr) +
+            /* 1. Metadata (log_circuit_size, num_public_inputs, pub_inputs_offset) */ (3 * num_frs_fr) +
             /* 2. NUM_PRECOMPUTED_ENTITIES commitments */ (NUM_PRECOMPUTED_ENTITIES * num_frs_comm);
 
         bool operator==(const VerificationKey&) const = default;
@@ -479,8 +479,7 @@ class UltraFlavor {
 
         VerificationKey(const PrecomputedData& precomputed)
         {
-            this->circuit_size = precomputed.metadata.dyadic_size;
-            this->log_circuit_size = numeric::get_msb(this->circuit_size);
+            this->log_circuit_size = numeric::get_msb(precomputed.metadata.dyadic_size);
             this->num_public_inputs = precomputed.metadata.num_public_inputs;
             this->pub_inputs_offset = precomputed.metadata.pub_inputs_offset;
 
@@ -494,8 +493,7 @@ class UltraFlavor {
         using MSGPACK_NO_STATIC_CHECK = std::true_type;
 
         // For serialising and deserialising data
-        MSGPACK_FIELDS(circuit_size,
-                       log_circuit_size,
+        MSGPACK_FIELDS(log_circuit_size,
                        num_public_inputs,
                        pub_inputs_offset,
                        q_m,

barretenberg/cpp/src/barretenberg/flavor/ultra_keccak_flavor.hpp

@@ -55,8 +55,7 @@ class UltraKeccakFlavor : public bb::UltraFlavor {
 
         VerificationKey(const PrecomputedData& precomputed)
         {
-            this->circuit_size = precomputed.metadata.dyadic_size;
-            this->log_circuit_size = numeric::get_msb(this->circuit_size);
+            this->log_circuit_size = numeric::get_msb(precomputed.metadata.dyadic_size);
             this->num_public_inputs = precomputed.metadata.num_public_inputs;
             this->pub_inputs_offset = precomputed.metadata.pub_inputs_offset;
 
@@ -81,7 +80,8 @@ class UltraKeccakFlavor : public bb::UltraFlavor {
             // TODO(https://github.com/AztecProtocol/barretenberg/issues/1427): We need to update this function to look
             // like UltraFlavor's add_hash_to_transcript. Alternatively, the VerificationKey class will go away when we
             // add pairing point aggregation to the solidity verifier.
-            transcript.add_to_hash_buffer(domain_separator + "vk_circuit_size", this->circuit_size);
+            uint64_t circuit_size = 1 << this->log_circuit_size;
+            transcript.add_to_hash_buffer(domain_separator + "vk_log_circuit_size", circuit_size);
             transcript.add_to_hash_buffer(domain_separator + "vk_num_public_inputs", this->num_public_inputs);
             transcript.add_to_hash_buffer(domain_separator + "vk_pub_inputs_offset", this->pub_inputs_offset);
             return 0;
@@ -91,8 +91,7 @@ class UltraKeccakFlavor : public bb::UltraFlavor {
         using MSGPACK_NO_STATIC_CHECK = std::true_type;
 
         // For serialising and deserialising data
-        MSGPACK_FIELDS(circuit_size,
-                       log_circuit_size,
+        MSGPACK_FIELDS(log_circuit_size,
                        num_public_inputs,
                        pub_inputs_offset,
                        q_m,

barretenberg/cpp/src/barretenberg/flavor/ultra_recursive_flavor.hpp

@@ -127,9 +127,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
          */
         VerificationKey(CircuitBuilder* builder, const std::shared_ptr<NativeVerificationKey>& native_key)
         {
-            this->circuit_size = FF::from_witness(builder, native_key->circuit_size);
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/1283): Use stdlib get_msb.
-            this->log_circuit_size = FF::from_witness(builder, numeric::get_msb(native_key->circuit_size));
+            this->log_circuit_size = FF::from_witness(builder, native_key->log_circuit_size);
             this->num_public_inputs = FF::from_witness(builder, native_key->num_public_inputs);
             this->pub_inputs_offset = FF::from_witness(builder, native_key->pub_inputs_offset);
 
@@ -151,12 +149,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
 
             size_t num_frs_read = 0;
 
-            this->circuit_size = deserialize_from_frs<FF>(builder, elements, num_frs_read);
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/1364): Improve VKs. log_circuit_size must be a
-            // witness to make the Recursive Verifier circuit constant. Seems that other members also need to be turned
-            // into witnesses.
-            this->log_circuit_size =
-                FF::from_witness(&builder, numeric::get_msb(static_cast<uint32_t>(this->circuit_size.get_value())));
+            this->log_circuit_size = deserialize_from_frs<FF>(builder, elements, num_frs_read);
             this->num_public_inputs = deserialize_from_frs<FF>(builder, elements, num_frs_read);
             this->pub_inputs_offset = deserialize_from_frs<FF>(builder, elements, num_frs_read);
 

barretenberg/cpp/src/barretenberg/flavor/ultra_rollup_flavor.hpp

@@ -42,8 +42,7 @@ class UltraRollupFlavor : public bb::UltraFlavor {
 
         VerificationKey(const PrecomputedData& precomputed)
         {
-            this->circuit_size = precomputed.metadata.dyadic_size;
-            this->log_circuit_size = numeric::get_msb(this->circuit_size);
+            this->log_circuit_size = numeric::get_msb(precomputed.metadata.dyadic_size);
             this->num_public_inputs = precomputed.metadata.num_public_inputs;
             this->pub_inputs_offset = precomputed.metadata.pub_inputs_offset;
 
@@ -57,8 +56,7 @@ class UltraRollupFlavor : public bb::UltraFlavor {
         using MSGPACK_NO_STATIC_CHECK = std::true_type;
 
         // For serialising and deserialising data
-        MSGPACK_FIELDS(circuit_size,
-                       log_circuit_size,
+        MSGPACK_FIELDS(log_circuit_size,
                        num_public_inputs,
                        pub_inputs_offset,
                        q_m,

barretenberg/cpp/src/barretenberg/flavor/ultra_rollup_recursive_flavor.hpp

@@ -70,9 +70,7 @@ template <typename BuilderType> class UltraRollupRecursiveFlavor_ : public Ultra
          */
         VerificationKey(CircuitBuilder* builder, const std::shared_ptr<NativeVerificationKey>& native_key)
         {
-            this->circuit_size = FF::from_witness(builder, native_key->circuit_size);
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/1283): Use stdlib get_msb.
-            this->log_circuit_size = FF::from_witness(builder, numeric::get_msb(native_key->circuit_size));
+            this->log_circuit_size = FF::from_witness(builder, native_key->log_circuit_size);
             this->num_public_inputs = FF::from_witness(builder, native_key->num_public_inputs);
             this->pub_inputs_offset = FF::from_witness(builder, native_key->pub_inputs_offset);
 
@@ -94,12 +92,7 @@ template <typename BuilderType> class UltraRollupRecursiveFlavor_ : public Ultra
 
             size_t num_frs_read = 0;
 
-            this->circuit_size = deserialize_from_frs<FF>(builder, elements, num_frs_read);
-            // TODO(https://github.com/AztecProtocol/barretenberg/issues/1364): Improve VKs. log_circuit_size must be a
-            // witness to make the Recursive Verifier circuit constant. Seems that other members also need to be turned
-            // into witnesses.
-            this->log_circuit_size =
-                FF::from_witness(&builder, numeric::get_msb(static_cast<uint32_t>(this->circuit_size.get_value())));
+            this->log_circuit_size = deserialize_from_frs<FF>(builder, elements, num_frs_read);
             this->num_public_inputs = deserialize_from_frs<FF>(builder, elements, num_frs_read);
             this->pub_inputs_offset = deserialize_from_frs<FF>(builder, elements, num_frs_read);
 

barretenberg/cpp/src/barretenberg/honk/library/grand_product_delta.hpp

@@ -25,8 +25,8 @@ template <typename Flavor>
 typename Flavor::FF compute_public_input_delta(std::span<const typename Flavor::FF> public_inputs,
                                                const typename Flavor::FF& beta,
                                                const typename Flavor::FF& gamma,
-                                               const auto domain_size,
-                                               size_t offset = 0)
+                                               const typename Flavor::FF& log_domain_size,
+                                               const typename Flavor::FF& offset = 0)
 {
     using Field = typename Flavor::FF;
     Field numerator = Field(1);
@@ -57,15 +57,16 @@ typename Flavor::FF compute_public_input_delta(std::span<const typename Flavor::
 
     // TODO(https://github.com/AztecProtocol/barretenberg/issues/1158): Ensure correct construction of public input
     // delta in the face of increases to virtual size caused by execution trace overflow
-    Field numerator_acc = gamma + (beta * Field(domain_size + offset));
-    Field denominator_acc = gamma - beta * Field(1 + offset);
+    Field domain_size = Field(2).pow(log_domain_size);
+    Field numerator_acc = gamma + (beta * (domain_size + offset));
+    Field denominator_acc = gamma - beta * (offset + 1);
 
     for (size_t i = 0; i < public_inputs.size(); i++) {
         numerator *= (numerator_acc + public_inputs[i]);     // γ + xᵢ + β(n+i)
         denominator *= (denominator_acc + public_inputs[i]); // γ + xᵢ - β(1+i)
 
-        // To avoid introducing extra variables in the circuit, we skip numeratoc_acc
-        // and denominator_acc in the final loop iteration, since their values won't be used
+        // To avoid introducing extra variables in the circuit, we skip numerator_acc and denominator_acc in the final
+        // loop iteration, since their values won't be used
         if (i < public_inputs.size() - 1) {
             numerator_acc += beta;
             denominator_acc -= beta;
@@ -74,4 +75,4 @@ typename Flavor::FF compute_public_input_delta(std::span<const typename Flavor::
     return numerator / denominator;
 }
 
-} // namespace bb
+} // namespace bb

barretenberg/cpp/src/barretenberg/honk/utils/honk_key_gen.hpp

@@ -64,14 +64,14 @@ inline void output_vk_sol_ultra_honk(std::ostream& os,
       "\n"
     "";
     print_types_import();
-    print_u256_const(key->circuit_size, "N");
+    print_u256_const(1 << key->log_circuit_size, "N");
     print_u256_const(key->log_circuit_size, "LOG_N");
     print_u256_const(key->num_public_inputs, "NUMBER_OF_PUBLIC_INPUTS");
     os << ""
     "library " << class_name << " {\n"
       "    function loadVerificationKey() internal pure returns (Honk.VerificationKey memory) {\n"
       "        Honk.VerificationKey memory vk = Honk.VerificationKey({\n";
-    print_u256(key->circuit_size, "circuitSize");
+    print_u256(1 << key->log_circuit_size, "circuitSize");
     print_u256(key->log_circuit_size, "logCircuitSize");
     print_u256(key->num_public_inputs, "publicInputsSize");
     print_g1(key->q_l, "ql");