@aztec/constants 0.0.1-commit.b655e406 → 0.0.1-commit.c7c42ec

package/src/constants.gen.ts

@@ -51,35 +51,47 @@ export const MAX_KEY_VALIDATION_REQUESTS_PER_CALL = 16;
 export const MAX_PRIVATE_LOGS_PER_CALL = 16;
 export const MAX_CONTRACT_CLASS_LOGS_PER_CALL = 1;
 export const NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP = 1024;
-export const PRIVATE_KERNEL_INIT_INDEX = 0;
-export const PRIVATE_KERNEL_INNER_INDEX = 1;
-export const PRIVATE_KERNEL_TAIL_INDEX = 2;
-export const PRIVATE_KERNEL_TAIL_TO_PUBLIC_INDEX = 3;
+export const PRIVATE_KERNEL_INIT_VK_INDEX = 0;
+export const PRIVATE_KERNEL_INNER_VK_INDEX = 1;
+export const PRIVATE_KERNEL_TAIL_VK_INDEX = 2;
+export const PRIVATE_KERNEL_TAIL_TO_PUBLIC_VK_INDEX = 3;
 export const HIDING_KERNEL_TO_ROLLUP_VK_INDEX = 4;
 export const HIDING_KERNEL_TO_PUBLIC_VK_INDEX = 5;
 export const PUBLIC_CHONK_VERIFIER_VK_INDEX = 6;
-export const AVM_VK_INDEX = 7;
-export const PRIVATE_TX_BASE_ROLLUP_VK_INDEX = 8;
-export const PUBLIC_TX_BASE_ROLLUP_VK_INDEX = 9;
-export const TX_MERGE_ROLLUP_VK_INDEX = 10;
-export const BLOCK_ROOT_FIRST_ROLLUP_VK_INDEX = 11;
-export const BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP_VK_INDEX = 12;
-export const BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP_VK_INDEX = 13;
-export const BLOCK_ROOT_ROLLUP_VK_INDEX = 14;
-export const BLOCK_ROOT_SINGLE_TX_ROLLUP_VK_INDEX = 15;
-export const BLOCK_MERGE_ROLLUP_VK_INDEX = 16;
-export const CHECKPOINT_ROOT_ROLLUP_VK_INDEX = 17;
-export const CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP_VK_INDEX = 18;
-export const CHECKPOINT_PADDING_ROLLUP_VK_INDEX = 19;
-export const CHECKPOINT_MERGE_ROLLUP_VK_INDEX = 20;
-export const ROOT_ROLLUP_VK_INDEX = 21;
-export const PARITY_BASE_VK_INDEX = 22;
-export const PARITY_ROOT_VK_INDEX = 23;
-export const PRIVATE_KERNEL_RESET_INDEX = 24;
+export const PRIVATE_TX_BASE_ROLLUP_VK_INDEX = 7;
+export const PUBLIC_TX_BASE_ROLLUP_VK_INDEX = 8;
+export const TX_MERGE_ROLLUP_VK_INDEX = 9;
+export const BLOCK_ROOT_FIRST_ROLLUP_VK_INDEX = 10;
+export const BLOCK_ROOT_SINGLE_TX_FIRST_ROLLUP_VK_INDEX = 11;
+export const BLOCK_ROOT_EMPTY_TX_FIRST_ROLLUP_VK_INDEX = 12;
+export const BLOCK_ROOT_ROLLUP_VK_INDEX = 13;
+export const BLOCK_ROOT_SINGLE_TX_ROLLUP_VK_INDEX = 14;
+export const BLOCK_MERGE_ROLLUP_VK_INDEX = 15;
+export const CHECKPOINT_ROOT_ROLLUP_VK_INDEX = 16;
+export const CHECKPOINT_ROOT_SINGLE_BLOCK_ROLLUP_VK_INDEX = 17;
+export const CHECKPOINT_PADDING_ROLLUP_VK_INDEX = 18;
+export const CHECKPOINT_MERGE_ROLLUP_VK_INDEX = 19;
+export const ROOT_ROLLUP_VK_INDEX = 20;
+export const PARITY_BASE_VK_INDEX = 21;
+export const PARITY_ROOT_VK_INDEX = 22;
+export const PRIVATE_KERNEL_RESET_VK_INDEX = 23;
+export const GLOBAL_INDEX_NOTE_HASH_READ_REQUEST_OFFSET = 0;
+export const GLOBAL_INDEX_NULLIFIER_READ_REQUEST_OFFSET = 16;
+export const GLOBAL_INDEX_NOTE_HASH_OFFSET = 32;
+export const GLOBAL_INDEX_NULLIFIER_OFFSET = 48;
+export const GLOBAL_INDEX_PRIVATE_CALL_REQUEST_START_OFFSET = 64;
+export const GLOBAL_INDEX_PRIVATE_CALL_REQUEST_END_OFFSET = 72;
+export const GLOBAL_INDEX_PUBLIC_CALL_REQUEST_OFFSET = 80;
+export const GLOBAL_INDEX_L2_TO_L1_MSG_OFFSET = 112;
+export const GLOBAL_INDEX_PRIVATE_LOG_OFFSET = 120;
+export const GLOBAL_INDEX_CONTRACT_CLASS_LOG_HASH_OFFSET = 136;
+export const GLOBAL_INDEX_CONTRACT_MIN_REVERTIBLE_SIDE_EFFECT_COUNTER_OFFSET = 137;
+export const TOTAL_COUNTED_SIDE_EFFECTS_PER_CALL = 138;
 export const FUNCTION_SELECTOR_NUM_BYTES = 4;
