@aztec/accounts 2.1.0-rc.9 → 3.0.0-devnet.2

package/src/schnorr/index.ts

@@ -4,13 +4,11 @@
  *
  * @packageDocumentation
  */
-import { AccountManager, type Salt, getAccountContractAddress } from '@aztec/aztec.js/account';
-import { type AccountWallet, type AccountWalletWithSecretKey, getWallet } from '@aztec/aztec.js/wallet';
+import { getAccountContractAddress } from '@aztec/aztec.js/account';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
 import { Fr, GrumpkinScalar } 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 { deriveSigningKey } from '@aztec/stdlib/keys';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
@@ -34,63 +32,17 @@ export class SchnorrAccountContract extends SchnorrBaseAccountContract {
   }
 }
 
-/**
- * Creates an Account Manager that relies on a Grumpkin signing key for authentication.
- * @param pxe - An PXE server instance.
- * @param secretKey - Secret key used to derive all the keystore keys.
- * @param signingPrivateKey - Grumpkin key used for signing transactions.
- * @param salt - Deployment salt.
- * @returns An account manager initialized with the account contract and its deployment params
- */
-export function getSchnorrAccount(
-  pxe: PXE,
-  secretKey: Fr,
-  signingPrivateKey: GrumpkinScalar,
-  salt?: Salt,
-): Promise<AccountManager> {
-  return AccountManager.create(pxe, secretKey, new SchnorrAccountContract(signingPrivateKey), salt);
-}
-
-/**
- * Gets a wallet for an already registered account using Schnorr signatures.
- * @param pxe - An PXE server instance.
- * @param address - Address for the account.
- * @param signingPrivateKey - Grumpkin key used for signing transactions.
- * @returns A wallet for this account that can be used to interact with a contract instance.
- */
-export function getSchnorrWallet(
-  pxe: PXE,
-  address: AztecAddress,
-  signingPrivateKey: GrumpkinScalar,
-): Promise<AccountWallet> {
-  return getWallet(pxe, address, new SchnorrAccountContract(signingPrivateKey));
-}
-
-/**
- * Gets a wallet for an already registered account using Schnorr signatures.
- * @param pxe - An PXE server instance.
- * @param secretKey - Secret key used to derive all the keystore keys.
- * @param signingPrivateKey - Grumpkin key used for signing transactions.
- * @param salt - Deployment salt.
- * @returns A wallet for this account that can be used to interact with a contract instance.
- */
-export async function getSchnorrWalletWithSecretKey(
-  pxe: PXE,
-  secretKey: Fr,
-  signingPrivateKey: GrumpkinScalar,
-  salt: Salt,
-): Promise<AccountWalletWithSecretKey> {
-  const account = await getSchnorrAccount(pxe, secretKey, signingPrivateKey, salt);
-  return account.getWallet();
-}
-
 /**
  * Compute the address of a schnorr account contract.
  * @param secret - A seed for deriving the signing key and public keys.
  * @param salt - The contract address salt.
  * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
  */
