@aztec/accounts 4.0.0-nightly.20250907 → 4.0.0-nightly.20260108

package/src/ecdsa/ecdsa_k/account_contract.ts

@@ -1,6 +1,6 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { Ecdsa } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
+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';
 

package/src/ecdsa/ecdsa_k/index.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 type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
 import EcdsaKAccountContractJson from '../../../artifacts/EcdsaKAccount.json' with { type: 'json' };
@@ -34,30 +29,3 @@ export class EcdsaKAccountContract extends EcdsaKBaseAccountContract {
     return Promise.resolve(EcdsaKAccountContractArtifact);
   }
 }
-/**
- * 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_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

@@ -1,6 +1,6 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { Ecdsa } from '@aztec/foundation/crypto';
-import type { Fr } from '@aztec/foundation/fields';
+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';
 

package/src/ecdsa/ecdsa_r/index.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 type { NoirCompiledContract } from '@aztec/stdlib/noir';
 
 import EcdsaRAccountContractJson from '../../../artifacts/EcdsaRAccount.json' with { type: 'json' };
@@ -34,30 +29,3 @@ export class EcdsaRAccountContract extends EcdsaRBaseAccountContract {
     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 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 getEcdsaRAccount(
-  pxe: PXE,
-  secretKey: Fr,
-  signingPrivateKey: Buffer,
-  salt?: Salt,
-): Promise<AccountManager> {
-  return AccountManager.create(pxe, secretKey, new EcdsaRAccountContract(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 getEcdsaRWallet(pxe: PXE, address: AztecAddress, signingPrivateKey: Buffer): Promise<AccountWallet> {
-  return getWallet(pxe, address, new EcdsaRAccountContract(signingPrivateKey));
-}

package/src/ecdsa/ecdsa_r/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 { EcdsaRBaseAccountContract } from './account_contract.js';
 
@@ -19,10 +14,10 @@ import { EcdsaRBaseAccountContract } from './account_contract.js';
  * @returns The contract artifact for the ecdsa K 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
+  // 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);
@@ -42,30 +37,3 @@ export class EcdsaRAccountContract extends EcdsaRBaseAccountContract {
     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 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 getEcdsaRAccount(
-  pxe: PXE,
-  secretKey: Fr,
-  signingPrivateKey: Buffer,
-  salt?: Salt,
-): Promise<AccountManager> {
-  return AccountManager.create(pxe, secretKey, new EcdsaRAccountContract(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 getEcdsaRWallet(pxe: PXE, address: AztecAddress, signingPrivateKey: Buffer): Promise<AccountWallet> {
-  return getWallet(pxe, address, new EcdsaRAccountContract(signingPrivateKey));
-}

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';
 

package/src/ecdsa/ssh_ecdsa_r/index.ts

@@ -4,12 +4,7 @@
  *
  * @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 { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { PXE } from '@aztec/stdlib/interfaces/client';
 
 import { EcdsaRAccountContractArtifact } from '../ecdsa_r/index.js';
 import { EcdsaRSSHBaseAccountContract } from './account_contract.js';
@@ -23,39 +18,11 @@ import { EcdsaRSSHBaseAccountContract } from './account_contract.js';
  * 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,12 +4,7 @@
  *
  * @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 { 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';
@@ -23,39 +18,11 @@ import { EcdsaRSSHBaseAccountContract } from './account_contract.js';
  * 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';
 

package/src/schnorr/index.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 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';
 
@@ -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/single_key/account_contract.ts

@@ -1,6 +1,7 @@
 import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { Schnorr } from '@aztec/foundation/crypto';
-import { type Fr, GrumpkinScalar } from '@aztec/foundation/fields';
+import { Schnorr } from '@aztec/foundation/crypto/schnorr';
+import type { 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';
 

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));
-}