+export const INITIAL_CHECKPOINT_NUMBER = 1;
 export const INITIAL_L2_BLOCK_NUM = 1;
 export const FIELDS_PER_BLOB = 4096;
-export const BLOBS_PER_BLOCK = 6;
+export const BLOBS_PER_CHECKPOINT = 6;
 export const AZTEC_MAX_EPOCH_DURATION = 48;
 export const MAX_INCLUDE_BY_TIMESTAMP_DURATION = 86400;
 export const GENESIS_BLOCK_HEADER_HASH = 6230580493657010651770048453555730909612826595416770775370473752814121567446n;
@@ -89,11 +101,16 @@ export const MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS = 3000;
 export const MAX_PACKED_BYTECODE_SIZE_PER_UTILITY_FUNCTION_IN_FIELDS = 3000;
 export const CLASS_REGISTRY_PRIVATE_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS = 23;
 export const CLASS_REGISTRY_UTILITY_FUNCTION_BROADCASTED_ADDITIONAL_FIELDS = 14;
-export const CONTRACT_CLASS_PUBLISHED_MAGIC_VALUE = 14149211982683198966415397187677099530590983261208050372085833907509n;
-export const CONTRACT_CLASS_REGISTRY_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE = 2889881020989534926461066592611988634597302675057895885580456197069n;
-export const CONTRACT_CLASS_REGISTRY_UTILITY_FUNCTION_BROADCASTED_MAGIC_VALUE = 24399338136397901754495080759185489776044879232766421623673792970137n;
-export const CONTRACT_INSTANCE_PUBLISHED_MAGIC_VALUE = 19558544958816189742429223939242700295084178455458336806004020892999n;
-export const CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE = 1534834688047131268740281708431107902615560100979874281215533519862n;
+export const CONTRACT_CLASS_PUBLISHED_MAGIC_VALUE =
+  14149211982683198966415397187677099530590983261208050372085833907509n;
+export const CONTRACT_CLASS_REGISTRY_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE =
+  2889881020989534926461066592611988634597302675057895885580456197069n;
+export const CONTRACT_CLASS_REGISTRY_UTILITY_FUNCTION_BROADCASTED_MAGIC_VALUE =
+  24399338136397901754495080759185489776044879232766421623673792970137n;
+export const CONTRACT_INSTANCE_PUBLISHED_MAGIC_VALUE =
+  19558544958816189742429223939242700295084178455458336806004020892999n;
+export const CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE =
+  1534834688047131268740281708431107902615560100979874281215533519862n;
 export const MAX_PROTOCOL_CONTRACTS = 11;
 export const CANONICAL_AUTH_REGISTRY_ADDRESS = 1;
 export const CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS = 2;
@@ -102,7 +119,8 @@ export const MULTI_CALL_ENTRYPOINT_ADDRESS = 4;
 export const FEE_JUICE_ADDRESS = 5;
 export const ROUTER_ADDRESS = 6;
 export const SIDE_EFFECT_MASKING_ADDRESS = 12;
