@aztec/accounts 0.76.4 → 0.77.0-testnet-ignition.21

package/dest/testing/create_account.js

@@ -1,54 +1,58 @@
-import { Fr, deriveSigningKey } from '@aztec/circuits.js';
-import { getSchnorrAccount } from '../schnorr/index.js';
+import { FeeJuicePaymentMethod } from '@aztec/aztec.js';
+import { Fr } from '@aztec/foundation/fields';
+import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { getSchnorrAccount, getSchnorrAccountContractAddress } from '../schnorr/index.js';
 /**
- * Deploys and registers a new account using random private keys and returns the associated Schnorr account wallet. Useful for testing.
- * @param pxe - PXE.
- * @returns - A wallet for a fresh account.
- */
-export async function createAccount(pxe) {
-    const secretKey = Fr.random();
-    const signingKey = deriveSigningKey(secretKey);
-    const account = await getSchnorrAccount(pxe, secretKey, signingKey);
-    return account.waitSetup();
+ * 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)
+        };
+    }));
 }
 /**
- * Creates a given number of random accounts using the Schnorr account wallet.
- * @param pxe - PXE.
- * @param numberOfAccounts - How many accounts to create.
- * @param secrets - Optional array of secrets to use for the accounts. If empty, random secrets will be generated.
- * @throws If the secrets array is not empty and does not have the same length as the number of accounts.
- * @returns The created account wallets.
- */
-export async function createAccounts(pxe, numberOfAccounts = 1, secrets = [], waitOpts = { interval: 0.1 }) {
-    if (secrets.length == 0) {
-        secrets = Array.from({ length: numberOfAccounts }, () => Fr.random());
-    }
-    else if (secrets.length > 0 && secrets.length !== numberOfAccounts) {
-        throw new Error('Secrets array must be empty or have the same length as the number of accounts');
-    }
-    // Prepare deployments
-    const accountsAndDeployments = await Promise.all(secrets.map(async (secret, index) => {
-        const signingKey = deriveSigningKey(secret);
-        const account = await getSchnorrAccount(pxe, secret, signingKey);
-        // only register the contract class once
-        let skipClassRegistration = true;
-        if (index === 0) {
-            // for the first account, check if the contract class is already registered, otherwise we should register now
-            if (!(await pxe.getContractClassMetadata(account.getInstance().contractClassId)).isContractClassPubliclyRegistered) {
-                skipClassRegistration = false;
-            }
+ * Deploy schnorr account contract.
+ * It will pay for the fee for the deployment itself. So it must be funded with the prefilled public data.
+ */ export async function deployFundedSchnorrAccount(pxe, account, opts = {
+    interval: 0.1,
+    skipClassRegistration: false
+}) {
+    const signingKey = account.signingKey ?? deriveSigningKey(account.secret);
+    const accountManager = await getSchnorrAccount(pxe, account.secret, signingKey, account.salt);
+    // Pay the fee by the account itself.
+    // This only works when the world state is prefilled with the balance for the account in test environment.
+    const paymentMethod = new FeeJuicePaymentMethod(accountManager.getAddress());
+    await accountManager.deploy({
+        skipClassRegistration: opts.skipClassRegistration,
+        skipPublicDeployment: true,
+        fee: {
+            paymentMethod
         }
-        const deployMethod = await account.getDeployMethod();
-        const provenTx = await deployMethod.prove({
-            contractAddressSalt: new Fr(account.salt),
-            skipClassRegistration,
-            skipPublicDeployment: true,
-            universalDeploy: true,
-        });
-        return { account, provenTx };
-    }));
-    // Send them and await them to be mined
-    await Promise.all(accountsAndDeployments.map(({ provenTx }) => provenTx.send().wait(waitOpts)));
-    return Promise.all(accountsAndDeployments.map(({ account }) => account.getWallet()));
+    }).wait(opts);
+    return accountManager;
+}
+/**
+ * Deploy schnorr account contracts.
+ * They will pay for the fees for the deployment themselves. So they must be funded with the prefilled public data.
+ */ export async function deployFundedSchnorrAccounts(pxe, accounts, opts = {
+    interval: 0.1,
+    skipClassRegistration: false
+}) {
+    const accountManagers = [];
+    // Serial due to https://github.com/AztecProtocol/aztec-packages/issues/12045
+    for(let i = 0; i < accounts.length; i++){
+        accountManagers.push(await deployFundedSchnorrAccount(pxe, accounts[i], {
+            ...opts,
+            skipClassRegistration: i !== 0 || opts.skipClassRegistration
+        }));
+    }
+    return accountManagers;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY3JlYXRlX2FjY291bnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9jcmVhdGVfYWNjb3VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEVBQUUsRUFBRSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFMUQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFFeEQ7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsYUFBYSxDQUFDLEdBQVE7SUFDMUMsTUFBTSxTQUFTLEdBQUcsRUFBRSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQzlCLE1BQU0sVUFBVSxHQUFHLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQy9DLE1BQU0sT0FBTyxHQUFHLE1BQU0saUJBQWlCLENBQUMsR0FBRyxFQUFFLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FBQztJQUNwRSxPQUFPLE9BQU8sQ0FBQyxTQUFTLEVBQUUsQ0FBQztBQUM3QixDQUFDO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILE1BQU0sQ0FBQyxLQUFLLFVBQVUsY0FBYyxDQUNsQyxHQUFRLEVBQ1IsZ0JBQWdCLEdBQUcsQ0FBQyxFQUNwQixVQUFnQixFQUFFLEVBQ2xCLFdBQXFCLEVBQUUsUUFBUSxFQUFFLEdBQUcsRUFBRTtJQUV0QyxJQUFJLE9BQU8sQ0FBQyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUM7UUFDeEIsT0FBTyxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsZ0JBQWdCLEVBQUUsRUFBRSxHQUFHLEVBQUUsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUN4RSxDQUFDO1NBQU0sSUFBSSxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsSUFBSSxPQUFPLENBQUMsTUFBTSxLQUFLLGdCQUFnQixFQUFFLENBQUM7UUFDckUsTUFBTSxJQUFJLEtBQUssQ0FBQywrRUFBK0UsQ0FBQyxDQUFDO0lBQ25HLENBQUM7SUFFRCxzQkFBc0I7SUFDdEIsTUFBTSxzQkFBc0IsR0FBRyxNQUFNLE9BQU8sQ0FBQyxHQUFHLENBQzlDLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsRUFBRTtRQUNsQyxNQUFNLFVBQVUsR0FBRyxnQkFBZ0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM1QyxNQUFNLE9BQU8sR0FBRyxNQUFNLGlCQUFpQixDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFFakUsd0NBQXdDO1FBQ3hDLElBQUkscUJBQXFCLEdBQUcsSUFBSSxDQUFDO1FBQ2pDLElBQUksS0FBSyxLQUFLLENBQUMsRUFBRSxDQUFDO1lBQ2hCLDZHQUE2RztZQUM3RyxJQUNFLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyx3QkFBd0IsQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLENBQUMsZUFBZSxDQUFDLENBQUMsQ0FBQyxpQ0FBaUMsRUFDOUcsQ0FBQztnQkFDRCxxQkFBcUIsR0FBRyxLQUFLLENBQUM7WUFDaEMsQ0FBQztRQUNILENBQUM7UUFFRCxNQUFNLFlBQVksR0FBRyxNQUFNLE9BQU8sQ0FBQyxlQUFlLEVBQUUsQ0FBQztRQUNyRCxNQUFNLFFBQVEsR0FBRyxNQUFNLFlBQVksQ0FBQyxLQUFLLENBQUM7WUFDeEMsbUJBQW1CLEVBQUUsSUFBSSxFQUFFLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQztZQUN6QyxxQkFBcUI7WUFDckIsb0JBQW9CLEVBQUUsSUFBSTtZQUMxQixlQUFlLEVBQUUsSUFBSTtTQUN0QixDQUFDLENBQUM7UUFDSCxPQUFPLEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxDQUFDO0lBQy9CLENBQUMsQ0FBQyxDQUNILENBQUM7SUFFRix1Q0FBdUM7SUFDdkMsTUFBTSxPQUFPLENBQUMsR0FBRyxDQUFDLHNCQUFzQixDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2hHLE9BQU8sT0FBTyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQ3ZGLENBQUMifQ==

package/dest/testing/index.d.ts

@@ -1,11 +1,35 @@
 /**
  * The `@aztec/accounts/testing` export provides utility methods for testing, in particular in a Sandbox environment.
  *
- * Use the {@link createAccount} and {@link createAccounts} methods to create new sample accounts for testing,
- * or use {@link getInitialTestAccountsWallets} to obtain a list of wallets for the Sandbox pre-seeded accounts.
+ * Use {@link getInitialTestAccountsWallets} to obtain a list of wallets for the Sandbox pre-seeded accounts.
  *
  * @packageDocumentation
  */
-export * from './create_account.js';
-export * from './configuration.js';
+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';
+/**
+ * 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[]>;
+/**
+ * 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 declare function getDeployedTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]>;
+export { deployFundedSchnorrAccount, deployFundedSchnorrAccounts, generateSchnorrAccounts } from './create_account.js';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAOzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAQ7D,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;AAED,OAAO,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC"}

package/dest/testing/index.js

@@ -1,11 +1,47 @@
 /**
  * The `@aztec/accounts/testing` export provides utility methods for testing, in particular in a Sandbox environment.
  *
- * Use the {@link createAccount} and {@link createAccounts} methods to create new sample accounts for testing,
- * or use {@link getInitialTestAccountsWallets} to obtain a list of wallets for the Sandbox pre-seeded accounts.
+ * Use {@link getInitialTestAccountsWallets} to obtain a list of wallets for the Sandbox pre-seeded accounts.
  *
  * @packageDocumentation
- */
-export * from './create_account.js';
-export * from './configuration.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdGVzdGluZy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztHQU9HO0FBRUgsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLG9CQUFvQixDQUFDIn0=
+ */ import { getSchnorrAccount, getSchnorrAccountContractAddress, getSchnorrWalletWithSecretKey } 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() {
+    return Promise.all(INITIAL_TEST_SECRET_KEYS.map(async (secret, i)=>({
+            secret,
+            signingKey: INITIAL_TEST_ENCRYPTION_KEYS[i],
+            salt: INITIAL_TEST_ACCOUNT_SALTS[i],
+            address: await getSchnorrAccountContractAddress(secret, INITIAL_TEST_ACCOUNT_SALTS[i], INITIAL_TEST_SIGNING_KEYS[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) {
+    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();
+    }));
+}
+/**
+ * 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)));
+}
+export { deployFundedSchnorrAccount, deployFundedSchnorrAccounts, generateSchnorrAccounts } from './create_account.js';

package/dest/testing/lazy.d.ts

@@ -0,0 +1,34 @@
+/**
+ * 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';
+/**
+ * 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[]>;
+/**
+ * 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 declare function getDeployedTestAccountsWallets(pxe: PXE): Promise<AccountWalletWithSecretKey[]>;
+//# sourceMappingURL=lazy.d.ts.map

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

@@ -0,0 +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"}

package/dest/testing/lazy.js

@@ -0,0 +1,46 @@
+/**
+ * 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 { 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() {
+    return Promise.all(INITIAL_TEST_SECRET_KEYS.map(async (secret, i)=>({
+            secret,
+            signingKey: INITIAL_TEST_ENCRYPTION_KEYS[i],
+            salt: INITIAL_TEST_ACCOUNT_SALTS[i],
+            address: await getSchnorrAccountContractAddress(secret, INITIAL_TEST_ACCOUNT_SALTS[i], INITIAL_TEST_SIGNING_KEYS[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) {
+    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();
+    }));
+}
+/**
+ * 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/dest/utils/index.js

@@ -1,2 +1 @@
 export * from './ssh_agent.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQyJ9

package/dest/utils/ssh_agent.js

@@ -6,8 +6,7 @@ const SSH_AGENT_SIGN_REQUEST = 13;
 const SSH_AGENT_SIGN_RESPONSE = 14;
 /**
  * Connect to the SSH agent via a TCP socket using the standard env variable
- */
-export function connectToAgent() {
+ */ export function connectToAgent() {
     const socketPath = process.env.SSH_AUTH_SOCK;
     if (!socketPath) {
         throw new Error('SSH_AUTH_SOCK is not set');
@@ -16,26 +15,37 @@ export function connectToAgent() {
 }
 /**
  * Retrieve the identities stored in the SSH agent.
- */
-export function getIdentities() {
-    return new Promise((resolve, reject) => {
+ */ export function getIdentities() {
+    return new Promise((resolve, reject)=>{
         const stream = connectToAgent();
-        stream.on('connect', () => {
+        stream.on('connect', ()=>{
             const request = Buffer.concat([
-                Buffer.from([0, 0, 0, 5 + 4]), // length
-                Buffer.from([SSH_AGENT_IDENTITIES_REQUEST]),
-                Buffer.from([0, 0, 0, 0]), // flags
+                Buffer.from([
+                    0,
+                    0,
+                    0,
+                    5 + 4
+                ]),
+                Buffer.from([
+                    SSH_AGENT_IDENTITIES_REQUEST
+                ]),
+                Buffer.from([
+                    0,
+                    0,
+                    0,
+                    0
+                ])
             ]);
             stream.write(request);
         });
-        stream.on('data', data => {
+        stream.on('data', (data)=>{
             const responseType = data[4];
             if (responseType === SSH_AGENT_IDENTITIES_RESPONSE) {
                 let offset = 5;
                 const numKeys = data.readUInt32BE(offset);
                 offset += 4;
                 const keys = [];
-                for (let i = 0; i < numKeys; i++) {
+                for(let i = 0; i < numKeys; i++){
                     const keyLength = data.readUInt32BE(offset);
                     offset += 4;
                     const key = data.subarray(offset, offset + keyLength);
@@ -51,13 +61,12 @@ export function getIdentities() {
                     keys.push({
                         type: type.toString('ascii'),
                         publicKey: key.toString('base64'),
-                        comment: comment.toString('utf8'),
+                        comment: comment.toString('utf8')
                     });
                 }
                 stream.end();
                 resolve(keys);
-            }
-            else {
+            } else {
                 stream.end();
                 reject(`Unexpected response type: ${responseType}`);
             }
@@ -66,44 +75,79 @@ export function getIdentities() {
 }
 /**
  * Sign data using a key stored in the SSH agent. The private signing key is identified by its corresponding public key.
- */
-export function signWithAgent(keyType, curveName, publicKey, data) {
-    return new Promise((resolve, reject) => {
+ */ export function signWithAgent(keyType, curveName, publicKey, data) {
+    return new Promise((resolve, reject)=>{
         const stream = connectToAgent();
-        stream.on('connect', () => {
+        stream.on('connect', ()=>{
             // Construct the key blob
             const keyBlob = Buffer.concat([
-                Buffer.from([0, 0, 0, keyType.length]),
+                Buffer.from([
+                    0,
+                    0,
+                    0,
+                    keyType.length
+                ]),
                 keyType,
-                Buffer.from([0, 0, 0, curveName.length]),
+                Buffer.from([
+                    0,
+                    0,
+                    0,
+                    curveName.length
+                ]),
                 curveName,
-                Buffer.from([0, 0, 0, publicKey.length + 1, 4]),
-                publicKey,
+                Buffer.from([
+                    0,
+                    0,
+                    0,
+                    publicKey.length + 1,
+                    4
+                ]),
+                publicKey
             ]);
             const request = Buffer.concat([
-                Buffer.from([0, 0, 0, 5 + keyBlob.length + 4 + data.length + 4]), // length
-                Buffer.from([SSH_AGENT_SIGN_REQUEST]),
-                Buffer.from([0, 0, 0, keyBlob.length]), // key blob length
+                Buffer.from([
+                    0,
+                    0,
+                    0,
+                    5 + keyBlob.length + 4 + data.length + 4
+                ]),
+                Buffer.from([
+                    SSH_AGENT_SIGN_REQUEST
+                ]),
+                Buffer.from([
+                    0,
+                    0,
+                    0,
+                    keyBlob.length
+                ]),
                 keyBlob,
-                Buffer.from([0, 0, 0, data.length]), // data length
+                Buffer.from([
+                    0,
+                    0,
+                    0,
+                    data.length
+                ]),
                 data,
-                Buffer.from([0, 0, 0, 0]), // flags
+                Buffer.from([
+                    0,
+                    0,
+                    0,
+                    0
+                ])
             ]);
             stream.write(request);
         });
-        stream.on('data', data => {
+        stream.on('data', (data)=>{
             const type = data[4];
             if (type === SSH_AGENT_SIGN_RESPONSE) {
                 const signatureLength = data.readUInt32BE(5);
                 const signature = data.subarray(9, 9 + signatureLength);
                 stream.end();
                 resolve(signature);
-            }
-            else {
+            } else {
                 stream.end();
                 reject(`Unexpected response type: ${type}`);
             }
         });
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3NoX2FnZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL3NzaF9hZ2VudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFDO0FBQ2hDLE9BQU8sR0FBRyxNQUFNLEtBQUssQ0FBQztBQUV0QixNQUFNLDRCQUE0QixHQUFHLEVBQUUsQ0FBQztBQUN4QyxNQUFNLDZCQUE2QixHQUFHLEVBQUUsQ0FBQztBQUN6QyxNQUFNLHNCQUFzQixHQUFHLEVBQUUsQ0FBQztBQUNsQyxNQUFNLHVCQUF1QixHQUFHLEVBQUUsQ0FBQztBQUVuQzs7R0FFRztBQUNILE1BQU0sVUFBVSxjQUFjO0lBQzVCLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDO0lBQzdDLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUNoQixNQUFNLElBQUksS0FBSyxDQUFDLDBCQUEwQixDQUFDLENBQUM7SUFDOUMsQ0FBQztJQUNELE9BQU8sR0FBRyxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUNqQyxDQUFDO0FBb0JEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGFBQWE7SUFDM0IsT0FBTyxJQUFJLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUNyQyxNQUFNLE1BQU0sR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUNoQyxNQUFNLENBQUMsRUFBRSxDQUFDLFNBQVMsRUFBRSxHQUFHLEVBQUU7WUFDeEIsTUFBTSxPQUFPLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQztnQkFDNUIsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLFNBQVM7Z0JBQ3hDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyw0QkFBNEIsQ0FBQyxDQUFDO2dCQUMzQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxRQUFRO2FBQ3BDLENBQUMsQ0FBQztZQUVILE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDeEIsQ0FBQyxDQUFDLENBQUM7UUFFSCxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsRUFBRTtZQUN2QixNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDN0IsSUFBSSxZQUFZLEtBQUssNkJBQTZCLEVBQUUsQ0FBQztnQkFDbkQsSUFBSSxNQUFNLEdBQUcsQ0FBQyxDQUFDO2dCQUNmLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQzFDLE1BQU0sSUFBSSxDQUFDLENBQUM7Z0JBRVosTUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO2dCQUNoQixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsT0FBTyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7b0JBQ2pDLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUM7b0JBQzVDLE1BQU0sSUFBSSxDQUFDLENBQUM7b0JBQ1osTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUFDO29CQUN0RCxNQUFNLElBQUksU0FBUyxDQUFDO29CQUNwQixNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxDQUFDO29CQUNoRCxNQUFNLElBQUksQ0FBQyxDQUFDO29CQUNaLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxhQUFhLENBQUMsQ0FBQztvQkFDOUQsTUFBTSxJQUFJLGFBQWEsQ0FBQztvQkFFeEIsSUFBSSxTQUFTLEdBQUcsQ0FBQyxDQUFDO29CQUNsQixNQUFNLE9BQU8sR0FBRyxHQUFHLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDO29CQUM1QyxTQUFTLElBQUksQ0FBQyxDQUFDO29CQUNmLE1BQU0sSUFBSSxHQUFHLEdBQUcsQ0FBQyxRQUFRLENBQUMsU0FBUyxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMsQ0FBQztvQkFFMUQsSUFBSSxDQUFDLElBQUksQ0FBQzt3QkFDUixJQUFJLEVBQUUsSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUM7d0JBQzVCLFNBQVMsRUFBRSxHQUFHLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQzt3QkFDakMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDO3FCQUNsQyxDQUFDLENBQUM7Z0JBQ0wsQ0FBQztnQkFDRCxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUM7Z0JBQ2IsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2hCLENBQUM7aUJBQU0sQ0FBQztnQkFDTixNQUFNLENBQUMsR0FBRyxFQUFFLENBQUM7Z0JBQ2IsTUFBTSxDQUFDLDZCQUE2QixZQUFZLEVBQUUsQ0FBQyxDQUFDO1lBQ3RELENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGFBQWEsQ0FBQyxPQUFlLEVBQUUsU0FBaUIsRUFBRSxTQUFpQixFQUFFLElBQVk7SUFDL0YsT0FBTyxJQUFJLE9BQU8sQ0FBUyxDQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFBRTtRQUM3QyxNQUFNLE1BQU0sR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUNoQyxNQUFNLENBQUMsRUFBRSxDQUFDLFNBQVMsRUFBRSxHQUFHLEVBQUU7WUFDeEIseUJBQXlCO1lBQ3pCLE1BQU0sT0FBTyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUM7Z0JBQzVCLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ3RDLE9BQU87Z0JBQ1AsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztnQkFDeEMsU0FBUztnQkFDVCxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsU0FBUyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7Z0JBQy9DLFNBQVM7YUFDVixDQUFDLENBQUM7WUFDSCxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDO2dCQUM1QixNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxTQUFTO2dCQUMzRSxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsc0JBQXNCLENBQUMsQ0FBQztnQkFDckMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLGtCQUFrQjtnQkFDMUQsT0FBTztnQkFDUCxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEVBQUUsY0FBYztnQkFDbkQsSUFBSTtnQkFDSixNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxRQUFRO2FBQ3BDLENBQUMsQ0FBQztZQUVILE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDeEIsQ0FBQyxDQUFDLENBQUM7UUFFSCxNQUFNLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsRUFBRTtZQUN2QixNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFFckIsSUFBSSxJQUFJLEtBQUssdUJBQXVCLEVBQUUsQ0FBQztnQkFDckMsTUFBTSxlQUFlLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDN0MsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxHQUFHLGVBQWUsQ0FBQyxDQUFDO2dCQUN4RCxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUM7Z0JBQ2IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQ3JCLENBQUM7aUJBQU0sQ0FBQztnQkFDTixNQUFNLENBQUMsR0FBRyxFQUFFLENBQUM7Z0JBQ2IsTUFBTSxDQUFDLDZCQUE2QixJQUFJLEVBQUUsQ0FBQyxDQUFDO1lBQzlDLENBQUM7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQyJ9

package/package.json

@@ -2,15 +2,19 @@
   "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": "0.76.4",
+  "version": "0.77.0-testnet-ignition.21",
   "type": "module",
   "exports": {
     "./dapp": "./dest/dapp/index.js",
     "./defaults": "./dest/defaults/index.js",
     "./ecdsa": "./dest/ecdsa/index.js",
+    "./ecdsa/lazy": "./dest/ecdsa/lazy.js",
     "./schnorr": "./dest/schnorr/index.js",
+    "./schnorr/lazy": "./dest/schnorr/lazy.js",
     "./single_key": "./dest/single_key/index.js",
+    "./single_key/lazy": "./dest/single_key/lazy.js",
     "./testing": "./dest/testing/index.js",
+    "./testing/lazy": "./dest/testing/lazy.js",
     "./utils": "./dest/utils/index.js"
   },
   "typedocOptions": {
@@ -33,7 +37,7 @@
     "clean": "rm -rf ./dest .tsbuildinfo ./artifacts",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
-    "test": "HARDWARE_CONCURRENCY=${HARDWARE_CONCURRENCY:-16} RAYON_NUM_THREADS=${RAYON_NUM_THREADS:-4} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "inherits": [
     "../package.common.json",
@@ -67,19 +71,17 @@
     "reporters": [
       "default"
     ],
-    "testTimeout": 30000,
+    "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
     ]
   },
   "dependencies": {
-    "@aztec/aztec.js": "0.76.4",
-    "@aztec/circuit-types": "0.76.4",
-    "@aztec/circuits.js": "0.76.4",
-    "@aztec/entrypoints": "0.76.4",
-    "@aztec/ethereum": "0.76.4",
-    "@aztec/foundation": "0.76.4",
-    "@aztec/types": "0.76.4",
+    "@aztec/aztec.js": "0.77.0-testnet-ignition.21",
+    "@aztec/entrypoints": "0.77.0-testnet-ignition.21",
+    "@aztec/ethereum": "0.77.0-testnet-ignition.21",
+    "@aztec/foundation": "0.77.0-testnet-ignition.21",
+    "@aztec/stdlib": "0.77.0-testnet-ignition.21",
     "tslib": "^2.4.0"
   },
   "devDependencies": {

package/src/dapp/dapp_interface.ts

@@ -1,5 +1,10 @@
-import { type AccountWallet, type AuthWitnessProvider } from '@aztec/aztec.js';
-import { type AztecAddress, type CompleteAddress, type NodeInfo } from '@aztec/circuits.js';
+import {
+  type AccountWallet,
+  type AuthWitnessProvider,
+  AztecAddress,
+  CompleteAddress,
+  type NodeInfo,
+} from '@aztec/aztec.js';
 import { DefaultDappEntrypoint } from '@aztec/entrypoints/dapp';
 
 import { DefaultAccountInterface } from '../defaults/account_interface.js';

package/src/defaults/account_contract.ts

@@ -1,7 +1,6 @@
-import { type AccountContract, type AccountInterface, type AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { type CompleteAddress } from '@aztec/circuit-types';
-import { type NodeInfo } from '@aztec/circuits.js';
-import { type ContractArtifact } from '@aztec/foundation/abi';
+import type { AccountContract, AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import type { CompleteAddress, NodeInfo } from '@aztec/stdlib/contract';
 
 import { DefaultAccountInterface } from '../defaults/account_interface.js';
 
@@ -12,12 +11,9 @@ import { DefaultAccountInterface } from '../defaults/account_interface.js';
 export abstract class DefaultAccountContract implements AccountContract {
   abstract getAuthWitnessProvider(address: CompleteAddress): AuthWitnessProvider;
   abstract getDeploymentArgs(): Promise<any[] | undefined>;
+  abstract getContractArtifact(): Promise<ContractArtifact>;
 
-  constructor(private artifact: ContractArtifact) {}
-
-  getContractArtifact(): ContractArtifact {
-    return this.artifact;
-  }
+  constructor() {}
 
   getInterface(address: CompleteAddress, nodeInfo: NodeInfo): AccountInterface {
     return new DefaultAccountInterface(this.getAuthWitnessProvider(address), address, nodeInfo);

package/src/defaults/account_interface.ts

@@ -1,8 +1,12 @@
-import { type AccountInterface, type AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { type EntrypointInterface, type ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
-import { type AuthWitness, type TxExecutionRequest } from '@aztec/circuit-types';
-import { type AztecAddress, type CompleteAddress, Fr, type NodeInfo } from '@aztec/circuits.js';
+import type { AccountInterface, AuthWitnessProvider } from '@aztec/aztec.js/account';
+import type { EntrypointInterface, ExecutionRequestInit } from '@aztec/aztec.js/entrypoint';
 import { DefaultAccountEntrypoint } from '@aztec/entrypoints/account';
+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 { TxExecutionRequest } from '@aztec/stdlib/tx';
 
 /**
  * Default implementation for an account interface. Requires that the account uses the default

package/src/ecdsa/ecdsa_k/account_contract.ts

@@ -1,19 +1,20 @@
-import { type AuthWitnessProvider } from '@aztec/aztec.js/account';
-import { AuthWitness, type CompleteAddress } from '@aztec/circuit-types';
-import { Ecdsa } from '@aztec/circuits.js/barretenberg';
-import { type ContractArtifact } from '@aztec/foundation/abi';
-import { type Fr } from '@aztec/foundation/fields';
+import type { AuthWitnessProvider } from '@aztec/aztec.js/account';
+import { Ecdsa } from '@aztec/foundation/crypto';
+import type { Fr } from '@aztec/foundation/fields';
+import { AuthWitness } from '@aztec/stdlib/auth-witness';
+import { CompleteAddress } from '@aztec/stdlib/contract';
 
 import { DefaultAccountContract } from '../../defaults/account_contract.js';
-import { EcdsaKAccountContractArtifact } from './artifact.js';
 
 /**
  * Account contract that authenticates transactions using ECDSA signatures
  * verified against a secp256k1 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 class EcdsaKAccountContract extends DefaultAccountContract {
+export abstract class EcdsaKBaseAccountContract extends DefaultAccountContract {
   constructor(private signingPrivateKey: Buffer) {
-    super(EcdsaKAccountContractArtifact as ContractArtifact);
+    super();
   }
 
   async getDeploymentArgs() {