@aztec/stdlib 3.0.0-canary.a9708bd → 3.0.0-devnet.2-patch.1

package/dest/abi/abi.d.ts

@@ -1,4 +1,4 @@
-import type { Fr } from '@aztec/foundation/fields';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { type ZodFor } from '@aztec/foundation/schemas';
 import { z } from 'zod';
 import { FunctionSelector } from './function_selector.js';
@@ -48,11 +48,11 @@ export declare const ABIVariableSchema: z.ZodObject<{
     /** The type of the variable. */
     type: z.ZodType<AbiType, z.ZodTypeDef, AbiType>;
 }, "strip", z.ZodTypeAny, {
-    type: AbiType;
     name: string;
-}, {
     type: AbiType;
+}, {
     name: string;
+    type: AbiType;
 }>;
 /** A named type. */
 export type ABIVariable = z.infer<typeof ABIVariableSchema>;
@@ -63,18 +63,18 @@ export declare const ABIParameterSchema: z.ZodIntersection<z.ZodObject<{
     /** The type of the variable. */
     type: z.ZodType<AbiType, z.ZodTypeDef, AbiType>;
 }, "strip", z.ZodTypeAny, {
-    type: AbiType;
     name: string;
-}, {
     type: AbiType;
+}, {
     name: string;
+    type: AbiType;
 }>, z.ZodObject<{
     /** Visibility of the parameter in the function. */
     visibility: z.ZodEnum<["public", "private", "databus"]>;
 }, "strip", z.ZodTypeAny, {
-    visibility: "public" | "private" | "databus";
+    visibility: "databus" | "private" | "public";
 }, {
-    visibility: "public" | "private" | "databus";
+    visibility: "databus" | "private" | "public";
 }>>;
 /** A function parameter. */
 export type ABIParameter = z.infer<typeof ABIParameterSchema>;
@@ -132,8 +132,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. */
@@ -148,7 +148,7 @@ export interface FunctionAbi {
 export declare const FunctionAbiSchema: 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<{
@@ -156,35 +156,35 @@ export declare const FunctionAbiSchema: z.ZodObject<{
         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;
+        visibility: "databus" | "private" | "public";
+    }, {
         name: string;
-        visibility: "public" | "private" | "databus";
+        type: AbiType;
+        visibility: "databus" | "private" | "public";
     }>, "many">;
     returnTypes: z.ZodArray<z.ZodType<AbiType, z.ZodTypeDef, AbiType>, "many">;
-    errorTypes: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+    errorTypes: z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodUnion<[z.ZodObject<{
         error_kind: z.ZodLiteral<"string">;
         string: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        string: string;
         error_kind: "string";
-    }, {
         string: string;
+    }, {
         error_kind: "string";
+        string: string;
     }>, 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";
+        length: number;
         item_types: AbiType[];
     }, {
-        length: number;
         error_kind: "fmtstring";
+        length: number;
         item_types: AbiType[];
     }>, z.ZodIntersection<z.ZodObject<{
         error_kind: z.ZodLiteral<"custom">;
@@ -192,51 +192,51 @@ export declare const FunctionAbiSchema: z.ZodObject<{
         error_kind: "custom";
     }, {
         error_kind: "custom";
-    }>, z.ZodType<AbiType, z.ZodTypeDef, AbiType>>]>>;
+    }>, z.ZodType<AbiType, z.ZodTypeDef, AbiType>>]>>>;
 }, "strip", z.ZodTypeAny, {
     name: string;
-    parameters: {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }[];
     functionType: FunctionType;
-    isInternal: boolean;
+    isOnlySelf: boolean;
     isStatic: boolean;
     isInitializer: boolean;
+    parameters: {
+        name: string;
+        type: AbiType;
+        visibility: "databus" | "private" | "public";
+    }[];
     returnTypes: AbiType[];
     errorTypes: Record<string, {
-        string: string;
         error_kind: "string";
+        string: string;
     } | {
-        length: number;
         error_kind: "fmtstring";
+        length: number;
         item_types: AbiType[];
     } | ({
         error_kind: "custom";
-    } & AbiType)>;
+    } & AbiType) | undefined>;
 }, {
     name: string;
-    parameters: {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }[];
     functionType: FunctionType;
-    isInternal: boolean;
+    isOnlySelf: boolean;
     isStatic: boolean;
     isInitializer: boolean;
+    parameters: {
+        name: string;
+        type: AbiType;
+        visibility: "databus" | "private" | "public";
+    }[];
     returnTypes: AbiType[];
     errorTypes: Record<string, {
-        string: string;
         error_kind: "string";
+        string: string;
     } | {
-        length: number;
         error_kind: "fmtstring";
+        length: number;
         item_types: AbiType[];
     } | ({
         error_kind: "custom";
-    } & AbiType)>;
+    } & AbiType) | undefined>;
 }>;
 /** Debug metadata for a function. */
 export interface FunctionDebugMetadata {
@@ -276,6 +276,7 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
                     file: number;
                 }>;
             }, "strip", z.ZodTypeAny, {
+                parent: number | null;
                 value: {
                     span: {
                         start: number;
@@ -283,8 +284,8 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
                     };
                     file: number;
                 };
-                parent: number | null;
             }, {
+                parent: number | null;
                 value: {
                     span: {
                         start: number;
@@ -292,10 +293,10 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
                     };
                     file: number;
                 };
-                parent: number | null;
             }>, "many">;
         }, "strip", z.ZodTypeAny, {
             locations: {
+                parent: number | null;
                 value: {
                     span: {
                         start: number;
@@ -303,10 +304,10 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
                     };
                     file: number;
                 };
-                parent: number | null;
             }[];
         }, {
             locations: {
+                parent: number | null;
                 value: {
                     span: {
                         start: number;
@@ -314,7 +315,6 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
                     };
                     file: number;
                 };
-                parent: number | null;
             }[];
         }>;
         acir_locations: z.ZodRecord<z.ZodString, z.ZodNumber>;