-export const NULL_MSG_SENDER_CONTRACT_ADDRESS = 21888242871839275222246405745257275088548364400416034343698204186575808495616n;
+export const NULL_MSG_SENDER_CONTRACT_ADDRESS =
+  21888242871839275222246405745257275088548364400416034343698204186575808495616n;
 export const CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT = 79025834455612;
 export const FEE_JUICE_BALANCES_SLOT = 1;
 export const UPDATED_CLASS_IDS_SLOT = 1;
@@ -129,7 +147,7 @@ export const FUNCTION_LEAF_PREIMAGE_LENGTH = 5;
 export const GLOBAL_VARIABLES_LENGTH = 9;
 export const APPEND_ONLY_TREE_SNAPSHOT_LENGTH = 2;
 export const APPEND_ONLY_TREE_SNAPSHOT_LENGTH_BYTES = 36;
-export const SPONGE_BLOB_LENGTH = 11;
+export const SPONGE_BLOB_LENGTH = 10;
 export const BLS12_FR_LIMBS = 3;
 export const BLS12_FQ_LIMBS = 4;
 export const BLS12_POINT_LENGTH = 9;
@@ -146,7 +164,6 @@ export const KEY_VALIDATION_REQUEST_LENGTH = 4;
 export const KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH = 5;
 export const SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH = 6;
 export const PARTIAL_STATE_REFERENCE_LENGTH = 6;
-export const READ_REQUEST_LENGTH = 2;
 export const TREE_LEAF_READ_REQUEST_LENGTH = 2;
 export const PRIVATE_LOG_SIZE_IN_FIELDS = 18;
 export const PRIVATE_LOG_LENGTH = 19;
@@ -182,22 +199,22 @@ export const TOTAL_FEES_LENGTH = 1;
 export const TOTAL_MANA_USED_LENGTH = 1;
 export const BLOCK_HEADER_LENGTH = 22;
 export const BLOCK_HEADER_LENGTH_BYTES = 616;
-export const PROPOSED_BLOCK_HEADER_LENGTH = 11;
-export const PROPOSED_BLOCK_HEADER_LENGTH_BYTES = 284;
-export const PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 868;
+export const CHECKPOINT_HEADER_LENGTH = 12;
+export const CHECKPOINT_HEADER_SIZE_IN_BYTES = 316;
+export const SCOPED_READ_REQUEST_LEN = 3;
+export const PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 902;
 export const PRIVATE_CONTEXT_INPUTS_LENGTH = 37;
 export const FEE_RECIPIENT_LENGTH = 2;
 export const HIDING_KERNEL_IO_PUBLIC_INPUTS_SIZE = 56;
 export const PAIRING_POINTS_SIZE = 16;
 export const IPA_CLAIM_SIZE = 10;
-export const SCOPED_READ_REQUEST_LEN = 3;
 export const PUBLIC_DATA_READ_LENGTH = 3;
-export const PRIVATE_VALIDATION_REQUESTS_LENGTH = 773;
+export const PRIVATE_VALIDATION_REQUESTS_LENGTH = 771;
 export const PRIVATE_TO_ROLLUP_ACCUMULATED_DATA_LENGTH = 1371;
 export const TX_CONSTANT_DATA_LENGTH = 34;
 export const COMBINED_CONSTANT_DATA_LENGTH = 43;
 export const PRIVATE_ACCUMULATED_DATA_LENGTH = 2187;
-export const PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 3002;
+export const PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 3001;
 export const PRIVATE_TO_PUBLIC_ACCUMULATED_DATA_LENGTH = 1499;
 export const PRIVATE_TO_AVM_ACCUMULATED_DATA_LENGTH = 152;
 export const NUM_PRIVATE_TO_AVM_ACCUMULATED_DATA_ARRAYS = 3;
@@ -210,19 +227,19 @@ export const AVM_CIRCUIT_PUBLIC_INPUTS_LENGTH = 5008;
 export const BLOCK_CONSTANT_DATA_LENGTH = 16;
 export const CHECKPOINT_CONSTANT_DATA_LENGTH = 10;
 export const EPOCH_CONSTANT_DATA_LENGTH = 5;
