@aztec/accounts 0.0.0-test.1 → 0.0.1-commit.001888fc

package/src/ecdsa/ecdsa_k/lazy.ts

@@ -4,13 +4,8 @@
  *
  * @packageDocumentation
  */
-import { AccountManager, type Salt } from '@aztec/aztec.js/account';
-import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
-import { Fr } from '@aztec/foundation/fields';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
 import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
 
 import { EcdsaKBaseAccountContract } from './account_contract.js';
 
@@ -19,10 +14,10 @@ import { EcdsaKBaseAccountContract } from './account_contract.js';
  * @returns The contract artifact for the ecdsa K account contract
  */
 export async function getEcdsaKAccountContractArtifact() {
-  // 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: ecdsaKAccountContractJson } = await import('../../../artifacts/EcdsaKAccount.json');
   return loadContractArtifact(ecdsaKAccountContractJson);
@@ -42,30 +37,3 @@ export class EcdsaKAccountContract extends EcdsaKBaseAccountContract {
     return getEcdsaKAccountContractArtifact();
   }
 }
-/**
- * Creates an Account that relies on an ECDSA signing key for authentication.
- * @param pxe - An PXE server instance.
- * @param secretKey - Secret key used to derive all the keystore keys.
- * @param signingPrivateKey - Secp256k1 key used for signing transactions.
- * @param salt - Deployment salt.
- * @returns An account manager initialized with the account contract and its deployment params
- */
-export function getEcdsaKAccount(
-  pxe: PXE,
-  secretKey: Fr,
-  signingPrivateKey: Buffer,
-  salt?: Salt,
-): Promise<AccountManager> {
-  return AccountManager.create(pxe, secretKey, new EcdsaKAccountContract(signingPrivateKey), salt);
-}
-
-/**
- * Gets a wallet for an already registered account using ECDSA signatures.
- * @param pxe - An PXE server instance.
- * @param address - Address for the account.
- * @param signingPrivateKey - ECDSA key used for signing transactions.
- * @returns A wallet for this account that can be used to interact with a contract instance.
- */
-export function getEcdsaKWallet(pxe: PXE, address: AztecAddress, signingPrivateKey: Buffer): Promise<AccountWallet> {
-  return getWallet(pxe, address, new EcdsaKAccountContract(signingPrivateKey));
-}

package/src/ecdsa/ecdsa_r/account_contract.ts

@@ -0,0 +1,42 @@
+import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { Ecdsa } from '@aztec/foundation/crypto/ecdsa';
+import type { Fr } from '@aztec/foundation/curves/bn254';
+import { AuthWitness } from '@aztec/stdlib/auth-witness';
+import { CompleteAddress } from '@aztec/stdlib/contract';
+
+import { DefaultAccountContract } from '../../defaults/account_contract.js';
+
+/**
+ * Account contract that authenticates transactions using ECDSA signatures
+ * verified against a secp256r1 public key stored in an immutable encrypted note.
+ * This abstract version does not provide a way to retrieve the artifact, as it
+ * can be implemented with or without lazy loading.
+ */
+export abstract class EcdsaRBaseAccountContract extends DefaultAccountContract {
+  constructor(private signingPrivateKey: Buffer) {
+    super();
+  }
+
+  async getInitializationFunctionAndArgs() {
+    const signingPublicKey = await new Ecdsa('secp256r1').computePublicKey(this.signingPrivateKey);
+    return {
+      constructorName: 'constructor',
+      constructorArgs: [signingPublicKey.subarray(0, 32), signingPublicKey.subarray(32, 64)],
+    };
+  }
+
+  getAuthWitnessProvider(_address: CompleteAddress): AuthWitnessProvider {
+    return new EcdsaRAuthWitnessProvider(this.signingPrivateKey);
+  }
+}
+
+/** Creates auth witnesses using ECDSA signatures. */
+class EcdsaRAuthWitnessProvider implements AuthWitnessProvider {
+  constructor(private signingPrivateKey: Buffer) {}
+
+  async createAuthWit(messageHash: Fr): Promise<AuthWitness> {
+    const ecdsa = new Ecdsa('secp256r1');
+    const signature = await ecdsa.constructSignature(messageHash.toBuffer(), this.signingPrivateKey);
+    return Promise.resolve(new AuthWitness(messageHash, [...signature.r, ...signature.s]));
+  }
+}

