@aztec/aztec.js 3.0.0-nightly.20251111 → 3.0.0-nightly.20251113

package/dest/wallet/wallet.d.ts

@@ -1,7 +1,6 @@
 import type { ChainInfo } from '@aztec/entrypoints/interfaces';
-import type { ExecutionPayload } from '@aztec/entrypoints/payload';
 import type { Fr } from '@aztec/foundation/fields';
-import { type ContractArtifact, type EventMetadataDefinition, FunctionType } from '@aztec/stdlib/abi';
+import { type ContractArtifact, type EventMetadataDefinition, type FunctionCall, FunctionType } from '@aztec/stdlib/abi';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type ContractClassMetadata, type ContractInstanceWithAddress, type ContractInstantiationData, type ContractMetadata } from '@aztec/stdlib/contract';
@@ -9,6 +8,7 @@ import { Gas } from '@aztec/stdlib/gas';
 import { PublicKeys } from '@aztec/stdlib/keys';
 import { type ApiSchemaFor, type ZodFor } from '@aztec/stdlib/schemas';
 import { Capsule, HashedValues, TxHash, TxProfileResult, TxReceipt, TxSimulationResult, UtilitySimulationResult } from '@aztec/stdlib/tx';
+import type { ExecutionPayload } from '@aztec/stdlib/tx';
 import { z } from 'zod';
 import type { Contract } from '../contract/contract.js';
 import type { FeeEstimationOptions, GasSettingsOption, ProfileInteractionOptions, SendInteractionOptions, SimulateInteractionOptions } from '../contract/interaction_options.js';