-export const TX_ROLLUP_PUBLIC_INPUTS_LENGTH = 54;
-export const BLOCK_ROLLUP_PUBLIC_INPUTS_LENGTH = 58;
+export const TX_ROLLUP_PUBLIC_INPUTS_LENGTH = 52;
+export const BLOCK_ROLLUP_PUBLIC_INPUTS_LENGTH = 57;
 export const CHECKPOINT_ROLLUP_PUBLIC_INPUTS_LENGTH = 193;
 export const ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH = 158;
 export const NUM_MSGS_PER_BASE_PARITY = 256;
 export const NUM_BASE_PARITY_PER_ROOT_PARITY = 4;
 export const RECURSIVE_PROOF_LENGTH = 457;
 export const NESTED_RECURSIVE_PROOF_LENGTH = 457;
-export const IPA_PROOF_LENGTH = 68;
-export const ULTRA_KECCAK_PROOF_LENGTH = 350;
-export const RECURSIVE_ROLLUP_HONK_PROOF_LENGTH = 535;
-export const NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH = 535;
-export const CHONK_PROOF_LENGTH = 2084;
+export const IPA_PROOF_LENGTH = 64;
+export const ULTRA_KECCAK_PROOF_LENGTH = 339;
+export const RECURSIVE_ROLLUP_HONK_PROOF_LENGTH = 531;
+export const NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH = 531;
+export const CHONK_PROOF_LENGTH = 1963;
 export const ULTRA_VK_LENGTH_IN_FIELDS = 115;
 export const MEGA_VK_LENGTH_IN_FIELDS = 127;
 export const CHONK_VK_LENGTH_IN_FIELDS = 127;
@@ -244,6 +261,9 @@ export const AVM_BITWISE_OR_OP_ID = 1;
 export const AVM_BITWISE_XOR_OP_ID = 2;
 export const AVM_KECCAKF1600_NUM_ROUNDS = 24;
 export const AVM_KECCAKF1600_STATE_SIZE = 25;
+export const AVM_TX_PHASE_VALUE_START = 0;
+export const AVM_TX_PHASE_VALUE_SETUP = 3;
+export const AVM_TX_PHASE_VALUE_LAST = 11;
 export const AVM_SUBTRACE_ID_EXECUTION = 1;
 export const AVM_SUBTRACE_ID_ALU = 2;
 export const AVM_SUBTRACE_ID_BITWISE = 4;
@@ -366,7 +386,7 @@ export const AVM_PUBLIC_INPUTS_REVERTED_ROW_IDX = 4684;
 export const AVM_PUBLIC_INPUTS_COLUMNS_MAX_LENGTH = 4685;
 export const AVM_NUM_PUBLIC_INPUT_COLUMNS = 4;
 export const AVM_PUBLIC_INPUTS_COLUMNS_COMBINED_LENGTH = 18740;
-export const AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED = 20000;
+export const AVM_V2_PROOF_LENGTH_IN_FIELDS_PADDED = 16200;
 export const AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED = 1000;
 export const AVM_MAX_PROCESSABLE_L2_GAS = 6000000;
 export const DA_BYTES_PER_FIELD = 32;
@@ -374,7 +394,7 @@ export const DA_GAS_PER_BYTE = 16;
 export const FIXED_DA_GAS = 512;
 export const FIXED_L2_GAS = 512;
 export const FIXED_AVM_STARTUP_L2_GAS = 20000;
-export const MAX_PROCESSABLE_DA_GAS_PER_BLOCK = 12582912;
+export const MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT = 12582912;
 export const GAS_ESTIMATION_TEARDOWN_L2_GAS_LIMIT = 6000000;
 export const GAS_ESTIMATION_L2_GAS_LIMIT = 12000000;
 export const GAS_ESTIMATION_TEARDOWN_DA_GAS_LIMIT = 12582912;
@@ -384,20 +404,22 @@ export const DEFAULT_L2_GAS_LIMIT = 6000000;
 export const DEFAULT_TEARDOWN_DA_GAS_LIMIT = 1000000;
 export const DEFAULT_DA_GAS_LIMIT = 12582912;
 export const L2_GAS_DISTRIBUTED_STORAGE_PREMIUM = 1024;
