@aztec/accounts 0.0.0-test.0 → 0.0.1-commit.03f7ef2

package/src/testing/index.ts

@@ -1,38 +1,32 @@
 /**
- * The `@aztec/accounts/testing` export provides utility methods for testing, in particular in a Sandbox environment.
- *
- * Use {@link getInitialTestAccountsWallets} to obtain a list of wallets for the Sandbox pre-seeded accounts.
+ * The `@aztec/accounts/testing` export provides utility methods for testing, in particular in a local network environment.
  *
  * @packageDocumentation
  */
-import type { PXE } from '@aztec/aztec.js';
-import type { AccountWalletWithSecretKey } from '@aztec/aztec.js/wallet';
+import { Fr } from '@aztec/aztec.js/fields';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
 
-import {
-  getSchnorrAccount,
-  getSchnorrAccountContractAddress,
-  getSchnorrWalletWithSecretKey,
-} from '../schnorr/index.js';
-import type { InitialAccountData } from './configuration.js';
+import { getSchnorrAccountContractAddress } from '../schnorr/index.js';
 import {
   INITIAL_TEST_ACCOUNT_SALTS,
   INITIAL_TEST_ENCRYPTION_KEYS,
   INITIAL_TEST_SECRET_KEYS,
   INITIAL_TEST_SIGNING_KEYS,
+  type InitialAccountData,
 } from './configuration.js';
 
 export {
-  type InitialAccountData,
   INITIAL_TEST_ACCOUNT_SALTS,
   INITIAL_TEST_ENCRYPTION_KEYS,
   INITIAL_TEST_SECRET_KEYS,
   INITIAL_TEST_SIGNING_KEYS,
+  type InitialAccountData,
 } from './configuration.js';
 
 /**
  * Gets the basic information for initial test accounts.
  */
