@aztec/stdlib 0.0.1-commit.d431d1c → 0.0.1-commit.d58ff9d0

package/dest/config/network-consensus-config.js

@@ -0,0 +1,223 @@
+import { l1ContractsConfigMappings, validateSlotDurations } from '@aztec/ethereum/config';
+import { pickConfigMappings } from '@aztec/foundation/config';
+import { DEFAULT_CHECKPOINT_PROPOSAL_INIT_TIME, DEFAULT_CHECKPOINT_PROPOSAL_PREPARE_TIME, DEFAULT_MIN_BLOCK_DURATION, DEFAULT_P2P_PROPAGATION_TIME } from '../timetable/budgets.js';
+import { ProposerTimetable } from '../timetable/proposer_timetable.js';
+import { sharedSequencerConfigMappings } from './sequencer-config.js';
+/**
+ * Environment variables whose values must be identical across every node of a network. They fall into three
+ * categories, all consensus-critical:
+ *
+ * - Timing/protocol consensus: slot and epoch durations, block sub-slot duration, max blocks per checkpoint, and
+ *   the checkpoint-proposal materialization grace. Proposers and validators must agree on these to land on the
+ *   same proposed chain and the same checkpoint-proposal receive/handoff deadlines.
+ * - Network identity and L1-posted deployment params: the L1 chain id and the staking/governance/slashing
+ *   parameters baked into the deployed rollup contract (committee size, lags, thresholds, mana target, fee
+ *   pricing, governance/slashing round sizes, quorums, slash amounts, etc.). A node disagreeing with the rollup
+ *   it points at would compute the wrong epoch geometry, fees, or slashing rounds.
+ * - Node-side slashing offense consensus: the offense detection/penalty parameters validators apply locally to
+ *   decide which payloads to sign. Validators must agree on these to reach the on-chain slashing quorum.
+ *
+ * Deliberately excluded: bootnodes, P2P/store/OTEL/sentinel settings, SEQ_MIN_TX_PER_BLOCK, SEQ_MAX_TX_PER_*,
+ * AZTEC_SLASHER_ENABLED, PROVER_REAL_PROOFS, TRANSACTIONS_DISABLED, and AZTEC_ENTRY_QUEUE_* (mainnet-only genesis
+ * params enforced by L1).
+ */ export const NETWORK_CONSENSUS_ENV_VARS = [
+    // Timing/protocol consensus.
+    'ETHEREUM_SLOT_DURATION',
+    'AZTEC_SLOT_DURATION',
+    'AZTEC_EPOCH_DURATION',
+    'SEQ_BLOCK_DURATION_MS',
+    'MAX_BLOCKS_PER_CHECKPOINT',
+    'CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS',
+    // Network identity / L1-posted deployment params.
+    'L1_CHAIN_ID',
+    'AZTEC_TARGET_COMMITTEE_SIZE',
+    'AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET',
+    'AZTEC_LAG_IN_EPOCHS_FOR_RANDAO',
+    'AZTEC_ACTIVATION_THRESHOLD',
+    'AZTEC_EJECTION_THRESHOLD',
+    'AZTEC_LOCAL_EJECTION_THRESHOLD',
+    'AZTEC_EXIT_DELAY_SECONDS',
+    'AZTEC_INBOX_LAG',
+    'AZTEC_PROOF_SUBMISSION_EPOCHS',
+    'AZTEC_MANA_TARGET',
+    'AZTEC_PROVING_COST_PER_MANA',
+    'AZTEC_INITIAL_ETH_PER_FEE_ASSET',
+    'AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE',
+    'AZTEC_GOVERNANCE_PROPOSER_QUORUM',
+    'AZTEC_SLASHING_QUORUM',
+    'AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS',
+    'AZTEC_SLASHING_LIFETIME_IN_ROUNDS',
+    'AZTEC_SLASHING_OFFSET_IN_ROUNDS',
+    'AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS',
+    'AZTEC_SLASHING_VETOER',
+    'AZTEC_SLASHING_DISABLE_DURATION',
+    'AZTEC_SLASH_AMOUNT_SMALL',
+    'AZTEC_SLASH_AMOUNT_MEDIUM',
+    'AZTEC_SLASH_AMOUNT_LARGE',
+    // Node-side slashing offense consensus.
+    'SLASH_OFFENSE_EXPIRATION_ROUNDS',
+    'SLASH_MAX_PAYLOAD_SIZE',
+    'SLASH_EXECUTE_ROUNDS_LOOK_BACK',
+    'SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS',
+    'SLASH_DATA_WITHHOLDING_PENALTY',
+    'SLASH_INACTIVITY_TARGET_PERCENTAGE',
+    'SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD',
+    'SLASH_INACTIVITY_PENALTY',
+    'SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY',
+    'SLASH_DUPLICATE_PROPOSAL_PENALTY',
+    'SLASH_DUPLICATE_ATTESTATION_PENALTY',
+    'SLASH_PROPOSE_DESCENDANT_OF_CHECKPOINT_WITH_INVALID_ATTESTATIONS_PENALTY',
+    'SLASH_ATTEST_INVALID_CHECKPOINT_PROPOSAL_PENALTY',
+    'SLASH_UNKNOWN_PENALTY',
+    'SLASH_INVALID_BLOCK_PENALTY',
+    'SLASH_INVALID_CHECKPOINT_PROPOSAL_PENALTY',
+    'SLASH_GRACE_PERIOD_L2_SLOTS'
+];
+/** Config mappings for the slot-timing fields of {@link NetworkConsensusConfig}, picked from their owners. */ const networkConsensusConfigMappings = {
+    ...pickConfigMappings(l1ContractsConfigMappings, [
+        'aztecSlotDuration',
+        'ethereumSlotDuration'
+    ]),
+    ...pickConfigMappings(sharedSequencerConfigMappings, [
+        'blockDurationMs',
+        'maxBlocksPerCheckpoint',
+        'checkpointProposalSyncGraceSeconds'
+    ])
+};
+/**
+ * Extracts the timing {@link NetworkConsensusConfig} from a generated network config object. The env-var names
+ * and the per-field parsing both come from the canonical config mappings (`l1ContractsConfigMappings` and
+ * `sharedSequencerConfigMappings`), so each field is parsed exactly as the node's config layer would parse it.
+ * A field whose env var is absent becomes `NaN`, which {@link validateNetworkConsensusConfig} reports as an
+ * error. Never throws: parse helpers that would throw or yield `undefined` are coerced to `NaN`.
+ */ export function getConsensusConfigFromNetworkEnv(values) {
+    const result = {};
+    for (const [field, mapping] of Object.entries(networkConsensusConfigMappings)){
+        const raw = mapping.env !== undefined ? values[mapping.env] : undefined;
+        if (raw === undefined) {
+            result[field] = NaN;
+            continue;
+        }
+        let parsed;
+        try {
+            parsed = mapping.parseEnv ? mapping.parseEnv(String(raw)) : Number(raw);
+        } catch  {
+            parsed = NaN;
+        }
+        result[field] = parsed ?? NaN;
+    }
+    return result;
+}
+/**
+ * Validates a {@link NetworkConsensusConfig} for self-consistency, returning a list of error messages (empty
+ * when valid). Used by the cli unit test that gates the generated network configs.
+ *
+ * The check requires `maxBlocksPerCheckpoint` to be *exactly* what a {@link ProposerTimetable} built from the
+ * same slot timings and the production default budgets derives. This exact-equality requirement ensures the
+ * published network value is precisely what the production default budgets produce, so every node running those
+ * defaults agrees on the per-checkpoint block count without clamping.
+ */ export function validateNetworkConsensusConfig(config) {
+    const errors = [];
+    for (const [field, value] of Object.entries(config)){
+        if (typeof value !== 'number' || !Number.isFinite(value)) {
+            errors.push(`${field} must be a finite number (got ${value})`);
+        }
+    }
+    if (errors.length > 0) {
+        return errors;
+    }
+    errors.push(...validateSlotDurations(config));
+    if (config.blockDurationMs <= 0) {
+        errors.push(`blockDurationMs must be positive (got ${config.blockDurationMs})`);
+    }
+    if (config.blockDurationMs / 1000 > config.aztecSlotDuration) {
+        errors.push(`blockDurationMs (${config.blockDurationMs}ms) exceeds aztecSlotDuration (${config.aztecSlotDuration}s)`);
+    }
+    if (config.maxBlocksPerCheckpoint < 1) {
+        errors.push(`maxBlocksPerCheckpoint must be at least 1 (got ${config.maxBlocksPerCheckpoint})`);
+    }
+    if (config.checkpointProposalSyncGraceSeconds < 0) {
+        errors.push(`checkpointProposalSyncGraceSeconds must be non-negative (got ${config.checkpointProposalSyncGraceSeconds})`);
+    }
+    if (errors.length > 0) {
+        return errors;
+    }
+    let computed;
+    try {
+        computed = new ProposerTimetable({
+            l1Constants: {
+                l1GenesisTime: 0n,
+                slotDuration: config.aztecSlotDuration,
+                ethereumSlotDuration: config.ethereumSlotDuration
+            },
+            blockDuration: config.blockDurationMs / 1000,
+            minBlockDuration: DEFAULT_MIN_BLOCK_DURATION,
+            p2pPropagationTime: DEFAULT_P2P_PROPAGATION_TIME,
+            checkpointProposalPrepareTime: DEFAULT_CHECKPOINT_PROPOSAL_PREPARE_TIME,
+            checkpointProposalInitTime: DEFAULT_CHECKPOINT_PROPOSAL_INIT_TIME,
+            checkpointProposalSyncGrace: config.checkpointProposalSyncGraceSeconds
+        }).getMaxBlocksPerCheckpoint();
+    } catch (err) {
+        // The timetable constructor throws when not even one block fits the default budgets; report instead.
+        errors.push(`maxBlocksPerCheckpoint (${config.maxBlocksPerCheckpoint}) cannot be achieved: the default operational ` + `budgets fit fewer than one block for slot duration ${config.aztecSlotDuration}s and block duration ` + `${config.blockDurationMs / 1000}s (${err instanceof Error ? err.message : String(err)})`);
+        return errors;
+    }
+    if (computed !== config.maxBlocksPerCheckpoint) {
+        errors.push(`maxBlocksPerCheckpoint (${config.maxBlocksPerCheckpoint}) does not match the ${computed} blocks the ` + `production default budgets derive for slot duration ${config.aztecSlotDuration}s and block duration ` + `${config.blockDurationMs / 1000}s`);
+    }
+    return errors;
+}
+/**
+ * Enforces that operators do not silently override consensus-critical values diverging from the network config.
+ *
+ * For each var in {@link NETWORK_CONSENSUS_ENV_VARS} present in `networkConfig`: if the operator set it in `env`
+ * to a conflicting value, this throws unless `ALLOW_OVERRIDING_NETWORK_CONFIG` is truthy (in which case it logs
+ * and keeps the operator value).
+ *
+ * This function is pure: it never writes to `env`. Instead it returns the canonical env writes the caller
+ * should apply — a map of env-var name to canonical string value for every numeric var whose env value matched
+ * the network value numerically. Applying these closes a bypass where the config layer parses some vars with
+ * `parseInt` (which reads '6e3' as 6); rewriting them to the network value's string form keeps the operator's
+ * numerically-equal value but in canonical form. Vars kept under `ALLOW_OVERRIDING_NETWORK_CONFIG` (genuine
+ * conflicts) are not included, so the operator value is preserved untouched.
+ *
+ * @returns Canonical env writes (env-var name -> canonical string value) for the caller to apply.
+ */ export function checkConsensusEnvOverrides(networkConfig, env = process.env, log) {
+    const allowOverride = allowsNetworkConfigOverride(env);
+    const canonical = {};
+    const conflicts = [];
+    for (const envVar of NETWORK_CONSENSUS_ENV_VARS){
+        const networkValue = networkConfig[envVar];
+        if (networkValue === undefined) {
+            continue;
+        }
+        const current = env[envVar];
+        if (current === undefined || current === '') {
+            continue;
+        }
+        const networkIsNumeric = typeof networkValue === 'number';
+        const matches = networkIsNumeric ? Number(current) === networkValue : current === String(networkValue);
+        if (matches) {
+            if (networkIsNumeric) {
+                canonical[envVar] = String(networkValue);
+            }
+            continue;
+        }
+        const conflict = `${envVar}=${current} conflicts with the network value ${networkValue}`;
+        if (allowOverride) {
+            log?.(`Environment variable ${conflict}. Consensus-critical values must match across the network, but ` + `ALLOW_OVERRIDING_NETWORK_CONFIG is set so the operator value is kept (only do this if you know what ` + `you are doing).`);
+            continue;
+        }
+        conflicts.push(conflict);
+    }
+    // Accumulate every conflict so the operator sees all the env vars they need to reconcile at once, rather than
+    // fixing them one failed startup at a time.
+    if (conflicts.length > 0) {
+        throw new Error(`Environment variables conflict with consensus-critical network values:\n` + conflicts.map((c)=>`  - ${c}`).join('\n') + `\nConsensus-critical values must match across the network. Set ALLOW_OVERRIDING_NETWORK_CONFIG=1 to ` + `override (only do this if you know what you are doing).`);
+    }
+    return canonical;
+}
+/** Whether the env opts into overriding network-wide consensus values (`ALLOW_OVERRIDING_NETWORK_CONFIG`). */ export function allowsNetworkConfigOverride(env = process.env) {
+    const value = env.ALLOW_OVERRIDING_NETWORK_CONFIG;
+    return value === '1' || value?.toLowerCase() === 'true';
+}