-export const L2_GAS_PER_PRIVATE_LOG = 0;
-export const L2_GAS_PER_CONTRACT_CLASS_LOG = 0;
-export const L2_GAS_PER_L2_TO_L1_MSG = 200;
 export const AVM_PC_SIZE_IN_BITS = 32;
 export const AVM_MAX_OPERANDS = 7;
 export const AVM_MAX_REGISTERS = 6;
 export const AVM_ADDRESSING_BASE_RESOLUTION_L2_GAS = 3;
 export const AVM_ADDRESSING_INDIRECT_L2_GAS = 3;
 export const AVM_ADDRESSING_RELATIVE_L2_GAS = 3;
+export const L2_GAS_PER_NOTE_HASH = 0;
+export const L2_GAS_PER_NULLIFIER = 0;
+export const L2_GAS_PER_L2_TO_L1_MSG = 200;
+export const L2_GAS_PER_PRIVATE_LOG = 0;
+export const L2_GAS_PER_CONTRACT_CLASS_LOG = 0;
 export const AVM_ADD_BASE_L2_GAS = 12;
 export const AVM_SUB_BASE_L2_GAS = 12;
 export const AVM_MUL_BASE_L2_GAS = 27;
 export const AVM_DIV_BASE_L2_GAS = 27;
-export const AVM_FDIV_BASE_L2_GAS = 9;
+export const AVM_FDIV_BASE_L2_GAS = 225;
 export const AVM_EQ_BASE_L2_GAS = 12;
 export const AVM_LT_BASE_L2_GAS = 42;
 export const AVM_LTE_BASE_L2_GAS = 42;
@@ -419,25 +441,25 @@ export const AVM_INTERNALCALL_BASE_L2_GAS = 9;
 export const AVM_INTERNALRETURN_BASE_L2_GAS = 9;
 export const AVM_SET_BASE_L2_GAS = 27;
 export const AVM_MOV_BASE_L2_GAS = 12;
-export const AVM_SLOAD_BASE_L2_GAS = 129;
-export const AVM_SSTORE_BASE_L2_GAS = 1657;
-export const AVM_NOTEHASHEXISTS_BASE_L2_GAS = 126;
-export const AVM_EMITNOTEHASH_BASE_L2_GAS = 1285;
-export const AVM_NULLIFIEREXISTS_BASE_L2_GAS = 132;
-export const AVM_EMITNULLIFIER_BASE_L2_GAS = 1540;
-export const AVM_L1TOL2MSGEXISTS_BASE_L2_GAS = 108;
-export const AVM_GETCONTRACTINSTANCE_BASE_L2_GAS = 1527;
+export const AVM_SLOAD_BASE_L2_GAS = 1290;
+export const AVM_SSTORE_BASE_L2_GAS = 33140;
+export const AVM_NOTEHASHEXISTS_BASE_L2_GAS = 504;
+export const AVM_EMITNOTEHASH_BASE_L2_GAS = 19275;
+export const AVM_NULLIFIEREXISTS_BASE_L2_GAS = 924;
+export const AVM_EMITNULLIFIER_BASE_L2_GAS = 30800;
+export const AVM_L1TOL2MSGEXISTS_BASE_L2_GAS = 540;
+export const AVM_GETCONTRACTINSTANCE_BASE_L2_GAS = 6108;
 export const AVM_EMITUNENCRYPTEDLOG_BASE_L2_GAS = 15;
-export const AVM_SENDL2TOL1MSG_BASE_L2_GAS = 209;
-export const AVM_CALL_BASE_L2_GAS = 3312;
-export const AVM_STATICCALL_BASE_L2_GAS = 3312;
+export const AVM_SENDL2TOL1MSG_BASE_L2_GAS = 418;
+export const AVM_CALL_BASE_L2_GAS = 9936;
+export const AVM_STATICCALL_BASE_L2_GAS = 9936;
 export const AVM_RETURN_BASE_L2_GAS = 9;
 export const AVM_REVERT_BASE_L2_GAS = 9;
 export const AVM_DEBUGLOG_BASE_L2_GAS = 9;
-export const AVM_POSEIDON2_BASE_L2_GAS = 24;
+export const AVM_POSEIDON2_BASE_L2_GAS = 360;
 export const AVM_SHA256COMPRESSION_BASE_L2_GAS = 12288;
 export const AVM_KECCAKF1600_BASE_L2_GAS = 58176;
