@aztec/accounts 0.0.1-commit.b6e433891 → 0.0.1-commit.b8a057fa

package/src/ecdsa/stub/index.ts

@@ -0,0 +1,28 @@
+import { BaseAccount } from '@aztec/aztec.js/account';
+import type { CompleteAddress } from '@aztec/aztec.js/addresses';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
+
+import SimulatedEcdsaAccountJson from '../../../artifacts/SimulatedEcdsaAccount.json' with { type: 'json' };
+import { StubBaseAccountContract } from '../../defaults/stub_account_contract.js';
+
+export const StubEcdsaAccountContractArtifact = loadContractArtifact(SimulatedEcdsaAccountJson as NoirCompiledContract);
+
+/** Stub account contract for ECDSA accounts (secp256k1 and secp256r1). Eagerly loads the contract artifact. */
+export class StubEcdsaAccountContract extends StubBaseAccountContract {
+  override getContractArtifact() {
+    return Promise.resolve(StubEcdsaAccountContractArtifact);
+  }
+}
+
+/** Creates an ECDSA stub account that impersonates the one with the provided address. */
+export function createStubEcdsaAccount(originalAddress: CompleteAddress) {
+  const accountContract = new StubEcdsaAccountContract();
+  const authWitnessProvider = accountContract.getAuthWitnessProvider(originalAddress);
+  return new BaseAccount(
+    new DefaultAccountEntrypoint(originalAddress.address, authWitnessProvider),
+    authWitnessProvider,
+    originalAddress,
+  );
+}

package/src/ecdsa/stub/lazy.ts

@@ -0,0 +1,34 @@
+import { BaseAccount } from '@aztec/aztec.js/account';
+import type { CompleteAddress } from '@aztec/aztec.js/addresses';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+
+import { StubBaseAccountContract } from '../../defaults/stub_account_contract.js';
+
+/**
+ * Lazily loads the ECDSA stub contract artifact (browser-compatible).
+ */
+export async function getStubEcdsaAccountContractArtifact() {
+  // Cannot assert this import as it's incompatible with bundlers like vite
+  // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
+  const { default: json } = await import('../../../artifacts/SimulatedEcdsaAccount.json');
+  return loadContractArtifact(json);
+}
+
+/** Stub account contract for ECDSA accounts (secp256k1 and secp256r1). Lazily loads the contract artifact. */
+export class StubEcdsaAccountContract extends StubBaseAccountContract {
+  override getContractArtifact() {
+    return getStubEcdsaAccountContractArtifact();
+  }
+}
+
+/** Creates an ECDSA stub account that impersonates the one with the provided address. */
+export function createStubEcdsaAccount(originalAddress: CompleteAddress) {
+  const accountContract = new StubEcdsaAccountContract();
+  const authWitnessProvider = accountContract.getAuthWitnessProvider(originalAddress);
+  return new BaseAccount(
+    new DefaultAccountEntrypoint(originalAddress.address, authWitnessProvider),
+    authWitnessProvider,
+    originalAddress,
+  );
+}

package/src/schnorr/account_contract.ts