package/src/ecdsa/ecdsa_r/index.ts

@@ -0,0 +1,31 @@
+/**
+ * The `@aztec/accounts/ecdsa` export provides an ECDSA account contract implementation, that uses an ECDSA private key for authentication, and a Grumpkin key for encryption.
+ * Consider using this account type when working with integrations with Ethereum wallets.
+ *
+ * @packageDocumentation
+ */
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+import type { NoirCompiledContract } from '@aztec/stdlib/noir';
+
+import EcdsaRAccountContractJson from '../../../artifacts/EcdsaRAccount.json' with { type: 'json' };
+import { EcdsaRBaseAccountContract } from './account_contract.js';
+
+export const EcdsaRAccountContractArtifact: ContractArtifact = loadContractArtifact(
+  EcdsaRAccountContractJson as NoirCompiledContract,
+);
+
+/**
+ * Account contract that authenticates transactions using ECDSA signatures
+ * verified against a secp256k1 public key stored in an immutable encrypted note.
+ * Eagerly loads the contract artifact
+ */
+export class EcdsaRAccountContract extends EcdsaRBaseAccountContract {
+  constructor(signingPrivateKey: Buffer) {
+    super(signingPrivateKey);
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return Promise.resolve(EcdsaRAccountContractArtifact);
+  }
+}

package/src/ecdsa/ecdsa_r/lazy.ts

@@ -0,0 +1,39 @@
+/**
+ * The `@aztec/accounts/ecdsa` export provides an ECDSA account contract implementation, that uses an ECDSA private key for authentication, and a Grumpkin key for encryption.
+ * Consider using this account type when working with integrations with Ethereum wallets.
+ *
+ * @packageDocumentation
+ */
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import { loadContractArtifact } from '@aztec/stdlib/abi';
+
+import { EcdsaRBaseAccountContract } from './account_contract.js';
+
+/**
+ * Lazily loads the contract artifact
+ * @returns The contract artifact for the ecdsa K account contract
+ */
+export async function getEcdsaRAccountContractArtifact() {
+  // 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: ecdsaKAccountContractJson } = await import('../../../artifacts/EcdsaRAccount.json');
+  return loadContractArtifact(ecdsaKAccountContractJson);
+}
+
+/**
+ * Account contract that authenticates transactions using ECDSA signatures
+ * verified against a secp256k1 public key stored in an immutable encrypted note.
+ * Lazily loads the contract artifact
+ */
+export class EcdsaRAccountContract extends EcdsaRBaseAccountContract {
+  constructor(signingPrivateKey: Buffer) {
+    super(signingPrivateKey);
+  }
+
+  override getContractArtifact(): Promise<ContractArtifact> {
+    return getEcdsaRAccountContractArtifact();
+  }
+}

package/src/ecdsa/index.ts

@@ -1,2 +1,3 @@
 export * from './ecdsa_k/index.js';
+export * from './ecdsa_r/index.js';
 export * from './ssh_ecdsa_r/index.js';

package/src/ecdsa/lazy.ts

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

package/src/ecdsa/ssh_ecdsa_r/account_contract.ts

@@ -1,6 +1,6 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { EcdsaSignature } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
+import { EcdsaSignature } from '@aztec/foundation/crypto/ecdsa';
+import type { Fr } from '@aztec/foundation/curves/bn254';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { CompleteAddress } from '@aztec/stdlib/contract';
 
@@ -22,8 +22,11 @@ export abstract class EcdsaRSSHBaseAccountContract extends DefaultAccountContrac
     super();
   }
 