-export const AVM_ECADD_BASE_L2_GAS = 27;
+export const AVM_ECADD_BASE_L2_GAS = 270;
 export const AVM_TORADIXBE_BASE_L2_GAS = 24;
 export const AVM_CALLDATACOPY_DYN_L2_GAS = 3;
 export const AVM_RETURNDATACOPY_DYN_L2_GAS = 3;
@@ -452,22 +474,24 @@ export const AVM_EMITUNENCRYPTEDLOG_DYN_DA_GAS = 512;
 export const AVM_SSTORE_DYN_DA_GAS = 1024;
 export const TX_START_PREFIX = 8392562855083340404n;
 export const BLOCK_END_PREFIX = 1815594492414860291684n;
-export const PROOF_TYPE_PLONK = 0;
-export const PROOF_TYPE_HONK = 1;
-export const PROOF_TYPE_OINK = 2;
-export const PROOF_TYPE_HN = 3;
-export const PROOF_TYPE_AVM = 4;
-export const PROOF_TYPE_ROLLUP_HONK = 5;
-export const PROOF_TYPE_ROOT_ROLLUP_HONK = 6;
-export const PROOF_TYPE_HN_FINAL = 8;
-export const PROOF_TYPE_HN_TAIL = 9;
-export const PROOF_TYPE_CHONK = 10;
+export const CHECKPOINT_END_PREFIX = 2016229657840014237853300314959460n;
+export const PROOF_TYPE_HONK = 0;
+export const PROOF_TYPE_OINK = 1;
+export const PROOF_TYPE_HN = 2;
+export const PROOF_TYPE_AVM = 3;
+export const PROOF_TYPE_ROLLUP_HONK = 4;
+export const PROOF_TYPE_ROOT_ROLLUP_HONK = 5;
+export const PROOF_TYPE_HN_FINAL = 7;
+export const PROOF_TYPE_HN_TAIL = 8;
+export const PROOF_TYPE_CHONK = 9;
 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 = 18291678969210913367302010540259942201271604198321103848479209155223586227821n;
+export const AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_INITIAL_ROOT =
+  18291678969210913367302010540259942201271604198321103848479209155223586227821n;
 export const AVM_WRITTEN_PUBLIC_DATA_SLOTS_TREE_INITIAL_SIZE = 1;
 export const AVM_RETRIEVED_BYTECODES_TREE_HEIGHT = 5;
-export const AVM_RETRIEVED_BYTECODES_TREE_INITIAL_ROOT = 7257575663883662864904159007845791361042428565864275462740313586853981161757n;
+export const AVM_RETRIEVED_BYTECODES_TREE_INITIAL_ROOT =
+  7257575663883662864904159007845791361042428565864275462740313586853981161757n;
 export const AVM_RETRIEVED_BYTECODES_TREE_INITIAL_SIZE = 1;
 export const TIMESTAMP_OF_CHANGE_BIT_SIZE = 32;
 export const DEFAULT_UPDATE_DELAY = 86400;