-export async function getSchnorrAccountContractAddress(secret: Fr, salt: Fr, signingPrivateKey?: GrumpkinScalar) {
+export async function getSchnorrAccountContractAddress(
+  secret: Fr,
+  salt: Fr,
+  signingPrivateKey?: GrumpkinScalar,
+): Promise<AztecAddress> {
   const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
   const accountContract = new SchnorrAccountContract(signingKey);
   return await getAccountContractAddress(accountContract, secret, salt);

package/src/schnorr/lazy.ts

@@ -4,13 +4,11 @@
  *
  * @packageDocumentation
  */
-import { AccountManager, type Salt, getAccountContractAddress } from '@aztec/aztec.js/account';
-import { type AccountWallet, type AccountWalletWithSecretKey, getWallet } from '@aztec/aztec.js/wallet';
+import { getAccountContractAddress } from '@aztec/aztec.js/account';
 import { Fr, GrumpkinScalar } 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 { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 
 import { SchnorrBaseAccountContract } from './account_contract.js';
@@ -20,10 +18,10 @@ import { SchnorrBaseAccountContract } from './account_contract.js';
  * @returns The contract artifact for the schnorr account contract
  */
 export async function getSchnorrAccountContractArtifact() {
-  // Cannot assert this import as it's incompatible with browsers
-  // https://caniuse.com/mdn-javascript_statements_import_import_assertions_type_json
-  // Use the new "with" syntax once supported by firefox
-  // https://caniuse.com/mdn-javascript_statements_import_import_attributes_type_json
+  // Cannot assert this import as it's incompatible with bundlers like vite
+  // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
+  // Even if now supported by al major browsers, the MIME type is replaced with
+  // "text/javascript"
   // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
   const { default: schnorrAccountContractJson } = await import('../../artifacts/SchnorrAccount.json');
   return loadContractArtifact(schnorrAccountContractJson);
@@ -44,63 +42,17 @@ export class SchnorrAccountContract extends SchnorrBaseAccountContract {
   }
 }
 
-/**
- * Creates an Account Manager that relies on a Grumpkin signing key for authentication.
- * @param pxe - An PXE server instance.
- * @param secretKey - Secret key used to derive all the keystore keys.
- * @param signingPrivateKey - Grumpkin key used for signing transactions.
- * @param salt - Deployment salt.
- * @returns An account manager initialized with the account contract and its deployment params
- */
-export function getSchnorrAccount(
-  pxe: PXE,
-  secretKey: Fr,
-  signingPrivateKey: GrumpkinScalar,
-  salt?: Salt,
-): Promise<AccountManager> {
-  return AccountManager.create(pxe, secretKey, new SchnorrAccountContract(signingPrivateKey), salt);
-}
-
-/**
- * Gets a wallet for an already registered account using Schnorr signatures.
- * @param pxe - An PXE server instance.
- * @param address - Address for the account.
- * @param signingPrivateKey - Grumpkin key used for signing transactions.
- * @returns A wallet for this account that can be used to interact with a contract instance.
- */
-export function getSchnorrWallet(
-  pxe: PXE,
-  address: AztecAddress,
-  signingPrivateKey: GrumpkinScalar,
-): Promise<AccountWallet> {
-  return getWallet(pxe, address, new SchnorrAccountContract(signingPrivateKey));
-}
-
-/**
- * Gets a wallet for an already registered account using Schnorr signatures.
- * @param pxe - An PXE server instance.
- * @param secretKey - Secret key used to derive all the keystore keys.
- * @param signingPrivateKey - Grumpkin key used for signing transactions.
- * @param salt - Deployment salt.
- * @returns A wallet for this account that can be used to interact with a contract instance.
- */
-export async function getSchnorrWalletWithSecretKey(
-  pxe: PXE,
-  secretKey: Fr,
-  signingPrivateKey: GrumpkinScalar,
-  salt: Salt,
-): Promise<AccountWalletWithSecretKey> {
-  const account = await getSchnorrAccount(pxe, secretKey, signingPrivateKey, salt);
-  return account.getWallet();
-}
-
 /**
  * Compute the address of a schnorr account contract.
  * @param secret - A seed for deriving the signing key and public keys.
  * @param salt - The contract address salt.
  * @param signingPrivateKey - A specific signing private key that's not derived from the secret.
  */
-export async function getSchnorrAccountContractAddress(secret: Fr, salt: Fr, signingPrivateKey?: GrumpkinScalar) {
+export async function getSchnorrAccountContractAddress(
+  secret: Fr,
+  salt: Fr,
+  signingPrivateKey?: GrumpkinScalar,
+): Promise<AztecAddress> {
   const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
   const accountContract = new SchnorrAccountContract(signingKey);
   return await getAccountContractAddress(accountContract, secret, salt);

package/src/single_key/index.ts

@@ -4,13 +4,9 @@
  *
  * @packageDocumentation
  */
-import type { AztecAddress, Fr, GrumpkinScalar } from '@aztec/aztec.js';
-import { AccountManager, type Salt } from '@aztec/aztec.js/account';
-import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
+import type { GrumpkinScalar } from '@aztec/aztec.js/fields';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
-import { deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys';
 import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
 import SchnorrSingleKeyAccountContractJson from '../../artifacts/SchnorrSingleKeyAccount.json' with { type: 'json' };
@@ -34,30 +30,3 @@ export class SingleKeyAccountContract extends SingleKeyBaseAccountContract {
     return Promise.resolve(SchnorrSingleKeyAccountContractArtifact);
   }
 }
-
-/**
- * Creates an Account that uses the same Grumpkin key for encryption and authentication.
- * @param pxe - An PXE server instance.
- * @param secretKey - Secret key used to derive all the keystore keys (in this case also used to get signing key).
- * @param salt - Deployment salt.
- * @returns An account manager initialized with the account contract and its deployment params
- */
-export function getUnsafeSchnorrAccount(pxe: PXE, secretKey: Fr, salt?: Salt) {
-  const encryptionPrivateKey = deriveMasterIncomingViewingSecretKey(secretKey);
-  return AccountManager.create(pxe, secretKey, new SingleKeyAccountContract(encryptionPrivateKey), salt);
-}
-
-/**
- * Gets a wallet for an already registered account using Schnorr signatures with a single key for encryption and authentication.
- * @param pxe - An PXE server instance.
- * @param address - Address for the account.
- * @param signingPrivateKey - Grumpkin key used for note encryption and signing transactions.
- * @returns A wallet for this account that can be used to interact with a contract instance.
- */
-export function getUnsafeSchnorrWallet(
-  pxe: PXE,
-  address: AztecAddress,
-  signingPrivateKey: GrumpkinScalar,
-): Promise<AccountWallet> {
-  return getWallet(pxe, address, new SingleKeyAccountContract(signingPrivateKey));
-}

package/src/single_key/lazy.ts

@@ -4,13 +4,9 @@
  *
  * @packageDocumentation
  */
-import type { AztecAddress, Fr, GrumpkinScalar } from '@aztec/aztec.js';
-import { AccountManager, type Salt } from '@aztec/aztec.js/account';
-import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
+import type { GrumpkinScalar } from '@aztec/aztec.js/fields';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
-import { deriveMasterIncomingViewingSecretKey } from '@aztec/stdlib/keys';
 
 import { SingleKeyBaseAccountContract } from './account_contract.js';
 
@@ -19,10 +15,10 @@ import { SingleKeyBaseAccountContract } from './account_contract.js';
  * @returns The contract artifact for the single key account contract
  */
 export async function getSingleKeyAccountContractArtifact() {
-  // Cannot assert this import as it's incompatible with browsers
-  // https://caniuse.com/mdn-javascript_statements_import_import_assertions_type_json
-  // Use the new "with" syntax once supported by firefox
-  // https://caniuse.com/mdn-javascript_statements_import_import_attributes_type_json
+  // Cannot assert this import as it's incompatible with bundlers like vite
+  // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
+  // Even if now supported by al major browsers, the MIME type is replaced with
+  // "text/javascript"
   // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
   const { default: schnorrAccountContractJson } = await import('../../artifacts/SchnorrAccount.json');
   return loadContractArtifact(schnorrAccountContractJson);
@@ -42,30 +38,3 @@ export class SingleKeyAccountContract extends SingleKeyBaseAccountContract {
     return getSingleKeyAccountContractArtifact();
   }
 }
-
-/**
- * Creates an Account that uses the same Grumpkin key for encryption and authentication.
- * @param pxe - An PXE server instance.
- * @param secretKey - Secret key used to derive all the keystore keys (in this case also used to get signing key).
- * @param salt - Deployment salt.
- * @returns An account manager initialized with the account contract and its deployment params
- */
-export function getUnsafeSchnorrAccount(pxe: PXE, secretKey: Fr, salt?: Salt) {
-  const encryptionPrivateKey = deriveMasterIncomingViewingSecretKey(secretKey);
-  return AccountManager.create(pxe, secretKey, new SingleKeyAccountContract(encryptionPrivateKey), salt);
-}
-
-/**
- * Gets a wallet for an already registered account using Schnorr signatures with a single key for encryption and authentication.
- * @param pxe - An PXE server instance.
- * @param address - Address for the account.
- * @param signingPrivateKey - Grumpkin key used for note encryption and signing transactions.
- * @returns A wallet for this account that can be used to interact with a contract instance.
- */
-export function getUnsafeSchnorrWallet(
-  pxe: PXE,
-  address: AztecAddress,
-  signingPrivateKey: GrumpkinScalar,
-): Promise<AccountWallet> {
-  return getWallet(pxe, address, new SingleKeyAccountContract(signingPrivateKey));
-}

package/src/stub/account_contract.ts

@@ -0,0 +1,39 @@
+import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { Fr } from '@aztec/foundation/fields';
+import { AuthWitness } from '@aztec/stdlib/auth-witness';
+import { CompleteAddress } from '@aztec/stdlib/contract';
+
+import { DefaultAccountContract } from '../defaults/account_contract.js';
+
+/**
+ * An Account contract that does not perform any authentication of authwits
+ * (`is_valid` always returns `true`)
+ * It is used to capture authorization data during simulations
+ */
+export abstract class StubBaseAccountContract extends DefaultAccountContract {
+  constructor() {
+    super();
+  }
+
+  getInitializationFunctionAndArgs() {
+    return Promise.resolve({ constructorName: 'constructor', constructorArgs: [] });
+  }
+
+  getAuthWitnessProvider(_address: CompleteAddress): AuthWitnessProvider {
+    return new StubAuthWitnessProvider();
+  }
+}
+
+/** Creates auth witnesses using Stub signatures. */
+export class StubAuthWitnessProvider implements AuthWitnessProvider {
+  constructor() {}
+
+  /**
+   * A fake account always returns an empty authwitness, since it doesn't
+   * perform any verification whatsoever
+   * @param messageHash - The outer hash of the message for which the auth witness is created
+   */
+  createAuthWit(messageHash: Fr): Promise<AuthWitness> {
+    return Promise.resolve(new AuthWitness(messageHash, []));
+  }
+}

package/src/stub/index.ts

@@ -0,0 +1,41 @@
+import { BaseAccount, type ChainInfo } from '@aztec/aztec.js/account';
+import type { CompleteAddress } from '@aztec/aztec.js/addresses';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
+
+import SimulatedAccountContract from '../../artifacts/SimulatedAccount.json' with { type: 'json' };
+import { DefaultAccountInterface } from '../defaults/account_interface.js';
+import { StubBaseAccountContract } from './account_contract.js';
+
+export const StubAccountContractArtifact = loadContractArtifact(SimulatedAccountContract as NoirCompiledContract);
+
+/**
+ * Stub account contract
+ * Eagerly loads the contract artifact
+ */
+export class StubAccountContract extends StubBaseAccountContract {
+  constructor() {
+    super();
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return Promise.resolve(StubAccountContractArtifact);
+  }
+}
+
+/**
+ * Creates a stub account that impersonates the one with the provided originalAddress.
+ * @param originalAddress - The address of the account to stub
+ * @param chainInfo - The chain info that the account is connected to
+ * @returns A stub account that can be used for kernelless simulations
+ */
+export function createStubAccount(originalAddress: CompleteAddress, chainInfo: ChainInfo) {
+  const accountContract = new StubAccountContract();
+  const accountInterface = new DefaultAccountInterface(
+    accountContract.getAuthWitnessProvider(originalAddress),
+    originalAddress,
+    chainInfo,
+  );
+  return new BaseAccount(accountInterface);
+}

package/src/stub/lazy.ts

@@ -0,0 +1,49 @@
+import { BaseAccount, type ChainInfo } from '@aztec/aztec.js/account';
+import type { CompleteAddress } from '@aztec/aztec.js/addresses';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+
+import { DefaultAccountInterface } from '../defaults/account_interface.js';
+import { StubBaseAccountContract } from './account_contract.js';
+
+/**
+ * Lazily loads the contract artifact
+ * @returns The contract artifact for the Stub account contract
+ */
+export async function getStubAccountContractArtifact() {
+  // Cannot assert this import as it's incompatible with bundlers like vite
+  // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
+  // Even if now supported by al major browsers, the MIME type is replaced with
+  // "text/javascript"
+  // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
+  const { default: StubAccountContractJson } = await import('../../artifacts/SimulatedAccount.json');
+  return loadContractArtifact(StubAccountContractJson);
+}
+
+/**
+ * Account contract that authenticates transactions using Stub signatures
+ * verified against a Grumpkin public key stored in an immutable encrypted note.
+ * Lazily loads the contract artifact
+ */
+export class StubAccountContract extends StubBaseAccountContract {
+  constructor() {
+    super();
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return getStubAccountContractArtifact();
+  }
+}
+
+/**
+ *
+ */
+export function createStubAccount(originalAddress: CompleteAddress, chainInfo: ChainInfo) {
+  const accountContract = new StubAccountContract();
+  const accountInterface = new DefaultAccountInterface(
+    accountContract.getAuthWitnessProvider(originalAddress),
+    originalAddress,
+    chainInfo,
+  );
+  return new BaseAccount(accountInterface);
+}

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.
- *
  * @packageDocumentation
  */
-import { AccountManager, 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,50 +42,19 @@ export function getInitialTestAccounts(): Promise<InitialAccountData[]> {
 }
 
 /**
- * Gets a collection of account managers for the Aztec accounts that are initially stored in the test environment.
- * @param pxe - PXE instance.
- * @returns A set of AccountManager implementations for each of the initial accounts.
- */
-export function getInitialTestAccountsManagers(pxe: PXE): Promise<AccountManager[]> {
-  return Promise.all(
-    INITIAL_TEST_SECRET_KEYS.map((encryptionKey, i) =>
-      getSchnorrAccount(pxe, encryptionKey!, INITIAL_TEST_SIGNING_KEYS[i]!, INITIAL_TEST_ACCOUNT_SALTS[i]),
-    ),
-  );
-}
-
-/**
- * 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.
- */
-export async function getInitialTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]> {
-  return Promise.all(
-    (await Promise.all(await getInitialTestAccountsManagers(pxe))).map(accountManager => accountManager.getWallet()),
-  );
-}
-
-/**
- * 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.
+ * Generate a fixed amount of random schnorr account contract instance.
  */
-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 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),
+      };
+    }),
   );
 }