package/dest/config/node-rpc-config.js

@@ -19,6 +19,6 @@ export const nodeRpcConfigMappings = {
     rpcMaxBodySize: {
         env: 'RPC_MAX_BODY_SIZE',
         description: 'Maximum allowed batch size for JSON RPC batch requests.',
-        defaultValue: '50mb'
+        defaultValue: '1mb'
     }
 };

package/dest/config/sequencer-config.d.ts

@@ -0,0 +1,16 @@
+import { type ConfigMappingsType } from '@aztec/foundation/config';
+import type { SequencerConfig } from '../interfaces/configs.js';
+/** Default duration per block in milliseconds, used to derive how many blocks fit in a slot. */
+export declare const DEFAULT_BLOCK_DURATION_MS: number;
+/** Default maximum number of transactions per block. */
+export declare const DEFAULT_MAX_TXS_PER_BLOCK = 32;
+/** Default maximum number of blocks the sequencer packs into a single checkpoint. */
+export declare const DEFAULT_MAX_BLOCKS_PER_CHECKPOINT = 24;
+/**
+ * Partial sequencer config mappings for fields that need to be shared across packages.
+ * The full sequencer config mappings remain in sequencer-client, but shared fields
+ * (like blockDurationMs needed by both p2p and sequencer-client) are defined here
+ * to avoid duplication.
+ */
+export declare const sharedSequencerConfigMappings: ConfigMappingsType<Pick<SequencerConfig, 'blockDurationMs' | 'checkpointProposalSyncGraceSeconds' | 'expectedBlockProposalsPerSlot' | 'maxTxsPerBlock' | 'attestationPropagationTime' | 'checkpointProposalPrepareTime' | 'minBlockDuration' | 'maxBlocksPerCheckpoint'>>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VxdWVuY2VyLWNvbmZpZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbmZpZy9zZXF1ZW5jZXItY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxLQUFLLGtCQUFrQixFQUl4QixNQUFNLDBCQUEwQixDQUFDO0FBRWxDLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBU2hFLGdHQUFnRztBQUNoRyxlQUFPLE1BQU0seUJBQXlCLFFBQWdDLENBQUM7QUFFdkUsd0RBQXdEO0FBQ3hELGVBQU8sTUFBTSx5QkFBeUIsS0FBSyxDQUFDO0FBRTVDLHFGQUFxRjtBQUNyRixlQUFPLE1BQU0saUNBQWlDLEtBQUssQ0FBQztBQUVwRDs7Ozs7R0FLRztBQUNILGVBQU8sTUFBTSw2QkFBNkIsRUFBRSxrQkFBa0IsQ0FDNUQsSUFBSSxDQUNGLGVBQWUsRUFDYixpQkFBaUIsR0FDakIsb0NBQW9DLEdBQ3BDLCtCQUErQixHQUMvQixnQkFBZ0IsR0FDaEIsNEJBQTRCLEdBQzVCLCtCQUErQixHQUMvQixrQkFBa0IsR0FDbEIsd0JBQXdCLENBQzNCLENBcURGLENBQUMifQ==

