@aztec/stdlib 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/abi/abi.d.ts

@@ -1,10 +1,6 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import type { Fr } from '@aztec/foundation/fields';
-import { type ZodFor } from '@aztec/foundation/schemas';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { z } from 'zod';
 import { FunctionSelector } from './function_selector.js';
-import { NoteSelector } from './note_selector.js';
 /** A basic value. */
 export interface BasicValue<T extends string, V> {
     /** The kind of the value. */
@@ -46,39 +42,22 @@ export type AbiType = BasicType<'field'> | BasicType<'boolean'> | IntegerType |
 export declare const AbiTypeSchema: z.ZodType<AbiType>;
 /** A named type. */
 export declare const ABIVariableSchema: z.ZodObject<{
-    /** The name of the variable. */
     name: z.ZodString;
-    /** The type of the variable. */
-    type: z.ZodType<AbiType, z.ZodTypeDef, AbiType>;
-}, "strip", z.ZodTypeAny, {
-    type: AbiType;
-    name: string;
-}, {
-    type: AbiType;
-    name: string;
-}>;
+    type: z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>;
+}, z.core.$strip>;
 /** A named type. */
 export type ABIVariable = z.infer<typeof ABIVariableSchema>;
 /** A function parameter. */
 export declare const ABIParameterSchema: z.ZodIntersection<z.ZodObject<{
-    /** The name of the variable. */
     name: z.ZodString;
-    /** The type of the variable. */
-    type: z.ZodType<AbiType, z.ZodTypeDef, AbiType>;
-}, "strip", z.ZodTypeAny, {
-    type: AbiType;
-    name: string;
-}, {
-    type: AbiType;
-    name: string;
-}>, z.ZodObject<{
-    /** Visibility of the parameter in the function. */
-    visibility: z.ZodEnum<["public", "private", "databus"]>;
-}, "strip", z.ZodTypeAny, {
-    visibility: "public" | "private" | "databus";
-}, {
-    visibility: "public" | "private" | "databus";
-}>>;
+    type: z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>;
+}, z.core.$strip>, z.ZodObject<{
+    visibility: z.ZodEnum<{
+        databus: "databus";
+        private: "private";
+        public: "public";
+    }>;
+}, z.core.$strip>>;
 /** A function parameter. */
 export type ABIParameter = z.infer<typeof ABIParameterSchema>;
 /** An integer type. */
