@aztec/stdlib 0.0.1-commit.9ef841308 → 0.0.1-commit.a5db02d

package/dest/config/sequencer-config.js

@@ -1,4 +1,8 @@
+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
@@ -7,18 +11,47 @@
  */ export const sharedSequencerConfigMappings = {
     blockDurationMs: {
         env: 'SEQ_BLOCK_DURATION_MS',
-        description: 'Duration per block in milliseconds when building multiple blocks per slot. ' + 'If undefined (default), builds a single block per slot using the full slot duration.',
-        parseEnv: (val)=>val ? parseInt(val, 10) : undefined
+        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.',
-        parseEnv: (val)=>val ? parseInt(val, 10) : 0,
-        defaultValue: 0
+        ...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.',
-        parseEnv: (val)=>val ? parseInt(val, 10) : undefined
+        ...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 = poseidon2(DOM_SEP__PARTIAL_ADDRESS, [salt, initialization_hash, deployer])
+ * 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_V1, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
+ * 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

@@ -8,9 +8,9 @@ import { computeAddress } from '../keys/index.js';
 /**
  * Returns the deployment address for a given contract instance.
  * ```
- * salted_initialization_hash = poseidon2(DOM_SEP__PARTIAL_ADDRESS, [salt, initialization_hash, deployer])
+ * 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_V1, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
+ * 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) {
@@ -34,8 +34,9 @@ import { computeAddress } from '../keys/index.js';
     return poseidon2HashWithSeparator([
         instance.salt,
         instance.initializationHash,
-        instance.deployer
-    ], DomainSeparator.PARTIAL_ADDRESS);
+        instance.deployer,
+        instance.immutablesHash
+    ], DomainSeparator.SALTED_INITIALIZATION_HASH);
 }
 /**
  * Computes the initialization hash for an instance given its constructor function and arguments.

package/dest/contract/contract_deployment_data.d.ts

@@ -16,77 +16,31 @@ export declare class ContractDeploymentData {
         privateLogs: PrivateLog[];
     }): ContractDeploymentData;
     static empty(): ContractDeploymentData;
-    static get schema(): z.ZodEffects<z.ZodObject<{
-        contractClassLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
+    static get schema(): z.ZodPipe<z.ZodObject<{
+        contractClassLogs: z.ZodArray<z.ZodPipe<z.ZodObject<{
             contractAddress: import("@aztec/foundation/schemas").ZodFor<import("../aztec-address/index.js").AztecAddress>;
-            fields: z.ZodEffects<z.ZodObject<{
-                fields: z.ZodEffects<z.ZodArray<z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>, "many">, import("@aztec/foundation/schemas").Fr[], string[]>;
-            }, "strip", z.ZodTypeAny, {
+            fields: z.ZodPipe<z.ZodObject<{
+                fields: z.ZodArray<z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>>;
+            }, z.core.$strip>, z.ZodTransform<import("@aztec/stdlib/logs").ContractClassLogFields, {
                 fields: import("@aztec/foundation/schemas").Fr[];
-            }, {
-                fields: string[];
-            }>, import("@aztec/stdlib/logs").ContractClassLogFields, {
-                fields: string[];
-            }>;
+            }>>;
             emittedLength: z.ZodNumber;
-        }, "strip", z.ZodTypeAny, {
+        }, z.core.$strip>, z.ZodTransform<ContractClassLog, {
             contractAddress: import("../aztec-address/index.js").AztecAddress;
             fields: import("@aztec/stdlib/logs").ContractClassLogFields;
             emittedLength: number;
-        }, {
-            contractAddress?: any;
-            fields: {
-                fields: string[];
-            };
-            emittedLength: number;
-        }>, ContractClassLog, {
-            contractAddress?: any;
-            fields: {
-                fields: string[];
-            };
-            emittedLength: number;
-        }>, "many">;
-        privateLogs: z.ZodArray<z.ZodEffects<z.ZodObject<{
-            fields: z.ZodArray<z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>, "many">;
+        }>>>;
+        privateLogs: z.ZodArray<z.ZodPipe<z.ZodObject<{
+            fields: z.ZodArray<z.ZodType<import("@aztec/foundation/schemas").Fr, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Fr, string>>>;
             emittedLength: z.ZodNumber;
-        }, "strict", z.ZodTypeAny, {
+        }, z.core.$strict>, z.ZodTransform<PrivateLog, {
             fields: import("@aztec/foundation/schemas").Fr[];
             emittedLength: number;
-        }, {
-            fields: string[];
-            emittedLength: number;
-        }>, PrivateLog, {
-            fields: string[];
-            emittedLength: number;
-        }>, "many">;
-    }, "strip", z.ZodTypeAny, {
+        }>>>;
+    }, z.core.$strip>, z.ZodTransform<ContractDeploymentData, {
         contractClassLogs: ContractClassLog[];
         privateLogs: PrivateLog[];
-    }, {
-        contractClassLogs: {
-            contractAddress?: any;
-            fields: {
-                fields: string[];
-            };
-            emittedLength: number;
-        }[];
-        privateLogs: {
-            fields: string[];
-            emittedLength: number;
-        }[];
-    }>, ContractDeploymentData, {
-        contractClassLogs: {
-            contractAddress?: any;
-            fields: {
-                fields: string[];
-            };
-            emittedLength: number;
-        }[];
-        privateLogs: {
-            fields: string[];
-            emittedLength: number;
-        }[];
-    }>;
+    }>>;
     /**
      * Creates a ContractDeploymentData from a plain object without Zod validation.
      * This method is optimized for performance and skips validation, making it suitable
@@ -116,4 +70,4 @@ export declare class AllContractDeploymentData {
      */
     static fromTx(tx: Tx): AllContractDeploymentData;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfZGVwbG95bWVudF9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvY29udHJhY3RfZGVwbG95bWVudF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUzQyxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCOzs7R0FHRztBQUNILHFCQUFhLHNCQUFzQjthQUVmLGlCQUFpQixFQUFFLGdCQUFnQixFQUFFO2FBQ3JDLFdBQVcsRUFBRSxVQUFVLEVBQUU7SUFGM0MsWUFDa0IsaUJBQWlCLEVBQUUsZ0JBQWdCLEVBQUUsRUFDckMsV0FBVyxFQUFFLFVBQVUsRUFBRSxFQUN2QztJQUVHLG9CQUFvQixJQUFJLGdCQUFnQixFQUFFLENBRWhEO0lBRU0sY0FBYyxJQUFJLFVBQVUsRUFBRSxDQUVwQztJQUVELE9BQWMsSUFBSSxDQUFDLElBQUksRUFBRTtRQUFFLGlCQUFpQixFQUFFLGdCQUFnQixFQUFFLENBQUM7UUFBQyxXQUFXLEVBQUUsVUFBVSxFQUFFLENBQUE7S0FBRSwwQkFFNUY7SUFFRCxPQUFjLEtBQUssSUFBSSxzQkFBc0IsQ0FFNUM7SUFFRCxXQUFrQixNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O09BT3ZCO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsT0FBYyxlQUFlLENBQUMsR0FBRyxFQUFFLEdBQUcsR0FBRyxzQkFBc0IsQ0FROUQ7Q0FDRjtBQUVEOztHQUVHO0FBQ0gscUJBQWEseUJBQXlCO2FBRWxCLG1DQUFtQyxFQUFFLHNCQUFzQjthQUMzRCxnQ0FBZ0MsRUFBRSxzQkFBc0I7SUFGMUUsWUFDa0IsbUNBQW1DLEVBQUUsc0JBQXNCLEVBQzNELGdDQUFnQyxFQUFFLHNCQUFzQixFQUN0RTtJQUVHLHNDQUFzQyxJQUFJLHNCQUFzQixDQUV0RTtJQUVNLG1DQUFtQyxJQUFJLHNCQUFzQixDQUVuRTtJQUVEOzs7Ozs7OztPQVFHO0lBQ0gsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLHlCQUF5QixDQXVDL0M7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfZGVwbG95bWVudF9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvY29udHJhY3RfZGVwbG95bWVudF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUzQyxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCOzs7R0FHRztBQUNILHFCQUFhLHNCQUFzQjthQUVmLGlCQUFpQixFQUFFLGdCQUFnQixFQUFFO2FBQ3JDLFdBQVcsRUFBRSxVQUFVLEVBQUU7SUFGM0MsWUFDa0IsaUJBQWlCLEVBQUUsZ0JBQWdCLEVBQUUsRUFDckMsV0FBVyxFQUFFLFVBQVUsRUFBRSxFQUN2QztJQUVHLG9CQUFvQixJQUFJLGdCQUFnQixFQUFFLENBRWhEO0lBRU0sY0FBYyxJQUFJLFVBQVUsRUFBRSxDQUVwQztJQUVELE9BQWMsSUFBSSxDQUFDLElBQUksRUFBRTtRQUFFLGlCQUFpQixFQUFFLGdCQUFnQixFQUFFLENBQUM7UUFBQyxXQUFXLEVBQUUsVUFBVSxFQUFFLENBQUE7S0FBRSwwQkFFNUY7SUFFRCxPQUFjLEtBQUssSUFBSSxzQkFBc0IsQ0FFNUM7SUFFRCxXQUFrQixNQUFNOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7UUFPdkI7SUFFRDs7Ozs7O09BTUc7SUFDSCxPQUFjLGVBQWUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLHNCQUFzQixDQVE5RDtDQUNGO0FBRUQ7O0dBRUc7QUFDSCxxQkFBYSx5QkFBeUI7YUFFbEIsbUNBQW1DLEVBQUUsc0JBQXNCO2FBQzNELGdDQUFnQyxFQUFFLHNCQUFzQjtJQUYxRSxZQUNrQixtQ0FBbUMsRUFBRSxzQkFBc0IsRUFDM0QsZ0NBQWdDLEVBQUUsc0JBQXNCLEVBQ3RFO0lBRUcsc0NBQXNDLElBQUksc0JBQXNCLENBRXRFO0lBRU0sbUNBQW1DLElBQUksc0JBQXNCLENBRW5FO0lBRUQ7Ozs7Ozs7O09BUUc7SUFDSCxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxFQUFFLEdBQUcseUJBQXlCLENBdUMvQztDQUNGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"contract_deployment_data.d.ts","sourceRoot":"","sources":["../../src/contract/contract_deployment_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,sBAAsB;aAEf,iBAAiB,EAAE,gBAAgB,EAAE;aACrC,WAAW,EAAE,UAAU,EAAE;IAF3C,YACkB,iBAAiB,EAAE,gBAAgB,EAAE,EACrC,WAAW,EAAE,UAAU,EAAE,EACvC;IAEG,oBAAoB,IAAI,gBAAgB,EAAE,CAEhD;IAEM,cAAc,IAAI,UAAU,EAAE,CAEpC;IAED,OAAc,IAAI,CAAC,IAAI,EAAE;QAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;QAAC,WAAW,EAAE,UAAU,EAAE,CAAA;KAAE,0BAE5F;IAED,OAAc,KAAK,IAAI,sBAAsB,CAE5C;IAED,WAAkB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAOvB;IAED;;;;;;OAMG;IACH,OAAc,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,sBAAsB,CAQ9D;CACF;AAED;;GAEG;AACH,qBAAa,yBAAyB;aAElB,mCAAmC,EAAE,sBAAsB;aAC3D,gCAAgC,EAAE,sBAAsB;IAF1E,YACkB,mCAAmC,EAAE,sBAAsB,EAC3D,gCAAgC,EAAE,sBAAsB,EACtE;IAEG,sCAAsC,IAAI,sBAAsB,CAEtE;IAEM,mCAAmC,IAAI,sBAAsB,CAEnE;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,yBAAyB,CAuC/C;CACF"}
+{"version":3,"file":"contract_deployment_data.d.ts","sourceRoot":"","sources":["../../src/contract/contract_deployment_data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAE3C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,sBAAsB;aAEf,iBAAiB,EAAE,gBAAgB,EAAE;aACrC,WAAW,EAAE,UAAU,EAAE;IAF3C,YACkB,iBAAiB,EAAE,gBAAgB,EAAE,EACrC,WAAW,EAAE,UAAU,EAAE,EACvC;IAEG,oBAAoB,IAAI,gBAAgB,EAAE,CAEhD;IAEM,cAAc,IAAI,UAAU,EAAE,CAEpC;IAED,OAAc,IAAI,CAAC,IAAI,EAAE;QAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;QAAC,WAAW,EAAE,UAAU,EAAE,CAAA;KAAE,0BAE5F;IAED,OAAc,KAAK,IAAI,sBAAsB,CAE5C;IAED,WAAkB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;QAOvB;IAED;;;;;;OAMG;IACH,OAAc,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,sBAAsB,CAQ9D;CACF;AAED;;GAEG;AACH,qBAAa,yBAAyB;aAElB,mCAAmC,EAAE,sBAAsB;aAC3D,gCAAgC,EAAE,sBAAsB;IAF1E,YACkB,mCAAmC,EAAE,sBAAsB,EAC3D,gCAAgC,EAAE,sBAAsB,EACtE;IAEG,sCAAsC,IAAI,sBAAsB,CAEtE;IAEM,mCAAmC,IAAI,sBAAsB,CAEnE;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,yBAAyB,CAuC/C;CACF"}

package/dest/contract/contract_instance.d.ts

@@ -4,7 +4,7 @@ import type { FieldsOf } from '@aztec/foundation/types';
 import { type ContractArtifact, type FunctionAbi } from '../abi/index.js';
 import { AztecAddress } from '../aztec-address/index.js';
 import { PublicKeys } from '../keys/public_keys.js';
-import type { ContractInstance, ContractInstanceWithAddress } from './interfaces/contract_instance.js';
+import type { ContractInstance, ContractInstancePreimage, ContractInstancePreimageWithAddress, ContractInstanceWithAddress } from './interfaces/contract_instance.js';
 export type ContractInstantiationData = {
     constructorArtifact?: FunctionAbi | string;
     constructorArgs?: any[];
@@ -12,14 +12,16 @@ export type ContractInstantiationData = {
     salt: Fr;
     publicKeys?: PublicKeys;
     deployer?: AztecAddress;
+    immutablesHash?: Fr;
 };
 export declare class SerializableContractInstance {
-    readonly version: 1;
+    readonly version: 2;
     readonly salt: Fr;
     readonly deployer: AztecAddress;
     readonly currentContractClassId: Fr;
     readonly originalContractClassId: Fr;
     readonly initializationHash: Fr;
+    readonly immutablesHash: Fr;
     readonly publicKeys: PublicKeys;
     constructor(instance: ContractInstance);
     toBuffer(): Buffer<ArrayBufferLike>;
@@ -29,6 +31,20 @@ export declare class SerializableContractInstance {
     static random(opts?: Partial<FieldsOf<ContractInstance>>): Promise<SerializableContractInstance>;
     static default(): SerializableContractInstance;
 }
+export declare class SerializableContractInstancePreimage {
+    readonly version: 2;
+    readonly salt: Fr;
+    readonly deployer: AztecAddress;
+    readonly originalContractClassId: Fr;
+    readonly initializationHash: Fr;
+    readonly immutablesHash: Fr;
+    readonly publicKeys: PublicKeys;
+    constructor(instance: ContractInstancePreimage);
+    toBuffer(): Buffer<ArrayBufferLike>;
+    /** Returns a copy of this object with its address included. */
+    withAddress(address: AztecAddress): ContractInstancePreimageWithAddress;
+    static fromBuffer(bufferOrReader: Buffer | BufferReader): SerializableContractInstancePreimage;
+}
 /**
  * Generates a Contract Instance from some instantiation params.
  * @param artifact - The account contract build artifact.
@@ -36,4 +52,4 @@ export declare class SerializableContractInstance {
  * @returns - The contract instance
  */
 export declare function getContractInstanceFromInstantiationParams(artifact: ContractArtifact, opts: ContractInstantiationData): Promise<ContractInstanceWithAddress>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdF9pbnN0YW5jZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBaUMsTUFBTSw2QkFBNkIsQ0FBQztBQUMxRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBS2pCLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQU1wRCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDO0FBSXZHLE1BQU0sTUFBTSx5QkFBeUIsR0FBRztJQUN0QyxtQkFBbUIsQ0FBQyxFQUFFLFdBQVcsR0FBRyxNQUFNLENBQUM7SUFDM0MsZUFBZSxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUM7SUFDeEIsZ0JBQWdCLENBQUMsRUFBRSxPQUFPLENBQUM7SUFDM0IsSUFBSSxFQUFFLEVBQUUsQ0FBQztJQUNULFVBQVUsQ0FBQyxFQUFFLFVBQVUsQ0FBQztJQUN4QixRQUFRLENBQUMsRUFBRSxZQUFZLENBQUM7Q0FDekIsQ0FBQztBQUVGLHFCQUFhLDRCQUE0QjtJQUN2QyxTQUFnQixPQUFPLElBQVc7SUFDbEMsU0FBZ0IsSUFBSSxFQUFFLEVBQUUsQ0FBQztJQUN6QixTQUFnQixRQUFRLEVBQUUsWUFBWSxDQUFDO0lBQ3ZDLFNBQWdCLHNCQUFzQixFQUFFLEVBQUUsQ0FBQztJQUMzQyxTQUFnQix1QkFBdUIsRUFBRSxFQUFFLENBQUM7SUFDNUMsU0FBZ0Isa0JBQWtCLEVBQUUsRUFBRSxDQUFDO0lBQ3ZDLFNBQWdCLFVBQVUsRUFBRSxVQUFVLENBQUM7SUFFdkMsWUFBWSxRQUFRLEVBQUUsZ0JBQWdCLEVBVXJDO0lBRU0sUUFBUSw0QkFVZDtJQUVELCtEQUErRDtJQUMvRCxXQUFXLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRywyQkFBMkIsQ0FFOUQ7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLGNBQWMsRUFBRSxNQUFNLEdBQUcsWUFBWSxnQ0FXdEQ7SUFFRCxPQUFhLE1BQU0sQ0FBQyxJQUFJLEdBQUUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFNLHlDQVdqRTtJQUVELE1BQU0sQ0FBQyxPQUFPLGlDQVViO0NBQ0Y7QUFFRDs7Ozs7R0FLRztBQUNILHdCQUFzQiwwQ0FBMEMsQ0FDOUQsUUFBUSxFQUFFLGdCQUFnQixFQUMxQixJQUFJLEVBQUUseUJBQXlCLEdBQzlCLE9BQU8sQ0FBQywyQkFBMkIsQ0FBQyxDQXlCdEMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC9jb250cmFjdF9pbnN0YW5jZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDcEQsT0FBTyxFQUFFLFlBQVksRUFBaUMsTUFBTSw2QkFBNkIsQ0FBQztBQUMxRixPQUFPLEtBQUssRUFBRSxRQUFRLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV4RCxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBS2pCLE1BQU0saUJBQWlCLENBQUM7QUFDekIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXpELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQU1wRCxPQUFPLEtBQUssRUFDVixnQkFBZ0IsRUFDaEIsd0JBQXdCLEVBQ3hCLG1DQUFtQyxFQUNuQywyQkFBMkIsRUFDNUIsTUFBTSxtQ0FBbUMsQ0FBQztBQUkzQyxNQUFNLE1BQU0seUJBQXlCLEdBQUc7SUFDdEMsbUJBQW1CLENBQUMsRUFBRSxXQUFXLEdBQUcsTUFBTSxDQUFDO0lBQzNDLGVBQWUsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDO0lBQ3hCLGdCQUFnQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzNCLElBQUksRUFBRSxFQUFFLENBQUM7SUFDVCxVQUFVLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDeEIsUUFBUSxDQUFDLEVBQUUsWUFBWSxDQUFDO0lBQ3hCLGNBQWMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztDQUNyQixDQUFDO0FBRUYscUJBQWEsNEJBQTRCO0lBQ3ZDLFNBQWdCLE9BQU8sSUFBVztJQUNsQyxTQUFnQixJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQ3pCLFNBQWdCLFFBQVEsRUFBRSxZQUFZLENBQUM7SUFDdkMsU0FBZ0Isc0JBQXNCLEVBQUUsRUFBRSxDQUFDO0lBQzNDLFNBQWdCLHVCQUF1QixFQUFFLEVBQUUsQ0FBQztJQUM1QyxTQUFnQixrQkFBa0IsRUFBRSxFQUFFLENBQUM7SUFDdkMsU0FBZ0IsY0FBYyxFQUFFLEVBQUUsQ0FBQztJQUNuQyxTQUFnQixVQUFVLEVBQUUsVUFBVSxDQUFDO0lBRXZDLFlBQVksUUFBUSxFQUFFLGdCQUFnQixFQVdyQztJQUVNLFFBQVEsNEJBV2Q7SUFFRCwrREFBK0Q7SUFDL0QsV0FBVyxDQUFDLE9BQU8sRUFBRSxZQUFZLEdBQUcsMkJBQTJCLENBRTlEO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxjQUFjLEVBQUUsTUFBTSxHQUFHLFlBQVksZ0NBWXREO0lBRUQsT0FBYSxNQUFNLENBQUMsSUFBSSxHQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsZ0JBQWdCLENBQUMsQ0FBTSx5Q0FZakU7SUFFRCxNQUFNLENBQUMsT0FBTyxpQ0FXYjtDQUNGO0FBRUQscUJBQWEsb0NBQW9DO0lBQy9DLFNBQWdCLE9BQU8sSUFBVztJQUNsQyxTQUFnQixJQUFJLEVBQUUsRUFBRSxDQUFDO0lBQ3pCLFNBQWdCLFFBQVEsRUFBRSxZQUFZLENBQUM7SUFDdkMsU0FBZ0IsdUJBQXVCLEVBQUUsRUFBRSxDQUFDO0lBQzVDLFNBQWdCLGtCQUFrQixFQUFFLEVBQUUsQ0FBQztJQUN2QyxTQUFnQixjQUFjLEVBQUUsRUFBRSxDQUFDO0lBQ25DLFNBQWdCLFVBQVUsRUFBRSxVQUFVLENBQUM7SUFFdkMsWUFBWSxRQUFRLEVBQUUsd0JBQXdCLEVBVTdDO0lBRU0sUUFBUSw0QkFVZDtJQUVELCtEQUErRDtJQUMvRCxXQUFXLENBQUMsT0FBTyxFQUFFLFlBQVksR0FBRyxtQ0FBbUMsQ0FFdEU7SUFFRCxNQUFNLENBQUMsVUFBVSxDQUFDLGNBQWMsRUFBRSxNQUFNLEdBQUcsWUFBWSxHQUFHLG9DQUFvQyxDQWU3RjtDQUNGO0FBRUQ7Ozs7O0dBS0c7QUFDSCx3QkFBc0IsMENBQTBDLENBQzlELFFBQVEsRUFBRSxnQkFBZ0IsRUFDMUIsSUFBSSxFQUFFLHlCQUF5QixHQUM5QixPQUFPLENBQUMsMkJBQTJCLENBQUMsQ0EyQnRDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"contract_instance.d.ts","sourceRoot":"","sources":["../../src/contract/contract_instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAiC,MAAM,6BAA6B,CAAC;AAC1F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAKjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAIvG,MAAM,MAAM,yBAAyB,GAAG;IACtC,mBAAmB,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC;IAC3C,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,IAAI,EAAE,EAAE,CAAC;IACT,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB,CAAC;AAEF,qBAAa,4BAA4B;IACvC,SAAgB,OAAO,IAAW;IAClC,SAAgB,IAAI,EAAE,EAAE,CAAC;IACzB,SAAgB,QAAQ,EAAE,YAAY,CAAC;IACvC,SAAgB,sBAAsB,EAAE,EAAE,CAAC;IAC3C,SAAgB,uBAAuB,EAAE,EAAE,CAAC;IAC5C,SAAgB,kBAAkB,EAAE,EAAE,CAAC;IACvC,SAAgB,UAAU,EAAE,UAAU,CAAC;IAEvC,YAAY,QAAQ,EAAE,gBAAgB,EAUrC;IAEM,QAAQ,4BAUd;IAED,+DAA+D;IAC/D,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,2BAA2B,CAE9D;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,gCAWtD;IAED,OAAa,MAAM,CAAC,IAAI,GAAE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAM,yCAWjE;IAED,MAAM,CAAC,OAAO,iCAUb;CACF;AAED;;;;;GAKG;AACH,wBAAsB,0CAA0C,CAC9D,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,yBAAyB,GAC9B,OAAO,CAAC,2BAA2B,CAAC,CAyBtC"}
+{"version":3,"file":"contract_instance.d.ts","sourceRoot":"","sources":["../../src/contract/contract_instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,YAAY,EAAiC,MAAM,6BAA6B,CAAC;AAC1F,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAExD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAKjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAMpD,OAAO,KAAK,EACV,gBAAgB,EAChB,wBAAwB,EACxB,mCAAmC,EACnC,2BAA2B,EAC5B,MAAM,mCAAmC,CAAC;AAI3C,MAAM,MAAM,yBAAyB,GAAG;IACtC,mBAAmB,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC;IAC3C,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,IAAI,EAAE,EAAE,CAAC;IACT,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,cAAc,CAAC,EAAE,EAAE,CAAC;CACrB,CAAC;AAEF,qBAAa,4BAA4B;IACvC,SAAgB,OAAO,IAAW;IAClC,SAAgB,IAAI,EAAE,EAAE,CAAC;IACzB,SAAgB,QAAQ,EAAE,YAAY,CAAC;IACvC,SAAgB,sBAAsB,EAAE,EAAE,CAAC;IAC3C,SAAgB,uBAAuB,EAAE,EAAE,CAAC;IAC5C,SAAgB,kBAAkB,EAAE,EAAE,CAAC;IACvC,SAAgB,cAAc,EAAE,EAAE,CAAC;IACnC,SAAgB,UAAU,EAAE,UAAU,CAAC;IAEvC,YAAY,QAAQ,EAAE,gBAAgB,EAWrC;IAEM,QAAQ,4BAWd;IAED,+DAA+D;IAC/D,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,2BAA2B,CAE9D;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,gCAYtD;IAED,OAAa,MAAM,CAAC,IAAI,GAAE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAM,yCAYjE;IAED,MAAM,CAAC,OAAO,iCAWb;CACF;AAED,qBAAa,oCAAoC;IAC/C,SAAgB,OAAO,IAAW;IAClC,SAAgB,IAAI,EAAE,EAAE,CAAC;IACzB,SAAgB,QAAQ,EAAE,YAAY,CAAC;IACvC,SAAgB,uBAAuB,EAAE,EAAE,CAAC;IAC5C,SAAgB,kBAAkB,EAAE,EAAE,CAAC;IACvC,SAAgB,cAAc,EAAE,EAAE,CAAC;IACnC,SAAgB,UAAU,EAAE,UAAU,CAAC;IAEvC,YAAY,QAAQ,EAAE,wBAAwB,EAU7C;IAEM,QAAQ,4BAUd;IAED,+DAA+D;IAC/D,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,mCAAmC,CAEtE;IAED,MAAM,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY,GAAG,oCAAoC,CAe7F;CACF;AAED;;;;;GAKG;AACH,wBAAsB,0CAA0C,CAC9D,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,yBAAyB,GAC9B,OAAO,CAAC,2BAA2B,CAAC,CA2BtC"}

package/dest/contract/contract_instance.js

@@ -5,7 +5,7 @@ import { AztecAddress } from '../aztec-address/index.js';
 import { getContractClassFromArtifact } from '../contract/contract_class.js';
 import { PublicKeys } from '../keys/public_keys.js';
 import { computeContractAddressFromInstance, computeInitializationHash, computeInitializationHashFromEncodedArgs } from './contract_address.js';
-const VERSION = 1;
+const VERSION = 2;
 export class SerializableContractInstance {
     version = VERSION;
     salt;
@@ -13,6 +13,7 @@ export class SerializableContractInstance {
     currentContractClassId;
     originalContractClassId;
     initializationHash;
+    immutablesHash;
     publicKeys;
     constructor(instance){
         if (instance.version !== VERSION) {
@@ -23,10 +24,11 @@ export class SerializableContractInstance {
         this.currentContractClassId = instance.currentContractClassId;
         this.originalContractClassId = instance.originalContractClassId;
         this.initializationHash = instance.initializationHash;
+        this.immutablesHash = instance.immutablesHash;
         this.publicKeys = instance.publicKeys;
     }
     toBuffer() {
-        return serializeToBuffer(numToUInt8(this.version), this.salt, this.deployer, this.currentContractClassId, this.originalContractClassId, this.initializationHash, this.publicKeys);
+        return serializeToBuffer(numToUInt8(this.version), this.salt, this.deployer, this.currentContractClassId, this.originalContractClassId, this.initializationHash, this.immutablesHash, this.publicKeys);
     }
     /** Returns a copy of this object with its address included. */ withAddress(address) {
         return {
@@ -43,6 +45,7 @@ export class SerializableContractInstance {
             currentContractClassId: reader.readObject(Fr),
             originalContractClassId: reader.readObject(Fr),
             initializationHash: reader.readObject(Fr),
+            immutablesHash: reader.readObject(Fr),
             publicKeys: reader.readObject(PublicKeys)
         });
     }
@@ -54,6 +57,7 @@ export class SerializableContractInstance {
             currentContractClassId: Fr.random(),
             originalContractClassId: Fr.random(),
             initializationHash: Fr.random(),
+            immutablesHash: Fr.random(),
             publicKeys: await PublicKeys.random(),
             ...opts
         });
@@ -66,10 +70,56 @@ export class SerializableContractInstance {
             currentContractClassId: Fr.zero(),
             originalContractClassId: Fr.zero(),
             initializationHash: Fr.zero(),
+            immutablesHash: Fr.zero(),
             publicKeys: PublicKeys.default()
         });
     }
 }
+export class SerializableContractInstancePreimage {
+    version = VERSION;
+    salt;
+    deployer;
+    originalContractClassId;
+    initializationHash;
+    immutablesHash;
+    publicKeys;
+    constructor(instance){
+        if (instance.version !== VERSION) {
+            throw new Error(`Unexpected contract class version ${instance.version}`);
+        }
+        this.salt = instance.salt;
+        this.deployer = instance.deployer;
+        this.originalContractClassId = instance.originalContractClassId;
+        this.initializationHash = instance.initializationHash;
+        this.immutablesHash = instance.immutablesHash;
+        this.publicKeys = instance.publicKeys;
+    }
+    toBuffer() {
+        return serializeToBuffer(numToUInt8(this.version), this.salt, this.deployer, this.originalContractClassId, this.initializationHash, this.immutablesHash, this.publicKeys);
+    }
+    /** Returns a copy of this object with its address included. */ withAddress(address) {
+        return {
+            ...this,
+            address
+        };
+    }
+    static fromBuffer(bufferOrReader) {
+        const reader = BufferReader.asReader(bufferOrReader);
+        const version = reader.readUInt8();
+        if (version !== VERSION) {
+            throw new Error(`Unexpected contract instance preimage version ${version}`);
+        }
+        return new SerializableContractInstancePreimage({
+            version: VERSION,
+            salt: reader.readObject(Fr),
+            deployer: reader.readObject(AztecAddress),
+            originalContractClassId: reader.readObject(Fr),
+            initializationHash: reader.readObject(Fr),
+            immutablesHash: reader.readObject(Fr),
+            publicKeys: reader.readObject(PublicKeys)
+        });
+    }
+}
 /**
  * Generates a Contract Instance from some instantiation params.
  * @param artifact - The account contract build artifact.
@@ -82,14 +132,16 @@ export class SerializableContractInstance {
     const contractClass = await getContractClassFromArtifact(artifact);
     const initializationHash = constructorArtifact && opts?.skipArgsDecoding ? await computeInitializationHashFromEncodedArgs(await FunctionSelector.fromNameAndParameters(constructorArtifact?.name, constructorArtifact?.parameters), args) : await computeInitializationHash(constructorArtifact, args);
     const publicKeys = opts.publicKeys ?? PublicKeys.default();
+    const immutablesHash = opts.immutablesHash ?? Fr.ZERO;
     const instance = {
         currentContractClassId: contractClass.id,
         originalContractClassId: contractClass.id,
         initializationHash,
+        immutablesHash,
         publicKeys,
         salt: opts.salt,
         deployer,
-        version: 1
+        version: 2
     };
     return {
         ...instance,