package/dest/config/sequencer-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sequencer-config.d.ts","sourceRoot":"","sources":["../../src/config/sequencer-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAShE,gGAAgG;AAChG,eAAO,MAAM,yBAAyB,QAAgC,CAAC;AAEvE,wDAAwD;AACxD,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAE5C,qFAAqF;AACrF,eAAO,MAAM,iCAAiC,KAAK,CAAC;AAEpD;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,EAAE,kBAAkB,CAC5D,IAAI,CACF,eAAe,EACb,iBAAiB,GACjB,oCAAoC,GACpC,+BAA+B,GAC/B,gBAAgB,GAChB,4BAA4B,GAC5B,+BAA+B,GAC/B,kBAAkB,GAClB,wBAAwB,CAC3B,CAqDF,CAAC"}

package/dest/config/sequencer-config.js

@@ -0,0 +1,57 @@
+import { floatConfigHelper, numberConfigHelper, optionalNumberConfigHelper } from '@aztec/foundation/config';
+import { DEFAULT_BLOCK_DURATION, DEFAULT_CHECKPOINT_PROPOSAL_PREPARE_TIME, DEFAULT_MIN_BLOCK_DURATION, DEFAULT_P2P_PROPAGATION_TIME, getDefaultCheckpointProposalSyncGrace } from '../timetable/index.js';
+/** Default duration per block in milliseconds, used to derive how many blocks fit in a slot. */ export const DEFAULT_BLOCK_DURATION_MS = DEFAULT_BLOCK_DURATION * 1000;
+/** Default maximum number of transactions per block. */ export const DEFAULT_MAX_TXS_PER_BLOCK = 32;
+/** Default maximum number of blocks the sequencer packs into a single checkpoint. */ export const DEFAULT_MAX_BLOCKS_PER_CHECKPOINT = 24;
+/**
+ * Partial sequencer config mappings for fields that need to be shared across packages.
+ * The full sequencer config mappings remain in sequencer-client, but shared fields
+ * (like blockDurationMs needed by both p2p and sequencer-client) are defined here
+ * to avoid duplication.
+ */ export const sharedSequencerConfigMappings = {
+    blockDurationMs: {
+        env: 'SEQ_BLOCK_DURATION_MS',
+        description: 'Duration per block in milliseconds, used to derive how many blocks fit in a slot.',
+        ...numberConfigHelper(DEFAULT_BLOCK_DURATION_MS)
+    },
+    expectedBlockProposalsPerSlot: {
+        env: 'SEQ_EXPECTED_BLOCK_PROPOSALS_PER_SLOT',
+        description: 'Expected number of block proposals per slot for P2P peer scoring. ' + '0 (default) disables block proposal scoring. Set to a positive value to enable.',
+        ...numberConfigHelper(0)
+    },
+    checkpointProposalSyncGraceSeconds: {
+        env: 'CHECKPOINT_PROPOSAL_SYNC_GRACE_SECONDS',
+        description: 'Consensus grace in seconds for a received checkpoint proposal to materialize into local proposed state. ' + 'Defaults to twice the block duration.',
+        defaultValue: getDefaultCheckpointProposalSyncGrace(DEFAULT_BLOCK_DURATION_MS / 1000),
+        ...optionalNumberConfigHelper()
+    },
+    maxTxsPerBlock: {
+        env: 'SEQ_MAX_TX_PER_BLOCK',
+        description: 'The maximum number of txs to include in a block.',
+        ...optionalNumberConfigHelper()
+    },
+    attestationPropagationTime: {
+        env: 'SEQ_ATTESTATION_PROPAGATION_TIME',
+        description: 'How many seconds it takes for proposals and attestations to travel across the p2p layer (one-way).',
+        defaultValue: DEFAULT_P2P_PROPAGATION_TIME,
+        ...floatConfigHelper(DEFAULT_P2P_PROPAGATION_TIME)
+    },
+    checkpointProposalPrepareTime: {
+        env: 'SEQ_CHECKPOINT_PROPOSAL_PREPARE_TIME',
+        description: 'Local time in seconds between the last block build finishing and the checkpoint proposal being ready for p2p send.',
+        defaultValue: DEFAULT_CHECKPOINT_PROPOSAL_PREPARE_TIME,
+        ...floatConfigHelper(DEFAULT_CHECKPOINT_PROPOSAL_PREPARE_TIME)
+    },
+    minBlockDuration: {
+        env: 'SEQ_MIN_BLOCK_DURATION',
+        description: 'Minimum block-building time in seconds still worth allocating if the proposer starts late.',
+        defaultValue: DEFAULT_MIN_BLOCK_DURATION,
+        ...floatConfigHelper(DEFAULT_MIN_BLOCK_DURATION)
+    },
+    maxBlocksPerCheckpoint: {
+        env: 'MAX_BLOCKS_PER_CHECKPOINT',
+        description: 'Maximum number of blocks the sequencer packs into a single checkpoint, and the maximum indexWithinCheckpoint accepted on inbound block proposals.',
+        parseEnv: (val)=>parseInt(val, 10),
+        defaultValue: DEFAULT_MAX_BLOCKS_PER_CHECKPOINT
+    }
+};

package/dest/contract/complete_address.d.ts

