@aztec/constants 0.0.1-commit.f2ce05ee → 0.0.1-commit.f5a9928

package/dest/scripts/constants.in.js

@@ -3,9 +3,23 @@ import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
 const NOIR_CONSTANTS_FILE = '../../../../noir-projects/noir-protocol-circuits/crates/types/src/constants.nr';
 const TS_CONSTANTS_FILE = '../constants.gen.ts';
-const CPP_AZTEC_CONSTANTS_FILE = '../../../../barretenberg/cpp/src/barretenberg/vm2/common/aztec_constants.hpp';
+const CPP_AZTEC_CONSTANTS_FILE = '../../../../barretenberg/cpp/src/barretenberg/aztec/aztec_constants.hpp';
 const PIL_AZTEC_CONSTANTS_FILE = '../../../../barretenberg/cpp/pil/vm2/constants_gen.pil';
 const SOLIDITY_CONSTANTS_FILE = '../../../../l1-contracts/src/core/libraries/ConstantsGen.sol';
+// Additional Noir source files (outside constants.nr) to extract specific constants from, keyed by
+// file path (relative to this script) and the exact constant names to pull from each. Used for
+// constants that are defined alongside circuit code rather than in constants.nr, so they can be
+// exported to the generated TS constants without duplicating their definition. The referenced
+// constants may depend on constants.nr values, which are in scope because they are evaluated after
+// the main file's constants.
+const ADDITIONAL_NOIR_CONSTANT_FILES = [
+    {
+        file: '../../../../noir-projects/noir-protocol-circuits/crates/types/src/blob_data/tx_blob_data.nr',
+        constants: [
+            'MAX_TX_BLOB_DATA_SIZE_IN_FIELDS'
+        ]
+    }
+];
 // Whitelist of constants that will be copied to aztec_constants.hpp.
 // We don't copy everything as just a handful are needed, and updating them breaks the cache and triggers expensive bb builds.
 const CPP_CONSTANTS = [
@@ -21,12 +35,10 @@ const CPP_CONSTANTS = [
     'MEM_TAG_U128',
     'MEM_TAG_FF',
     'MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS',
-    'CANONICAL_AUTH_REGISTRY_ADDRESS',
     'CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS',
     'CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS',
-    'MULTI_CALL_ENTRYPOINT_ADDRESS',
     'FEE_JUICE_ADDRESS',
-    'PUBLIC_CHECKS_ADDRESS',
+    'TX_DA_GAS_OVERHEAD',
     'FEE_JUICE_BALANCES_SLOT',
     'UPDATED_CLASS_IDS_SLOT',
     'UPDATES_DELAYED_PUBLIC_MUTABLE_VALUES_LEN',
@@ -42,6 +54,7 @@ const CPP_CONSTANTS = [
     'MAX_NOTE_HASHES_PER_TX',
     'MAX_NULLIFIERS_PER_TX',
     'MAX_L2_TO_L1_MSGS_PER_TX',
+    'MAX_PROCESSABLE_L2_GAS',
     'MAX_PUBLIC_LOGS_PER_TX',
     'MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX',
     'MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS',
@@ -109,15 +122,18 @@ const CPP_CONSTANTS = [
     'FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH',
     'PUBLIC_LOGS_LENGTH',
     'PUBLIC_LOG_HEADER_LENGTH',
+    'PUBLIC_TX_L2_GAS_OVERHEAD',
     'MAX_PROTOCOL_CONTRACTS',
     'DEFAULT_MAX_DEBUG_LOG_MEMORY_READS'
 ];
 const CPP_GENERATORS = [
     'BLOCK_HEADER_HASH',
+    'SALTED_INITIALIZATION_HASH',
     'PARTIAL_ADDRESS',
-    'CONTRACT_ADDRESS_V1',
+    'CONTRACT_ADDRESS_V2',
     'CONTRACT_CLASS_ID',
     'PUBLIC_KEYS_HASH',
+    'SINGLE_PUBLIC_KEY_HASH',
     'NOTE_HASH_NONCE',
     'UNIQUE_NOTE_HASH',
     'SILOED_NOTE_HASH',
@@ -125,7 +141,12 @@ const CPP_GENERATORS = [
     'PUBLIC_LEAF_SLOT',
     'PUBLIC_STORAGE_MAP_SLOT',
     'PUBLIC_CALLDATA',
-    'PUBLIC_BYTECODE'
+    'PUBLIC_BYTECODE',
+    'MERKLE_HASH',
+    'NULLIFIER_MERKLE',
+    'PUBLIC_DATA_MERKLE',
+    'WRITTEN_SLOTS_MERKLE',
+    'RETRIEVED_BYTECODES_MERKLE'
 ];
 const PIL_CONSTANTS = [
     'MAX_ETH_ADDRESS_VALUE',
@@ -159,12 +180,9 @@ const PIL_CONSTANTS = [
     'L1_TO_L2_MSG_TREE_HEIGHT',
     'UPDATED_CLASS_IDS_SLOT',
     'UPDATES_DELAYED_PUBLIC_MUTABLE_VALUES_LEN',
-    'CANONICAL_AUTH_REGISTRY_ADDRESS',
     'CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS',
     'CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS',
-    'MULTI_CALL_ENTRYPOINT_ADDRESS',
     'FEE_JUICE_ADDRESS',
-    'PUBLIC_CHECKS_ADDRESS',
     'FEE_JUICE_BALANCES_SLOT',
     'TIMESTAMP_OF_CHANGE_BIT_SIZE',
     'UPDATES_DELAYED_PUBLIC_MUTABLE_METADATA_BIT_SIZE',
@@ -248,10 +266,10 @@ const PIL_CONSTANTS = [
     'AVM_DYN_GAS_ID_RETURNDATACOPY',
     'AVM_DYN_GAS_ID_TORADIX',
     'AVM_DYN_GAS_ID_BITWISE',
-    'AVM_DYN_GAS_ID_EMITUNENCRYPTEDLOG',
+    'AVM_DYN_GAS_ID_EMITPUBLICLOG',
     'AVM_DYN_GAS_ID_SSTORE',
     'AVM_SUBTRACE_ID_GETCONTRACTINSTANCE',
-    'AVM_SUBTRACE_ID_EMITUNENCRYPTEDLOG',
+    'AVM_SUBTRACE_ID_EMITPUBLICLOG',
     'AVM_EXEC_OP_ID_GETENVVAR',
     'AVM_EXEC_OP_ID_MOV',
     'AVM_EXEC_OP_ID_JUMP',
@@ -300,10 +318,12 @@ const PIL_CONSTANTS = [
     'MAX_PROTOCOL_CONTRACTS'
 ];
 const PIL_GENERATORS = [
+    'SALTED_INITIALIZATION_HASH',
     'PARTIAL_ADDRESS',
-    'CONTRACT_ADDRESS_V1',
+    'CONTRACT_ADDRESS_V2',
     'CONTRACT_CLASS_ID',
     'PUBLIC_KEYS_HASH',
+    'SINGLE_PUBLIC_KEY_HASH',
     'NOTE_HASH_NONCE',
     'UNIQUE_NOTE_HASH',
     'SILOED_NOTE_HASH',
@@ -311,7 +331,12 @@ const PIL_GENERATORS = [
     'PUBLIC_LEAF_SLOT',
     'PUBLIC_STORAGE_MAP_SLOT',
     'PUBLIC_CALLDATA',
-    'PUBLIC_BYTECODE'
+    'PUBLIC_BYTECODE',
+    'MERKLE_HASH',
+    'NULLIFIER_MERKLE',
+    'PUBLIC_DATA_MERKLE',
+    'WRITTEN_SLOTS_MERKLE',
+    'RETRIEVED_BYTECODES_MERKLE'
 ];
 const SOLIDITY_CONSTANTS = [
     'MAX_FIELD_VALUE',
@@ -417,30 +442,30 @@ const SOLIDITY_CONSTANTS = [
 }
 /**
  * Generate the constants file in Typescript.
- */ function generateTypescriptConstants({ constants, generatorIndexEnum }, targetPath) {
+ */ function generateTypescriptConstants({ constants, domainSeparatorEnum }, targetPath) {
     const result = [
         '// GENERATED FILE - DO NOT EDIT, RUN yarn remake-constants',
         processConstantsTS(constants),
-        processEnumTS('GeneratorIndex', generatorIndexEnum)
+        processEnumTS('DomainSeparator', domainSeparatorEnum)
     ].join('\n');
     fs.writeFileSync(targetPath, result);
 }
 /**
  * Generate the constants file in C++.
- */ function generateCppConstants({ constants, generatorIndexEnum }, targetPath) {
+ */ function generateCppConstants({ constants, domainSeparatorEnum }, targetPath) {
     const resultCpp = `// GENERATED FILE - DO NOT EDIT, RUN yarn remake-constants in yarn-project/constants
 #pragma once
 
-${processConstantsCpp(constants, generatorIndexEnum)}
+${processConstantsCpp(constants, domainSeparatorEnum)}
 `;
     fs.writeFileSync(targetPath, resultCpp);
 }
 /**
  * Generate the constants file in PIL.
- */ function generatePilConstants({ constants, generatorIndexEnum }, targetPath) {
+ */ function generatePilConstants({ constants, domainSeparatorEnum }, targetPath) {
     const resultPil = `// GENERATED FILE - DO NOT EDIT, RUN yarn remake-constants in yarn-project/constants
 namespace constants;
-${processConstantsPil(constants, generatorIndexEnum)}
+${processConstantsPil(constants, domainSeparatorEnum)}
 \n`;
     fs.writeFileSync(targetPath, resultPil);
 }
@@ -468,16 +493,19 @@ ${processConstantsSolidity(constants)}
 }
 /**
  * Parse the content of the constants file in Noir.
- */ function parseNoirFile(fileContent) {
+ */ function parseNoirFile(fileContent, { stripLineComments = false } = {}) {
     const constantsExpressions = [];
-    const generatorIndexEnum = {};
+    const domainSeparatorEnum = {};
     const emptyExpression = ()=>({
             name: '',
             content: []
         });
     let expression = emptyExpression();
     fileContent.split('\n').forEach((l)=>{
-        const line = l.trim();
+        // Strip trailing `//` line comments so multi-line expressions with inline comments (e.g.
+        // MAX_TX_BLOB_DATA_SIZE_IN_FIELDS) parse correctly. Disabled for constants.nr to keep its
+        // existing parsing behavior byte-for-byte unchanged.
+        const line = (stripLineComments ? l.replace(/\/\/.*$/, '') : l).trim();
         if (!line) {
             // Empty line.
             return;
@@ -492,7 +520,7 @@ ${processConstantsSolidity(constants)}
                 const [, indexName] = name.match(/DOM_SEP__(\w+)/) || [];
                 if (indexName) {
                     // Generator index.
-                    generatorIndexEnum[indexName] = +value;
+                    domainSeparatorEnum[indexName] = +value;
                 } else if (end) {
                     // A single line of expression.
                     constantsExpressions.push([
@@ -537,10 +565,9 @@ ${processConstantsSolidity(constants)}
             console.warn(`Unknown content: ${line}`);
         }
     });
-    const constants = evaluateExpressions(constantsExpressions);
     return {
-        constants,
-        generatorIndexEnum
+        constantsExpressions,
+        domainSeparatorEnum
     };
 }
 /**
@@ -567,7 +594,11 @@ ${processConstantsSolidity(constants)}
         .replace(/\(/g, '( ').replace(/\)/g, ' )')// We also make some space around common operators
         .replace(/\+/g, ' + ').replace(/(?<!\/)\*(?!\/)/, ' * ')// We split the expression into terms...
         .split(/\s+/)// ...and then we convert each term to a BigInt if it is a number.
-        .map((term)=>isNaN(+term) ? term : `BigInt('${term}')`)// .. also, we convert the known bigints to BigInts.
+        .map((term)=>{
+            // Remove underscores from numeric literals (e.g., 6_000_000 -> 6000000)
+            const termWithoutUnderscores = term.replace(/_/g, '');
+            return isNaN(+termWithoutUnderscores) ? term : `BigInt('${termWithoutUnderscores}')`;
+        })// .. also, we convert the known bigints to BigInts.
         .map((term)=>knownBigInts.includes(term) ? `BigInt(${term})` : term)// We join the terms back together.
         .join(' ');
         return `var ${name} = ${guardedRhs};`;
@@ -585,7 +616,26 @@ ${processConstantsSolidity(constants)}
     const __dirname = dirname(fileURLToPath(import.meta.url));
     const noirConstantsFile = join(__dirname, NOIR_CONSTANTS_FILE);
     const noirConstants = fs.readFileSync(noirConstantsFile, 'utf-8');
-    const parsedContent = parseNoirFile(noirConstants);
+    const { constantsExpressions, domainSeparatorEnum } = parseNoirFile(noirConstants);
+    // Pull in explicitly-listed constants defined outside constants.nr (e.g. alongside circuit code).
+    // They are appended after the main constants so they can reference them when evaluated together.
+    for (const { file, constants: names } of ADDITIONAL_NOIR_CONSTANT_FILES){
+        const additionalContent = fs.readFileSync(join(__dirname, file), 'utf-8');
+        const { constantsExpressions: additionalExpressions } = parseNoirFile(additionalContent, {
+            stripLineComments: true
+        });
+        for (const name of names){
+            const expression = additionalExpressions.find(([exprName])=>exprName === name);
+            if (!expression) {
+                throw new Error(`Constant ${name} not found in ${file}`);
+            }
+            constantsExpressions.push(expression);
+        }
+    }
+    const parsedContent = {
+        constants: evaluateExpressions(constantsExpressions),
+        domainSeparatorEnum
+    };
     // Typescript
     const tsTargetPath = join(__dirname, TS_CONSTANTS_FILE);
     generateTypescriptConstants(parsedContent, tsTargetPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/constants",
-  "version": "0.0.1-commit.f2ce05ee",
+  "version": "0.0.1-commit.f5a9928",
   "type": "module",
   "inherits": [
     "../package.common.json"
@@ -23,7 +23,7 @@
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "dependencies": {
-    "@aztec/foundation": "0.0.1-commit.f2ce05ee",
+    "@aztec/foundation": "0.0.1-commit.f5a9928",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/constants.gen.ts

@@ -57,8 +57,6 @@ export const MAX_KEY_VALIDATION_REQUESTS_PER_CALL = 16;
 export const NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP = 1024;
 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;
@@ -79,6 +77,14 @@ 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 PRIVATE_KERNEL_RESET_TAIL_VK_INDEX = 31;
+export const PRIVATE_KERNEL_RESET_TAIL_TO_PUBLIC_VK_INDEX = 37;
+export const PRIVATE_KERNEL_RESET_BLOCK_END = 43;
+export const PRIVATE_KERNEL_INIT_3_VK_INDEX = 65;
+export const PRIVATE_KERNEL_INIT_2_VK_INDEX = 66;
+export const PRIVATE_KERNEL_INNER_2_VK_INDEX = 67;
+export const PRIVATE_KERNEL_INNER_3_VK_INDEX = 68;
+export const MAX_APPS_PER_KERNEL = 3;
 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;
@@ -97,9 +103,9 @@ export const INITIAL_L2_BLOCK_NUM = 1;
 export const FIELDS_PER_BLOB = 4096;
 export const BLOBS_PER_CHECKPOINT = 6;
 export const MAX_CHECKPOINTS_PER_EPOCH = 32;
-export const MAX_INCLUDE_BY_TIMESTAMP_DURATION = 86400;
-export const GENESIS_BLOCK_HEADER_HASH = 21694244557328181932449230888455310614586084993178835904749768133365362325861n;
-export const GENESIS_ARCHIVE_ROOT = 9682850228538071369704502076456077473410427336083826595120404283897422804423n;
+export const MAX_TX_LIFETIME = 86400;
+export const GENESIS_BLOCK_HEADER_HASH = 6551417544883665873456328017782433997345264442591862482015827744892259451090n;
+export const GENESIS_ARCHIVE_ROOT = 10619256997260439436842531499967995403253967496480475679746178797053672406517n;
 export const EMPTY_EPOCH_OUT_HASH = 355785372471781095838790036702437931769306153278986832745847530947941691539n;
 export const MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS = 3000;
 export const MAX_PACKED_BYTECODE_SIZE_PER_PRIVATE_FUNCTION_IN_FIELDS = 3000;
@@ -112,12 +118,9 @@ export const CONTRACT_CLASS_REGISTRY_UTILITY_FUNCTION_BROADCASTED_MAGIC_VALUE =
 export const CONTRACT_INSTANCE_PUBLISHED_MAGIC_VALUE = 10538216027419913765597387738085647348651103543680388181336823392401502757423n;
 export const CONTRACT_INSTANCE_UPDATED_MAGIC_VALUE = 20721543224513346060908370400407150739273836456436647488068002302723900469047n;
 export const MAX_PROTOCOL_CONTRACTS = 11;
-export const CANONICAL_AUTH_REGISTRY_ADDRESS = 1;
+export const CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 1;
 export const CONTRACT_INSTANCE_REGISTRY_CONTRACT_ADDRESS = 2;
-export const CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS = 3;
-export const MULTI_CALL_ENTRYPOINT_ADDRESS = 4;
-export const FEE_JUICE_ADDRESS = 5;
-export const PUBLIC_CHECKS_ADDRESS = 6;
+export const FEE_JUICE_ADDRESS = 3;
 export const SIDE_EFFECT_MASKING_ADDRESS = 19523154334483583633304358390644137470227519736821975910774528428729027989987n;
 export const NULL_MSG_SENDER_CONTRACT_ADDRESS = 21888242871839275222246405745257275088548364400416034343698204186575808495616n;
 export const CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT = 14193106819744442689484501689686180698286338820089744102289275815863062044599n;
@@ -131,12 +134,21 @@ export const DEFAULT_OVPK_M_X = 122127877196173055705879288602884754543280089552
 export const DEFAULT_OVPK_M_Y = 3646747884782549389807830220601404629716007431341772952958971658285958854707n;
 export const DEFAULT_TPK_M_X = 728059161893070741164607238299536939695876538801885465230641192969135857403n;
 export const DEFAULT_TPK_M_Y = 14575718736702206050102425029229426215631664471161015518982549597389390371695n;
+export const DEFAULT_MSPK_M_X = 376604625977751683916174973150925911104291823095102990065366659597425722296n;
+export const DEFAULT_MSPK_M_Y = 6401736487141786437369922081657103422778081213225821992340733703460199150021n;
+export const DEFAULT_FBPK_M_X = 11572348468544340050763207926758553848489417025671995953147359609999720016266n;
+export const DEFAULT_FBPK_M_Y = 11774107091164614768010125692190151838649080987589360468021169521798921524563n;
+export const DEFAULT_NPK_M_HASH = 9490941203163884203266873379528043162885952552009707050511473783876867365414n;
+export const DEFAULT_OVPK_M_HASH = 6503635668323258394266152634006889881423098283582185344306514598322956522059n;
+export const DEFAULT_TPK_M_HASH = 3696996950890211715833095099359687729113787313245035143274671977290400579312n;
+export const DEFAULT_MSPK_M_HASH = 9339255027081995322829531434846677508514443987752207871815765570767379563350n;
+export const DEFAULT_FBPK_M_HASH = 6817041416194035981444514907304573239615033139388669881213007796289638159510n;
 export const AZTEC_ADDRESS_LENGTH = 1;
 export const GAS_FEES_LENGTH = 2;
 export const GAS_LENGTH = 2;
 export const GAS_SETTINGS_LENGTH = 8;
 export const CALL_CONTEXT_LENGTH = 4;
-export const CONTRACT_INSTANCE_LENGTH = 16;
+export const CONTRACT_INSTANCE_LENGTH = 12;
 export const CONTRACT_STORAGE_READ_LENGTH = 3;
 export const CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH = 3;
 export const ETH_ADDRESS_LENGTH = 1;
@@ -158,16 +170,16 @@ export const L2_TO_L1_MESSAGE_LENGTH = 2;
 export const COUNTED_L2_TO_L1_MESSAGE_LENGTH = 3;
 export const SCOPED_L2_TO_L1_MESSAGE_LENGTH = 3;
 export const SCOPED_COUNTED_L2_TO_L1_MESSAGE_LENGTH = 4;
-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 KEY_VALIDATION_REQUEST_LENGTH = 2;
+export const KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH = 3;
+export const SCOPED_KEY_VALIDATION_REQUEST_AND_GENERATOR_LENGTH = 4;
 export const PARTIAL_STATE_REFERENCE_LENGTH = 6;
 export const TREE_LEAF_READ_REQUEST_LENGTH = 2;
-export const PRIVATE_LOG_SIZE_IN_FIELDS = 18;
-export const PRIVATE_LOG_LENGTH = 19;
-export const PRIVATE_LOG_DATA_LENGTH = 21;
-export const PRIVATE_LOG_CIPHERTEXT_LEN = 17;
-export const SCOPED_PRIVATE_LOG_DATA_LENGTH = 22;
+export const PRIVATE_LOG_SIZE_IN_FIELDS = 16;
+export const PRIVATE_LOG_LENGTH = 17;
+export const PRIVATE_LOG_DATA_LENGTH = 19;
+export const PRIVATE_LOG_CIPHERTEXT_LEN = 15;
+export const SCOPED_PRIVATE_LOG_DATA_LENGTH = 20;
 export const FLAT_PUBLIC_LOGS_HEADER_LENGTH = 1;
 export const FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH = 4096;
 export const PUBLIC_LOGS_LENGTH = 4097;
@@ -196,30 +208,30 @@ export const TX_REQUEST_LENGTH = 15;
 export const TOTAL_FEES_LENGTH = 1;
 export const TOTAL_MANA_USED_LENGTH = 1;
 export const BLOCK_HEADER_LENGTH = 22;
-export const CHECKPOINT_HEADER_LENGTH = 12;
-export const CHECKPOINT_HEADER_SIZE_IN_BYTES = 316;
+export const CHECKPOINT_HEADER_LENGTH = 13;
+export const CHECKPOINT_HEADER_SIZE_IN_BYTES = 348;
 export const SCOPED_READ_REQUEST_LEN = 3;
-export const PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 902;
-export const PRIVATE_CONTEXT_INPUTS_LENGTH = 37;
+export const PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH = 839;
+export const PRIVATE_CONTEXT_INPUTS_LENGTH = 38;
 export const FEE_RECIPIENT_LENGTH = 2;
 export const HIDING_KERNEL_IO_PUBLIC_INPUTS_SIZE = 28;
 export const PAIRING_POINTS_SIZE = 8;
 export const IPA_CLAIM_SIZE = 6;
 export const PUBLIC_DATA_READ_LENGTH = 3;
-export const PRIVATE_VALIDATION_REQUESTS_LENGTH = 771;
-export const PRIVATE_TO_ROLLUP_ACCUMULATED_DATA_LENGTH = 1371;
+export const PRIVATE_VALIDATION_REQUESTS_LENGTH = 643;
+export const PRIVATE_TO_ROLLUP_ACCUMULATED_DATA_LENGTH = 1243;
 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 = 3001;
-export const PRIVATE_TO_PUBLIC_ACCUMULATED_DATA_LENGTH = 1499;
+export const PRIVATE_ACCUMULATED_DATA_LENGTH = 2059;
+export const PRIVATE_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2746;
+export const PRIVATE_TO_PUBLIC_ACCUMULATED_DATA_LENGTH = 1371;
 export const PRIVATE_TO_AVM_ACCUMULATED_DATA_LENGTH = 152;
 export const NUM_PRIVATE_TO_AVM_ACCUMULATED_DATA_ARRAYS = 3;
 export const NUM_AVM_ACCUMULATED_DATA_ARRAYS = 4;
 export const NUM_PUBLIC_CALL_REQUEST_ARRAYS = 3;
 export const AVM_ACCUMULATED_DATA_LENGTH = 4377;
-export const PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 3040;
-export const PRIVATE_TO_ROLLUP_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 1409;
+export const PRIVATE_TO_PUBLIC_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 2784;
+export const PRIVATE_TO_ROLLUP_KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 1281;
 export const AVM_CIRCUIT_PUBLIC_INPUTS_LENGTH = 5008;
 export const BLOCK_CONSTANT_DATA_LENGTH = 16;
 export const CHECKPOINT_CONSTANT_DATA_LENGTH = 10;
@@ -230,16 +242,21 @@ export const CHECKPOINT_ROLLUP_PUBLIC_INPUTS_LENGTH = 149;
 export const ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH = 111;
 export const NUM_MSGS_PER_BASE_PARITY = 256;
 export const NUM_BASE_PARITY_PER_ROOT_PARITY = 4;
-export const RECURSIVE_PROOF_LENGTH = 449;
-export const NESTED_RECURSIVE_PROOF_LENGTH = 449;
+export const RECURSIVE_PROOF_LENGTH = 410;
+export const NESTED_RECURSIVE_PROOF_LENGTH = 410;
 export const IPA_PROOF_LENGTH = 64;
 export const ULTRA_KECCAK_PROOF_LENGTH = 331;
-export const RECURSIVE_ROLLUP_HONK_PROOF_LENGTH = 519;
-export const NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH = 519;
-export const CHONK_PROOF_LENGTH = 1935;
+export const RECURSIVE_ROLLUP_HONK_PROOF_LENGTH = 480;
+export const NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH = 480;
+export const CHONK_HIDING_OINK_LENGTH = 48;
+export const CHONK_MERGE_PROOF_SIZE = 41;
+export const CHONK_ECCVM_PROOF_LENGTH = 612;
+export const CHONK_JOINT_PROOF_LENGTH = 477;
+export const CHONK_PROOF_LENGTH = 1270;
 export const ULTRA_VK_LENGTH_IN_FIELDS = 115;
-export const MEGA_VK_LENGTH_IN_FIELDS = 127;
-export const CHONK_VK_LENGTH_IN_FIELDS = 127;
+export const MEGA_VK_LENGTH_IN_FIELDS = 163;
+export const MEGA_ZK_VK_LENGTH_IN_FIELDS = 115;
+export const CHONK_VK_LENGTH_IN_FIELDS = 115;
 export const AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS = 86;
 export const MAX_PUBLIC_BYTECODE_SIZE_IN_BYTES = 96000;
 export const MAX_PUBLIC_CALLS_TO_UNIQUE_CONTRACT_CLASS_IDS = 21;
@@ -269,7 +286,7 @@ export const AVM_SUBTRACE_ID_CALLDATA_COPY = 16;
 export const AVM_SUBTRACE_ID_RETURNDATA_COPY = 32;
 export const AVM_SUBTRACE_ID_SET = 64;
 export const AVM_SUBTRACE_ID_GETCONTRACTINSTANCE = 128;
-export const AVM_SUBTRACE_ID_EMITUNENCRYPTEDLOG = 256;
+export const AVM_SUBTRACE_ID_EMITPUBLICLOG = 256;
 export const AVM_SUBTRACE_ID_POSEIDON2_PERM = 512;
 export const AVM_SUBTRACE_ID_SHA256_COMPRESSION = 1024;
 export const AVM_SUBTRACE_ID_KECCAKF1600 = 2048;
@@ -279,7 +296,7 @@ export const AVM_DYN_GAS_ID_CALLDATACOPY = 1;
 export const AVM_DYN_GAS_ID_RETURNDATACOPY = 2;
 export const AVM_DYN_GAS_ID_TORADIX = 4;
 export const AVM_DYN_GAS_ID_BITWISE = 8;
-export const AVM_DYN_GAS_ID_EMITUNENCRYPTEDLOG = 16;
+export const AVM_DYN_GAS_ID_EMITPUBLICLOG = 16;
 export const AVM_DYN_GAS_ID_SSTORE = 32;
 export const AVM_EXEC_OP_ID_GETENVVAR = 1;
 export const AVM_EXEC_OP_ID_MOV = 2;
@@ -383,23 +400,17 @@ 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 = 16200;
-export const AVM_V2_VERIFICATION_KEY_LENGTH_IN_FIELDS_PADDED = 1000;
-export const AVM_MAX_PROCESSABLE_L2_GAS = 6000000;
+export const AVM_V2_PROOF_LENGTH_IN_FIELDS = 15516;
 export const DA_BYTES_PER_FIELD = 32;
-export const DA_GAS_PER_BYTE = 16;
-export const FIXED_DA_GAS = 512;
-export const FIXED_L2_GAS = 512;
+export const DA_GAS_PER_BYTE = 1;
+export const DA_GAS_PER_FIELD = 32;
+export const TX_DA_GAS_OVERHEAD = 96;
+export const PUBLIC_TX_L2_GAS_OVERHEAD = 540000;
+export const PRIVATE_TX_L2_GAS_OVERHEAD = 440000;
 export const FIXED_AVM_STARTUP_L2_GAS = 20000;
-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;
-export const GAS_ESTIMATION_DA_GAS_LIMIT = 25165824;
-export const DEFAULT_TEARDOWN_L2_GAS_LIMIT = 1000000;
-export const DEFAULT_L2_GAS_LIMIT = 6000000;
-export const DEFAULT_TEARDOWN_DA_GAS_LIMIT = 1000000;
-export const DEFAULT_DA_GAS_LIMIT = 12582912;
+export const AVM_MAX_PROCESSABLE_L2_GAS = 6000000;
+export const MAX_PROCESSABLE_L2_GAS = 6540000;
+export const MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT = 786432;
 export const L2_GAS_DISTRIBUTED_STORAGE_PREMIUM = 1024;
 export const AVM_PC_SIZE_IN_BITS = 32;
 export const AVM_MAX_OPERANDS = 7;
@@ -407,11 +418,11 @@ 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 L2_GAS_PER_NOTE_HASH = 9200;
+export const L2_GAS_PER_NULLIFIER = 16000;
+export const L2_GAS_PER_L2_TO_L1_MSG = 5200;
+export const L2_GAS_PER_PRIVATE_LOG = 2500;
+export const L2_GAS_PER_CONTRACT_CLASS_LOG = 73000;
 export const AVM_ADD_BASE_L2_GAS = 12;
 export const AVM_SUB_BASE_L2_GAS = 12;
 export const AVM_MUL_BASE_L2_GAS = 27;
@@ -446,8 +457,8 @@ export const AVM_NULLIFIEREXISTS_BASE_L2_GAS = 903;
 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 = 478;
+export const AVM_EMITPUBLICLOG_BASE_L2_GAS = 15;
+export const AVM_SENDL2TOL1MSG_BASE_L2_GAS = 5239;
 export const AVM_CALL_BASE_L2_GAS = 9936;
 export const AVM_STATICCALL_BASE_L2_GAS = 9936;
 export const AVM_RETURN_BASE_L2_GAS = 9;
@@ -456,19 +467,19 @@ export const AVM_DEBUGLOG_BASE_L2_GAS = 9;
 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 = 270;
+export const AVM_ECADD_BASE_L2_GAS = 180;
 export const AVM_TORADIXBE_BASE_L2_GAS = 24;
-export const AVM_CALLDATACOPY_DYN_L2_GAS = 3;
-export const AVM_RETURNDATACOPY_DYN_L2_GAS = 3;
+export const AVM_CALLDATACOPY_DYN_L2_GAS = 6;
+export const AVM_RETURNDATACOPY_DYN_L2_GAS = 6;
 export const AVM_TORADIXBE_DYN_L2_GAS = 3;
 export const AVM_BITWISE_DYN_L2_GAS = 3;
-export const AVM_EMITUNENCRYPTEDLOG_DYN_L2_GAS = 3;
-export const AVM_EMITNOTEHASH_BASE_DA_GAS = 512;
-export const AVM_EMITNULLIFIER_BASE_DA_GAS = 512;
-export const AVM_SENDL2TOL1MSG_BASE_DA_GAS = 512;
-export const AVM_EMITUNENCRYPTEDLOG_BASE_DA_GAS = 1024;
-export const AVM_EMITUNENCRYPTEDLOG_DYN_DA_GAS = 512;
-export const AVM_SSTORE_DYN_DA_GAS = 1024;
+export const AVM_EMITPUBLICLOG_DYN_L2_GAS = 3;
+export const AVM_EMITNOTEHASH_BASE_DA_GAS = 32;
+export const AVM_EMITNULLIFIER_BASE_DA_GAS = 32;
+export const AVM_SENDL2TOL1MSG_BASE_DA_GAS = 32;
+export const AVM_EMITPUBLICLOG_BASE_DA_GAS = 64;
+export const AVM_EMITPUBLICLOG_DYN_DA_GAS = 32;
+export const AVM_SSTORE_DYN_DA_GAS = 64;
 export const TX_START_PREFIX = 2624615704;
 export const BLOCK_END_PREFIX = 3951939007;
 export const CHECKPOINT_END_PREFIX = 2355328067;
@@ -483,10 +494,10 @@ 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 = 8857725174171741160013581538021104168730942281584695363072221389187184558934n;
 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 = 7219963955978612430652135562469971022121082503142071142433583613738272177170n;
 export const AVM_RETRIEVED_BYTECODES_TREE_INITIAL_SIZE = 1;
 export const TIMESTAMP_OF_CHANGE_BIT_SIZE = 32;
 export const DEFAULT_UPDATE_DELAY = 86400;
@@ -500,28 +511,49 @@ export const UPDATES_DELAYED_PUBLIC_MUTABLE_METADATA_BIT_SIZE = 144;
 export const GRUMPKIN_ONE_X = 1;
 export const GRUMPKIN_ONE_Y = 17631683881184975370165255887551781615748388533673675138860n;
 export const DEFAULT_MAX_DEBUG_LOG_MEMORY_READS = 125000;
-export enum GeneratorIndex {
+export const MAX_TX_BLOB_DATA_SIZE_IN_FIELDS = 8475;
+export enum DomainSeparator {
   NOTE_HASH = 116501019,
-  NOTE_HASH_NONCE = 1721808740,
-  UNIQUE_NOTE_HASH = 226850429,
+  PARTIAL_NOTE_COMMITMENT = 568912195,
   SILOED_NOTE_HASH = 3361878420,
+  UNIQUE_NOTE_HASH = 226850429,
+  NOTE_HASH_NONCE = 1721808740,
+  SINGLE_USE_CLAIM_NULLIFIER = 1465998995,
   NOTE_NULLIFIER = 50789342,
-  MESSAGE_NULLIFIER = 3754509616,
   SILOED_NULLIFIER = 57496191,
+  MESSAGE_NULLIFIER = 3754509616,
+  EVENT_LOG_TAG = 926040838,
+  NOTE_COMPLETION_LOG_TAG = 3372669888,
+  UNCONSTRAINED_MSG_LOG_TAG = 1485357192,
+  CONSTRAINED_MSG_LOG_TAG = 3715244738,
+  CONSTRAINED_MSG_NULLIFIER = 3723577546,
+  CONSTRAINED_MSG_SENDER_SECRET = 1182889476,
+  NON_INTERACTIVE_HANDSHAKE_LOG_TAG = 4046403018,
+  INTERACTIVE_HANDSHAKE_SIGNATURE = 3098455647,
+  HANDSHAKE_FORGERY_PROTECTION = 2291983127,
   PRIVATE_LOG_FIRST_FIELD = 2769976252,
   PUBLIC_LEAF_SLOT = 1247650290,
   PUBLIC_STORAGE_MAP_SLOT = 4015149901,
+  MERKLE_HASH = 2982624097,
+  NULLIFIER_MERKLE = 1157584160,
+  PUBLIC_DATA_MERKLE = 3756303423,
+  WRITTEN_SLOTS_MERKLE = 2292766212,
+  RETRIEVED_BYTECODES_MERKLE = 2789215184,
   PRIVATE_FUNCTION_LEAF = 1389398688,
   PUBLIC_BYTECODE = 260313585,
   CONTRACT_CLASS_ID = 3923495515,
+  SALTED_INITIALIZATION_HASH = 2763052992,
   INITIALIZER = 385396519,
   NHK_M = 242137788,
   IVSK_M = 2747825907,
   OVSK_M = 4272201051,
   TSK_M = 1546190975,
+  MSSK_M = 617962565,
+  FBSK_M = 787738027,
   PUBLIC_KEYS_HASH = 777457226,
+  SINGLE_PUBLIC_KEY_HASH = 3452068255,
   PARTIAL_ADDRESS = 2103633018,
-  CONTRACT_ADDRESS_V1 = 1788365517,
+  CONTRACT_ADDRESS_V2 = 4099338721,
   BLOCK_HEADER_HASH = 4195546849,
   TX_REQUEST = 3763737512,
   PUBLIC_TX_HASH = 1630108851,
@@ -533,11 +565,20 @@ export enum GeneratorIndex {
   AUTHWIT_INNER = 221354163,
   AUTHWIT_OUTER = 3283595782,
   AUTHWIT_NULLIFIER = 1239150694,
-  SYMMETRIC_KEY = 3882206064,
-  SYMMETRIC_KEY_2 = 4129434989,
+  APP_SILOED_ECDH_SHARED_SECRET = 1707851664,
+  ECDH_SUBKEY = 4277646631,
+  ECDH_FIELD_MASK = 190532684,
   PARTIAL_NOTE_VALIDITY_COMMITMENT = 623934423,
   INITIALIZATION_NULLIFIER = 1653084894,
+  PUBLIC_INITIALIZATION_NULLIFIER = 3342006647,
+  PRIVATE_INITIALIZATION_NULLIFIER = 3990889078,
   SECRET_HASH = 4199652938,
   TX_NULLIFIER = 1025801951,
   SIGNATURE_PAYLOAD = 463525807,
+  BLOCK_HEADERS_HASH = 515582467,
+  BLOB_HASHED_Y_LIMBS = 2949331415,
+  BLOB_CHALLENGE_Z = 60345710,
+  BLOB_Z_ACC = 1003392952,
+  BLOB_GAMMA_ACC = 855632775,
+  BLOB_GAMMA_FINAL = 1755883835,
 }