@aztec/aztec.js 0.6.7 → 0.7.0

package/src/account/entrypoint/auth_witness_account_entrypoint.ts

@@ -7,7 +7,7 @@ import SchnorrAuthWitnessAccountContractAbi from '../../abis/schnorr_auth_witnes
 import { generatePublicKey } from '../../index.js';
 import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from '../../utils/defaults.js';
 import { buildPayload, hashPayload } from './entrypoint_payload.js';
-import { CreateTxRequestOpts, Entrypoint } from './index.js';
+import { Entrypoint } from './index.js';
 
 /**
  * Account contract implementation that uses a single key for signing and encryption. This public key is not
@@ -59,10 +59,7 @@ export class AuthWitnessAccountEntrypoint implements Entrypoint {
    * @param opts - The options
    * @returns The TxRequest, the auth witness to insert in db and the message signed
    */
-  async createTxExecutionRequestWithWitness(
-    executions: FunctionCall[],
-    opts: CreateTxRequestOpts = {},
-  ): Promise<{
+  async createTxExecutionRequestWithWitness(executions: FunctionCall[]): Promise<{
     /** The transaction request */
     txRequest: TxExecutionRequest;
     /** The auth witness */
@@ -70,10 +67,6 @@ export class AuthWitnessAccountEntrypoint implements Entrypoint {
     /** The message signed */
     message: Buffer;
   }> {
-    if (opts.origin && !opts.origin.equals(this.address)) {
-      throw new Error(`Sender ${opts.origin.toString()} does not match account address ${this.address.toString()}`);
-    }
-
     const { payload, packedArguments: callsPackedArguments } = await buildPayload(executions);
     const message = await hashPayload(payload);
     const witness = await this.createAuthWitness(message);
@@ -92,7 +85,7 @@ export class AuthWitnessAccountEntrypoint implements Entrypoint {
     return { txRequest, message, witness };
   }
 
-  createTxExecutionRequest(executions: FunctionCall[], _opts: CreateTxRequestOpts = {}): Promise<TxExecutionRequest> {
+  createTxExecutionRequest(_executions: FunctionCall[]): Promise<TxExecutionRequest> {
     throw new Error(`Not implemented, use createTxExecutionRequestWithWitness instead`);
   }
 

package/src/account/entrypoint/entrypoint_payload.ts

@@ -5,7 +5,7 @@ import { FunctionCall, PackedArguments, emptyFunctionCall } from '@aztec/types';
 
 import partition from 'lodash.partition';
 
-// These must match the values defined in yarn-project/noir-libs/noir-aztec/src/entrypoint.nr
+// These must match the values defined in yarn-project/noir-libs/aztec-noir/src/entrypoint.nr
 export const ACCOUNT_MAX_PRIVATE_CALLS = 2;
 export const ACCOUNT_MAX_PUBLIC_CALLS = 2;
 

package/src/account/entrypoint/index.ts

@@ -1,18 +1,10 @@
-import { AztecAddress } from '@aztec/circuits.js';
 import { FunctionCall, TxExecutionRequest } from '@aztec/types';
 
-export * from './entrypoint_collection.js';
+export * from './auth_witness_account_entrypoint.js';
 export * from './entrypoint_payload.js';
 export * from './entrypoint_utils.js';
 export * from './single_key_account_entrypoint.js';
 export * from './stored_key_account_entrypoint.js';
-export * from './auth_witness_account_entrypoint.js';
-
-/** Options for creating a tx request out of a set of function calls. */
-export type CreateTxRequestOpts = {
-  /** Origin of the tx. Needs to be an address managed by this account. */
-  origin?: AztecAddress;
-};
 
 // docs:start:entrypoint-interface
 /**
@@ -26,6 +18,6 @@ export interface Entrypoint {
    * @param opts - Options.
    * @returns The authenticated transaction execution request.
    */
-  createTxExecutionRequest(executions: FunctionCall[], opts?: CreateTxRequestOpts): Promise<TxExecutionRequest>;
+  createTxExecutionRequest(executions: FunctionCall[]): Promise<TxExecutionRequest>;
 }
 // docs:end:entrypoint-interface

package/src/account/entrypoint/single_key_account_entrypoint.ts

@@ -7,7 +7,7 @@ import SchnorrSingleKeyAccountContractAbi from '../../abis/schnorr_single_key_ac
 import { generatePublicKey } from '../../index.js';
 import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from '../../utils/defaults.js';
 import { buildPayload, hashPayload } from './entrypoint_payload.js';
-import { CreateTxRequestOpts, Entrypoint } from './index.js';
+import { Entrypoint } from './index.js';
 
 /**
  * Account contract implementation that uses a single key for signing and encryption. This public key is not
@@ -23,14 +23,7 @@ export class SingleKeyAccountEntrypoint implements Entrypoint {
     private version: number = DEFAULT_VERSION,
   ) {}
 
-  async createTxExecutionRequest(
-    executions: FunctionCall[],
-    opts: CreateTxRequestOpts = {},
-  ): Promise<TxExecutionRequest> {
-    if (opts.origin && !opts.origin.equals(this.address)) {
-      throw new Error(`Sender ${opts.origin.toString()} does not match account address ${this.address.toString()}`);
-    }
-
+  async createTxExecutionRequest(executions: FunctionCall[]): Promise<TxExecutionRequest> {
     const { payload, packedArguments: callsPackedArguments } = await buildPayload(executions);
     const message = await hashPayload(payload);
 

package/src/account/entrypoint/stored_key_account_entrypoint.ts

@@ -7,7 +7,7 @@ import { FunctionCall, PackedArguments, TxExecutionRequest } from '@aztec/types'
 import EcdsaAccountContractAbi from '../../abis/ecdsa_account_contract.json' assert { type: 'json' };
 import { DEFAULT_CHAIN_ID, DEFAULT_VERSION } from '../../utils/defaults.js';
 import { buildPayload, hashPayload } from './entrypoint_payload.js';
-import { CreateTxRequestOpts, Entrypoint } from './index.js';
+import { Entrypoint } from './index.js';
 
 /**
  * Account contract implementation that keeps a signing public key in storage, and is retrieved on
@@ -25,14 +25,7 @@ export class StoredKeyAccountEntrypoint implements Entrypoint {
     this.log = createDebugLogger('aztec:client:accounts:stored_key');
   }
 
-  async createTxExecutionRequest(
-    executions: FunctionCall[],
-    opts: CreateTxRequestOpts = {},
-  ): Promise<TxExecutionRequest> {
-    if (opts.origin && !opts.origin.equals(this.address)) {
-      throw new Error(`Sender ${opts.origin.toString()} does not match account address ${this.address.toString()}`);
-    }
-
+  async createTxExecutionRequest(executions: FunctionCall[]): Promise<TxExecutionRequest> {
     const { payload, packedArguments: callsPackedArguments } = await buildPayload(executions);
     const message = await hashPayload(payload);
     const signature = this.sign(message).toBuffer();

package/src/aztec_rpc_client/wallet.ts

@@ -16,7 +16,7 @@ import {
   TxReceipt,
 } from '@aztec/types';
 
-import { AuthWitnessAccountEntrypoint, CreateTxRequestOpts, Entrypoint } from '../account/entrypoint/index.js';
+import { AuthWitnessAccountEntrypoint, Entrypoint } from '../account/entrypoint/index.js';
 import { CompleteAddress } from '../index.js';
 
 /**
@@ -30,7 +30,7 @@ export type Wallet = Entrypoint & AztecRPC;
 export abstract class BaseWallet implements Wallet {
   constructor(protected readonly rpc: AztecRPC) {}
 
-  abstract createTxExecutionRequest(execs: FunctionCall[], opts?: CreateTxRequestOpts): Promise<TxExecutionRequest>;
+  abstract createTxExecutionRequest(execs: FunctionCall[]): Promise<TxExecutionRequest>;
 
   registerAccount(privKey: GrumpkinPrivateKey, partialAddress: PartialAddress): Promise<void> {
     return this.rpc.registerAccount(privKey, partialAddress);
@@ -110,8 +110,8 @@ export class EntrypointWallet extends BaseWallet {
   constructor(rpc: AztecRPC, protected accountImpl: Entrypoint) {
     super(rpc);
   }
-  createTxExecutionRequest(executions: FunctionCall[], opts: CreateTxRequestOpts = {}): Promise<TxExecutionRequest> {
-    return this.accountImpl.createTxExecutionRequest(executions, opts);
+  createTxExecutionRequest(executions: FunctionCall[]): Promise<TxExecutionRequest> {
+    return this.accountImpl.createTxExecutionRequest(executions);
   }
 }
 
@@ -136,14 +136,8 @@ export class AuthWitnessEntrypointWallet extends BaseWallet {
    * @param opts - The options.
    * @returns - The TxRequest
    */
-  async createTxExecutionRequest(
-    executions: FunctionCall[],
-    opts: CreateTxRequestOpts = {},
-  ): Promise<TxExecutionRequest> {
-    const { txRequest, message, witness } = await this.accountImpl.createTxExecutionRequestWithWitness(
-      executions,
-      opts,
-    );
+  async createTxExecutionRequest(executions: FunctionCall[]): Promise<TxExecutionRequest> {
+    const { txRequest, message, witness } = await this.accountImpl.createTxExecutionRequestWithWitness(executions);
     await this.rpc.addAuthWitness(Fr.fromBuffer(message), witness);
     return txRequest;
   }

package/src/contract/base_contract_interaction.ts

@@ -1,4 +1,3 @@
-import { AztecAddress } from '@aztec/circuits.js';
 import { AztecRPC, Tx, TxExecutionRequest } from '@aztec/types';
 
 import { SentTx } from './sent_tx.js';
@@ -8,10 +7,6 @@ import { SentTx } from './sent_tx.js';
  * Allows the user to specify the sender address and nonce for a transaction.
  */
 export interface SendMethodOptions {
-  /**
-   * Sender's address initiating the transaction.
-   */
-  origin?: AztecAddress;
   /**
    * Wether to skip the simulation of the public part of the transaction.
    */

package/src/contract/batch_call.ts

@@ -1,5 +1,5 @@
 import { FunctionCall, TxExecutionRequest, Wallet } from '../index.js';
-import { BaseContractInteraction, SendMethodOptions } from './base_contract_interaction.js';
+import { BaseContractInteraction } from './base_contract_interaction.js';
 
 /** A batch of function calls to be sent as a single transaction through a wallet. */
 export class BatchCall extends BaseContractInteraction {
@@ -10,12 +10,11 @@ export class BatchCall extends BaseContractInteraction {
   /**
    * Create a transaction execution request that represents this batch, encoded and authenticated by the
    * user's wallet, ready to be simulated.
-   * @param options - An optional object containing additional configuration for the transaction.
    * @returns A Promise that resolves to a transaction instance.
    */
-  public async create(options?: SendMethodOptions | undefined): Promise<TxExecutionRequest> {
+  public async create(): Promise<TxExecutionRequest> {
     if (!this.txRequest) {
-      this.txRequest = await this.wallet.createTxExecutionRequest(this.calls, options);
+      this.txRequest = await this.wallet.createTxExecutionRequest(this.calls);
     }
     return this.txRequest;
   }

package/src/contract/contract.test.ts

@@ -109,9 +109,7 @@ describe('Contract Class', () => {
     const fooContract = await Contract.at(contractAddress, defaultAbi, wallet);
     const param0 = 12;
     const param1 = 345n;
-    const sentTx = fooContract.methods.bar(param0, param1).send({
-      origin: account.address,
-    });
+    const sentTx = fooContract.methods.bar(param0, param1).send();
     const txHash = await sentTx.getTxHash();
     const receipt = await sentTx.getReceipt();
 
@@ -134,7 +132,7 @@ describe('Contract Class', () => {
 
   it('should not call create on an unconstrained function', async () => {
     const fooContract = await Contract.at(contractAddress, defaultAbi, wallet);
-    await expect(fooContract.methods.qux().create({ origin: account.address })).rejects.toThrow();
+    await expect(fooContract.methods.qux().create()).rejects.toThrow();
   });
 
   it('should not call view on a secret or open function', async () => {

package/src/contract/contract.ts

@@ -1,7 +1,9 @@
 import { ContractAbi } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { PublicKey } from '@aztec/types';
 
 import { Wallet } from '../aztec_rpc_client/wallet.js';
+import { DeployMethod, Point } from '../index.js';
 import { ContractBase } from './contract_base.js';
 
 /**
@@ -26,4 +28,25 @@ export class Contract extends ContractBase {
     }
     return new Contract(extendedContractData.getCompleteAddress(), abi, wallet);
   }
+
+  /**
+   * Creates a tx to deploy a new instance of a contract.
+   * @param wallet - The wallet for executing the deployment.
+   * @param abi - ABI of the contract to deploy.
+   * @param args - Arguments for the constructor.
+   */
+  public static deploy(wallet: Wallet, abi: ContractAbi, args: any[]) {
+    return new DeployMethod(Point.ZERO, wallet, abi, args);
+  }
+
+  /**
+   * Creates a tx to deploy a new instance of a contract using the specified public key to derive the address.
+   * @param publicKey - Public key for deriving the address.
+   * @param wallet - The wallet for executing the deployment.
+   * @param abi - ABI of the contract to deploy.
+   * @param args - Arguments for the constructor.
+   */
+  public static deployWithPublicKey(publicKey: PublicKey, wallet: Wallet, abi: ContractAbi, args: any[]) {
+    return new DeployMethod(publicKey, wallet, abi, args);
+  }
 }

package/src/contract/contract_base.ts

@@ -19,7 +19,7 @@ export type ContractMethod = ((...args: any[]) => ContractFunctionInteraction) &
 /**
  * Abstract implementation of a contract extended by the Contract class and generated contract types.
  */
-export abstract class ContractBase {
+export class ContractBase {
   /**
    * An object containing contract methods mapped to their respective names.
    */
@@ -56,10 +56,22 @@ export abstract class ContractBase {
     });
   }
 
-  get address() {
+  /**
+   * Address of the contract.
+   */
+  public get address() {
     return this.completeAddress.address;
   }
 
+  /**
+   * Creates a new instance of the contract wrapper attached to a different wallet.
+   * @param wallet - Wallet to use for sending txs.
+   * @returns A new contract instance.
+   */
+  public withWallet(wallet: Wallet): this {
+    return new ContractBase(this.completeAddress, this.abi, wallet) as this;
+  }
+
   /**
    * Attach the current contract instance to a portal contract and optionally add its dependencies.
    * The function will return a promise that resolves when all contracts have been added to the AztecRPCClient.

package/src/contract/contract_function_interaction.ts

@@ -38,15 +38,14 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
   /**
    * Create a transaction execution request that represents this call, encoded and authenticated by the
    * user's wallet, ready to be simulated.
-   * @param options - An optional object containing additional configuration for the transaction.
    * @returns A Promise that resolves to a transaction instance.
    */
-  public async create(options: SendMethodOptions = {}): Promise<TxExecutionRequest> {
+  public async create(): Promise<TxExecutionRequest> {
     if (this.functionDao.functionType === FunctionType.UNCONSTRAINED) {
       throw new Error("Can't call `create` on an unconstrained function.");
     }
     if (!this.txRequest) {
-      this.txRequest = await this.wallet.createTxExecutionRequest([this.request()], options);
+      this.txRequest = await this.wallet.createTxExecutionRequest([this.request()]);
     }
     return this.txRequest;
   }

package/src/contract_deployer/contract_deployer.test.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, EthAddress, Fr, Point } from '@aztec/circuits.js';
+import { EthAddress, Fr, Point } from '@aztec/circuits.js';
 import { ContractAbi, FunctionType } from '@aztec/foundation/abi';
 import { AztecRPC, PublicKey, Tx, TxHash, TxReceipt } from '@aztec/types';
 
@@ -26,7 +26,6 @@ describe.skip('Contract Deployer', () => {
   const publicKey: PublicKey = Point.random();
   const portalContract = EthAddress.random();
   const contractAddressSalt = Fr.random();
-  const account = AztecAddress.random();
   const args = [12, 345n];
 
   const mockTx = { type: 'Tx' } as any as Tx;
@@ -44,7 +43,6 @@ describe.skip('Contract Deployer', () => {
     const sentTx = deployer.deploy(args[0], args[1]).send({
       portalContract,
       contractAddressSalt,
-      origin: account,
     });
     const txHash = await sentTx.getTxHash();
     const receipt = await sentTx.getReceipt();

package/src/sandbox/index.ts

@@ -1,11 +1,10 @@
 import { Fr, GrumpkinScalar } from '@aztec/circuits.js';
-import { ContractAbi } from '@aztec/foundation/abi';
 import { sleep } from '@aztec/foundation/sleep';
 
 import zip from 'lodash.zip';
 
 import SchnorrAccountContractAbi from '../abis/schnorr_account_contract.json' assert { type: 'json' };
-import { AccountWallet, AztecRPC, EntrypointWallet, getAccountWallets, getSchnorrAccount } from '../index.js';
+import { AccountWallet, AztecRPC, createAztecRpcClient, getSchnorrAccount } from '../index.js';
 
 export const INITIAL_SANDBOX_ENCRYPTION_KEYS = [
   GrumpkinScalar.fromString('2153536ff6628eee01cf4024889ff977a18d9fa61d0e414422f7681cf085c281'),
@@ -19,20 +18,7 @@ export const INITIAL_SANDBOX_SALTS = [Fr.ZERO, Fr.ZERO, Fr.ZERO];
 
 export const INITIAL_SANDBOX_ACCOUNT_CONTRACT_ABI = SchnorrAccountContractAbi;
 
-/**
- * Gets a single wallet that manages all the Aztec accounts that are initially stored in the sandbox.
- * @param aztecRpc - An instance of the Aztec RPC interface.
- * @returns An AccountWallet implementation that includes all the initial accounts.
- */
-export async function getSandboxAccountsWallet(aztecRpc: AztecRPC): Promise<EntrypointWallet> {
-  return await getAccountWallets(
-    aztecRpc,
-    INITIAL_SANDBOX_ACCOUNT_CONTRACT_ABI as unknown as ContractAbi,
-    INITIAL_SANDBOX_ENCRYPTION_KEYS,
-    INITIAL_SANDBOX_SIGNING_KEYS,
-    INITIAL_SANDBOX_SALTS,
-  );
-}
+export const { SANDBOX_URL = 'http://localhost:8080' } = process.env;
 
 /**
  * Gets a collection of wallets for the Aztec accounts that are initially stored in the sandbox.
@@ -84,12 +70,13 @@ export async function deployInitialSandboxAccounts(aztecRpc: AztecRPC) {
 
 /**
  * Function to wait until the sandbox becomes ready for use.
- * @param rpcServer - The rpc client connected to the sandbox.
+ * @param rpc - The rpc client connected to the sandbox.
  */
-export async function waitForSandbox(rpcServer: AztecRPC) {
+export async function waitForSandbox(rpc?: AztecRPC) {
+  rpc = rpc ?? createAztecRpcClient(SANDBOX_URL);
   while (true) {
     try {
-      await rpcServer.getNodeInfo();
+      await rpc.getNodeInfo();
       break;
     } catch (err) {
       await sleep(1000);

package/src/utils/account.ts

@@ -1,91 +1,47 @@
-import { Fr, GrumpkinPrivateKey, GrumpkinScalar, getContractDeploymentInfo } from '@aztec/circuits.js';
-import { Schnorr } from '@aztec/circuits.js/barretenberg';
-import { ContractAbi } from '@aztec/foundation/abi';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { AztecRPC, TxStatus } from '@aztec/types';
+import { CompleteAddress, GrumpkinScalar } from '@aztec/circuits.js';
+import { AztecRPC } from '@aztec/types';
 
-import { SingleKeyAccountEntrypoint } from '../account/entrypoint/single_key_account_entrypoint.js';
-import { EntrypointWallet, Wallet } from '../aztec_rpc_client/wallet.js';
-import { ContractDeployer, EntrypointCollection, StoredKeyAccountEntrypoint, generatePublicKey } from '../index.js';
+import { AccountWallet } from '../aztec_rpc_client/wallet.js';
+import { getSchnorrAccount } from '../index.js';
 
 /**
- * Creates an Aztec Account.
- * @returns The account's address & public key.
+ * Deploys and registers a new account using random private keys and returns the associated wallet. Useful for testing.
+ * @param rpc - RPC client.
+ * @returns - A wallet for a fresh account.
  */
-export async function createAccounts(
-  aztecRpcClient: AztecRPC,
-  accountContractAbi: ContractAbi,
-  privateKey?: GrumpkinPrivateKey,
-  salt = Fr.random(),
-  numberOfAccounts = 1,
-  logger = createDebugLogger('aztec:aztec.js:accounts'),
-): Promise<Wallet> {
-  const accountImpls = new EntrypointCollection();
-
-  for (let i = 0; i < numberOfAccounts; ++i) {
-    // TODO(#662): Let the aztec rpc server generate the keypair rather than hardcoding the private key
-    const privKey = i == 0 && privateKey ? privateKey : GrumpkinScalar.random();
-    const publicKey = await generatePublicKey(privKey);
-    const deploymentInfo = await getContractDeploymentInfo(accountContractAbi, [], salt, publicKey);
-    await aztecRpcClient.registerAccount(privKey, deploymentInfo.completeAddress.partialAddress);
-    const contractDeployer = new ContractDeployer(accountContractAbi, aztecRpcClient, publicKey);
-    const tx = contractDeployer.deploy().send({ contractAddressSalt: salt });
-    await tx.isMined({ interval: 0.5 });
-    const receipt = await tx.getReceipt();
-    if (receipt.status !== TxStatus.MINED) {
-      throw new Error(`Deployment tx not mined (status is ${receipt.status})`);
-    }
-    const address = receipt.contractAddress!;
-    if (!address.equals(deploymentInfo.completeAddress.address)) {
-      throw new Error(
-        `Deployment address does not match for account contract (expected ${deploymentInfo.completeAddress.address.toString()} got ${address.toString()})`,
-      );
-    }
-    logger(`Created account ${address.toString()} with public key ${publicKey.toString()}`);
-    accountImpls.registerAccount(
-      address,
-      new SingleKeyAccountEntrypoint(address, deploymentInfo.completeAddress.partialAddress, privKey),
-    );
-  }
-  return new EntrypointWallet(aztecRpcClient, accountImpls);
+export function createAccount(rpc: AztecRPC): Promise<AccountWallet> {
+  return getSchnorrAccount(rpc, GrumpkinScalar.random(), GrumpkinScalar.random()).waitDeploy();
 }
 
 /**
- * Gets the Aztec accounts that are stored in an Aztec RPC instance.
- * @param aztecRpcClient - An instance of the Aztec RPC interface.
- * @param accountContractAbi - The abi of the account contract used when the accounts were deployed
- * @param privateKeys - The encryption private keys used to create the accounts.
- * @param signingKeys - The signing private keys used to create the accounts.
- * @param salts - The salt values used to create the accounts.
- * @returns An AccountWallet implementation that includes all the accounts found.
+ * Creates a random address and registers it as a recipient on the RPC server. Useful for testing.
+ * @param rpc - RPC client.
+ * @returns Complete address of the registered recipient.
  */
-export async function getAccountWallets(
-  aztecRpcClient: AztecRPC,
-  accountContractAbi: ContractAbi,
-  privateKeys: GrumpkinPrivateKey[],
-  signingKeys: GrumpkinPrivateKey[],
-  salts: Fr[],
-) {
-  if (privateKeys.length != salts.length || signingKeys.length != privateKeys.length) {
-    throw new Error('Keys and salts must be the same length');
-  }
-  const accountCollection = new EntrypointCollection();
-  const schnorr = await Schnorr.new();
-
-  for (let i = 0; i < privateKeys.length; i++) {
-    const publicKey = await generatePublicKey(privateKeys[i]);
-    const signingPublicKey = await generatePublicKey(signingKeys[i]);
-    const deploymentInfo = await getContractDeploymentInfo(
-      accountContractAbi,
-      [signingPublicKey.x, signingPublicKey.y],
-      salts[i],
-      publicKey,
-    );
-    const address = deploymentInfo.completeAddress.address;
+export async function createRecipient(rpc: AztecRPC): Promise<CompleteAddress> {
+  const completeAddress = await CompleteAddress.random();
+  await rpc.registerRecipient(completeAddress);
+  return completeAddress;
+}
 
-    const signClosure = (msg: Buffer) => schnorr.constructSignature(msg, signingKeys[i]);
+/**
+ * Creates a given number of random accounts using the Schnorr account wallet.
+ * @param rpc - RPC interface.
+ * @param numberOfAccounts - How many accounts to create.
+ * @returns The created account wallets.
+ */
+export async function createAccounts(rpc: AztecRPC, numberOfAccounts = 1): Promise<AccountWallet[]> {
+  const accounts = [];
 
-    accountCollection.registerAccount(address, new StoredKeyAccountEntrypoint(address, signClosure));
+  // Prepare deployments
+  for (let i = 0; i < numberOfAccounts; ++i) {
+    const account = getSchnorrAccount(rpc, GrumpkinScalar.random(), GrumpkinScalar.random());
+    await account.getDeployMethod().then(d => d.simulate({ contractAddressSalt: account.salt }));
+    accounts.push(account);
   }
-  return new EntrypointWallet(aztecRpcClient, accountCollection);
+
+  // Send them and await them to be mined
+  const txs = await Promise.all(accounts.map(account => account.deploy()));
+  await Promise.all(txs.map(tx => tx.wait({ interval: 0.1 })));
+  return Promise.all(accounts.map(account => account.getWallet()));
 }

package/src/utils/cheat_codes.ts

@@ -234,7 +234,7 @@ export class AztecCheatCodes {
    */
   public computeSlotInMap(baseSlot: Fr | bigint, key: Fr | bigint | AztecAddress): Fr {
     // Based on `at` function in
-    // aztec3-packages/yarn-project/noir-contracts/src/contracts/noir-aztec/src/state_vars/map.nr
+    // aztec3-packages/yarn-project/noir-libs/aztec-noir/src/state_vars/map.nr
     return Fr.fromBuffer(
       pedersenPlookupCommitInputs(
         this.wasm,

package/dest/account/entrypoint/entrypoint_collection.d.ts

@@ -1,26 +0,0 @@
-import { AztecAddress } from '@aztec/circuits.js';
-import { FunctionCall, TxExecutionRequest } from '@aztec/types';
-import { Account } from '../account.js';
-import { CreateTxRequestOpts, Entrypoint } from './index.js';
-/**
- * An entrypoint that groups together multiple concrete entrypoints.
- * Delegates to the registered entrypoints based on the requested origin.
- */
-export declare class EntrypointCollection implements Entrypoint {
-    private entrypoints;
-    constructor(entrypoints?: [AztecAddress, Entrypoint][]);
-    /**
-     * Creates a new instance out of a set of Accounts.
-     * @param accounts - Accounts to register in this entrypoint.
-     * @returns A new instance.
-     */
-    static fromAccounts(accounts: Account[]): Promise<EntrypointCollection>;
-    /**
-     * Registers an entrypoint against an aztec address
-     * @param addr - The aztec address against which to register the implementation.
-     * @param impl - The entrypoint to be registered.
-     */
-    registerAccount(addr: AztecAddress, impl: Entrypoint): void;
-    createTxExecutionRequest(executions: FunctionCall[], opts?: CreateTxRequestOpts): Promise<TxExecutionRequest>;
-}
-//# sourceMappingURL=entrypoint_collection.d.ts.map

package/dest/account/entrypoint/entrypoint_collection.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"entrypoint_collection.d.ts","sourceRoot":"","sources":["../../../src/account/entrypoint/entrypoint_collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7D;;;GAGG;AACH,qBAAa,oBAAqB,YAAW,UAAU;IACrD,OAAO,CAAC,WAAW,CAAsC;gBAE7C,WAAW,GAAE,CAAC,YAAY,EAAE,UAAU,CAAC,EAAO;IAM1D;;;;OAIG;WACU,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE;IAQ7C;;;;OAIG;IACI,eAAe,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU;IAIpD,wBAAwB,CAC7B,UAAU,EAAE,YAAY,EAAE,EAC1B,IAAI,GAAE,mBAAwB,GAC7B,OAAO,CAAC,kBAAkB,CAAC;CAM/B"}

package/dest/account/entrypoint/entrypoint_collection.js

@@ -1,40 +0,0 @@
-/**
- * An entrypoint that groups together multiple concrete entrypoints.
- * Delegates to the registered entrypoints based on the requested origin.
- */
-export class EntrypointCollection {
-    constructor(entrypoints = []) {
-        this.entrypoints = new Map();
-        for (const [key, value] of entrypoints) {
-            this.registerAccount(key, value);
-        }
-    }
-    /**
-     * Creates a new instance out of a set of Accounts.
-     * @param accounts - Accounts to register in this entrypoint.
-     * @returns A new instance.
-     */
-    static async fromAccounts(accounts) {
-        const collection = new EntrypointCollection();
-        for (const account of accounts) {
-            collection.registerAccount((await account.getCompleteAddress()).address, await account.getEntrypoint());
-        }
-        return collection;
-    }
-    /**
-     * Registers an entrypoint against an aztec address
-     * @param addr - The aztec address against which to register the implementation.
-     * @param impl - The entrypoint to be registered.
-     */
-    registerAccount(addr, impl) {
-        this.entrypoints.set(addr.toString(), impl);
-    }
-    createTxExecutionRequest(executions, opts = {}) {
-        const defaultAccount = this.entrypoints.values().next().value;
-        const impl = opts.origin ? this.entrypoints.get(opts.origin.toString()) : defaultAccount;
-        if (!impl)
-            throw new Error(`No entrypoint registered for ${opts.origin}`);
-        return impl.createTxExecutionRequest(executions, opts);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW50cnlwb2ludF9jb2xsZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2FjY291bnQvZW50cnlwb2ludC9lbnRyeXBvaW50X2NvbGxlY3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTUE7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLG9CQUFvQjtJQUcvQixZQUFZLGNBQTRDLEVBQUU7UUFGbEQsZ0JBQVcsR0FBNEIsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUd2RCxLQUFLLE1BQU0sQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLElBQUksV0FBVyxFQUFFO1lBQ3RDLElBQUksQ0FBQyxlQUFlLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxDQUFDO1NBQ2xDO0lBQ0gsQ0FBQztJQUVEOzs7O09BSUc7SUFDSCxNQUFNLENBQUMsS0FBSyxDQUFDLFlBQVksQ0FBQyxRQUFtQjtRQUMzQyxNQUFNLFVBQVUsR0FBRyxJQUFJLG9CQUFvQixFQUFFLENBQUM7UUFDOUMsS0FBSyxNQUFNLE9BQU8sSUFBSSxRQUFRLEVBQUU7WUFDOUIsVUFBVSxDQUFDLGVBQWUsQ0FBQyxDQUFDLE1BQU0sT0FBTyxDQUFDLGtCQUFrQixFQUFFLENBQUMsQ0FBQyxPQUFPLEVBQUUsTUFBTSxPQUFPLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQztTQUN6RztRQUNELE9BQU8sVUFBVSxDQUFDO0lBQ3BCLENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksZUFBZSxDQUFDLElBQWtCLEVBQUUsSUFBZ0I7UUFDekQsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFTSx3QkFBd0IsQ0FDN0IsVUFBMEIsRUFDMUIsT0FBNEIsRUFBRTtRQUU5QixNQUFNLGNBQWMsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sRUFBRSxDQUFDLElBQUksRUFBRSxDQUFDLEtBQW1CLENBQUM7UUFDNUUsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUM7UUFDekYsSUFBSSxDQUFDLElBQUk7WUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLGdDQUFnQyxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztRQUMxRSxPQUFPLElBQUksQ0FBQyx3QkFBd0IsQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDekQsQ0FBQztDQUNGIn0=