@@ -30,16 +30,6 @@ export type Aliased<T> = {
  * A reduced representation of a Contract, only including its instance and artifact
  */
 export type ContractInstanceAndArtifact = Pick<Contract, 'artifact' | 'instance'>;
-/**
- * Options that can be provided to the wallet for configuration of the fee payment.
- */
-export type UserFeeOptions = {
-    /**
-     * Informs the wallet that the crafted tx already contains the necessary calls to pay for its fee
-     * and who is paying
-     */
-    embeddedPaymentMethodFeePayer?: AztecAddress;
-} & GasSettingsOption;
 /**
  * Options for simulating interactions with the wallet. Overrides the fee settings of an interaction with
  * a simplified version that only hints at the wallet wether the interaction contains a
@@ -47,7 +37,7 @@ export type UserFeeOptions = {
  */
 export type SimulateOptions = Omit<SimulateInteractionOptions, 'fee'> & {
     /** The fee options */
-    fee?: UserFeeOptions & FeeEstimationOptions;
+    fee?: GasSettingsOption & FeeEstimationOptions;
 };
 /**
  * Options for profiling interactions with the wallet. Overrides the fee settings of an interaction with
@@ -56,7 +46,7 @@ export type SimulateOptions = Omit<SimulateInteractionOptions, 'fee'> & {
  */
 export type ProfileOptions = Omit<ProfileInteractionOptions, 'fee'> & {
     /** The fee options */
-    fee?: UserFeeOptions;
+    fee?: GasSettingsOption;
 };
 /**
  * Options for sending/proving interactions with the wallet. Overrides the fee settings of an interaction with
@@ -65,7 +55,7 @@ export type ProfileOptions = Omit<ProfileInteractionOptions, 'fee'> & {
  */
 export type SendOptions = Omit<SendInteractionOptions, 'fee'> & {
     /** The fee options */
-    fee?: UserFeeOptions;
+    fee?: GasSettingsOption;
 };
 /**
  * Helper type that represents all methods that can be batched.
@@ -118,7 +108,7 @@ export type Wallet = {
     registerContract(instanceData: AztecAddress | ContractInstanceWithAddress | ContractInstantiationData | ContractInstanceAndArtifact, artifact: ContractArtifact): Promise<ContractInstanceWithAddress>;
     registerContract(instanceData: AztecAddress | ContractInstanceWithAddress | ContractInstantiationData | ContractInstanceAndArtifact, artifact: ContractArtifact | undefined, secretKey: Fr | undefined): Promise<ContractInstanceWithAddress>;
     simulateTx(exec: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResult>;
-    simulateUtility(functionName: string, args: any[], to: AztecAddress, authwits?: AuthWitness[]): Promise<UtilitySimulationResult>;
+    simulateUtility(call: FunctionCall, authwits?: AuthWitness[], scopes?: AztecAddress[]): Promise<UtilitySimulationResult>;
     profileTx(exec: ExecutionPayload, opts: ProfileOptions): Promise<TxProfileResult>;
     sendTx(exec: ExecutionPayload, opts: SendOptions): Promise<TxHash>;
     createAuthWit(from: AztecAddress, messageHashOrIntent: Fr | IntentInnerHash | CallIntent): Promise<AuthWitness>;
@@ -128,7 +118,7 @@ export declare const ContractInstantiationDataSchema: z.ZodObject<{
     constructorArtifact: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodUnion<[z.ZodObject<{
         name: z.ZodString;
         functionType: z.ZodNativeEnum<typeof FunctionType>;
-        isInternal: z.ZodBoolean;
+        isOnlySelf: z.ZodBoolean;
         isStatic: z.ZodBoolean;
         isInitializer: z.ZodBoolean;
         parameters: z.ZodArray<z.ZodObject<{
@@ -181,7 +171,7 @@ export declare const ContractInstantiationDataSchema: z.ZodObject<{
             visibility: "public" | "private" | "databus";
         }[];
         functionType: FunctionType;
-        isInternal: boolean;
+        isOnlySelf: boolean;
         isStatic: boolean;
         isInitializer: boolean;
         returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -203,7 +193,7 @@ export declare const ContractInstantiationDataSchema: z.ZodObject<{
             visibility: "public" | "private" | "databus";
         }[];
         functionType: FunctionType;
-        isInternal: boolean;
+        isOnlySelf: boolean;
         isStatic: boolean;
         isInitializer: boolean;
         returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -222,97 +212,25 @@ export declare const ContractInstantiationDataSchema: z.ZodObject<{
     skipArgsDecoding: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodBoolean>;
     salt: ZodFor<Fr>;
     publicKeys: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodEffects<z.ZodObject<{
-        masterNullifierPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
-        masterIncomingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
-        masterOutgoingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
-        masterTaggingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
+        masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+        masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+        masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+        masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
     }, "strip", z.ZodTypeAny, {
         masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
         masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
         masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
         masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
     }, {
-        masterNullifierPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterIncomingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterOutgoingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterTaggingPublicKey: string | {
-            x: string;
-            y: string;
-        };
+        masterNullifierPublicKey: string;
+        masterIncomingViewingPublicKey: string;
+        masterOutgoingViewingPublicKey: string;
+        masterTaggingPublicKey: string;
     }>, PublicKeys, {
-        masterNullifierPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterIncomingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterOutgoingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterTaggingPublicKey: string | {
-            x: string;
-            y: string;
-        };
+        masterNullifierPublicKey: string;
+        masterIncomingViewingPublicKey: string;
+        masterOutgoingViewingPublicKey: string;
+        masterTaggingPublicKey: string;
     }>>;
     deployer: import("@aztec/foundation/schemas").ZodNullableOptional<ZodFor<AztecAddress>>;
 }, "strip", z.ZodTypeAny, {
@@ -328,7 +246,7 @@ export declare const ContractInstantiationDataSchema: z.ZodObject<{
             visibility: "public" | "private" | "databus";
         }[];
         functionType: FunctionType;
-        isInternal: boolean;
+        isOnlySelf: boolean;
         isStatic: boolean;
         isInitializer: boolean;
         returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -348,22 +266,10 @@ export declare const ContractInstantiationDataSchema: z.ZodObject<{
     salt?: any;
     deployer?: any;
     publicKeys?: {
-        masterNullifierPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterIncomingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterOutgoingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterTaggingPublicKey: string | {
-            x: string;
-            y: string;
-        };
+        masterNullifierPublicKey: string;
+        masterIncomingViewingPublicKey: string;
+        masterOutgoingViewingPublicKey: string;
+        masterTaggingPublicKey: string;
     } | undefined;
     constructorArgs?: any[] | undefined;
     constructorArtifact?: string | {
@@ -374,7 +280,7 @@ export declare const ContractInstantiationDataSchema: z.ZodObject<{
             visibility: "public" | "private" | "databus";
         }[];
         functionType: FunctionType;
-        isInternal: boolean;
+        isOnlySelf: boolean;
         isStatic: boolean;
         isInitializer: boolean;
         returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -480,7 +386,7 @@ export declare const ExecutionPayloadSchema: z.ZodObject<{
     }[];
     extraHashedArgs: any[];
 }>;
-export declare const UserFeeOptionsSchema: z.ZodObject<{
+export declare const GasSettingsOptionSchema: z.ZodObject<{
     gasSettings: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodObject<{
         gasLimits: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodEffects<z.ZodObject<{
             daGas: z.ZodPipeline<z.ZodUnion<[z.ZodBigInt, z.ZodNumber, z.ZodString]>, z.ZodNumber>;
@@ -557,9 +463,7 @@ export declare const UserFeeOptionsSchema: z.ZodObject<{
             feePerL2Gas: string | number | bigint;
         } | undefined;
     }>>;
-    embeddedPaymentMethodFeePayer: import("@aztec/foundation/schemas").ZodNullableOptional<ZodFor<AztecAddress>>;
 }, "strip", z.ZodTypeAny, {
-    embeddedPaymentMethodFeePayer?: AztecAddress | undefined;
     gasSettings?: {
         gasLimits?: Gas | undefined;
         teardownGasLimits?: Gas | undefined;
@@ -573,7 +477,6 @@ export declare const UserFeeOptionsSchema: z.ZodObject<{
         } | undefined;
     } | undefined;
 }, {
-    embeddedPaymentMethodFeePayer?: any;
     gasSettings?: {
         gasLimits?: {
             daGas: string | number | bigint;
@@ -670,12 +573,10 @@ export declare const WalletSimulationFeeOptionSchema: z.ZodObject<{
             feePerL2Gas: string | number | bigint;
         } | undefined;
     }>>;
-    embeddedPaymentMethodFeePayer: import("@aztec/foundation/schemas").ZodNullableOptional<ZodFor<AztecAddress>>;
 } & {
     estimatedGasPadding: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
     estimateGas: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    embeddedPaymentMethodFeePayer?: AztecAddress | undefined;
     gasSettings?: {
         gasLimits?: Gas | undefined;
         teardownGasLimits?: Gas | undefined;
@@ -691,7 +592,6 @@ export declare const WalletSimulationFeeOptionSchema: z.ZodObject<{
     estimateGas?: boolean | undefined;
     estimatedGasPadding?: number | undefined;
 }, {
-    embeddedPaymentMethodFeePayer?: any;
     gasSettings?: {
         gasLimits?: {
             daGas: string | number | bigint;
@@ -794,9 +694,7 @@ export declare const SendOptionsSchema: z.ZodObject<{
                 feePerL2Gas: string | number | bigint;
             } | undefined;
         }>>;
-        embeddedPaymentMethodFeePayer: import("@aztec/foundation/schemas").ZodNullableOptional<ZodFor<AztecAddress>>;
     }, "strip", z.ZodTypeAny, {
-        embeddedPaymentMethodFeePayer?: AztecAddress | undefined;
         gasSettings?: {
             gasLimits?: Gas | undefined;
             teardownGasLimits?: Gas | undefined;
@@ -810,7 +708,6 @@ export declare const SendOptionsSchema: z.ZodObject<{
             } | undefined;
         } | undefined;
     }, {
-        embeddedPaymentMethodFeePayer?: any;
         gasSettings?: {
             gasLimits?: {
                 daGas: string | number | bigint;
@@ -833,7 +730,6 @@ export declare const SendOptionsSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     from: AztecAddress;
     fee?: {
-        embeddedPaymentMethodFeePayer?: AztecAddress | undefined;
         gasSettings?: {
             gasLimits?: Gas | undefined;
             teardownGasLimits?: Gas | undefined;
@@ -851,7 +747,6 @@ export declare const SendOptionsSchema: z.ZodObject<{
     capsules?: Capsule[] | undefined;
 }, {
     fee?: {
-        embeddedPaymentMethodFeePayer?: any;
         gasSettings?: {
             gasLimits?: {
                 daGas: string | number | bigint;
@@ -956,12 +851,10 @@ export declare const SimulateOptionsSchema: z.ZodObject<{
                 feePerL2Gas: string | number | bigint;
             } | undefined;
         }>>;
-        embeddedPaymentMethodFeePayer: import("@aztec/foundation/schemas").ZodNullableOptional<ZodFor<AztecAddress>>;
     } & {
         estimatedGasPadding: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
         estimateGas: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
-        embeddedPaymentMethodFeePayer?: AztecAddress | undefined;
         gasSettings?: {
             gasLimits?: Gas | undefined;
             teardownGasLimits?: Gas | undefined;
@@ -977,7 +870,6 @@ export declare const SimulateOptionsSchema: z.ZodObject<{
         estimateGas?: boolean | undefined;
         estimatedGasPadding?: number | undefined;
     }, {
-        embeddedPaymentMethodFeePayer?: any;
         gasSettings?: {
             gasLimits?: {
                 daGas: string | number | bigint;
@@ -1005,7 +897,6 @@ export declare const SimulateOptionsSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     from: AztecAddress;
     fee?: {
-        embeddedPaymentMethodFeePayer?: AztecAddress | undefined;
         gasSettings?: {
             gasLimits?: Gas | undefined;
             teardownGasLimits?: Gas | undefined;
@@ -1028,7 +919,6 @@ export declare const SimulateOptionsSchema: z.ZodObject<{
     includeMetadata?: boolean | undefined;
 }, {
     fee?: {
-        embeddedPaymentMethodFeePayer?: any;
         gasSettings?: {
             gasLimits?: {
                 daGas: string | number | bigint;
@@ -1138,12 +1028,10 @@ export declare const ProfileOptionsSchema: z.ZodObject<{
                 feePerL2Gas: string | number | bigint;
             } | undefined;
         }>>;
-        embeddedPaymentMethodFeePayer: import("@aztec/foundation/schemas").ZodNullableOptional<ZodFor<AztecAddress>>;
     } & {
         estimatedGasPadding: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
         estimateGas: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
-        embeddedPaymentMethodFeePayer?: AztecAddress | undefined;
         gasSettings?: {
             gasLimits?: Gas | undefined;
             teardownGasLimits?: Gas | undefined;
@@ -1159,7 +1047,6 @@ export declare const ProfileOptionsSchema: z.ZodObject<{
         estimateGas?: boolean | undefined;
         estimatedGasPadding?: number | undefined;
     }, {
-        embeddedPaymentMethodFeePayer?: any;
         gasSettings?: {
             gasLimits?: {
                 daGas: string | number | bigint;
@@ -1191,7 +1078,6 @@ export declare const ProfileOptionsSchema: z.ZodObject<{
     from: AztecAddress;
     profileMode: "gates" | "execution-steps" | "full";
     fee?: {
-        embeddedPaymentMethodFeePayer?: AztecAddress | undefined;
         gasSettings?: {
             gasLimits?: Gas | undefined;
             teardownGasLimits?: Gas | undefined;
@@ -1216,7 +1102,6 @@ export declare const ProfileOptionsSchema: z.ZodObject<{
 }, {
     profileMode: "gates" | "execution-steps" | "full";
     fee?: {
-        embeddedPaymentMethodFeePayer?: any;
         gasSettings?: {
             gasLimits?: {
                 daGas: string | number | bigint;
@@ -1254,97 +1139,25 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
     originalContractClassId: ZodFor<Fr>;
     initializationHash: ZodFor<Fr>;
     publicKeys: z.ZodEffects<z.ZodObject<{
-        masterNullifierPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
-        masterIncomingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
-        masterOutgoingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
-        masterTaggingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
+        masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+        masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+        masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+        masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
     }, "strip", z.ZodTypeAny, {
         masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
         masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
         masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
         masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
     }, {
-        masterNullifierPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterIncomingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterOutgoingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterTaggingPublicKey: string | {
-            x: string;
-            y: string;
-        };
+        masterNullifierPublicKey: string;
+        masterIncomingViewingPublicKey: string;
+        masterOutgoingViewingPublicKey: string;
+        masterTaggingPublicKey: string;
     }>, PublicKeys, {
-        masterNullifierPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterIncomingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterOutgoingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterTaggingPublicKey: string | {
-            x: string;
-            y: string;
-        };
+        masterNullifierPublicKey: string;
+        masterIncomingViewingPublicKey: string;
+        masterOutgoingViewingPublicKey: string;
+        masterTaggingPublicKey: string;
     }>;
 }, "strip", z.ZodTypeAny, {
     version: 1;
@@ -1357,22 +1170,10 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
 }, {
     version: 1;
     publicKeys: {
-        masterNullifierPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterIncomingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterOutgoingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterTaggingPublicKey: string | {
-            x: string;
-            y: string;
-        };
+        masterNullifierPublicKey: string;
+        masterIncomingViewingPublicKey: string;
+        masterOutgoingViewingPublicKey: string;
+        masterTaggingPublicKey: string;
     };
     salt?: any;
     deployer?: any;
@@ -1389,7 +1190,7 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
     constructorArtifact: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodUnion<[z.ZodObject<{
         name: z.ZodString;
         functionType: z.ZodNativeEnum<typeof FunctionType>;
-        isInternal: z.ZodBoolean;
+        isOnlySelf: z.ZodBoolean;
         isStatic: z.ZodBoolean;
         isInitializer: z.ZodBoolean;
         parameters: z.ZodArray<z.ZodObject<{
@@ -1442,7 +1243,7 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
             visibility: "public" | "private" | "databus";
         }[];
         functionType: FunctionType;
-        isInternal: boolean;
+        isOnlySelf: boolean;
         isStatic: boolean;
         isInitializer: boolean;
         returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -1464,7 +1265,7 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
             visibility: "public" | "private" | "databus";
         }[];
         functionType: FunctionType;
-        isInternal: boolean;
+        isOnlySelf: boolean;
         isStatic: boolean;
         isInitializer: boolean;
         returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -1483,97 +1284,25 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
     skipArgsDecoding: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodBoolean>;
     salt: ZodFor<Fr>;
     publicKeys: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodEffects<z.ZodObject<{
-        masterNullifierPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
-        masterIncomingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
-        masterOutgoingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
-        masterTaggingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-            x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-        }, "strip", z.ZodTypeAny, {
-            x: Fr;
-            y: Fr;
-        }, {
-            x: string;
-            y: string;
-        }>, import("@aztec/foundation/fields").Point, {
-            x: string;
-            y: string;
-        }>]>;
+        masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+        masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+        masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+        masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
     }, "strip", z.ZodTypeAny, {
         masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
         masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
         masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
         masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
     }, {
-        masterNullifierPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterIncomingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterOutgoingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterTaggingPublicKey: string | {
-            x: string;
-            y: string;
-        };
+        masterNullifierPublicKey: string;
+        masterIncomingViewingPublicKey: string;
+        masterOutgoingViewingPublicKey: string;
+        masterTaggingPublicKey: string;
     }>, PublicKeys, {
-        masterNullifierPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterIncomingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterOutgoingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterTaggingPublicKey: string | {
-            x: string;
-            y: string;
-        };
+        masterNullifierPublicKey: string;
+        masterIncomingViewingPublicKey: string;
+        masterOutgoingViewingPublicKey: string;
+        masterTaggingPublicKey: string;
     }>>;
     deployer: import("@aztec/foundation/schemas").ZodNullableOptional<ZodFor<AztecAddress>>;
 }, "strip", z.ZodTypeAny, {
@@ -1589,7 +1318,7 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
             visibility: "public" | "private" | "databus";
         }[];
         functionType: FunctionType;
-        isInternal: boolean;
+        isOnlySelf: boolean;
         isStatic: boolean;
         isInitializer: boolean;
         returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -1609,22 +1338,10 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
     salt?: any;
     deployer?: any;
     publicKeys?: {
-        masterNullifierPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterIncomingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterOutgoingViewingPublicKey: string | {
-            x: string;
-            y: string;
-        };
-        masterTaggingPublicKey: string | {
-            x: string;
-            y: string;
-        };
+        masterNullifierPublicKey: string;
+        masterIncomingViewingPublicKey: string;
+        masterOutgoingViewingPublicKey: string;
+        masterTaggingPublicKey: string;
     } | undefined;
     constructorArgs?: any[] | undefined;
     constructorArtifact?: string | {
@@ -1635,7 +1352,7 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
             visibility: "public" | "private" | "databus";
         }[];
         functionType: FunctionType;
-        isInternal: boolean;
+        isOnlySelf: boolean;
         isStatic: boolean;
         isInitializer: boolean;
         returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -1660,97 +1377,25 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
         originalContractClassId: ZodFor<Fr>;
         initializationHash: ZodFor<Fr>;
         publicKeys: z.ZodEffects<z.ZodObject<{
-            masterNullifierPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterIncomingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterOutgoingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterTaggingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
+            masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
         }, "strip", z.ZodTypeAny, {
             masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
             masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
             masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
             masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
         }, {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         }>, PublicKeys, {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         }>;
     }, "strip", z.ZodTypeAny, {
         version: 1;
@@ -1763,22 +1408,10 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
     }, {
         version: 1;
         publicKeys: {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         };
         salt?: any;
         deployer?: any;
@@ -1810,22 +1443,10 @@ export declare const InstanceDataSchema: z.ZodUnion<[ZodFor<AztecAddress>, z.Zod
     instance: {
         version: 1;
         publicKeys: {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         };
         salt?: any;
         deployer?: any;
@@ -1920,97 +1541,25 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
         originalContractClassId: ZodFor<Fr>;
         initializationHash: ZodFor<Fr>;
         publicKeys: z.ZodEffects<z.ZodObject<{
-            masterNullifierPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterIncomingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterOutgoingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterTaggingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
+            masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
         }, "strip", z.ZodTypeAny, {
             masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
             masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
             masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
             masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
         }, {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         }>, PublicKeys, {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         }>;
     }, "strip", z.ZodTypeAny, {
         version: 1;
@@ -2023,22 +1572,10 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
     }, {
         version: 1;
         publicKeys: {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         };
         salt?: any;
         deployer?: any;
@@ -2055,7 +1592,7 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
         constructorArtifact: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodUnion<[z.ZodObject<{
             name: z.ZodString;
             functionType: z.ZodNativeEnum<typeof FunctionType>;
-            isInternal: z.ZodBoolean;
+            isOnlySelf: z.ZodBoolean;
             isStatic: z.ZodBoolean;
             isInitializer: z.ZodBoolean;
             parameters: z.ZodArray<z.ZodObject<{
@@ -2108,7 +1645,7 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
                 visibility: "public" | "private" | "databus";
             }[];
             functionType: FunctionType;
-            isInternal: boolean;
+            isOnlySelf: boolean;
             isStatic: boolean;
             isInitializer: boolean;
             returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -2130,7 +1667,7 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
                 visibility: "public" | "private" | "databus";
             }[];
             functionType: FunctionType;
-            isInternal: boolean;
+            isOnlySelf: boolean;
             isStatic: boolean;
             isInitializer: boolean;
             returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -2149,97 +1686,25 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
         skipArgsDecoding: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodBoolean>;
         salt: ZodFor<Fr>;
         publicKeys: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodEffects<z.ZodObject<{
-            masterNullifierPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterIncomingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterOutgoingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterTaggingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
+            masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
         }, "strip", z.ZodTypeAny, {
             masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
             masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
             masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
             masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
         }, {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         }>, PublicKeys, {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         }>>;
         deployer: import("@aztec/foundation/schemas").ZodNullableOptional<ZodFor<AztecAddress>>;
     }, "strip", z.ZodTypeAny, {
@@ -2255,7 +1720,7 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
                 visibility: "public" | "private" | "databus";
             }[];
             functionType: FunctionType;
-            isInternal: boolean;
+            isOnlySelf: boolean;
             isStatic: boolean;
             isInitializer: boolean;
             returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -2275,22 +1740,10 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
         salt?: any;
         deployer?: any;
         publicKeys?: {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         } | undefined;
         constructorArgs?: any[] | undefined;
         constructorArtifact?: string | {
@@ -2301,7 +1754,7 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
                 visibility: "public" | "private" | "databus";
             }[];
             functionType: FunctionType;
-            isInternal: boolean;
+            isOnlySelf: boolean;
             isStatic: boolean;
             isInitializer: boolean;
             returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -2326,97 +1779,25 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
             originalContractClassId: ZodFor<Fr>;
             initializationHash: ZodFor<Fr>;
             publicKeys: z.ZodEffects<z.ZodObject<{
-                masterNullifierPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                    x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                }, "strip", z.ZodTypeAny, {
-                    x: Fr;
-                    y: Fr;
-                }, {
-                    x: string;
-                    y: string;
-                }>, import("@aztec/foundation/fields").Point, {
-                    x: string;
-                    y: string;
-                }>]>;
-                masterIncomingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                    x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                }, "strip", z.ZodTypeAny, {
-                    x: Fr;
-                    y: Fr;
-                }, {
-                    x: string;
-                    y: string;
-                }>, import("@aztec/foundation/fields").Point, {
-                    x: string;
-                    y: string;
-                }>]>;
-                masterOutgoingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                    x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                }, "strip", z.ZodTypeAny, {
-                    x: Fr;
-                    y: Fr;
-                }, {
-                    x: string;
-                    y: string;
-                }>, import("@aztec/foundation/fields").Point, {
-                    x: string;
-                    y: string;
-                }>]>;
-                masterTaggingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                    x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                    y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                }, "strip", z.ZodTypeAny, {
-                    x: Fr;
-                    y: Fr;
-                }, {
-                    x: string;
-                    y: string;
-                }>, import("@aztec/foundation/fields").Point, {
-                    x: string;
-                    y: string;
-                }>]>;
+                masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+                masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+                masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+                masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
             }, "strip", z.ZodTypeAny, {
                 masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
                 masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
                 masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
                 masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
             }, {
-                masterNullifierPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterIncomingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterOutgoingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterTaggingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
+                masterNullifierPublicKey: string;
+                masterIncomingViewingPublicKey: string;
+                masterOutgoingViewingPublicKey: string;
+                masterTaggingPublicKey: string;
             }>, PublicKeys, {
-                masterNullifierPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterIncomingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterOutgoingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterTaggingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
+                masterNullifierPublicKey: string;
+                masterIncomingViewingPublicKey: string;
+                masterOutgoingViewingPublicKey: string;
+                masterTaggingPublicKey: string;
             }>;
         }, "strip", z.ZodTypeAny, {
             version: 1;
@@ -2429,22 +1810,10 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
         }, {
             version: 1;
             publicKeys: {
-                masterNullifierPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterIncomingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterOutgoingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterTaggingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
+                masterNullifierPublicKey: string;
+                masterIncomingViewingPublicKey: string;
+                masterOutgoingViewingPublicKey: string;
+                masterTaggingPublicKey: string;
             };
             salt?: any;
             deployer?: any;
@@ -2476,22 +1845,10 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
         instance: {
             version: 1;
             publicKeys: {
-                masterNullifierPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterIncomingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterOutgoingViewingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
-                masterTaggingPublicKey: string | {
-                    x: string;
-                    y: string;
-                };
+                masterNullifierPublicKey: string;
+                masterIncomingViewingPublicKey: string;
+                masterOutgoingViewingPublicKey: string;
+                masterTaggingPublicKey: string;
             };
             salt?: any;
             deployer?: any;
@@ -2518,7 +1875,7 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
                 visibility: "public" | "private" | "databus";
             }[];
             functionType: FunctionType;
-            isInternal: boolean;
+            isOnlySelf: boolean;
             isStatic: boolean;
             isInitializer: boolean;
             returnTypes: import("@aztec/stdlib/abi").AbiType[];
@@ -2704,9 +2061,7 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
                     feePerL2Gas: string | number | bigint;
                 } | undefined;
             }>>;
-            embeddedPaymentMethodFeePayer: import("@aztec/foundation/schemas").ZodNullableOptional<ZodFor<AztecAddress>>;
         }, "strip", z.ZodTypeAny, {
-            embeddedPaymentMethodFeePayer?: AztecAddress | undefined;
             gasSettings?: {
                 gasLimits?: Gas | undefined;
                 teardownGasLimits?: Gas | undefined;
@@ -2720,7 +2075,6 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
                 } | undefined;
             } | undefined;
         }, {
-            embeddedPaymentMethodFeePayer?: any;
             gasSettings?: {
                 gasLimits?: {
                     daGas: string | number | bigint;
@@ -2743,7 +2097,6 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         from: AztecAddress;
         fee?: {
-            embeddedPaymentMethodFeePayer?: AztecAddress | undefined;
             gasSettings?: {
                 gasLimits?: Gas | undefined;
                 teardownGasLimits?: Gas | undefined;
@@ -2761,7 +2114,6 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
         capsules?: Capsule[] | undefined;
     }, {
         fee?: {
-            embeddedPaymentMethodFeePayer?: any;
             gasSettings?: {
                 gasLimits?: {
                     daGas: string | number | bigint;
@@ -2804,7 +2156,6 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
     }, {
         from: AztecAddress;
         fee?: {
-            embeddedPaymentMethodFeePayer?: AztecAddress | undefined;
             gasSettings?: {
                 gasLimits?: Gas | undefined;
                 teardownGasLimits?: Gas | undefined;
@@ -2839,7 +2190,6 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
         extraHashedArgs: any[];
     }, {
         fee?: {
-            embeddedPaymentMethodFeePayer?: any;
             gasSettings?: {
                 gasLimits?: {
                     daGas: string | number | bigint;
@@ -2865,13 +2215,58 @@ export declare const BatchedMethodSchema: z.ZodUnion<[z.ZodObject<{
     }];
 }>, z.ZodObject<{
     name: z.ZodLiteral<"simulateUtility">;
-    args: z.ZodTuple<[z.ZodString, z.ZodArray<z.ZodAny, "many">, ZodFor<AztecAddress>, import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<z.ZodType<AuthWitness, any, string>, "many">>], null>;
+    args: z.ZodTuple<[z.ZodObject<{
+        name: z.ZodString;
+        to: ZodFor<AztecAddress>;
+        selector: ZodFor<import("@aztec/stdlib/abi").FunctionSelector>;
+        type: z.ZodNativeEnum<typeof FunctionType>;
+        isStatic: z.ZodBoolean;
+        hideMsgSender: z.ZodBoolean;
+        args: z.ZodArray<ZodFor<Fr>, "many">;
+        returnTypes: z.ZodArray<z.ZodType<import("@aztec/stdlib/abi").AbiType, z.ZodTypeDef, import("@aztec/stdlib/abi").AbiType>, "many">;
+    }, "strip", z.ZodTypeAny, {
+        name: string;
+        args: Fr[];
+        type: FunctionType;
+        to: AztecAddress;
+        selector: import("@aztec/stdlib/abi").FunctionSelector;
+        isStatic: boolean;
+        hideMsgSender: boolean;
+        returnTypes: import("@aztec/stdlib/abi").AbiType[];
+    }, {
+        name: string;
+        args: any[];
+        type: FunctionType;
+        isStatic: boolean;
+        hideMsgSender: boolean;
+        returnTypes: import("@aztec/stdlib/abi").AbiType[];
+        to?: any;
+        selector?: any;
+    }>, import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<z.ZodType<AuthWitness, any, string>, "many">>, import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodArray<ZodFor<AztecAddress>, "many">>], null>;
 }, "strip", z.ZodTypeAny, {
     name: "simulateUtility";
-    args: [string, any[], AztecAddress, AuthWitness[] | undefined];
+    args: [{
+        name: string;
+        args: Fr[];
+        type: FunctionType;
+        to: AztecAddress;
+        selector: import("@aztec/stdlib/abi").FunctionSelector;
+        isStatic: boolean;
+        hideMsgSender: boolean;
+        returnTypes: import("@aztec/stdlib/abi").AbiType[];
+    }, AuthWitness[] | undefined, AztecAddress[] | undefined];
 }, {
     name: "simulateUtility";
-    args: [string, any[], any, string[] | undefined];
+    args: [{
+        name: string;
+        args: any[];
+        type: FunctionType;
+        isStatic: boolean;
+        hideMsgSender: boolean;
+        returnTypes: import("@aztec/stdlib/abi").AbiType[];
+        to?: any;
+        selector?: any;
+    }, string[] | undefined, any[] | undefined];
 }>]>;
 export declare const ContractMetadataSchema: z.ZodObject<{
     contractInstance: z.ZodUnion<[z.ZodIntersection<z.ZodObject<{
@@ -2882,97 +2277,25 @@ export declare const ContractMetadataSchema: z.ZodObject<{
         originalContractClassId: ZodFor<Fr>;
         initializationHash: ZodFor<Fr>;
         publicKeys: z.ZodEffects<z.ZodObject<{
-            masterNullifierPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterIncomingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterOutgoingViewingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
-            masterTaggingPublicKey: z.ZodUnion<[z.ZodType<import("@aztec/foundation/fields").Point, any, string>, z.ZodEffects<z.ZodObject<{
-                x: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-                y: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
-            }, "strip", z.ZodTypeAny, {
-                x: Fr;
-                y: Fr;
-            }, {
-                x: string;
-                y: string;
-            }>, import("@aztec/foundation/fields").Point, {
-                x: string;
-                y: string;
-            }>]>;
+            masterNullifierPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterIncomingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterOutgoingViewingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
+            masterTaggingPublicKey: z.ZodType<import("@aztec/foundation/fields").Point, any, string>;
         }, "strip", z.ZodTypeAny, {
             masterNullifierPublicKey: import("@aztec/foundation/fields").Point;
             masterIncomingViewingPublicKey: import("@aztec/foundation/fields").Point;
             masterOutgoingViewingPublicKey: import("@aztec/foundation/fields").Point;
             masterTaggingPublicKey: import("@aztec/foundation/fields").Point;
         }, {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         }>, PublicKeys, {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         }>;
     }, "strip", z.ZodTypeAny, {
         version: 1;
@@ -2985,22 +2308,10 @@ export declare const ContractMetadataSchema: z.ZodObject<{
     }, {
         version: 1;
         publicKeys: {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         };
         salt?: any;
         deployer?: any;
@@ -3036,22 +2347,10 @@ export declare const ContractMetadataSchema: z.ZodObject<{
     contractInstance?: ({
         version: 1;
         publicKeys: {
-            masterNullifierPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterIncomingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterOutgoingViewingPublicKey: string | {
-                x: string;
-                y: string;
-            };
-            masterTaggingPublicKey: string | {
-                x: string;
-                y: string;
-            };
+            masterNullifierPublicKey: string;
+            masterIncomingViewingPublicKey: string;
+            masterOutgoingViewingPublicKey: string;
+            masterTaggingPublicKey: string;
         };
         salt?: any;
         deployer?: any;
@@ -3065,10 +2364,10 @@ export declare const ContractMetadataSchema: z.ZodObject<{
 export declare const ContractClassMetadataSchema: z.ZodObject<{
     contractClass: z.ZodUnion<[z.ZodObject<{
         version: z.ZodLiteral<1>;
-        artifactHash: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+        artifactHash: z.ZodType<Fr, any, string>;
         privateFunctions: z.ZodArray<z.ZodObject<{
             selector: ZodFor<import("@aztec/stdlib/abi").FunctionSelector>;
-            vkHash: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+            vkHash: z.ZodType<Fr, any, string>;
         }, "strip", z.ZodTypeAny, {
             selector: import("@aztec/stdlib/abi").FunctionSelector;
             vkHash: Fr;
@@ -3078,7 +2377,7 @@ export declare const ContractClassMetadataSchema: z.ZodObject<{
         }>, "many">;
         packedBytecode: ZodFor<Buffer<ArrayBufferLike>>;
     } & {
-        id: z.ZodUnion<[z.ZodType<Fr, any, string>, z.ZodType<never, any, string>]>;
+        id: z.ZodType<Fr, any, string>;
     }, "strip", z.ZodTypeAny, {
         version: 1;
         artifactHash: Fr;