-export function getInitialTestAccounts(): Promise<InitialAccountData[]> {
+export function getInitialTestAccountsData(): Promise<InitialAccountData[]> {
   return Promise.all(
     INITIAL_TEST_SECRET_KEYS.map(async (secret, i) => ({
       secret,
@@ -48,45 +42,19 @@ export function getInitialTestAccounts(): Promise<InitialAccountData[]> {
 }
 
 /**
- * Gets a collection of wallets for the Aztec accounts that are initially stored in the test environment.
- * @param pxe - PXE instance.
- * @returns A set of AccountWallet implementations for each of the initial accounts.
+ * Generate a fixed amount of random schnorr account contract instance.
  */
-export function getInitialTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]> {
-  return Promise.all(
-    INITIAL_TEST_SECRET_KEYS.map(async (encryptionKey, i) => {
-      const account = await getSchnorrAccount(
-        pxe,
-        encryptionKey!,
-        INITIAL_TEST_SIGNING_KEYS[i]!,
-        INITIAL_TEST_ACCOUNT_SALTS[i],
-      );
-      return account.getWallet();
+export async function generateSchnorrAccounts(numberOfAccounts: number): Promise<Promise<InitialAccountData[]>> {
+  const secrets = Array.from({ length: numberOfAccounts }, () => Fr.random());
+  return await Promise.all(
+    secrets.map(async secret => {
+      const salt = Fr.random();
+      return {
+        secret,
+        signingKey: deriveSigningKey(secret),
+        salt,
+        address: await getSchnorrAccountContractAddress(secret, salt),
+      };
     }),
   );
 }
-
-/**
- * Queries a PXE for it's registered accounts.
- * @param pxe - PXE instance.
- * @returns A set of key data for each of the initial accounts.
- */
-export async function getDeployedTestAccounts(pxe: PXE): Promise<InitialAccountData[]> {
-  const registeredAccounts = await pxe.getRegisteredAccounts();
-  const testAccounts = await getInitialTestAccounts();
-  return testAccounts.filter(t => registeredAccounts.some(r => r.address.equals(t.address)));
-}
-
-/**
- * Queries a PXE for it's registered accounts and returns wallets for those accounts using keys in the initial test accounts.
- * @param pxe - PXE instance.
- * @returns A set of AccountWallet implementations for each of the initial accounts.
- */
-export async function getDeployedTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]> {
-  const testAccounts = await getDeployedTestAccounts(pxe);
-  return Promise.all(
-    testAccounts.map(({ secret, signingKey, salt }) => getSchnorrWalletWithSecretKey(pxe, secret, signingKey, salt)),
-  );
-}
-
-export { deployFundedSchnorrAccount, deployFundedSchnorrAccounts, generateSchnorrAccounts } from './create_account.js';

package/src/testing/lazy.ts

@@ -1,14 +1,12 @@
 /**
- * The `@aztec/accounts/testing/lazy` export provides utility methods for testing, in particular in a Sandbox environment.
- *
- * Use {@link getInitialTestAccountsWallets} to obtain a list of wallets for the Sandbox pre-seeded accounts.
+ * The `@aztec/accounts/testing/lazy` export provides utility methods for testing, in particular in a local network environment.
  *
  * @packageDocumentation
  */
-import type { PXE } from '@aztec/aztec.js';
-import type { AccountWalletWithSecretKey } from '@aztec/aztec.js/wallet';
+import { Fr } from '@aztec/aztec.js/fields';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
 
-import { getSchnorrAccount, getSchnorrAccountContractAddress, getSchnorrWalletWithSecretKey } from '../schnorr/lazy.js';
+import { getSchnorrAccountContractAddress } from '../schnorr/lazy.js';
 import {
   INITIAL_TEST_ACCOUNT_SALTS,
   INITIAL_TEST_ENCRYPTION_KEYS,
@@ -17,18 +15,12 @@ import {
   type InitialAccountData,
 } from './configuration.js';
 
-export {
-  type InitialAccountData,
-  INITIAL_TEST_ACCOUNT_SALTS,
-  INITIAL_TEST_ENCRYPTION_KEYS,
-  INITIAL_TEST_SECRET_KEYS,
-  INITIAL_TEST_SIGNING_KEYS,
-} from './configuration.js';
+export { INITIAL_TEST_ACCOUNT_SALTS, INITIAL_TEST_SECRET_KEYS } from './configuration.js';
 
 /**
  * Gets the basic information for initial test accounts.
  */
-export function getInitialTestAccounts(): Promise<InitialAccountData[]> {
+export function getInitialTestAccountsData(): Promise<InitialAccountData[]> {
   return Promise.all(
     INITIAL_TEST_SECRET_KEYS.map(async (secret, i) => ({
       secret,
@@ -44,43 +36,19 @@ export function getInitialTestAccounts(): Promise<InitialAccountData[]> {
 }
 
 /**
- * Gets a collection of wallets for the Aztec accounts that are initially stored in the test environment.
- * @param pxe - PXE instance.
- * @returns A set of AccountWallet implementations for each of the initial accounts.
+ * Generate a fixed amount of random schnorr account contract instance.
  */
-export function getInitialTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]> {
-  return Promise.all(
-    INITIAL_TEST_SECRET_KEYS.map(async (encryptionKey, i) => {
-      const account = await getSchnorrAccount(
-        pxe,
-        encryptionKey!,
-        INITIAL_TEST_SIGNING_KEYS[i]!,
-        INITIAL_TEST_ACCOUNT_SALTS[i],
-      );
-      return account.getWallet();
+export async function generateSchnorrAccounts(numberOfAccounts: number): Promise<InitialAccountData[]> {
+  const secrets = Array.from({ length: numberOfAccounts }, () => Fr.random());
+  return await Promise.all(
+    secrets.map(async secret => {
+      const salt = Fr.random();
+      return {
+        secret,
+        signingKey: deriveSigningKey(secret),
+        salt,
+        address: await getSchnorrAccountContractAddress(secret, salt),
+      };
     }),
   );
 }
-
-/**
- * Queries a PXE for it's registered accounts.
- * @param pxe - PXE instance.
- * @returns A set of key data for each of the initial accounts.
- */
-export async function getDeployedTestAccounts(pxe: PXE): Promise<InitialAccountData[]> {
-  const registeredAccounts = await pxe.getRegisteredAccounts();
-  const testAccounts = await getInitialTestAccounts();
-  return testAccounts.filter(t => registeredAccounts.some(r => r.address.equals(t.address)));
-}
-
-/**
- * Queries a PXE for it's registered accounts and returns wallets for those accounts using keys in the initial test accounts.
- * @param pxe - PXE instance.
- * @returns A set of AccountWallet implementations for each of the initial accounts.
- */
-export async function getDeployedTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]> {
-  const testAccounts = await getDeployedTestAccounts(pxe);
-  return Promise.all(
-    testAccounts.map(({ secret, signingKey, salt }) => getSchnorrWalletWithSecretKey(pxe, secret, signingKey, salt)),
-  );
-}

package/dest/dapp/dapp_interface.d.ts

@@ -1,10 +0,0 @@
-import { type AccountWallet, type AuthWitnessProvider, AztecAddress, CompleteAddress, type NodeInfo } from '@aztec/aztec.js';
-import { DefaultAccountInterface } from '../defaults/account_interface.js';
-/**
- * Default implementation for an account interface that uses a dapp entrypoint.
- */
-export declare class DefaultDappInterface extends DefaultAccountInterface {
-    constructor(authWitnessProvider: AuthWitnessProvider, userAddress: CompleteAddress, dappAddress: AztecAddress, nodeInfo: Pick<NodeInfo, 'l1ChainId' | 'protocolVersion'>);
-    static createFromUserWallet(wallet: AccountWallet, dappAddress: AztecAddress): DefaultDappInterface;
-}
-//# sourceMappingURL=dapp_interface.d.ts.map

package/dest/dapp/dapp_interface.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dapp_interface.d.ts","sourceRoot":"","sources":["../../src/dapp/dapp_interface.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,mBAAmB,EACxB,YAAY,EACZ,eAAe,EACf,KAAK,QAAQ,EACd,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAE3E;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,uBAAuB;gBAE7D,mBAAmB,EAAE,mBAAmB,EACxC,WAAW,EAAE,eAAe,EAC5B,WAAW,EAAE,YAAY,EACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,iBAAiB,CAAC;IAY3D,MAAM,CAAC,oBAAoB,CAAC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,GAAG,oBAAoB;CAMpG"}

package/dest/dapp/dapp_interface.js

@@ -1,16 +0,0 @@
-import { DefaultDappEntrypoint } from '@aztec/entrypoints/dapp';
-import { DefaultAccountInterface } from '../defaults/account_interface.js';
-/**
- * Default implementation for an account interface that uses a dapp entrypoint.
- */ export class DefaultDappInterface extends DefaultAccountInterface {
-    constructor(authWitnessProvider, userAddress, dappAddress, nodeInfo){
-        super(authWitnessProvider, userAddress, nodeInfo);
-        this.entrypoint = new DefaultDappEntrypoint(userAddress.address, authWitnessProvider, dappAddress, nodeInfo.l1ChainId, nodeInfo.protocolVersion);
-    }
-    static createFromUserWallet(wallet, dappAddress) {
-        return new DefaultDappInterface(wallet, wallet.getCompleteAddress(), dappAddress, {
-            l1ChainId: wallet.getChainId().toNumber(),
-            protocolVersion: wallet.getVersion().toNumber()
-        });
-    }
-}

package/dest/dapp/index.d.ts

@@ -1,2 +0,0 @@
-export * from './dapp_interface.js';
-//# sourceMappingURL=index.d.ts.map

package/dest/dapp/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dapp/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC"}

package/dest/dapp/index.js

@@ -1 +0,0 @@
-export * from './dapp_interface.js';

package/dest/testing/create_account.d.ts

@@ -1,43 +0,0 @@
-import { type AccountManager, type PXE, type WaitOpts } from '@aztec/aztec.js';
-import { Fr } from '@aztec/foundation/fields';
-import type { InitialAccountData } from './configuration.js';
-/**
- * Generate a fixed amount of random schnorr account contract instance.
- */
-export declare function generateSchnorrAccounts(numberOfAccounts: number): Promise<{
-    secret: Fr;
-    signingKey: import("@aztec/aztec.js").Fq;
-    salt: Fr;
-    address: import("@aztec/aztec.js").AztecAddress;
-}[]>;
-/**
- * Data for deploying funded account.
- */
-type DeployAccountData = Pick<InitialAccountData, 'secret' | 'salt'> & {
-    /**
-     * An optional signingKey if it's not derived from the secret.
-     */
-    signingKey?: InitialAccountData['signingKey'];
-};
-/**
- * Deploy schnorr account contract.
- * It will pay for the fee for the deployment itself. So it must be funded with the prefilled public data.
- */
-export declare function deployFundedSchnorrAccount(pxe: PXE, account: DeployAccountData, opts?: WaitOpts & {
-    /**
-     * Whether or not to skip registering contract class.
-     */
-    skipClassRegistration?: boolean;
-}): Promise<AccountManager>;
-/**
- * Deploy schnorr account contracts.
- * They will pay for the fees for the deployment themselves. So they must be funded with the prefilled public data.
- */
-export declare function deployFundedSchnorrAccounts(pxe: PXE, accounts: DeployAccountData[], opts?: WaitOpts & {
-    /**
-     * Whether or not to skip registering contract class.
-     */
-    skipClassRegistration?: boolean;
-}): Promise<AccountManager[]>;
-export {};
-//# sourceMappingURL=create_account.d.ts.map

package/dest/testing/create_account.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"create_account.d.ts","sourceRoot":"","sources":["../../src/testing/create_account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAyB,KAAK,GAAG,EAAE,KAAK,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACtG,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAI9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,gBAAgB,EAAE,MAAM;;;;;KAarE;AAED;;GAEG;AACH,KAAK,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,EAAE,QAAQ,GAAG,MAAM,CAAC,GAAG;IACrE;;OAEG;IACH,UAAU,CAAC,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;CAC/C,CAAC;AAEF;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,iBAAiB,EAC1B,IAAI,GAAE,QAAQ,GAAG;IACf;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACiB,GAClD,OAAO,CAAC,cAAc,CAAC,CAiBzB;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,GAAG,EAAE,GAAG,EACR,QAAQ,EAAE,iBAAiB,EAAE,EAC7B,IAAI,GAAE,QAAQ,GAAG;IACf;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACiB,GAClD,OAAO,CAAC,cAAc,EAAE,CAAC,CAY3B"}

package/dest/testing/create_account.js

@@ -1,58 +0,0 @@
-import { FeeJuicePaymentMethod } from '@aztec/aztec.js';
-import { Fr } from '@aztec/foundation/fields';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
-import { getSchnorrAccount, getSchnorrAccountContractAddress } from '../schnorr/index.js';
-/**
- * Generate a fixed amount of random schnorr account contract instance.
- */ export async function generateSchnorrAccounts(numberOfAccounts) {
-    const secrets = Array.from({
-        length: numberOfAccounts
-    }, ()=>Fr.random());
-    return await Promise.all(secrets.map(async (secret)=>{
-        const salt = Fr.random();
-        return {
-            secret,
-            signingKey: deriveSigningKey(secret),
-            salt,
-            address: await getSchnorrAccountContractAddress(secret, salt)
-        };
-    }));
-}
-/**
- * Deploy schnorr account contract.
- * It will pay for the fee for the deployment itself. So it must be funded with the prefilled public data.
- */ export async function deployFundedSchnorrAccount(pxe, account, opts = {
-    interval: 0.1,
-    skipClassRegistration: false
-}) {
-    const signingKey = account.signingKey ?? deriveSigningKey(account.secret);
-    const accountManager = await getSchnorrAccount(pxe, account.secret, signingKey, account.salt);
-    // Pay the fee by the account itself.
-    // This only works when the world state is prefilled with the balance for the account in test environment.
-    const paymentMethod = new FeeJuicePaymentMethod(accountManager.getAddress());
-    await accountManager.deploy({
-        skipClassRegistration: opts.skipClassRegistration,
-        skipPublicDeployment: true,
-        fee: {
-            paymentMethod
-        }
-    }).wait(opts);
-    return accountManager;
-}
-/**
- * Deploy schnorr account contracts.
- * They will pay for the fees for the deployment themselves. So they must be funded with the prefilled public data.
- */ export async function deployFundedSchnorrAccounts(pxe, accounts, opts = {
-    interval: 0.1,
-    skipClassRegistration: false
-}) {
-    const accountManagers = [];
-    // Serial due to https://github.com/AztecProtocol/aztec-packages/issues/12045
-    for(let i = 0; i < accounts.length; i++){
-        accountManagers.push(await deployFundedSchnorrAccount(pxe, accounts[i], {
-            ...opts,
-            skipClassRegistration: i !== 0 || opts.skipClassRegistration
-        }));
-    }
-    return accountManagers;
-}

package/src/dapp/dapp_interface.ts

@@ -1,38 +0,0 @@
-import {
-  type AccountWallet,
-  type AuthWitnessProvider,
-  AztecAddress,
-  CompleteAddress,
-  type NodeInfo,
-} from '@aztec/aztec.js';
-import { DefaultDappEntrypoint } from '@aztec/entrypoints/dapp';
-
-import { DefaultAccountInterface } from '../defaults/account_interface.js';
-
-/**
- * Default implementation for an account interface that uses a dapp entrypoint.
- */
-export class DefaultDappInterface extends DefaultAccountInterface {
-  constructor(
-    authWitnessProvider: AuthWitnessProvider,
-    userAddress: CompleteAddress,
-    dappAddress: AztecAddress,
-    nodeInfo: Pick<NodeInfo, 'l1ChainId' | 'protocolVersion'>,
-  ) {
-    super(authWitnessProvider, userAddress, nodeInfo);
-    this.entrypoint = new DefaultDappEntrypoint(
-      userAddress.address,
-      authWitnessProvider,
-      dappAddress,
-      nodeInfo.l1ChainId,
-      nodeInfo.protocolVersion,
-    );
-  }
-
-  static createFromUserWallet(wallet: AccountWallet, dappAddress: AztecAddress): DefaultDappInterface {
-    return new DefaultDappInterface(wallet, wallet.getCompleteAddress(), dappAddress, {
-      l1ChainId: wallet.getChainId().toNumber(),
-      protocolVersion: wallet.getVersion().toNumber(),
-    });
-  }
-}

package/src/dapp/index.ts

@@ -1 +0,0 @@
-export * from './dapp_interface.js';

package/src/testing/create_account.ts

@@ -1,93 +0,0 @@
-import { type AccountManager, FeeJuicePaymentMethod, type PXE, type WaitOpts } from '@aztec/aztec.js';
-import { Fr } from '@aztec/foundation/fields';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
-
-import { getSchnorrAccount, getSchnorrAccountContractAddress } from '../schnorr/index.js';
-import type { InitialAccountData } from './configuration.js';
-
-/**
- * Generate a fixed amount of random schnorr account contract instance.
- */
-export async function generateSchnorrAccounts(numberOfAccounts: number) {
-  const secrets = Array.from({ length: numberOfAccounts }, () => Fr.random());
-  return await Promise.all(
-    secrets.map(async secret => {
-      const salt = Fr.random();
-      return {
-        secret,
-        signingKey: deriveSigningKey(secret),
-        salt,
-        address: await getSchnorrAccountContractAddress(secret, salt),
-      };
-    }),
-  );
-}
-
-/**
- * Data for deploying funded account.
- */
-type DeployAccountData = Pick<InitialAccountData, 'secret' | 'salt'> & {
-  /**
-   * An optional signingKey if it's not derived from the secret.
-   */
-  signingKey?: InitialAccountData['signingKey'];
-};
-
-/**
- * Deploy schnorr account contract.
- * It will pay for the fee for the deployment itself. So it must be funded with the prefilled public data.
- */
-export async function deployFundedSchnorrAccount(
-  pxe: PXE,
-  account: DeployAccountData,
-  opts: WaitOpts & {
-    /**
-     * Whether or not to skip registering contract class.
-     */
-    skipClassRegistration?: boolean;
-  } = { interval: 0.1, skipClassRegistration: false },
-): Promise<AccountManager> {
-  const signingKey = account.signingKey ?? deriveSigningKey(account.secret);
-  const accountManager = await getSchnorrAccount(pxe, account.secret, signingKey, account.salt);
-
-  // Pay the fee by the account itself.
-  // This only works when the world state is prefilled with the balance for the account in test environment.
-  const paymentMethod = new FeeJuicePaymentMethod(accountManager.getAddress());
-
-  await accountManager
-    .deploy({
-      skipClassRegistration: opts.skipClassRegistration,
-      skipPublicDeployment: true,
-      fee: { paymentMethod },
-    })
-    .wait(opts);
-
-  return accountManager;
-}
-
-/**
- * Deploy schnorr account contracts.
- * They will pay for the fees for the deployment themselves. So they must be funded with the prefilled public data.
- */
-export async function deployFundedSchnorrAccounts(
-  pxe: PXE,
-  accounts: DeployAccountData[],
-  opts: WaitOpts & {
-    /**
-     * Whether or not to skip registering contract class.
-     */
-    skipClassRegistration?: boolean;
-  } = { interval: 0.1, skipClassRegistration: false },
-): Promise<AccountManager[]> {
-  const accountManagers: AccountManager[] = [];
-  // Serial due to https://github.com/AztecProtocol/aztec-packages/issues/12045
-  for (let i = 0; i < accounts.length; i++) {
-    accountManagers.push(
-      await deployFundedSchnorrAccount(pxe, accounts[i], {
-        ...opts,
-        skipClassRegistration: i !== 0 || opts.skipClassRegistration, // Register the contract class at most once.
-      }),
-    );
-  }
-  return accountManagers;
-}