@aztec/end-to-end 3.0.0-nightly.20250930 → 3.0.0-nightly.20251002

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "3.0.0-nightly.20250930",
+  "version": "3.0.0-nightly.20251002",
   "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.20250930",
-    "@aztec/archiver": "3.0.0-nightly.20250930",
-    "@aztec/aztec": "3.0.0-nightly.20250930",
-    "@aztec/aztec-node": "3.0.0-nightly.20250930",
-    "@aztec/aztec.js": "3.0.0-nightly.20250930",
-    "@aztec/bb-prover": "3.0.0-nightly.20250930",
-    "@aztec/blob-lib": "3.0.0-nightly.20250930",
-    "@aztec/blob-sink": "3.0.0-nightly.20250930",
-    "@aztec/bot": "3.0.0-nightly.20250930",
-    "@aztec/cli": "3.0.0-nightly.20250930",
-    "@aztec/constants": "3.0.0-nightly.20250930",
-    "@aztec/entrypoints": "3.0.0-nightly.20250930",
-    "@aztec/epoch-cache": "3.0.0-nightly.20250930",
-    "@aztec/ethereum": "3.0.0-nightly.20250930",
-    "@aztec/foundation": "3.0.0-nightly.20250930",
-    "@aztec/kv-store": "3.0.0-nightly.20250930",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250930",
-    "@aztec/merkle-tree": "3.0.0-nightly.20250930",
-    "@aztec/node-keystore": "3.0.0-nightly.20250930",
-    "@aztec/noir-contracts.js": "3.0.0-nightly.20250930",
-    "@aztec/noir-noirc_abi": "3.0.0-nightly.20250930",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250930",
-    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20250930",
-    "@aztec/p2p": "3.0.0-nightly.20250930",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250930",
-    "@aztec/prover-client": "3.0.0-nightly.20250930",
-    "@aztec/prover-node": "3.0.0-nightly.20250930",
-    "@aztec/pxe": "3.0.0-nightly.20250930",
-    "@aztec/sequencer-client": "3.0.0-nightly.20250930",
-    "@aztec/simulator": "3.0.0-nightly.20250930",
-    "@aztec/slasher": "3.0.0-nightly.20250930",
-    "@aztec/stdlib": "3.0.0-nightly.20250930",
-    "@aztec/telemetry-client": "3.0.0-nightly.20250930",
-    "@aztec/test-wallet": "3.0.0-nightly.20250930",
-    "@aztec/validator-client": "3.0.0-nightly.20250930",
-    "@aztec/world-state": "3.0.0-nightly.20250930",
+    "@aztec/accounts": "3.0.0-nightly.20251002",
+    "@aztec/archiver": "3.0.0-nightly.20251002",
+    "@aztec/aztec": "3.0.0-nightly.20251002",
+    "@aztec/aztec-node": "3.0.0-nightly.20251002",
+    "@aztec/aztec.js": "3.0.0-nightly.20251002",
+    "@aztec/bb-prover": "3.0.0-nightly.20251002",
+    "@aztec/blob-lib": "3.0.0-nightly.20251002",
+    "@aztec/blob-sink": "3.0.0-nightly.20251002",
+    "@aztec/bot": "3.0.0-nightly.20251002",
+    "@aztec/cli": "3.0.0-nightly.20251002",
+    "@aztec/constants": "3.0.0-nightly.20251002",
+    "@aztec/entrypoints": "3.0.0-nightly.20251002",
+    "@aztec/epoch-cache": "3.0.0-nightly.20251002",
+    "@aztec/ethereum": "3.0.0-nightly.20251002",
+    "@aztec/foundation": "3.0.0-nightly.20251002",
+    "@aztec/kv-store": "3.0.0-nightly.20251002",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20251002",
+    "@aztec/merkle-tree": "3.0.0-nightly.20251002",
+    "@aztec/node-keystore": "3.0.0-nightly.20251002",
+    "@aztec/noir-contracts.js": "3.0.0-nightly.20251002",
+    "@aztec/noir-noirc_abi": "3.0.0-nightly.20251002",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251002",
+    "@aztec/noir-test-contracts.js": "3.0.0-nightly.20251002",
+    "@aztec/p2p": "3.0.0-nightly.20251002",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20251002",
+    "@aztec/prover-client": "3.0.0-nightly.20251002",
+    "@aztec/prover-node": "3.0.0-nightly.20251002",
+    "@aztec/pxe": "3.0.0-nightly.20251002",
+    "@aztec/sequencer-client": "3.0.0-nightly.20251002",
+    "@aztec/simulator": "3.0.0-nightly.20251002",
+    "@aztec/slasher": "3.0.0-nightly.20251002",
+    "@aztec/stdlib": "3.0.0-nightly.20251002",
+    "@aztec/telemetry-client": "3.0.0-nightly.20251002",
+    "@aztec/test-wallet": "3.0.0-nightly.20251002",
+    "@aztec/validator-client": "3.0.0-nightly.20251002",
+    "@aztec/world-state": "3.0.0-nightly.20251002",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",
@@ -92,7 +92,7 @@
     "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",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -1,9 +1,8 @@
 import {
+  type AppConfigurableFeePaymentMethod,
   AztecAddress,
   type AztecNode,
-  FeeJuicePaymentMethod,
   FeeJuicePaymentMethodWithClaim,
-  type FeePaymentMethod,
   type Logger,
   PrivateFeePaymentMethod,
   SponsoredFeePaymentMethod,
@@ -26,6 +25,7 @@ import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contract
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { type PXEConfig, getPXEConfig } from '@aztec/pxe/server';
+import { GasSettings } from '@aztec/stdlib/gas';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 import { TestWallet } from '@aztec/test-wallet/server';
 
@@ -49,7 +49,10 @@ 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, sender: AztecAddress) => Promise<FeePaymentMethod>;
+export type FeePaymentMethodGetter = (
+  wallet: Wallet,
+  sender: AztecAddress,
+) => Promise<AppConfigurableFeePaymentMethod | undefined>;
 export type BenchmarkingFeePaymentMethod = 'bridged_fee_juice' | 'private_fpc' | 'sponsored_fpc' | 'fee_juice';
 
 export class ClientFlowsBenchmark {
@@ -112,7 +115,7 @@ export class ClientFlowsBenchmark {
       },
       // eslint-disable-next-line camelcase
       fee_juice: {
-        forWallet: this.getFeeJuicePaymentMethodForWallet.bind(this),
+        forWallet: () => Promise.resolve(undefined),
         circuits: 0,
       },
     };