-
-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.
- *
  * @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/copy_cat/base.d.ts

@@ -1,18 +0,0 @@
-import { type AccountInterface, AccountWalletWithSecretKey, type ContractArtifact, type PXE, TxExecutionRequest } from '@aztec/aztec.js';
-import type { CompleteAddress, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
-import type { SimulationOverrides, TxSimulationResult } from '@aztec/stdlib/tx';
-/**
- * An AccountWallet that copies the address of another account, and then
- * uses the simulation overrides feature to execute different contract code under
- * the copied address. This is used to bypass authwit verification entirely
- * (`is_valid` always returns `true`)
- */
-export declare abstract class CopyCatAccountWalletBase extends AccountWalletWithSecretKey {
-    private originalAddress;
-    private artifact;
-    private instance;
-    constructor(pxe: PXE, account: AccountInterface, originalAddress: CompleteAddress, artifact: ContractArtifact, instance: ContractInstanceWithAddress);
-    getCompleteAddress(): CompleteAddress;
-    simulateTx(txRequest: TxExecutionRequest, simulatePublic: boolean, _skipTxValidation?: boolean, _skipFeeEnforcement?: boolean, _overrides?: SimulationOverrides): Promise<TxSimulationResult>;
-}
-//# sourceMappingURL=base.d.ts.map

package/dest/copy_cat/base.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/copy_cat/base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,0BAA0B,EAC1B,KAAK,gBAAgB,EAErB,KAAK,GAAG,EACR,kBAAkB,EACnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEhF;;;;;GAKG;AACH,8BAAsB,wBAAyB,SAAQ,0BAA0B;IAI7E,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,QAAQ;gBAJhB,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,gBAAgB,EACjB,eAAe,EAAE,eAAe,EAChC,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,2BAA2B;IAKtC,kBAAkB,IAAI,eAAe;IAIrC,UAAU,CACjB,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,OAAO,EACvB,iBAAiB,CAAC,EAAE,OAAO,EAC3B,mBAAmB,CAAC,EAAE,OAAO,EAC7B,UAAU,CAAC,EAAE,mBAAmB,GAC/B,OAAO,CAAC,kBAAkB,CAAC;CAQ/B"}