@aztec/stdlib 0.0.1-commit.a072138 → 0.0.1-commit.a4600f49

package/dest/contract/interfaces/contract_class.js

@@ -7,29 +7,6 @@ const PrivateFunctionSchema = zodFor()(z.object({
     selector: FunctionSelector.schema,
     vkHash: schemas.Fr
 }));
-const ExecutablePrivateFunctionSchema = zodFor()(PrivateFunctionSchema.and(z.object({
-    bytecode: schemas.Buffer
-})));
-const UtilityFunctionSchema = zodFor()(z.object({
-    selector: FunctionSelector.schema,
-    bytecode: schemas.Buffer
-}));
-const PrivateFunctionMembershipProofSchema = zodFor()(z.object({
-    artifactMetadataHash: schemas.Fr,
-    functionMetadataHash: schemas.Fr,
-    utilityFunctionsTreeRoot: schemas.Fr,
-    privateFunctionTreeSiblingPath: z.array(schemas.Fr),
-    privateFunctionTreeLeafIndex: schemas.Integer,
-    artifactTreeSiblingPath: z.array(schemas.Fr),
-    artifactTreeLeafIndex: schemas.Integer
-}));
-const UtilityFunctionMembershipProofSchema = zodFor()(z.object({
-    artifactMetadataHash: schemas.Fr,
-    functionMetadataHash: schemas.Fr,
-    privateFunctionsArtifactTreeRoot: schemas.Fr,
-    artifactTreeSiblingPath: z.array(schemas.Fr),
-    artifactTreeLeafIndex: schemas.Integer
-}));
 export const ContractClassSchema = zodFor()(z.object({
     version: z.literal(VERSION),
     artifactHash: schemas.Fr,
@@ -41,9 +18,7 @@ export const ContractClassWithIdSchema = zodFor()(ContractClassSchema.extend({
 }));
 export const ContractClassPublicSchema = zodFor()(z.object({
     id: schemas.Fr,
-    privateFunctionsRoot: schemas.Fr,
-    privateFunctions: z.array(ExecutablePrivateFunctionSchema.and(PrivateFunctionMembershipProofSchema)),
-    utilityFunctions: z.array(UtilityFunctionSchema.and(UtilityFunctionMembershipProofSchema))
+    privateFunctionsRoot: schemas.Fr
 }).and(ContractClassSchema.omit({
     privateFunctions: true
 })));
@@ -58,8 +33,6 @@ export const ContractClassPublicSchema = zodFor()(z.object({
         version: 1,
         artifactHash: Fr.fromPlainObject(obj.artifactHash),
         privateFunctionsRoot: Fr.fromPlainObject(obj.privateFunctionsRoot),
-        privateFunctions: [],
-        utilityFunctions: [],
         packedBytecode: obj.packedBytecode instanceof Buffer ? obj.packedBytecode : Buffer.from(obj.packedBytecode)
     };
 }

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)
     };
 }

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

@@ -19,33 +19,13 @@ export type ContractInstanceUpdateWithAddress = ContractInstanceUpdate & {
 export declare const ContractInstanceUpdateSchema: z.ZodObject<{
     prevContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
     newContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
-    timestampOfChange: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-}, "strip", z.ZodTypeAny, {
-    prevContractClassId: Fr;
-    newContractClassId: Fr;
-    timestampOfChange: bigint;
-}, {
-    prevContractClassId?: any;
-    newContractClassId?: any;
-    timestampOfChange: string | number | bigint;
-}>;
+    timestampOfChange: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
+}, z.core.$strip>;
 export declare const ContractInstanceUpdateWithAddressSchema: z.ZodIntersection<z.ZodObject<{
     prevContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
     newContractClassId: import("../../schemas/index.js").ZodFor<Fr>;
-    timestampOfChange: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodBigInt>;
-}, "strip", z.ZodTypeAny, {
-    prevContractClassId: Fr;
-    newContractClassId: Fr;
-    timestampOfChange: bigint;
-}, {
-    prevContractClassId?: any;
-    newContractClassId?: any;
-    timestampOfChange: string | number | bigint;
-}>, z.ZodObject<{
+    timestampOfChange: z.ZodPipe<z.ZodUnion<readonly [z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodCoercedBigInt<string | number | bigint>>;
+}, z.core.$strip>, z.ZodObject<{
     address: import("../../schemas/index.js").ZodFor<AztecAddress>;
-}, "strip", z.ZodTypeAny, {
-    address: AztecAddress;
-}, {
-    address?: any;
-}>>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2VfdXBkYXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3QvaW50ZXJmYWNlcy9jb250cmFjdF9pbnN0YW5jZV91cGRhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFekQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUVqRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRDs7R0FFRztBQUNILE1BQU0sV0FBVyxzQkFBc0I7SUFDckMsa0VBQWtFO0lBQ2xFLG1CQUFtQixFQUFFLEVBQUUsQ0FBQztJQUN4Qiw4REFBOEQ7SUFDOUQsa0JBQWtCLEVBQUUsRUFBRSxDQUFDO0lBQ3ZCLDJFQUEyRTtJQUMzRSxpQkFBaUIsRUFBRSxNQUFNLENBQUM7Q0FDM0I7QUFFRCxNQUFNLE1BQU0saUNBQWlDLEdBQUcsc0JBQXNCLEdBQUc7SUFBRSxPQUFPLEVBQUUsWUFBWSxDQUFBO0NBQUUsQ0FBQztBQUVuRyxlQUFPLE1BQU0sNEJBQTRCOzs7Ozs7Ozs7Ozs7RUFNeEMsQ0FBQztBQUVGLGVBQU8sTUFBTSx1Q0FBdUM7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQUVuRCxDQUFDIn0=
+}, z.core.$strip>>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJhY3RfaW5zdGFuY2VfdXBkYXRlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3QvaW50ZXJmYWNlcy9jb250cmFjdF9pbnN0YW5jZV91cGRhdGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFFekQsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUVqRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRDs7R0FFRztBQUNILE1BQU0sV0FBVyxzQkFBc0I7SUFDckMsa0VBQWtFO0lBQ2xFLG1CQUFtQixFQUFFLEVBQUUsQ0FBQztJQUN4Qiw4REFBOEQ7SUFDOUQsa0JBQWtCLEVBQUUsRUFBRSxDQUFDO0lBQ3ZCLDJFQUEyRTtJQUMzRSxpQkFBaUIsRUFBRSxNQUFNLENBQUM7Q0FDM0I7QUFFRCxNQUFNLE1BQU0saUNBQWlDLEdBQUcsc0JBQXNCLEdBQUc7SUFBRSxPQUFPLEVBQUUsWUFBWSxDQUFBO0NBQUUsQ0FBQztBQUVuRyxlQUFPLE1BQU0sNEJBQTRCOzs7O2lCQU14QyxDQUFDO0FBRUYsZUFBTyxNQUFNLHVDQUF1Qzs7Ozs7O2tCQUVuRCxDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"contract_instance_update.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/contract_instance_update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,kEAAkE;IAClE,mBAAmB,EAAE,EAAE,CAAC;IACxB,8DAA8D;IAC9D,kBAAkB,EAAE,EAAE,CAAC;IACvB,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,iCAAiC,GAAG,sBAAsB,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC;AAEnG,eAAO,MAAM,4BAA4B;;;;;;;;;;;;EAMxC,CAAC;AAEF,eAAO,MAAM,uCAAuC;;;;;;;;;;;;;;;;;;GAEnD,CAAC"}
+{"version":3,"file":"contract_instance_update.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/contract_instance_update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,kEAAkE;IAClE,mBAAmB,EAAE,EAAE,CAAC;IACxB,8DAA8D;IAC9D,kBAAkB,EAAE,EAAE,CAAC;IACvB,2EAA2E;IAC3E,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,iCAAiC,GAAG,sBAAsB,GAAG;IAAE,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC;AAEnG,eAAO,MAAM,4BAA4B;;;;iBAMxC,CAAC;AAEF,eAAO,MAAM,uCAAuC;;;;;;kBAEnD,CAAC"}