@@ -322,6 +322,7 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         location_tree: {
             locations: {
+                parent: number | null;
                 value: {
                     span: {
                         start: number;
@@ -329,7 +330,6 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
                     };
                     file: number;
                 };
-                parent: number | null;
             }[];
         };
         acir_locations: Record<string, number>;
@@ -337,6 +337,7 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
     }, {
         location_tree: {
             locations: {
+                parent: number | null;
                 value: {
                     span: {
                         start: number;
@@ -344,7 +345,6 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
                     };
                     file: number;
                 };
-                parent: number | null;
             }[];
         };
         acir_locations: Record<string, number>;
@@ -354,16 +354,17 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
         source: z.ZodString;
         path: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        path: string;
         source: string;
-    }, {
         path: string;
+    }, {
         source: string;
+        path: string;
     }>>;
 }, "strip", z.ZodTypeAny, {
     debugSymbols: {
         location_tree: {
             locations: {
+                parent: number | null;
                 value: {
                     span: {
                         start: number;
@@ -371,20 +372,20 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
                     };
                     file: number;
                 };
-                parent: number | null;
             }[];
         };
         acir_locations: Record<string, number>;
         brillig_locations: Record<string, Record<string, number>>;
     };
     files: Record<string, {
-        path: string;
         source: string;
+        path: string;
     }>;
 }, {
     debugSymbols: {
         location_tree: {
             locations: {
+                parent: number | null;
                 value: {
                     span: {
                         start: number;
@@ -392,15 +393,14 @@ export declare const FunctionDebugMetadataSchema: z.ZodObject<{
                     };
                     file: number;
                 };
-                parent: number | null;
             }[];
         };
         acir_locations: Record<string, number>;
         brillig_locations: Record<string, Record<string, number>>;
     };
     files: Record<string, {
-        path: string;
         source: string;
+        path: string;
     }>;
 }>;
 /** The artifact entry of a function. */
@@ -421,7 +421,7 @@ export interface FunctionArtifactWithContractName extends FunctionArtifact {
 export declare const FunctionArtifactSchema: z.ZodIntersection<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<{
@@ -429,35 +429,35 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
         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;
+        visibility: "databus" | "private" | "public";
+    }, {
         name: string;
-        visibility: "public" | "private" | "databus";
+        type: AbiType;
+        visibility: "databus" | "private" | "public";
     }>, "many">;
     returnTypes: z.ZodArray<z.ZodType<AbiType, z.ZodTypeDef, AbiType>, "many">;
-    errorTypes: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+    errorTypes: z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodUnion<[z.ZodObject<{
         error_kind: z.ZodLiteral<"string">;
         string: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        string: string;
         error_kind: "string";
-    }, {
         string: string;
+    }, {
         error_kind: "string";
+        string: string;
     }>, 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";
+        length: number;
         item_types: AbiType[];
     }, {
-        length: number;
         error_kind: "fmtstring";
+        length: number;
         item_types: AbiType[];
     }>, z.ZodIntersection<z.ZodObject<{
         error_kind: z.ZodLiteral<"custom">;
@@ -465,65 +465,53 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
         error_kind: "custom";
     }, {
         error_kind: "custom";
-    }>, z.ZodType<AbiType, z.ZodTypeDef, AbiType>>]>>;
+    }>, z.ZodType<AbiType, z.ZodTypeDef, AbiType>>]>>>;
 }, "strip", z.ZodTypeAny, {
     name: string;
-    parameters: {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }[];
     functionType: FunctionType;
-    isInternal: boolean;
+    isOnlySelf: boolean;
     isStatic: boolean;
     isInitializer: boolean;
+    parameters: {
+        name: string;
+        type: AbiType;
+        visibility: "databus" | "private" | "public";
+    }[];
     returnTypes: AbiType[];
     errorTypes: Record<string, {
-        string: string;
         error_kind: "string";
+        string: string;
     } | {
-        length: number;
         error_kind: "fmtstring";
+        length: number;
         item_types: AbiType[];
     } | ({
         error_kind: "custom";
-    } & AbiType)>;
+    } & AbiType) | undefined>;
 }, {
     name: string;
-    parameters: {
-        type: AbiType;
-        name: string;
-        visibility: "public" | "private" | "databus";
-    }[];
     functionType: FunctionType;
-    isInternal: boolean;
+    isOnlySelf: boolean;
     isStatic: boolean;
     isInitializer: boolean;
+    parameters: {
+        name: string;
+        type: AbiType;
+        visibility: "databus" | "private" | "public";
+    }[];
     returnTypes: AbiType[];
     errorTypes: Record<string, {
-        string: string;
         error_kind: "string";
+        string: string;
     } | {
-        length: number;
         error_kind: "fmtstring";
+        length: number;
         item_types: AbiType[];
     } | ({
         error_kind: "custom";
-    } & AbiType)>;
+    } & AbiType) | undefined>;
 }>, z.ZodObject<{
-    bytecode: z.ZodUnion<[z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, Buffer<ArrayBuffer>, 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<ArrayBuffer>, {
-        type: "Buffer";
-        data: number[];
-    }>]>;
+    bytecode: ZodFor<Buffer<ArrayBufferLike>>;
     verificationKey: z.ZodOptional<z.ZodString>;
     debugSymbols: z.ZodString;
     debug: z.ZodOptional<z.ZodObject<{
@@ -557,6 +545,7 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
                         file: number;
                     }>;
                 }, "strip", z.ZodTypeAny, {
+                    parent: number | null;
                     value: {
                         span: {
                             start: number;
@@ -564,8 +553,8 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
                         };
                         file: number;
                     };
-                    parent: number | null;
                 }, {
+                    parent: number | null;
                     value: {
                         span: {
                             start: number;
@@ -573,10 +562,10 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
                         };
                         file: number;
                     };
-                    parent: number | null;
                 }>, "many">;
             }, "strip", z.ZodTypeAny, {
                 locations: {
+                    parent: number | null;
                     value: {
                         span: {
                             start: number;
@@ -584,10 +573,10 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
                         };
                         file: number;
                     };
-                    parent: number | null;
                 }[];
             }, {
                 locations: {
+                    parent: number | null;
                     value: {
                         span: {
                             start: number;
@@ -595,7 +584,6 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
                         };
                         file: number;
                     };
-                    parent: number | null;
                 }[];
             }>;
             acir_locations: z.ZodRecord<z.ZodString, z.ZodNumber>;
