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

package/dest/constants.gen.js

@@ -1,5 +1,7 @@
 // GENERATED FILE - DO NOT EDIT, RUN yarn remake-constants
 export const MAX_FIELD_VALUE = 21888242871839275222246405745257275088548364400416034343698204186575808495616n;
+export const MAX_ETH_ADDRESS_BIT_SIZE = 160;
+export const MAX_ETH_ADDRESS_VALUE = 1461501637330902918203684832716283019655932542975n;
 export const MAX_U64_VALUE = 18446744073709551615n;
 export const MAX_U32_VALUE = 4294967295;
 export const MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS = 16000;
@@ -10,6 +12,7 @@ export const NOTE_HASH_TREE_HEIGHT = 42;
 export const PUBLIC_DATA_TREE_HEIGHT = 40;
 export const NULLIFIER_TREE_HEIGHT = 42;
 export const L1_TO_L2_MSG_TREE_HEIGHT = 36;
+export const OUT_HASH_TREE_HEIGHT = 5;
 export const ARTIFACT_FUNCTION_TREE_MAX_HEIGHT = 7;
 export const NULLIFIER_TREE_ID = 0;
 export const NOTE_HASH_TREE_ID = 1;
@@ -18,6 +21,7 @@ export const L1_TO_L2_MESSAGE_TREE_ID = 3;
 export const ARCHIVE_TREE_ID = 4;
 export const NOTE_HASH_TREE_LEAF_COUNT = 4398046511104;
 export const L1_TO_L2_MSG_TREE_LEAF_COUNT = 68719476736;
+export const OUT_HASH_TREE_LEAF_COUNT = 32;
 export const NOTE_HASH_SUBTREE_HEIGHT = 6;
 export const NULLIFIER_SUBTREE_HEIGHT = 6;
 export const PUBLIC_DATA_SUBTREE_HEIGHT = 6;
@@ -35,21 +39,21 @@ export const MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 64;
 export const MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX = 63;
 export const MAX_PUBLIC_DATA_READS_PER_TX = 64;
 export const MAX_L2_TO_L1_MSGS_PER_TX = 8;
+export const MAX_PRIVATE_LOGS_PER_TX = 64;
+export const MAX_CONTRACT_CLASS_LOGS_PER_TX = 1;
 export const MAX_NOTE_HASH_READ_REQUESTS_PER_TX = 64;
 export const MAX_NULLIFIER_READ_REQUESTS_PER_TX = 64;
 export const MAX_KEY_VALIDATION_REQUESTS_PER_TX = 64;
-export const MAX_PRIVATE_LOGS_PER_TX = 64;
-export const MAX_CONTRACT_CLASS_LOGS_PER_TX = 1;
 export const MAX_NOTE_HASHES_PER_CALL = 16;
 export const MAX_NULLIFIERS_PER_CALL = 16;
 export const MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL = 8;
 export const MAX_ENQUEUED_CALLS_PER_CALL = 32;
 export const MAX_L2_TO_L1_MSGS_PER_CALL = 8;
+export const MAX_PRIVATE_LOGS_PER_CALL = 16;
+export const MAX_CONTRACT_CLASS_LOGS_PER_CALL = 1;
 export const MAX_NOTE_HASH_READ_REQUESTS_PER_CALL = 16;
 export const MAX_NULLIFIER_READ_REQUESTS_PER_CALL = 16;
 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_VK_INDEX = 0;
 export const PRIVATE_KERNEL_INNER_VK_INDEX = 1;
@@ -92,30 +96,31 @@ export const INITIAL_CHECKPOINT_NUMBER = 1;
 export const INITIAL_L2_BLOCK_NUM = 1;
 export const FIELDS_PER_BLOB = 4096;
 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;
-export const GENESIS_ARCHIVE_ROOT = 14269942583723164841365114274712143548835546030057296325580016468921911294613n;
+export const MAX_CHECKPOINTS_PER_EPOCH = 32;
+export const MAX_TX_LIFETIME = 86400;
+export const GENESIS_BLOCK_HEADER_HASH = 21694244557328181932449230888455310614586084993178835904749768133365362325861n;
+export const GENESIS_ARCHIVE_ROOT = 9682850228538071369704502076456077473410427336083826595120404283897422804423n;
+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;
 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 = 14907836659448373306373608164128296596488873008270905914742877230397948162628n;