@@ -23,10 +23,11 @@ export declare class CompleteAddress {
     static create(address: AztecAddress, publicKeys: PublicKeys, partialAddress: PartialAddress): Promise<CompleteAddress>;
     /** Size in bytes of an instance */
     static readonly SIZE_IN_BYTES: number;
-    static get schema(): import("zod").ZodType<never, any, string>;
+    static get schema(): import("zod").ZodType<never, string, import("zod/v4/core").$ZodTypeInternals<never, string>>;
     toJSON(): string;
     static random(): Promise<CompleteAddress>;
     static fromSecretKeyAndPartialAddress(secretKey: Fr, partialAddress: Fr): Promise<CompleteAddress>;
+    static fromPublicKeysAndPartialAddress(publicKeys: PublicKeys, partialAddress: Fr): Promise<CompleteAddress>;
     getPreaddress(): Promise<Fr>;
     static fromSecretKeyAndInstance(secretKey: Fr, instance: Parameters<typeof computePartialAddress>[0]): Promise<CompleteAddress>;
     /** Throws if the address is not correctly derived from the public key and partial address.*/
@@ -77,4 +78,4 @@ export declare class CompleteAddress {
      */
     toString(): string;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGxldGVfYWRkcmVzcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L2NvbXBsZXRlX2FkZHJlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFHOUUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRDs7Ozs7OztHQU9HO0FBQ0gscUJBQWEsZUFBZTtJQUV4QiwwREFBMEQ7SUFDbkQsT0FBTyxFQUFFLFlBQVk7SUFDNUIsdUJBQXVCO0lBQ2hCLFVBQVUsRUFBRSxVQUFVO0lBQzdCLGtFQUFrRTtJQUMzRCxjQUFjLEVBQUUsY0FBYztJQU52QyxPQUFPLGVBT0g7SUFFSixPQUFhLE1BQU0sQ0FDakIsT0FBTyxFQUFFLFlBQVksRUFDckIsVUFBVSxFQUFFLFVBQVUsRUFDdEIsY0FBYyxFQUFFLGNBQWMsR0FDN0IsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUkxQjtJQUVELG1DQUFtQztJQUNuQyxNQUFNLENBQUMsUUFBUSxDQUFDLGFBQWEsU0FBVztJQUV4QyxNQUFNLEtBQUssTUFBTSw4Q0FFaEI7SUFFRCxNQUFNLFdBRUw7SUFFRCxPQUFhLE1BQU0sSUFBSSxPQUFPLENBQUMsZUFBZSxDQUFDLENBRTlDO0lBRUQsT0FBYSw4QkFBOEIsQ0FBQyxTQUFTLEVBQUUsRUFBRSxFQUFFLGNBQWMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUt2RztJQUVLLGFBQWEsZ0JBRWxCO0lBRUQsT0FBYSx3QkFBd0IsQ0FDbkMsU0FBUyxFQUFFLEVBQUUsRUFDYixRQUFRLEVBQUUsVUFBVSxDQUFDLE9BQU8scUJBQXFCLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FDcEQsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUcxQjtJQUVELDZGQUE2RjtJQUNoRixRQUFRLGtCQVFwQjtJQUVEOzs7T0FHRztJQUNJLGdCQUFnQixJQUFJLE1BQU0sQ0FFaEM7SUFFRDs7Ozs7O09BTUc7SUFDSCxNQUFNLENBQUMsS0FBSyxFQUFFLGVBQWUsR0FBRyxPQUFPLENBTXRDO0lBRUQ7Ozs7O09BS0c7SUFDSCxRQUFRLElBQUksTUFBTSxDQUVqQjtJQUVEOzs7Ozs7O09BT0c7SUFDSCxNQUFNLENBQUMsVUFBVSxDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FNekU7SUFFRDs7Ozs7OztPQU9HO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FFM0Q7SUFFRDs7Ozs7T0FLRztJQUNILFFBQVEsSUFBSSxNQUFNLENBRWpCO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGxldGVfYWRkcmVzcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L2NvbXBsZXRlX2FkZHJlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxZQUFZLEVBQXFCLE1BQU0sNkJBQTZCLENBQUM7QUFHOUUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNwRCxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRDs7Ozs7OztHQU9HO0FBQ0gscUJBQWEsZUFBZTtJQUV4QiwwREFBMEQ7SUFDbkQsT0FBTyxFQUFFLFlBQVk7SUFDNUIsdUJBQXVCO0lBQ2hCLFVBQVUsRUFBRSxVQUFVO0lBQzdCLGtFQUFrRTtJQUMzRCxjQUFjLEVBQUUsY0FBYztJQU52QyxPQUFPLGVBT0g7SUFFSixPQUFhLE1BQU0sQ0FDakIsT0FBTyxFQUFFLFlBQVksRUFDckIsVUFBVSxFQUFFLFVBQVUsRUFDdEIsY0FBYyxFQUFFLGNBQWMsR0FDN0IsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUkxQjtJQUVELG1DQUFtQztJQUVuQyxNQUFNLENBQUMsUUFBUSxDQUFDLGFBQWEsU0FBVTtJQUV2QyxNQUFNLEtBQUssTUFBTSxpR0FFaEI7SUFFRCxNQUFNLFdBRUw7SUFFRCxPQUFhLE1BQU0sSUFBSSxPQUFPLENBQUMsZUFBZSxDQUFDLENBRTlDO0lBRUQsT0FBYSw4QkFBOEIsQ0FBQyxTQUFTLEVBQUUsRUFBRSxFQUFFLGNBQWMsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGVBQWUsQ0FBQyxDQUd2RztJQUVELE9BQWEsK0JBQStCLENBQUMsVUFBVSxFQUFFLFVBQVUsRUFBRSxjQUFjLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FHakg7SUFFSyxhQUFhLGdCQUVsQjtJQUVELE9BQWEsd0JBQXdCLENBQ25DLFNBQVMsRUFBRSxFQUFFLEVBQ2IsUUFBUSxFQUFFLFVBQVUsQ0FBQyxPQUFPLHFCQUFxQixDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQ3BELE9BQU8sQ0FBQyxlQUFlLENBQUMsQ0FHMUI7SUFFRCw2RkFBNkY7SUFDaEYsUUFBUSxrQkFRcEI7SUFFRDs7O09BR0c7SUFDSSxnQkFBZ0IsSUFBSSxNQUFNLENBRWhDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsTUFBTSxDQUFDLEtBQUssRUFBRSxlQUFlLEdBQUcsT0FBTyxDQU10QztJQUVEOzs7OztPQUtHO0lBQ0gsUUFBUSxJQUFJLE1BQU0sQ0FFakI7SUFFRDs7Ozs7OztPQU9HO0lBQ0gsTUFBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFlBQVksR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBTXpFO0lBRUQ7Ozs7Ozs7T0FPRztJQUNILE1BQU0sQ0FBQyxVQUFVLENBQUMsT0FBTyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBRTNEO0lBRUQ7Ozs7O09BS0c7SUFDSCxRQUFRLElBQUksTUFBTSxDQUVqQjtDQUNGIn0=

package/dest/contract/complete_address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"complete_address.d.ts","sourceRoot":"","sources":["../../src/contract/complete_address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D;;;;;;;GAOG;AACH,qBAAa,eAAe;IAExB,0DAA0D;IACnD,OAAO,EAAE,YAAY;IAC5B,uBAAuB;IAChB,UAAU,EAAE,UAAU;IAC7B,kEAAkE;IAC3D,cAAc,EAAE,cAAc;IANvC,OAAO,eAOH;IAEJ,OAAa,MAAM,CACjB,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,eAAe,CAAC,CAI1B;IAED,mCAAmC;IACnC,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAW;IAExC,MAAM,KAAK,MAAM,8CAEhB;IAED,MAAM,WAEL;IAED,OAAa,MAAM,IAAI,OAAO,CAAC,eAAe,CAAC,CAE9C;IAED,OAAa,8BAA8B,CAAC,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAKvG;IAEK,aAAa,gBAElB;IAED,OAAa,wBAAwB,CACnC,SAAS,EAAE,EAAE,EACb,QAAQ,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAAC,GACpD,OAAO,CAAC,eAAe,CAAC,CAG1B;IAED,6FAA6F;IAChF,QAAQ,kBAQpB;IAED;;;OAGG;IACI,gBAAgB,IAAI,MAAM,CAEhC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAMtC;IAED;;;;;OAKG;IACH,QAAQ,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAMzE;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAE3D;IAED;;;;;OAKG;IACH,QAAQ,IAAI,MAAM,CAEjB;CACF"}
+{"version":3,"file":"complete_address.d.ts","sourceRoot":"","sources":["../../src/contract/complete_address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAG9E,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D;;;;;;;GAOG;AACH,qBAAa,eAAe;IAExB,0DAA0D;IACnD,OAAO,EAAE,YAAY;IAC5B,uBAAuB;IAChB,UAAU,EAAE,UAAU;IAC7B,kEAAkE;IAC3D,cAAc,EAAE,cAAc;IANvC,OAAO,eAOH;IAEJ,OAAa,MAAM,CACjB,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,eAAe,CAAC,CAI1B;IAED,mCAAmC;IAEnC,MAAM,CAAC,QAAQ,CAAC,aAAa,SAAU;IAEvC,MAAM,KAAK,MAAM,iGAEhB;IAED,MAAM,WAEL;IAED,OAAa,MAAM,IAAI,OAAO,CAAC,eAAe,CAAC,CAE9C;IAED,OAAa,8BAA8B,CAAC,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAGvG;IAED,OAAa,+BAA+B,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAGjH;IAEK,aAAa,gBAElB;IAED,OAAa,wBAAwB,CACnC,SAAS,EAAE,EAAE,EACb,QAAQ,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC,CAAC,CAAC,GACpD,OAAO,CAAC,eAAe,CAAC,CAG1B;IAED,6FAA6F;IAChF,QAAQ,kBAQpB;IAED;;;OAGG;IACI,gBAAgB,IAAI,MAAM,CAEhC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAMtC;IAED;;;;;OAKG;IACH,QAAQ,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAMzE;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAE3D;IAED;;;;;OAKG;IACH,QAAQ,IAAI,MAAM,CAEjB;CACF"}

package/dest/contract/complete_address.js

@@ -27,7 +27,8 @@ import { computePartialAddress } from './contract_address.js';
         await completeAddress.validate();
         return completeAddress;
     }
-    /** Size in bytes of an instance */ static SIZE_IN_BYTES = 32 * 10;
+    /** Size in bytes of an instance */ // address (1 Fr) + publicKeys (1 Fr hash + 1 Point + 4 Fr hashes = 7 Fr) + partialAddress (1 Fr) = 9 Fr
+    static SIZE_IN_BYTES = 32 * 9;
     static get schema() {
         return hexSchemaFor(CompleteAddress);
     }
@@ -39,6 +40,9 @@ import { computePartialAddress } from './contract_address.js';
     }
     static async fromSecretKeyAndPartialAddress(secretKey, partialAddress) {
         const { publicKeys } = await deriveKeys(secretKey);
+        return await this.fromPublicKeysAndPartialAddress(publicKeys, partialAddress);
+    }
+    static async fromPublicKeysAndPartialAddress(publicKeys, partialAddress) {
         const address = await computeAddress(publicKeys, partialAddress);
         return new CompleteAddress(address, publicKeys, partialAddress);
     }
@@ -59,7 +63,7 @@ import { computePartialAddress } from './contract_address.js';
    * Gets a readable string representation of the complete address.
    * @returns A readable string representation of the complete address.
    */ toReadableString() {
-        return `Address: ${this.address.toString()}\nMaster Nullifier Public Key: ${this.publicKeys.masterNullifierPublicKey.toString()}\nMaster Incoming Viewing Public Key: ${this.publicKeys.masterIncomingViewingPublicKey.toString()}\nMaster Outgoing Viewing Public Key: ${this.publicKeys.masterOutgoingViewingPublicKey.toString()}\nMaster Tagging Public Key: ${this.publicKeys.masterTaggingPublicKey.toString()}\nPartial Address: ${this.partialAddress.toString()}\n`;
+        return `Address: ${this.address.toString()}\nNpkM hash: ${this.publicKeys.npkMHash.toString()}\nIvpkM: ${this.publicKeys.ivpkM.toString()}\nOvpkM hash: ${this.publicKeys.ovpkMHash.toString()}\nTpkM hash: ${this.publicKeys.tpkMHash.toString()}\nMspkM hash: ${this.publicKeys.mspkMHash.toString()}\nFbpkM hash: ${this.publicKeys.fbpkMHash.toString()}\nPartial Address: ${this.partialAddress.toString()}\n`;
     }
     /**
    * Determines if this CompleteAddress instance is equal to the given CompleteAddress instance.

package/dest/contract/contract_address.d.ts

@@ -1,17 +1,18 @@
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { type FunctionAbi, FunctionSelector } from '../abi/index.js';
 import type { AztecAddress } from '../aztec-address/index.js';
-import type { ContractInstance } from './interfaces/contract_instance.js';
+import type { ContractInstance, ContractInstancePreimage } from './interfaces/contract_instance.js';
+import type { PartialAddress } from './partial_address.js';
 /**
  * Returns the deployment address for a given contract instance.
  * ```
- * salted_initialization_hash = pedersen([salt, initialization_hash, deployer], GENERATOR__SALTED_INITIALIZATION_HASH)
- * partial_address = pedersen([contract_class_id, salted_initialization_hash], GENERATOR__CONTRACT_PARTIAL_ADDRESS_V1)
- * address = ((poseidon2Hash([public_keys_hash, partial_address, GENERATOR__CONTRACT_ADDRESS_V1]) * G) + ivpk_m).x <- the x-coordinate of the address point
+ * salted_initialization_hash = poseidon2(DOM_SEP__SALTED_INITIALIZATION_HASH, [salt, initialization_hash, deployer, immutables_hash])
+ * partial_address = poseidon2(DOM_SEP__PARTIAL_ADDRESS, [contract_class_id, salted_initialization_hash])
+ * address = ((poseidon2(DOM_SEP__CONTRACT_ADDRESS_V2, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
  * ```
  * @param instance - A contract instance for which to calculate the deployment address.
  */
-export declare function computeContractAddressFromInstance(instance: ContractInstance | ({
+export declare function computeContractAddressFromInstance(instance: ContractInstancePreimage | ({
     originalContractClassId: Fr;
     saltedInitializationHash: Fr;
 } & Pick<ContractInstance, 'publicKeys'>)): Promise<AztecAddress>;
@@ -19,15 +20,15 @@ export declare function computeContractAddressFromInstance(instance: ContractIns
  * Computes the partial address defined as the hash of the contract class id and salted initialization hash.
  * @param instance - Contract instance for which to calculate the partial address.
  */
-export declare function computePartialAddress(instance: Pick<ContractInstance, 'originalContractClassId' | 'initializationHash' | 'salt' | 'deployer'> | {
+export declare function computePartialAddress(instance: Pick<ContractInstance, 'originalContractClassId' | 'initializationHash' | 'salt' | 'deployer' | 'immutablesHash'> | {
     originalContractClassId: Fr;
     saltedInitializationHash: Fr;
-}): Promise<Fr>;
+}): Promise<PartialAddress>;
 /**
  * Computes the salted initialization hash for an address, defined as the hash of the salt and initialization hash.
  * @param instance - Contract instance for which to compute the salted initialization hash.
  */
-export declare function computeSaltedInitializationHash(instance: Pick<ContractInstance, 'initializationHash' | 'salt' | 'deployer'>): Promise<Fr>;
+export declare function computeSaltedInitializationHash(instance: Pick<ContractInstance, 'initializationHash' | 'salt' | 'deployer' | 'immutablesHash'>): Promise<Fr>;
 /**
  * Computes the initialization hash for an instance given its constructor function and arguments.
  * @param initFn - Constructor function or empty if no initialization is expected.
@@ -42,4 +43,4 @@ export declare function computeInitializationHash(initFn: FunctionAbi | undefine
  * @returns The hash.
  */
 export declare function computeInitializationHashFromEncodedArgs(initFn: FunctionSelector, encodedArgs: Fr[]): Promise<Fr>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfYWRkcmVzcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L2NvbnRyYWN0X2FkZHJlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBRSxnQkFBZ0IsRUFBbUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN0RixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUc5RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBSTFFOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGtDQUFrQyxDQUN0RCxRQUFRLEVBQ0osZ0JBQWdCLEdBQ2hCLENBQUM7SUFBRSx1QkFBdUIsRUFBRSxFQUFFLENBQUM7SUFBQyx3QkFBd0IsRUFBRSxFQUFFLENBQUE7Q0FBRSxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxZQUFZLENBQUMsQ0FBQyxHQUN6RyxPQUFPLENBQUMsWUFBWSxDQUFDLENBR3ZCO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHFCQUFxQixDQUN6QyxRQUFRLEVBQ0osSUFBSSxDQUFDLGdCQUFnQixFQUFFLHlCQUF5QixHQUFHLG9CQUFvQixHQUFHLE1BQU0sR0FBRyxVQUFVLENBQUMsR0FDOUY7SUFBRSx1QkFBdUIsRUFBRSxFQUFFLENBQUM7SUFBQyx3QkFBd0IsRUFBRSxFQUFFLENBQUE7Q0FBRSxHQUNoRSxPQUFPLENBQUMsRUFBRSxDQUFDLENBVWI7QUFFRDs7O0dBR0c7QUFDSCx3QkFBZ0IsK0JBQStCLENBQzdDLFFBQVEsRUFBRSxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsb0JBQW9CLEdBQUcsTUFBTSxHQUFHLFVBQVUsQ0FBQyxHQUMzRSxPQUFPLENBQUMsRUFBRSxDQUFDLENBS2I7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFzQix5QkFBeUIsQ0FBQyxNQUFNLEVBQUUsV0FBVyxHQUFHLFNBQVMsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQU96RztBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQXNCLHdDQUF3QyxDQUM1RCxNQUFNLEVBQUUsZ0JBQWdCLEVBQ3hCLFdBQVcsRUFBRSxFQUFFLEVBQUUsR0FDaEIsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUdiIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfYWRkcmVzcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L2NvbnRyYWN0X2FkZHJlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXBELE9BQU8sRUFBRSxLQUFLLFdBQVcsRUFBRSxnQkFBZ0IsRUFBbUIsTUFBTSxpQkFBaUIsQ0FBQztBQUN0RixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUc5RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSx3QkFBd0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBQ3BHLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBSTNEOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGtDQUFrQyxDQUN0RCxRQUFRLEVBQ0osd0JBQXdCLEdBQ3hCLENBQUM7SUFBRSx1QkFBdUIsRUFBRSxFQUFFLENBQUM7SUFBQyx3QkFBd0IsRUFBRSxFQUFFLENBQUE7Q0FBRSxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxZQUFZLENBQUMsQ0FBQyxHQUN6RyxPQUFPLENBQUMsWUFBWSxDQUFDLENBR3ZCO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHFCQUFxQixDQUN6QyxRQUFRLEVBQ0osSUFBSSxDQUFDLGdCQUFnQixFQUFFLHlCQUF5QixHQUFHLG9CQUFvQixHQUFHLE1BQU0sR0FBRyxVQUFVLEdBQUcsZ0JBQWdCLENBQUMsR0FDakg7SUFBRSx1QkFBdUIsRUFBRSxFQUFFLENBQUM7SUFBQyx3QkFBd0IsRUFBRSxFQUFFLENBQUE7Q0FBRSxHQUNoRSxPQUFPLENBQUMsY0FBYyxDQUFDLENBVXpCO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLCtCQUErQixDQUM3QyxRQUFRLEVBQUUsSUFBSSxDQUFDLGdCQUFnQixFQUFFLG9CQUFvQixHQUFHLE1BQU0sR0FBRyxVQUFVLEdBQUcsZ0JBQWdCLENBQUMsR0FDOUYsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUtiO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBc0IseUJBQXlCLENBQUMsTUFBTSxFQUFFLFdBQVcsR0FBRyxTQUFTLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FPekc7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFzQix3Q0FBd0MsQ0FDNUQsTUFBTSxFQUFFLGdCQUFnQixFQUN4QixXQUFXLEVBQUUsRUFBRSxFQUFFLEdBQ2hCLE9BQU8sQ0FBQyxFQUFFLENBQUMsQ0FHYiJ9

package/dest/contract/contract_address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_address.d.ts","sourceRoot":"","sources":["../../src/contract/contract_address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,KAAK,WAAW,EAAE,gBAAgB,EAAmB,MAAM,iBAAiB,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAI1E;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CACtD,QAAQ,EACJ,gBAAgB,GAChB,CAAC;IAAE,uBAAuB,EAAE,EAAE,CAAC;IAAC,wBAAwB,EAAE,EAAE,CAAA;CAAE,GAAG,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,GACzG,OAAO,CAAC,YAAY,CAAC,CAGvB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EACJ,IAAI,CAAC,gBAAgB,EAAE,yBAAyB,GAAG,oBAAoB,GAAG,MAAM,GAAG,UAAU,CAAC,GAC9F;IAAE,uBAAuB,EAAE,EAAE,CAAC;IAAC,wBAAwB,EAAE,EAAE,CAAA;CAAE,GAChE,OAAO,CAAC,EAAE,CAAC,CAUb;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,oBAAoB,GAAG,MAAM,GAAG,UAAU,CAAC,GAC3E,OAAO,CAAC,EAAE,CAAC,CAKb;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAOzG;AAED;;;;;GAKG;AACH,wBAAsB,wCAAwC,CAC5D,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,EAAE,EAAE,GAChB,OAAO,CAAC,EAAE,CAAC,CAGb"}
+{"version":3,"file":"contract_address.d.ts","sourceRoot":"","sources":["../../src/contract/contract_address.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,KAAK,WAAW,EAAE,gBAAgB,EAAmB,MAAM,iBAAiB,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,mCAAmC,CAAC;AACpG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CACtD,QAAQ,EACJ,wBAAwB,GACxB,CAAC;IAAE,uBAAuB,EAAE,EAAE,CAAC;IAAC,wBAAwB,EAAE,EAAE,CAAA;CAAE,GAAG,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,GACzG,OAAO,CAAC,YAAY,CAAC,CAGvB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EACJ,IAAI,CAAC,gBAAgB,EAAE,yBAAyB,GAAG,oBAAoB,GAAG,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAC,GACjH;IAAE,uBAAuB,EAAE,EAAE,CAAC;IAAC,wBAAwB,EAAE,EAAE,CAAA;CAAE,GAChE,OAAO,CAAC,cAAc,CAAC,CAUzB;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAAE,oBAAoB,GAAG,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAC,GAC9F,OAAO,CAAC,EAAE,CAAC,CAKb;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAOzG;AAED;;;;;GAKG;AACH,wBAAsB,wCAAwC,CAC5D,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,EAAE,EAAE,GAChB,OAAO,CAAC,EAAE,CAAC,CAGb"}

package/dest/contract/contract_address.js

@@ -1,4 +1,4 @@
-import { GeneratorIndex } from '@aztec/constants';
+import { DomainSeparator } from '@aztec/constants';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { FunctionSelector, encodeArguments } from '../abi/index.js';
@@ -8,9 +8,9 @@ import { computeAddress } from '../keys/index.js';
 /**
  * Returns the deployment address for a given contract instance.
  * ```
- * salted_initialization_hash = pedersen([salt, initialization_hash, deployer], GENERATOR__SALTED_INITIALIZATION_HASH)
- * partial_address = pedersen([contract_class_id, salted_initialization_hash], GENERATOR__CONTRACT_PARTIAL_ADDRESS_V1)
- * address = ((poseidon2Hash([public_keys_hash, partial_address, GENERATOR__CONTRACT_ADDRESS_V1]) * G) + ivpk_m).x <- the x-coordinate of the address point
+ * salted_initialization_hash = poseidon2(DOM_SEP__SALTED_INITIALIZATION_HASH, [salt, initialization_hash, deployer, immutables_hash])
+ * partial_address = poseidon2(DOM_SEP__PARTIAL_ADDRESS, [contract_class_id, salted_initialization_hash])
+ * address = ((poseidon2(DOM_SEP__CONTRACT_ADDRESS_V2, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
  * ```
  * @param instance - A contract instance for which to calculate the deployment address.
  */ export async function computeContractAddressFromInstance(instance) {
@@ -25,7 +25,7 @@ import { computeAddress } from '../keys/index.js';
     return poseidon2HashWithSeparator([
         instance.originalContractClassId,
         saltedInitializationHash
-    ], GeneratorIndex.PARTIAL_ADDRESS);
+    ], DomainSeparator.PARTIAL_ADDRESS);
 }
 /**
  * Computes the salted initialization hash for an address, defined as the hash of the salt and initialization hash.
@@ -34,8 +34,9 @@ import { computeAddress } from '../keys/index.js';
     return poseidon2HashWithSeparator([
         instance.salt,
         instance.initializationHash,
-        instance.deployer
-    ], GeneratorIndex.PARTIAL_ADDRESS);
+        instance.deployer,
+        instance.immutablesHash
+    ], DomainSeparator.SALTED_INITIALIZATION_HASH);
 }
 /**
  * Computes the initialization hash for an instance given its constructor function and arguments.
@@ -60,5 +61,5 @@ import { computeAddress } from '../keys/index.js';
     return poseidon2HashWithSeparator([
         initFn,
         argsHash
-    ], GeneratorIndex.CONSTRUCTOR);
+    ], DomainSeparator.INITIALIZER);
 }

package/dest/contract/contract_class.d.ts

@@ -3,7 +3,7 @@ import { type ContractArtifact, type FunctionArtifact } from '../abi/index.js';
 import { type ContractClassIdPreimage } from './contract_class_id.js';
 import type { ContractClass, ContractClassWithId } from './interfaces/index.js';
 /** Contract artifact including its artifact hash */
-type ContractArtifactWithHash = ContractArtifact & {
+export type ContractArtifactWithHash = ContractArtifact & {
     artifactHash: Fr;
 };
 /** Creates a ContractClass from a contract compilation artifact. */
@@ -13,5 +13,4 @@ export declare function getContractClassPrivateFunctionFromArtifact(f: FunctionA
  * For a given private function, computes the hash of its vk.
  */
 export declare function computeVerificationKeyHash(f: FunctionArtifact): Promise<Fr>;
-export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdF9jbGFzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQUUsS0FBSyxnQkFBZ0IsRUFBa0MsTUFBTSxpQkFBaUIsQ0FBQztBQUcvRyxPQUFPLEVBQUUsS0FBSyx1QkFBdUIsRUFBc0MsTUFBTSx3QkFBd0IsQ0FBQztBQUMxRyxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVoRixvREFBb0Q7QUFDcEQsS0FBSyx3QkFBd0IsR0FBRyxnQkFBZ0IsR0FBRztJQUFFLFlBQVksRUFBRSxFQUFFLENBQUE7Q0FBRSxDQUFDO0FBS3hFLG9FQUFvRTtBQUNwRSx3QkFBc0IsNEJBQTRCLENBQ2hELFFBQVEsRUFBRSxnQkFBZ0IsR0FBRyx3QkFBd0IsR0FDcEQsT0FBTyxDQUFDLG1CQUFtQixHQUFHLHVCQUF1QixDQUFDLENBMEJ4RDtBQUVELHdCQUFzQiwyQ0FBMkMsQ0FDL0QsQ0FBQyxFQUFFLGdCQUFnQixHQUNsQixPQUFPLENBQUMsYUFBYSxDQUFDLGtCQUFrQixDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FLcEQ7QUFFRDs7R0FFRztBQUNILHdCQUFzQiwwQkFBMEIsQ0FBQyxDQUFDLEVBQUUsZ0JBQWdCLGVBS25FIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdF9jbGFzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFcEQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQUUsS0FBSyxnQkFBZ0IsRUFBa0MsTUFBTSxpQkFBaUIsQ0FBQztBQUcvRyxPQUFPLEVBQUUsS0FBSyx1QkFBdUIsRUFBc0MsTUFBTSx3QkFBd0IsQ0FBQztBQUMxRyxPQUFPLEtBQUssRUFBRSxhQUFhLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVoRixvREFBb0Q7QUFDcEQsTUFBTSxNQUFNLHdCQUF3QixHQUFHLGdCQUFnQixHQUFHO0lBQUUsWUFBWSxFQUFFLEVBQUUsQ0FBQTtDQUFFLENBQUM7QUFLL0Usb0VBQW9FO0FBQ3BFLHdCQUFzQiw0QkFBNEIsQ0FDaEQsUUFBUSxFQUFFLGdCQUFnQixHQUFHLHdCQUF3QixHQUNwRCxPQUFPLENBQUMsbUJBQW1CLEdBQUcsdUJBQXVCLENBQUMsQ0EwQnhEO0FBRUQsd0JBQXNCLDJDQUEyQyxDQUMvRCxDQUFDLEVBQUUsZ0JBQWdCLEdBQ2xCLE9BQU8sQ0FBQyxhQUFhLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUtwRDtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLDBCQUEwQixDQUFDLENBQUMsRUFBRSxnQkFBZ0IsZUFLbkUifQ==

package/dest/contract/contract_class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_class.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAkC,MAAM,iBAAiB,CAAC;AAG/G,OAAO,EAAE,KAAK,uBAAuB,EAAsC,MAAM,wBAAwB,CAAC;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,oDAAoD;AACpD,KAAK,wBAAwB,GAAG,gBAAgB,GAAG;IAAE,YAAY,EAAE,EAAE,CAAA;CAAE,CAAC;AAKxE,oEAAoE;AACpE,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,gBAAgB,GAAG,wBAAwB,GACpD,OAAO,CAAC,mBAAmB,GAAG,uBAAuB,CAAC,CA0BxD;AAED,wBAAsB,2CAA2C,CAC/D,CAAC,EAAE,gBAAgB,GAClB,OAAO,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAKpD;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,CAAC,EAAE,gBAAgB,eAKnE"}
+{"version":3,"file":"contract_class.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAkC,MAAM,iBAAiB,CAAC;AAG/G,OAAO,EAAE,KAAK,uBAAuB,EAAsC,MAAM,wBAAwB,CAAC;AAC1G,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEhF,oDAAoD;AACpD,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GAAG;IAAE,YAAY,EAAE,EAAE,CAAA;CAAE,CAAC;AAK/E,oEAAoE;AACpE,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,gBAAgB,GAAG,wBAAwB,GACpD,OAAO,CAAC,mBAAmB,GAAG,uBAAuB,CAAC,CA0BxD;AAED,wBAAsB,2CAA2C,CAC/D,CAAC,EAAE,gBAAgB,GAClB,OAAO,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAKpD;AAED;;GAEG;AACH,wBAAsB,0BAA0B,CAAC,CAAC,EAAE,gBAAgB,eAKnE"}

package/dest/contract/contract_class.js

@@ -1,4 +1,5 @@
-import { vkAsFieldsMegaHonk } from '@aztec/foundation/crypto/keys';
+import { CircuitKind } from '@aztec/bb.js';
+import { vkAsFields } from '@aztec/foundation/crypto/keys';
 import { FunctionSelector, FunctionType } from '../abi/index.js';
 import { hashVK } from '../hash/hash.js';
 import { computeArtifactHash } from './artifact_hash.js';
@@ -37,5 +38,5 @@ export async function getContractClassPrivateFunctionFromArtifact(f) {
     if (!f.verificationKey) {
         throw new Error(`Private function ${f.name} must have a verification key`);
     }
-    return hashVK(await vkAsFieldsMegaHonk(Buffer.from(f.verificationKey, 'base64')));
+    return hashVK(await vkAsFields(Buffer.from(f.verificationKey, 'base64'), CircuitKind.App));
 }

package/dest/contract/contract_class_id.d.ts

@@ -5,10 +5,10 @@ import type { ContractClass } from './interfaces/contract_class.js';
  *
  * ```
  * version = 1
- * private_function_leaves = private_functions.map(fn => pedersen([fn.function_selector as Field, fn.vk_hash], GENERATOR__FUNCTION_LEAF))
+ * private_function_leaves = private_functions.map(fn => poseidon2(DOM_SEP__PRIVATE_FUNCTION_LEAF, [fn.function_selector as Field, fn.vk_hash]))
  * private_functions_root = merkleize(private_function_leaves)
  * bytecode_commitment = calculate_commitment(packed_bytecode)
- * contract_class_id = pedersen([version, artifact_hash, private_functions_root, bytecode_commitment], GENERATOR__CLASS_IDENTIFIER)
+ * contract_class_id = poseidon2(DOM_SEP__CONTRACT_CLASS_ID, [version, artifact_hash, private_functions_root, bytecode_commitment])
  * ```
  * @param contractClass - Contract class.
  * @returns The identifier.
@@ -27,4 +27,4 @@ export type ContractClassIdPreimage = {
     publicBytecodeCommitment: Fr;
 };
 export declare function computePublicBytecodeCommitment(packedBytecode: Buffer): Promise<Fr>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3NfaWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdF9jbGFzc19pZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFLcEQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEU7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gsd0JBQXNCLHNCQUFzQixDQUFDLGFBQWEsRUFBRSxhQUFhLEdBQUcsdUJBQXVCLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUVoSDtBQUVELDJFQUEyRTtBQUMzRSx3QkFBc0Isa0NBQWtDLENBQ3RELGFBQWEsRUFBRSxhQUFhLEdBQUcsdUJBQXVCLEdBQ3JELE9BQU8sQ0FBQyx1QkFBdUIsR0FBRztJQUFFLEVBQUUsRUFBRSxFQUFFLENBQUE7Q0FBRSxDQUFDLENBZS9DO0FBRUQsMEVBQTBFO0FBQzFFLHdCQUFzQiw4QkFBOEIsQ0FBQyxhQUFhLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUluSDtBQUVELHVDQUF1QztBQUN2QyxNQUFNLE1BQU0sdUJBQXVCLEdBQUc7SUFDcEMsWUFBWSxFQUFFLEVBQUUsQ0FBQztJQUNqQixvQkFBb0IsRUFBRSxFQUFFLENBQUM7SUFDekIsd0JBQXdCLEVBQUUsRUFBRSxDQUFDO0NBQzlCLENBQUM7QUFFRix3QkFBc0IsK0JBQStCLENBQUMsY0FBYyxFQUFFLE1BQU0sZUFjM0UifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3NfaWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdF9jbGFzc19pZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFLcEQsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFHcEU7Ozs7Ozs7Ozs7OztHQVlHO0FBQ0gsd0JBQXNCLHNCQUFzQixDQUFDLGFBQWEsRUFBRSxhQUFhLEdBQUcsdUJBQXVCLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUVoSDtBQUVELDJFQUEyRTtBQUMzRSx3QkFBc0Isa0NBQWtDLENBQ3RELGFBQWEsRUFBRSxhQUFhLEdBQUcsdUJBQXVCLEdBQ3JELE9BQU8sQ0FBQyx1QkFBdUIsR0FBRztJQUFFLEVBQUUsRUFBRSxFQUFFLENBQUE7Q0FBRSxDQUFDLENBZS9DO0FBRUQsMEVBQTBFO0FBQzFFLHdCQUFzQiw4QkFBOEIsQ0FBQyxhQUFhLEVBQUUsYUFBYSxHQUFHLE9BQU8sQ0FBQyx1QkFBdUIsQ0FBQyxDQUluSDtBQUVELHVDQUF1QztBQUN2QyxNQUFNLE1BQU0sdUJBQXVCLEdBQUc7SUFDcEMsWUFBWSxFQUFFLEVBQUUsQ0FBQztJQUNqQixvQkFBb0IsRUFBRSxFQUFFLENBQUM7SUFDekIsd0JBQXdCLEVBQUUsRUFBRSxDQUFDO0NBQzlCLENBQUM7QUFFRix3QkFBc0IsK0JBQStCLENBQUMsY0FBYyxFQUFFLE1BQU0sZUFlM0UifQ==

package/dest/contract/contract_class_id.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_class_id.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class_id.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAKpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGpE;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAAC,aAAa,EAAE,aAAa,GAAG,uBAAuB,GAAG,OAAO,CAAC,EAAE,CAAC,CAEhH;AAED,2EAA2E;AAC3E,wBAAsB,kCAAkC,CACtD,aAAa,EAAE,aAAa,GAAG,uBAAuB,GACrD,OAAO,CAAC,uBAAuB,GAAG;IAAE,EAAE,EAAE,EAAE,CAAA;CAAE,CAAC,CAe/C;AAED,0EAA0E;AAC1E,wBAAsB,8BAA8B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAInH;AAED,uCAAuC;AACvC,MAAM,MAAM,uBAAuB,GAAG;IACpC,YAAY,EAAE,EAAE,CAAC;IACjB,oBAAoB,EAAE,EAAE,CAAC;IACzB,wBAAwB,EAAE,EAAE,CAAC;CAC9B,CAAC;AAEF,wBAAsB,+BAA+B,CAAC,cAAc,EAAE,MAAM,eAc3E"}
+{"version":3,"file":"contract_class_id.d.ts","sourceRoot":"","sources":["../../src/contract/contract_class_id.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAKpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAGpE;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAAC,aAAa,EAAE,aAAa,GAAG,uBAAuB,GAAG,OAAO,CAAC,EAAE,CAAC,CAEhH;AAED,2EAA2E;AAC3E,wBAAsB,kCAAkC,CACtD,aAAa,EAAE,aAAa,GAAG,uBAAuB,GACrD,OAAO,CAAC,uBAAuB,GAAG;IAAE,EAAE,EAAE,EAAE,CAAA;CAAE,CAAC,CAe/C;AAED,0EAA0E;AAC1E,wBAAsB,8BAA8B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAInH;AAED,uCAAuC;AACvC,MAAM,MAAM,uBAAuB,GAAG;IACpC,YAAY,EAAE,EAAE,CAAC;IACjB,oBAAoB,EAAE,EAAE,CAAC;IACzB,wBAAwB,EAAE,EAAE,CAAC;CAC9B,CAAC;AAEF,wBAAsB,+BAA+B,CAAC,cAAc,EAAE,MAAM,eAe3E"}

package/dest/contract/contract_class_id.js

@@ -1,4 +1,4 @@
-import { GeneratorIndex, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS } from '@aztec/constants';
+import { DomainSeparator, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS } from '@aztec/constants';
 import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { strict as assert } from 'assert';
@@ -9,10 +9,10 @@ import { computePrivateFunctionsRoot } from './private_function.js';
  *
  * ```
  * version = 1
- * private_function_leaves = private_functions.map(fn => pedersen([fn.function_selector as Field, fn.vk_hash], GENERATOR__FUNCTION_LEAF))
+ * private_function_leaves = private_functions.map(fn => poseidon2(DOM_SEP__PRIVATE_FUNCTION_LEAF, [fn.function_selector as Field, fn.vk_hash]))
  * private_functions_root = merkleize(private_function_leaves)
  * bytecode_commitment = calculate_commitment(packed_bytecode)
- * contract_class_id = pedersen([version, artifact_hash, private_functions_root, bytecode_commitment], GENERATOR__CLASS_IDENTIFIER)
+ * contract_class_id = poseidon2(DOM_SEP__CONTRACT_CLASS_ID, [version, artifact_hash, private_functions_root, bytecode_commitment])
  * ```
  * @param contractClass - Contract class.
  * @returns The identifier.
@@ -27,7 +27,7 @@ import { computePrivateFunctionsRoot } from './private_function.js';
         artifactHash,
         privateFunctionsRoot,
         publicBytecodeCommitment
-    ], GeneratorIndex.CONTRACT_CLASS_ID);
+    ], DomainSeparator.CONTRACT_CLASS_ID);
     return {
         id,
         artifactHash,
@@ -45,12 +45,13 @@ import { computePrivateFunctionsRoot } from './private_function.js';
     };
 }
 export async function computePublicBytecodeCommitment(packedBytecode) {
-    // Encode the buffer into field elements (chunked into 32 bytes each)
+    // Encode the buffer into field elements (chunked into 31 bytes each)
     // The first element is the length of the bytecode (in bytes)
     const [bytecodeLengthAsField, ...bytecodeAsFields] = bufferAsFields(packedBytecode, MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS);
     const bytecodeLength = Math.ceil(bytecodeLengthAsField.toNumber() / (Fr.SIZE_IN_BYTES - 1));
     assert(bytecodeLength < MAX_PACKED_PUBLIC_BYTECODE_SIZE_IN_FIELDS, 'Bytecode exceeds maximum deployable size');
     // NOTE: hash the bytecode here only up to the actual length of the bytecode.
     // We do not hash the entire max bytecode length!
-    return await poseidon2HashWithSeparator(bytecodeAsFields.slice(0, bytecodeLength), GeneratorIndex.PUBLIC_BYTECODE);
+    const sep = BigInt(DomainSeparator.PUBLIC_BYTECODE) + (bytecodeLengthAsField.toBigInt() << 32n);
+    return await poseidon2HashWithSeparator(bytecodeAsFields.slice(0, bytecodeLength), new Fr(sep).toNumber());
 }