package/dest/contract/interfaces/node-info.d.ts

@@ -1,6 +1,14 @@
 import { type L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
 import type { ZodFor } from '@aztec/foundation/schemas';
 import { type ProtocolContractAddresses } from './protocol_contract_addresses.js';
+/** Limits a single transaction may declare on a network. */
+export interface TxsLimits {
+    /** Maximum gas limits a single tx may declare: the smaller of the per-tx maximum and the per-block allocation. */
+    gas: {
+        daGas: number;
+        l2Gas: number;
+    };
+}
 /** Provides basic information about the running node. */
 export interface NodeInfo {
     /** Version as tracked in the aztec-packages repository. */
@@ -15,6 +23,10 @@ export interface NodeInfo {
     l1ContractAddresses: L1ContractAddresses;
     /** Protocol contract addresses */
     protocolContractAddresses: ProtocolContractAddresses;
+    /** Whether the node requires real proofs for transaction submission. */
+    realProofs: boolean;
+    /** Limits a single tx may declare on this network. Clients rely on this to set fallback gas limits. */
+    txsLimits: TxsLimits;
 }
 export declare const NodeInfoSchema: ZodFor<NodeInfo>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS1pbmZvLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3QvaW50ZXJmYWNlcy9ub2RlLWluZm8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssbUJBQW1CLEVBQTZCLE1BQU0sdUNBQXVDLENBQUM7QUFDNUcsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFJeEQsT0FBTyxFQUFFLEtBQUsseUJBQXlCLEVBQW1DLE1BQU0sa0NBQWtDLENBQUM7QUFFbkgseURBQXlEO0FBQ3pELE1BQU0sV0FBVyxRQUFRO0lBQ3ZCLDJEQUEyRDtJQUMzRCxXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLG1CQUFtQjtJQUNuQixTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLHNCQUFzQjtJQUN0QixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHNCQUFzQjtJQUN0QixHQUFHLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUN4Qix5Q0FBeUM7SUFDekMsbUJBQW1CLEVBQUUsbUJBQW1CLENBQUM7SUFDekMsa0NBQWtDO0lBQ2xDLHlCQUF5QixFQUFFLHlCQUF5QixDQUFDO0NBQ3REO0FBRUQsZUFBTyxNQUFNLGNBQWMsRUFBRSxNQUFNLENBQUMsUUFBUSxDQVNLLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9kZS1pbmZvLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3QvaW50ZXJmYWNlcy9ub2RlLWluZm8udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssbUJBQW1CLEVBQTZCLE1BQU0sdUNBQXVDLENBQUM7QUFDNUcsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFJeEQsT0FBTyxFQUFFLEtBQUsseUJBQXlCLEVBQW1DLE1BQU0sa0NBQWtDLENBQUM7QUFFbkgsNERBQTREO0FBQzVELE1BQU0sV0FBVyxTQUFTO0lBQ3hCLGtIQUFrSDtJQUNsSCxHQUFHLEVBQUU7UUFBRSxLQUFLLEVBQUUsTUFBTSxDQUFDO1FBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQTtLQUFFLENBQUM7Q0FDdkM7QUFFRCx5REFBeUQ7QUFDekQsTUFBTSxXQUFXLFFBQVE7SUFDdkIsMkRBQTJEO0lBQzNELFdBQVcsRUFBRSxNQUFNLENBQUM7SUFDcEIsbUJBQW1CO0lBQ25CLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsc0JBQXNCO0lBQ3RCLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIsc0JBQXNCO0lBQ3RCLEdBQUcsRUFBRSxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQ3hCLHlDQUF5QztJQUN6QyxtQkFBbUIsRUFBRSxtQkFBbUIsQ0FBQztJQUN6QyxrQ0FBa0M7SUFDbEMseUJBQXlCLEVBQUUseUJBQXlCLENBQUM7SUFDckQsd0VBQXdFO0lBQ3hFLFVBQVUsRUFBRSxPQUFPLENBQUM7SUFDcEIsdUdBQXVHO0lBQ3ZHLFNBQVMsRUFBRSxTQUFTLENBQUM7Q0FDdEI7QUFFRCxlQUFPLE1BQU0sY0FBYyxFQUFFLE1BQU0sQ0FBQyxRQUFRLENBYUssQ0FBQyJ9

package/dest/contract/interfaces/node-info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-info.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/node-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAA6B,MAAM,uCAAuC,CAAC;AAC5G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,EAAE,KAAK,yBAAyB,EAAmC,MAAM,kCAAkC,CAAC;AAEnH,yDAAyD;AACzD,MAAM,WAAW,QAAQ;IACvB,2DAA2D;IAC3D,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB;IACtB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,yCAAyC;IACzC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kCAAkC;IAClC,yBAAyB,EAAE,yBAAyB,CAAC;CACtD;AAED,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,QAAQ,CASK,CAAC"}
+{"version":3,"file":"node-info.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/node-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAA6B,MAAM,uCAAuC,CAAC;AAC5G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,EAAE,KAAK,yBAAyB,EAAmC,MAAM,kCAAkC,CAAC;AAEnH,4DAA4D;AAC5D,MAAM,WAAW,SAAS;IACxB,kHAAkH;IAClH,GAAG,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CACvC;AAED,yDAAyD;AACzD,MAAM,WAAW,QAAQ;IACvB,2DAA2D;IAC3D,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,sBAAsB;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB;IACtB,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,yCAAyC;IACzC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kCAAkC;IAClC,yBAAyB,EAAE,yBAAyB,CAAC;IACrD,wEAAwE;IACxE,UAAU,EAAE,OAAO,CAAC;IACpB,uGAAuG;IACvG,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,QAAQ,CAaK,CAAC"}

package/dest/contract/interfaces/node-info.js

@@ -7,7 +7,14 @@ export const NodeInfoSchema = z.object({
     rollupVersion: z.number().int().nonnegative(),
     enr: z.string().optional(),
     l1ContractAddresses: L1ContractAddressesSchema,
-    protocolContractAddresses: ProtocolContractAddressesSchema
+    protocolContractAddresses: ProtocolContractAddressesSchema,
+    realProofs: z.boolean(),
+    txsLimits: z.object({
+        gas: z.object({
+            daGas: z.number().int().nonnegative(),
+            l2Gas: z.number().int().nonnegative()
+        })
+    })
 }).transform((obj)=>({
         enr: undefined,
         ...obj

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

@@ -12,15 +12,5 @@ export declare const ProtocolContractAddressesSchema: z.ZodObject<{
     feeJuice: import("../../schemas/index.js").ZodFor<AztecAddress>;
     instanceRegistry: import("../../schemas/index.js").ZodFor<AztecAddress>;
     multiCallEntrypoint: import("../../schemas/index.js").ZodFor<AztecAddress>;
-}, "strip", z.ZodTypeAny, {
-    classRegistry: AztecAddress;
-    feeJuice: AztecAddress;
-    instanceRegistry: AztecAddress;
-    multiCallEntrypoint: AztecAddress;
-}, {
-    classRegistry?: any;
-    feeJuice?: any;
-    instanceRegistry?: any;
-    multiCallEntrypoint?: any;
-}>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2xfY29udHJhY3RfYWRkcmVzc2VzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3QvaW50ZXJmYWNlcy9wcm90b2NvbF9jb250cmFjdF9hZGRyZXNzZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUdqRSxlQUFPLE1BQU0sc0JBQXNCLG1GQUFvRixDQUFDO0FBRXhILE1BQU0sTUFBTSx5QkFBeUIsR0FBRztJQUN0QyxhQUFhLEVBQUUsWUFBWSxDQUFDO0lBQzVCLFFBQVEsRUFBRSxZQUFZLENBQUM7SUFDdkIsZ0JBQWdCLEVBQUUsWUFBWSxDQUFDO0lBQy9CLG1CQUFtQixFQUFFLFlBQVksQ0FBQztDQUNuQyxDQUFDO0FBRUYsZUFBTyxNQUFNLCtCQUErQjs7Ozs7Ozs7Ozs7Ozs7O0VBSzFDLENBQUMifQ==
+}, z.core.$strip>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2xfY29udHJhY3RfYWRkcmVzc2VzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3QvaW50ZXJmYWNlcy9wcm90b2NvbF9jb250cmFjdF9hZGRyZXNzZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUdqRSxlQUFPLE1BQU0sc0JBQXNCLG1GQUFvRixDQUFDO0FBRXhILE1BQU0sTUFBTSx5QkFBeUIsR0FBRztJQUN0QyxhQUFhLEVBQUUsWUFBWSxDQUFDO0lBQzVCLFFBQVEsRUFBRSxZQUFZLENBQUM7SUFDdkIsZ0JBQWdCLEVBQUUsWUFBWSxDQUFDO0lBQy9CLG1CQUFtQixFQUFFLFlBQVksQ0FBQztDQUNuQyxDQUFDO0FBRUYsZUFBTyxNQUFNLCtCQUErQjs7Ozs7aUJBSzFDLENBQUMifQ==

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

@@ -1 +1 @@
-{"version":3,"file":"protocol_contract_addresses.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/protocol_contract_addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAGjE,eAAO,MAAM,sBAAsB,mFAAoF,CAAC;AAExH,MAAM,MAAM,yBAAyB,GAAG;IACtC,aAAa,EAAE,YAAY,CAAC;IAC5B,QAAQ,EAAE,YAAY,CAAC;IACvB,gBAAgB,EAAE,YAAY,CAAC;IAC/B,mBAAmB,EAAE,YAAY,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;EAK1C,CAAC"}
+{"version":3,"file":"protocol_contract_addresses.d.ts","sourceRoot":"","sources":["../../../src/contract/interfaces/protocol_contract_addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAGjE,eAAO,MAAM,sBAAsB,mFAAoF,CAAC;AAExH,MAAM,MAAM,yBAAyB,GAAG;IACtC,aAAa,EAAE,YAAY,CAAC;IAC5B,QAAQ,EAAE,YAAY,CAAC;IACvB,gBAAgB,EAAE,YAAY,CAAC;IAC/B,mBAAmB,EAAE,YAAY,CAAC;CACnC,CAAC;AAEF,eAAO,MAAM,+BAA+B;;;;;iBAK1C,CAAC"}

package/dest/contract/partial_address.d.ts

@@ -1,7 +1,13 @@
 import type { Fr } from '@aztec/foundation/curves/bn254';
 /**
- * A type which along with public key forms a preimage of a contract address. See the link below for more details
- * https://github.com/AztecProtocol/aztec-packages/blob/master/docs/docs/concepts/foundation/accounts/keys.md#addresses-partial-addresses-and-public-keys
+ * The contract-side preimage of an Aztec address, i.e. the commitment to a specific contract instance.
+ *
+ * A partial address commits to a contract's code and initialization
+ * (`hash(contract_class_id, salted_initialization_hash)`) but not to its keys. Combined with an account's `PublicKeys`,
+ * it fully determines the address: `address = (hash(public_keys_hash, partial_address) * G + Ivpk_m).x`. Two accounts
+ * therefore share an address only if they share both their public keys and their partial address.
+ *
+ * See `computePartialAddress` for the derivation.
  */
 export type PartialAddress = Fr;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFydGlhbF9hZGRyZXNzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvcGFydGlhbF9hZGRyZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpEOzs7R0FHRztBQUNILE1BQU0sTUFBTSxjQUFjLEdBQUcsRUFBRSxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFydGlhbF9hZGRyZXNzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29udHJhY3QvcGFydGlhbF9hZGRyZXNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXpEOzs7Ozs7Ozs7R0FTRztBQUNILE1BQU0sTUFBTSxjQUFjLEdBQUcsRUFBRSxDQUFDIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"partial_address.d.ts","sourceRoot":"","sources":["../../src/contract/partial_address.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,EAAE,CAAC"}
+{"version":3,"file":"partial_address.d.ts","sourceRoot":"","sources":["../../src/contract/partial_address.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AAEzD;;;;;;;;;GASG;AACH,MAAM,MAAM,cAAc,GAAG,EAAE,CAAC"}

package/dest/contract/partial_address.js

@@ -1,4 +1,10 @@
 /**
- * A type which along with public key forms a preimage of a contract address. See the link below for more details
- * https://github.com/AztecProtocol/aztec-packages/blob/master/docs/docs/concepts/foundation/accounts/keys.md#addresses-partial-addresses-and-public-keys
+ * The contract-side preimage of an Aztec address, i.e. the commitment to a specific contract instance.
+ *
+ * A partial address commits to a contract's code and initialization
+ * (`hash(contract_class_id, salted_initialization_hash)`) but not to its keys. Combined with an account's `PublicKeys`,
+ * it fully determines the address: `address = (hash(public_keys_hash, partial_address) * G + Ivpk_m).x`. Two accounts
+ * therefore share an address only if they share both their public keys and their partial address.
+ *
+ * See `computePartialAddress` for the derivation.
  */ export { };

package/dest/contract/private_function.d.ts

@@ -7,4 +7,4 @@ export declare function computePrivateFunctionsTree(fns: PrivateFunction[]): Pro
 export declare function computePrivateFunctionsRoot(fns: PrivateFunction[]): Promise<Fr>;
 /** Returns the leaf for a given private function. */
 export declare function computePrivateFunctionLeaf(fn: PrivateFunction): Promise<Buffer>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9mdW5jdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L3ByaXZhdGVfZnVuY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBd0IsTUFBTSx5QkFBeUIsQ0FBQztBQUVoRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQU90RSw0RUFBNEU7QUFDNUUsd0JBQXNCLDJCQUEyQixDQUFDLEdBQUcsRUFBRSxlQUFlLEVBQUUsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBSTdGO0FBRUQsbUZBQW1GO0FBQ25GLHdCQUFzQiwyQkFBMkIsQ0FBQyxHQUFHLEVBQUUsZUFBZSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUlyRjtBQU9ELHFEQUFxRDtBQUNyRCx3QkFBc0IsMEJBQTBCLENBQUMsRUFBRSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBRXJGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9mdW5jdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0L3ByaXZhdGVfZnVuY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQ3BELE9BQU8sRUFBRSxLQUFLLFVBQVUsRUFBd0IsTUFBTSx5QkFBeUIsQ0FBQztBQUdoRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQU90RSw0RUFBNEU7QUFDNUUsd0JBQXNCLDJCQUEyQixDQUFDLEdBQUcsRUFBRSxlQUFlLEVBQUUsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBSTdGO0FBRUQsbUZBQW1GO0FBQ25GLHdCQUFzQiwyQkFBMkIsQ0FBQyxHQUFHLEVBQUUsZUFBZSxFQUFFLEdBQUcsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUlyRjtBQU9ELHFEQUFxRDtBQUNyRCx3QkFBc0IsMEJBQTBCLENBQUMsRUFBRSxFQUFFLGVBQWUsR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBRXJGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"private_function.d.ts","sourceRoot":"","sources":["../../src/contract/private_function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,UAAU,EAAwB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAOtE,4EAA4E;AAC5E,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAI7F;AAED,mFAAmF;AACnF,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAIrF;AAOD,qDAAqD;AACrD,wBAAsB,0BAA0B,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAErF"}
+{"version":3,"file":"private_function.d.ts","sourceRoot":"","sources":["../../src/contract/private_function.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,UAAU,EAAwB,MAAM,yBAAyB,CAAC;AAGhF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAOtE,4EAA4E;AAC5E,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAI7F;AAED,mFAAmF;AACnF,wBAAsB,2BAA2B,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAIrF;AAOD,qDAAqD;AACrD,wBAAsB,0BAA0B,CAAC,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAErF"}

package/dest/contract/private_function.js

@@ -1,7 +1,8 @@
-import { FUNCTION_TREE_HEIGHT, GeneratorIndex } from '@aztec/constants';
+import { DomainSeparator, FUNCTION_TREE_HEIGHT } from '@aztec/constants';
 import { poseidon2Hash, poseidon2HashWithSeparator } from '@aztec/foundation/crypto/poseidon';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { MerkleTreeCalculator } from '@aztec/foundation/trees';
+import { computeMerkleHash } from '../hash/hash.js';
 // Memoize the merkle tree calculators to avoid re-computing the zero-hash for each level in each call
 let privateFunctionTreeCalculator;
 const PRIVATE_FUNCTION_SIZE = 2;
@@ -25,15 +26,12 @@ function computePrivateFunctionLeaves(fns) {
     return (await poseidon2HashWithSeparator([
         fn.selector,
         fn.vkHash
-    ], GeneratorIndex.PRIVATE_FUNCTION_LEAF)).toBuffer();
+    ], DomainSeparator.PRIVATE_FUNCTION_LEAF)).toBuffer();
 }
 async function getPrivateFunctionTreeCalculator() {
     if (!privateFunctionTreeCalculator) {
         const functionTreeZeroLeaf = (await poseidon2Hash(new Array(PRIVATE_FUNCTION_SIZE).fill(0))).toBuffer();
-        privateFunctionTreeCalculator = await MerkleTreeCalculator.create(FUNCTION_TREE_HEIGHT, functionTreeZeroLeaf, async (left, right)=>(await poseidon2Hash([
-                left,
-                right
-            ])).toBuffer());
+        privateFunctionTreeCalculator = await MerkleTreeCalculator.create(FUNCTION_TREE_HEIGHT, functionTreeZeroLeaf, async (left, right)=>(await computeMerkleHash(Fr.fromBuffer(left), Fr.fromBuffer(right))).toBuffer());
     }
     return privateFunctionTreeCalculator;
 }