@@ -344,17 +347,22 @@ export class ClientFlowsBenchmark {
   public async createAndFundBenchmarkingAccountOnUserWallet(accountType: AccountType) {
     const benchysAccountManager = await this.createBenchmarkingAccountManager(this.adminWallet, accountType);
     const benchysAccount = await benchysAccountManager.getAccount();
-    const benchysAddress = benchysAccountManager.getAddress();
+    const benchysAddress = benchysAccountManager.address;
     const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
-    const paymentMethod = new FeeJuicePaymentMethodWithClaim(benchysAddress, claim);
-    await benchysAccountManager.deploy({ fee: { paymentMethod } }).wait();
+    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(),
     });
-    return accountManager.getAddress();
+    return accountManager.address;
   }
 
   public async applyDeployAmmSnapshot() {
@@ -388,15 +396,15 @@ export class ClientFlowsBenchmark {
     return new FeeJuicePaymentMethodWithClaim(sender, claim);
   }
 
-  public getPrivateFPCPaymentMethodForWallet(wallet: Wallet, sender: AztecAddress) {
-    return Promise.resolve(new PrivateFeePaymentMethod(this.bananaFPC.address, sender, 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.getCurrentBaseFees()).mul(1.5);
+    const gasSettings = GasSettings.default({ maxFeesPerGas });
+    return new PrivateFeePaymentMethod(this.bananaFPC.address, sender, wallet, gasSettings);
   }
 
   public getSponsoredFPCPaymentMethodForWallet(_wallet: Wallet, _sender: AztecAddress) {
     return Promise.resolve(new SponsoredFeePaymentMethod(this.sponsoredFPC.address));
   }
-
-  public getFeeJuicePaymentMethodForWallet(_wallet: Wallet, sender: AztecAddress) {
-    return Promise.resolve(new FeeJuicePaymentMethod(sender));
-  }
 }

package/src/e2e_fees/bridging_race.notest.ts

@@ -48,7 +48,7 @@ describe('e2e_fees bridging_race', () => {
       salt: bobsSalt,
       contract: new SchnorrAccountContract(bobsPrivateSigningKey),
     });
-    bobsAddress = bobsAccountManager.getAddress();
+    bobsAddress = bobsAccountManager.address;
   });
 
   it('Alice bridges funds to Bob', async () => {

package/src/e2e_fees/fees_test.ts

@@ -1,4 +1,3 @@
-import { SchnorrAccountContract } from '@aztec/accounts/schnorr';
 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';
@@ -190,17 +189,6 @@ export class FeesTest {
         this.accounts = deployedAccounts.map(a => a.address);
         this.accounts.forEach((a, i) => this.logger.verbose(`Account ${i} address: ${a}`));
         [this.aliceAddress, this.bobAddress, this.sequencerAddress] = this.accounts.slice(0, 3);
-        await Promise.all(
-          deployedAccounts.map(async acc => {
-            const accountData = {
-              secret: acc.secret,
-              salt: acc.salt,
-              contract: new SchnorrAccountContract(acc.signingKey),
-            };
-            const accountManager = await this.wallet.createAccount(accountData);
-            return accountManager.register();
-          }),
-        );
 
         // We set Alice as the FPC admin to avoid the need for deployment of another account.
         this.fpcAdmin = this.aliceAddress;

package/src/e2e_p2p/shared.ts

@@ -65,7 +65,7 @@ export const submitTransactions = async (
   rpcConfig.proverEnabled = false;
   const wallet = await TestWallet.create(node, { ...getPXEConfig(), proverEnabled: false }, { useLogSuffix: true });
   const fundedAccountManager = await wallet.createSchnorrAccount(fundedAccount.secret, fundedAccount.salt);
-  return submitTxsTo(wallet, fundedAccountManager.getAddress(), numTxs, logger);
+  return submitTxsTo(wallet, fundedAccountManager.address, numTxs, logger);
 };
 
 export async function prepareTransactions(
@@ -87,7 +87,7 @@ export async function prepareTransactions(
   const contract = await TestContract.at(testContractInstance.address, wallet);
 
   return timesAsync(numTxs, async () => {
-    const tx = await contract.methods.emit_nullifier(Fr.random()).prove({ from: fundedAccountManager.getAddress() });
+    const tx = await contract.methods.emit_nullifier(Fr.random()).prove({ from: fundedAccountManager.address });
     const txHash = tx.getTxHash();
     logger.info(`Tx prepared with hash ${txHash}`);
     return tx;

package/src/fixtures/snapshot_manager.ts

@@ -2,7 +2,7 @@ import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
 import { type InitialAccountData, generateSchnorrAccounts } from '@aztec/accounts/testing';
 import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
 import {
-  type AztecAddress,
+  AztecAddress,
   type AztecNode,
   BatchCall,
   type ContractFunctionInteraction,
@@ -447,7 +447,7 @@ async function setupFromFresh(
   // Only enable proving if specifically requested.
   pxeConfig.proverEnabled = !!opts.realProofs;
   const wallet = await TestWallet.create(aztecNode, pxeConfig);
-  const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, wallet, aztecNode, dateProvider);
+  const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, aztecNode, dateProvider);
 
   if (statePath) {
     writeFileSync(`${statePath}/aztec_node_config.json`, JSON.stringify(aztecNodeConfig, resolver));
@@ -575,7 +575,7 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
   const pxeConfig = getPXEConfig();
   pxeConfig.dataDirectory = statePath;
   const wallet = await TestWallet.create(aztecNode, pxeConfig);
-  const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, wallet, aztecNode, dateProvider);
+  const cheatCodes = await CheatCodes.create(aztecNodeConfig.l1RpcUrls, aztecNode, dateProvider);
 
   return {
     aztecNodeConfig,
@@ -620,8 +620,10 @@ export const deployAccounts =
         deployedAccounts[i].salt,
         deployedAccounts[i].signingKey,
       );
-      await accountManager
-        .deploy({
+      const deployMethod = await accountManager.getDeployMethod();
+      await deployMethod
+        .send({
+          from: AztecAddress.ZERO,
           skipClassPublication: i !== 0, // Publish the contract class at most once.
         })
         .wait();

package/src/fixtures/token_utils.ts

@@ -1,8 +1,6 @@
 import { type AztecAddress, BatchCall, type Logger, type Wallet } from '@aztec/aztec.js';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 
-// docs:start:token_utils
-
 export async function deployToken(wallet: Wallet, admin: AztecAddress, initialAdminBalance: bigint, logger: Logger) {
   logger.info(`Deploying Token contract...`);
   const contract = await TokenContract.deploy(wallet, admin, 'TokenName', 'TokenSymbol', 18)
@@ -26,7 +24,6 @@ export async function mintTokensToPrivate(
 ) {
   await token.methods.mint_to_private(recipient, amount).send({ from: minter }).wait();
 }
-// docs:end:token_utils
 
 export async function expectTokenBalance(
   wallet: Wallet,
@@ -49,9 +46,9 @@ export async function mintNotes(
   asset: TokenContract,
   noteAmounts: bigint[],
 ): Promise<bigint> {
-  // We can only mint 4 notes at a time, since that's the maximum number of calls our entrypoints allow
+  // We can only mint 5 notes at a time, since that's the maximum number of calls our entrypoints allow
   // TODO(#13024): mint as many notes as possible in a single tx
-  const notesPerIteration = 4;
+  const notesPerIteration = 5;
   for (let mintedNotes = 0; mintedNotes < noteAmounts.length; mintedNotes += notesPerIteration) {
     const toMint = noteAmounts.slice(mintedNotes, mintedNotes + notesPerIteration);
     const actions = toMint.map(amt => asset.methods.mint_to_private(recipient, amt));

package/src/fixtures/utils.ts

@@ -220,7 +220,7 @@ async function setupWithRemoteEnvironment(
   };
   const ethCheatCodes = new EthCheatCodes(config.l1RpcUrls, new DateProvider());
   const wallet = await TestWallet.create(aztecNode);
-  const cheatCodes = await CheatCodes.create(config.l1RpcUrls, wallet, aztecNode, new DateProvider());
+  const cheatCodes = await CheatCodes.create(config.l1RpcUrls, aztecNode, new DateProvider());
   const teardown = () => Promise.resolve();
 
   logger.verbose('Populating wallet from already registered accounts...');
@@ -234,7 +234,7 @@ async function setupWithRemoteEnvironment(
   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 accountManager.address;
     }),
   );
 
@@ -636,7 +636,7 @@ export async function setup(
     logger.verbose('Creating a pxe...');
     const { wallet, teardown: pxeTeardown } = await setupPXEAndGetWallet(aztecNode!, pxeOpts, logger);
 
-    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, wallet, aztecNode, dateProvider);
+    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, aztecNode, dateProvider);
 
     if (
       (opts.aztecTargetCommitteeSize && opts.aztecTargetCommitteeSize > 0) ||
@@ -659,8 +659,8 @@ export async function setup(
         `${numberOfAccounts} accounts are being deployed. Reliably progressing past genesis by setting minTxsPerBlock to 1 and waiting for the accounts to be deployed`,
       );
       const accountsData = initialFundedAccounts.slice(0, numberOfAccounts);
-      const accountManagers = await deployFundedSchnorrAccounts(wallet, accountsData);
-      accounts = accountManagers.map(accountManager => accountManager.getAddress());
+      const accountManagers = await deployFundedSchnorrAccounts(wallet, aztecNode, accountsData);
+      accounts = accountManagers.map(accountManager => accountManager.address);
     }
 
     // Now we restore the original minTxsPerBlock setting.
@@ -733,7 +733,6 @@ export async function setup(
  * @param accountsToDeploy - Which accounts to publicly deploy.
  */
 
-// docs:start:public_deploy_accounts
 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
@@ -762,7 +761,6 @@ export async function ensureAccountContractsPublished(wallet: Wallet, accountsTo
   const batch = new BatchCall(wallet, requests);
   await batch.send({ from: accountsToDeploy[0] }).wait();
 }
-// docs:end:public_deploy_accounts
 
 /** Returns the job name for the current test. */
 function getJobName() {

package/src/guides/up_quick_start.sh

@@ -19,36 +19,28 @@ aztec-wallet() {
 aztec-wallet import-test-accounts
 
 # docs:start:declare-accounts
-aztec-wallet create-account -a alice --payment method=fee_juice,feePayer=test0
-aztec-wallet create-account -a bob --payment method=fee_juice,feePayer=test0
+aztec-wallet create-account -a alice -f test0
+aztec-wallet create-account -a bob -f test0
 # docs:end:declare-accounts
 
-# docs:start:deploy
 DEPLOY_OUTPUT=$(aztec-wallet deploy ../noir-contracts.js/artifacts/token_contract-Token.json --args accounts:test0 Test TST 18 -f test0)
 TOKEN_ADDRESS=$(echo "$DEPLOY_OUTPUT" | grep -oE 'Contract deployed at 0x[0-9a-fA-F]+' | cut -d ' ' -f4)
 echo "Deployed contract at $TOKEN_ADDRESS"
-# docs:end:deploy
 
-# docs:start:mint-private
 MINT_AMOUNT=69
 aztec-wallet send mint_to_private -ca last --args accounts:alice $MINT_AMOUNT -f test0
-# docs:end:mint-private
 
-# docs:start:get-balance
 ALICE_BALANCE=$(aztec-wallet simulate balance_of_private -ca last --args accounts:alice -f alice)
 if ! echo $ALICE_BALANCE | grep -q $MINT_AMOUNT; then
   echo "Incorrect Alice balance after transaction (expected $MINT_AMOUNT but got $ALICE_BALANCE)"
   exit 1
 fi
-# docs:end:get-balance
 
-# docs:start:transfer
 TRANSFER_AMOUNT=42
 
 aztec-wallet create-authwit transfer_in_private accounts:test0 -ca last --args accounts:alice accounts:bob $TRANSFER_AMOUNT 1 -f alice
 
 aztec-wallet send transfer_in_private -ca last --args accounts:alice accounts:bob $TRANSFER_AMOUNT 1 -aw authwits:last -f test0
-# docs:end:transfer
 
 # Test end result
 ALICE_BALANCE=$(aztec-wallet simulate balance_of_private -ca last --args accounts:alice -f alice)

package/src/shared/cross_chain_test_harness.ts

@@ -1,4 +1,3 @@
-// docs:start:cross_chain_test_harness
 import {
   AuthWitness,
   type AztecAddress,
@@ -25,7 +24,6 @@ import { type Hex, getContract } from 'viem';
 
 import { mintTokensToPrivate } from '../fixtures/token_utils.js';
 
-// docs:start:deployAndInitializeTokenAndBridgeContracts
 /**
  * Deploy L1 token and portal, initialize portal, deploy a non native l2 token contract, its L2 bridge contract and attach is to the portal.
  * @param wallet - the wallet instance
@@ -110,7 +108,6 @@ export async function deployAndInitializeTokenAndBridgeContracts(
 
   return { token, bridge, tokenPortalAddress, tokenPortal, underlyingERC20 };
 }
-// docs:end:deployAndInitializeTokenAndBridgeContracts
 
 export type CrossChainContext = {
   l2Token: AztecAddress;
@@ -382,4 +379,3 @@ export class CrossChainTestHarness {
     };
   }
 }
-// docs:end:cross_chain_test_harness

package/src/shared/submit-transactions.ts

@@ -13,7 +13,8 @@ export const submitTxsTo = async (
   await Promise.all(
     times(numTxs, async () => {
       const accountManager = await wallet.createSchnorrAccount(Fr.random(), Fr.random(), GrumpkinScalar.random());
-      const tx = accountManager.deploy({ deployAccount: submitter });
+      const deployMethod = await accountManager.getDeployMethod();
+      const tx = deployMethod.send({ from: submitter });
       const txHash = await tx.getTxHash();
 
       logger.info(`Tx sent with hash ${txHash}`);

package/src/shared/uniswap_l1_l2.ts

@@ -35,7 +35,6 @@ import { CrossChainTestHarness } from './cross_chain_test_harness.js';
 // anvil --fork-url https://mainnet.infura.io/v3/9928b52099854248b3a096be07a6b23c --fork-block-number 17514288 --chain-id 31337
 // For CI, this is configured in `run_tests.sh` and `docker-compose-images.yml`
 
-// docs:start:uniswap_l1_l2_test_setup_const
 const TIMEOUT = 360_000;
 
 /** Objects to be returned by the uniswap setup function */
@@ -57,14 +56,12 @@ export type UniswapSetupContext = {
   /** Cheat codes instance. */
   cheatCodes: CheatCodes;
 };
-// docs:end:uniswap_l1_l2_test_setup_const
 
 export const uniswapL1L2TestSuite = (
   setup: () => Promise<UniswapSetupContext>,
   cleanup: () => Promise<void>,
   expectedForkBlockNumber = 17514288,
 ) => {
-  // docs:start:uniswap_l1_l2_test_beforeAll
   describe('uniswap_trade_on_l1_from_l2', () => {
     jest.setTimeout(TIMEOUT);
 
@@ -164,7 +161,6 @@ export const uniswapL1L2TestSuite = (
       const wethBalance = await wethCrossChainHarness.getL1BalanceOf(ownerEthAddress);
       expect(wethBalance).toBe(parseEther('1000'));
     });
-    // docs:end:uniswap_l1_l2_test_beforeAll
 
     afterAll(async () => {
       await cleanup();

package/src/simulators/token_simulator.ts

@@ -104,7 +104,7 @@ export class TokenSimulator {
 
     const results = (
       await Promise.all(
-        chunk(calls, 4).map(batch => new BatchCall(this.defaultWallet, batch).simulate({ from: this.defaultAddress })),
+        chunk(calls, 5).map(batch => new BatchCall(this.defaultWallet, batch).simulate({ from: this.defaultAddress })),
       )
     ).flat();
     expect(results[0]).toEqual(this.totalSupply);

package/src/spartan/setup_test_wallets.ts

@@ -1,9 +1,9 @@
 import { generateSchnorrAccounts } from '@aztec/accounts/testing';
 import {
-  type AztecAddress,
+  type AppConfigurableFeePaymentMethod,
+  AztecAddress,
   type AztecNode,
   FeeJuicePaymentMethodWithClaim,
-  type FeePaymentMethod,
   Fr,
   L1FeeJuicePortalManager,
   SponsoredFeePaymentMethod,
@@ -82,19 +82,21 @@ export async function deploySponsoredTestAccounts(
   await registerSponsoredFPC(wallet);
 
   const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
-  await recipientAccount.deploy({ fee: { paymentMethod } }).wait({ timeout: 2400 });
+  const recipientDeployMethod = await recipientAccount.getDeployMethod();
+  await recipientDeployMethod.send({ from: AztecAddress.ZERO, fee: { paymentMethod } }).wait({ timeout: 2400 });
   await Promise.all(
     fundedAccounts.map(async a => {
-      await a.deploy({ fee: { paymentMethod } }).wait({ timeout: 2400 }); // increase timeout on purpose in order to account for two empty epochs
-      logger.info(`Account deployed at ${a.getAddress()}`);
+      const deployMethod = await a.getDeployMethod();
+      await deployMethod.send({ from: AztecAddress.ZERO, fee: { paymentMethod } }).wait({ timeout: 2400 }); // increase timeout on purpose in order to account for two empty epochs
+      logger.info(`Account deployed at ${a.address}`);
     }),
   );
 
   const tokenAdmin = fundedAccounts[0];
   const tokenAddress = await deployTokenAndMint(
     wallet,
-    fundedAccounts.map(acc => acc.getAddress()),
-    tokenAdmin.getAddress(),
+    fundedAccounts.map(acc => acc.address),
+    tokenAdmin.address,
     mintAmount,
     new SponsoredFeePaymentMethod(await getSponsoredFPCAddress()),
     logger,
@@ -104,12 +106,12 @@ export async function deploySponsoredTestAccounts(
   return {
     aztecNode,
     wallet,
-    accounts: fundedAccounts.map(acc => acc.getAddress()),
-    tokenAdminAddress: tokenAdmin.getAddress(),
+    accounts: fundedAccounts.map(acc => acc.address),
+    tokenAdminAddress: tokenAdmin.address,
     tokenName: TOKEN_NAME,
     tokenAddress,
     tokenContract,
-    recipientAddress: recipientAccount.getAddress(),
+    recipientAddress: recipientAccount.address,
   };
 }
 
@@ -129,9 +131,7 @@ export async function deployTestAccountsWithTokens(
   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, aztecNode, a.getAddress(), undefined, logger),
-    ),
+    fundedAccounts.map(a => bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, aztecNode, a.address, undefined, logger)),
   );
 
   // Progress by 3 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
@@ -141,17 +141,18 @@ export async function deployTestAccountsWithTokens(
 
   await Promise.all(
     fundedAccounts.map(async (a, i) => {
-      const paymentMethod = new FeeJuicePaymentMethodWithClaim(a.getAddress(), claims[i]);
-      await a.deploy({ fee: { paymentMethod } }).wait();
-      logger.info(`Account deployed at ${a.getAddress()}`);
+      const paymentMethod = new FeeJuicePaymentMethodWithClaim(a.address, claims[i]);
+      const deployMethod = await a.getDeployMethod();
+      await deployMethod.send({ from: AztecAddress.ZERO, fee: { paymentMethod } }).wait();
+      logger.info(`Account deployed at ${a.address}`);
     }),
   );
 
   const tokenAdmin = fundedAccounts[0];
   const tokenAddress = await deployTokenAndMint(
     wallet,
-    fundedAccounts.map(acc => acc.getAddress()),
-    tokenAdmin.getAddress(),
+    fundedAccounts.map(acc => acc.address),
+    tokenAdmin.address,
     mintAmount,
     undefined,
     logger,
@@ -161,12 +162,12 @@ export async function deployTestAccountsWithTokens(
   return {
     aztecNode,
     wallet,
-    accounts: fundedAccounts.map(acc => acc.getAddress()),
-    tokenAdminAddress: tokenAdmin.getAddress(),
+    accounts: fundedAccounts.map(acc => acc.address),
+    tokenAdminAddress: tokenAdmin.address,
     tokenName: TOKEN_NAME,
     tokenAddress,
     tokenContract,
-    recipientAddress: recipientAccount.getAddress(),
+    recipientAddress: recipientAccount.address,
   };
 }
 
@@ -182,10 +183,8 @@ async function bridgeL1FeeJuice(
   const chain = createEthereumChain(l1RpcUrls, l1ChainId);
   const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
 
-  // docs:start:bridge_fee_juice
   const portal = await L1FeeJuicePortalManager.new(aztecNode, l1Client, log);
   const claim = await portal.bridgeTokensPublic(recipient, amount, true /* mint */);
-  // docs:end:bridge_fee_juice
 
   const isSynced = async () =>
     (await aztecNode.getL1ToL2MessageBlock(Fr.fromHexString(claim.messageHash))) !== undefined;
@@ -216,7 +215,7 @@ async function deployTokenAndMint(
   accounts: AztecAddress[],
   admin: AztecAddress,
   mintAmount: bigint,
-  paymentMethod: FeePaymentMethod | undefined,
+  paymentMethod: AppConfigurableFeePaymentMethod | undefined,
   logger: Logger,
 ) {
   logger.verbose(`Deploying TokenContract...`);
@@ -258,7 +257,7 @@ export async function performTransfers({
   rounds: number;
   transferAmount: bigint;
   logger: Logger;
-  feePaymentMethod?: FeePaymentMethod;
+  feePaymentMethod?: AppConfigurableFeePaymentMethod;
 }) {
   const recipient = testAccounts.recipientAddress;
   // Default to sponsored fee payment if no fee method is provided