@aztec/end-to-end 0.0.1-fake-c83136db25 → 0.0.1-fake-ceab37513c

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -1,10 +1,17 @@
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import type { AztecNodeConfig } from '@aztec/aztec-node';
-import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
-import { type Logger, createLogger } from '@aztec/aztec.js/log';
-import type { AztecNode } from '@aztec/aztec.js/node';
+import {
+  type AccountWallet,
+  AztecAddress,
+  type AztecNode,
+  type CompleteAddress,
+  EthAddress,
+  type Logger,
+  type PXE,
+  createLogger,
+} from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
 import {
-  type DeployL1ContractsArgs,
   type DeployL1ContractsReturnType,
   type ExtendedViemWalletClient,
   createExtendedL1Client,
@@ -14,7 +21,6 @@ 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/server';
 
 import { getContract } from 'viem';
 
@@ -26,7 +32,6 @@ import {
   deployAccounts,
   publicDeployAccounts,
 } from '../fixtures/snapshot_manager.js';
-import type { SetupOptions } from '../fixtures/utils.js';
 import { CrossChainTestHarness } from '../shared/cross_chain_test_harness.js';
 
 const { E2E_DATA_PATH: dataPath } = process.env;
@@ -34,19 +39,21 @@ const { E2E_DATA_PATH: dataPath } = process.env;
 export class CrossChainMessagingTest {
   private snapshotManager: ISnapshotManager;
   logger: Logger;
+  accounts: CompleteAddress[] = [];
   aztecNode!: AztecNode;
+  pxe!: PXE;
   aztecNodeConfig!: AztecNodeConfig;
   aztecNodeAdmin!: AztecNodeAdmin;
-  ctx!: SubsystemsContext;
 
   l1Client!: ExtendedViemWalletClient | undefined;
 
-  wallet!: TestWallet;
-  ownerAddress!: AztecAddress;
+  user1Wallet!: AccountWallet;
   user1Address!: AztecAddress;
+  user2Wallet!: AccountWallet;
   user2Address!: AztecAddress;
   crossChainTestHarness!: CrossChainTestHarness;
   ethAccount!: EthAddress;
+  ownerAddress!: AztecAddress;
   l2Token!: TokenContract;
   l2Bridge!: TokenBridgeContract;
 
@@ -56,12 +63,9 @@ export class CrossChainMessagingTest {
 
   deployL1ContractsValues!: DeployL1ContractsReturnType;
 
-  constructor(testName: string, opts: SetupOptions = {}, deployL1ContractsArgs: Partial<DeployL1ContractsArgs> = {}) {
+  constructor(testName: string) {
     this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
-    this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath, opts, {
-      initialValidators: [],
-      ...deployL1ContractsArgs,
-    });
+    this.snapshotManager = createSnapshotManager(`e2e_cross_chain_messaging/${testName}`, dataPath);
   }
 
   async assumeProven() {
@@ -69,13 +73,13 @@ export class CrossChainMessagingTest {
   }
 
   async setup() {
-    this.ctx = await this.snapshotManager.setup();
-    this.aztecNode = this.ctx.aztecNode;
-    this.wallet = this.ctx.wallet;
-    this.aztecNodeConfig = this.ctx.aztecNodeConfig;
-    this.cheatCodes = this.ctx.cheatCodes;
-    this.deployL1ContractsValues = this.ctx.deployL1ContractsValues;
-    this.aztecNodeAdmin = this.ctx.aztecNode;
+    const { aztecNode, pxe, aztecNodeConfig, deployL1ContractsValues } = await this.snapshotManager.setup();
+    this.aztecNode = aztecNode;
+    this.pxe = pxe;
+    this.aztecNodeConfig = aztecNodeConfig;
+    this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe);
+    this.deployL1ContractsValues = deployL1ContractsValues;
+    this.aztecNodeAdmin = aztecNode;
   }
 
   snapshot = <T>(
@@ -89,18 +93,25 @@ export class CrossChainMessagingTest {
   }
 
   async applyBaseSnapshots() {
-    // Note that we are using the same `wallet`, `aztecNodeConfig` and `aztecNode` across all snapshots.
+    // Note that we are using the same `pxe`, `aztecNodeConfig` and `aztecNode` across all snapshots.
     // This is to not have issues with different networks.
 
     await this.snapshotManager.snapshot(
       '3_accounts',
       deployAccounts(3, this.logger),
-      ({ deployedAccounts }, { wallet, aztecNodeConfig, aztecNode }) => {
-        [this.ownerAddress, this.user1Address, this.user2Address] = deployedAccounts.map(a => a.address);
-        this.wallet = wallet;
+      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();
+
+        this.pxe = pxe;
         this.aztecNode = aztecNode;
         this.aztecNodeConfig = aztecNodeConfig;
-        return Promise.resolve();
       },
     );
 
@@ -110,7 +121,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.wallet, [this.ownerAddress, this.user1Address, this.user2Address]);
+        await publicDeployAccounts(this.user1Wallet, this.accounts.slice(0, 3));
 
         this.l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
@@ -123,9 +134,10 @@ export class CrossChainMessagingTest {
         this.logger.verbose(`Setting up cross chain harness...`);
         this.crossChainTestHarness = await CrossChainTestHarness.new(
           this.aztecNode,
+          this.pxe,
           this.l1Client,
-          this.wallet,
-          this.ownerAddress,
+          this.user1Wallet,
+          this.user1Address,
           this.logger,
           underlyingERC20Address,
         );
@@ -135,11 +147,12 @@ export class CrossChainMessagingTest {
         return this.crossChainTestHarness.toCrossChainContext();
       },
       async crossChainContext => {
-        this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.wallet);
-        this.l2Bridge = await TokenBridgeContract.at(crossChainContext.l2Bridge, this.wallet);
+        this.l2Token = await TokenContract.at(crossChainContext.l2Token, this.user1Wallet);
+        this.l2Bridge = await TokenBridgeContract.at(crossChainContext.l2Bridge, this.user1Wallet);
 
         // 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);
@@ -157,6 +170,7 @@ export class CrossChainMessagingTest {
 
         this.crossChainTestHarness = new CrossChainTestHarness(
           this.aztecNode,
+          this.pxe,
           this.logger,
           this.l2Token,
           this.l2Bridge,
@@ -165,8 +179,8 @@ export class CrossChainMessagingTest {
           crossChainContext.underlying,
           l1Client,
           this.aztecNodeConfig.l1Contracts,
-          this.wallet,
-          this.ownerAddress,
+          this.user1Wallet,
+          this.user1Address,
         );
 
         this.l1Client = l1Client;

package/src/e2e_deploy_contract/deploy_test.ts

@@ -1,14 +1,20 @@
-import type { ContractArtifact } from '@aztec/aztec.js/abi';
-import type { AztecAddress } from '@aztec/aztec.js/addresses';
-import { type ContractBase, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
-import { Fr } from '@aztec/aztec.js/fields';
-import type { PublicKeys } from '@aztec/aztec.js/keys';
-import { type Logger, createLogger } from '@aztec/aztec.js/log';
-import type { AztecNode } from '@aztec/aztec.js/node';
-import type { Wallet } from '@aztec/aztec.js/wallet';
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
+import {
+  type AccountWallet,
+  type AztecAddress,
+  type AztecNode,
+  type ContractArtifact,
+  type ContractBase,
+  Fr,
+  type Logger,
+  type PXE,
+  type PublicKeys,
+  type Wallet,
+  createLogger,
+  getContractInstanceFromInstantiationParams,
+} from '@aztec/aztec.js';
 import type { StatefulTestContract } from '@aztec/noir-test-contracts.js/StatefulTest';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
-import type { TestWallet } from '@aztec/test-wallet/server';
 
 import { type ISnapshotManager, createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
 
@@ -17,7 +23,8 @@ const { E2E_DATA_PATH: dataPath } = process.env;
 export class DeployTest {
   private snapshotManager: ISnapshotManager;
   public logger: Logger;
-  public wallet!: TestWallet;
+  public pxe!: PXE;
+  public wallet!: AccountWallet;
   public defaultAccountAddress!: AztecAddress;
   public aztecNode!: AztecNode;
   public aztecNodeAdmin!: AztecNodeAdmin;
@@ -30,7 +37,7 @@ export class DeployTest {
   async setup() {
     await this.applyInitialAccountSnapshot();
     const context = await this.snapshotManager.setup();
-    ({ aztecNode: this.aztecNode, wallet: this.wallet } = context);
+    ({ pxe: this.pxe, aztecNode: this.aztecNode } = context);
     this.aztecNodeAdmin = context.aztecNode;
     return this;
   }
@@ -40,10 +47,16 @@ export class DeployTest {
   }
 
   private async applyInitialAccountSnapshot() {
-    await this.snapshotManager.snapshot('initial_account', deployAccounts(1, this.logger), ({ deployedAccounts }) => {
-      this.defaultAccountAddress = deployedAccounts[0].address;
-      return Promise.resolve();
-    });
+    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();
+      },
+    );
   }
 
   async registerContract<T extends ContractBase>(
@@ -61,13 +74,18 @@ export class DeployTest {
     const instance = await getContractInstanceFromInstantiationParams(contractArtifact.artifact, {
       constructorArgs: initArgs ?? [],
       constructorArtifact: constructorName,
-      salt: salt ?? Fr.random(),
+      salt,
       publicKeys,
       deployer,
     });
-    await wallet.registerContract(instance, contractArtifact.artifact);
+    await wallet.registerContract({ artifact: contractArtifact.artifact, instance });
     return contractArtifact.at(instance.address, wallet);
   }
+
+  async registerRandomAccount(): Promise<AztecAddress> {
+    const completeAddress = await this.pxe.registerAccount(Fr.random(), Fr.random());
+    return completeAddress.address;
+  }
 }
 
 export type StatefulContractCtorArgs = Parameters<StatefulTestContract['methods']['constructor']>;

package/src/e2e_epochs/epochs_test.ts

@@ -1,10 +1,14 @@
 import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
-import { getTimestampRangeForEpoch } from '@aztec/aztec.js/block';
-import { getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
-import { Fr } from '@aztec/aztec.js/fields';
-import type { Logger } from '@aztec/aztec.js/log';
-import { MerkleTreeId } from '@aztec/aztec.js/trees';
-import type { Wallet } from '@aztec/aztec.js/wallet';
+import {
+  Fr,
+  type Logger,
+  MerkleTreeId,
+  type Wallet,
+  getContractInstanceFromInstantiationParams,
+  getTimestampRangeForEpoch,
+  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';
@@ -12,8 +16,6 @@ import { ChainMonitor, DelayedTxUtils, type Delayer, waitUntilL1Timestamp, withD
 import { SecretValue } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { withLogNameSuffix } from '@aztec/foundation/log';
-import { retryUntil } from '@aztec/foundation/retry';
-import { sleep } from '@aztec/foundation/sleep';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
 import { ProverNode, type ProverNodeConfig, ProverNodePublisher } from '@aztec/prover-node';
@@ -186,14 +188,14 @@ export class EpochsTestContext {
     this.logger.warn('Creating and syncing a simulated prover node...');
     const proverNodePrivateKey = this.getNextPrivateKey();
     const suffix = (this.proverNodes.length + 1).toString();
+    const proverId = EthAddress.fromNumber(parseInt(suffix, 10));
     const proverNode = await withLogNameSuffix(suffix, () =>
       createAndSyncProverNode(
         proverNodePrivateKey,
-        { ...this.context.config },
+        { ...this.context.config, proverId },
         {
           dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')),
-          proverId: EthAddress.fromNumber(parseInt(suffix, 10)),
-          dontStart: opts.dontStart,
+          proverId,
           ...opts,
         },
         this.context.aztecNode,
@@ -352,7 +354,7 @@ export class EpochsTestContext {
       publicKeys: undefined,
       deployer: undefined,
     });
-    await wallet.registerContract(instance, SpamContract.artifact);
+    await wallet.registerContract({ artifact: SpamContract.artifact, instance });
     return SpamContract.at(instance.address, wallet);
   }
 

package/src/e2e_fees/bridging_race.notest.ts

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

package/src/e2e_fees/fees_test.ts

@@ -1,11 +1,17 @@
-import type { AztecAddress } from '@aztec/aztec.js/addresses';
-import { type Logger, createLogger } from '@aztec/aztec.js/log';
-import type { AztecNode } from '@aztec/aztec.js/node';
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
+import {
+  type AccountWallet,
+  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';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { sleep } from '@aztec/foundation/sleep';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
 import { AppSubscriptionContract } from '@aztec/noir-contracts.js/AppSubscription';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
@@ -16,7 +22,6 @@ 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/server';
 
 import { getContract } from 'viem';
 
@@ -51,14 +56,17 @@ const { E2E_DATA_PATH: dataPath } = process.env;
  */
 export class FeesTest {
   private snapshotManager: ISnapshotManager;
+  private wallets: AccountWallet[] = [];
   private accounts: AztecAddress[] = [];
 
   public logger: Logger;
+  public pxe!: PXE;
   public aztecNode!: AztecNode;
   public cheatCodes!: CheatCodes;
 
-  public wallet!: TestWallet;
+  public aliceWallet!: AccountWallet;
   public aliceAddress!: AztecAddress;
+  public bobWallet!: AccountWallet;
   public bobAddress!: AztecAddress;
   public sequencerAddress!: AztecAddress;
   public coinbase!: EthAddress;
@@ -165,7 +173,7 @@ export class FeesTest {
       .balance_of_private(address)
       .simulate({ from: this.aliceAddress });
 
-    await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, address, amount);
+    await mintTokensToPrivate(this.bananaCoin, this.aliceAddress, this.aliceWallet, address, amount);
 
     const balanceAfter = await this.bananaCoin.methods
       .balance_of_private(address)
@@ -184,27 +192,30 @@ export class FeesTest {
     await this.snapshotManager.snapshot(
       'initial_accounts',
       deployAccounts(this.numberOfAccounts, this.logger),
-      async ({ deployedAccounts }, { wallet, aztecNode, cheatCodes }) => {
-        this.wallet = wallet;
+      async ({ deployedAccounts }, { pxe, aztecNode, aztecNodeConfig }) => {
+        this.pxe = pxe;
+
         this.aztecNode = aztecNode;
         this.gasSettings = GasSettings.default({ maxFeesPerGas: (await this.aztecNode.getCurrentBaseFees()).mul(2) });
-        this.cheatCodes = cheatCodes;
-        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);
+        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;
 
         // 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.wallet);
+        this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.aliceWallet);
       },
     );
   }
 
   async applyPublicDeployAccountsSnapshot() {
     await this.snapshotManager.snapshot('public_deploy_accounts', () =>
-      ensureAccountContractsPublished(this.wallet, this.accounts),
+      ensureAccountContractsPublished(this.aliceWallet, this.wallets),
     );
   }
 
@@ -215,7 +226,7 @@ export class FeesTest {
       async (_data, context) => {
         this.context = context;
 
-        this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.wallet);
+        this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.aliceWallet);
 
         this.getGasBalanceFn = getBalancesFn(
           '⛽',
@@ -227,8 +238,9 @@ export class FeesTest {
         this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
           aztecNode: context.aztecNode,
           aztecNodeAdmin: context.aztecNode,
+          pxeService: context.pxe,
           l1Client: context.deployL1ContractsValues.l1Client,
-          wallet: this.wallet,
+          wallet: this.aliceWallet,
           logger: this.logger,
         });
       },
@@ -239,14 +251,14 @@ export class FeesTest {
     await this.snapshotManager.snapshot(
       'deploy_banana_token',
       async () => {
-        const bananaCoin = await BananaCoin.deploy(this.wallet, this.aliceAddress, 'BC', 'BC', 18n)
+        const bananaCoin = await BananaCoin.deploy(this.aliceWallet, 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.wallet);
+        this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.aliceWallet);
         const logger = this.logger;
         this.getBananaPublicBalanceFn = getBalancesFn(
           '🍌.public',
@@ -269,10 +281,10 @@ export class FeesTest {
       'fpc_setup',
       async context => {
         const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+        expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
         const bananaCoin = this.bananaCoin;
-        const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin)
+        const bananaFPC = await FPCContract.deploy(this.aliceWallet, bananaCoin.address, this.fpcAdmin)
           .send({ from: this.aliceAddress })
           .deployed();
 
@@ -288,7 +300,7 @@ export class FeesTest {
         };
       },
       async (data, context) => {
-        const bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.wallet);
+        const bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.aliceWallet);
         this.bananaFPC = bananaFPC;
 
         this.getCoinbaseBalance = async () => {
@@ -306,7 +318,7 @@ export class FeesTest {
         };
 
         this.getProverFee = async (blockNumber: number) => {
-          const block = await this.aztecNode.getBlock(blockNumber);
+          const block = await this.pxe.getBlock(blockNumber);
 
           // @todo @lherskind As we deal with #13601
           // Right now the value is from `FeeLib.sol`
@@ -337,9 +349,9 @@ export class FeesTest {
       'sponsored_fpc_setup',
       async context => {
         const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+        expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
-        const sponsoredFPC = await setupSponsoredFPC(this.wallet);
+        const sponsoredFPC = await setupSponsoredFPC(context.pxe);
         this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
 
         return {
@@ -347,7 +359,7 @@ export class FeesTest {
         };
       },
       async data => {
-        this.sponsoredFPC = await SponsoredFPCContract.at(data.sponsoredFPCAddress, this.wallet);
+        this.sponsoredFPC = await SponsoredFPCContract.at(data.sponsoredFPCAddress, this.aliceWallet);
       },
     );
   }

package/src/e2e_l1_publisher/write_json.ts

@@ -1,7 +1,5 @@
-import { AztecAddress } from '@aztec/aztec.js/addresses';
-import type { L2Block } from '@aztec/aztec.js/block';
-import { Fr } from '@aztec/aztec.js/fields';
-import { BatchedBlob, Blob, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
+import { AztecAddress, Fr, type L2Block } from '@aztec/aztec.js';
+import { BatchedBlob, Blob } from '@aztec/blob-lib';
 import { EthAddress } from '@aztec/foundation/eth-address';
 
 import { writeFile } from 'fs/promises';
@@ -34,18 +32,18 @@ export async function writeJson(
 
   const jsonObject = {
     populate: {
-      l1ToL2Content: l1ToL2Content.map(value => asHex(value)),
+      l1ToL2Content: l1ToL2Content.map(asHex),
       recipient: asHex(recipientAddress.toField()),
       sender: deployerAddress,
     },
     messages: {
-      l2ToL1Messages: block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs).map(value => asHex(value)),
+      l2ToL1Messages: block.body.txEffects.flatMap(txEffect => txEffect.l2ToL1Msgs).map(asHex),
     },
     block: {
       // The json formatting in forge is a bit brittle, so we convert Fr to a number in the few values below.
       // This should not be a problem for testing as long as the values are not larger than u32.
       archive: asHex(block.archive.root),
-      blobCommitments: getPrefixedEthBlobCommitments(blobs),
+      blobCommitments: Blob.getPrefixedEthBlobCommitments(blobs),
       batchedBlobInputs: batchedBlob.getEthBlobEvaluationInputs(),
       blockNumber: block.number,
       body: `0x${block.body.toBuffer().toString('hex')}`,
@@ -66,7 +64,7 @@ export async function writeJson(
         },
         totalManaUsed: block.header.totalManaUsed.toNumber(),
       },
-      headerHash: asHex(block.getCheckpointHeader().hash()),
+      headerHash: asHex(block.header.toPropose().hash()),
       numTxs: block.body.txEffects.length,
     },
   };

package/src/e2e_multi_validator/utils.ts

@@ -1,4 +1,4 @@
-import { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { AztecAddress } from '@aztec/aztec.js';
 import { getAddressFromPrivateKey } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { EthPrivateKey } from '@aztec/node-keystore';

package/src/e2e_nested_contract/nested_contract_test.ts

@@ -1,7 +1,5 @@
-import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { type Logger, createLogger } from '@aztec/aztec.js/log';
-import type { AztecNode } from '@aztec/aztec.js/node';
-import type { Wallet } from '@aztec/aztec.js/wallet';
+import { getSchnorrWallet } from '@aztec/accounts/schnorr';
+import { type AccountWallet, AztecAddress, type Logger, type PXE, createLogger } from '@aztec/aztec.js';
 import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
 import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
 
@@ -18,9 +16,9 @@ const { E2E_DATA_PATH: dataPath } = process.env;
 export class NestedContractTest {
   private snapshotManager: ISnapshotManager;
   logger: Logger;
-  wallet!: Wallet;
+  wallet!: AccountWallet;
   defaultAccountAddress!: AztecAddress;
-  aztecNode!: AztecNode;
+  pxe!: PXE;
 
   parentContract!: ParentContract;
   childContract!: ChildContract;
@@ -42,11 +40,12 @@ export class NestedContractTest {
     await this.snapshotManager.snapshot(
       'accounts',
       deployAccounts(this.numberOfAccounts, this.logger),
-      ({ deployedAccounts }, { wallet, aztecNode }) => {
-        this.wallet = wallet;
-        [{ address: this.defaultAccountAddress }] = deployedAccounts;
-        this.aztecNode = aztecNode;
-        return Promise.resolve();
+      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();
+        this.pxe = pxe;
       },
     );