+export const CONTRACT_CLASS_REGISTRY_PRIVATE_FUNCTION_BROADCASTED_MAGIC_VALUE = 6632427679359753950122686582223287785801228472790519808071945107172278003224n;
+export const CONTRACT_CLASS_REGISTRY_UTILITY_FUNCTION_BROADCASTED_MAGIC_VALUE = 2863388930963370662477859081312917957786876946407365497018765359301074232169n;
+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_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 ROUTER_ADDRESS = 6;
-export const SIDE_EFFECT_MASKING_ADDRESS = 12;
+export const PUBLIC_CHECKS_ADDRESS = 6;
+export const SIDE_EFFECT_MASKING_ADDRESS = 19523154334483583633304358390644137470227519736821975910774528428729027989987n;
 export const NULL_MSG_SENDER_CONTRACT_ADDRESS = 21888242871839275222246405745257275088548364400416034343698204186575808495616n;
-export const CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT = 79025834455612;
+export const CONTRACT_CLASS_REGISTRY_BYTECODE_CAPSULE_SLOT = 14193106819744442689484501689686180698286338820089744102289275815863062044599n;
 export const FEE_JUICE_BALANCES_SLOT = 1;
 export const UPDATED_CLASS_IDS_SLOT = 1;
 export const DEFAULT_NPK_M_X = 582240093077765400562621227108555700500271598878376310175765873770292988861n;
@@ -131,7 +136,6 @@ 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 CONTENT_COMMITMENT_LENGTH = 3;
 export const CONTRACT_INSTANCE_LENGTH = 16;
 export const CONTRACT_STORAGE_READ_LENGTH = 3;
 export const CONTRACT_STORAGE_UPDATE_REQUEST_LENGTH = 3;
@@ -159,11 +163,11 @@ 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 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;
@@ -192,48 +196,47 @@ 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 BLOCK_HEADER_LENGTH_BYTES = 616;
 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_CIRCUIT_PUBLIC_INPUTS_LENGTH = 870;
 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 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_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 = 2873;
+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;
 export const EPOCH_CONSTANT_DATA_LENGTH = 5;
 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 BLOCK_ROLLUP_PUBLIC_INPUTS_LENGTH = 56;
+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 = 457;
-export const NESTED_RECURSIVE_PROOF_LENGTH = 457;
+export const RECURSIVE_PROOF_LENGTH = 449;
+export const NESTED_RECURSIVE_PROOF_LENGTH = 449;
 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_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 = 1632;
 export const ULTRA_VK_LENGTH_IN_FIELDS = 115;
 export const MEGA_VK_LENGTH_IN_FIELDS = 127;
 export const CHONK_VK_LENGTH_IN_FIELDS = 127;
@@ -250,9 +253,9 @@ export const MEM_TAG_U128 = 6;
 export const AVM_HIGHEST_MEM_ADDRESS = 4294967295;
 export const AVM_MEMORY_NUM_BITS = 32;
 export const AVM_MEMORY_SIZE = 4294967296;
-export const AVM_BITWISE_AND_OP_ID = 0;
-export const AVM_BITWISE_OR_OP_ID = 1;
-export const AVM_BITWISE_XOR_OP_ID = 2;
+export const AVM_BITWISE_AND_OP_ID = 1;
+export const AVM_BITWISE_OR_OP_ID = 2;
+export const AVM_BITWISE_XOR_OP_ID = 4;
 export const AVM_KECCAKF1600_NUM_ROUNDS = 24;
 export const AVM_KECCAKF1600_STATE_SIZE = 25;
 export const AVM_TX_PHASE_VALUE_START = 0;
@@ -266,7 +269,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;
@@ -276,7 +279,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;
@@ -380,23 +383,26 @@ 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_PROOF_LENGTH_IN_FIELDS_PADDED = 16400;
 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;
-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 AVM_MAX_PROCESSABLE_L2_GAS = 6000000;
+export const MAX_PROCESSABLE_L2_GAS = 6540000;
+export const MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT = 786432;
+export const GAS_ESTIMATION_TEARDOWN_L2_GAS_LIMIT = 6540000;
+export const GAS_ESTIMATION_L2_GAS_LIMIT = 13080000;
+export const GAS_ESTIMATION_TEARDOWN_DA_GAS_LIMIT = 786432;
+export const GAS_ESTIMATION_DA_GAS_LIMIT = 1572864;
 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 DEFAULT_L2_GAS_LIMIT = 6540000;
