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

package/dest/testing/index.js

@@ -1,15 +1,15 @@
 /**
  * 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 { getSchnorrAccount, getSchnorrAccountContractAddress, getSchnorrWalletWithSecretKey } from '../schnorr/index.js';
+ */ import { Fr } from '@aztec/aztec.js/fields';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { getSchnorrAccountContractAddress } from '../schnorr/index.js';
 import { 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_ENCRYPTION_KEYS, INITIAL_TEST_SECRET_KEYS, INITIAL_TEST_SIGNING_KEYS } from './configuration.js';
 /**
  * Gets the basic information for initial test accounts.
- */ export function getInitialTestAccounts() {
+ */ export function getInitialTestAccountsData() {
     return Promise.all(INITIAL_TEST_SECRET_KEYS.map(async (secret, i)=>({
             secret,
             signingKey: INITIAL_TEST_ENCRYPTION_KEYS[i],
@@ -18,34 +18,18 @@ export { INITIAL_TEST_ACCOUNT_SALTS, INITIAL_TEST_ENCRYPTION_KEYS, INITIAL_TEST_
         })));
 }
 /**
- * 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) {
-    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) {
-    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) {
-    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) {
-    const testAccounts = await getDeployedTestAccounts(pxe);
-    return Promise.all(testAccounts.map(({ secret, signingKey, salt })=>getSchnorrWalletWithSecretKey(pxe, secret, signingKey, salt)));
+ * Generate a fixed amount of random schnorr account contract instance.
+ */ export async function generateSchnorrAccounts(numberOfAccounts) {
+    const secrets = Array.from({
+        length: numberOfAccounts
+    }, ()=>Fr.random());
+    return await Promise.all(secrets.map(async (secret)=>{
+        const salt = Fr.random();
+        return {
+            secret,
+            signingKey: deriveSigningKey(secret),
+            salt,
+            address: await getSchnorrAccountContractAddress(secret, salt)
+        };
+    }));
 }
-export { deployFundedSchnorrAccount, deployFundedSchnorrAccounts, generateSchnorrAccounts } from './create_account.js';

package/dest/testing/lazy.d.ts

@@ -1,34 +1,11 @@
-/**
- * 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 { 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 declare 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.
- */
-export declare function getInitialTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]>;
-/**
- * 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 declare function getDeployedTestAccounts(pxe: PXE): Promise<InitialAccountData[]>;
+export declare function getInitialTestAccountsData(): Promise<InitialAccountData[]>;
 /**
- * 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 declare function getDeployedTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]>;
+export declare function generateSchnorrAccounts(numberOfAccounts: number): Promise<InitialAccountData[]>;
 //# sourceMappingURL=lazy.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/testing/lazy.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAGzE,OAAO,EAKL,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,KAAK,kBAAkB,EACvB,0BAA0B,EAC1B,4BAA4B,EAC5B,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,oBAAoB,CAAC;AAE5B;;GAEG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAatE;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,0BAA0B,EAAE,CAAC,CAY7F;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAIrF;AAED;;;;GAIG;AACH,wBAAsB,8BAA8B,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,0BAA0B,EAAE,CAAC,CAKpG"}
+{"version":3,"file":"lazy.d.ts","sourceRoot":"","sources":["../../src/testing/lazy.ts"],"names":[],"mappings":"AASA,OAAO,EAKL,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAE1F;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAa1E;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAarG"}

package/dest/testing/lazy.js

@@ -1,15 +1,15 @@
 /**
  * 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 { getSchnorrAccount, getSchnorrAccountContractAddress, getSchnorrWalletWithSecretKey } from '../schnorr/lazy.js';
+ */ import { Fr } from '@aztec/aztec.js/fields';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { getSchnorrAccountContractAddress } from '../schnorr/lazy.js';
 import { 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_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() {
+ */ export function getInitialTestAccountsData() {
     return Promise.all(INITIAL_TEST_SECRET_KEYS.map(async (secret, i)=>({
             secret,
             signingKey: INITIAL_TEST_ENCRYPTION_KEYS[i],
@@ -18,29 +18,18 @@ export { INITIAL_TEST_ACCOUNT_SALTS, INITIAL_TEST_ENCRYPTION_KEYS, INITIAL_TEST_
         })));
 }
 /**
- * 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 function getInitialTestAccountsWallets(pxe) {
-    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();
+ * Generate a fixed amount of random schnorr account contract instance.
+ */ export async function generateSchnorrAccounts(numberOfAccounts) {
+    const secrets = Array.from({
+        length: numberOfAccounts
+    }, ()=>Fr.random());
+    return await Promise.all(secrets.map(async (secret)=>{
+        const salt = Fr.random();
+        return {
+            secret,
+            signingKey: deriveSigningKey(secret),
+            salt,
+            address: await getSchnorrAccountContractAddress(secret, salt)
+        };
     }));
 }
-/**
- * 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) {
-    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) {
-    const testAccounts = await getDeployedTestAccounts(pxe);
-    return Promise.all(testAccounts.map(({ secret, signingKey, salt })=>getSchnorrWalletWithSecretKey(pxe, secret, signingKey, salt)));
-}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@aztec/accounts",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/accounts",
   "description": "Implementation of sample account contracts for Aztec Network",
-  "version": "2.1.0-rc.9",
+  "version": "3.0.0-devnet.2",
   "type": "module",
   "exports": {
     "./defaults": "./dest/defaults/index.js",
@@ -12,6 +12,8 @@
     "./schnorr/lazy": "./dest/schnorr/lazy.js",
     "./single_key": "./dest/single_key/index.js",
     "./single_key/lazy": "./dest/single_key/lazy.js",
+    "./stub": "./dest/stub/index.js",
+    "./stub/lazy": "./dest/stub/lazy.js",
     "./testing": "./dest/testing/index.js",
     "./testing/lazy": "./dest/testing/lazy.js",
     "./copy-cat": "./dest/copy_cat/index.js",
@@ -80,11 +82,11 @@
     ]
   },
   "dependencies": {
-    "@aztec/aztec.js": "2.1.0-rc.9",
-    "@aztec/entrypoints": "2.1.0-rc.9",
-    "@aztec/ethereum": "2.1.0-rc.9",
-    "@aztec/foundation": "2.1.0-rc.9",
-    "@aztec/stdlib": "2.1.0-rc.9",
+    "@aztec/aztec.js": "3.0.0-devnet.2",
+    "@aztec/entrypoints": "3.0.0-devnet.2",
+    "@aztec/ethereum": "3.0.0-devnet.2",
+    "@aztec/foundation": "3.0.0-devnet.2",
+    "@aztec/stdlib": "3.0.0-devnet.2",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/defaults/account_contract.ts

@@ -1,6 +1,6 @@
-import type { AccountContract, AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
+import type { AccountContract, AccountInterface, AuthWitnessProvider, ChainInfo } from '@aztec/aztec.js/account';
 import type { ContractArtifact } from '@aztec/stdlib/abi';
-import type { CompleteAddress, NodeInfo } from '@aztec/stdlib/contract';
+import type { CompleteAddress } from '@aztec/stdlib/contract';
 
 import { DefaultAccountInterface } from '../defaults/account_interface.js';
 
@@ -23,7 +23,7 @@ export abstract class DefaultAccountContract implements AccountContract {
 
   constructor() {}
 
-  getInterface(address: CompleteAddress, nodeInfo: NodeInfo): AccountInterface {
-    return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, nodeInfo);
+  getInterface(address: CompleteAddress, chainInfo: ChainInfo): AccountInterface {
+    return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, chainInfo);
   }
 }

package/src/defaults/account_interface.ts

@@ -1,12 +1,12 @@
 import type { AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
-import type { EntrypointInterface, FeeOptions, TxExecutionOptions } from '@aztec/entrypoints/interfaces';
+import { DefaultAccountEntrypoint, type DefaultAccountEntrypointOptions } from '@aztec/entrypoints/account';
+import type { ChainInfo, EntrypointInterface } from '@aztec/entrypoints/interfaces';
 import type { ExecutionPayload } from '@aztec/entrypoints/payload';
 import { Fr } from '@aztec/foundation/fields';
 import type { AuthWitness } from '@aztec/stdlib/auth-witness';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { CompleteAddress } from '@aztec/stdlib/contract';
-import type { NodeInfo } from '@aztec/stdlib/contract';
+import type { GasSettings } from '@aztec/stdlib/gas';
 import type { TxExecutionRequest } from '@aztec/stdlib/tx';
 
 /**
@@ -22,24 +22,24 @@ export class DefaultAccountInterface implements AccountInterface {
   constructor(
     private authWitnessProvider: AuthWitnessProvider,
     private address: CompleteAddress,
-    nodeInfo: Pick<NodeInfo, 'l1ChainId' | 'rollupVersion'>,
+    chainInfo: ChainInfo,
   ) {
     this.entrypoint = new DefaultAccountEntrypoint(
       address.address,
       authWitnessProvider,
-      nodeInfo.l1ChainId,
-      nodeInfo.rollupVersion,
+      chainInfo.chainId.toNumber(),
+      chainInfo.version.toNumber(),
     );
-    this.chainId = new Fr(nodeInfo.l1ChainId);
-    this.version = new Fr(nodeInfo.rollupVersion);
+    this.chainId = chainInfo.chainId;
+    this.version = chainInfo.version;
   }
 
   createTxExecutionRequest(
     exec: ExecutionPayload,
-    fee: FeeOptions,
-    options: TxExecutionOptions,
+    gasSettings: GasSettings,
+    options: DefaultAccountEntrypointOptions,
   ): Promise<TxExecutionRequest> {
-    return this.entrypoint.createTxExecutionRequest(exec, fee, options);
+    return this.entrypoint.createTxExecutionRequest(exec, gasSettings, options);
   }
 
   createAuthWit(messageHash: Fr): Promise<AuthWitness> {

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