@aztec/end-to-end 3.0.0-nightly.20250910 → 3.0.0-nightly.20250912

package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -1,9 +1,6 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import {
-  type AccountWallet,
   AztecAddress,
   type AztecNode,
-  type CompleteAddress,
   Fr,
   type Logger,
   type PXE,
@@ -16,6 +13,7 @@ import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
 import type { SequencerClient } from '@aztec/sequencer-client';
+import type { TestWallet } from '@aztec/test-wallet';
 
 import { jest } from '@jest/globals';
 
@@ -63,9 +61,8 @@ export class BlacklistTokenContractTest {
 
   private snapshotManager: ISnapshotManager;
   logger: Logger;
-  wallets: AccountWallet[] = [];
+  wallet!: TestWallet;
   pxe!: PXE;
-  accounts: CompleteAddress[] = [];
   asset!: TokenBlacklistContract;
   tokenSim!: TokenSimulator;
   badAccount!: InvalidAccountContract;
@@ -73,11 +70,8 @@ export class BlacklistTokenContractTest {
   sequencer!: SequencerClient;
   aztecNode!: AztecNode;
 
-  admin!: AccountWallet;
   adminAddress!: AztecAddress;
-  other!: AccountWallet;
   otherAddress!: AztecAddress;
-  blacklisted!: AccountWallet;
   blacklistedAddress!: AztecAddress;
 
   constructor(testName: string) {
@@ -105,19 +99,16 @@ export class BlacklistTokenContractTest {
     await this.snapshotManager.snapshot(
       '3_accounts',
       deployAccounts(3, this.logger),
-      async ({ deployedAccounts }, { pxe, cheatCodes, aztecNode, sequencer }) => {
+      ({ deployedAccounts }, { pxe, cheatCodes, aztecNode, sequencer, wallet }) => {
         this.pxe = pxe;
         this.cheatCodes = cheatCodes;
         this.aztecNode = aztecNode;
         this.sequencer = sequencer;
-        this.wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
-        this.admin = this.wallets[0];
-        this.adminAddress = this.admin.getAddress();
-        this.other = this.wallets[1];
-        this.otherAddress = this.other.getAddress();
-        this.blacklisted = this.wallets[2];
-        this.blacklistedAddress = this.blacklisted.getAddress();
-        this.accounts = this.wallets.map(w => w.getCompleteAddress());
+        this.wallet = wallet;
+        this.adminAddress = deployedAccounts[0].address;
+        this.otherAddress = deployedAccounts[1].address;
+        this.blacklistedAddress = deployedAccounts[2].address;
+        return Promise.resolve();
       },
     );
 
@@ -127,16 +118,16 @@ export class BlacklistTokenContractTest {
         // Create the token contract state.
         // Move this account thing to addAccounts above?
         this.logger.verbose(`Public deploy accounts...`);
-        await publicDeployAccounts(this.admin, this.accounts.slice(0, 3));
+        await publicDeployAccounts(this.wallet, [this.adminAddress, this.otherAddress, this.blacklistedAddress]);
 
         this.logger.verbose(`Deploying TokenContract...`);
-        this.asset = await TokenBlacklistContract.deploy(this.admin, this.adminAddress)
+        this.asset = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress)
           .send({ from: this.adminAddress })
           .deployed();
         this.logger.verbose(`Token deployed to ${this.asset.address}`);
 
         this.logger.verbose(`Deploying bad account...`);
-        this.badAccount = await InvalidAccountContract.deploy(this.admin).send({ from: this.adminAddress }).deployed();
+        this.badAccount = await InvalidAccountContract.deploy(this.wallet).send({ from: this.adminAddress }).deployed();
         this.logger.verbose(`Deployed to ${this.badAccount.address}.`);
 
         await this.crossTimestampOfChange();
@@ -145,18 +136,18 @@ export class BlacklistTokenContractTest {
       },
       async ({ tokenContractAddress, badAccountAddress }) => {
         // Restore the token contract state.
-        this.asset = await TokenBlacklistContract.at(tokenContractAddress, this.wallets[0]);
+        this.asset = await TokenBlacklistContract.at(tokenContractAddress, this.wallet);
         this.logger.verbose(`Token contract address: ${this.asset.address}`);
 
         this.tokenSim = new TokenSimulator(
           this.asset as unknown as TokenContract,
-          this.admin,
+          this.wallet,
           this.adminAddress,
           this.logger,
-          this.accounts.map(a => a.address),
+          [this.adminAddress, this.otherAddress, this.blacklistedAddress],
         );
 
-        this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallets[0]);
+        this.badAccount = await InvalidAccountContract.at(badAccountAddress, this.wallet);
         this.logger.verbose(`Bad account address: ${this.badAccount.address}`);
 
         expect(await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).toEqual(
@@ -205,40 +196,38 @@ export class BlacklistTokenContractTest {
     await this.snapshotManager.snapshot(
       'mint',
       async () => {
-        const { asset, accounts, wallets } = this;
+        const { asset } = this;
         const amount = 10000n;
 
         const adminMinterRole = new Role().withAdmin().withMinter();
-        await this.asset
-          .withWallet(this.admin)
-          .methods.update_roles(this.admin.getAddress(), adminMinterRole.toNoirStruct())
+        await this.asset.methods
+          .update_roles(this.adminAddress, adminMinterRole.toNoirStruct())
           .send({ from: this.adminAddress })
           .wait();
 
         const blacklistRole = new Role().withBlacklisted();
-        await this.asset
-          .withWallet(this.admin)
-          .methods.update_roles(this.blacklisted.getAddress(), blacklistRole.toNoirStruct())
+        await this.asset.methods
+          .update_roles(this.blacklistedAddress, blacklistRole.toNoirStruct())
           .send({ from: this.adminAddress })
           .wait();
 
         await this.crossTimestampOfChange();
 
-        expect(
-          await this.asset.methods.get_roles(this.admin.getAddress()).simulate({ from: this.adminAddress }),
-        ).toEqual(adminMinterRole.toNoirStruct());
+        expect(await this.asset.methods.get_roles(this.adminAddress).simulate({ from: this.adminAddress })).toEqual(
+          adminMinterRole.toNoirStruct(),
+        );
 
         this.logger.verbose(`Minting ${amount} publicly...`);
-        await asset.methods.mint_public(accounts[0].address, amount).send({ from: this.adminAddress }).wait();
+        await asset.methods.mint_public(this.adminAddress, amount).send({ from: this.adminAddress }).wait();
 
         this.logger.verbose(`Minting ${amount} privately...`);
         const secret = Fr.random();
         const secretHash = await computeSecretHash(secret);
         const receipt = await asset.methods.mint_private(amount, secretHash).send({ from: this.adminAddress }).wait();
 
-        await this.addPendingShieldNoteToPXE(asset, wallets[0].getAddress(), amount, secretHash, receipt.txHash);
+        await this.addPendingShieldNoteToPXE(asset, this.adminAddress, amount, secretHash, receipt.txHash);
         const txClaim = asset.methods
-          .redeem_shield(accounts[0].address, amount, secret)
+          .redeem_shield(this.adminAddress, amount, secret)
           .send({ from: this.adminAddress });
         await txClaim.wait();
         this.logger.verbose(`Minting complete.`);
@@ -246,23 +235,23 @@ export class BlacklistTokenContractTest {
         return { amount };
       },
       async ({ amount }) => {
-        const {
-          asset,
-          accounts: [{ address }],
-          tokenSim,
-        } = this;
-        tokenSim.mintPublic(address, amount);
-
-        const publicBalance = await asset.methods.balance_of_public(address).simulate({ from: address });
+        const { asset, tokenSim } = this;
+        tokenSim.mintPublic(this.adminAddress, amount);
+
+        const publicBalance = await asset.methods
+          .balance_of_public(this.adminAddress)
+          .simulate({ from: this.adminAddress });
         this.logger.verbose(`Public balance of wallet 0: ${publicBalance}`);
-        expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(address));
+        expect(publicBalance).toEqual(this.tokenSim.balanceOfPublic(this.adminAddress));
 
-        tokenSim.mintPrivate(address, amount);
-        const privateBalance = await asset.methods.balance_of_private(address).simulate({ from: address });
+        tokenSim.mintPrivate(this.adminAddress, amount);
+        const privateBalance = await asset.methods
+          .balance_of_private(this.adminAddress)
+          .simulate({ from: this.adminAddress });
         this.logger.verbose(`Private balance of wallet 0: ${privateBalance}`);
-        expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(address));
+        expect(privateBalance).toEqual(tokenSim.balanceOfPrivate(this.adminAddress));
 
-        const totalSupply = await asset.methods.total_supply().simulate({ from: address });
+        const totalSupply = await asset.methods.total_supply().simulate({ from: this.adminAddress });
         this.logger.verbose(`Total supply: ${totalSupply}`);
         expect(totalSupply).toEqual(tokenSim.totalSupply);
 

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -1,15 +1,5 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import type { AztecNodeConfig } from '@aztec/aztec-node';
-import {
-  type AccountWallet,
-  AztecAddress,
-  type AztecNode,
-  type CompleteAddress,
-  EthAddress,
-  type Logger,
-  type PXE,
-  createLogger,
-} from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, EthAddress, type Logger, type PXE, createLogger } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
 import {
   type DeployL1ContractsReturnType,
@@ -21,6 +11,7 @@ import { InboxAbi, OutboxAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
+import type { TestWallet } from '@aztec/test-wallet';
 
 import { getContract } from 'viem';
 
@@ -39,7 +30,6 @@ const { E2E_DATA_PATH: dataPath } = process.env;
 export class CrossChainMessagingTest {
   private snapshotManager: ISnapshotManager;
   logger: Logger;
-  accounts: CompleteAddress[] = [];
   aztecNode!: AztecNode;
   pxe!: PXE;
   aztecNodeConfig!: AztecNodeConfig;
@@ -47,13 +37,12 @@ export class CrossChainMessagingTest {
 
   l1Client!: ExtendedViemWalletClient | undefined;
 
-  user1Wallet!: AccountWallet;
+  wallet!: TestWallet;
+  ownerAddress!: AztecAddress;
   user1Address!: AztecAddress;
-  user2Wallet!: AccountWallet;
   user2Address!: AztecAddress;
   crossChainTestHarness!: CrossChainTestHarness;
   ethAccount!: EthAddress;
-  ownerAddress!: AztecAddress;
   l2Token!: TokenContract;
   l2Bridge!: TokenBridgeContract;
 
@@ -99,19 +88,13 @@ export class CrossChainMessagingTest {
     await this.snapshotManager.snapshot(
       '3_accounts',
       deployAccounts(3, this.logger),
-      async ({ deployedAccounts }, { pxe, aztecNodeConfig, aztecNode }) => {
-        const wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
-        this.accounts = wallets.map(w => w.getCompleteAddress());
-        wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-
-        this.user1Wallet = wallets[0];
-        this.user1Address = this.user1Wallet.getAddress();
-        this.user2Wallet = wallets[1];
-        this.user2Address = this.user2Wallet.getAddress();
-
+      ({ deployedAccounts }, { pxe, wallet, aztecNodeConfig, aztecNode }) => {
+        [this.ownerAddress, this.user1Address, this.user2Address] = deployedAccounts.map(a => a.address);
         this.pxe = pxe;
+        this.wallet = wallet;
         this.aztecNode = aztecNode;
         this.aztecNodeConfig = aztecNodeConfig;
+        return Promise.resolve();
       },
     );
 
@@ -121,7 +104,7 @@ export class CrossChainMessagingTest {
         // Create the token contract state.
         // Move this account thing to addAccounts above?
         this.logger.verbose(`Public deploy accounts...`);
-        await publicDeployAccounts(this.user1Wallet, this.accounts.slice(0, 3));
+        await publicDeployAccounts(this.wallet, [this.ownerAddress, this.user1Address, this.user2Address]);
 
         this.l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
@@ -136,8 +119,8 @@ export class CrossChainMessagingTest {
           this.aztecNode,
           this.pxe,
           this.l1Client,
-          this.user1Wallet,
-          this.user1Address,
+          this.wallet,
+          this.ownerAddress,
           this.logger,
           underlyingERC20Address,
         );
@@ -147,12 +130,11 @@ export class CrossChainMessagingTest {
         return this.crossChainTestHarness.toCrossChainContext();
       },
       async crossChainContext => {
-        this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.user1Wallet);
-        this.l2Bridge = await TokenBridgeContract.at(crossChainContext.l2Bridge, this.user1Wallet);
+        this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.wallet);
+        this.l2Bridge = await TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
 
         // There is an issue with the reviver so we are getting strings sometimes. Working around it here.
         this.ethAccount = EthAddress.fromString(crossChainContext.ethAccount.toString());
-        this.ownerAddress = AztecAddress.fromString(crossChainContext.ownerAddress.toString());
         const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
 
         const l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
@@ -179,8 +161,8 @@ export class CrossChainMessagingTest {
           crossChainContext.underlying,
           l1Client,
           this.aztecNodeConfig.l1Contracts,
-          this.user1Wallet,
-          this.user1Address,
+          this.wallet,
+          this.ownerAddress,
         );
 
         this.l1Client = l1Client;

package/src/e2e_deploy_contract/deploy_test.ts

@@ -1,6 +1,4 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import {
-  type AccountWallet,
   type AztecAddress,
   type AztecNode,
   type ContractArtifact,
@@ -24,7 +22,7 @@ export class DeployTest {
   private snapshotManager: ISnapshotManager;
   public logger: Logger;
   public pxe!: PXE;
-  public wallet!: AccountWallet;
+  public wallet!: Wallet;
   public defaultAccountAddress!: AztecAddress;
   public aztecNode!: AztecNode;
   public aztecNodeAdmin!: AztecNodeAdmin;
@@ -37,7 +35,7 @@ export class DeployTest {
   async setup() {
     await this.applyInitialAccountSnapshot();
     const context = await this.snapshotManager.setup();
-    ({ pxe: this.pxe, aztecNode: this.aztecNode } = context);
+    ({ pxe: this.pxe, aztecNode: this.aztecNode, wallet: this.wallet } = context);
     this.aztecNodeAdmin = context.aztecNode;
     return this;
   }
@@ -47,16 +45,10 @@ export class DeployTest {
   }
 
   private async applyInitialAccountSnapshot() {
-    await this.snapshotManager.snapshot(
-      'initial_account',
-      deployAccounts(1, this.logger),
-      async ({ deployedAccounts }, { pxe }) => {
-        const wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
-        wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-        this.wallet = wallets[0];
-        this.defaultAccountAddress = this.wallet.getAddress();
-      },
-    );
+    await this.snapshotManager.snapshot('initial_account', deployAccounts(1, this.logger), ({ deployedAccounts }) => {
+      this.defaultAccountAddress = deployedAccounts[0].address;
+      return Promise.resolve();
+    });
   }
 
   async registerContract<T extends ContractBase>(

package/src/e2e_epochs/epochs_test.ts

@@ -9,6 +9,7 @@ import {
   retryUntil,
   sleep,
 } from '@aztec/aztec.js';
+import { EpochCache } from '@aztec/epoch-cache';
 import { DefaultL1ContractsConfig, type ExtendedViemWalletClient, createExtendedL1Client } from '@aztec/ethereum';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import { ChainMonitor, DelayedTxUtils, type Delayer, waitUntilL1Timestamp, withDelayer } from '@aztec/ethereum/test';
@@ -69,6 +70,7 @@ export class EpochsTestContext {
   public constants!: L1RollupConstants;
   public logger!: Logger;
   public monitor!: ChainMonitor;
+  public epochCache!: EpochCache;
   public proverDelayer!: Delayer;
   public sequencerDelayer!: Delayer;
 
@@ -141,6 +143,7 @@ export class EpochsTestContext {
     this.logger = context.logger;
     this.l1Client = context.deployL1ContractsValues.l1Client;
     this.rollup = RollupContract.getFromConfig(context.config);
+    this.epochCache = await EpochCache.create(this.rollup, context.config, { dateProvider: context.dateProvider });
 
     // Loop that tracks L1 and L2 block numbers and logs whenever there's a new one.
     this.monitor = new ChainMonitor(this.rollup, context.dateProvider, this.logger).start();

package/src/e2e_fees/bridging_race.notest.ts

@@ -1,7 +1,8 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { Fr, type Logger, type PXE, sleep } from '@aztec/aztec.js';
+import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
+import { Fr, type Logger, sleep } from '@aztec/aztec.js';
 import { Fq } from '@aztec/foundation/fields';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { TestWallet } from '@aztec/test-wallet';
 
 import { jest } from '@jest/globals';
 import type { Hex } from 'viem';
@@ -27,7 +28,7 @@ describe('e2e_fees bridging_race', () => {
     await t.applyPublicDeployAccountsSnapshot();
     await t.applySetupFeeJuiceSnapshot();
 
-    ({ pxe, logger } = await t.setup());
+    ({ wallet, logger } = await t.setup());
   });
 
   afterAll(async () => {
@@ -35,17 +36,19 @@ describe('e2e_fees bridging_race', () => {
   });
 
   let logger: Logger;
-  let pxe: PXE;
   let bobsAddress: AztecAddress;
+  let wallet: TestWallet;
 
   beforeEach(async () => {
     const bobsSecretKey = Fr.random();
     const bobsPrivateSigningKey = Fq.random();
-    const bobsAccountManager = await getSchnorrAccount(pxe, bobsSecretKey, bobsPrivateSigningKey, Fr.random());
-    const bobsCompleteAddress = await bobsAccountManager.getCompleteAddress();
-    bobsAddress = bobsCompleteAddress.address;
-    await bobsAccountManager.getWallet();
-    await bobsAccountManager.register();
+    const bobsSalt = Fr.random();
+    const bobsAccountManager = await wallet.createAccount({
+      secret: bobsSecretKey,
+      salt: bobsSalt,
+      contract: new SchnorrAccountContract(bobsPrivateSigningKey),
+    });
+    bobsAddress = bobsAccountManager.getAddress();
   });
 
   it('Alice bridges funds to Bob', async () => {

package/src/e2e_fees/fees_test.ts

@@ -1,13 +1,5 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import {
-  type AccountWallet,
-  type AztecAddress,
-  type AztecNode,
-  type Logger,
-  type PXE,
-  createLogger,
-  sleep,
-} from '@aztec/aztec.js';
+import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
+import { type AztecAddress, type AztecNode, type Logger, type PXE, createLogger, sleep } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
 import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
@@ -22,6 +14,7 @@ import { CounterContract } from '@aztec/noir-test-contracts.js/Counter';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { GasSettings } from '@aztec/stdlib/gas';
+import { TestWallet } from '@aztec/test-wallet';
 
 import { getContract } from 'viem';
 
@@ -56,7 +49,6 @@ const { E2E_DATA_PATH: dataPath } = process.env;
  */
 export class FeesTest {
   private snapshotManager: ISnapshotManager;
-  private wallets: AccountWallet[] = [];
   private accounts: AztecAddress[] = [];
 
   public logger: Logger;
@@ -64,9 +56,8 @@ export class FeesTest {
   public aztecNode!: AztecNode;
   public cheatCodes!: CheatCodes;
 
-  public aliceWallet!: AccountWallet;
+  public wallet!: TestWallet;
   public aliceAddress!: AztecAddress;
-  public bobWallet!: AccountWallet;
   public bobAddress!: AztecAddress;
   public sequencerAddress!: AztecAddress;
   public coinbase!: EthAddress;
@@ -172,7 +163,7 @@ export class FeesTest {
       .balance_of_private(address)
       .simulate({ from: this.aliceAddress });
 
-    await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, this.aliceWallet, address, amount);
+    await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, address, amount);
 
     const balanceAfter = await this.bananaCoin.methods
       .balance_of_private(address)
@@ -191,30 +182,39 @@ export class FeesTest {
     await this.snapshotManager.snapshot(
       'initial_accounts',
       deployAccounts(this.numberOfAccounts, this.logger),
-      async ({ deployedAccounts }, { pxe, aztecNode, aztecNodeConfig }) => {
+      async ({ deployedAccounts }, { wallet, pxe, aztecNode, aztecNodeConfig }) => {
         this.pxe = pxe;
-
+        this.wallet = wallet;
         this.aztecNode = aztecNode;
         this.gasSettings = GasSettings.default({ maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2) });
         this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
-        this.wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
-        this.wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-        this.accounts = this.wallets.map(w => w.getAddress());
-        [this.aliceWallet, this.bobWallet] = this.wallets.slice(0, 2);
-        [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts;
+        this.accounts = deployedAccounts.map(a => a.address);
+        this.accounts.forEach((a, i) => this.logger.verbose(`Account ${i} address: ${a}`));
+        [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
+        await Promise.all(
+          deployedAccounts.map(async acc => {
+            const accountData = {
+              secret: acc.secret,
+              salt: acc.salt,
+              contract: new SchnorrAccountContract(acc.signingKey),
+            };
+            const accountManager = await this.wallet.createAccount(accountData);
+            return accountManager.register();
+          }),
+        );
 
         // We set Alice as the FPC admin to avoid the need for deployment of another account.
         this.fpcAdmin = this.aliceAddress;
 
         const canonicalFeeJuice = await getCanonicalFeeJuice();
-        this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.aliceWallet);
+        this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.wallet);
       },
     );
   }
 
   async applyPublicDeployAccountsSnapshot() {
     await this.snapshotManager.snapshot('public_deploy_accounts', () =>
-      ensureAccountContractsPublished(this.aliceWallet, this.wallets),
+      ensureAccountContractsPublished(this.wallet, this.accounts),
     );
   }
 
@@ -225,7 +225,7 @@ export class FeesTest {
       async (_data, context) => {
         this.context = context;
 
-        this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.aliceWallet);
+        this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.wallet);
 
         this.getGasBalanceFn = getBalancesFn(
           '⛽',
@@ -239,7 +239,7 @@ export class FeesTest {
           aztecNodeAdmin: context.aztecNode,
           pxeService: context.pxe,
           l1Client: context.deployL1ContractsValues.l1Client,
-          wallet: this.aliceWallet,
+          wallet: this.wallet,
           logger: this.logger,
         });
       },
@@ -250,14 +250,14 @@ export class FeesTest {
     await this.snapshotManager.snapshot(
       'deploy_banana_token',
       async () => {
-        const bananaCoin = await BananaCoin.deploy(this.aliceWallet, this.aliceAddress, 'BC', 'BC', 18n)
+        const bananaCoin = await BananaCoin.deploy(this.wallet, this.aliceAddress, 'BC', 'BC', 18n)
           .send({ from: this.aliceAddress })
           .deployed();
         this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
         return { bananaCoinAddress: bananaCoin.address };
       },
       async ({ bananaCoinAddress }) => {
-        this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.aliceWallet);
+        this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.wallet);
         const logger = this.logger;
         this.getBananaPublicBalanceFn = getBalancesFn(
           '🍌.public',
@@ -283,7 +283,7 @@ export class FeesTest {
         expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
         const bananaCoin = this.bananaCoin;
-        const bananaFPC = await FPCContract.deploy(this.aliceWallet, bananaCoin.address, this.fpcAdmin)
+        const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin)
           .send({ from: this.aliceAddress })
           .deployed();
 
@@ -299,7 +299,7 @@ export class FeesTest {
         };
       },
       async (data, context) => {
-        const bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.aliceWallet);
+        const bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.wallet);
         this.bananaFPC = bananaFPC;
 
         this.getCoinbaseBalance = async () => {
@@ -358,7 +358,7 @@ export class FeesTest {
         };
       },
       async data => {
-        this.sponsoredFPC = await SponsoredFPCContract.at(data.sponsoredFPCAddress, this.aliceWallet);
+        this.sponsoredFPC = await SponsoredFPCContract.at(data.sponsoredFPCAddress, this.wallet);
       },
     );
   }

package/src/e2e_nested_contract/nested_contract_test.ts

@@ -1,5 +1,4 @@
-import { getSchnorrWallet } from '@aztec/accounts/schnorr';
-import { type AccountWallet, AztecAddress, type Logger, type PXE, createLogger } from '@aztec/aztec.js';
+import { AztecAddress, type Logger, type PXE, type Wallet, createLogger } from '@aztec/aztec.js';
 import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
 
@@ -16,7 +15,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
 export class NestedContractTest {
   private snapshotManager: ISnapshotManager;
   logger: Logger;
-  wallet!: AccountWallet;
+  wallet!: Wallet;
   defaultAccountAddress!: AztecAddress;
   pxe!: PXE;
 
@@ -40,12 +39,11 @@ export class NestedContractTest {
     await this.snapshotManager.snapshot(
       'accounts',
       deployAccounts(this.numberOfAccounts, this.logger),
-      async ({ deployedAccounts }, { pxe }) => {
-        const wallets = await Promise.all(deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)));
-        wallets.forEach((w, i) => this.logger.verbose(`Wallet ${i} address: ${w.getAddress()}`));
-        [this.wallet] = wallets;
-        this.defaultAccountAddress = this.wallet.getAddress();
+      ({ deployedAccounts }, { pxe, wallet }) => {
+        this.wallet = wallet;
+        [{ address: this.defaultAccountAddress }] = deployedAccounts;
         this.pxe = pxe;
+        return Promise.resolve();
       },
     );