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

package/src/fixtures/utils.ts

@@ -1,17 +1,9 @@
 import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
-import {
-  type InitialAccountData,
-  deployFundedSchnorrAccounts,
-  generateSchnorrAccounts,
-  getDeployedTestAccounts,
-  getDeployedTestAccountsWallets,
-} from '@aztec/accounts/testing';
+import { type InitialAccountData, generateSchnorrAccounts, getDeployedTestAccounts } from '@aztec/accounts/testing';
 import { type Archiver, createArchiver } from '@aztec/archiver';
 import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
 import {
-  AccountManager,
-  type AccountWalletWithSecretKey,
-  type AztecAddress,
+  AztecAddress,
   type AztecNode,
   BatchCall,
   type ContractMethod,
@@ -91,6 +83,7 @@ import {
   initTelemetryClient,
 } from '@aztec/telemetry-client';
 import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
+import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
 import type { Anvil } from '@viem/anvil';
@@ -246,15 +239,22 @@ async function setupWithRemoteEnvironment(
   const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxeClient!);
   const teardown = () => Promise.resolve();
 
-  logger.verbose('Constructing available wallets from already registered accounts...');
+  logger.verbose('Populating wallet from already registered accounts...');
   const initialFundedAccounts = await getDeployedTestAccounts(pxeClient);
-  const wallets = await getDeployedTestAccountsWallets(pxeClient);
+  const wallet = new TestWallet(pxeClient);
 
-  if (wallets.length < numberOfAccounts) {
-    throw new Error(`Required ${numberOfAccounts} accounts. Found ${wallets.length}.`);
+  if (initialFundedAccounts.length < numberOfAccounts) {
+    throw new Error(`Required ${numberOfAccounts} accounts. Found ${initialFundedAccounts.length}.`);
     // Deploy new accounts if there's a test that requires more funded accounts in the remote environment.
   }
 
+  const testAccounts = await Promise.all(
+    initialFundedAccounts.slice(0, numberOfAccounts).map(async account => {
+      const accountManager = await wallet.createSchnorrAccount(account.secret, account.salt, account.signingKey);
+      return accountManager.getAddress();
+    }),
+  );
+
   return {
     aztecNode,
     aztecNodeAdmin: undefined,
@@ -264,9 +264,8 @@ async function setupWithRemoteEnvironment(
     deployL1ContractsValues,
     config,
     initialFundedAccounts,
-    wallets,
-    wallet: wallets[0],
-    accounts: wallets.slice(0, numberOfAccounts).map(w => w.getAddress()),
+    wallet,
+    accounts: testAccounts,
     logger,
     cheatCodes,
     ethCheatCodes,
@@ -346,11 +345,9 @@ export type EndToEndContext = {
   config: AztecNodeConfig;
   /** The data for the initial funded accounts. */
   initialFundedAccounts: InitialAccountData[];
-  /* Wallets created for the initial funded accounts, with secret keys. */
-  wallets: AccountWalletWithSecretKey[];
-  /** The first wallet to be used. */
-  wallet: AccountWalletWithSecretKey;
-  /** The accounts to be used. */
+  /** The wallet to be used. */
+  wallet: TestWallet;
+  /** The wallets to be used. */
   accounts: AztecAddress[];
   /** Logger instance named as the current test. */
   logger: Logger;
@@ -666,15 +663,16 @@ export async function setup(
       (opts.aztecTargetCommitteeSize && opts.aztecTargetCommitteeSize > 0) ||
       (opts.initialValidators && opts.initialValidators.length > 0)
     ) {
-      // We need to advance to epoch 2 such that the committee is set up.
-      logger.info(`Advancing to epoch 2`);
-      await cheatCodes.rollup.advanceToEpoch(2n, { updateDateProvider: dateProvider });
+      // We need to advance such that the committee is set up.
+      await cheatCodes.rollup.advanceToEpoch((await cheatCodes.rollup.getEpoch()) + BigInt(config.lagInEpochs + 1), {
+        updateDateProvider: dateProvider,
+      });
       await cheatCodes.rollup.setupEpoch();
       await cheatCodes.rollup.debugRollup();
     }
-
+    const wallet = new TestWallet(pxe);
+    let accounts: AztecAddress[] = [];
     // Below we continue with what we described in the long comment on line 571.
-    let accountManagers: AccountManager[] = [];
     if (numberOfAccounts === 0) {
       logger.info('No accounts are being deployed, waiting for an empty block 1 to be mined');
       while ((await pxe.getBlockNumber()) === 0) {
@@ -684,13 +682,14 @@ export async function setup(
       logger.info(
         `${numberOfAccounts} accounts are being deployed. Reliably progressing past genesis by setting minTxsPerBlock to 1 and waiting for the accounts to be deployed`,
       );
-      accountManagers = await deployFundedSchnorrAccounts(pxe, initialFundedAccounts.slice(0, numberOfAccounts));
+      const accountsData = initialFundedAccounts.slice(0, numberOfAccounts);
+      const accountManagers = await deployFundedSchnorrAccounts(wallet, accountsData);
+      accounts = accountManagers.map(accountManager => accountManager.getAddress());
     }
 
     // Now we restore the original minTxsPerBlock setting.
     sequencerClient!.getSequencer().updateConfig({ minTxsPerBlock: originalMinTxsPerBlock });
 
-    const wallets = await Promise.all(accountManagers.map(account => account.getWallet()));
     if (initialFundedAccounts.length < numberOfAccounts) {
       // TODO: Create (numberOfAccounts - initialFundedAccounts.length) wallets without funds.
       throw new Error(
@@ -741,9 +740,8 @@ export async function setup(
       sequencer: sequencerClient,
       teardown,
       telemetryClient: telemetry,
-      wallets,
-      wallet: wallets[0],
-      accounts: wallets.map(w => w.getAddress()),
+      wallet,
+      accounts,
       watcher,
     };
   } catch (err) {
@@ -761,15 +759,14 @@ export async function setup(
  */
 
 // docs:start:public_deploy_accounts
-export async function ensureAccountContractsPublished(sender: Wallet, accountsToDeploy: Wallet[]) {
+export async function ensureAccountContractsPublished(wallet: Wallet, accountsToDeploy: AztecAddress[]) {
   // We have to check whether the accounts are already deployed. This can happen if the test runs against
   // the sandbox and the test accounts exist
   const accountsAndAddresses = await Promise.all(
-    accountsToDeploy.map(async account => {
-      const address = account.getAddress();
+    accountsToDeploy.map(async address => {
       return {
         address,
-        deployed: (await sender.getContractMetadata(address)).isContractPublished,
+        deployed: (await wallet.getContractMetadata(address)).isContractPublished,
       };
     }),
   );
@@ -777,18 +774,18 @@ export async function ensureAccountContractsPublished(sender: Wallet, accountsTo
     await Promise.all(
       accountsAndAddresses
         .filter(({ deployed }) => !deployed)
-        .map(({ address }) => sender.getContractMetadata(address)),
+        .map(({ address }) => wallet.getContractMetadata(address)),
     )
   ).map(contractMetadata => contractMetadata.contractInstance);
   const contractClass = await getContractClassFromArtifact(SchnorrAccountContractArtifact);
-  if (!(await sender.getContractClassMetadata(contractClass.id, true)).isContractClassPubliclyRegistered) {
-    await (await publishContractClass(sender, SchnorrAccountContractArtifact))
-      .send({ from: accountsToDeploy[0].getAddress() })
+  if (!(await wallet.getContractClassMetadata(contractClass.id, true)).isContractClassPubliclyRegistered) {
+    await (await publishContractClass(wallet, SchnorrAccountContractArtifact))
+      .send({ from: accountsToDeploy[0] })
       .wait();
   }
-  const requests = await Promise.all(instances.map(async instance => await publishInstance(sender, instance!)));
-  const batch = new BatchCall(sender, requests);
-  await batch.send({ from: accountsToDeploy[0].getAddress() }).wait();
+  const requests = await Promise.all(instances.map(async instance => await publishInstance(wallet, instance!)));
+  const batch = new BatchCall(wallet, requests);
+  await batch.send({ from: accountsToDeploy[0] }).wait();
 }
 // docs:end:public_deploy_accounts
 
@@ -908,7 +905,7 @@ export async function setupSponsoredFPC(pxe: PXE) {
  * Registers the SponsoredFPC in this PXE instance
  * @param pxe - The pxe client
  */
-export async function registerSponsoredFPC(pxe: PXE): Promise<void> {
+export async function registerSponsoredFPC(pxe: PXE | Wallet): Promise<void> {
   await pxe.registerContract({ instance: await getSponsoredFPCInstance(), artifact: SponsoredFPCContract.artifact });
 }
 

package/src/shared/cross_chain_test_harness.ts

@@ -1,6 +1,5 @@
 // docs:start:cross_chain_test_harness
 import {
-  type AccountWallet,
   AuthWitness,
   type AztecAddress,
   type AztecNode,
@@ -134,7 +133,7 @@ export class CrossChainTestHarness {
     aztecNode: AztecNode,
     pxeService: PXE,
     l1Client: ExtendedViemWalletClient,
-    wallet: AccountWallet,
+    wallet: Wallet,
     ownerAddress: AztecAddress,
     logger: Logger,
     underlyingERC20Address: EthAddress,
@@ -148,7 +147,7 @@ export class CrossChainTestHarness {
       wallet,
       l1Client,
       l1ContractAddresses.registryAddress,
-      wallet.getAddress(),
+      ownerAddress,
       underlyingERC20Address,
     );
     logger.info('Deployed and initialized token, portal and its bridge.');
@@ -198,8 +197,8 @@ export class CrossChainTestHarness {
     /** Deployment addresses for all L1 contracts */
     public readonly l1ContractAddresses: L1ContractAddresses,
 
-    /** Wallet of the owner. */
-    public readonly ownerWallet: AccountWallet,
+    /** Wallet to simulate and send txs from. */
+    public readonly wallet: Wallet,
 
     /** Owner of the l2 token and bridge */
     public readonly ownerAddress: AztecAddress,
@@ -213,7 +212,6 @@ export class CrossChainTestHarness {
       this.logger,
     );
     this.l1TokenManager = this.l1TokenPortalManager.getTokenManager();
-    this.ownerAddress = this.ownerWallet.getAddress();
   }
 
   async mintTokensOnL1(amount: bigint) {
@@ -246,7 +244,7 @@ export class CrossChainTestHarness {
   }
 
   async mintTokensPrivateOnL2(amount: bigint) {
-    await mintTokensToPrivate(this.l2Token, this.ownerAddress, this.ownerWallet, this.ownerAddress, amount);
+    await mintTokensToPrivate(this.l2Token, this.ownerAddress, this.ownerAddress, amount);
   }
 
   async sendL2PublicTransfer(transferAmount: bigint, receiverAddress: AztecAddress) {

package/src/shared/gas_portal_test_harness.ts

@@ -1,5 +1,5 @@
 import {
-  type AztecAddress,
+  AztecAddress,
   type AztecNode,
   EthAddress,
   Fr,

package/src/shared/submit-transactions.ts

@@ -1,20 +1,19 @@
-import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { Fr, GrumpkinScalar, type Logger, type SentTx, TxStatus, type Wallet } from '@aztec/aztec.js';
+import { AztecAddress, Fr, GrumpkinScalar, type Logger, type SentTx, TxStatus } from '@aztec/aztec.js';
 import { times } from '@aztec/foundation/collection';
-import type { PXEService } from '@aztec/pxe/server';
+import type { TestWallet } from '@aztec/test-wallet';
 
-// submits a set of transactions to the provided Private eXecution Environment (PXE)
+// submits a set of transactions to the provided Wallet
 export const submitTxsTo = async (
-  pxe: PXEService,
+  wallet: TestWallet,
+  submitter: AztecAddress,
   numTxs: number,
-  wallet: Wallet,
   logger: Logger,
 ): Promise<SentTx[]> => {
   const txs: SentTx[] = [];
   await Promise.all(
     times(numTxs, async () => {
-      const accountManager = await getSchnorrAccount(pxe, Fr.random(), GrumpkinScalar.random(), Fr.random());
-      const tx = accountManager.deploy({ deployWallet: wallet });
+      const accountManager = await wallet.createSchnorrAccount(Fr.random(), Fr.random(), GrumpkinScalar.random());
+      const tx = accountManager.deploy({ deployAccount: submitter });
       const txHash = await tx.getTxHash();
 
       logger.info(`Tx sent with hash ${txHash}`);

package/src/shared/uniswap_l1_l2.ts

@@ -1,11 +1,11 @@
 import {
-  type AccountWallet,
   AztecAddress,
   type AztecNode,
   EthAddress,
   Fr,
   type Logger,
   type PXE,
+  type Wallet,
   computeAuthWitMessageHash,
   generateClaimSecret,
 } from '@aztec/aztec.js';
@@ -49,10 +49,12 @@ export type UniswapSetupContext = {
   logger: Logger;
   /** The L1 wallet client, extended with public actions. */
   l1Client: ExtendedViemWalletClient;
-  /** The owner wallet. */
-  ownerWallet: AccountWallet;
+  /** The wallet. */
+  wallet: Wallet;
+  /** The owner address. */
+  ownerAddress: AztecAddress;
   /** The sponsor wallet. */
-  sponsorWallet: AccountWallet;
+  sponsorAddress: AztecAddress;
   /**  */
   deployL1ContractsValues: DeployL1ContractsReturnType;
   /** Cheat codes instance. */
@@ -78,11 +80,10 @@ export const uniswapL1L2TestSuite = (
 
     let l1Client: ExtendedViemWalletClient;
 
-    let ownerWallet: AccountWallet;
+    let wallet: Wallet;
     let ownerAddress: AztecAddress;
     let ownerEthAddress: EthAddress;
     // does transactions on behalf of owner on Aztec:
-    let sponsorWallet: AccountWallet;
     let sponsorAddress: AztecAddress;
 
     let daiCrossChainHarness: CrossChainTestHarness;
@@ -101,7 +102,7 @@ export const uniswapL1L2TestSuite = (
     let cheatCodes: CheatCodes;
     let version: number;
     beforeAll(async () => {
-      ({ aztecNode, pxe, logger, l1Client, ownerWallet, sponsorWallet, deployL1ContractsValues, cheatCodes } =
+      ({ aztecNode, pxe, logger, l1Client, wallet, ownerAddress, sponsorAddress, deployL1ContractsValues, cheatCodes } =
         await setup());
 
       if (Number(await l1Client.getBlockNumber()) < expectedForkBlockNumber) {
@@ -113,18 +114,16 @@ export const uniswapL1L2TestSuite = (
         deployL1ContractsValues.l1ContractAddresses.rollupAddress,
       );
       version = Number(await rollup.getVersion());
-      ownerAddress = ownerWallet.getAddress();
-      sponsorAddress = sponsorWallet.getAddress();
       ownerEthAddress = EthAddress.fromString((await l1Client.getAddresses())[0]);
 
-      await ensureAccountContractsPublished(ownerWallet, [ownerWallet, sponsorWallet]);
+      await ensureAccountContractsPublished(wallet, [ownerAddress, sponsorAddress]);
 
       logger.info('Deploying DAI Portal, initializing and deploying l2 contract...');
       daiCrossChainHarness = await CrossChainTestHarness.new(
         aztecNode,
         pxe,
         deployL1ContractsValues.l1Client,
-        ownerWallet,
+        wallet,
         ownerAddress,
         logger,
         DAI_ADDRESS,
@@ -135,7 +134,7 @@ export const uniswapL1L2TestSuite = (
         aztecNode,
         pxe,
         l1Client,
-        ownerWallet,
+        wallet,
         ownerAddress,
         logger,
         WETH9_ADDRESS,
@@ -152,7 +151,7 @@ export const uniswapL1L2TestSuite = (
         client: l1Client,
       });
       // deploy l2 uniswap contract and attach to portal
-      uniswapL2Contract = await UniswapContract.deploy(ownerWallet, uniswapPortalAddress)
+      uniswapL2Contract = await UniswapContract.deploy(wallet, uniswapPortalAddress)
         .send({ from: ownerAddress })
         .deployed();
 
@@ -206,7 +205,7 @@ export const uniswapL1L2TestSuite = (
       // 3. Owner gives uniswap approval to transfer the funds to public to self on its behalf
       logger.info('Approving uniswap to transfer funds to public to self on my behalf');
       const nonceForWETHTransferToPublicApproval = new Fr(1n);
-      const transferToPublicAuhtwit = await ownerWallet.createAuthWit({
+      const transferToPublicAuhtwit = await wallet.createAuthWit(ownerAddress, {
         caller: uniswapL2Contract.address,
         action: wethCrossChainHarness.l2Token.methods.transfer_to_public(
           ownerAddress,
@@ -622,7 +621,7 @@ export const uniswapL1L2TestSuite = (
             nonceForWETHTransferToPublicApproval,
           ),
         },
-        { chainId: ownerWallet.getChainId(), version: ownerWallet.getVersion() },
+        { chainId: new Fr(await aztecNode.getChainId()), version: new Fr(await aztecNode.getVersion()) },
       );
 
       await expect(
@@ -650,7 +649,7 @@ export const uniswapL1L2TestSuite = (
       // 2. owner gives uniswap approval to transfer the funds to public:
       logger.info('Approving uniswap to transfer funds to public to self on my behalf');
       const nonceForWETHTransferToPublicApproval = new Fr(3n);
-      const transferToPublicAuthwith = await ownerWallet.createAuthWit({
+      const transferToPublicAuthwith = await wallet.createAuthWit(ownerAddress, {
         caller: uniswapL2Contract.address,
         action: wethCrossChainHarness.l2Token.methods.transfer_to_public(
           ownerAddress,
@@ -687,7 +686,8 @@ export const uniswapL1L2TestSuite = (
 
       // 2. Give approval to uniswap to transfer funds to itself
       const nonceForWETHTransferApproval = new Fr(2n);
-      const validateActionInteraction = await ownerWallet.setPublicAuthWit(
+      const validateActionInteraction = await wallet.setPublicAuthWit(
+        ownerAddress,
         {
           caller: uniswapL2Contract.address,
           action: wethCrossChainHarness.l2Token.methods.transfer_in_public(
@@ -731,22 +731,24 @@ export const uniswapL1L2TestSuite = (
       const nonceForWETHTransferApproval = new Fr(3n);
       const nonceForSwap = new Fr(3n);
       const secretHashForDepositingSwappedDai = new Fr(4n);
-      const action = uniswapL2Contract
-        .withWallet(sponsorWallet)
-        .methods.swap_public(
-          ownerAddress,
-          wethCrossChainHarness.l2Bridge.address,
-          wethAmountToBridge,
-          daiCrossChainHarness.l2Bridge.address,
-          nonceForWETHTransferApproval,
-          uniswapFeeTier,
-          minimumOutputAmount,
-          ownerAddress,
-          secretHashForDepositingSwappedDai,
-          ownerEthAddress,
-          nonceForSwap,
-        );
-      const validateActionInteraction = await ownerWallet.setPublicAuthWit({ caller: approvedUser, action }, true);
+      const action = uniswapL2Contract.methods.swap_public(
+        ownerAddress,
+        wethCrossChainHarness.l2Bridge.address,
+        wethAmountToBridge,
+        daiCrossChainHarness.l2Bridge.address,
+        nonceForWETHTransferApproval,
+        uniswapFeeTier,
+        minimumOutputAmount,
+        ownerAddress,
+        secretHashForDepositingSwappedDai,
+        ownerEthAddress,
+        nonceForSwap,
+      );
+      const validateActionInteraction = await wallet.setPublicAuthWit(
+        ownerAddress,
+        { caller: approvedUser, action },
+        true,
+      );
       await validateActionInteraction.send({ from: ownerAddress }).wait();
 
       await expect(action.simulate({ from: sponsorAddress })).rejects.toThrow(/unauthorized/);
@@ -756,7 +758,8 @@ export const uniswapL1L2TestSuite = (
       // swap should fail since no transfer approval to uniswap:
       const nonceForWETHTransferApproval = new Fr(4n);
 
-      const validateActionInteraction = await ownerWallet.setPublicAuthWit(
+      const validateActionInteraction = await wallet.setPublicAuthWit(
+        ownerAddress,
         {
           caller: uniswapL2Contract.address,
           action: wethCrossChainHarness.l2Token.methods.transfer_in_public(
@@ -798,7 +801,7 @@ export const uniswapL1L2TestSuite = (
       // Owner gives uniswap approval to transfer the funds to public to self on its behalf
       logger.info('Approving uniswap to transfer the funds to public to self on my behalf');
       const nonceForWETHTransferToPublicApproval = new Fr(4n);
-      const transferToPublicAuhtwit = await ownerWallet.createAuthWit({
+      const transferToPublicAuhtwit = await wallet.createAuthWit(ownerAddress, {
         caller: uniswapL2Contract.address,
         action: wethCrossChainHarness.l2Token.methods.transfer_to_public(
           ownerAddress,
@@ -926,7 +929,8 @@ export const uniswapL1L2TestSuite = (
 
       // Owner gives uniswap approval to transfer funds on its behalf
       const nonceForWETHTransferApproval = new Fr(5n);
-      const validateActionInteraction = await ownerWallet.setPublicAuthWit(
+      const validateActionInteraction = await wallet.setPublicAuthWit(
+        ownerAddress,
         {
           caller: uniswapL2Contract.address,
           action: wethCrossChainHarness.l2Token.methods.transfer_in_public(

package/src/simulators/lending_simulator.ts

@@ -190,7 +190,7 @@ export class LendingSimulator {
     expect(asset['last_updated_ts']).toEqual(BigInt(this.time));
 
     for (const key of [this.account.address, AztecAddress.fromField(await this.account.key())]) {
-      const privatePos = await this.lendingContract.methods.get_position(key).simulate({ from: key });
+      const privatePos = await this.lendingContract.methods.get_position(key).simulate({ from: this.account.address });
       expect(new Fr(privatePos['collateral'])).toEqual(this.collateral[key.toString()] ?? Fr.ZERO);
       expect(new Fr(privatePos['static_debt'])).toEqual(this.staticDebt[key.toString()] ?? Fr.ZERO);
       expect(privatePos['debt']).toEqual(