@aztec/accounts 0.82.2 → 0.82.3

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/index.ts

@@ -8,18 +8,12 @@ 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.

package/src/ecdsa/ssh_ecdsa_r/lazy.ts

@@ -8,29 +8,12 @@ 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.

package/src/testing/index.ts

@@ -5,7 +5,7 @@
  *
  * @packageDocumentation
  */
-import type { PXE } from '@aztec/aztec.js';
+import { AccountManager, type PXE } from '@aztec/aztec.js';
 import type { AccountWalletWithSecretKey } from '@aztec/aztec.js/wallet';
 
 import {
@@ -47,22 +47,27 @@ export function getInitialTestAccounts(): Promise<InitialAccountData[]> {
   );
 }
 
+/**
+ * Gets a collection of account managers for the Aztec accounts that are initially stored in the test environment.
+ * @param pxe - PXE instance.
+ * @returns A set of AccountManager implementations for each of the initial accounts.
+ */
+export function getInitialTestAccountsManagers(pxe: PXE): Promise<AccountManager[]> {
+  return Promise.all(
+    INITIAL_TEST_SECRET_KEYS.map((encryptionKey, i) =>
+      getSchnorrAccount(pxe, encryptionKey!, INITIAL_TEST_SIGNING_KEYS[i]!, INITIAL_TEST_ACCOUNT_SALTS[i]),
+    ),
+  );
+}
+
 /**
  * Gets a collection of wallets for the Aztec accounts that are initially stored in the test environment.
  * @param pxe - PXE instance.
  * @returns A set of AccountWallet implementations for each of the initial accounts.
  */
-export function getInitialTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]> {
+export async function getInitialTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]> {
   return Promise.all(
-    INITIAL_TEST_SECRET_KEYS.map(async (encryptionKey, i) => {
-      const account = await getSchnorrAccount(
-        pxe,
-        encryptionKey!,
-        INITIAL_TEST_SIGNING_KEYS[i]!,
-        INITIAL_TEST_ACCOUNT_SALTS[i],
-      );
-      return account.getWallet();
-    }),
+    (await Promise.all(await getInitialTestAccountsManagers(pxe))).map(accountManager => accountManager.getWallet()),
   );
 }