@@ -486,54 +510,37 @@ export enum GeneratorIndex {
   NOTE_HASH_NONCE = 2,
   UNIQUE_NOTE_HASH = 3,
   SILOED_NOTE_HASH = 4,
-  MESSAGE_NULLIFIER = 5,
-  INITIALIZATION_NULLIFIER = 6,
+  NOTE_NULLIFIER = 53,
   OUTER_NULLIFIER = 7,
-  PUBLIC_DATA_READ = 8,
-  PUBLIC_DATA_UPDATE_REQUEST = 9,
-  FUNCTION_DATA = 10,
+  PUBLIC_LEAF_INDEX = 23,
+  MESSAGE_NULLIFIER = 5,
   FUNCTION_LEAF = 11,
-  CONTRACT_DEPLOYMENT_DATA = 12,
+  PUBLIC_BYTECODE = 60,
+  CONTRACT_CLASS_ID = 16,
   CONSTRUCTOR = 13,
-  CONSTRUCTOR_ARGS = 14,
-  CONTRACT_ADDRESS_V1 = 15,
-  CONTRACT_LEAF = 16,
-  CALL_CONTEXT = 17,
-  CALL_STACK_ITEM = 18,
-  CALL_STACK_ITEM_2 = 19,
-  SECRET_HASH = 20,
-  L2_TO_L1_MSG = 21,
-  TX_CONTEXT = 22,
-  PUBLIC_LEAF_INDEX = 23,
-  PUBLIC_DATA_LEAF = 24,
-  SIGNED_TX_REQUEST = 25,
-  GLOBAL_VARIABLES = 26,
+  NSK_M = 48,
+  IVSK_M = 49,
+  OVSK_M = 50,
+  TSK_M = 51,
+  PUBLIC_KEYS_HASH = 52,
   PARTIAL_ADDRESS = 27,
+  CONTRACT_ADDRESS_V1 = 15,
   BLOCK_HASH = 28,
-  SIDE_EFFECT = 29,
-  FEE_PAYLOAD = 30,
-  COMBINED_PAYLOAD = 31,
-  TX_NULLIFIER = 32,
   TX_REQUEST = 33,
-  SIGNATURE_PAYLOAD = 34,
-  VK = 41,
+  PUBLIC_TX_HASH = 56,
+  PRIVATE_TX_HASH = 57,
   PUBLIC_CALLDATA = 43,
   FUNCTION_ARGS = 44,
+  PROTOCOL_CONTRACTS = 61,
+  EVENT_COMMITMENT = 59,
   AUTHWIT_INNER = 45,
   AUTHWIT_OUTER = 46,
   AUTHWIT_NULLIFIER = 47,
-  NSK_M = 48,
-  IVSK_M = 49,
-  OVSK_M = 50,
-  TSK_M = 51,
-  PUBLIC_KEYS_HASH = 52,
-  NOTE_NULLIFIER = 53,
   SYMMETRIC_KEY = 54,
   SYMMETRIC_KEY_2 = 55,
-  PUBLIC_TX_HASH = 56,
-  PRIVATE_TX_HASH = 57,
   PARTIAL_NOTE_VALIDITY_COMMITMENT = 58,
-  EVENT_COMMITMENT = 59,
-  PUBLIC_BYTECODE = 60,
-  PROTOCOL_CONTRACTS = 61,
-}
+  INITIALIZATION_NULLIFIER = 6,
+  SECRET_HASH = 20,
+  TX_NULLIFIER = 32,
+  SIGNATURE_PAYLOAD = 34,
+}

package/src/constants.ts

@@ -1,5 +1,31 @@
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Fr } from '@aztec/foundation/curves/bn254';
+
+// Re-export L2 block number constants with proper BlockNumber type
+// Note: The generated constants are plain numbers, but we provide typed versions here
+import {
+  GENESIS_BLOCK_HEADER_HASH as GENESIS_BLOCK_HEADER_HASH_BIGINT,
+  INITIAL_CHECKPOINT_NUMBER as INITIAL_CHECKPOINT_NUM_RAW,
+  INITIAL_L2_BLOCK_NUM as INITIAL_L2_BLOCK_NUM_RAW,
+} from './constants.gen.js';
+
 // Typescript-land-only constants
 export const SPONSORED_FPC_SALT = BigInt(0);
 
 // Autogenerated constants loaded from noir-land
+// eslint-disable-next-line import/export
 export * from './constants.gen.js';
+
+/** The initial L2 block number (typed as BlockNumber). This is the first block number in the Aztec L2 chain. */
+// Shadow the export from constants.gen above
+// eslint-disable-next-line import/export
+export const INITIAL_L2_BLOCK_NUM: BlockNumber = BlockNumber(INITIAL_L2_BLOCK_NUM_RAW);
+
+/** The initial L2 checkpoint number (typed as CheckpointNumber). This is the first checkpoint number in the Aztec L2 chain. */
+// Shadow the export from constants.gen above
+export const INITIAL_L2_CHECKPOINT_NUM: CheckpointNumber = CheckpointNumber(INITIAL_CHECKPOINT_NUM_RAW);
+
+/** The block header hash for the genesis block 0. */
+// Shadow the export from constants.gen above
+// eslint-disable-next-line import/export
+export const GENESIS_BLOCK_HEADER_HASH = new Fr(GENESIS_BLOCK_HEADER_HASH_BIGINT);