@aztec/builder 0.79.0 → 0.80.0

package/dest/contract-interface-gen/typescript.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../src/contract-interface-gen/typescript.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EAStB,MAAM,mBAAmB,CAAC;AAyR3B;;;;;GAKG;AACH,wBAAsB,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,EAAE,MAAM,mBA8E7G"}
+{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../src/contract-interface-gen/typescript.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EAUtB,MAAM,mBAAmB,CAAC;AAgS3B;;;;;GAKG;AACH,wBAAsB,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,EAAE,MAAM,mBA+E7G"}

package/dest/contract-interface-gen/typescript.js

@@ -1,4 +1,4 @@
-import { EventSelector, decodeFunctionSignature, getDefaultInitializer, isAztecAddressStruct, isEthAddressStruct, isFunctionSelectorStruct, isWrappedFieldStruct } from '@aztec/stdlib/abi';
+import { EventSelector, decodeFunctionSignature, getAllFunctionAbis, getDefaultInitializer, isAztecAddressStruct, isEthAddressStruct, isFunctionSelectorStruct, isWrappedFieldStruct } from '@aztec/stdlib/abi';
 /**
  * Returns the corresponding typescript type for a given Noir type.
  * @param type - The input Noir type.
@@ -128,9 +128,9 @@ import { EventSelector, decodeFunctionSignature, getDefaultInitializer, isAztecA
   }`;
 }
 /**
- * Generates a static getter for the contract's artifact.
+ * Generates static getters for the contract's artifact.
  * @param name - Name of the contract used to derive name of the artifact import.
- */ function generateArtifactGetter(name) {
+ */ function generateArtifactGetters(name) {
     const artifactName = `${name}ContractArtifact`;
     return `
   /**
@@ -139,6 +139,13 @@ import { EventSelector, decodeFunctionSignature, getDefaultInitializer, isAztecA
   public static get artifact(): ContractArtifact {
     return ${artifactName};
   }
+
+  /**
+   * Returns this contract's artifact with public bytecode.
+   */
+  public static get artifactForPublic(): ContractArtifact {
+    return loadContractArtifactForPublic(${artifactName}Json as NoirCompiledContract);
+  }
   `;
 }
 /**
@@ -240,12 +247,12 @@ async function generateEvents(events) {
  * @param artifactImportPath - Optional path to import the artifact (if not set, will be required in the constructor).
  * @returns The corresponding ts code.
  */ export async function generateTypescriptContractInterface(input, artifactImportPath) {
-    const methods = input.functions.filter((f)=>!f.isInternal).sort((a, b)=>a.name.localeCompare(b.name)).map(generateMethod);
+    const methods = getAllFunctionAbis(input).filter((f)=>!f.isInternal).sort((a, b)=>a.name.localeCompare(b.name)).map(generateMethod);
     const deploy = artifactImportPath && generateDeploy(input);
     const ctor = artifactImportPath && generateConstructor(input.name);
     const at = artifactImportPath && generateAt(input.name);
     const artifactStatement = artifactImportPath && generateAbiStatement(input.name, artifactImportPath);
-    const artifactGetter = artifactImportPath && generateArtifactGetter(input.name);
+    const artifactGetter = artifactImportPath && generateArtifactGetters(input.name);
     const storageLayoutGetter = artifactImportPath && generateStorageLayoutGetter(input);
     const notesGetter = artifactImportPath && generateNotesGetter(input);
     const { eventDefs, events } = await generateEvents(input.outputs.structs?.events);
@@ -276,6 +283,7 @@ import {
   type FunctionSelectorLike,
   L1EventPayload,
   loadContractArtifact,
+  loadContractArtifactForPublic,
   type NoirCompiledContract,
   NoteSelector,
   Point,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/builder",
-  "version": "0.79.0",
+  "version": "0.80.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -67,8 +67,8 @@
     ]
   },
   "dependencies": {
-    "@aztec/foundation": "0.79.0",
-    "@aztec/stdlib": "0.79.0",
+    "@aztec/foundation": "0.80.0",
+    "@aztec/stdlib": "0.80.0",
     "commander": "^12.1.0"
   },
   "devDependencies": {

package/src/contract-interface-gen/typescript.ts

@@ -3,8 +3,9 @@ import {
   type ABIVariable,
   type ContractArtifact,
   EventSelector,
-  type FunctionArtifact,
+  type FunctionAbi,
   decodeFunctionSignature,
+  getAllFunctionAbis,
   getDefaultInitializer,
   isAztecAddressStruct,
   isEthAddressStruct,
@@ -62,7 +63,7 @@ function generateParameter(param: ABIParameter) {
  * @param param - A Noir function.
  * @returns The corresponding ts code.
  */
-function generateMethod(entry: FunctionArtifact) {
+function generateMethod(entry: FunctionAbi) {
   const args = entry.parameters.map(generateParameter).join(', ');
   return `
     /** ${entry.name}(${entry.parameters.map(p => `${p.name}: ${p.type.kind}`).join(', ')}) */
@@ -154,10 +155,10 @@ function generateAt(name: string) {
 }
 
 /**
- * Generates a static getter for the contract's artifact.
+ * Generates static getters for the contract's artifact.
  * @param name - Name of the contract used to derive name of the artifact import.
  */
-function generateArtifactGetter(name: string) {
+function generateArtifactGetters(name: string) {
   const artifactName = `${name}ContractArtifact`;
   return `
   /**
@@ -166,6 +167,13 @@ function generateArtifactGetter(name: string) {
   public static get artifact(): ContractArtifact {
     return ${artifactName};
   }
+
+  /**
+   * Returns this contract's artifact with public bytecode.
+   */
+  public static get artifactForPublic(): ContractArtifact {
+    return loadContractArtifactForPublic(${artifactName}Json as NoirCompiledContract);
+  }
   `;
 }
 
@@ -298,7 +306,7 @@ async function generateEvents(events: any[] | undefined) {
  * @returns The corresponding ts code.
  */
 export async function generateTypescriptContractInterface(input: ContractArtifact, artifactImportPath?: string) {
-  const methods = input.functions
+  const methods = getAllFunctionAbis(input)
     .filter(f => !f.isInternal)
     .sort((a, b) => a.name.localeCompare(b.name))
     .map(generateMethod);
@@ -306,7 +314,7 @@ export async function generateTypescriptContractInterface(input: ContractArtifac
   const ctor = artifactImportPath && generateConstructor(input.name);
   const at = artifactImportPath && generateAt(input.name);
   const artifactStatement = artifactImportPath && generateAbiStatement(input.name, artifactImportPath);
-  const artifactGetter = artifactImportPath && generateArtifactGetter(input.name);
+  const artifactGetter = artifactImportPath && generateArtifactGetters(input.name);
   const storageLayoutGetter = artifactImportPath && generateStorageLayoutGetter(input);
   const notesGetter = artifactImportPath && generateNotesGetter(input);
   const { eventDefs, events } = await generateEvents(input.outputs.structs?.events);
@@ -338,6 +346,7 @@ import {
   type FunctionSelectorLike,
   L1EventPayload,
   loadContractArtifact,
+  loadContractArtifactForPublic,
   type NoirCompiledContract,
   NoteSelector,
   Point,