Cleaning up some obsolete AVM related constants

Author: jeanmon

barretenberg/cpp/src/barretenberg/vm2/common/aztec_constants.hpp

@@ -165,9 +165,6 @@
 #define AVM_PUBLIC_INPUTS_COLUMNS_MAX_LENGTH 681
 #define AVM_NUM_PUBLIC_INPUT_COLUMNS 4
 #define AVM_PUBLIC_INPUTS_COLUMNS_COMBINED_LENGTH 2724
-#define AVM_PROOF_LENGTH_IN_FIELDS 4154
-#define AVM_PUBLIC_COLUMN_MAX_SIZE 1024
-#define AVM_V2_PUBLIC_INPUTS_FLATTENED_SIZE 1
 #define AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED 20000
 #define AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED 1000
 #define AVM_MAX_PROCESSABLE_L2_GAS 6000000

noir-projects/noir-protocol-circuits/crates/types/src/constants.nr

@@ -879,15 +879,14 @@ pub global AVM_NUM_PUBLIC_INPUT_COLUMNS: u32 = 4;
 pub global AVM_PUBLIC_INPUTS_COLUMNS_COMBINED_LENGTH: u32 =
     AVM_NUM_PUBLIC_INPUT_COLUMNS * AVM_PUBLIC_INPUTS_COLUMNS_MAX_LENGTH;
 
-// `AVM_PROOF_LENGTH_IN_FIELDS` must be updated when AVM circuit changes.
+// REMARK: This comment will be relevant when we decommission the "padded" constants below and revive the
+// non-padded constants: `AVM_V2_PROOF_LENGTH_IN_FIELDS` and `AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS`.
+// `AVM_V2_PROOF_LENGTH_IN_FIELDS` must be updated when AVM circuit changes.
 // To determine latest value, hover `COMPUTED_AVM_PROOF_LENGTH_IN_FIELDS`
-// in barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp
+// in barretenberg/cpp/src/barretenberg/vm2/constraining/flavor.hpp
 // This also changes the length of inputs for the public base rollup circuit, so its Prover.toml must be updated.
 // To do so: run: 'AZTEC_GENERATE_TEST_DATA=1 yarn workspace @aztec/prover-client test orchestrator_public_functions' from yarn-project.
-pub global AVM_PROOF_LENGTH_IN_FIELDS: u32 = 4154;
-pub global AVM_PUBLIC_COLUMN_MAX_SIZE: u32 = 1024;
 
-pub global AVM_V2_PUBLIC_INPUTS_FLATTENED_SIZE: u32 = 1;
 // pub global AVM_V2_PROOF_LENGTH_IN_FIELDS: u32 = 5452;
 // VK is composed of
 // - circuit size encoded as a fr field element (32 bytes)

yarn-project/constants/src/constants.gen.ts

@@ -378,9 +378,6 @@ export const AVM_PUBLIC_INPUTS_REVERTED_ROW_IDX = 680;
 export const AVM_PUBLIC_INPUTS_COLUMNS_MAX_LENGTH = 681;
 export const AVM_NUM_PUBLIC_INPUT_COLUMNS = 4;
 export const AVM_PUBLIC_INPUTS_COLUMNS_COMBINED_LENGTH = 2724;
-export const AVM_PROOF_LENGTH_IN_FIELDS = 4154;
-export const AVM_PUBLIC_COLUMN_MAX_SIZE = 1024;
-export const AVM_V2_PUBLIC_INPUTS_FLATTENED_SIZE = 1;
 export const AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED = 20000;
 export const AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED = 1000;
 export const AVM_MAX_PROCESSABLE_L2_GAS = 6000000;
@@ -504,6 +501,7 @@ export const PROOF_TYPE_ROLLUP_HONK = 5;
 export const PROOF_TYPE_ROOT_ROLLUP_HONK = 6;
 export const PROOF_TYPE_PG_FINAL = 8;
 export const PROOF_TYPE_PG_TAIL = 9;
+export const PROOF_TYPE_CIVC = 10;
 export const TWO_POW_64 = 18446744073709551616n;
 export const AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_HEIGHT = 6;
 export const AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_INITIAL_ROOT =