-  getDeploymentArgs() {
-    return Promise.resolve([this.signingPublicKey.subarray(0, 32), this.signingPublicKey.subarray(32, 64)]);
+  getInitializationFunctionAndArgs() {
+    return Promise.resolve({
+      constructorName: 'constructor',
+      constructorArgs: [this.signingPublicKey.subarray(0, 32), this.signingPublicKey.subarray(32, 64)],
+    });
   }
 
   getAuthWitnessProvider(_address: CompleteAddress): AuthWitnessProvider {

package/src/ecdsa/ssh_ecdsa_r/index.ts

@@ -4,22 +4,11 @@
  *
  * @packageDocumentation
  */
-import { AccountManager, type Salt } from '@aztec/aztec.js/account';
-import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
-import { Fr } from '@aztec/foundation/fields';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
-import type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
-import EcdsaRAccountContractJson from '../../../artifacts/EcdsaKAccount.json' assert { type: 'json' };
+import { EcdsaRAccountContractArtifact } from '../ecdsa_r/index.js';
 import { EcdsaRSSHBaseAccountContract } from './account_contract.js';
 
-export const EcdsaRAccountContractArtifact: ContractArtifact = loadContractArtifact(
-  EcdsaRAccountContractJson as NoirCompiledContract,
-);
-
 /**
  * Account contract that authenticates transactions using ECDSA signatures
  * verified against a secp256r1 public key stored in an immutable encrypted note.
@@ -29,39 +18,11 @@ export const EcdsaRAccountContractArtifact: ContractArtifact = loadContractArtif
  * Eagerly loads the contract artifact
  */
 export class EcdsaRSSHAccountContract extends EcdsaRSSHBaseAccountContract {
-  constructor(signingPrivateKey: Buffer) {
-    super(signingPrivateKey);
+  constructor(signingPublicKey: Buffer) {
+    super(signingPublicKey);
   }
 
   override getContractArtifact(): Promise<ContractArtifact> {
     return Promise.resolve(EcdsaRAccountContractArtifact);
   }
 }
-
-/**
- * Creates an Account that relies on an ECDSA signing key for authentication.
- * @param pxe - An PXE server instance.
- * @param secretKey - Secret key used to derive all the keystore keys.
- * @param signingPublicKey - Secp2561 key used to identify its corresponding private key in the SSH Agent.
- * @param salt - Deployment salt.
- * @returns An account manager initialized with the account contract and its deployment params
- */
-export function getEcdsaRSSHAccount(
-  pxe: PXE,
-  secretKey: Fr,
-  signingPublicKey: Buffer,
-  salt?: Salt,
-): Promise<AccountManager> {
-  return AccountManager.create(pxe, secretKey, new EcdsaRSSHAccountContract(signingPublicKey), salt);
-}
-
-/**
- * Gets a wallet for an already registered account using ECDSA signatures.
- * @param pxe - An PXE server instance.
- * @param address - Address for the account.
- * @param signingPrivateKey - ECDSA key used for signing transactions.
- * @returns A wallet for this account that can be used to interact with a contract instance.
- */
-export function getEcdsaRSSHWallet(pxe: PXE, address: AztecAddress, signingPublicKey: Buffer): Promise<AccountWallet> {
-  return getWallet(pxe, address, new EcdsaRSSHAccountContract(signingPublicKey));
-}

package/src/ecdsa/ssh_ecdsa_r/lazy.ts

@@ -4,33 +4,11 @@
  *
  * @packageDocumentation
  */
-import { AccountManager, type Salt } from '@aztec/aztec.js/account';
-import { type AccountWallet, getWallet } from '@aztec/aztec.js/wallet';
-import { Fr } from '@aztec/foundation/fields';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import { loadContractArtifact } from '@aztec/stdlib/abi';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
 
+import { getEcdsaRAccountContractArtifact } from '../ecdsa_r/lazy.js';
 import { EcdsaRSSHBaseAccountContract } from './account_contract.js';
 
-/*
- * Lazily loads the contract artifact
- * @returns The contract artifact for the ecdsa R account contract
- */
-/**
- *
- */
-export async function getEcdsaRAccountContractArtifact() {
-  // 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
-  // In the meantime, this lazy import is INCOMPATIBLE WITH NODEJS
-  const { default: ecdsaKAccountContractJson } = await import('../../../artifacts/EcdsaRAccount.json');
-  return loadContractArtifact(ecdsaKAccountContractJson);
-}
-
 /**
  * Account contract that authenticates transactions using ECDSA signatures
  * verified against a secp256r1 public key stored in an immutable encrypted note.
@@ -40,39 +18,11 @@ export async function getEcdsaRAccountContractArtifact() {
  * Lazily loads the contract artifact
  */
 export class EcdsaRSSHAccountContract extends EcdsaRSSHBaseAccountContract {
-  constructor(signingPrivateKey: Buffer) {
-    super(signingPrivateKey);
+  constructor(signingPublicKey: Buffer) {
+    super(signingPublicKey);
   }
 
   override getContractArtifact(): Promise<ContractArtifact> {
     return getEcdsaRAccountContractArtifact();
   }
 }
-
-/**
- * Creates an Account that relies on an ECDSA signing key for authentication.
- * @param pxe - An PXE server instance.
- * @param secretKey - Secret key used to derive all the keystore keys.
- * @param signingPublicKey - Secp2561 key used to identify its corresponding private key in the SSH Agent.
- * @param salt - Deployment salt.
- * @returns An account manager initialized with the account contract and its deployment params
- */
-export function getEcdsaRSSHAccount(
-  pxe: PXE,
-  secretKey: Fr,
-  signingPublicKey: Buffer,
-  salt?: Salt,
-): Promise<AccountManager> {
-  return AccountManager.create(pxe, secretKey, new EcdsaRSSHAccountContract(signingPublicKey), salt);
-}
-
-/**
- * Gets a wallet for an already registered account using ECDSA signatures.
- * @param pxe - An PXE server instance.
- * @param address - Address for the account.
- * @param signingPrivateKey - ECDSA key used for signing transactions.
- * @returns A wallet for this account that can be used to interact with a contract instance.
- */
-export function getEcdsaRSSHWallet(pxe: PXE, address: AztecAddress, signingPublicKey: Buffer): Promise<AccountWallet> {
-  return getWallet(pxe, address, new EcdsaRSSHAccountContract(signingPublicKey));
-}

package/src/schnorr/account_contract.ts

@@ -1,6 +1,7 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { Schnorr } from '@aztec/foundation/crypto';
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+import { Schnorr } from '@aztec/foundation/crypto/schnorr';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { AuthWitness } from '@aztec/stdlib/auth-witness';
 import { CompleteAddress } from '@aztec/stdlib/contract';
 
@@ -17,9 +18,9 @@ export abstract class SchnorrBaseAccountContract extends DefaultAccountContract
     super();
   }
 
-  async getDeploymentArgs() {
+  async getInitializationFunctionAndArgs() {
     const signingPublicKey = await new Schnorr().computePublicKey(this.signingPrivateKey);
-    return [signingPublicKey.x, signingPublicKey.y];
+    return { constructorName: 'constructor', constructorArgs: [signingPublicKey.x, signingPublicKey.y] };
   }
 
   getAuthWitnessProvider(_address: CompleteAddress): AuthWitnessProvider {

package/src/schnorr/index.ts

@@ -4,17 +4,16 @@
  *
  * @packageDocumentation
  */
-import { AccountManager, type Salt, getAccountContractAddress } from '@aztec/aztec.js/account';
-import { type AccountWallet, type AccountWalletWithSecretKey, getWallet } from '@aztec/aztec.js/wallet';
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+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 { 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';
 
-import SchnorrAccountContractJson from '../../artifacts/SchnorrAccount.json' assert { type: 'json' };
+import SchnorrAccountContractJson from '../../artifacts/SchnorrAccount.json' with { type: 'json' };
 import { SchnorrBaseAccountContract } from './account_contract.js';
 
 export const SchnorrAccountContractArtifact = loadContractArtifact(SchnorrAccountContractJson as NoirCompiledContract);
@@ -34,63 +33,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,12 @@
  *
  * @packageDocumentation
  */
-import { AccountManager, type Salt, getAccountContractAddress } from '@aztec/aztec.js/account';
-import { type AccountWallet, type AccountWalletWithSecretKey, getWallet } from '@aztec/aztec.js/wallet';
-import { Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+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 { 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 +19,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 +43,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/stub/account_contract.ts

@@ -0,0 +1,39 @@
+import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { Fr } from '@aztec/foundation/curves/bn254';
+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,40 @@
+import { BaseAccount } from '@aztec/aztec.js/account';
+import type { CompleteAddress } from '@aztec/aztec.js/addresses';
+import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
+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 { 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
+ * @returns A stub account that can be used for kernelless simulations
+ */
+export function createStubAccount(originalAddress: CompleteAddress) {
+  const accountContract = new StubAccountContract();
+  const authWitnessProvider = accountContract.getAuthWitnessProvider(originalAddress);
+  return new BaseAccount(
+    new DefaultAccountEntrypoint(originalAddress.address, authWitnessProvider),
+    authWitnessProvider,
+    originalAddress,
+  );
+}