@@ -127,7 +106,7 @@ export type AbiErrorType = {
 export declare enum FunctionType {
     PRIVATE = "private",
     PUBLIC = "public",
-    UNCONSTRAINED = "unconstrained"
+    UTILITY = "utility"
 }
 /** The abi entry of a function. */
 export interface FunctionAbi {
@@ -135,8 +114,8 @@ export interface FunctionAbi {
     name: string;
     /** Whether the function is secret. */
     functionType: FunctionType;
-    /** Whether the function is internal. */
-    isInternal: boolean;
+    /** Whether the function is marked as `#[only_self]` and hence callable only from within the contract. */
+    isOnlySelf: boolean;
     /** Whether the function can alter state or not */
     isStatic: boolean;
     /** Function parameters. */
@@ -150,97 +129,31 @@ export interface FunctionAbi {
 }
 export declare const FunctionAbiSchema: z.ZodObject<{
     name: z.ZodString;
-    functionType: z.ZodNativeEnum<typeof FunctionType>;
-    isInternal: z.ZodBoolean;
+    functionType: z.ZodEnum<typeof FunctionType>;
+    isOnlySelf: z.ZodBoolean;
     isStatic: z.ZodBoolean;
     isInitializer: z.ZodBoolean;
     parameters: z.ZodArray<z.ZodObject<{
         name: z.ZodString;
-        type: z.ZodType<AbiType, z.ZodTypeDef, AbiType>;
-        visibility: z.ZodEnum<["public", "private", "databus"]>;
-    }, "strip", z.ZodTypeAny, {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }, {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }>, "many">;
-    returnTypes: z.ZodArray<z.ZodType<AbiType, z.ZodTypeDef, AbiType>, "many">;
-    errorTypes: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+        type: z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>;
+        visibility: z.ZodEnum<{
+            databus: "databus";
+            private: "private";
+            public: "public";
+        }>;
+    }, z.core.$strip>>;
+    returnTypes: z.ZodArray<z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>;
+    errorTypes: z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
         error_kind: z.ZodLiteral<"string">;
         string: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        string: string;
-        error_kind: "string";
-    }, {
-        string: string;
-        error_kind: "string";
-    }>, z.ZodObject<{
+    }, z.core.$strip>, z.ZodObject<{
         error_kind: z.ZodLiteral<"fmtstring">;
         length: z.ZodNumber;
-        item_types: z.ZodArray<z.ZodType<AbiType, z.ZodTypeDef, AbiType>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        length: number;
-        error_kind: "fmtstring";
-        item_types: AbiType[];
-    }, {
-        length: number;
-        error_kind: "fmtstring";
-        item_types: AbiType[];
-    }>, z.ZodIntersection<z.ZodObject<{
+        item_types: z.ZodArray<z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>;
+    }, z.core.$strip>, z.ZodIntersection<z.ZodObject<{
         error_kind: z.ZodLiteral<"custom">;
-    }, "strip", z.ZodTypeAny, {
-        error_kind: "custom";
-    }, {
-        error_kind: "custom";
-    }>, z.ZodType<AbiType, z.ZodTypeDef, AbiType>>]>>;
-}, "strip", z.ZodTypeAny, {
-    name: string;
-    parameters: {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }[];
-    functionType: FunctionType;
-    isInternal: boolean;
-    isStatic: boolean;
-    isInitializer: boolean;
-    returnTypes: AbiType[];
-    errorTypes: Record<string, {
-        string: string;
-        error_kind: "string";
-    } | {
-        length: number;
-        error_kind: "fmtstring";
-        item_types: AbiType[];
-    } | ({
-        error_kind: "custom";
-    } & AbiType)>;
-}, {
-    name: string;
-    parameters: {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }[];
-    functionType: FunctionType;
-    isInternal: boolean;
-    isStatic: boolean;
-    isInitializer: boolean;
-    returnTypes: AbiType[];
-    errorTypes: Record<string, {
-        string: string;
-        error_kind: "string";
-    } | {
-        length: number;
-        error_kind: "fmtstring";
-        item_types: AbiType[];
-    } | ({
-        error_kind: "custom";
-    } & AbiType)>;
-}>;
+    }, z.core.$strip>, z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>]>>>;
+}, z.core.$strip>;
 /** Debug metadata for a function. */
 export interface FunctionDebugMetadata {
     /** Maps opcodes to source code pointers */
@@ -250,140 +163,30 @@ export interface FunctionDebugMetadata {
 }
 export declare const FunctionDebugMetadataSchema: z.ZodObject<{
     debugSymbols: z.ZodObject<{
-        locations: z.ZodRecord<z.ZodString, z.ZodArray<z.ZodObject<{
-            span: z.ZodObject<{
-                start: z.ZodNumber;
-                end: z.ZodNumber;
-            }, "strip", z.ZodTypeAny, {
-                start: number;
-                end: number;
-            }, {
-                start: number;
-                end: number;
-            }>;
-            file: z.ZodNumber;
-        }, "strip", z.ZodTypeAny, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }>, "many">>;
-        brillig_locations: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodArray<z.ZodObject<{
-            span: z.ZodObject<{
-                start: z.ZodNumber;
-                end: z.ZodNumber;
-            }, "strip", z.ZodTypeAny, {
-                start: number;
-                end: number;
-            }, {
-                start: number;
-                end: number;
-            }>;
-            file: z.ZodNumber;
-        }, "strip", z.ZodTypeAny, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }>, "many">>>;
-    }, "strip", z.ZodTypeAny, {
-        locations: Record<string, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }[]>;
-        brillig_locations: Record<string, Record<string, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }[]>>;
-    }, {
-        locations: Record<string, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }[]>;
-        brillig_locations: Record<string, Record<string, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }[]>>;
-    }>;
+        location_tree: z.ZodObject<{
+            locations: z.ZodArray<z.ZodObject<{
+                parent: z.ZodNullable<z.ZodNumber>;
+                value: z.ZodObject<{
+                    span: z.ZodObject<{
+                        start: z.ZodNumber;
+                        end: z.ZodNumber;
+                    }, z.core.$strip>;
+                    file: z.ZodNumber;
+                }, z.core.$strip>;
+            }, z.core.$strip>>;
+        }, z.core.$strip>;
+        acir_locations: z.ZodRecord<z.ZodString, z.ZodNumber>;
+        brillig_locations: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
+    }, z.core.$strip>;
     files: z.ZodRecord<z.ZodString, z.ZodObject<{
         source: z.ZodString;
         path: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        path: string;
-        source: string;
-    }, {
-        path: string;
-        source: string;
-    }>>;
-}, "strip", z.ZodTypeAny, {
-    debugSymbols: {
-        locations: Record<string, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }[]>;
-        brillig_locations: Record<string, Record<string, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }[]>>;
-    };
-    files: Record<string, {
-        path: string;
-        source: string;
-    }>;
-}, {
-    debugSymbols: {
-        locations: Record<string, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }[]>;
-        brillig_locations: Record<string, Record<string, {
-            span: {
-                start: number;
-                end: number;
-            };
-            file: number;
-        }[]>>;
-    };
-    files: Record<string, {
-        path: string;
-        source: string;
-    }>;
-}>;
+        function_locations: z.ZodArray<z.ZodObject<{
+            start: z.ZodNumber;
+            name: z.ZodString;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
 /** The artifact entry of a function. */
 export interface FunctionArtifact extends FunctionAbi {
     /** The ACIR bytecode of the function. */
@@ -395,310 +198,71 @@ export interface FunctionArtifact extends FunctionAbi {
     /** Debug metadata for the function. */
     debug?: FunctionDebugMetadata;
 }
+export interface FunctionArtifactWithContractName extends FunctionArtifact {
+    /** The name of the contract. */
+    contractName: string;
+}
 export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
     name: z.ZodString;
-    functionType: z.ZodNativeEnum<typeof FunctionType>;
-    isInternal: z.ZodBoolean;
+    functionType: z.ZodEnum<typeof FunctionType>;
+    isOnlySelf: z.ZodBoolean;
     isStatic: z.ZodBoolean;
     isInitializer: z.ZodBoolean;
     parameters: z.ZodArray<z.ZodObject<{
         name: z.ZodString;
-        type: z.ZodType<AbiType, z.ZodTypeDef, AbiType>;
-        visibility: z.ZodEnum<["public", "private", "databus"]>;
-    }, "strip", z.ZodTypeAny, {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }, {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }>, "many">;
-    returnTypes: z.ZodArray<z.ZodType<AbiType, z.ZodTypeDef, AbiType>, "many">;
-    errorTypes: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+        type: z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>;
+        visibility: z.ZodEnum<{
+            databus: "databus";
+            private: "private";
+            public: "public";
+        }>;
+    }, z.core.$strip>>;
+    returnTypes: z.ZodArray<z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>;
+    errorTypes: z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
         error_kind: z.ZodLiteral<"string">;
         string: z.ZodString;
-    }, "strip", z.ZodTypeAny, {
-        string: string;
-        error_kind: "string";
-    }, {
-        string: string;
-        error_kind: "string";
-    }>, z.ZodObject<{
+    }, z.core.$strip>, z.ZodObject<{
         error_kind: z.ZodLiteral<"fmtstring">;
         length: z.ZodNumber;
-        item_types: z.ZodArray<z.ZodType<AbiType, z.ZodTypeDef, AbiType>, "many">;
-    }, "strip", z.ZodTypeAny, {
-        length: number;
-        error_kind: "fmtstring";
-        item_types: AbiType[];
-    }, {
-        length: number;
-        error_kind: "fmtstring";
-        item_types: AbiType[];
-    }>, z.ZodIntersection<z.ZodObject<{
+        item_types: z.ZodArray<z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>;
+    }, z.core.$strip>, z.ZodIntersection<z.ZodObject<{
         error_kind: z.ZodLiteral<"custom">;
-    }, "strip", z.ZodTypeAny, {
-        error_kind: "custom";
-    }, {
-        error_kind: "custom";
-    }>, z.ZodType<AbiType, z.ZodTypeDef, AbiType>>]>>;
-}, "strip", z.ZodTypeAny, {
-    name: string;
-    parameters: {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }[];
-    functionType: FunctionType;
-    isInternal: boolean;
-    isStatic: boolean;
-    isInitializer: boolean;
-    returnTypes: AbiType[];
-    errorTypes: Record<string, {
-        string: string;
-        error_kind: "string";
-    } | {
-        length: number;
-        error_kind: "fmtstring";
-        item_types: AbiType[];
-    } | ({
-        error_kind: "custom";
-    } & AbiType)>;
-}, {
-    name: string;
-    parameters: {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }[];
-    functionType: FunctionType;
-    isInternal: boolean;
-    isStatic: boolean;
-    isInitializer: boolean;
-    returnTypes: AbiType[];
-    errorTypes: Record<string, {
-        string: string;
-        error_kind: "string";
-    } | {
-        length: number;
-        error_kind: "fmtstring";
-        item_types: AbiType[];
-    } | ({
-        error_kind: "custom";
-    } & AbiType)>;
-}>, z.ZodObject<{
-    bytecode: z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer, string>, z.ZodEffects<z.ZodObject<{
-        type: z.ZodLiteral<"Buffer">;
-        data: z.ZodArray<z.ZodNumber, "many">;
-    }, "strip", z.ZodTypeAny, {
-        type: "Buffer";
-        data: number[];
-    }, {
-        type: "Buffer";
-        data: number[];
-    }>, Buffer, {
-        type: "Buffer";
-        data: number[];
-    }>]>;
+    }, z.core.$strip>, z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>]>>>;
+}, z.core.$strip>, z.ZodObject<{
+    bytecode: import("@aztec/foundation/schemas").ZodFor<Buffer<ArrayBufferLike>>;
     verificationKey: z.ZodOptional<z.ZodString>;
     debugSymbols: z.ZodString;
     debug: z.ZodOptional<z.ZodObject<{
         debugSymbols: z.ZodObject<{
-            locations: z.ZodRecord<z.ZodString, z.ZodArray<z.ZodObject<{
-                span: z.ZodObject<{
-                    start: z.ZodNumber;
-                    end: z.ZodNumber;
-                }, "strip", z.ZodTypeAny, {
-                    start: number;
-                    end: number;
-                }, {
-                    start: number;
-                    end: number;
-                }>;
-                file: z.ZodNumber;
-            }, "strip", z.ZodTypeAny, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }>, "many">>;
-            brillig_locations: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodArray<z.ZodObject<{
-                span: z.ZodObject<{
-                    start: z.ZodNumber;
-                    end: z.ZodNumber;
-                }, "strip", z.ZodTypeAny, {
-                    start: number;
-                    end: number;
-                }, {
-                    start: number;
-                    end: number;
-                }>;
-                file: z.ZodNumber;
-            }, "strip", z.ZodTypeAny, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }>, "many">>>;
-        }, "strip", z.ZodTypeAny, {
-            locations: Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>;
-            brillig_locations: Record<string, Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>>;
-        }, {
-            locations: Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>;
-            brillig_locations: Record<string, Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>>;
-        }>;
+            location_tree: z.ZodObject<{
+                locations: z.ZodArray<z.ZodObject<{
+                    parent: z.ZodNullable<z.ZodNumber>;
+                    value: z.ZodObject<{
+                        span: z.ZodObject<{
+                            start: z.ZodNumber;
+                            end: z.ZodNumber;
+                        }, z.core.$strip>;
+                        file: z.ZodNumber;
+                    }, z.core.$strip>;
+                }, z.core.$strip>>;
+            }, z.core.$strip>;
+            acir_locations: z.ZodRecord<z.ZodString, z.ZodNumber>;
+            brillig_locations: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
+        }, z.core.$strip>;
         files: z.ZodRecord<z.ZodString, z.ZodObject<{
             source: z.ZodString;
             path: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            path: string;
-            source: string;
-        }, {
-            path: string;
-            source: string;
-        }>>;
-    }, "strip", z.ZodTypeAny, {
-        debugSymbols: {
-            locations: Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>;
-            brillig_locations: Record<string, Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>>;
-        };
-        files: Record<string, {
-            path: string;
-            source: string;
-        }>;
-    }, {
-        debugSymbols: {
-            locations: Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>;
-            brillig_locations: Record<string, Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>>;
-        };
-        files: Record<string, {
-            path: string;
-            source: string;
-        }>;
-    }>>;
-}, "strip", z.ZodTypeAny, {
-    debugSymbols: string;
-    bytecode: Buffer;
-    debug?: {
-        debugSymbols: {
-            locations: Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>;
-            brillig_locations: Record<string, Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>>;
-        };
-        files: Record<string, {
-            path: string;
-            source: string;
-        }>;
-    } | undefined;
-    verificationKey?: string | undefined;
-}, {
-    debugSymbols: string;
-    bytecode: string | {
-        type: "Buffer";
-        data: number[];
-    };
-    debug?: {
-        debugSymbols: {
-            locations: Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>;
-            brillig_locations: Record<string, Record<string, {
-                span: {
-                    start: number;
-                    end: number;
-                };
-                file: number;
-            }[]>>;
-        };
-        files: Record<string, {
-            path: string;
-            source: string;
-        }>;
-    } | undefined;
-    verificationKey?: string | undefined;
-}>>;
+            function_locations: z.ZodArray<z.ZodObject<{
+                start: z.ZodNumber;
+                name: z.ZodString;
+            }, z.core.$strip>>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
+}, z.core.$strip>>;
 /** A file ID. It's assigned during compilation. */
