@aztec/end-to-end 3.0.0-nightly.20250922 → 3.0.0-nightly.20250923

package/dest/spartan/setup_test_wallets.js

@@ -15,12 +15,11 @@ export async function setupTestAccountsWithTokens(pxeUrl, nodeUrl, mintAmount, l
     const pxe = await createCompatibleClient(pxeUrl, logger);
     const aztecNode = createAztecNodeClient(nodeUrl);
     const wallet = new TestWallet(pxe, aztecNode);
-    const [recipientAccount, ...accounts] = (await getDeployedTestAccounts(pxe)).slice(0, ACCOUNT_COUNT + 1);
+    const [recipientAccount, ...accounts] = (await getDeployedTestAccounts(wallet)).slice(0, ACCOUNT_COUNT + 1);
     const tokenAdmin = accounts[0];
     const tokenAddress = await deployTokenAndMint(wallet, accounts.map((acc)=>acc.address), tokenAdmin.address, mintAmount, undefined, logger);
     const tokenContract = await TokenContract.at(tokenAddress, wallet);
     return {
-        pxe,
         aztecNode,
         accounts: accounts.map((acc)=>acc.address),
         wallet,
@@ -31,8 +30,7 @@ export async function setupTestAccountsWithTokens(pxeUrl, nodeUrl, mintAmount, l
         recipientAddress: recipientAccount.address
     };
 }
-export async function deploySponsoredTestAccounts(pxe, aztecNode, mintAmount, logger, numberOfFundedWallets = 1) {
-    const wallet = new TestWallet(pxe, aztecNode);
+export async function deploySponsoredTestAccounts(wallet, aztecNode, mintAmount, logger, numberOfFundedWallets = 1) {
     const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
     const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
     const fundedAccounts = await Promise.all(funded.map((a)=>wallet.createSchnorrAccount(a.secret, a.salt)));
@@ -52,7 +50,6 @@ export async function deploySponsoredTestAccounts(pxe, aztecNode, mintAmount, lo
     const tokenAddress = await deployTokenAndMint(wallet, fundedAccounts.map((acc)=>acc.getAddress()), tokenAdmin.getAddress(), mintAmount, new SponsoredFeePaymentMethod(await getSponsoredFPCAddress()), logger);
     const tokenContract = await TokenContract.at(tokenAddress, wallet);
     return {
-        pxe,
         aztecNode,
         wallet,
         accounts: fundedAccounts.map((acc)=>acc.getAddress()),
@@ -70,7 +67,7 @@ export async function deployTestAccountsWithTokens(pxeUrl, nodeUrl, l1RpcUrls, m
     const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
     const recipientAccount = await wallet.createSchnorrAccount(recipient.secret, recipient.salt);
     const fundedAccounts = await Promise.all(funded.map((a)=>wallet.createSchnorrAccount(a.secret, a.salt)));
-    const claims = await Promise.all(fundedAccounts.map((a)=>bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, aztecNode, a.getAddress(), undefined, logger)));
+    const claims = await Promise.all(fundedAccounts.map((a)=>bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, aztecNode, a.getAddress(), undefined, logger)));
     // Progress by 3 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
     await advanceL2Block(aztecNode);
     await advanceL2Block(aztecNode);
@@ -88,7 +85,6 @@ export async function deployTestAccountsWithTokens(pxeUrl, nodeUrl, l1RpcUrls, m
     const tokenAddress = await deployTokenAndMint(wallet, fundedAccounts.map((acc)=>acc.getAddress()), tokenAdmin.getAddress(), mintAmount, undefined, logger);
     const tokenContract = await TokenContract.at(tokenAddress, wallet);
     return {
-        pxe,
         aztecNode,
         wallet,
         accounts: fundedAccounts.map((acc)=>acc.getAddress()),
@@ -99,7 +95,7 @@ export async function deployTestAccountsWithTokens(pxeUrl, nodeUrl, l1RpcUrls, m
         recipientAddress: recipientAccount.getAddress()
     };
 }
-async function bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, aztecNode, recipient, amount, log) {
+async function bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, aztecNode, recipient, amount, log) {
     const { l1ChainId } = await aztecNode.getNodeInfo();
     const chain = createEthereumChain(l1RpcUrls, l1ChainId);
     const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
@@ -169,21 +165,23 @@ export async function performTransfers({ testAccounts, rounds, transferAmount, l
         logger.info(`Completed round ${i + 1} / ${rounds}`);
     }
 }
-export async function startCompatiblePXE(nodeUrl, proverEnabled, logger) {
-    const node = createAztecNodeClient(nodeUrl);
+export async function createWalletAndAztecNodeClient(nodeUrl, proverEnabled, logger) {
+    const aztecNode = createAztecNodeClient(nodeUrl);
     const [bbConfig, acvmConfig] = await Promise.all([
         getBBConfig(logger),
         getACVMConfig(logger)
     ]);
-    const pxe = await createPXEService(node, {
+    const pxe = await createPXEService(aztecNode, {
         dataDirectory: undefined,
         dataStoreMapSizeKB: 1024 * 1024,
         ...bbConfig,
         ...acvmConfig,
         proverEnabled
     });
+    const wallet = new TestWallet(pxe, aztecNode);
     return {
-        pxe,
+        wallet,
+        aztecNode,
         async cleanup () {
             await pxe.stop();
             await bbConfig?.cleanup();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "3.0.0-nightly.20250922",
+  "version": "3.0.0-nightly.20250923",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,42 +25,42 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "3.0.0-nightly.20250922",
-    "@aztec/archiver": "3.0.0-nightly.20250922",
-    "@aztec/aztec": "3.0.0-nightly.20250922",
-    "@aztec/aztec-node": "3.0.0-nightly.20250922",
-    "@aztec/aztec.js": "3.0.0-nightly.20250922",
-    "@aztec/bb-prover": "3.0.0-nightly.20250922",
-    "@aztec/blob-lib": "3.0.0-nightly.20250922",
-    "@aztec/blob-sink": "3.0.0-nightly.20250922",
-    "@aztec/bot": "3.0.0-nightly.20250922",
-    "@aztec/cli": "3.0.0-nightly.20250922",
-    "@aztec/constants": "3.0.0-nightly.20250922",
-    "@aztec/entrypoints": "3.0.0-nightly.20250922",
-    "@aztec/epoch-cache": "3.0.0-nightly.20250922",
-    "@aztec/ethereum": "3.0.0-nightly.20250922",
-    "@aztec/foundation": "3.0.0-nightly.20250922",
-    "@aztec/kv-store": "3.0.0-nightly.20250922",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250922",
-    "@aztec/merkle-tree": "3.0.0-nightly.20250922",
-    "@aztec/node-keystore": "3.0.0-nightly.20250922",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20250922",
-    "@aztec/noir-noirc_abi": "3.0.0-nightly.20250922",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250922",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250922",
-    "@aztec/p2p": "3.0.0-nightly.20250922",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250922",
-    "@aztec/prover-client": "3.0.0-nightly.20250922",
-    "@aztec/prover-node": "3.0.0-nightly.20250922",
-    "@aztec/pxe": "3.0.0-nightly.20250922",
-    "@aztec/sequencer-client": "3.0.0-nightly.20250922",
-    "@aztec/simulator": "3.0.0-nightly.20250922",
-    "@aztec/slasher": "3.0.0-nightly.20250922",
-    "@aztec/stdlib": "3.0.0-nightly.20250922",
-    "@aztec/telemetry-client": "3.0.0-nightly.20250922",
-    "@aztec/test-wallet": "3.0.0-nightly.20250922",
-    "@aztec/validator-client": "3.0.0-nightly.20250922",
-    "@aztec/world-state": "3.0.0-nightly.20250922",
+    "@aztec/accounts": "3.0.0-nightly.20250923",
+    "@aztec/archiver": "3.0.0-nightly.20250923",
+    "@aztec/aztec": "3.0.0-nightly.20250923",
+    "@aztec/aztec-node": "3.0.0-nightly.20250923",
+    "@aztec/aztec.js": "3.0.0-nightly.20250923",
+    "@aztec/bb-prover": "3.0.0-nightly.20250923",
+    "@aztec/blob-lib": "3.0.0-nightly.20250923",
+    "@aztec/blob-sink": "3.0.0-nightly.20250923",
+    "@aztec/bot": "3.0.0-nightly.20250923",
+    "@aztec/cli": "3.0.0-nightly.20250923",
+    "@aztec/constants": "3.0.0-nightly.20250923",
+    "@aztec/entrypoints": "3.0.0-nightly.20250923",
+    "@aztec/epoch-cache": "3.0.0-nightly.20250923",
+    "@aztec/ethereum": "3.0.0-nightly.20250923",
+    "@aztec/foundation": "3.0.0-nightly.20250923",
+    "@aztec/kv-store": "3.0.0-nightly.20250923",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20250923",
+    "@aztec/merkle-tree": "3.0.0-nightly.20250923",
+    "@aztec/node-keystore": "3.0.0-nightly.20250923",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20250923",
+    "@aztec/noir-noirc_abi": "3.0.0-nightly.20250923",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250923",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250923",
+    "@aztec/p2p": "3.0.0-nightly.20250923",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250923",
+    "@aztec/prover-client": "3.0.0-nightly.20250923",
+    "@aztec/prover-node": "3.0.0-nightly.20250923",
+    "@aztec/pxe": "3.0.0-nightly.20250923",
+    "@aztec/sequencer-client": "3.0.0-nightly.20250923",
+    "@aztec/simulator": "3.0.0-nightly.20250923",
+    "@aztec/slasher": "3.0.0-nightly.20250923",
+    "@aztec/stdlib": "3.0.0-nightly.20250923",
+    "@aztec/telemetry-client": "3.0.0-nightly.20250923",
+    "@aztec/test-wallet": "3.0.0-nightly.20250923",
+    "@aztec/validator-client": "3.0.0-nightly.20250923",
+    "@aztec/world-state": "3.0.0-nightly.20250923",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -57,7 +57,6 @@ export class ClientFlowsBenchmark {
   private snapshotManager: ISnapshotManager;
 
   public logger: Logger;
-  private pxe!: PXE;
   public aztecNode!: AztecNode;
   public cheatCodes!: CheatCodes;
   public context!: SubsystemsContext;
@@ -202,12 +201,11 @@ export class ClientFlowsBenchmark {
       deployAccounts(2, this.logger),
       async (
         { deployedAccounts: [{ address: adminAddress }, { address: sequencerAddress }] },
-        { wallet, pxe, aztecNode, aztecNodeConfig },
+        { wallet, aztecNode, aztecNodeConfig },
       ) => {
-        this.pxe = pxe;
         this.adminWallet = wallet;
         this.aztecNode = aztecNode;
-        this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
+        this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, wallet, aztecNode);
 
         this.adminAddress = adminAddress;
         this.sequencerAddress = sequencerAddress;
@@ -246,7 +244,6 @@ export class ClientFlowsBenchmark {
         this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
           aztecNode: context.aztecNode,
           aztecNodeAdmin: context.aztecNode,
-          pxeService: context.pxe,
           l1Client: context.deployL1ContractsValues.l1Client,
           wallet: this.adminWallet,
           logger: this.logger,
@@ -292,7 +289,7 @@ export class ClientFlowsBenchmark {
       'fpc_setup',
       async context => {
         const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+        expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
         const bananaCoin = this.bananaCoin;
         const bananaFPC = await FPCContract.deploy(this.adminWallet, bananaCoin.address, this.adminAddress)
@@ -315,7 +312,7 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_sponsored_fpc',
       async () => {
-        const sponsoredFPC = await setupSponsoredFPC(this.pxe);
+        const sponsoredFPC = await setupSponsoredFPC(this.adminWallet);
         this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
         return { sponsoredFPCAddress: sponsoredFPC.address };
       },
@@ -337,7 +334,6 @@ export class ClientFlowsBenchmark {
     this.logger.verbose(`Setting up cross chain harness...`);
     const crossChainTestHarness = await CrossChainTestHarness.new(
       this.aztecNode,
-      this.pxe,
       l1Client,
       this.adminWallet,
       owner,

package/src/bench/utils.ts

@@ -1,8 +1,7 @@
 import type { AztecNodeService } from '@aztec/aztec-node';
-import { type AztecNode, BatchCall, type SentTx, type WaitOpts } from '@aztec/aztec.js';
+import { BatchCall, type SentTx, type WaitOpts } from '@aztec/aztec.js';
 import { mean, stdDev, times } from '@aztec/foundation/collection';
 import { BenchmarkingContract } from '@aztec/noir-test-contracts.js/Benchmarking';
-import { type PXEService, type PXEServiceConfig, createPXEService } from '@aztec/pxe/server';
 import type { MetricsType } from '@aztec/telemetry-client';
 import type { BenchmarkDataPoint, BenchmarkMetricsType, BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
 
@@ -150,32 +149,6 @@ export async function waitTxs(txs: SentTx[], context: EndToEndContext, txWaitOpt
   context.logger.info(`All ${txs.length} txs have been mined`);
 }
 
-/**
- * Creates a new PXE
- * @param node - Node to connect the pxe to.
- * @param contract - Benchmark contract to add to the pxe.
- * @param startingBlock - First l2 block to process.
- * @returns The new PXE.
- */
-export async function createNewPXE(node: AztecNode, contract: BenchmarkingContract): Promise<PXEService> {
-  const l1Contracts = await node.getL1ContractAddresses();
-  const { l1ChainId, rollupVersion } = await node.getNodeInfo();
-  const pxeConfig = {
-    l2BlockBatchSize: 50,
-    l2BlockPollingIntervalMS: 100,
-    dataDirectory: undefined,
-    dataStoreMapSizeKB: 1024 * 1024,
-    l1Contracts,
-    l1ChainId,
-    rollupVersion,
-  } as PXEServiceConfig;
-  // docs:start:PXEcreate
-  const pxe = await createPXEService(node, pxeConfig);
-  // docs:end:PXEcreate
-  await pxe.registerContract(contract);
-  return pxe;
-}
-
 function randomBytesAsBigInts(length: number): bigint[] {
   return [...Array(length)].map(_ => BigInt(Math.floor(Math.random() * 255)));
 }

package/src/e2e_blacklist_token_contract/blacklist_token_contract_test.ts

@@ -3,7 +3,6 @@ import {
   type AztecNode,
   Fr,
   type Logger,
-  type PXE,
   type TxHash,
   computeSecretHash,
   createLogger,
@@ -62,7 +61,6 @@ export class BlacklistTokenContractTest {
   private snapshotManager: ISnapshotManager;
   logger: Logger;
   wallet!: TestWallet;
-  pxe!: PXE;
   asset!: TokenBlacklistContract;
   tokenSim!: TokenSimulator;
   badAccount!: InvalidAccountContract;
@@ -99,8 +97,7 @@ export class BlacklistTokenContractTest {
     await this.snapshotManager.snapshot(
       '3_accounts',
       deployAccounts(3, this.logger),
-      ({ deployedAccounts }, { pxe, cheatCodes, aztecNode, sequencer, wallet }) => {
-        this.pxe = pxe;
+      ({ deployedAccounts }, { cheatCodes, aztecNode, sequencer, wallet }) => {
         this.cheatCodes = cheatCodes;
         this.aztecNode = aztecNode;
         this.sequencer = sequencer;

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -1,5 +1,5 @@
 import type { AztecNodeConfig } from '@aztec/aztec-node';
-import { AztecAddress, type AztecNode, EthAddress, type Logger, type PXE, createLogger } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, EthAddress, type Logger, createLogger } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
 import {
   type DeployL1ContractsArgs,
@@ -33,7 +33,6 @@ export class CrossChainMessagingTest {
   private snapshotManager: ISnapshotManager;
   logger: Logger;
   aztecNode!: AztecNode;
-  pxe!: PXE;
   aztecNodeConfig!: AztecNodeConfig;
   aztecNodeAdmin!: AztecNodeAdmin;
   ctx!: SubsystemsContext;
@@ -70,9 +69,9 @@ export class CrossChainMessagingTest {
   async setup() {
     this.ctx = await this.snapshotManager.setup();
     this.aztecNode = this.ctx.aztecNode;
-    this.pxe = this.ctx.pxe;
+    this.wallet = this.ctx.wallet;
     this.aztecNodeConfig = this.ctx.aztecNodeConfig;
-    this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.pxe, this.aztecNode);
+    this.cheatCodes = await CheatCodes.create(this.aztecNodeConfig.l1RpcUrls, this.wallet, this.aztecNode);
     this.deployL1ContractsValues = this.ctx.deployL1ContractsValues;
     this.aztecNodeAdmin = this.ctx.aztecNode;
   }
@@ -88,15 +87,14 @@ export class CrossChainMessagingTest {
   }
 
   async applyBaseSnapshots() {
-    // Note that we are using the same `pxe`, `aztecNodeConfig` and `aztecNode` across all snapshots.
+    // Note that we are using the same `wallet`, `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 }, { pxe, wallet, aztecNodeConfig, aztecNode }) => {
+      ({ deployedAccounts }, { 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;
@@ -123,7 +121,6 @@ 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,
@@ -158,7 +155,6 @@ export class CrossChainMessagingTest {
 
         this.crossChainTestHarness = new CrossChainTestHarness(
           this.aztecNode,
-          this.pxe,
           this.logger,
           this.l2Token,
           this.l2Bridge,

package/src/e2e_deploy_contract/deploy_test.ts

@@ -5,7 +5,6 @@ import {
   type ContractBase,
   Fr,
   type Logger,
-  type PXE,
   type PublicKeys,
   type Wallet,
   createLogger,
@@ -13,6 +12,7 @@ import {
 } 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';
 
 import { type ISnapshotManager, createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
 
@@ -21,8 +21,7 @@ const { E2E_DATA_PATH: dataPath } = process.env;
 export class DeployTest {
   private snapshotManager: ISnapshotManager;
   public logger: Logger;
-  public pxe!: PXE;
-  public wallet!: Wallet;
+  public wallet!: TestWallet;
   public defaultAccountAddress!: AztecAddress;
   public aztecNode!: AztecNode;
   public aztecNodeAdmin!: AztecNodeAdmin;
@@ -35,7 +34,7 @@ export class DeployTest {
   async setup() {
     await this.applyInitialAccountSnapshot();
     const context = await this.snapshotManager.setup();
-    ({ pxe: this.pxe, aztecNode: this.aztecNode, wallet: this.wallet } = context);
+    ({ aztecNode: this.aztecNode, wallet: this.wallet } = context);
     this.aztecNodeAdmin = context.aztecNode;
     return this;
   }
@@ -75,7 +74,7 @@ export class DeployTest {
   }
 
   async registerRandomAccount(): Promise<AztecAddress> {
-    const completeAddress = await this.pxe.registerAccount(Fr.random(), Fr.random());
+    const completeAddress = await this.wallet.registerAccount(Fr.random(), Fr.random());
     return completeAddress.address;
   }
 }

package/src/e2e_fees/fees_test.ts

@@ -1,5 +1,5 @@
 import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
-import { type AztecAddress, type AztecNode, type Logger, type PXE, createLogger, sleep } from '@aztec/aztec.js';
+import { type AztecAddress, type AztecNode, type Logger, 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';
@@ -52,7 +52,6 @@ export class FeesTest {
   private accounts: AztecAddress[] = [];
 
   public logger: Logger;
-  public pxe!: PXE;
   public aztecNode!: AztecNode;
   public cheatCodes!: CheatCodes;
 
@@ -183,12 +182,11 @@ export class FeesTest {
     await this.snapshotManager.snapshot(
       'initial_accounts',
       deployAccounts(this.numberOfAccounts, this.logger),
-      async ({ deployedAccounts }, { wallet, pxe, aztecNode, aztecNodeConfig }) => {
-        this.pxe = pxe;
+      async ({ deployedAccounts }, { wallet, aztecNode, aztecNodeConfig }) => {
         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, aztecNode);
+        this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, wallet, aztecNode);
         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);
@@ -238,7 +236,6 @@ export class FeesTest {
         this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
           aztecNode: context.aztecNode,
           aztecNodeAdmin: context.aztecNode,
-          pxeService: context.pxe,
           l1Client: context.deployL1ContractsValues.l1Client,
           wallet: this.wallet,
           logger: this.logger,
@@ -281,7 +278,7 @@ export class FeesTest {
       'fpc_setup',
       async context => {
         const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+        expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
         const bananaCoin = this.bananaCoin;
         const bananaFPC = await FPCContract.deploy(this.wallet, bananaCoin.address, this.fpcAdmin)
@@ -349,9 +346,9 @@ export class FeesTest {
       'sponsored_fpc_setup',
       async context => {
         const feeJuiceContract = this.feeJuiceBridgeTestHarness.feeJuice;
-        expect((await context.pxe.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
+        expect((await context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
-        const sponsoredFPC = await setupSponsoredFPC(context.pxe);
+        const sponsoredFPC = await setupSponsoredFPC(this.wallet);
         this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
 
         return {

package/src/e2e_nested_contract/nested_contract_test.ts

@@ -1,4 +1,4 @@
-import { AztecAddress, type AztecNode, type Logger, type PXE, type Wallet, createLogger } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, type Logger, 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';
 
@@ -17,7 +17,6 @@ export class NestedContractTest {
   logger: Logger;
   wallet!: Wallet;
   defaultAccountAddress!: AztecAddress;
-  pxe!: PXE;
   aztecNode!: AztecNode;
 
   parentContract!: ParentContract;
@@ -40,10 +39,9 @@ export class NestedContractTest {
     await this.snapshotManager.snapshot(
       'accounts',
       deployAccounts(this.numberOfAccounts, this.logger),
-      ({ deployedAccounts }, { pxe, wallet, aztecNode }) => {
+      ({ deployedAccounts }, { wallet, aztecNode }) => {
         this.wallet = wallet;
         [{ address: this.defaultAccountAddress }] = deployedAccounts;
-        this.pxe = pxe;
         this.aztecNode = aztecNode;
         return Promise.resolve();
       },

package/src/e2e_p2p/shared.ts

@@ -13,6 +13,7 @@ import {
 import type { RollupCheatCodes } from '@aztec/aztec/testing';
 import type { EmpireSlashingProposerContract, RollupContract, TallySlashingProposerContract } from '@aztec/ethereum';
 import { timesAsync, unique } from '@aztec/foundation/collection';
+import { pluralize } from '@aztec/foundation/string';
 import type { TestDateProvider } from '@aztec/foundation/timer';
 import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
@@ -157,17 +158,20 @@ export async function awaitOffenseDetected({
   nodeAdmin,
   slashingRoundSize,
   epochDuration,
+  waitUntilOffenseCount,
 }: {
   nodeAdmin: AztecNodeAdmin;
   logger: Logger;
   slashingRoundSize: number;
   epochDuration: number;
+  waitUntilOffenseCount?: number;
 }) {
-  logger.info(`Waiting for an offense to be detected`);
+  const targetOffenseCount = waitUntilOffenseCount ?? 1;
+  logger.warn(`Waiting for ${pluralize('offense', targetOffenseCount)} to be detected`);
   const offenses = await retryUntil(
     async () => {
       const offenses = await nodeAdmin.getSlashOffenses('all');
-      if (offenses.length > 0) {
+      if (offenses.length >= targetOffenseCount) {
         return offenses;
       }
     },

package/src/fixtures/e2e_prover_test.ts

@@ -1,6 +1,6 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import { type Archiver, createArchiver } from '@aztec/archiver';
-import { AztecAddress, type AztecNode, EthAddress, type Logger, type PXE, createLogger } from '@aztec/aztec.js';
+import { AztecAddress, type AztecNode, EthAddress, type Logger, createLogger } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec/testing';
 import {
   BBCircuitVerifier,
@@ -16,7 +16,6 @@ import { SecretValue } from '@aztec/foundation/config';
 import { FeeAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { type ProverNode, type ProverNodeConfig, createProverNode } from '@aztec/prover-node';
-import type { PXEService } from '@aztec/pxe/server';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import { TestWallet } from '@aztec/test-wallet';
 import { getGenesisValues } from '@aztec/world-state/testing';
@@ -34,12 +33,12 @@ import {
   deployAccounts,
   publicDeployAccounts,
 } from './snapshot_manager.js';
-import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setupPXEService } from './utils.js';
+import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setupPXEServiceAndGetWallet } from './utils.js';
 
 const { E2E_DATA_PATH: dataPath } = process.env;
 
 type ProvenSetup = {
-  pxe: PXE;
+  wallet: TestWallet;
   teardown: () => Promise<void>;
 };
 
@@ -63,7 +62,6 @@ export class FullProverTest {
   tokenSim!: TokenSimulator;
   aztecNode!: AztecNode;
   aztecNodeAdmin!: AztecNodeAdmin;
-  pxe!: PXEService;
   cheatCodes!: CheatCodes;
   blobSink!: BlobSinkServer;
   private provenComponents: ProvenSetup[] = [];
@@ -161,7 +159,6 @@ export class FullProverTest {
 
     this.simulatedProverNode = this.context.proverNode!;
     ({
-      pxe: this.pxe,
       aztecNode: this.aztecNode,
       deployL1ContractsValues: this.l1Contracts,
       cheatCodes: this.cheatCodes,
@@ -211,7 +208,7 @@ export class FullProverTest {
 
     this.logger.verbose(`Main setup completed, initializing full prover PXE, Node, and Prover Node`);
     for (let i = 0; i < 2; i++) {
-      const result = await setupPXEService(
+      const { wallet: provenWallet, teardown: provenTeardown } = await setupPXEServiceAndGetWallet(
         this.aztecNode,
         {
           proverEnabled: this.realProofs,
@@ -222,9 +219,7 @@ export class FullProverTest {
         true,
       );
       this.logger.debug(`Contract address ${this.fakeProofsAsset.address}`);
-      await result.pxe.registerContract(this.fakeProofsAsset);
-
-      const provenWallet = new TestWallet(result.pxe, this.aztecNode);
+      await provenWallet.registerContract(this.fakeProofsAsset);
 
       for (let i = 0; i < 2; i++) {
         await provenWallet.createSchnorrAccount(this.deployedAccounts[i].secret, this.deployedAccounts[i].salt);
@@ -233,8 +228,8 @@ export class FullProverTest {
 
       const asset = await TokenContract.at(this.fakeProofsAsset.address, provenWallet);
       this.provenComponents.push({
-        pxe: result.pxe,
-        teardown: result.teardown,
+        wallet: provenWallet,
+        teardown: provenTeardown,
       });
       this.provenAssets.push(asset);
     }

package/src/fixtures/snapshot_manager.ts

@@ -31,7 +31,7 @@ import { createLogger } from '@aztec/foundation/log';
 import { resolver, reviver } from '@aztec/foundation/serialize';
 import { TestDateProvider } from '@aztec/foundation/timer';
 import type { ProverNode } from '@aztec/prover-node';
-import { type PXEService, createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
+import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
 import type { SequencerClient } from '@aztec/sequencer-client';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
@@ -68,7 +68,6 @@ export type SubsystemsContext = {
   bbConfig: any;
   aztecNode: AztecNodeService;
   aztecNodeConfig: AztecNodeConfig;
-  pxe: PXEService;
   wallet: TestWallet;
   deployL1ContractsValues: DeployL1ContractsReturnType;
   proverNode?: ProverNode;
@@ -449,7 +448,7 @@ async function setupFromFresh(
   pxeConfig.proverEnabled = !!opts.realProofs;
   const pxe = await createPXEService(aztecNode, pxeConfig);
   const wallet = new TestWallet(pxe, aztecNode);
-  const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
+  const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, wallet, aztecNode);
 
   if (statePath) {
     writeFileSync(`${statePath}/aztec_node_config.json`, JSON.stringify(aztecNodeConfig, resolver));
@@ -460,7 +459,6 @@ async function setupFromFresh(
     aztecNodeConfig,
     anvil,
     aztecNode,
-    pxe,
     wallet,
     sequencer: aztecNode.getSequencer()!,
     acvmConfig,
@@ -578,13 +576,12 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
   pxeConfig.dataDirectory = statePath;
   const pxe = await createPXEService(aztecNode, pxeConfig);
   const wallet = new TestWallet(pxe, aztecNode);
-  const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe, aztecNode);
+  const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, wallet, aztecNode);
 
   return {
     aztecNodeConfig,
     anvil,
     aztecNode,
-    pxe,
     wallet,
     sequencer: aztecNode.getSequencer()!,
     acvmConfig,