chore: Lazy loading artifacts everywhere

boxes/boxes/react/src/config.ts

@@ -1,6 +1,6 @@
 import { createPXEClient, PXE } from '@aztec/aztec.js';
 import { BoxReactContractArtifact } from '../artifacts/BoxReact';
-import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
+import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing/lazy';
 
 export class PrivateEnv {
   private constructor(private pxe: PXE) {}

boxes/boxes/vanilla/src/index.ts

@@ -1,6 +1,6 @@
 import { Fr, Wallet, createPXEClient } from '@aztec/aztec.js';
 
-import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
+import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing/lazy';
 import { VanillaContract } from '../artifacts/Vanilla';
 
 const pxe = createPXEClient(process.env.PXE_URL || 'http://localhost:8080');

boxes/boxes/vite/package.json

@@ -21,6 +21,7 @@
     "@aztec/bb-prover": "latest",
     "@aztec/key-store": "latest",
     "@aztec/kv-store": "latest",
+    "@aztec/protocol-contracts": "latest",
     "@aztec/pxe": "latest",
     "@aztec/simulator": "latest",
     "@aztec/stdlib": "latest",

boxes/boxes/vite/src/config.ts

@@ -1,5 +1,5 @@
-import { getInitialTestAccounts } from "@aztec/accounts/testing";
-import { getSchnorrAccount } from "@aztec/accounts/schnorr";
+import { getInitialTestAccounts } from "@aztec/accounts/testing/lazy";
+import { getSchnorrAccount } from "@aztec/accounts/schnorr/lazy";
 import {
   AccountWalletWithSecretKey,
   createAztecNodeClient,
@@ -14,6 +14,7 @@ import { KVPxeDatabase } from "@aztec/pxe/database";
 import { PXEService } from "@aztec/pxe/service";
 import { WASMSimulator } from "@aztec/simulator/client";
 import { BoxReactContractArtifact } from "../artifacts/BoxReact";
+import { LazyProtocolContractsProvider } from "@aztec/protocol-contracts/providers/lazy";
 
 export class PrivateEnv {
   pxe: PXEService;
@@ -30,7 +31,7 @@ export class PrivateEnv {
     const simulationProvider = new WASMSimulator();
     const proofCreator = new BBWASMLazyPrivateKernelProver(
       simulationProvider,
-      16,
+      16
     );
     const l1Contracts = await aztecNode.getL1ContractAddresses();
     const configWithContracts = {
@@ -41,30 +42,33 @@ export class PrivateEnv {
     const store = await createStore(
       "pxe_data",
       configWithContracts,
-      createLogger("pxe:data:idb"),
+      createLogger("pxe:data:idb")
     );
 
     const keyStore = new KeyStore(store);
 
     const db = await KVPxeDatabase.create(store);
     const tips = new L2TipsStore(store, "pxe");
 
+    const protocolContractsProvider = new LazyProtocolContractsProvider();
+
     this.pxe = new PXEService(
       keyStore,
       aztecNode,
       db,
       tips,
       proofCreator,
       simulationProvider,
-      config,
+      protocolContractsProvider,
+      config
     );
     await this.pxe.init();
     const [accountData] = await getInitialTestAccounts();
     const account = await getSchnorrAccount(
       this.pxe,
       accountData.secret,
       accountData.signingKey,
-      accountData.salt,
+      accountData.salt
     );
     await account.register();
     this.wallet = await account.getWallet();
@@ -79,5 +83,5 @@ export const deployerEnv = new PrivateEnv();
 
 const IGNORE_FUNCTIONS = ["constructor", "process_log", "sync_notes"];
 export const filteredInterface = BoxReactContractArtifact.functions.filter(
-  (f) => !IGNORE_FUNCTIONS.includes(f.name),
+  (f) => !IGNORE_FUNCTIONS.includes(f.name)
 );

boxes/yarn.lock

@@ -45,6 +45,12 @@ __metadata:
   languageName: node
   linkType: soft
 
+"@aztec/protocol-contracts@link:../yarn-project/protocol-contracts::locator=aztec-app%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "@aztec/protocol-contracts@link:../yarn-project/protocol-contracts::locator=aztec-app%40workspace%3A."
+  languageName: node
+  linkType: soft
+
 "@aztec/pxe@link:../yarn-project/pxe::locator=aztec-app%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@aztec/pxe@link:../yarn-project/pxe::locator=aztec-app%40workspace%3A."
@@ -141,6 +147,7 @@ __metadata:
     "@aztec/bb-prover": "npm:latest"
     "@aztec/key-store": "npm:latest"
     "@aztec/kv-store": "npm:latest"
+    "@aztec/protocol-contracts": "npm:latest"
     "@aztec/pxe": "npm:latest"
     "@aztec/simulator": "npm:latest"
     "@aztec/stdlib": "npm:latest"

playground/package.json

@@ -18,6 +18,7 @@
     "@aztec/foundation": "link:../yarn-project/foundation",
     "@aztec/key-store": "link:../yarn-project/key-store",
     "@aztec/kv-store": "link:../yarn-project/kv-store",
+    "@aztec/protocol-contracts": "link:../yarn-project/protocol-contracts",
     "@aztec/pxe": "link:../yarn-project/pxe",
     "@aztec/simulator": "link:../yarn-project/simulator",
     "@aztec/stdlib": "link:../yarn-project/stdlib",

playground/src/aztecEnv.ts

@@ -17,6 +17,7 @@ import { createContext } from "react";
 import { NetworkDB, WalletDB } from "./utils/storage";
 import { type ContractFunctionInteractionTx } from "./utils/txs";
 import { type Logger, createLogger } from "@aztec/aztec.js/log";
+import { LazyProtocolContractsProvider } from "@aztec/protocol-contracts/providers/lazy";
 
 process.env = Object.keys(import.meta.env).reduce((acc, key) => {
   acc[key.replace("VITE_", "")] = import.meta.env[key];
@@ -192,13 +193,16 @@ export class AztecEnv {
     const db = await KVPxeDatabase.create(store);
     const tips = new L2TipsStore(store, "pxe");
 
+    const protocolContractsProvider = new LazyProtocolContractsProvider();
+
     const pxe = new PXEService(
       keyStore,
       aztecNode,
       db,
       tips,
       proofCreator,
       simulationProvider,
+      protocolContractsProvider,
       config,
       WebLogger.getInstance().createLogger("pxe:service")
     );

playground/src/components/sidebar/components/createAccountDialog.tsx

@@ -1,7 +1,7 @@
 import DialogTitle from "@mui/material/DialogTitle";
 import Dialog from "@mui/material/Dialog";
 import { AccountWalletWithSecretKey, Fr } from "@aztec/aztec.js";
-import { getSchnorrAccount } from "@aztec/accounts/schnorr";
+import { getSchnorrAccount } from "@aztec/accounts/schnorr/lazy";
 import {
   Button,
   CircularProgress,

playground/src/components/sidebar/sidebar.tsx

@@ -11,11 +11,11 @@ import {
   AztecAddress,
   AccountManager,
 } from "@aztec/aztec.js";
-import { getInitialTestAccounts } from "@aztec/accounts/testing";
+import { getInitialTestAccounts } from "@aztec/accounts/testing/lazy";
 import { NetworkDB, WalletDB } from "../../utils/storage";
 import { useContext, useEffect, useState } from "react";
 import { CreateAccountDialog } from "./components/createAccountDialog";
-import { getSchnorrAccount } from "@aztec/accounts/schnorr";
+import { getSchnorrAccount } from "@aztec/accounts/schnorr/lazy";
 import AddIcon from "@mui/icons-material/Add";
 import { Button, Divider, Typography } from "@mui/material";
 import {

playground/yarn.lock

@@ -41,6 +41,12 @@ __metadata:
   languageName: node
   linkType: soft
 
+"@aztec/protocol-contracts@link:../yarn-project/protocol-contracts::locator=playground%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "@aztec/protocol-contracts@link:../yarn-project/protocol-contracts::locator=playground%40workspace%3A."
+  languageName: node
+  linkType: soft
+
 "@aztec/pxe@link:../yarn-project/pxe::locator=playground%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@aztec/pxe@link:../yarn-project/pxe::locator=playground%40workspace%3A."
@@ -3750,6 +3756,7 @@ __metadata:
     "@aztec/foundation": "link:../yarn-project/foundation"
     "@aztec/key-store": "link:../yarn-project/key-store"
     "@aztec/kv-store": "link:../yarn-project/kv-store"
+    "@aztec/protocol-contracts": "link:../yarn-project/protocol-contracts"
     "@aztec/pxe": "link:../yarn-project/pxe"
     "@aztec/simulator": "link:../yarn-project/simulator"
     "@aztec/stdlib": "link:../yarn-project/stdlib"

yarn-project/accounts/package.json

@@ -8,9 +8,13 @@
     "./dapp": "./dest/dapp/index.js",
     "./defaults": "./dest/defaults/index.js",
     "./ecdsa": "./dest/ecdsa/index.js",
+    "./ecdsa/lazy": "./dest/ecdsa/lazy.js",
     "./schnorr": "./dest/schnorr/index.js",
+    "./schnorr/lazy": "./dest/schnorr/lazy.js",
     "./single_key": "./dest/single_key/index.js",
+    "./single_key/lazy": "./dest/single_key/lazy.js",
     "./testing": "./dest/testing/index.js",
+    "./testing/lazy": "./dest/testing/lazy.js",
     "./utils": "./dest/utils/index.js"
   },
   "typedocOptions": {

yarn-project/accounts/src/defaults/account_contract.ts

@@ -11,12 +11,9 @@ import { DefaultAccountInterface } from '../defaults/account_interface.js';
 export abstract class DefaultAccountContract implements AccountContract {
   abstract getAuthWitnessProvider(address: CompleteAddress): AuthWitnessProvider;
   abstract getDeploymentArgs(): Promise<any[] | undefined>;
+  abstract getContractArtifact(): Promise<ContractArtifact>;
 
-  constructor(private artifact: ContractArtifact) {}
-
-  getContractArtifact(): ContractArtifact {
-    return this.artifact;
-  }
+  constructor() {}
 
   getInterface(address: CompleteAddress, nodeInfo: NodeInfo): AccountInterface {
     return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, nodeInfo);

yarn-project/accounts/src/defaults/account_interface.ts

@@ -1,9 +1,11 @@
-import type { AztecAddress, NodeInfo } from '@aztec/aztec.js';
-import { type AccountInterface, type AuthWitnessProvider, CompleteAddress } from '@aztec/aztec.js/account';
+import type { AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
 import type { EntrypointInterface, ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
 import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
 import { Fr } from '@aztec/foundation/fields';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { CompleteAddress } from '@aztec/stdlib/contract';
+import type { NodeInfo } from '@aztec/stdlib/contract';
 import type { TxExecutionRequest } from '@aztec/stdlib/tx';
 
 /**

yarn-project/accounts/src/ecdsa/ecdsa_k/account_contract.ts

@@ -1,20 +1,20 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
 import { Ecdsa } from '@aztec/foundation/crypto';
 import type { Fr } from '@aztec/foundation/fields';
-import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { CompleteAddress } from '@aztec/stdlib/contract';
 
 import { DefaultAccountContract } from '../../defaults/account_contract.js';
-import { EcdsaKAccountContractArtifact } from './artifact.js';
 
 /**
  * Account contract that authenticates transactions using ECDSA signatures
  * verified against a secp256k1 public key stored in an immutable encrypted note.
+ * This abstract version does not provide a way to retrieve the artifact, as it
+ * can be implemented with or without lazy loading.
  */
-export class EcdsaKAccountContract extends DefaultAccountContract {
+export abstract class EcdsaKBaseAccountContract extends DefaultAccountContract {
   constructor(private signingPrivateKey: Buffer) {
-    super(EcdsaKAccountContractArtifact as ContractArtifact);
+    super();
   }
 
   async getDeploymentArgs() {

yarn-project/accounts/src/ecdsa/ecdsa_k/index.ts

@@ -4,16 +4,36 @@
  *
  * @packageDocumentation
  */
-import type { AztecAddress, Fr } from '@aztec/aztec.js';
 import { AccountManager, type Salt } from '@aztec/aztec.js/account';
 import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
+import { Fr } from '@aztec/foundation/fields';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { PXE } from '@aztec/stdlib/interfaces/client';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
-import { EcdsaKAccountContract } from './account_contract.js';
+import EcdsaKAccountContractJson from '../../../artifacts/EcdsaKAccount.json' assert { type: 'json' };
+import { EcdsaKBaseAccountContract } from './account_contract.js';
 
-export { EcdsaKAccountContractArtifact } from './artifact.js';
-export { EcdsaKAccountContract };
+export const EcdsaKAccountContractArtifact: ContractArtifact = loadContractArtifact(
+  EcdsaKAccountContractJson as NoirCompiledContract,
+);
 
+/**
+ * Account contract that authenticates transactions using ECDSA signatures
+ * verified against a secp256k1 public key stored in an immutable encrypted note.
+ * Eagerly loads the contract artifact
+ */
+export class EcdsaKAccountContract extends EcdsaKBaseAccountContract {
+  constructor(signingPrivateKey: Buffer) {
+    super(signingPrivateKey);
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return Promise.resolve(EcdsaKAccountContractArtifact);
+  }
+}
 /**
  * Creates an Account that relies on an ECDSA signing key for authentication.
  * @param pxe - An PXE server instance.

yarn-project/accounts/src/ecdsa/ecdsa_k/lazy.ts

@@ -0,0 +1,66 @@
+/**
+ * The `@aztec/accounts/ecdsa` export provides an ECDSA account contract implementation, that uses an ECDSA private key for authentication, and a Grumpkin key for encryption.
+ * Consider using this account type when working with integrations with Ethereum wallets.
+ *
+ * @packageDocumentation
+ */
+import { AccountManager, type Salt } from '@aztec/aztec.js/account';
+import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
+import { Fr } from '@aztec/foundation/fields';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { PXE } from '@aztec/stdlib/interfaces/client';
+
+import { EcdsaKBaseAccountContract } from './account_contract.js';
+
+/**
+ * Lazily loads the contract artifact
+ * @returns The contract artifact for the ecdsa K account contract
+ */
+export async function getEcdsaKAccountContractArtifact() {
+  const { default: ecdsaKAccountContractJson } = await import('../../../artifacts/EcdsaKAccount.json');
+  return loadContractArtifact(ecdsaKAccountContractJson);
+}
+
+/**
+ * Account contract that authenticates transactions using ECDSA signatures
+ * verified against a secp256k1 public key stored in an immutable encrypted note.
+ * Lazily loads the contract artifact
+ */
+export class EcdsaKAccountContract extends EcdsaKBaseAccountContract {
+  constructor(signingPrivateKey: Buffer) {
+    super(signingPrivateKey);
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return getEcdsaKAccountContractArtifact();
+  }
+}
+/**
+ * Creates an Account that relies on an ECDSA signing key for authentication.
+ * @param pxe - An PXE server instance.
+ * @param secretKey - Secret key used to derive all the keystore keys.
+ * @param signingPrivateKey - Secp256k1 key used for signing transactions.
+ * @param salt - Deployment salt.
+ * @returns An account manager initialized with the account contract and its deployment params
+ */
+export function getEcdsaKAccount(
+  pxe: PXE,
+  secretKey: Fr,
+  signingPrivateKey: Buffer,
+  salt?: Salt,
+): Promise<AccountManager> {
+  return AccountManager.create(pxe, secretKey, new EcdsaKAccountContract(signingPrivateKey), salt);
+}
+
+/**
+ * Gets a wallet for an already registered account using ECDSA signatures.
+ * @param pxe - An PXE server instance.
+ * @param address - Address for the account.
+ * @param signingPrivateKey - ECDSA key used for signing transactions.
+ * @returns A wallet for this account that can be used to interact with a contract instance.
+ */
+export function getEcdsaKWallet(pxe: PXE, address: AztecAddress, signingPrivateKey: Buffer): Promise<AccountWallet> {
+  return getWallet(pxe, address, new EcdsaKAccountContract(signingPrivateKey));
+}

yarn-project/accounts/src/ecdsa/lazy.ts

@@ -0,0 +1,2 @@
+export * from './ecdsa_k/lazy.js';
+export * from './ssh_ecdsa_r/lazy.js';