@@ -603,6 +591,7 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
         }, "strip", z.ZodTypeAny, {
             location_tree: {
                 locations: {
+                    parent: number | null;
                     value: {
                         span: {
                             start: number;
@@ -610,7 +599,6 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
                         };
                         file: number;
                     };
-                    parent: number | null;
                 }[];
             };
             acir_locations: Record<string, number>;
@@ -618,6 +606,7 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
         }, {
             location_tree: {
                 locations: {
+                    parent: number | null;
                     value: {
                         span: {
                             start: number;
@@ -625,7 +614,6 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
                         };
                         file: number;
                     };
-                    parent: number | null;
                 }[];
             };
             acir_locations: Record<string, number>;
@@ -635,16 +623,17 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
             source: z.ZodString;
             path: z.ZodString;
         }, "strip", z.ZodTypeAny, {
-            path: string;
             source: string;
-        }, {
             path: string;
+        }, {
             source: string;
+            path: string;
         }>>;
     }, "strip", z.ZodTypeAny, {
         debugSymbols: {
             location_tree: {
                 locations: {
+                    parent: number | null;
                     value: {
                         span: {
                             start: number;
@@ -652,20 +641,20 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
                         };
                         file: number;
                     };
-                    parent: number | null;
                 }[];
             };
             acir_locations: Record<string, number>;
             brillig_locations: Record<string, Record<string, number>>;
         };
         files: Record<string, {
-            path: string;
             source: string;
+            path: string;
         }>;
     }, {
         debugSymbols: {
             location_tree: {
                 locations: {
+                    parent: number | null;
                     value: {
                         span: {
                             start: number;
@@ -673,24 +662,25 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
                         };
                         file: number;
                     };
-                    parent: number | null;
                 }[];
             };
             acir_locations: Record<string, number>;
             brillig_locations: Record<string, Record<string, number>>;
         };
         files: Record<string, {
-            path: string;
             source: string;
+            path: string;
         }>;
     }>>;
 }, "strip", z.ZodTypeAny, {
+    bytecode: Buffer<ArrayBufferLike>;
+    verificationKey?: string | undefined;
     debugSymbols: string;
-    bytecode: Buffer<ArrayBuffer>;
     debug?: {
         debugSymbols: {
             location_tree: {
                 locations: {
+                    parent: number | null;
                     value: {
                         span: {
                             start: number;
@@ -698,28 +688,25 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
                         };
                         file: number;
                     };
-                    parent: number | null;
                 }[];
             };
             acir_locations: Record<string, number>;
             brillig_locations: Record<string, Record<string, number>>;
         };
         files: Record<string, {
-            path: string;
             source: string;
+            path: string;
         }>;
     } | undefined;
-    verificationKey?: string | undefined;
 }, {
+    bytecode?: any;
+    verificationKey?: string | undefined;
     debugSymbols: string;
-    bytecode: string | {
-        type: "Buffer";
-        data: number[];
-    };
     debug?: {
         debugSymbols: {
             location_tree: {
                 locations: {
+                    parent: number | null;
                     value: {
                         span: {
                             start: number;
@@ -727,18 +714,16 @@ export declare const FunctionArtifactSchema: z.ZodIntersection<z.ZodObject<{
                         };
                         file: number;
                     };
-                    parent: number | null;
                 }[];
             };
             acir_locations: Record<string, number>;
             brillig_locations: Record<string, Record<string, number>>;
         };
         files: Record<string, {
-            path: string;
             source: string;
+            path: string;
         }>;
     } | undefined;
-    verificationKey?: string | undefined;
 }>>;
 /** A file ID. It's assigned during compilation. */
 type FileId = number;
@@ -843,4 +828,4 @@ 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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"}