@aztec/builder 0.0.1-commit.b655e406 → 0.0.1-commit.b9865e97

package/dest/bin/cli.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 export {};
-//# sourceMappingURL=cli.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYmluL2NsaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIn0=

package/dest/contract-interface-gen/codegen.d.ts

@@ -5,5 +5,5 @@ export type GenerateCodeOptions = {
 /**
  * Generates Noir interface or Typescript interface for a folder or single file from a Noir compilation artifact.
  */
-export declare function generateCode(outputPath: string, fileOrDirPath: string, opts?: GenerateCodeOptions): Promise<string[]>;
-//# sourceMappingURL=codegen.d.ts.map
+export declare function generateCode(outputPath: string, fileOrDirPath: string, opts?: GenerateCodeOptions): Promise<(string | undefined)[]>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZWdlbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0LWludGVyZmFjZS1nZW4vY29kZWdlbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFZQSw0QkFBNEI7QUFDNUIsTUFBTSxNQUFNLG1CQUFtQixHQUFHO0lBQUUsS0FBSyxDQUFDLEVBQUUsT0FBTyxDQUFBO0NBQUUsQ0FBQztBQUV0RDs7R0FFRztBQUNILHdCQUFzQixZQUFZLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxhQUFhLEVBQUUsTUFBTSxFQUFFLElBQUksR0FBRSxtQkFBd0IsbUNBa0IzRyJ9

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

@@ -1 +1 @@
-{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../src/contract-interface-gen/codegen.ts"],"names":[],"mappings":"AAYA,4BAA4B;AAC5B,MAAM,MAAM,mBAAmB,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtD;;GAEG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,GAAE,mBAAwB,qBAkB3G"}
+{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../src/contract-interface-gen/codegen.ts"],"names":[],"mappings":"AAYA,4BAA4B;AAC5B,MAAM,MAAM,mBAAmB,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtD;;GAEG;AACH,wBAAsB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,GAAE,mBAAwB,mCAkB3G"}

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

@@ -38,6 +38,10 @@ let cache = {};
     }
     const file = await readFile(noirAbiPath, 'utf8');
     const contract = JSON.parse(file);
+    if (!Array.isArray(contract.functions)) {
+        console.log(`${fileName} is not a contract artifact. Skipping.`);
+        return;
+    }
     const aztecAbi = loadContractArtifact(contract);
     await mkdir(outputPath, {
         recursive: true

package/dest/contract-interface-gen/index.d.ts

@@ -0,0 +1,2 @@
+export { generateTypescriptContractInterface } from './typescript.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC1pbnRlcmZhY2UtZ2VuL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxtQ0FBbUMsRUFBRSxNQUFNLGlCQUFpQixDQUFDIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/contract-interface-gen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mCAAmC,EAAE,MAAM,iBAAiB,CAAC"}

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

@@ -0,0 +1 @@
+export { generateTypescriptContractInterface } from './typescript.js';

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

@@ -6,4 +6,4 @@ import { type ContractArtifact } from '@aztec/stdlib/abi';
  * @returns The corresponding ts code.
  */
 export declare function generateTypescriptContractInterface(input: ContractArtifact, artifactImportPath?: string): Promise<string>;
-//# sourceMappingURL=typescript.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXNjcmlwdC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0LWludGVyZmFjZS1nZW4vdHlwZXNjcmlwdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBR0wsS0FBSyxnQkFBZ0IsRUFhdEIsTUFBTSxtQkFBbUIsQ0FBQztBQXVSM0I7Ozs7O0dBS0c7QUFDSCx3QkFBc0IsbUNBQW1DLENBQUMsS0FBSyxFQUFFLGdCQUFnQixFQUFFLGtCQUFrQixDQUFDLEVBQUUsTUFBTSxtQkFrRDdHIn0=

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,EAWtB,MAAM,mBAAmB,CAAC;AAwQ3B;;;;;GAKG;AACH,wBAAsB,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,EAAE,MAAM,mBAkD7G"}
+{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../../src/contract-interface-gen/typescript.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EAatB,MAAM,mBAAmB,CAAC;AAuR3B;;;;;GAKG;AACH,wBAAsB,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,CAAC,EAAE,MAAM,mBAkD7G"}

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

@@ -1,4 +1,4 @@
-import { EventSelector, decodeFunctionSignature, getAllFunctionAbis, getDefaultInitializer, isAztecAddressStruct, isBoundedVecStruct, isEthAddressStruct, isFunctionSelectorStruct, isWrappedFieldStruct } from '@aztec/stdlib/abi';
+import { EventSelector, decodeFunctionSignature, getAllFunctionAbis, getDefaultInitializer, isAztecAddressStruct, isBoundedVecStruct, isEthAddressStruct, isFunctionSelectorStruct, isOptionStruct, isPublicKeysStruct, isWrappedFieldStruct } from '@aztec/stdlib/abi';
 /**
  * Returns the corresponding typescript type for a given Noir type.
  * @param type - The input Noir type.
@@ -28,11 +28,19 @@ import { EventSelector, decodeFunctionSignature, getAllFunctionAbis, getDefaultI
             if (isWrappedFieldStruct(type)) {
                 return 'WrappedFieldLike';
             }
+            if (isPublicKeysStruct(type)) {
+                // PublicKeys are special cased due to them being part of the preimage of contract addresses.
+                // The proper type is expected by the TS code that deals with the ContractInstanceRegistry protocol contract.
+                return 'PublicKeys';
+            }
             if (isBoundedVecStruct(type)) {
                 // To make BoundedVec easier to work with, we expect a simple array on the input and then we encode it
                 // as a BoundedVec in the ArgumentsEncoder.
                 return `${abiTypeToTypescript(type.fields[0].type)}`;
             }
+            if (isOptionStruct(type)) {
+                return `OptionLike<${abiTypeToTypescript(type.fields[1].type)}>`;
+            }
             return `{ ${type.fields.map((f)=>`${f.name}: ${abiTypeToTypescript(f.type)}`).join(', ')} }`;
         default:
             throw new Error(`Unknown type ${type.kind}`);
@@ -61,38 +69,46 @@ import { EventSelector, decodeFunctionSignature, getAllFunctionAbis, getDefaultI
  * @returns A type-safe deploy method in ts.
  */ function generateDeploy(input) {
     const ctor = getDefaultInitializer(input);
-    const args = (ctor?.parameters ?? []).map(generateParameter).join(', ');
+    const ctorParams = ctor?.parameters ?? [];
+    const args = ctorParams.map(generateParameter).join(', ');
+    const argNames = ctorParams.map((p)=>p.name).join(', ');
+    const argsForwarding = argNames ? `[${argNames}]` : '[]';
     const contractName = `${input.name}Contract`;
     const artifactName = `${contractName}Artifact`;
     return `
   /**
    * Creates a tx to deploy a new instance of this contract.
+   * @param instantiation - Optional address-affecting parameters (salt, deployer / universalDeploy, publicKeys).
+   *                       Salt defaults to a random value; the deployer is locked lazily from the first send-time \`from\`.
    */
-  public static deploy(wallet: Wallet, ${args}) {
-    return new DeployMethod<${contractName}>(PublicKeys.default(), wallet, ${artifactName}, ${contractName}.at, Array.from(arguments).slice(1));
-  }
-
-  /**
-   * Creates a tx to deploy a new instance of this contract using the specified public keys hash to derive the address.
-   */
-  public static deployWithPublicKeys(publicKeys: PublicKeys, wallet: Wallet, ${args}) {
-    return new DeployMethod<${contractName}>(publicKeys, wallet, ${artifactName}, ${contractName}.at, Array.from(arguments).slice(2));
+  public static deploy(wallet: Wallet, ${args ? `${args}, ` : ''}instantiation?: DeployInstantiationOptions) {
+    return DeployMethod.create<${contractName}>(
+      wallet,
+      {
+        artifact: ${artifactName},
+        postDeployCtor: (instance, wallet) => ${contractName}.at(instance.address, wallet),
+        args: ${argsForwarding},
+      },
+      instantiation,
+    );
   }
 
   /**
    * Creates a tx to deploy a new instance of this contract using the specified constructor method.
    */
   public static deployWithOpts<M extends keyof ${contractName}['methods']>(
-    opts: { publicKeys?: PublicKeys; method?: M; wallet: Wallet },
+    opts: { method?: M; wallet: Wallet; instantiation?: DeployInstantiationOptions },
     ...args: Parameters<${contractName}['methods'][M]>
   ) {
-    return new DeployMethod<${contractName}>(
-      opts.publicKeys ?? PublicKeys.default(),
+    return DeployMethod.create<${contractName}>(
       opts.wallet,
-      ${artifactName},
-      ${contractName}.at,
-      Array.from(arguments).slice(1),
-      opts.method ?? 'constructor',
+      {
+        artifact: ${artifactName},
+        postDeployCtor: (instance, wallet) => ${contractName}.at(instance.address, wallet),
+        args,
+        constructorNameOrArtifact: opts.method ?? 'constructor',
+      },
+      opts.instantiation,
     );
   }
   `;
@@ -101,14 +117,14 @@ import { EventSelector, decodeFunctionSignature, getAllFunctionAbis, getDefaultI
  * Generates the constructor by supplying the ABI to the parent class so the user doesn't have to.
  * @param name - Name of the contract to derive the ABI name from.
  * @returns A constructor method.
- * @remarks The constructor is private because we want to force the user to use the create method.
+ * @remarks The constructor is private because we want to force the user to use the at method.
  */ function generateConstructor(name) {
     return `
   private constructor(
-    instance: ContractInstanceWithAddress,
+    address: AztecAddress,
     wallet: Wallet,
   ) {
-    super(instance, ${name}ContractArtifact, wallet);
+    super(address, ${name}ContractArtifact, wallet);
   }
   `;
 }
@@ -116,20 +132,19 @@ import { EventSelector, decodeFunctionSignature, getAllFunctionAbis, getDefaultI
  * Generates the at method for this contract.
  * @param name - Name of the contract to derive the ABI name from.
  * @returns An at method.
- * @remarks We don't use constructor directly because of the async `wallet.getContractData` call.
  */ function generateAt(name) {
     return `
   /**
    * Creates a contract instance.
    * @param address - The deployed contract's address.
    * @param wallet - The wallet to use when interacting with the contract.
-   * @returns A promise that resolves to a new Contract instance.
+   * @returns A new Contract instance.
    */
-  public static async at(
+  public static at(
     address: AztecAddress,
     wallet: Wallet,
-  ) {
-    return Contract.at(address, ${name}Contract.artifact, wallet) as Promise<${name}Contract>;
+  ): ${name}Contract {
+    return Contract.at(address, ${name}Contract.artifact, wallet) as ${name}Contract;
   }`;
 }
 /**
@@ -233,7 +248,7 @@ 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 = getAllFunctionAbis(input).filter((f)=>!f.isInternal).sort((a, b)=>a.name.localeCompare(b.name)).map(generateMethod);
+    const methods = getAllFunctionAbis(input).filter((f)=>!f.isOnlySelf).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);
@@ -246,8 +261,8 @@ async function generateEvents(events) {
 
 /* eslint-disable */
 import { AztecAddress, CompleteAddress } from '@aztec/aztec.js/addresses';
-import { type AbiType, type AztecAddressLike, type ContractArtifact, EventSelector, decodeFromAbi, type EthAddressLike, type FieldLike, type FunctionSelectorLike, loadContractArtifact, loadContractArtifactForPublic, type NoirCompiledContract, type U128Like, type WrappedFieldLike } from '@aztec/aztec.js/abi';
-import { Contract, ContractBase, ContractFunctionInteraction, type ContractInstanceWithAddress, type ContractMethod, type ContractStorageLayout, DeployMethod } from '@aztec/aztec.js/contracts';
+import { type AbiType, type AztecAddressLike, type ContractArtifact, EventSelector, decodeFromAbi, type EthAddressLike, type FieldLike, type FunctionSelectorLike, loadContractArtifact, loadContractArtifactForPublic, type NoirCompiledContract, type OptionLike, type U128Like, type WrappedFieldLike } from '@aztec/aztec.js/abi';
+import { Contract, ContractBase, ContractFunctionInteraction, type ContractMethod, type ContractStorageLayout, type DeployInstantiationOptions, DeployMethod } from '@aztec/aztec.js/contracts';
 import { EthAddress } from '@aztec/aztec.js/addresses';
 import { Fr, Point } from '@aztec/aztec.js/fields';
 import { type PublicKey, PublicKeys } from '@aztec/aztec.js/keys';

package/dest/index.d.ts

@@ -1,3 +1,3 @@
 import type { Command } from 'commander';
 export declare function injectCommands(program: Command): Command;
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxPQUFPLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFHekMsd0JBQWdCLGNBQWMsQ0FBQyxPQUFPLEVBQUUsT0FBTyxXQVk5QyJ9

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@aztec/builder",
-  "version": "0.0.1-commit.b655e406",
+  "version": "0.0.1-commit.b9865e97",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
-    "./cli": "./dest/bin/cli.js"
+    "./cli": "./dest/bin/cli.js",
+    "./codegen": "./dest/contract-interface-gen/index.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -13,13 +14,10 @@
     "name": "Aztec builder",
     "tsconfig": "./tsconfig.json"
   },
-  "bin": {
-    "aztec-builder": "dest/bin/cli.js"
-  },
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
-    "generate": "tsc -b",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
+    "generate": "../scripts/tsc.sh",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
@@ -69,14 +67,15 @@
     ]
   },
   "dependencies": {
-    "@aztec/foundation": "0.0.1-commit.b655e406",
-    "@aztec/stdlib": "0.0.1-commit.b655e406",
+    "@aztec/foundation": "0.0.1-commit.b9865e97",
+    "@aztec/stdlib": "0.0.1-commit.b9865e97",
     "commander": "^12.1.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",
+    "@typescript/native-preview": "7.0.0-dev.20260113.1",
     "jest": "^30.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3"

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

@@ -50,6 +50,12 @@ async function generateFromNoirAbi(outputPath: string, noirAbiPath: string, opts
 
   const file = await readFile(noirAbiPath, 'utf8');
   const contract = JSON.parse(file);
+
+  if (!Array.isArray(contract.functions)) {
+    console.log(`${fileName} is not a contract artifact. Skipping.`);
+    return;
+  }
+
   const aztecAbi = loadContractArtifact(contract);
 
   await mkdir(outputPath, { recursive: true });

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

@@ -0,0 +1 @@
+export { generateTypescriptContractInterface } from './typescript.js';

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

@@ -11,6 +11,8 @@ import {
   isBoundedVecStruct,
   isEthAddressStruct,
   isFunctionSelectorStruct,
+  isOptionStruct,
+  isPublicKeysStruct,
   isWrappedFieldStruct,
 } from '@aztec/stdlib/abi';
 
@@ -44,11 +46,19 @@ function abiTypeToTypescript(type: ABIParameter['type']): string {
       if (isWrappedFieldStruct(type)) {
         return 'WrappedFieldLike';
       }
+      if (isPublicKeysStruct(type)) {
+        // PublicKeys are special cased due to them being part of the preimage of contract addresses.
+        // The proper type is expected by the TS code that deals with the ContractInstanceRegistry protocol contract.
+        return 'PublicKeys';
+      }
       if (isBoundedVecStruct(type)) {
         // To make BoundedVec easier to work with, we expect a simple array on the input and then we encode it
         // as a BoundedVec in the ArgumentsEncoder.
         return `${abiTypeToTypescript(type.fields[0].type)}`;
       }
+      if (isOptionStruct(type)) {
+        return `OptionLike<${abiTypeToTypescript(type.fields[1].type)}>`;
+      }
       return `{ ${type.fields.map(f => `${f.name}: ${abiTypeToTypescript(f.type)}`).join(', ')} }`;
     default:
       throw new Error(`Unknown type ${type.kind}`);
@@ -83,39 +93,47 @@ function generateMethod(entry: FunctionAbi) {
  */
 function generateDeploy(input: ContractArtifact) {
   const ctor = getDefaultInitializer(input);
-  const args = (ctor?.parameters ?? []).map(generateParameter).join(', ');
+  const ctorParams = ctor?.parameters ?? [];
+  const args = ctorParams.map(generateParameter).join(', ');
+  const argNames = ctorParams.map(p => p.name).join(', ');
+  const argsForwarding = argNames ? `[${argNames}]` : '[]';
   const contractName = `${input.name}Contract`;
   const artifactName = `${contractName}Artifact`;
 
   return `
   /**
    * Creates a tx to deploy a new instance of this contract.
+   * @param instantiation - Optional address-affecting parameters (salt, deployer / universalDeploy, publicKeys).
+   *                       Salt defaults to a random value; the deployer is locked lazily from the first send-time \`from\`.
    */
-  public static deploy(wallet: Wallet, ${args}) {
-    return new DeployMethod<${contractName}>(PublicKeys.default(), wallet, ${artifactName}, ${contractName}.at, Array.from(arguments).slice(1));
-  }
-
-  /**
-   * Creates a tx to deploy a new instance of this contract using the specified public keys hash to derive the address.
-   */
-  public static deployWithPublicKeys(publicKeys: PublicKeys, wallet: Wallet, ${args}) {
-    return new DeployMethod<${contractName}>(publicKeys, wallet, ${artifactName}, ${contractName}.at, Array.from(arguments).slice(2));
+  public static deploy(wallet: Wallet, ${args ? `${args}, ` : ''}instantiation?: DeployInstantiationOptions) {
+    return DeployMethod.create<${contractName}>(
+      wallet,
+      {
+        artifact: ${artifactName},
+        postDeployCtor: (instance, wallet) => ${contractName}.at(instance.address, wallet),
+        args: ${argsForwarding},
+      },
+      instantiation,
+    );
   }
 
   /**
    * Creates a tx to deploy a new instance of this contract using the specified constructor method.
    */
   public static deployWithOpts<M extends keyof ${contractName}['methods']>(
-    opts: { publicKeys?: PublicKeys; method?: M; wallet: Wallet },
+    opts: { method?: M; wallet: Wallet; instantiation?: DeployInstantiationOptions },
     ...args: Parameters<${contractName}['methods'][M]>
   ) {
-    return new DeployMethod<${contractName}>(
-      opts.publicKeys ?? PublicKeys.default(),
+    return DeployMethod.create<${contractName}>(
       opts.wallet,
-      ${artifactName},
-      ${contractName}.at,
-      Array.from(arguments).slice(1),
-      opts.method ?? 'constructor',
+      {
+        artifact: ${artifactName},
+        postDeployCtor: (instance, wallet) => ${contractName}.at(instance.address, wallet),
+        args,
+        constructorNameOrArtifact: opts.method ?? 'constructor',
+      },
+      opts.instantiation,
     );
   }
   `;
@@ -125,15 +143,15 @@ function generateDeploy(input: ContractArtifact) {
  * Generates the constructor by supplying the ABI to the parent class so the user doesn't have to.
  * @param name - Name of the contract to derive the ABI name from.
  * @returns A constructor method.
- * @remarks The constructor is private because we want to force the user to use the create method.
+ * @remarks The constructor is private because we want to force the user to use the at method.
  */
 function generateConstructor(name: string) {
   return `
   private constructor(
-    instance: ContractInstanceWithAddress,
+    address: AztecAddress,
     wallet: Wallet,
   ) {
-    super(instance, ${name}ContractArtifact, wallet);
+    super(address, ${name}ContractArtifact, wallet);
   }
   `;
 }
@@ -142,7 +160,6 @@ function generateConstructor(name: string) {
  * Generates the at method for this contract.
  * @param name - Name of the contract to derive the ABI name from.
  * @returns An at method.
- * @remarks We don't use constructor directly because of the async `wallet.getContractData` call.
  */
 function generateAt(name: string) {
   return `
@@ -150,13 +167,13 @@ function generateAt(name: string) {
    * Creates a contract instance.
    * @param address - The deployed contract's address.
    * @param wallet - The wallet to use when interacting with the contract.
-   * @returns A promise that resolves to a new Contract instance.
+   * @returns A new Contract instance.
    */
-  public static async at(
+  public static at(
     address: AztecAddress,
     wallet: Wallet,
-  ) {
-    return Contract.at(address, ${name}Contract.artifact, wallet) as Promise<${name}Contract>;
+  ): ${name}Contract {
+    return Contract.at(address, ${name}Contract.artifact, wallet) as ${name}Contract;
   }`;
 }
 
@@ -284,7 +301,7 @@ async function generateEvents(events: any[] | undefined) {
  */
 export async function generateTypescriptContractInterface(input: ContractArtifact, artifactImportPath?: string) {
   const methods = getAllFunctionAbis(input)
-    .filter(f => !f.isInternal)
+    .filter(f => !f.isOnlySelf)
     .sort((a, b) => a.name.localeCompare(b.name))
     .map(generateMethod);
   const deploy = artifactImportPath && generateDeploy(input);
@@ -300,8 +317,8 @@ export async function generateTypescriptContractInterface(input: ContractArtifac
 
 /* eslint-disable */
 import { AztecAddress, CompleteAddress } from '@aztec/aztec.js/addresses';
-import { type AbiType, type AztecAddressLike, type ContractArtifact, EventSelector, decodeFromAbi, type EthAddressLike, type FieldLike, type FunctionSelectorLike, loadContractArtifact, loadContractArtifactForPublic, type NoirCompiledContract, type U128Like, type WrappedFieldLike } from '@aztec/aztec.js/abi';
-import { Contract, ContractBase, ContractFunctionInteraction, type ContractInstanceWithAddress, type ContractMethod, type ContractStorageLayout, DeployMethod } from '@aztec/aztec.js/contracts';
+import { type AbiType, type AztecAddressLike, type ContractArtifact, EventSelector, decodeFromAbi, type EthAddressLike, type FieldLike, type FunctionSelectorLike, loadContractArtifact, loadContractArtifactForPublic, type NoirCompiledContract, type OptionLike, type U128Like, type WrappedFieldLike } from '@aztec/aztec.js/abi';
+import { Contract, ContractBase, ContractFunctionInteraction, type ContractMethod, type ContractStorageLayout, type DeployInstantiationOptions, DeployMethod } from '@aztec/aztec.js/contracts';
 import { EthAddress } from '@aztec/aztec.js/addresses';
 import { Fr, Point } from '@aztec/aztec.js/fields';
 import { type PublicKey, PublicKeys } from '@aztec/aztec.js/keys';