+export const DEFAULT_TEARDOWN_DA_GAS_LIMIT = 393216;
+export const DEFAULT_DA_GAS_LIMIT = 786432;
 export const L2_GAS_DISTRIBUTED_STORAGE_PREMIUM = 1024;
 export const AVM_PC_SIZE_IN_BITS = 32;
 export const AVM_MAX_OPERANDS = 7;
@@ -404,11 +410,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;
@@ -439,12 +445,12 @@ 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_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 = 418;
+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;
@@ -459,16 +465,16 @@ export const AVM_CALLDATACOPY_DYN_L2_GAS = 3;
 export const AVM_RETURNDATACOPY_DYN_L2_GAS = 3;
 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 TX_START_PREFIX = 8392562855083340404n;
-export const BLOCK_END_PREFIX = 1815594492414860291684n;
-export const CHECKPOINT_END_PREFIX = 2016229657840014237853300314959460n;
+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;
 export const PROOF_TYPE_HONK = 0;
 export const PROOF_TYPE_OINK = 1;
 export const PROOF_TYPE_HN = 2;
@@ -497,43 +503,45 @@ 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 var GeneratorIndex = /*#__PURE__*/ function(GeneratorIndex) {
-    GeneratorIndex[GeneratorIndex["NOTE_HASH"] = 1] = "NOTE_HASH";
-    GeneratorIndex[GeneratorIndex["NOTE_HASH_NONCE"] = 2] = "NOTE_HASH_NONCE";
-    GeneratorIndex[GeneratorIndex["UNIQUE_NOTE_HASH"] = 3] = "UNIQUE_NOTE_HASH";
-    GeneratorIndex[GeneratorIndex["SILOED_NOTE_HASH"] = 4] = "SILOED_NOTE_HASH";
-    GeneratorIndex[GeneratorIndex["NOTE_NULLIFIER"] = 53] = "NOTE_NULLIFIER";
-    GeneratorIndex[GeneratorIndex["OUTER_NULLIFIER"] = 7] = "OUTER_NULLIFIER";
-    GeneratorIndex[GeneratorIndex["PUBLIC_LEAF_INDEX"] = 23] = "PUBLIC_LEAF_INDEX";
-    GeneratorIndex[GeneratorIndex["MESSAGE_NULLIFIER"] = 5] = "MESSAGE_NULLIFIER";
-    GeneratorIndex[GeneratorIndex["FUNCTION_LEAF"] = 11] = "FUNCTION_LEAF";
-    GeneratorIndex[GeneratorIndex["PUBLIC_BYTECODE"] = 60] = "PUBLIC_BYTECODE";
-    GeneratorIndex[GeneratorIndex["CONTRACT_CLASS_ID"] = 16] = "CONTRACT_CLASS_ID";
-    GeneratorIndex[GeneratorIndex["CONSTRUCTOR"] = 13] = "CONSTRUCTOR";
-    GeneratorIndex[GeneratorIndex["NSK_M"] = 48] = "NSK_M";
-    GeneratorIndex[GeneratorIndex["IVSK_M"] = 49] = "IVSK_M";
-    GeneratorIndex[GeneratorIndex["OVSK_M"] = 50] = "OVSK_M";
-    GeneratorIndex[GeneratorIndex["TSK_M"] = 51] = "TSK_M";
-    GeneratorIndex[GeneratorIndex["PUBLIC_KEYS_HASH"] = 52] = "PUBLIC_KEYS_HASH";
-    GeneratorIndex[GeneratorIndex["PARTIAL_ADDRESS"] = 27] = "PARTIAL_ADDRESS";
-    GeneratorIndex[GeneratorIndex["CONTRACT_ADDRESS_V1"] = 15] = "CONTRACT_ADDRESS_V1";
-    GeneratorIndex[GeneratorIndex["BLOCK_HASH"] = 28] = "BLOCK_HASH";
-    GeneratorIndex[GeneratorIndex["TX_REQUEST"] = 33] = "TX_REQUEST";
-    GeneratorIndex[GeneratorIndex["PUBLIC_TX_HASH"] = 56] = "PUBLIC_TX_HASH";
-    GeneratorIndex[GeneratorIndex["PRIVATE_TX_HASH"] = 57] = "PRIVATE_TX_HASH";
-    GeneratorIndex[GeneratorIndex["PUBLIC_CALLDATA"] = 43] = "PUBLIC_CALLDATA";
-    GeneratorIndex[GeneratorIndex["FUNCTION_ARGS"] = 44] = "FUNCTION_ARGS";
-    GeneratorIndex[GeneratorIndex["PROTOCOL_CONTRACTS"] = 61] = "PROTOCOL_CONTRACTS";
-    GeneratorIndex[GeneratorIndex["EVENT_COMMITMENT"] = 59] = "EVENT_COMMITMENT";
-    GeneratorIndex[GeneratorIndex["AUTHWIT_INNER"] = 45] = "AUTHWIT_INNER";
-    GeneratorIndex[GeneratorIndex["AUTHWIT_OUTER"] = 46] = "AUTHWIT_OUTER";
-    GeneratorIndex[GeneratorIndex["AUTHWIT_NULLIFIER"] = 47] = "AUTHWIT_NULLIFIER";
-    GeneratorIndex[GeneratorIndex["SYMMETRIC_KEY"] = 54] = "SYMMETRIC_KEY";
-    GeneratorIndex[GeneratorIndex["SYMMETRIC_KEY_2"] = 55] = "SYMMETRIC_KEY_2";
-    GeneratorIndex[GeneratorIndex["PARTIAL_NOTE_VALIDITY_COMMITMENT"] = 58] = "PARTIAL_NOTE_VALIDITY_COMMITMENT";
-    GeneratorIndex[GeneratorIndex["INITIALIZATION_NULLIFIER"] = 6] = "INITIALIZATION_NULLIFIER";
-    GeneratorIndex[GeneratorIndex["SECRET_HASH"] = 20] = "SECRET_HASH";
-    GeneratorIndex[GeneratorIndex["TX_NULLIFIER"] = 32] = "TX_NULLIFIER";
-    GeneratorIndex[GeneratorIndex["SIGNATURE_PAYLOAD"] = 34] = "SIGNATURE_PAYLOAD";
-    return GeneratorIndex;
+export var DomainSeparator = /*#__PURE__*/ function(DomainSeparator) {
+    DomainSeparator[DomainSeparator["NOTE_HASH"] = 116501019] = "NOTE_HASH";
+    DomainSeparator[DomainSeparator["NOTE_HASH_NONCE"] = 1721808740] = "NOTE_HASH_NONCE";
+    DomainSeparator[DomainSeparator["UNIQUE_NOTE_HASH"] = 226850429] = "UNIQUE_NOTE_HASH";
+    DomainSeparator[DomainSeparator["SILOED_NOTE_HASH"] = 3361878420] = "SILOED_NOTE_HASH";
+    DomainSeparator[DomainSeparator["NOTE_NULLIFIER"] = 50789342] = "NOTE_NULLIFIER";
+    DomainSeparator[DomainSeparator["MESSAGE_NULLIFIER"] = 3754509616] = "MESSAGE_NULLIFIER";
+    DomainSeparator[DomainSeparator["SILOED_NULLIFIER"] = 57496191] = "SILOED_NULLIFIER";
+    DomainSeparator[DomainSeparator["PRIVATE_LOG_FIRST_FIELD"] = 2769976252] = "PRIVATE_LOG_FIRST_FIELD";
+    DomainSeparator[DomainSeparator["PUBLIC_LEAF_SLOT"] = 1247650290] = "PUBLIC_LEAF_SLOT";
+    DomainSeparator[DomainSeparator["PUBLIC_STORAGE_MAP_SLOT"] = 4015149901] = "PUBLIC_STORAGE_MAP_SLOT";
+    DomainSeparator[DomainSeparator["PRIVATE_FUNCTION_LEAF"] = 1389398688] = "PRIVATE_FUNCTION_LEAF";
+    DomainSeparator[DomainSeparator["PUBLIC_BYTECODE"] = 260313585] = "PUBLIC_BYTECODE";
+    DomainSeparator[DomainSeparator["CONTRACT_CLASS_ID"] = 3923495515] = "CONTRACT_CLASS_ID";
+    DomainSeparator[DomainSeparator["INITIALIZER"] = 385396519] = "INITIALIZER";
+    DomainSeparator[DomainSeparator["NHK_M"] = 242137788] = "NHK_M";
+    DomainSeparator[DomainSeparator["IVSK_M"] = 2747825907] = "IVSK_M";
+    DomainSeparator[DomainSeparator["OVSK_M"] = 4272201051] = "OVSK_M";
+    DomainSeparator[DomainSeparator["TSK_M"] = 1546190975] = "TSK_M";
+    DomainSeparator[DomainSeparator["PUBLIC_KEYS_HASH"] = 777457226] = "PUBLIC_KEYS_HASH";
+    DomainSeparator[DomainSeparator["PARTIAL_ADDRESS"] = 2103633018] = "PARTIAL_ADDRESS";
+    DomainSeparator[DomainSeparator["CONTRACT_ADDRESS_V1"] = 1788365517] = "CONTRACT_ADDRESS_V1";
+    DomainSeparator[DomainSeparator["BLOCK_HEADER_HASH"] = 4195546849] = "BLOCK_HEADER_HASH";
+    DomainSeparator[DomainSeparator["TX_REQUEST"] = 3763737512] = "TX_REQUEST";
+    DomainSeparator[DomainSeparator["PUBLIC_TX_HASH"] = 1630108851] = "PUBLIC_TX_HASH";
+    DomainSeparator[DomainSeparator["PRIVATE_TX_HASH"] = 1971680439] = "PRIVATE_TX_HASH";
+    DomainSeparator[DomainSeparator["PUBLIC_CALLDATA"] = 2760353947] = "PUBLIC_CALLDATA";
+    DomainSeparator[DomainSeparator["FUNCTION_ARGS"] = 3576554347] = "FUNCTION_ARGS";
+    DomainSeparator[DomainSeparator["PROTOCOL_CONTRACTS"] = 3904434327] = "PROTOCOL_CONTRACTS";
+    DomainSeparator[DomainSeparator["EVENT_COMMITMENT"] = 2517418573] = "EVENT_COMMITMENT";
+    DomainSeparator[DomainSeparator["AUTHWIT_INNER"] = 221354163] = "AUTHWIT_INNER";
+    DomainSeparator[DomainSeparator["AUTHWIT_OUTER"] = 3283595782] = "AUTHWIT_OUTER";
+    DomainSeparator[DomainSeparator["AUTHWIT_NULLIFIER"] = 1239150694] = "AUTHWIT_NULLIFIER";
+    DomainSeparator[DomainSeparator["SYMMETRIC_KEY"] = 3882206064] = "SYMMETRIC_KEY";
+    DomainSeparator[DomainSeparator["SYMMETRIC_KEY_2"] = 4129434989] = "SYMMETRIC_KEY_2";
+    DomainSeparator[DomainSeparator["PARTIAL_NOTE_VALIDITY_COMMITMENT"] = 623934423] = "PARTIAL_NOTE_VALIDITY_COMMITMENT";
+    DomainSeparator[DomainSeparator["INITIALIZATION_NULLIFIER"] = 1653084894] = "INITIALIZATION_NULLIFIER";
+    DomainSeparator[DomainSeparator["SECRET_HASH"] = 4199652938] = "SECRET_HASH";
+    DomainSeparator[DomainSeparator["TX_NULLIFIER"] = 1025801951] = "TX_NULLIFIER";
+    DomainSeparator[DomainSeparator["SIGNATURE_PAYLOAD"] = 463525807] = "SIGNATURE_PAYLOAD";
+    return DomainSeparator;
 }({});

package/dest/constants.js

@@ -6,13 +6,13 @@ import { GENESIS_BLOCK_HEADER_HASH as GENESIS_BLOCK_HEADER_HASH_BIGINT, INITIAL_
 // Typescript-land-only constants
 export const SPONSORED_FPC_SALT = BigInt(0);
 // Autogenerated constants loaded from noir-land
-// eslint-disable-next-line import/export
+// eslint-disable-next-line import-x/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
+// eslint-disable-next-line import-x/export
 export const INITIAL_L2_BLOCK_NUM = 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(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
+// eslint-disable-next-line import-x/export
 export const GENESIS_BLOCK_HEADER_HASH = new Fr(GENESIS_BLOCK_HEADER_HASH_BIGINT);

package/dest/scripts/constants.in.js

@@ -9,6 +9,8 @@ const SOLIDITY_CONSTANTS_FILE = '../../../../l1-contracts/src/core/libraries/Con
 // 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 = [
+    'MAX_ETH_ADDRESS_BIT_SIZE',
+    'MAX_ETH_ADDRESS_VALUE',
     'GENESIS_BLOCK_HEADER_HASH',
     'GENESIS_ARCHIVE_ROOT',
     'MEM_TAG_U1',
@@ -24,7 +26,8 @@ const CPP_CONSTANTS = [
     'CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS',
     'MULTI_CALL_ENTRYPOINT_ADDRESS',
     'FEE_JUICE_ADDRESS',
-    'ROUTER_ADDRESS',
+    'TX_DA_GAS_OVERHEAD',
+    'PUBLIC_CHECKS_ADDRESS',
     'FEE_JUICE_BALANCES_SLOT',
     'UPDATED_CLASS_IDS_SLOT',
     'UPDATES_DELAYED_PUBLIC_MUTABLE_VALUES_LEN',
@@ -40,6 +43,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',
@@ -107,10 +111,12 @@ 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',
     'PARTIAL_ADDRESS',
     'CONTRACT_ADDRESS_V1',
     'CONTRACT_CLASS_ID',
@@ -118,12 +124,14 @@ const CPP_GENERATORS = [
     'NOTE_HASH_NONCE',
     'UNIQUE_NOTE_HASH',
     'SILOED_NOTE_HASH',
-    'OUTER_NULLIFIER',
-    'PUBLIC_LEAF_INDEX',
+    'SILOED_NULLIFIER',
+    'PUBLIC_LEAF_SLOT',
+    'PUBLIC_STORAGE_MAP_SLOT',
     'PUBLIC_CALLDATA',
     'PUBLIC_BYTECODE'
 ];
 const PIL_CONSTANTS = [
+    'MAX_ETH_ADDRESS_VALUE',
     'MEM_TAG_U1',
     'MEM_TAG_U8',
     'MEM_TAG_U16',
@@ -159,7 +167,7 @@ const PIL_CONSTANTS = [
     'CONTRACT_CLASS_REGISTRY_CONTRACT_ADDRESS',
     'MULTI_CALL_ENTRYPOINT_ADDRESS',
     'FEE_JUICE_ADDRESS',
-    'ROUTER_ADDRESS',
+    'PUBLIC_CHECKS_ADDRESS',
     'FEE_JUICE_BALANCES_SLOT',
     'TIMESTAMP_OF_CHANGE_BIT_SIZE',
     'UPDATES_DELAYED_PUBLIC_MUTABLE_METADATA_BIT_SIZE',
@@ -243,10 +251,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',
@@ -302,14 +310,16 @@ const PIL_GENERATORS = [
     'NOTE_HASH_NONCE',
     'UNIQUE_NOTE_HASH',
     'SILOED_NOTE_HASH',
-    'OUTER_NULLIFIER',
-    'PUBLIC_LEAF_INDEX',
+    'SILOED_NULLIFIER',
+    'PUBLIC_LEAF_SLOT',
+    'PUBLIC_STORAGE_MAP_SLOT',
     'PUBLIC_CALLDATA',
     'PUBLIC_BYTECODE'
 ];
 const SOLIDITY_CONSTANTS = [
     'MAX_FIELD_VALUE',
     'MAX_L2_TO_L1_MSGS_PER_TX',
+    'EMPTY_EPOCH_OUT_HASH',
     'L1_TO_L2_MSG_SUBTREE_HEIGHT',
     'NUM_MSGS_PER_BASE_PARITY',
     'NUM_BASE_PARITY_PER_ROOT_PARITY',
@@ -318,7 +328,7 @@ const SOLIDITY_CONSTANTS = [
     'INITIAL_CHECKPOINT_NUMBER',
     'GENESIS_ARCHIVE_ROOT',
     'FEE_JUICE_ADDRESS',
-    'AZTEC_MAX_EPOCH_DURATION'
+    'MAX_CHECKPOINTS_PER_EPOCH'
 ];
 /**
  * Processes a collection of constants and generates code to export them as TypeScript constants.
@@ -353,7 +363,7 @@ const SOLIDITY_CONSTANTS = [
     });
     Object.entries(generatorIndices).forEach(([key, value])=>{
         if (CPP_GENERATORS.includes(key)) {
-            code.push(`#define DOM_SEP__${key} ${value}`);
+            code.push(`#define DOM_SEP__${key} ${value}UL`);
         }
     });
     return code.join('\n');
@@ -410,30 +420,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);
 }
@@ -463,7 +473,7 @@ ${processConstantsSolidity(constants)}
  * Parse the content of the constants file in Noir.
  */ function parseNoirFile(fileContent) {
     const constantsExpressions = [];
-    const generatorIndexEnum = {};
+    const domainSeparatorEnum = {};
     const emptyExpression = ()=>({
             name: '',
             content: []
@@ -485,7 +495,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([
@@ -533,7 +543,7 @@ ${processConstantsSolidity(constants)}
     const constants = evaluateExpressions(constantsExpressions);
     return {
         constants,
-        generatorIndexEnum
+        domainSeparatorEnum
     };
 }
 /**
@@ -560,7 +570,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};`;