-export type FileId = number;
+type FileId = number;
 /** A pointer to a specific section of the source code. */
-export interface SourceCodeLocation {
+interface SourceCodeLocation {
     /** The section of the source code. */
     span: {
         /** The byte where the section starts. */
@@ -715,11 +279,19 @@ export interface SourceCodeLocation {
  */
 export type OpcodeLocation = string;
 export type BrilligFunctionId = number;
-export type OpcodeToLocationsMap = Record<OpcodeLocation, SourceCodeLocation[]>;
+export type OpcodeToLocationsMap = Record<OpcodeLocation, number>;
+export type LocationNodeDebugInfo = {
+    parent: number | null;
+    value: SourceCodeLocation;
+};
+export type LocationTree = {
+    locations: LocationNodeDebugInfo[];
+};
 /** The debug information for a given function. */
 export interface DebugInfo {
     /** A map of the opcode location to the source code location. */
-    locations: OpcodeToLocationsMap;
+    location_tree: LocationTree;
+    acir_locations: OpcodeToLocationsMap;
     /** For each Brillig function, we have a map of the opcode location to the source code location. */
     brillig_locations: Record<BrilligFunctionId, OpcodeToLocationsMap>;
 }
@@ -728,90 +300,39 @@ export interface ProgramDebugInfo {
     /** A list of debug information that matches with each function in a program */
     debug_infos: Array<DebugInfo>;
 }
+/** The range a function occupies in a file. */
+export type FunctionLocation = {
+    /** The byte where the function starts. */
+    start: number;
+    /** The name of the function. */
+    name: string;
+};
 /** Maps a file ID to its metadata for debugging purposes. */
 export type DebugFileMap = Record<FileId, {
     /** The source code of the file. */
     source: string;
     /** The path of the file. */
     path: string;
-}>;
-/** Type representing a field of a note (e.g. `amount` in `TokenNote`). */
-export type NoteField = {
-    /** Name of the field (e.g. `amount`). */
-    name: string;
-    /** Index where the note field starts in the serialized note array. */
-    index: number;
-    /** Whether the field can be unset when creating the note (in the partial notes flow). */
-    nullable: boolean;
-};
-export declare const NoteFieldSchema: z.ZodObject<{
-    name: z.ZodString;
-    index: z.ZodNumber;
-    nullable: z.ZodBoolean;
-}, "strip", z.ZodTypeAny, {
-    name: string;
-    index: number;
-    nullable: boolean;
-}, {
-    name: string;
-    index: number;
-    nullable: boolean;
-}>;
-/** Type representing a note in use in the contract. */
-export type ContractNote = {
-    /** Note identifier */
-    id: NoteSelector;
-    /** Type of the note (e.g., 'TransparentNote') */
-    typ: string;
-    /** Fields of the note. */
-    fields: NoteField[];
-};
-export declare const ContractNoteSchema: z.ZodObject<{
-    id: z.ZodType<NoteSelector, any, string>;
-    typ: z.ZodString;
-    fields: z.ZodArray<z.ZodObject<{
-        name: z.ZodString;
-        index: z.ZodNumber;
-        nullable: z.ZodBoolean;
-    }, "strip", z.ZodTypeAny, {
-        name: string;
-        index: number;
-        nullable: boolean;
-    }, {
-        name: string;
-        index: number;
-        nullable: boolean;
-    }>, "many">;
-}, "strip", z.ZodTypeAny, {
-    fields: {
-        name: string;
-        index: number;
-        nullable: boolean;
-    }[];
-    id: NoteSelector;
-    typ: string;
-}, {
-    fields: {
-        name: string;
-        index: number;
-        nullable: boolean;
-    }[];
-    id: string;
-    typ: string;
+    /** The range each function occupies in the file. */
+    function_locations: FunctionLocation[];
 }>;
 /** Type representing a field layout in the storage of a contract. */
 export type FieldLayout = {
     /** Slot in which the field is stored. */
     slot: Fr;
 };
+/** Placeholder version injected into artifacts compiled before aztecVersion was added. TODO(F-557): Remove. */
+export declare const ARTIFACT_VERSION_BEFORE_INJECTION = "FROM_RELEASE_BEFORE_VERSION_INJECTION";
 /** Defines artifact of a contract. */
 export interface ContractArtifact {
     /** The name of the contract. */
     name: string;
-    /** The version of compiler used to create this artifact */
-    aztecNrVersion?: string;
-    /** The functions of the contract. */
+    /** The version of the Aztec stack that compiled this artifact. */
+    aztecVersion: string;
+    /** The functions of the contract. Includes private and utility functions, plus the public dispatch function. */
     functions: FunctionArtifact[];
+    /** The public functions of the contract, excluding dispatch. */
+    nonDispatchPublicFunctions: FunctionAbi[];
     /** The outputs of the contract. */
     outputs: {
         structs: Record<string, AbiType[]>;
@@ -819,15 +340,128 @@ export interface ContractArtifact {
     };
     /** Storage layout */
     storageLayout: Record<string, FieldLayout>;
-    /** The notes used in the contract. */
-    notes: Record<string, ContractNote>;
     /** The map of file ID to the source code and path of the file. */
     fileMap: DebugFileMap;
 }
-export declare const ContractArtifactSchema: ZodFor<ContractArtifact>;
+export declare const ContractArtifactSchema: z.ZodObject<{
+    name: z.ZodString;
+    aztecVersion: z.ZodDefault<z.ZodString>;
+    functions: z.ZodArray<z.ZodIntersection<z.ZodObject<{
+        name: z.ZodString;
+        functionType: z.ZodEnum<typeof FunctionType>;
+        isOnlySelf: z.ZodBoolean;
+        isStatic: z.ZodBoolean;
+        isInitializer: z.ZodBoolean;
+        parameters: z.ZodArray<z.ZodObject<{
+            name: z.ZodString;
+            type: z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>;
+            visibility: z.ZodEnum<{
+                databus: "databus";
+                private: "private";
+                public: "public";
+            }>;
+        }, z.core.$strip>>;
+        returnTypes: z.ZodArray<z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>;
+        errorTypes: z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
+            error_kind: z.ZodLiteral<"string">;
+            string: z.ZodString;
+        }, z.core.$strip>, z.ZodObject<{
+            error_kind: z.ZodLiteral<"fmtstring">;
+            length: z.ZodNumber;
+            item_types: z.ZodArray<z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>;
+        }, z.core.$strip>, z.ZodIntersection<z.ZodObject<{
+            error_kind: z.ZodLiteral<"custom">;
+        }, z.core.$strip>, z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>]>>>;
+    }, z.core.$strip>, z.ZodObject<{
+        bytecode: import("@aztec/foundation/schemas").ZodFor<Buffer<ArrayBufferLike>>;
+        verificationKey: z.ZodOptional<z.ZodString>;
+        debugSymbols: z.ZodString;
+        debug: z.ZodOptional<z.ZodObject<{
+            debugSymbols: z.ZodObject<{
+                location_tree: z.ZodObject<{
+                    locations: z.ZodArray<z.ZodObject<{
+                        parent: z.ZodNullable<z.ZodNumber>;
+                        value: z.ZodObject<{
+                            span: z.ZodObject<{
+                                start: z.ZodNumber;
+                                end: z.ZodNumber;
+                            }, z.core.$strip>;
+                            file: z.ZodNumber;
+                        }, z.core.$strip>;
+                    }, z.core.$strip>>;
+                }, z.core.$strip>;
+                acir_locations: z.ZodRecord<z.ZodString, z.ZodNumber>;
+                brillig_locations: z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodNumber>>;
+            }, z.core.$strip>;
+            files: z.ZodRecord<z.ZodString, z.ZodObject<{
+                source: z.ZodString;
+                path: z.ZodString;
+                function_locations: z.ZodArray<z.ZodObject<{
+                    start: z.ZodNumber;
+                    name: z.ZodString;
+                }, z.core.$strip>>;
+            }, z.core.$strip>>;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>>;
+    nonDispatchPublicFunctions: z.ZodArray<z.ZodObject<{
+        name: z.ZodString;
+        functionType: z.ZodEnum<typeof FunctionType>;
+        isOnlySelf: z.ZodBoolean;
+        isStatic: z.ZodBoolean;
+        isInitializer: z.ZodBoolean;
+        parameters: z.ZodArray<z.ZodObject<{
+            name: z.ZodString;
+            type: z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>;
+            visibility: z.ZodEnum<{
+                databus: "databus";
+                private: "private";
+                public: "public";
+            }>;
+        }, z.core.$strip>>;
+        returnTypes: z.ZodArray<z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>;
+        errorTypes: z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodUnion<readonly [z.ZodObject<{
+            error_kind: z.ZodLiteral<"string">;
+            string: z.ZodString;
+        }, z.core.$strip>, z.ZodObject<{
+            error_kind: z.ZodLiteral<"fmtstring">;
+            length: z.ZodNumber;
+            item_types: z.ZodArray<z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>;
+        }, z.core.$strip>, z.ZodIntersection<z.ZodObject<{
+            error_kind: z.ZodLiteral<"custom">;
+        }, z.core.$strip>, z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>]>>>;
+    }, z.core.$strip>>;
+    outputs: z.ZodObject<{
+        structs: z.ZodPipe<z.ZodRecord<z.ZodString, z.ZodArray<z.ZodType<AbiType, unknown, z.core.$ZodTypeInternals<AbiType, unknown>>>>, z.ZodTransform<Record<string, AbiType[]>, Record<string, AbiType[]>>>;
+        globals: z.ZodRecord<z.ZodString, z.ZodArray<z.ZodType<AbiValue, unknown, z.core.$ZodTypeInternals<AbiValue, unknown>>>>;
+    }, z.core.$strip>;
+    storageLayout: z.ZodRecord<z.ZodString, z.ZodObject<{
+        slot: z.ZodType<Fr, string, z.core.$ZodTypeInternals<Fr, string>>;
+    }, z.core.$strip>>;
+    fileMap: z.ZodRecord<z.ZodCoercedNumber<unknown>, z.ZodObject<{
+        source: z.ZodString;
+        path: z.ZodString;
+        function_locations: z.ZodArray<z.ZodObject<{
+            start: z.ZodNumber;
+            name: z.ZodString;
+        }, z.core.$strip>>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
 export declare function getFunctionArtifactByName(artifact: ContractArtifact, functionName: string): FunctionArtifact;
 /** Gets a function artifact including debug metadata given its name or selector. */
-export declare function getFunctionArtifact(artifact: ContractArtifact, functionNameOrSelector: string | FunctionSelector): Promise<FunctionArtifact>;
+export declare function getFunctionArtifact(artifact: ContractArtifact, functionNameOrSelector: string | FunctionSelector): Promise<FunctionArtifactWithContractName>;
+/**
+ * Finds the function artifact within `artifact.functions` whose selector matches `selector`.
+ * Returns `undefined` if no match is found.
+ */
+export declare function findFunctionArtifactBySelector(artifact: ContractArtifact, selector: FunctionSelector): Promise<FunctionArtifact | undefined>;
+/**
+ * Finds the function abi (across both `functions` and `nonDispatchPublicFunctions`) whose selector
+ * matches `selector`. Returns `undefined` if no match is found.
+ */
+export declare function findFunctionAbiBySelector(artifact: ContractArtifact, selector: FunctionSelector): Promise<FunctionAbi | undefined>;
+/** Gets all function abis */
+export declare function getAllFunctionAbis(artifact: ContractArtifact): FunctionAbi[];
+export declare function parseDebugSymbols(debugSymbols: string): DebugInfo[];
 /**
  * Gets the debug metadata of a given function from the contract artifact
  * @param artifact - The contract build artifact
@@ -842,12 +476,15 @@ export declare function getFunctionDebugMetadata(contractArtifact: ContractArtif
  * @param contractArtifact - The contract artifact.
  * @returns An initializer function, or none if there are no functions flagged as initializers in the contract.
  */
-export declare function getDefaultInitializer(contractArtifact: ContractArtifact): FunctionArtifact | undefined;
+export declare function getDefaultInitializer(contractArtifact: ContractArtifact): FunctionAbi | undefined;
 /**
  * Returns an initializer from the contract.
  * @param initializerNameOrArtifact - The name of the constructor, or the artifact of the constructor, or undefined
  * to pick the default initializer.
  */
-export declare function getInitializer(contract: ContractArtifact, initializerNameOrArtifact: string | undefined | FunctionArtifact): FunctionArtifact | undefined;
+export declare function getInitializer(contract: ContractArtifact, initializerNameOrArtifact: string | undefined | FunctionArtifact): FunctionAbi | undefined;
+export declare function emptyFunctionAbi(): FunctionAbi;
+export declare function emptyFunctionArtifact(): FunctionArtifact;
+export declare function emptyContractArtifact(): ContractArtifact;
 export {};
-//# sourceMappingURL=abi.d.ts.map
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"abi.d.ts","sourceRoot":"","sources":["../../src/abi/abi.ts"],"names":[],"mappings":"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"}