@aztec/stdlib 0.0.1-commit.3fd054f6 → 0.0.1-commit.431c48d

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,

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

@@ -30,35 +30,13 @@ export interface PrivateFunction {
 }
 export declare const ContractClassSchema: z.ZodObject<{
     version: z.ZodLiteral<1>;
-    artifactHash: z.ZodType<Fr, any, string>;
+    artifactHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
     privateFunctions: z.ZodArray<z.ZodObject<{
         selector: import("@aztec/foundation/schemas").ZodFor<FunctionSelector>;
-        vkHash: z.ZodType<Fr, any, string>;
-    }, "strip", z.ZodTypeAny, {
-        selector: FunctionSelector;
-        vkHash: Fr;
-    }, {
-        selector?: any;
-        vkHash: string;
-    }>, "many">;
+        vkHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    }, z.core.$strip>>;
     packedBytecode: import("@aztec/foundation/schemas").ZodFor<Buffer<ArrayBufferLike>>;
-}, "strip", z.ZodTypeAny, {
-    version: 1;
-    artifactHash: Fr;
-    privateFunctions: {
-        selector: FunctionSelector;
-        vkHash: Fr;
-    }[];
-    packedBytecode: Buffer<ArrayBufferLike>;
-}, {
-    version: 1;
-    artifactHash: string;
-    privateFunctions: {
-        selector?: any;
-        vkHash: string;
-    }[];
-    packedBytecode?: any;
-}>;
+}, z.core.$strip>;
 /** Commitments to fields of a contract class. */
 interface ContractClassCommitments {
     /** Identifier of the contract class. */
@@ -72,74 +50,25 @@ interface ContractClassCommitments {
 export type ContractClassWithId = ContractClass & Pick<ContractClassCommitments, 'id'>;
 export declare const ContractClassWithIdSchema: z.ZodObject<{
     version: z.ZodLiteral<1>;
-    artifactHash: z.ZodType<Fr, any, string>;
+    artifactHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
     privateFunctions: z.ZodArray<z.ZodObject<{
         selector: import("@aztec/foundation/schemas").ZodFor<FunctionSelector>;
-        vkHash: z.ZodType<Fr, any, string>;
-    }, "strip", z.ZodTypeAny, {
-        selector: FunctionSelector;
-        vkHash: Fr;
-    }, {
-        selector?: any;
-        vkHash: string;
-    }>, "many">;
+        vkHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    }, z.core.$strip>>;
     packedBytecode: import("@aztec/foundation/schemas").ZodFor<Buffer<ArrayBufferLike>>;
-} & {
-    id: z.ZodType<Fr, any, string>;
-}, "strip", z.ZodTypeAny, {
-    version: 1;
-    artifactHash: Fr;
-    privateFunctions: {
-        selector: FunctionSelector;
-        vkHash: Fr;
-    }[];
-    packedBytecode: Buffer<ArrayBufferLike>;
-    id: Fr;
-}, {
-    version: 1;
-    artifactHash: string;
-    privateFunctions: {
-        selector?: any;
-        vkHash: string;
-    }[];
-    packedBytecode?: any;
-    id: string;
-}>;
+    id: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+}, z.core.$strip>;
 /** A contract class with public bytecode information. */
 export type ContractClassPublic = Pick<ContractClassCommitments, 'id' | 'privateFunctionsRoot'> & Omit<ContractClass, 'privateFunctions'>;
 export type ContractClassPublicWithCommitment = ContractClassPublic & Pick<ContractClassCommitments, 'publicBytecodeCommitment'>;
 export declare const ContractClassPublicSchema: z.ZodIntersection<z.ZodObject<{
-    id: z.ZodType<Fr, any, string>;
-    privateFunctionsRoot: z.ZodType<Fr, any, string>;
-}, "strip", z.ZodTypeAny, {
-    id: Fr;
-    privateFunctionsRoot: Fr;
-}, {
-    id: string;
-    privateFunctionsRoot: string;
-}>, z.ZodObject<Omit<{
+    id: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    privateFunctionsRoot: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+}, z.core.$strip>, z.ZodObject<{
     version: z.ZodLiteral<1>;
-    artifactHash: z.ZodType<Fr, any, string>;
-    privateFunctions: z.ZodArray<z.ZodObject<{
-        selector: import("@aztec/foundation/schemas").ZodFor<FunctionSelector>;
-        vkHash: z.ZodType<Fr, any, string>;
-    }, "strip", z.ZodTypeAny, {
-        selector: FunctionSelector;
-        vkHash: Fr;
-    }, {
-        selector?: any;
-        vkHash: string;
-    }>, "many">;
+    artifactHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
     packedBytecode: import("@aztec/foundation/schemas").ZodFor<Buffer<ArrayBufferLike>>;
-}, "privateFunctions">, "strip", z.ZodTypeAny, {
-    version: 1;
-    artifactHash: Fr;
-    packedBytecode: Buffer<ArrayBufferLike>;
-}, {
-    version: 1;
-    artifactHash: string;
-    packedBytecode?: any;
-}>>;
+}, z.core.$strip>>;
 /** The contract class with the block it was initially deployed at */
 export type ContractClassPublicWithBlockNumber = {
     l2BlockNumber: number;
@@ -152,4 +81,4 @@ export type ContractClassPublicWithBlockNumber = {
  */
 export declare function contractClassPublicFromPlainObject(obj: any): ContractClassPublic;
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb250cmFjdC9pbnRlcmZhY2VzL2NvbnRyYWN0X2NsYXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdwRCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXRELFFBQUEsTUFBTSxPQUFPLEdBQWEsQ0FBQztBQUUzQjs7OztHQUlHO0FBQ0gsTUFBTSxXQUFXLGFBQWE7SUFDNUIscUNBQXFDO0lBQ3JDLE9BQU8sRUFBRSxPQUFPLE9BQU8sQ0FBQztJQUN4Qjs7OztPQUlHO0lBQ0gsWUFBWSxFQUFFLEVBQUUsQ0FBQztJQUNqQixtRUFBbUU7SUFDbkUsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFLENBQUM7SUFDcEMsMkRBQTJEO0lBQzNELGNBQWMsRUFBRSxNQUFNLENBQUM7Q0FDeEI7QUFFRCwyREFBMkQ7QUFDM0QsTUFBTSxXQUFXLGVBQWU7SUFDOUIscUpBQXFKO0lBQ3JKLFFBQVEsRUFBRSxnQkFBZ0IsQ0FBQztJQUMzQix3RUFBd0U7SUFDeEUsTUFBTSxFQUFFLEVBQUUsQ0FBQztDQUNaO0FBU0QsZUFBTyxNQUFNLG1CQUFtQjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBTy9CLENBQUM7QUFFRixpREFBaUQ7QUFDakQsVUFBVSx3QkFBd0I7SUFDaEMsd0NBQXdDO0lBQ3hDLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFDUCx5Q0FBeUM7SUFDekMsd0JBQXdCLEVBQUUsRUFBRSxDQUFDO0lBQzdCLDBDQUEwQztJQUMxQyxvQkFBb0IsRUFBRSxFQUFFLENBQUM7Q0FDMUI7QUFFRCxnREFBZ0Q7QUFDaEQsTUFBTSxNQUFNLG1CQUFtQixHQUFHLGFBQWEsR0FBRyxJQUFJLENBQUMsd0JBQXdCLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFFdkYsZUFBTyxNQUFNLHlCQUF5Qjs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztFQUlyQyxDQUFDO0FBRUYseURBQXlEO0FBQ3pELE1BQU0sTUFBTSxtQkFBbUIsR0FBRyxJQUFJLENBQUMsd0JBQXdCLEVBQUUsSUFBSSxHQUFHLHNCQUFzQixDQUFDLEdBQzdGLElBQUksQ0FBQyxhQUFhLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztBQUUxQyxNQUFNLE1BQU0saUNBQWlDLEdBQUcsbUJBQW1CLEdBQ2pFLElBQUksQ0FBQyx3QkFBd0IsRUFBRSwwQkFBMEIsQ0FBQyxDQUFDO0FBRTdELGVBQU8sTUFBTSx5QkFBeUI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FPckMsQ0FBQztBQUVGLHFFQUFxRTtBQUNyRSxNQUFNLE1BQU0sa0NBQWtDLEdBQUc7SUFBRSxhQUFhLEVBQUUsTUFBTSxDQUFBO0NBQUUsR0FBRyxtQkFBbUIsQ0FBQztBQUVqRzs7Ozs7R0FLRztBQUNILHdCQUFnQixrQ0FBa0MsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLG1CQUFtQixDQVFoRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfY2xhc3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb250cmFjdC9pbnRlcmZhY2VzL2NvbnRyYWN0X2NsYXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUdwRCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXRELFFBQUEsTUFBTSxPQUFPLEdBQWEsQ0FBQztBQUUzQjs7OztHQUlHO0FBQ0gsTUFBTSxXQUFXLGFBQWE7SUFDNUIscUNBQXFDO0lBQ3JDLE9BQU8sRUFBRSxPQUFPLE9BQU8sQ0FBQztJQUN4Qjs7OztPQUlHO0lBQ0gsWUFBWSxFQUFFLEVBQUUsQ0FBQztJQUNqQixtRUFBbUU7SUFDbkUsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFLENBQUM7SUFDcEMsMkRBQTJEO0lBQzNELGNBQWMsRUFBRSxNQUFNLENBQUM7Q0FDeEI7QUFFRCwyREFBMkQ7QUFDM0QsTUFBTSxXQUFXLGVBQWU7SUFDOUIscUpBQXFKO0lBQ3JKLFFBQVEsRUFBRSxnQkFBZ0IsQ0FBQztJQUMzQix3RUFBd0U7SUFDeEUsTUFBTSxFQUFFLEVBQUUsQ0FBQztDQUNaO0FBU0QsZUFBTyxNQUFNLG1CQUFtQjs7Ozs7Ozs7aUJBTy9CLENBQUM7QUFFRixpREFBaUQ7QUFDakQsVUFBVSx3QkFBd0I7SUFDaEMsd0NBQXdDO0lBQ3hDLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFDUCx5Q0FBeUM7SUFDekMsd0JBQXdCLEVBQUUsRUFBRSxDQUFDO0lBQzdCLDBDQUEwQztJQUMxQyxvQkFBb0IsRUFBRSxFQUFFLENBQUM7Q0FDMUI7QUFFRCxnREFBZ0Q7QUFDaEQsTUFBTSxNQUFNLG1CQUFtQixHQUFHLGFBQWEsR0FBRyxJQUFJLENBQUMsd0JBQXdCLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFFdkYsZUFBTyxNQUFNLHlCQUF5Qjs7Ozs7Ozs7O2lCQUlyQyxDQUFDO0FBRUYseURBQXlEO0FBQ3pELE1BQU0sTUFBTSxtQkFBbUIsR0FBRyxJQUFJLENBQUMsd0JBQXdCLEVBQUUsSUFBSSxHQUFHLHNCQUFzQixDQUFDLEdBQzdGLElBQUksQ0FBQyxhQUFhLEVBQUUsa0JBQWtCLENBQUMsQ0FBQztBQUUxQyxNQUFNLE1BQU0saUNBQWlDLEdBQUcsbUJBQW1CLEdBQ2pFLElBQUksQ0FBQyx3QkFBd0IsRUFBRSwwQkFBMEIsQ0FBQyxDQUFDO0FBRTdELGVBQU8sTUFBTSx5QkFBeUI7Ozs7Ozs7a0JBT3JDLENBQUM7QUFFRixxRUFBcUU7QUFDckUsTUFBTSxNQUFNLGtDQUFrQyxHQUFHO0lBQUUsYUFBYSxFQUFFLE1BQU0sQ0FBQTtDQUFFLEdBQUcsbUJBQW1CLENBQUM7QUFFakc7Ozs7O0dBS0c7QUFDSCx3QkFBZ0Isa0NBQWtDLENBQUMsR0FBRyxFQUFFLEdBQUcsR0FBRyxtQkFBbUIsQ0FRaEYifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"contract_class.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/contract_class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,QAAA,MAAM,OAAO,GAAa,CAAC;AAE3B;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,qCAAqC;IACrC,OAAO,EAAE,OAAO,OAAO,CAAC;IACxB;;;;OAIG;IACH,YAAY,EAAE,EAAE,CAAC;IACjB,mEAAmE;IACnE,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,2DAA2D;IAC3D,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,2DAA2D;AAC3D,MAAM,WAAW,eAAe;IAC9B,qJAAqJ;IACrJ,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,wEAAwE;IACxE,MAAM,EAAE,EAAE,CAAC;CACZ;AASD,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAO/B,CAAC;AAEF,iDAAiD;AACjD,UAAU,wBAAwB;IAChC,wCAAwC;IACxC,EAAE,EAAE,EAAE,CAAC;IACP,yCAAyC;IACzC,wBAAwB,EAAE,EAAE,CAAC;IAC7B,0CAA0C;IAC1C,oBAAoB,EAAE,EAAE,CAAC;CAC1B;AAED,gDAAgD;AAChD,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;AAEvF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIrC,CAAC;AAEF,yDAAyD;AACzD,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,wBAAwB,EAAE,IAAI,GAAG,sBAAsB,CAAC,GAC7F,IAAI,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;AAE1C,MAAM,MAAM,iCAAiC,GAAG,mBAAmB,GACjE,IAAI,CAAC,wBAAwB,EAAE,0BAA0B,CAAC,CAAC;AAE7D,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAOrC,CAAC;AAEF,qEAAqE;AACrE,MAAM,MAAM,kCAAkC,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG,mBAAmB,CAAC;AAEjG;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,GAAG,GAAG,mBAAmB,CAQhF"}
+{"version":3,"file":"contract_class.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/contract_class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAGpD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,QAAA,MAAM,OAAO,GAAa,CAAC;AAE3B;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,qCAAqC;IACrC,OAAO,EAAE,OAAO,OAAO,CAAC;IACxB;;;;OAIG;IACH,YAAY,EAAE,EAAE,CAAC;IACjB,mEAAmE;IACnE,gBAAgB,EAAE,eAAe,EAAE,CAAC;IACpC,2DAA2D;IAC3D,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,2DAA2D;AAC3D,MAAM,WAAW,eAAe;IAC9B,qJAAqJ;IACrJ,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,wEAAwE;IACxE,MAAM,EAAE,EAAE,CAAC;CACZ;AASD,eAAO,MAAM,mBAAmB;;;;;;;;iBAO/B,CAAC;AAEF,iDAAiD;AACjD,UAAU,wBAAwB;IAChC,wCAAwC;IACxC,EAAE,EAAE,EAAE,CAAC;IACP,yCAAyC;IACzC,wBAAwB,EAAE,EAAE,CAAC;IAC7B,0CAA0C;IAC1C,oBAAoB,EAAE,EAAE,CAAC;CAC1B;AAED,gDAAgD;AAChD,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;AAEvF,eAAO,MAAM,yBAAyB;;;;;;;;;iBAIrC,CAAC;AAEF,yDAAyD;AACzD,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAAC,wBAAwB,EAAE,IAAI,GAAG,sBAAsB,CAAC,GAC7F,IAAI,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;AAE1C,MAAM,MAAM,iCAAiC,GAAG,mBAAmB,GACjE,IAAI,CAAC,wBAAwB,EAAE,0BAA0B,CAAC,CAAC;AAE7D,eAAO,MAAM,yBAAyB;;;;;;;kBAOrC,CAAC;AAEF,qEAAqE;AACrE,MAAM,MAAM,kCAAkC,GAAG;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG,mBAAmB,CAAC;AAEjG;;;;;GAKG;AACH,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,GAAG,GAAG,mBAAmB,CAQhF"}

package/dest/contract/interfaces/contract_data_source.d.ts

@@ -20,11 +20,9 @@ export interface ContractDataSource {
     /**
      * Returns a publicly deployed contract instance given its address.
      * @param address - Address of the deployed contract.
-     * @param timestamp - Timestamp at which to retrieve the contract instance. If not provided, the latest block should
-     * be used.
-     * TODO(#15170): Fix the implementations ignoring the timestamp param and make timestamp required.
+     * @param timestamp - Timestamp at which to resolve the contract instance's current class id.
      */
-    getContract(address: AztecAddress, timestamp?: UInt64): Promise<ContractInstanceWithAddress | undefined>;
+    getContract(address: AztecAddress, timestamp: UInt64): Promise<ContractInstanceWithAddress | undefined>;
     /**
      * Returns the list of all class ids known.
      */
@@ -34,4 +32,4 @@ export interface ContractDataSource {
     /** Registers a function names. Useful for debugging. */
     registerContractFunctionSignatures(signatures: string[]): Promise<void>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfZGF0YV9zb3VyY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb250cmFjdC9pbnRlcmZhY2VzL2NvbnRyYWN0X2RhdGFfc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTFFLE1BQU0sV0FBVyxrQkFBa0I7SUFDakM7OztPQUdHO0lBQ0gsY0FBYyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUV2Qzs7O09BR0c7SUFDSCxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUVuRSxxQkFBcUIsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUM7SUFFdkQ7Ozs7OztPQU1HO0lBQ0gsV0FBVyxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsU0FBUyxDQUFDLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQywyQkFBMkIsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUV6Rzs7T0FFRztJQUNILG1CQUFtQixJQUFJLE9BQU8sQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBRXJDLGtIQUFrSDtJQUNsSCxvQkFBb0IsQ0FBQyxPQUFPLEVBQUUsWUFBWSxFQUFFLFFBQVEsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUFDO0lBRXJHLHdEQUF3RDtJQUN4RCxrQ0FBa0MsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQ3pFIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfZGF0YV9zb3VyY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb250cmFjdC9pbnRlcmZhY2VzL2NvbnRyYWN0X2RhdGFfc291cmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ25FLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDM0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDcEQsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUMvRCxPQUFPLEtBQUssRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTFFLE1BQU0sV0FBVyxrQkFBa0I7SUFDakM7OztPQUdHO0lBQ0gsY0FBYyxJQUFJLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUV2Qzs7O09BR0c7SUFDSCxnQkFBZ0IsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxtQkFBbUIsR0FBRyxTQUFTLENBQUMsQ0FBQztJQUVuRSxxQkFBcUIsQ0FBQyxFQUFFLEVBQUUsRUFBRSxHQUFHLE9BQU8sQ0FBQyxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUM7SUFFdkQ7Ozs7T0FJRztJQUNILFdBQVcsQ0FBQyxPQUFPLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLDJCQUEyQixHQUFHLFNBQVMsQ0FBQyxDQUFDO0lBRXhHOztPQUVHO0lBQ0gsbUJBQW1CLElBQUksT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFFckMsa0hBQWtIO0lBQ2xILG9CQUFvQixDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsUUFBUSxFQUFFLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBQUM7SUFFckcsd0RBQXdEO0lBQ3hELGtDQUFrQyxDQUFDLFVBQVUsRUFBRSxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDekUifQ==

package/dest/contract/interfaces/contract_data_source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract_data_source.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/contract_data_source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE1E,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IAEvC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;IAEnE,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAEvD;;;;;;OAMG;IACH,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAAC;IAEzG;;OAEG;IACH,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAErC,kHAAkH;IAClH,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAErG,wDAAwD;IACxD,kCAAkC,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE"}
+{"version":3,"file":"contract_data_source.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/contract_data_source.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE1E,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IAEvC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAAC;IAEnE,qBAAqB,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAEvD;;;;OAIG;IACH,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAAC;IAExG;;OAEG;IACH,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAErC,kHAAkH;IAClH,oBAAoB,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAErG,wDAAwD;IACxD,kCAAkC,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE"}

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

@@ -2,137 +2,144 @@ import { Fr } from '@aztec/foundation/curves/bn254';
 import { z } from 'zod';
 import { AztecAddress } from '../../aztec-address/index.js';
 import { PublicKeys } from '../../keys/public_keys.js';
-declare const VERSION: 1;
+declare const VERSION: 2;
 /**
- * A contract instance is a concrete deployment of a contract class. It always references a contract class,
- * which dictates what code it executes when called. It has state (both private and public), as well as an
- * address that acts as its identifier. It can be called into. It may have encryption and nullifying public keys.
+ * The address preimage of a contract instance: the immutable data that hashes to its address, i.e. everything a
+ * contract deployment commits to.
+ *
+ * Note that `originaContractClassId` is not necessarily the instance's _current_ class id, in case of upgrades: that
+ * one is not part of the preimage and is instead derived from chain state.
  */
-export interface ContractInstance {
+export interface ContractInstancePreimage {
     /** Version identifier. Initially one, bumped for any changes to the contract instance struct. */
     version: typeof VERSION;
     /** User-generated pseudorandom value for uniqueness. */
     salt: Fr;
     /** Optional deployer address or zero if this was a universal deploy. */
     deployer: AztecAddress;
-    /** Identifier of the contract class for this instance. */
-    currentContractClassId: Fr;
     /** Identifier of the original (at deployment) contract class for this instance */
     originalContractClassId: Fr;
     /** Hash of the selector and arguments to the constructor. */
     initializationHash: Fr;
+    /** Hash of Immutables Values the contract is deployed with. */
+    immutablesHash: Fr;
     /** Public keys associated with this instance. */
     publicKeys: PublicKeys;
 }
+/**
+ * The address preimage plus the current contract class id, which is chain-tracked state derived from the
+ * ContractInstanceRegistry (it equals the original class id unless the contract has been upgraded).
+ */
+export interface ContractInstance extends ContractInstancePreimage {
+    /** Identifier of the contract class this instance currently runs (as of some block). */
+    currentContractClassId: Fr;
+}
+export type ContractInstancePreimageWithAddress = ContractInstancePreimage & {
+    address: AztecAddress;
+};
 export type ContractInstanceWithAddress = ContractInstance & {
     address: AztecAddress;
 };
-export declare const ContractInstanceSchema: z.ZodObject<{
-    version: z.ZodLiteral<1>;
+export declare const ContractInstancePreimageSchema: z.ZodObject<{
+    version: z.ZodLiteral<2>;
     salt: import("../../schemas/index.js").ZodFor<Fr>;
     deployer: import("../../schemas/index.js").ZodFor<AztecAddress>;
-    currentContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
     originalContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
     initializationHash: import("../../schemas/index.js").ZodFor<Fr>;
-    publicKeys: z.ZodEffects<z.ZodObject<{
-        masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
-        masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
-        masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
-        masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
-    }, "strip", z.ZodTypeAny, {
-        masterNullifierPublicKey: import("@aztec/foundation/schemas").Point;
-        masterIncomingViewingPublicKey: import("@aztec/foundation/schemas").Point;
-        masterOutgoingViewingPublicKey: import("@aztec/foundation/schemas").Point;
-        masterTaggingPublicKey: import("@aztec/foundation/schemas").Point;
-    }, {
-        masterNullifierPublicKey: string;
-        masterIncomingViewingPublicKey: string;
-        masterOutgoingViewingPublicKey: string;
-        masterTaggingPublicKey: string;
-    }>, PublicKeys, {
-        masterNullifierPublicKey: string;
-        masterIncomingViewingPublicKey: string;
-        masterOutgoingViewingPublicKey: string;
-        masterTaggingPublicKey: string;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    version: 1;
-    salt: Fr;
-    deployer: AztecAddress;
-    currentContractClassId: Fr;
-    originalContractClassId: Fr;
-    initializationHash: Fr;
-    publicKeys: PublicKeys;
-}, {
-    version: 1;
-    salt?: any;
-    deployer?: any;
-    currentContractClassId?: any;
-    originalContractClassId?: any;
-    initializationHash?: any;
-    publicKeys: {
-        masterNullifierPublicKey: string;
-        masterIncomingViewingPublicKey: string;
-        masterOutgoingViewingPublicKey: string;
-        masterTaggingPublicKey: string;
-    };
-}>;
-export declare const ContractInstanceWithAddressSchema: z.ZodIntersection<z.ZodObject<{
-    version: z.ZodLiteral<1>;
+    immutablesHash: import("../../schemas/index.js").ZodFor<Fr>;
+    publicKeys: z.ZodPipe<z.ZodObject<{
+        npkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        ivpkM: z.ZodType<import("@aztec/foundation/schemas").Point, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Point, string>>;
+        ovpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        tpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        mspkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        fbpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    }, z.core.$strip>, z.ZodTransform<PublicKeys, {
+        npkMHash: Fr;
+        ivpkM: import("@aztec/foundation/schemas").Point;
+        ovpkMHash: Fr;
+        tpkMHash: Fr;
+        mspkMHash: Fr;
+        fbpkMHash: Fr;
+    }>>;
+}, z.core.$strip>;
+export declare const ContractInstanceSchema: z.ZodIntersection<z.ZodObject<{
+    version: z.ZodLiteral<2>;
     salt: import("../../schemas/index.js").ZodFor<Fr>;
     deployer: import("../../schemas/index.js").ZodFor<AztecAddress>;
+    originalContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
+    initializationHash: import("../../schemas/index.js").ZodFor<Fr>;
+    immutablesHash: import("../../schemas/index.js").ZodFor<Fr>;
+    publicKeys: z.ZodPipe<z.ZodObject<{
+        npkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        ivpkM: z.ZodType<import("@aztec/foundation/schemas").Point, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Point, string>>;
+        ovpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        tpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        mspkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        fbpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    }, z.core.$strip>, z.ZodTransform<PublicKeys, {
+        npkMHash: Fr;
+        ivpkM: import("@aztec/foundation/schemas").Point;
+        ovpkMHash: Fr;
+        tpkMHash: Fr;
+        mspkMHash: Fr;
+        fbpkMHash: Fr;
+    }>>;
+}, z.core.$strip>, z.ZodObject<{
     currentContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
+}, z.core.$strip>>;
+export declare const ContractInstancePreimageWithAddressSchema: z.ZodIntersection<z.ZodObject<{
+    version: z.ZodLiteral<2>;
+    salt: import("../../schemas/index.js").ZodFor<Fr>;
+    deployer: import("../../schemas/index.js").ZodFor<AztecAddress>;
     originalContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
     initializationHash: import("../../schemas/index.js").ZodFor<Fr>;
-    publicKeys: z.ZodEffects<z.ZodObject<{
-        masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
-        masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
-        masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
-        masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/schemas").Point, any, string>;
-    }, "strip", z.ZodTypeAny, {
-        masterNullifierPublicKey: import("@aztec/foundation/schemas").Point;
-        masterIncomingViewingPublicKey: import("@aztec/foundation/schemas").Point;
-        masterOutgoingViewingPublicKey: import("@aztec/foundation/schemas").Point;
-        masterTaggingPublicKey: import("@aztec/foundation/schemas").Point;
-    }, {
-        masterNullifierPublicKey: string;
-        masterIncomingViewingPublicKey: string;
-        masterOutgoingViewingPublicKey: string;
-        masterTaggingPublicKey: string;
-    }>, PublicKeys, {
-        masterNullifierPublicKey: string;
-        masterIncomingViewingPublicKey: string;
-        masterOutgoingViewingPublicKey: string;
-        masterTaggingPublicKey: string;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    version: 1;
-    salt: Fr;
-    deployer: AztecAddress;
-    currentContractClassId: Fr;
-    originalContractClassId: Fr;
-    initializationHash: Fr;
-    publicKeys: PublicKeys;
-}, {
-    version: 1;
-    salt?: any;
-    deployer?: any;
-    currentContractClassId?: any;
-    originalContractClassId?: any;
-    initializationHash?: any;
-    publicKeys: {
-        masterNullifierPublicKey: string;
-        masterIncomingViewingPublicKey: string;
-        masterOutgoingViewingPublicKey: string;
-        masterTaggingPublicKey: string;
-    };
-}>, z.ZodObject<{
+    immutablesHash: import("../../schemas/index.js").ZodFor<Fr>;
+    publicKeys: z.ZodPipe<z.ZodObject<{
+        npkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        ivpkM: z.ZodType<import("@aztec/foundation/schemas").Point, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Point, string>>;
+        ovpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        tpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        mspkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        fbpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    }, z.core.$strip>, z.ZodTransform<PublicKeys, {
+        npkMHash: Fr;
+        ivpkM: import("@aztec/foundation/schemas").Point;
+        ovpkMHash: Fr;
+        tpkMHash: Fr;
+        mspkMHash: Fr;
+        fbpkMHash: Fr;
+    }>>;
+}, z.core.$strip>, z.ZodObject<{
     address: import("../../schemas/index.js").ZodFor<AztecAddress>;
-}, "strip", z.ZodTypeAny, {
-    address: AztecAddress;
-}, {
-    address?: any;
-}>>;
+}, z.core.$strip>>;
+export declare const ContractInstanceWithAddressSchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
+    version: z.ZodLiteral<2>;
+    salt: import("../../schemas/index.js").ZodFor<Fr>;
+    deployer: import("../../schemas/index.js").ZodFor<AztecAddress>;
+    originalContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
+    initializationHash: import("../../schemas/index.js").ZodFor<Fr>;
+    immutablesHash: import("../../schemas/index.js").ZodFor<Fr>;
+    publicKeys: z.ZodPipe<z.ZodObject<{
+        npkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        ivpkM: z.ZodType<import("@aztec/foundation/schemas").Point, string, z.core.$ZodTypeInternals<import("@aztec/foundation/schemas").Point, string>>;
+        ovpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        tpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        mspkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+        fbpkMHash: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    }, z.core.$strip>, z.ZodTransform<PublicKeys, {
+        npkMHash: Fr;
+        ivpkM: import("@aztec/foundation/schemas").Point;
+        ovpkMHash: Fr;
+        tpkMHash: Fr;
+        mspkMHash: Fr;
+        fbpkMHash: Fr;
+    }>>;
+}, z.core.$strip>, z.ZodObject<{
+    currentContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
+}, z.core.$strip>>, z.ZodObject<{
+    address: import("../../schemas/index.js").ZodFor<AztecAddress>;
+}, z.core.$strip>>;
 /**
  * Creates a ContractInstance from a plain object without Zod validation.
  * Suitable for deserializing trusted data (e.g., from C++ via MessagePack).
@@ -144,4 +151,4 @@ export declare function contractInstanceFromPlainObject(obj: any): ContractInsta
  */
 export declare function contractInstanceWithAddressFromPlainObject(address: AztecAddress, obj: any): ContractInstanceWithAddress;
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb250cmFjdC9pbnRlcmZhY2VzL2NvbnRyYWN0X2luc3RhbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHdkQsUUFBQSxNQUFNLE9BQU8sR0FBYSxDQUFDO0FBRTNCOzs7O0dBSUc7QUFDSCxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLGlHQUFpRztJQUNqRyxPQUFPLEVBQUUsT0FBTyxPQUFPLENBQUM7SUFDeEIsd0RBQXdEO0lBQ3hELElBQUksRUFBRSxFQUFFLENBQUM7SUFDVCx3RUFBd0U7SUFDeEUsUUFBUSxFQUFFLFlBQVksQ0FBQztJQUN2QiwwREFBMEQ7SUFDMUQsc0JBQXNCLEVBQUUsRUFBRSxDQUFDO0lBQzNCLGtGQUFrRjtJQUNsRix1QkFBdUIsRUFBRSxFQUFFLENBQUM7SUFDNUIsNkRBQTZEO0lBQzdELGtCQUFrQixFQUFFLEVBQUUsQ0FBQztJQUN2QixpREFBaUQ7SUFDakQsVUFBVSxFQUFFLFVBQVUsQ0FBQztDQUN4QjtBQUVELE1BQU0sTUFBTSwyQkFBMkIsR0FBRyxnQkFBZ0IsR0FBRztJQUFFLE9BQU8sRUFBRSxZQUFZLENBQUE7Q0FBRSxDQUFDO0FBRXZGLGVBQU8sTUFBTSxzQkFBc0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7RUFVbEMsQ0FBQztBQUVGLGVBQU8sTUFBTSxpQ0FBaUM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0FFN0MsQ0FBQztBQUVGOzs7R0FHRztBQUNILHdCQUFnQiwrQkFBK0IsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLGdCQUFnQixDQVUxRTtBQUVEOzs7R0FHRztBQUNILHdCQUFnQiwwQ0FBMEMsQ0FDeEQsT0FBTyxFQUFFLFlBQVksRUFDckIsR0FBRyxFQUFFLEdBQUcsR0FDUCwyQkFBMkIsQ0FLN0IifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2UuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb250cmFjdC9pbnRlcmZhY2VzL2NvbnRyYWN0X2luc3RhbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUVwRCxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sS0FBSyxDQUFDO0FBRXhCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUM1RCxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHdkQsUUFBQSxNQUFNLE9BQU8sR0FBYSxDQUFDO0FBRTNCOzs7Ozs7R0FNRztBQUNILE1BQU0sV0FBVyx3QkFBd0I7SUFDdkMsaUdBQWlHO0lBQ2pHLE9BQU8sRUFBRSxPQUFPLE9BQU8sQ0FBQztJQUN4Qix3REFBd0Q7SUFDeEQsSUFBSSxFQUFFLEVBQUUsQ0FBQztJQUNULHdFQUF3RTtJQUN4RSxRQUFRLEVBQUUsWUFBWSxDQUFDO0lBQ3ZCLGtGQUFrRjtJQUNsRix1QkFBdUIsRUFBRSxFQUFFLENBQUM7SUFDNUIsNkRBQTZEO0lBQzdELGtCQUFrQixFQUFFLEVBQUUsQ0FBQztJQUN2QiwrREFBK0Q7SUFDL0QsY0FBYyxFQUFFLEVBQUUsQ0FBQztJQUNuQixpREFBaUQ7SUFDakQsVUFBVSxFQUFFLFVBQVUsQ0FBQztDQUN4QjtBQUVEOzs7R0FHRztBQUNILE1BQU0sV0FBVyxnQkFBaUIsU0FBUSx3QkFBd0I7SUFDaEUsd0ZBQXdGO0lBQ3hGLHNCQUFzQixFQUFFLEVBQUUsQ0FBQztDQUM1QjtBQUVELE1BQU0sTUFBTSxtQ0FBbUMsR0FBRyx3QkFBd0IsR0FBRztJQUFFLE9BQU8sRUFBRSxZQUFZLENBQUE7Q0FBRSxDQUFDO0FBRXZHLE1BQU0sTUFBTSwyQkFBMkIsR0FBRyxnQkFBZ0IsR0FBRztJQUFFLE9BQU8sRUFBRSxZQUFZLENBQUE7Q0FBRSxDQUFDO0FBRXZGLGVBQU8sTUFBTSw4QkFBOEI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7aUJBVTFDLENBQUM7QUFFRixlQUFPLE1BQU0sc0JBQXNCOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7a0JBRWxDLENBQUM7QUFFRixlQUFPLE1BQU0seUNBQXlDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7a0JBRXJELENBQUM7QUFFRixlQUFPLE1BQU0saUNBQWlDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztrQkFFN0MsQ0FBQztBQUVGOzs7R0FHRztBQUNILHdCQUFnQiwrQkFBK0IsQ0FBQyxHQUFHLEVBQUUsR0FBRyxHQUFHLGdCQUFnQixDQVcxRTtBQUVEOzs7R0FHRztBQUNILHdCQUFnQiwwQ0FBMEMsQ0FDeEQsT0FBTyxFQUFFLFlBQVksRUFDckIsR0FBRyxFQUFFLEdBQUcsR0FDUCwyQkFBMkIsQ0FLN0IifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"contract_instance.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/contract_instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,QAAA,MAAM,OAAO,GAAa,CAAC;AAE3B;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,iGAAiG;IACjG,OAAO,EAAE,OAAO,OAAO,CAAC;IACxB,wDAAwD;IACxD,IAAI,EAAE,EAAE,CAAC;IACT,wEAAwE;IACxE,QAAQ,EAAE,YAAY,CAAC;IACvB,0DAA0D;IAC1D,sBAAsB,EAAE,EAAE,CAAC;IAC3B,kFAAkF;IAClF,uBAAuB,EAAE,EAAE,CAAC;IAC5B,6DAA6D;IAC7D,kBAAkB,EAAE,EAAE,CAAC;IACvB,iDAAiD;IACjD,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,MAAM,MAAM,2BAA2B,GAAG,gBAAgB,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC;AAEvF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUlC,CAAC;AAEF,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAE7C,CAAC;AAEF;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,GAAG,GAAG,gBAAgB,CAU1E;AAED;;;GAGG;AACH,wBAAgB,0CAA0C,CACxD,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,GAAG,GACP,2BAA2B,CAK7B"}
+{"version":3,"file":"contract_instance.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/contract_instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEpD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAGvD,QAAA,MAAM,OAAO,GAAa,CAAC;AAE3B;;;;;;GAMG;AACH,MAAM,WAAW,wBAAwB;IACvC,iGAAiG;IACjG,OAAO,EAAE,OAAO,OAAO,CAAC;IACxB,wDAAwD;IACxD,IAAI,EAAE,EAAE,CAAC;IACT,wEAAwE;IACxE,QAAQ,EAAE,YAAY,CAAC;IACvB,kFAAkF;IAClF,uBAAuB,EAAE,EAAE,CAAC;IAC5B,6DAA6D;IAC7D,kBAAkB,EAAE,EAAE,CAAC;IACvB,+DAA+D;IAC/D,cAAc,EAAE,EAAE,CAAC;IACnB,iDAAiD;IACjD,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAiB,SAAQ,wBAAwB;IAChE,wFAAwF;IACxF,sBAAsB,EAAE,EAAE,CAAC;CAC5B;AAED,MAAM,MAAM,mCAAmC,GAAG,wBAAwB,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC;AAEvG,MAAM,MAAM,2BAA2B,GAAG,gBAAgB,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC;AAEvF,eAAO,MAAM,8BAA8B;;;;;;;;;;;;;;;;;;;;;;iBAU1C,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;kBAElC,CAAC;AAEF,eAAO,MAAM,yCAAyC;;;;;;;;;;;;;;;;;;;;;;;;kBAErD,CAAC;AAEF,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;kBAE7C,CAAC;AAEF;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,GAAG,GAAG,gBAAgB,CAW1E;AAED;;;GAGG;AACH,wBAAgB,0CAA0C,CACxD,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,GAAG,GACP,2BAA2B,CAK7B"}

package/dest/contract/interfaces/contract_instance.js

@@ -3,16 +3,22 @@ import { z } from 'zod';
 import { AztecAddress } from '../../aztec-address/index.js';
 import { PublicKeys } from '../../keys/public_keys.js';
 import { schemas, zodFor } from '../../schemas/index.js';
-const VERSION = 1;
-export const ContractInstanceSchema = zodFor()(z.object({
+const VERSION = 2;
+export const ContractInstancePreimageSchema = zodFor()(z.object({
     version: z.literal(VERSION),
     salt: schemas.Fr,
     deployer: schemas.AztecAddress,
-    currentContractClassId: schemas.Fr,
     originalContractClassId: schemas.Fr,
     initializationHash: schemas.Fr,
+    immutablesHash: schemas.Fr,
     publicKeys: PublicKeys.schema
 }));
+export const ContractInstanceSchema = zodFor()(ContractInstancePreimageSchema.and(z.object({
+    currentContractClassId: schemas.Fr
+})));
+export const ContractInstancePreimageWithAddressSchema = zodFor()(ContractInstancePreimageSchema.and(z.object({
+    address: schemas.AztecAddress
+})));
 export const ContractInstanceWithAddressSchema = zodFor()(ContractInstanceSchema.and(z.object({
     address: schemas.AztecAddress
 })));
@@ -21,12 +27,13 @@ export const ContractInstanceWithAddressSchema = zodFor()(ContractInstanceSchema
  * Suitable for deserializing trusted data (e.g., from C++ via MessagePack).
  */ export function contractInstanceFromPlainObject(obj) {
     return {
-        version: 1,
+        version: 2,
         salt: Fr.fromPlainObject(obj.salt),
         deployer: AztecAddress.fromPlainObject(obj.deployer),
         currentContractClassId: Fr.fromPlainObject(obj.currentContractClassId),
         originalContractClassId: Fr.fromPlainObject(obj.originalContractClassId),
         initializationHash: Fr.fromPlainObject(obj.initializationHash),
+        immutablesHash: Fr.fromPlainObject(obj.immutablesHash),
         publicKeys: PublicKeys.fromPlainObject(obj.publicKeys)
     };
 }