@@ -14,12 +14,25 @@ import { DefaultAccountContract } from '../defaults/account_contract.js';
  * can be implemented with or without lazy loading.
  */
 export abstract class SchnorrBaseAccountContract extends DefaultAccountContract {
-  constructor(private signingPrivateKey: GrumpkinScalar) {
+  constructor(protected signingPrivateKey: GrumpkinScalar) {
     super();
   }
 
-  async getInitializationFunctionAndArgs() {
-    const signingPublicKey = await new Schnorr().computePublicKey(this.signingPrivateKey);
+  /** The Grumpkin public key this account verifies signatures against. */
+  getSigningPublicKey() {
+    return new Schnorr().computePublicKey(this.signingPrivateKey);
+  }
+
+  async getInitializationFunctionAndArgs(): Promise<
+    | {
+        /** The name of the function used to initialize the contract */
+        constructorName: string;
+        /** The args to the function used to initialize the contract */
+        constructorArgs: any[];
+      }
+    | undefined
+  > {
+    const signingPublicKey = await this.getSigningPublicKey();
     return { constructorName: 'constructor', constructorArgs: [signingPublicKey.x, signingPublicKey.y] };
   }
 
@@ -34,7 +47,7 @@ export class SchnorrAuthWitnessProvider implements AuthWitnessProvider {
 
   async createAuthWit(messageHash: Fr): Promise<AuthWitness> {
     const schnorr = new Schnorr();
-    const signature = await schnorr.constructSignature(messageHash.toBuffer(), this.signingPrivateKey);
-    return new AuthWitness(messageHash, [...signature.toBuffer()]);
+    const signature = await schnorr.constructSignature(messageHash, this.signingPrivateKey);
+    return new AuthWitness(messageHash, signature.toLimbFields());
   }
 }

package/src/schnorr/index.ts

@@ -1,50 +1,2 @@
-/**
- * The `@aztec/accounts/schnorr` export provides an account contract implementation that uses Schnorr signatures with a Grumpkin key for authentication, and a separate Grumpkin key for encryption.
- * This is the suggested account contract type for most use cases within Aztec.
- *
- * @packageDocumentation
- */
-import { getAccountContractAddress } from '@aztec/aztec.js/account';
-import type { AztecAddress } from '@aztec/aztec.js/addresses';
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
-import type { ContractArtifact } from '@aztec/stdlib/abi';
-import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
-import type { NoirCompiledContract } from '@aztec/stdlib/noir';
-
-import SchnorrAccountContractJson from '../../artifacts/SchnorrAccount.json' with { type: 'json' };
-import { SchnorrBaseAccountContract } from './account_contract.js';
-
-export const SchnorrAccountContractArtifact = loadContractArtifact(SchnorrAccountContractJson as NoirCompiledContract);
-
-/**
- * Account contract that authenticates transactions using Schnorr signatures
- * verified against a Grumpkin public key stored in an immutable encrypted note.
- * Eagerly loads the contract artifact
- */
-export class SchnorrAccountContract extends SchnorrBaseAccountContract {
-  constructor(signingPrivateKey: GrumpkinScalar) {
-    super(signingPrivateKey);
-  }
-
-  override getContractArtifact(): Promise<ContractArtifact> {
-    return Promise.resolve(SchnorrAccountContractArtifact);
-  }
-}
-
-/**
- * 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,
-): Promise<AztecAddress> {
-  const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
-  const accountContract = new SchnorrAccountContract(signingKey);
-  return await getAccountContractAddress(accountContract, secret, salt);
-}
+export * from './private_immutable/index.js';
+export * from './initializerless/index.js';

package/src/schnorr/initializerless/index.ts

@@ -0,0 +1,62 @@
+/**
+ * The `@aztec/accounts/schnorr` export provides an account contract implementation that uses Schnorr signatures with a Grumpkin key for authentication, and a separate Grumpkin key for encryption.
+ * This is the suggested account contract type for most use cases within Aztec.
+ *
+ * @packageDocumentation
+ */
+import { getAccountContractAddress } from '@aztec/aztec.js/account';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
+
+import SchnorrInitializerlessAccountContractJson from '../../../artifacts/SchnorrInitializerlessAccount.json' with { type: 'json' };
+import { SchnorrBaseAccountContract } from '../account_contract.js';
+
+export const SchnorrInitializerlessAccountContractArtifact = loadContractArtifact(
+  SchnorrInitializerlessAccountContractJson as NoirCompiledContract,
+);
+
+/**
+ * Account contract that authenticates transactions using Schnorr signatures
+ * verified against a Grumpkin public key stored in an immutable encrypted note.
+ * Eagerly loads the contract artifact
+ */
+export class SchnorrInitializerlessAccountContract extends SchnorrBaseAccountContract {
+  constructor(signingPrivateKey: GrumpkinScalar) {
+    super(signingPrivateKey);
+  }
+
+  override getInitializationFunctionAndArgs() {
+    return Promise.resolve(undefined);
+  }
+
+  override async getImmutablesHash(): Promise<Fr> {
+    const signingPublicKey = await this.getSigningPublicKey();
+    return poseidon2Hash([signingPublicKey.x, signingPublicKey.y]);
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return Promise.resolve(SchnorrInitializerlessAccountContractArtifact);
+  }
+}
+
+/**
+ * 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 getSchnorrInitializerlessAccountContractAddress(
+  secret: Fr,
+  salt: Fr,
+  signingPrivateKey?: GrumpkinScalar,
+): Promise<AztecAddress> {
+  const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
+  const accountContract = new SchnorrInitializerlessAccountContract(signingKey);
+  return await getAccountContractAddress(accountContract, secret, salt);
+}

package/src/schnorr/initializerless/lazy.ts

@@ -0,0 +1,70 @@
+/**
+ * The `@aztec/accounts/schnorr` export provides an account contract implementation that uses Schnorr signatures with a Grumpkin key for authentication, and a separate Grumpkin key for encryption.
+ * This is the suggested account contract type for most use cases within Aztec.
+ *
+ * @packageDocumentation
+ */
+import { getAccountContractAddress } from '@aztec/aztec.js/account';
+import { poseidon2Hash } from '@aztec/foundation/crypto/poseidon';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
+
+import { SchnorrBaseAccountContract } from '../account_contract.js';
+
+/**
+ * Lazily loads the contract artifact
+ * @returns The contract artifact for the schnorr account contract
+ */
+export async function getSchnorrInitializerlessAccountContractArtifact() {
+  // 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 all 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/SchnorrInitializerlessAccount.json');
+  return loadContractArtifact(schnorrAccountContractJson);
+}
+
+/**
+ * Account contract that authenticates transactions using Schnorr signatures
+ * verified against a Grumpkin public key stored in an immutable encrypted note.
+ * Lazily loads the contract artifact
+ */
+export class SchnorrInitializerlessAccountContract extends SchnorrBaseAccountContract {
+  constructor(signingPrivateKey: GrumpkinScalar) {
+    super(signingPrivateKey);
+  }
+
+  override getInitializationFunctionAndArgs() {
+    return Promise.resolve(undefined);
+  }
+
+  override async getImmutablesHash(): Promise<Fr> {
+    const signingPublicKey = await this.getSigningPublicKey();
+    return poseidon2Hash([signingPublicKey.x, signingPublicKey.y]);
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return getSchnorrInitializerlessAccountContractArtifact();
+  }
+}
+
+/**
+ * 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 getSchnorrInitializerlessAccountContractAddress(
+  secret: Fr,
+  salt: Fr,
+  signingPrivateKey?: GrumpkinScalar,
+): Promise<AztecAddress> {
+  const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
+  const accountContract = new SchnorrInitializerlessAccountContract(signingKey);
+  return await getAccountContractAddress(accountContract, secret, salt);
+}

package/src/schnorr/lazy.ts

@@ -1,60 +1,2 @@
-/**
- * The `@aztec/accounts/schnorr` export provides an account contract implementation that uses Schnorr signatures with a Grumpkin key for authentication, and a separate Grumpkin key for encryption.
- * This is the suggested account contract type for most use cases within Aztec.
- *
- * @packageDocumentation
- */
-import { getAccountContractAddress } from '@aztec/aztec.js/account';
-import { Fr } from '@aztec/foundation/curves/bn254';
-import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
-import type { ContractArtifact } from '@aztec/stdlib/abi';
-import { loadContractArtifact } from '@aztec/stdlib/abi';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
-
-import { SchnorrBaseAccountContract } from './account_contract.js';
-
-/**
- * Lazily loads the contract artifact
- * @returns The contract artifact for the schnorr account contract
- */
-export async function getSchnorrAccountContractArtifact() {
-  // 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);
-}
-
-/**
- * Account contract that authenticates transactions using Schnorr signatures
- * verified against a Grumpkin public key stored in an immutable encrypted note.
- * Lazily loads the contract artifact
- */
-export class SchnorrAccountContract extends SchnorrBaseAccountContract {
-  constructor(signingPrivateKey: GrumpkinScalar) {
-    super(signingPrivateKey);
-  }
-
-  override getContractArtifact(): Promise<ContractArtifact> {
-    return getSchnorrAccountContractArtifact();
-  }
-}
-
-/**
- * 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,
-): Promise<AztecAddress> {
-  const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
-  const accountContract = new SchnorrAccountContract(signingKey);
-  return await getAccountContractAddress(accountContract, secret, salt);
-}
+export * from './private_immutable/lazy.js';
+export * from './initializerless/lazy.js';

package/src/schnorr/private_immutable/index.ts

@@ -0,0 +1,50 @@
+/**
+ * The `@aztec/accounts/schnorr` export provides an account contract implementation that uses Schnorr signatures with a Grumpkin key for authentication, and a separate Grumpkin key for encryption.
+ * This is the suggested account contract type for most use cases within Aztec.
+ *
+ * @packageDocumentation
+ */
+import { getAccountContractAddress } from '@aztec/aztec.js/account';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
+
+import SchnorrAccountContractJson from '../../../artifacts/SchnorrAccount.json' with { type: 'json' };
+import { SchnorrBaseAccountContract } from '../account_contract.js';
+
+export const SchnorrAccountContractArtifact = loadContractArtifact(SchnorrAccountContractJson as NoirCompiledContract);
+
+/**
+ * Account contract that authenticates transactions using Schnorr signatures
+ * verified against a Grumpkin public key stored in an immutable encrypted note.
+ * Eagerly loads the contract artifact
+ */
+export class SchnorrAccountContract extends SchnorrBaseAccountContract {
+  constructor(signingPrivateKey: GrumpkinScalar) {
+    super(signingPrivateKey);
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return Promise.resolve(SchnorrAccountContractArtifact);
+  }
+}
+
+/**
+ * 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,
+): Promise<AztecAddress> {
+  const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
+  const accountContract = new SchnorrAccountContract(signingKey);
+  return await getAccountContractAddress(accountContract, secret, salt);
+}

package/src/schnorr/private_immutable/lazy.ts

@@ -0,0 +1,60 @@
+/**
+ * The `@aztec/accounts/schnorr` export provides an account contract implementation that uses Schnorr signatures with a Grumpkin key for authentication, and a separate Grumpkin key for encryption.
+ * This is the suggested account contract type for most use cases within Aztec.
+ *
+ * @packageDocumentation
+ */
+import { getAccountContractAddress } from '@aztec/aztec.js/account';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
+
+import { SchnorrBaseAccountContract } from '../account_contract.js';
+
+/**
+ * Lazily loads the contract artifact
+ * @returns The contract artifact for the schnorr account contract
+ */
+export async function getSchnorrAccountContractArtifact() {
+  // 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 all 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);
+}
+
+/**
+ * Account contract that authenticates transactions using Schnorr signatures
+ * verified against a Grumpkin public key stored in an immutable encrypted note.
+ * Lazily loads the contract artifact
+ */
+export class SchnorrAccountContract extends SchnorrBaseAccountContract {
+  constructor(signingPrivateKey: GrumpkinScalar) {
+    super(signingPrivateKey);
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return getSchnorrAccountContractArtifact();
+  }
+}
+
+/**
+ * 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,
+): Promise<AztecAddress> {
+  const signingKey = signingPrivateKey ?? deriveSigningKey(secret);
+  const accountContract = new SchnorrAccountContract(signingKey);
+  return await getAccountContractAddress(accountContract, secret, salt);
+}

package/src/schnorr/stub/index.ts

@@ -0,0 +1,30 @@
+import { BaseAccount } from '@aztec/aztec.js/account';
+import type { CompleteAddress } from '@aztec/aztec.js/addresses';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
+
+import SimulatedSchnorrAccountJson from '../../../artifacts/SimulatedSchnorrAccount.json' with { type: 'json' };
+import { StubBaseAccountContract } from '../../defaults/stub_account_contract.js';
+
+export const StubSchnorrAccountContractArtifact = loadContractArtifact(
+  SimulatedSchnorrAccountJson as NoirCompiledContract,
+);
+
+/** Stub account contract for Schnorr accounts. Eagerly loads the contract artifact. */
+export class StubSchnorrAccountContract extends StubBaseAccountContract {
+  override getContractArtifact() {
+    return Promise.resolve(StubSchnorrAccountContractArtifact);
+  }
+}
+
+/** Creates a Schnorr stub account that impersonates the one with the provided address. */
+export function createStubSchnorrAccount(originalAddress: CompleteAddress) {
+  const accountContract = new StubSchnorrAccountContract();
+  const authWitnessProvider = accountContract.getAuthWitnessProvider(originalAddress);
+  return new BaseAccount(
+    new DefaultAccountEntrypoint(originalAddress.address, authWitnessProvider),
+    authWitnessProvider,
+    originalAddress,
+  );
+}

package/src/schnorr/stub/lazy.ts

@@ -0,0 +1,34 @@
+import { BaseAccount } from '@aztec/aztec.js/account';
+import type { CompleteAddress } from '@aztec/aztec.js/addresses';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+
+import { StubBaseAccountContract } from '../../defaults/stub_account_contract.js';
+
+/**
+ * Lazily loads the Schnorr stub contract artifact (browser-compatible).
+ */
+export async function getStubSchnorrAccountContractArtifact() {
+  // Cannot assert this import as it's incompatible with bundlers like vite
+  // https://github.com/vitejs/vite/issues/19095#issuecomment-2566074352
+  const { default: json } = await import('../../../artifacts/SimulatedSchnorrAccount.json');
+  return loadContractArtifact(json);
+}
+
+/** Stub account contract for Schnorr accounts. Lazily loads the contract artifact. */
+export class StubSchnorrAccountContract extends StubBaseAccountContract {
+  override getContractArtifact() {
+    return getStubSchnorrAccountContractArtifact();
+  }
+}
+
+/** Creates a Schnorr stub account that impersonates the one with the provided address. */
+export function createStubSchnorrAccount(originalAddress: CompleteAddress) {
+  const accountContract = new StubSchnorrAccountContract();
+  const authWitnessProvider = accountContract.getAuthWitnessProvider(originalAddress);
+  return new BaseAccount(
+    new DefaultAccountEntrypoint(originalAddress.address, authWitnessProvider),
+    authWitnessProvider,
+    originalAddress,
+  );
+}

package/src/testing/configuration.ts

@@ -17,6 +17,11 @@ export const INITIAL_TEST_SIGNING_KEYS = INITIAL_TEST_ENCRYPTION_KEYS;
 
 export const INITIAL_TEST_ACCOUNT_SALTS = [Fr.ZERO, Fr.ZERO, Fr.ZERO];
 
+/**
+ * The schnorr account contract variant a test account uses.
+ */
+export type InitialAccountType = 'schnorr' | 'schnorr_initializerless';
+
 /**
  * Data for generating an initial account.
  */
@@ -37,4 +42,8 @@ export interface InitialAccountData {
    * Address of the schnorr account contract.
    */
   address: AztecAddress;
+  /**
+   * Account contract variant.
+   */
+  type?: InitialAccountType;
 }

package/src/testing/index.ts

@@ -4,15 +4,18 @@
  * @packageDocumentation
  */
 import { Fr } from '@aztec/aztec.js/fields';
+import type { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 
-import { getSchnorrAccountContractAddress } from '../schnorr/index.js';
+import { getSchnorrInitializerlessAccountContractAddress } from '../schnorr/initializerless/index.js';
+import { getSchnorrAccountContractAddress } from '../schnorr/private_immutable/index.js';
 import {
   INITIAL_TEST_ACCOUNT_SALTS,
   INITIAL_TEST_ENCRYPTION_KEYS,
   INITIAL_TEST_SECRET_KEYS,
   INITIAL_TEST_SIGNING_KEYS,
   type InitialAccountData,
+  type InitialAccountType,
 } from './configuration.js';
 
 export {
@@ -21,8 +24,16 @@ export {
   INITIAL_TEST_SECRET_KEYS,
   INITIAL_TEST_SIGNING_KEYS,
   type InitialAccountData,
+  type InitialAccountType,
 } from './configuration.js';
 
+/** Derives the account contract address for the given type */
+function getTestAccountAddress(type: InitialAccountType, secret: Fr, salt: Fr, signingKey?: GrumpkinScalar) {
+  return type === 'schnorr'
+    ? getSchnorrAccountContractAddress(secret, salt, signingKey)
+    : getSchnorrInitializerlessAccountContractAddress(secret, salt, signingKey);
+}
+
 /**
  * Gets the basic information for initial test accounts.
  */
@@ -32,7 +43,8 @@ export function getInitialTestAccountsData(): Promise<InitialAccountData[]> {
       secret,
       signingKey: INITIAL_TEST_ENCRYPTION_KEYS[i],
       salt: INITIAL_TEST_ACCOUNT_SALTS[i],
-      address: await getSchnorrAccountContractAddress(
+      type: 'schnorr_initializerless' as const,
+      address: await getSchnorrInitializerlessAccountContractAddress(
         secret,
         INITIAL_TEST_ACCOUNT_SALTS[i],
         INITIAL_TEST_SIGNING_KEYS[i],
@@ -42,9 +54,12 @@ export function getInitialTestAccountsData(): Promise<InitialAccountData[]> {
 }
 
 /**
- * Generate a fixed amount of random schnorr account contract instance.
+ * Generate a fixed amount of random schnorr account contract instances of the given type
  */
-export async function generateSchnorrAccounts(numberOfAccounts: number): Promise<Promise<InitialAccountData[]>> {
+export async function generateSchnorrAccounts(
+  numberOfAccounts: number,
+  type: InitialAccountType = 'schnorr_initializerless',
+): Promise<InitialAccountData[]> {
   const secrets = Array.from({ length: numberOfAccounts }, () => Fr.random());
   return await Promise.all(
     secrets.map(async secret => {
@@ -53,7 +68,8 @@ export async function generateSchnorrAccounts(numberOfAccounts: number): Promise
         secret,
         signingKey: deriveSigningKey(secret),
         salt,
-        address: await getSchnorrAccountContractAddress(secret, salt),
+        type,
+        address: await getTestAccountAddress(type, secret, salt),
       };
     }),
   );