fix(avm): avm vk after serialization unification (#16721)

Author: ludamad

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

@@ -102,10 +102,9 @@ namespace bb {
 /**
  * @brief Enum to control verification key metadata serialization
  */
-enum class VKSerializationMode {
-    FULL,         // Serialize all metadata (log_circuit_size, num_public_inputs, pub_inputs_offset)
-    NO_METADATA,  // Serialize only commitments, no metadata
-    NO_PUB_OFFSET // Serialize log_circuit_size and num_public_inputs, but not pub_inputs_offset
+enum class VKSerializationMode : std::uint8_t {
+    FULL,       // Serialize all metadata (log_circuit_size, num_public_inputs, pub_inputs_offset)
+    NO_METADATA // Serialize only commitments, no metadata
 };
 
 // Specifies the regions of the execution trace containing non-trivial wire values
@@ -190,9 +189,6 @@ class NativeVerificationKey_ : public PrecomputedCommitments {
         if constexpr (SerializeMetadata == VKSerializationMode::FULL) {
             // 3 metadata fields + commitments
             metadata_size = 3 * Transcript::template calc_num_data_types<uint64_t>();
-        } else if constexpr (SerializeMetadata == VKSerializationMode::NO_PUB_OFFSET) {
-            // 2 metadata fields + commitments
-            metadata_size = 2 * Transcript::template calc_num_data_types<uint64_t>();
         }
         // else NO_METADATA: metadata_size remains 0
         return metadata_size + commitments_size;
@@ -218,9 +214,6 @@ class NativeVerificationKey_ : public PrecomputedCommitments {
             serialize(this->log_circuit_size, elements);
             serialize(this->num_public_inputs, elements);
             serialize(this->pub_inputs_offset, elements);
-        } else if constexpr (SerializeMetadata == VKSerializationMode::NO_PUB_OFFSET) {
-            serialize(this->log_circuit_size, elements);
-            serialize(this->num_public_inputs, elements);
         }
         // else NO_METADATA: skip metadata serialization
 
@@ -252,9 +245,6 @@ class NativeVerificationKey_ : public PrecomputedCommitments {
             deserialize(this->log_circuit_size);
             deserialize(this->num_public_inputs);
             deserialize(this->pub_inputs_offset);
-        } else if constexpr (SerializeMetadata == VKSerializationMode::NO_PUB_OFFSET) {
-            deserialize(this->log_circuit_size);
-            deserialize(this->num_public_inputs);
         }
         // else NO_METADATA: skip metadata deserialization
 
@@ -309,7 +299,7 @@ class NativeVerificationKey_ : public PrecomputedCommitments {
  * @tparam Builder
  * @tparam FF
  * @tparam PrecomputedCommitments
- * @tparam SerializeMetadata Controls how metadata is serialized (FULL, NO_METADATA, NO_PUB_OFFSET)
+ * @tparam SerializeMetadata Controls how metadata is serialized (FULL, NO_METADATA)
  */
 template <typename Builder_,
           typename PrecomputedCommitments,

barretenberg/cpp/src/barretenberg/vm2/constraining/flavor.hpp

@@ -237,9 +237,8 @@ class AvmFlavor {
         auto get_to_be_shifted() { return AvmFlavor::get_to_be_shifted<Polynomial>(*this); }
     };
 
-    class VerificationKey : public NativeVerificationKey_<PrecomputedEntities<Commitment>,
-                                                          Transcript,
-                                                          VKSerializationMode::NO_PUB_OFFSET> {
+    class VerificationKey
+        : public NativeVerificationKey_<PrecomputedEntities<Commitment>, Transcript, VKSerializationMode::NO_METADATA> {
       public:
         static constexpr size_t NUM_PRECOMPUTED_COMMITMENTS = NUM_PRECOMPUTED_ENTITIES;