@aztec/end-to-end 4.0.0-nightly.20250907 → 4.0.0-nightly.20260108

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "4.0.0-nightly.20250907",
+  "version": "4.0.0-nightly.20260108",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -8,8 +8,8 @@
     "./package.local.json"
   ],
   "scripts": {
-    "build": "yarn clean && tsc -b",
-    "build:dev": "tsc -b --watch",
+    "build": "yarn clean && ../scripts/tsc.sh",
+    "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "test:with-alerts": "./scripts/test-with-alerts.sh",
     "test:e2e": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit",
@@ -25,41 +25,43 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "4.0.0-nightly.20250907",
-    "@aztec/archiver": "4.0.0-nightly.20250907",
-    "@aztec/aztec": "4.0.0-nightly.20250907",
-    "@aztec/aztec-node": "4.0.0-nightly.20250907",
-    "@aztec/aztec.js": "4.0.0-nightly.20250907",
-    "@aztec/bb-prover": "4.0.0-nightly.20250907",
-    "@aztec/blob-lib": "4.0.0-nightly.20250907",
-    "@aztec/blob-sink": "4.0.0-nightly.20250907",
-    "@aztec/bot": "4.0.0-nightly.20250907",
-    "@aztec/cli": "4.0.0-nightly.20250907",
-    "@aztec/constants": "4.0.0-nightly.20250907",
-    "@aztec/entrypoints": "4.0.0-nightly.20250907",
-    "@aztec/epoch-cache": "4.0.0-nightly.20250907",
-    "@aztec/ethereum": "4.0.0-nightly.20250907",
-    "@aztec/foundation": "4.0.0-nightly.20250907",
-    "@aztec/kv-store": "4.0.0-nightly.20250907",
-    "@aztec/l1-artifacts": "4.0.0-nightly.20250907",
-    "@aztec/merkle-tree": "4.0.0-nightly.20250907",
-    "@aztec/node-keystore": "4.0.0-nightly.20250907",
-    "@aztec/noir-contracts.js": "4.0.0-nightly.20250907",
-    "@aztec/noir-noirc_abi": "4.0.0-nightly.20250907",
-    "@aztec/noir-protocol-circuits-types": "4.0.0-nightly.20250907",
-    "@aztec/noir-test-contracts.js": "4.0.0-nightly.20250907",
-    "@aztec/p2p": "4.0.0-nightly.20250907",
-    "@aztec/protocol-contracts": "4.0.0-nightly.20250907",
-    "@aztec/prover-client": "4.0.0-nightly.20250907",
-    "@aztec/prover-node": "4.0.0-nightly.20250907",
-    "@aztec/pxe": "4.0.0-nightly.20250907",
-    "@aztec/sequencer-client": "4.0.0-nightly.20250907",
-    "@aztec/simulator": "4.0.0-nightly.20250907",
-    "@aztec/slasher": "4.0.0-nightly.20250907",
-    "@aztec/stdlib": "4.0.0-nightly.20250907",
-    "@aztec/telemetry-client": "4.0.0-nightly.20250907",
-    "@aztec/validator-client": "4.0.0-nightly.20250907",
-    "@aztec/world-state": "4.0.0-nightly.20250907",
+    "@aztec/accounts": "4.0.0-nightly.20260108",
+    "@aztec/archiver": "4.0.0-nightly.20260108",
+    "@aztec/aztec": "4.0.0-nightly.20260108",
+    "@aztec/aztec-node": "4.0.0-nightly.20260108",
+    "@aztec/aztec.js": "4.0.0-nightly.20260108",
+    "@aztec/bb-prover": "4.0.0-nightly.20260108",
+    "@aztec/bb.js": "4.0.0-nightly.20260108",
+    "@aztec/blob-client": "4.0.0-nightly.20260108",
+    "@aztec/blob-lib": "4.0.0-nightly.20260108",
+    "@aztec/bot": "4.0.0-nightly.20260108",
+    "@aztec/cli": "4.0.0-nightly.20260108",
+    "@aztec/constants": "4.0.0-nightly.20260108",
+    "@aztec/entrypoints": "4.0.0-nightly.20260108",
+    "@aztec/epoch-cache": "4.0.0-nightly.20260108",
+    "@aztec/ethereum": "4.0.0-nightly.20260108",
+    "@aztec/foundation": "4.0.0-nightly.20260108",
+    "@aztec/kv-store": "4.0.0-nightly.20260108",
+    "@aztec/l1-artifacts": "4.0.0-nightly.20260108",
+    "@aztec/merkle-tree": "4.0.0-nightly.20260108",
+    "@aztec/node-keystore": "4.0.0-nightly.20260108",
+    "@aztec/noir-contracts.js": "4.0.0-nightly.20260108",
+    "@aztec/noir-noirc_abi": "4.0.0-nightly.20260108",
+    "@aztec/noir-protocol-circuits-types": "4.0.0-nightly.20260108",
+    "@aztec/noir-test-contracts.js": "4.0.0-nightly.20260108",
+    "@aztec/p2p": "4.0.0-nightly.20260108",
+    "@aztec/protocol-contracts": "4.0.0-nightly.20260108",
+    "@aztec/prover-client": "4.0.0-nightly.20260108",
+    "@aztec/prover-node": "4.0.0-nightly.20260108",
+    "@aztec/pxe": "4.0.0-nightly.20260108",
+    "@aztec/sequencer-client": "4.0.0-nightly.20260108",
+    "@aztec/simulator": "4.0.0-nightly.20260108",
+    "@aztec/slasher": "4.0.0-nightly.20260108",
+    "@aztec/stdlib": "4.0.0-nightly.20260108",
+    "@aztec/telemetry-client": "4.0.0-nightly.20260108",
+    "@aztec/test-wallet": "4.0.0-nightly.20260108",
+    "@aztec/validator-client": "4.0.0-nightly.20260108",
+    "@aztec/world-state": "4.0.0-nightly.20260108",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",
@@ -91,12 +93,12 @@
     "snappy": "^7.2.2",
     "stream-browserify": "^3.0.0",
     "string-argv": "^0.3.2",
-    "ts-loader": "^9.4.4",
+    "ts-loader": "^9.5.4",
     "ts-node": "^10.9.1",
     "tslib": "^2.4.0",
     "typescript": "^5.3.3",
     "util": "^0.12.5",
-    "viem": "2.23.7",
+    "viem": "npm:@aztec/viem@2.38.2",
     "zod": "^3.23.8"
   },
   "devDependencies": {
@@ -105,6 +107,7 @@
     "@types/jest": "^30.0.0",
     "@types/js-yaml": "^4.0.9",
     "@types/lodash.chunk": "^4.2.9",
+    "@typescript/native-preview": "7.0.0-dev.20251126.1",
     "concurrently": "^7.6.0",
     "jest": "^30.0.0",
     "jest-extended": "^6.0.0",

package/src/bench/client_flows/benchmark.ts

@@ -1,10 +1,10 @@
-import type {
+import {
   ContractFunctionInteraction,
   DeployMethod,
-  DeployOptions,
-  Logger,
-  ProfileMethodOptions,
-} from '@aztec/aztec.js';
+  type DeployOptions,
+  type ProfileInteractionOptions,
+} from '@aztec/aztec.js/contracts';
+import type { Logger } from '@aztec/aztec.js/log';
 import { createLogger } from '@aztec/foundation/log';
 import { type PrivateExecutionStep, serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
 import type { ProvingStats, ProvingTimings, SimulationStats, SimulationTimings } from '@aztec/stdlib/tx';
@@ -301,7 +301,7 @@ export function convertProfileToGHBenchmark(benchmark: ClientFlowBenchmark): Git
 export async function captureProfile(
   label: string,
   interaction: ContractFunctionInteraction | DeployMethod,
-  opts: Omit<ProfileMethodOptions & DeployOptions, 'profileMode'>,
+  opts: Omit<ProfileInteractionOptions & DeployOptions, 'profileMode'>,
   expectedSteps?: number,
 ) {
   // Make sure the proxy logger starts from a clean slate
@@ -315,12 +315,12 @@ export async function captureProfile(
 
   const ivcFolder = process.env.CAPTURE_IVC_FOLDER;
   if (ivcFolder) {
-    logger.info(`Capturing client ivc execution profile for ${label}`);
+    logger.info(`Capturing chonk execution profile for ${label}`);
 
     const resultsDirectory = join(ivcFolder, label);
     logger.info(`Writing private execution steps to ${resultsDirectory}`);
     await mkdir(resultsDirectory, { recursive: true });
-    // Write the client IVC files read by the prover.
+    // Write the chonk files read by the prover.
     const ivcInputsPath = join(resultsDirectory, 'ivc-inputs.msgpack');
     await writeFile(ivcInputsPath, serializePrivateExecutionSteps(result.executionSteps));
     await writeFile(join(resultsDirectory, 'logs.json'), JSON.stringify(logs, null, 2));

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -1,26 +1,18 @@
-import { EcdsaRAccountContractArtifact, getEcdsaRAccount } from '@aztec/accounts/ecdsa';
-import { SchnorrAccountContractArtifact, getSchnorrAccount, getSchnorrWallet } from '@aztec/accounts/schnorr';
-import {
-  type AccountWallet,
-  AccountWalletWithSecretKey,
-  AztecAddress,
-  type AztecNode,
-  FeeJuicePaymentMethod,
-  FeeJuicePaymentMethodWithClaim,
-  type FeePaymentMethod,
-  type Logger,
-  type PXE,
-  PrivateFeePaymentMethod,
-  SponsoredFeePaymentMethod,
-  type Wallet,
-  createLogger,
-} from '@aztec/aztec.js';
+import { AztecAddress } from '@aztec/aztec.js/addresses';
+import { FeeJuicePaymentMethodWithClaim } from '@aztec/aztec.js/fee';
+import { type FeePaymentMethod, PrivateFeePaymentMethod, SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee';
+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 { CheatCodes } from '@aztec/aztec/testing';
-import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
+import { createExtendedL1Client } from '@aztec/ethereum/client';
+import { RollupContract } from '@aztec/ethereum/contracts';
+import type { DeployAztecL1ContractsArgs } from '@aztec/ethereum/deploy-aztec-l1-contracts';
+import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import { ChainMonitor } from '@aztec/ethereum/test';
-import { randomBytes } from '@aztec/foundation/crypto';
+import { randomBytes } from '@aztec/foundation/crypto/random';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { Fr } from '@aztec/foundation/fields';
 import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
 import { TestERC20Bytecode } from '@aztec/l1-artifacts/TestERC20Bytecode';
 import { AMMContract } from '@aztec/noir-contracts.js/AMM';
@@ -30,8 +22,11 @@ import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contracts.js/Token';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
-import { type PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
+import { type PXEConfig, getPXEConfig } from '@aztec/pxe/server';
+import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
+import { GasSettings } from '@aztec/stdlib/gas';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { TestWallet } from '@aztec/test-wallet/server';
 
 import { MNEMONIC } from '../../fixtures/fixtures.js';
 import {
@@ -53,22 +48,21 @@ import { type ClientFlowsConfig, FULL_FLOWS_CONFIG, KEY_FLOWS_CONFIG } from './c
 const { E2E_DATA_PATH: dataPath, BENCHMARK_CONFIG } = process.env;
 
 export type AccountType = 'ecdsar1' | 'schnorr';
-export type FeePaymentMethodGetter = (wallet: Wallet) => Promise<FeePaymentMethod>;
+export type FeePaymentMethodGetter = (wallet: Wallet, sender: AztecAddress) => Promise<FeePaymentMethod | undefined>;
 export type BenchmarkingFeePaymentMethod = 'bridged_fee_juice' | 'private_fpc' | 'sponsored_fpc' | 'fee_juice';
 
 export class ClientFlowsBenchmark {
   private snapshotManager: ISnapshotManager;
 
   public logger: Logger;
-  public pxe!: PXE;
   public aztecNode!: AztecNode;
   public cheatCodes!: CheatCodes;
   public context!: SubsystemsContext;
   public chainMonitor!: ChainMonitor;
   public feeJuiceBridgeTestHarness!: GasBridgingTestHarness;
+  public adminWallet!: TestWallet;
 
   // The admin that aids in the setup of the test
-  public adminWallet!: AccountWallet;
   public adminAddress!: AztecAddress;
 
   // Aztec Node config
@@ -79,18 +73,24 @@ export class ClientFlowsBenchmark {
   public feeJuiceContract!: FeeJuiceContract;
   // Asset in which fees are paid via FPC
   public bananaCoin!: BananaCoin;
+  public bananaCoinInstance!: ContractInstanceWithAddress;
   public bananaFPC!: FPCContract;
+  public bananaFPCInstance!: ContractInstanceWithAddress;
   // Random asset we want to trade
   public candyBarCoin!: TokenContract;
+  public candyBarCoinInstance!: ContractInstanceWithAddress;
   // AMM contract
   public amm!: AMMContract;
+  public ammInstance!: ContractInstanceWithAddress;
   // Liquidity token for AMM
   public liquidityToken!: TokenContract;
+  public liquidityTokenInstance!: ContractInstanceWithAddress;
   // Sponsored FPC contract
   public sponsoredFPC!: SponsoredFPCContract;
+  public sponsoredFPCInstance!: ContractInstanceWithAddress;
 
-  // PXE used by the benchmarking user. It can be set up with client-side proving enabled
-  public userPXE!: PXE;
+  // PXE and Wallet used by the benchmarking user. It can be set up with client-side proving enabled
+  public userWallet!: TestWallet;
 
   public realProofs = ['true', '1'].includes(process.env.REAL_PROOFS ?? '');
 
@@ -117,7 +117,7 @@ export class ClientFlowsBenchmark {
       },
       // eslint-disable-next-line camelcase
       fee_juice: {
-        forWallet: this.getFeeJuicePaymentMethodForWallet.bind(this),
+        forWallet: () => Promise.resolve(undefined),
         circuits: 0,
       },
     };
@@ -126,7 +126,7 @@ export class ClientFlowsBenchmark {
 
   private proxyLogger: ProxyLogger;
 
-  constructor(testName?: string, setupOptions: Partial<SetupOptions & DeployL1ContractsArgs> = {}) {
+  constructor(testName?: string, setupOptions: Partial<SetupOptions & DeployAztecL1ContractsArgs> = {}) {
     this.logger = createLogger(`bench:client_flows${testName ? `:${testName}` : ''}`);
     this.snapshotManager = createSnapshotManager(
       `bench_client_flows${testName ? `/${testName}` : ''}`,
@@ -169,7 +169,7 @@ export class ClientFlowsBenchmark {
       .balance_of_private(address)
       .simulate({ from: this.adminAddress });
 
-    await mintTokensToPrivate(this.bananaCoin, this.adminAddress, this.adminWallet, address, amount);
+    await mintTokensToPrivate(this.bananaCoin, this.adminAddress, address, amount);
 
     const balanceAfter = await this.bananaCoin.methods
       .balance_of_private(address)
@@ -177,23 +177,20 @@ export class ClientFlowsBenchmark {
     expect(balanceAfter).toEqual(balanceBefore + amount);
   }
 
-  async createBenchmarkingAccountManager(pxe: PXE, type: 'ecdsar1' | 'schnorr') {
-    const benchysSecretKey = Fr.random();
+  createBenchmarkingAccountManager(wallet: TestWallet, type: 'ecdsar1' | 'schnorr') {
+    const benchysSecret = Fr.random();
     const salt = Fr.random();
 
     let benchysPrivateSigningKey;
-    let benchysAccountManager;
     if (type === 'schnorr') {
-      benchysPrivateSigningKey = deriveSigningKey(benchysSecretKey);
-      benchysAccountManager = await getSchnorrAccount(pxe, benchysSecretKey, benchysPrivateSigningKey, salt);
+      benchysPrivateSigningKey = deriveSigningKey(benchysSecret);
+      return wallet.createSchnorrAccount(benchysSecret, salt, benchysPrivateSigningKey);
     } else if (type === 'ecdsar1') {
       benchysPrivateSigningKey = randomBytes(32);
-      benchysAccountManager = await getEcdsaRAccount(pxe, benchysSecretKey, benchysPrivateSigningKey, salt);
+      return wallet.createECDSARAccount(benchysSecret, salt, benchysPrivateSigningKey);
     } else {
       throw new Error(`Unknown account type: ${type}`);
     }
-    await benchysAccountManager.register();
-    return benchysAccountManager;
   }
 
   public async applyBaseSnapshots() {
@@ -205,32 +202,28 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'initial_accounts',
       deployAccounts(2, this.logger),
-      async ({ deployedAccounts }, { pxe, aztecNode, aztecNodeConfig }) => {
-        this.pxe = pxe;
-
+      async (
+        { deployedAccounts: [{ address: adminAddress }, { address: sequencerAddress }] },
+        { wallet, aztecNode, cheatCodes },
+      ) => {
+        this.adminWallet = wallet;
         this.aztecNode = aztecNode;
-        this.cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, pxe);
+        this.cheatCodes = cheatCodes;
 
-        const deployedWallets = await Promise.all(
-          deployedAccounts.map(a => getSchnorrWallet(pxe, a.address, a.signingKey)),
-        );
-        [this.adminWallet] = deployedWallets;
-        this.adminAddress = this.adminWallet.getAddress();
-        this.sequencerAddress = deployedWallets[1].getAddress();
+        this.adminAddress = adminAddress;
+        this.sequencerAddress = sequencerAddress;
 
         const canonicalFeeJuice = await getCanonicalFeeJuice();
-        this.feeJuiceContract = await FeeJuiceContract.at(canonicalFeeJuice.address, this.adminWallet);
+        this.feeJuiceContract = FeeJuiceContract.at(canonicalFeeJuice.address, this.adminWallet);
         this.coinbase = EthAddress.random();
 
-        const userPXEConfig = getPXEServiceConfig();
-        const l1Contracts = await aztecNode.getL1ContractAddresses();
+        const userPXEConfig = getPXEConfig();
         const userPXEConfigWithContracts = {
           ...userPXEConfig,
           proverEnabled: this.realProofs,
-          l1Contracts,
-        } as PXEServiceConfig;
+        } as PXEConfig;
 
-        this.userPXE = await createPXEService(this.aztecNode, userPXEConfigWithContracts, {
+        this.userWallet = await TestWallet.create(this.aztecNode, userPXEConfigWithContracts, {
           loggers: {
             prover: this.proxyLogger.createLogger('pxe:bb:wasm:bundle:proxied'),
           },
@@ -246,12 +239,11 @@ export class ClientFlowsBenchmark {
       async (_data, context) => {
         this.context = context;
 
-        this.feeJuiceContract = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.adminWallet);
+        this.feeJuiceContract = FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, this.adminWallet);
 
         this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
           aztecNode: context.aztecNode,
           aztecNodeAdmin: context.aztecNode,
-          pxeService: context.pxe,
           l1Client: context.deployL1ContractsValues.l1Client,
           wallet: this.adminWallet,
           logger: this.logger,
@@ -264,14 +256,22 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_banana_token',
       async () => {
-        const bananaCoin = await BananaCoin.deploy(this.adminWallet, this.adminAddress, 'BC', 'BC', 18n)
+        const { contract: bananaCoin, instance: bananaCoinInstance } = await BananaCoin.deploy(
+          this.adminWallet,
+          this.adminAddress,
+          'BC',
+          'BC',
+          18n,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
         this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
-        return { bananaCoinAddress: bananaCoin.address };
+        return { bananaCoinAddress: bananaCoin.address, bananaCoinInstance };
       },
-      async ({ bananaCoinAddress }) => {
-        this.bananaCoin = await BananaCoin.at(bananaCoinAddress, this.adminWallet);
+      ({ bananaCoinAddress, bananaCoinInstance }) => {
+        this.bananaCoin = BananaCoin.at(bananaCoinAddress, this.adminWallet);
+        this.bananaCoinInstance = bananaCoinInstance;
+        return Promise.resolve();
       },
     );
   }
@@ -280,14 +280,22 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_candy_bar_token',
       async () => {
-        const candyBarCoin = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'CBC', 'CBC', 18n)
+        const { contract: candyBarCoin, instance: candyBarCoinInstance } = await TokenContract.deploy(
+          this.adminWallet,
+          this.adminAddress,
+          'CBC',
+          'CBC',
+          18n,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
         this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
-        return { candyBarCoinAddress: candyBarCoin.address };
+        return { candyBarCoinAddress: candyBarCoin.address, candyBarCoinInstance };
       },
-      async ({ candyBarCoinAddress }) => {
-        this.candyBarCoin = await TokenContract.at(candyBarCoinAddress, this.adminWallet);
+      ({ candyBarCoinAddress, candyBarCoinInstance }) => {
+        this.candyBarCoin = TokenContract.at(candyBarCoinAddress, this.adminWallet);
+        this.candyBarCoinInstance = candyBarCoinInstance;
+        return Promise.resolve();
       },
     );
   }
@@ -297,21 +305,27 @@ 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)
+        const { contract: bananaFPC, instance: bananaFPCInstance } = await FPCContract.deploy(
+          this.adminWallet,
+          bananaCoin.address,
+          this.adminAddress,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
 
         this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
 
         await this.feeJuiceBridgeTestHarness.bridgeFromL1ToL2(bananaFPC.address, this.adminAddress);
 
-        return { bananaFPCAddress: bananaFPC.address };
+        return { bananaFPCAddress: bananaFPC.address, bananaFPCInstance };
       },
-      async data => {
-        this.bananaFPC = await FPCContract.at(data.bananaFPCAddress, this.adminWallet);
+      data => {
+        this.bananaFPC = FPCContract.at(data.bananaFPCAddress, this.adminWallet);
+        this.bananaFPCInstance = data.bananaFPCInstance;
+        return Promise.resolve();
       },
     );
   }
@@ -320,17 +334,19 @@ export class ClientFlowsBenchmark {
     await this.snapshotManager.snapshot(
       'deploy_sponsored_fpc',
       async () => {
-        const sponsoredFPC = await setupSponsoredFPC(this.pxe);
-        this.logger.info(`SponsoredFPC at ${sponsoredFPC.address}`);
-        return { sponsoredFPCAddress: sponsoredFPC.address };
+        const sponsoredFPCInstance = await setupSponsoredFPC(this.adminWallet);
+        this.logger.info(`SponsoredFPC at ${sponsoredFPCInstance.address}`);
+        return { sponsoredFPCAddress: sponsoredFPCInstance.address, sponsoredFPCInstance };
       },
-      async ({ sponsoredFPCAddress }) => {
-        this.sponsoredFPC = await SponsoredFPCContract.at(sponsoredFPCAddress, this.adminWallet);
+      ({ sponsoredFPCAddress, sponsoredFPCInstance }) => {
+        this.sponsoredFPC = SponsoredFPCContract.at(sponsoredFPCAddress, this.adminWallet);
+        this.sponsoredFPCInstance = sponsoredFPCInstance;
+        return Promise.resolve();
       },
     );
   }
 
-  public async createCrossChainTestHarness(owner: AccountWallet) {
+  public async createCrossChainTestHarness(owner: AztecAddress) {
     const l1Client = createExtendedL1Client(this.context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
     const underlyingERC20Address = await deployL1Contract(l1Client, TestERC20Abi, TestERC20Bytecode, [
@@ -342,10 +358,9 @@ export class ClientFlowsBenchmark {
     this.logger.verbose(`Setting up cross chain harness...`);
     const crossChainTestHarness = await CrossChainTestHarness.new(
       this.aztecNode,
-      this.pxe,
       l1Client,
+      this.adminWallet,
       owner,
-      owner.getAddress(),
       this.logger,
       underlyingERC20Address,
     );
@@ -355,68 +370,81 @@ export class ClientFlowsBenchmark {
     return crossChainTestHarness;
   }
 
-  public async createAndFundBenchmarkingWallet(accountType: AccountType) {
-    const benchysAccountManager = await this.createBenchmarkingAccountManager(this.pxe, accountType);
-    const benchysWallet = await benchysAccountManager.getWallet();
-    const benchysAddress = benchysAccountManager.getAddress();
+  public async createAndFundBenchmarkingAccountOnUserWallet(accountType: AccountType) {
+    const benchysAccountManager = await this.createBenchmarkingAccountManager(this.adminWallet, accountType);
+    const benchysAccount = await benchysAccountManager.getAccount();
+    const benchysAddress = benchysAccountManager.address;
     const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
-    const paymentMethod = new FeeJuicePaymentMethodWithClaim(benchysWallet, claim);
-    await benchysAccountManager.deploy({ fee: { paymentMethod } }).wait();
-    // Register benchy on the user's PXE, where we're going to be interacting from
-    await this.userPXE.registerContract({
-      instance: benchysAccountManager.getInstance(),
-      artifact: accountType === 'ecdsar1' ? EcdsaRAccountContractArtifact : SchnorrAccountContractArtifact,
+    const behchysDeployMethod = await benchysAccountManager.getDeployMethod();
+    await behchysDeployMethod
+      .send({
+        from: AztecAddress.ZERO,
+        fee: { paymentMethod: new FeeJuicePaymentMethodWithClaim(benchysAddress, claim) },
+      })
+      .wait();
+    // Register benchy on the user's Wallet, where we're going to be interacting from
+    const accountManager = await this.userWallet.createAccount({
+      secret: benchysAccount.getSecretKey(),
+      salt: new Fr(benchysAccount.salt),
+      contract: benchysAccountManager.getAccountContract(),
     });
-    await this.userPXE.registerAccount(benchysWallet.getSecretKey(), benchysWallet.getCompleteAddress().partialAddress);
-    const entrypoint = await benchysAccountManager.getAccount();
-    return new AccountWalletWithSecretKey(
-      this.userPXE,
-      entrypoint,
-      benchysWallet.getSecretKey(),
-      benchysAccountManager.salt,
-    );
+    return accountManager.address;
   }
 
   public async applyDeployAmmSnapshot() {
     await this.snapshotManager.snapshot(
       'deploy_amm',
       async () => {
-        const liquidityToken = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'LPT', 'LPT', 18n)
+        const { contract: liquidityToken, instance: liquidityTokenInstance } = await TokenContract.deploy(
+          this.adminWallet,
+          this.adminAddress,
+          'LPT',
+          'LPT',
+          18n,
+        )
           .send({ from: this.adminAddress })
-          .deployed();
-        const amm = await AMMContract.deploy(
+          .wait();
+        const { contract: amm, instance: ammInstance } = await AMMContract.deploy(
           this.adminWallet,
           this.bananaCoin.address,
           this.candyBarCoin.address,
           liquidityToken.address,
         )
           .send({ from: this.adminAddress })
-          .deployed();
+          .wait();
         this.logger.info(`AMM deployed at ${amm.address}`);
         await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress }).wait();
-        return { ammAddress: amm.address, liquidityTokenAddress: liquidityToken.address };
+        return {
+          ammAddress: amm.address,
+          ammInstance,
+          liquidityTokenAddress: liquidityToken.address,
+          liquidityTokenInstance,
+        };
       },
-      async ({ ammAddress, liquidityTokenAddress }) => {
-        this.liquidityToken = await TokenContract.at(liquidityTokenAddress, this.adminWallet);
-        this.amm = await AMMContract.at(ammAddress, this.adminWallet);
+      ({ ammAddress, ammInstance, liquidityTokenAddress, liquidityTokenInstance }) => {
+        this.liquidityToken = TokenContract.at(liquidityTokenAddress, this.adminWallet);
+        this.liquidityTokenInstance = liquidityTokenInstance;
+        this.amm = AMMContract.at(ammAddress, this.adminWallet);
+        this.ammInstance = ammInstance;
+        return Promise.resolve();
       },
     );
   }
 
-  public async getBridgedFeeJuicePaymentMethodForWallet(wallet: Wallet) {
-    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(wallet.getAddress());
-    return new FeeJuicePaymentMethodWithClaim(wallet, claim);
+  public async getBridgedFeeJuicePaymentMethodForWallet(_wallet: Wallet, sender: AztecAddress) {
+    const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(sender);
+    return new FeeJuicePaymentMethodWithClaim(sender, claim);
   }
 
-  public getPrivateFPCPaymentMethodForWallet(wallet: Wallet) {
-    return Promise.resolve(new PrivateFeePaymentMethod(this.bananaFPC.address, wallet));
+  public async getPrivateFPCPaymentMethodForWallet(wallet: Wallet, sender: AztecAddress) {
+    // The private fee paying method assembled on the app side requires knowledge of the maximum
+    // fee the user is willing to pay
+    const maxFeesPerGas = (await this.aztecNode.getCurrentMinFees()).mul(1.5);
+    const gasSettings = GasSettings.default({ maxFeesPerGas });
+    return new PrivateFeePaymentMethod(this.bananaFPC.address, sender, wallet, gasSettings);
   }
 
-  public getSponsoredFPCPaymentMethodForWallet(_wallet: Wallet) {
+  public getSponsoredFPCPaymentMethodForWallet(_wallet: Wallet, _sender: AztecAddress) {
     return Promise.resolve(new SponsoredFeePaymentMethod(this.sponsoredFPC.address));
   }
-
-  public getFeeJuicePaymentMethodForWallet(wallet: Wallet) {
-    return Promise.resolve(new FeeJuicePaymentMethod(wallet.getAddress()));
-  }
 }