@aztec/end-to-end 0.85.0 → 0.86.0

package/src/fixtures/utils.ts

@@ -29,14 +29,14 @@ import { SponsoredFeePaymentMethod } from '@aztec/aztec.js/fee/testing';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec.js/testing';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
 import { type BlobSinkServer, createBlobSinkServer } from '@aztec/blob-sink/server';
-import { GENESIS_ARCHIVE_ROOT, GENESIS_BLOCK_HASH, SPONSORED_FPC_SALT } from '@aztec/constants';
+import { GENESIS_ARCHIVE_ROOT, SPONSORED_FPC_SALT } from '@aztec/constants';
 import { DefaultMultiCallEntrypoint } from '@aztec/entrypoints/multicall';
 import {
   type DeployL1ContractsArgs,
   type DeployL1ContractsReturnType,
   ForwarderContract,
   NULL_KEY,
-  createL1Clients,
+  createExtendedL1Client,
   deployL1Contracts,
   getL1ContractsConfigEnvVars,
   isAnvilTestChain,
@@ -125,7 +125,6 @@ export const setupL1Contracts = async (
     vkTreeRoot: getVKTreeRoot(),
     protocolContractTreeRoot,
     genesisArchiveRoot: args.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
-    genesisBlockHash: args.genesisBlockHash ?? new Fr(GENESIS_BLOCK_HASH),
     salt: args.salt,
     initialValidators: args.initialValidators,
     ...getL1ContractsConfigEnvVars(),
@@ -224,12 +223,11 @@ async function setupWithRemoteEnvironment(
   logger.verbose(`Retrieving contract addresses from ${PXE_URL}`);
   const l1Contracts = (await pxeClient.getNodeInfo()).l1ContractAddresses;
 
-  const { walletClient, publicClient } = createL1Clients(config.l1RpcUrls, account, foundry);
+  const l1Client = createExtendedL1Client(config.l1RpcUrls, account, foundry);
 
   const deployL1ContractsValues: DeployL1ContractsReturnType = {
     l1ContractAddresses: l1Contracts,
-    walletClient,
-    publicClient,
+    l1Client,
   };
   const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxeClient!);
   const teardown = () => Promise.resolve();
@@ -425,7 +423,7 @@ export async function setup(
     const initialFundedAccounts =
       opts.initialFundedAccounts ??
       (await generateSchnorrAccounts(opts.numberOfInitialFundedAccounts ?? numberOfAccounts));
-    const { genesisBlockHash, genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(
+    const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(
       initialFundedAccounts.map(a => a.address),
       opts.initialAccountFeeJuice,
       opts.genesisPublicData,
@@ -437,7 +435,7 @@ export async function setup(
         config.l1RpcUrls,
         publisherHdAccount!,
         logger,
-        { ...opts, genesisArchiveRoot, genesisBlockHash, feeJuicePortalInitialBalance: fundingNeeded },
+        { ...opts, genesisArchiveRoot, feeJuicePortalInitialBalance: fundingNeeded },
         chain,
       ));
 
@@ -449,7 +447,7 @@ export async function setup(
       const rewardDistributor = getContract({
         address: deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
         abi: l1Artifacts.rewardDistributor.contractAbi,
-        client: deployL1ContractsValues.publicClient,
+        client: deployL1ContractsValues.l1Client,
       });
 
       const blockReward = await rewardDistributor.read.BLOCK_REWARD();
@@ -458,11 +456,11 @@ export async function setup(
       const feeJuice = getContract({
         address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
         abi: l1Artifacts.feeAsset.contractAbi,
-        client: deployL1ContractsValues.walletClient,
+        client: deployL1ContractsValues.l1Client,
       });
 
       const rewardDistributorMintTxHash = await feeJuice.write.mint([rewardDistributor.address, mintAmount], {} as any);
-      await deployL1ContractsValues.publicClient.waitForTransactionReceipt({ hash: rewardDistributorMintTxHash });
+      await deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: rewardDistributorMintTxHash });
       logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
     }
 
@@ -477,7 +475,7 @@ export async function setup(
     const watcher = new AnvilTestWatcher(
       new EthCheatCodesWithState(config.l1RpcUrls),
       deployL1ContractsValues.l1ContractAddresses.rollupAddress,
-      deployL1ContractsValues.publicClient,
+      deployL1ContractsValues.l1Client,
       dateProvider,
     );
 
@@ -516,7 +514,7 @@ export async function setup(
     }
     config.l1PublishRetryIntervalMS = 100;
 
-    const blobSinkClient = createBlobSinkClient(config);
+    const blobSinkClient = createBlobSinkClient(config, { logger: createLogger('node:blob-sink:client') });
     const aztecNode = await AztecNodeService.createAndSync(
       config,
       { dateProvider, blobSinkClient, telemetry },
@@ -791,7 +789,9 @@ export async function createAndSyncProverNode(
     stop: () => Promise.resolve(),
   };
 
-  const blobSinkClient = createBlobSinkClient(aztecNodeConfig);
+  const blobSinkClient = createBlobSinkClient(aztecNodeConfig, {
+    logger: createLogger('prover-node:blob-sink:client'),
+  });
   // Creating temp store and archiver for simulated prover node
   const archiverConfig = { ...aztecNodeConfig, dataDirectory };
   const archiver = await createArchiver(archiverConfig, blobSinkClient, {
@@ -801,7 +801,7 @@ export async function createAndSyncProverNode(
   // Prover node config is for simulated proofs
   const proverConfig: ProverNodeConfig = {
     ...aztecNodeConfig,
-    proverCoordinationNodeUrl: undefined,
+    proverCoordinationNodeUrls: [],
     dataDirectory: undefined,
     realProofs: false,
     proverAgentCount: 2,
@@ -809,9 +809,9 @@ export async function createAndSyncProverNode(
     proverNodeMaxPendingJobs: 10,
     proverNodeMaxParallelBlocksPerEpoch: 32,
     proverNodePollingIntervalMs: 200,
-    txGatheringTimeoutMs: 60000,
     txGatheringIntervalMs: 1000,
-    txGatheringMaxParallelRequests: 100,
+    txGatheringBatchSize: 10,
+    txGatheringMaxParallelRequestsPerNode: 10,
   };
 
   const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node');
@@ -825,16 +825,16 @@ export async function createAndSyncProverNode(
     },
     { prefilledPublicData },
   );
-  getLogger().info(`Created and synced prover node`, { publisherAddress: l1TxUtils.walletClient.account.address });
-  proverNode.start();
+  getLogger().info(`Created and synced prover node`, { publisherAddress: l1TxUtils.client.account!.address });
+  await proverNode.start();
   return proverNode;
 }
 
 function createDelayedL1TxUtils(aztecNodeConfig: AztecNodeConfig, privateKey: `0x${string}`, logName: string) {
-  const { publicClient, walletClient } = createL1Clients(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
+  const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
 
   const log = createLogger(logName);
-  const l1TxUtils = new DelayedTxUtils(publicClient, walletClient, log, aztecNodeConfig);
+  const l1TxUtils = new DelayedTxUtils(l1Client, log, aztecNodeConfig);
   l1TxUtils.enableDelayer(aztecNodeConfig.ethereumSlotDuration);
   return l1TxUtils;
 }
@@ -844,11 +844,10 @@ export async function createForwarderContract(
   privateKey: `0x${string}`,
   rollupAddress: Hex,
 ) {
-  const { walletClient, publicClient } = createL1Clients(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
+  const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
   const forwarderContract = await ForwarderContract.create(
-    walletClient.account.address,
-    walletClient,
-    publicClient,
+    l1Client.account.address,
+    l1Client,
     createLogger('forwarder'),
     rollupAddress,
   );

package/src/shared/capture_private_execution_steps.ts

@@ -9,30 +9,13 @@ import type {
   ProfileMethodOptions,
 } from '@aztec/aztec.js/contracts';
 import { createLogger } from '@aztec/foundation/log';
-import { serializeWitness } from '@aztec/noir-noirc_abi';
-import type { PrivateExecutionStep } from '@aztec/stdlib/kernel';
+import { serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
 
-import { encode } from '@msgpack/msgpack';
 import { promises as fs } from 'fs';
 import path from 'path';
 
 const logger = createLogger('e2e:capture-private-execution-steps');
 
-// TODO(#7371): This is duplicated.
-// Longer term we won't use this hacked together msgpack format
-// Leaving duplicated as this eventually bb will provide a serialization
-// helper for passing to a generic msgpack RPC endpoint.
-async function _createClientIvcProofFiles(directory: string, executionSteps: PrivateExecutionStep[]) {
-  const acirPath = path.join(directory, 'acir.msgpack');
-  const witnessPath = path.join(directory, 'witnesses.msgpack');
-  await fs.writeFile(acirPath, encode(executionSteps.map(map => map.bytecode)));
-  await fs.writeFile(witnessPath, encode(executionSteps.map(map => serializeWitness(map.witness))));
-  return {
-    acirPath,
-    witnessPath,
-  };
-}
-
 export async function capturePrivateExecutionStepsIfEnvSet(
   label: string,
   interaction: ContractFunctionInteraction | DeployMethod,
@@ -56,7 +39,8 @@ export async function capturePrivateExecutionStepsIfEnvSet(
   logger.info(`Writing private execution steps to ${resultsDirectory}`);
   await fs.mkdir(resultsDirectory, { recursive: true });
   // Write the client IVC files read by the prover.
-  await _createClientIvcProofFiles(resultsDirectory, result.executionSteps);
+  const ivcInputsPath = path.join(resultsDirectory, 'ivc-inputs.msgpack');
+  await fs.writeFile(ivcInputsPath, serializePrivateExecutionSteps(result.executionSteps));
   if (profileMode === 'full') {
     // If we have gate counts, write the steps in human-readable format.
     await fs.writeFile(

package/src/shared/cross_chain_test_harness.ts

@@ -18,12 +18,7 @@ import {
   type Wallet,
   retryUntil,
 } from '@aztec/aztec.js';
-import {
-  type L1ContractAddresses,
-  type ViemPublicClient,
-  type ViemWalletClient,
-  deployL1Contract,
-} from '@aztec/ethereum';
+import { type ExtendedViemWalletClient, type L1ContractAddresses, deployL1Contract } from '@aztec/ethereum';
 import { TestERC20Abi, TokenPortalAbi, TokenPortalBytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
@@ -45,8 +40,7 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
  */
 export async function deployAndInitializeTokenAndBridgeContracts(
   wallet: Wallet,
-  walletClient: ViemWalletClient,
-  publicClient: ViemPublicClient,
+  l1Client: ExtendedViemWalletClient,
   rollupRegistryAddress: EthAddress,
   owner: AztecAddress,
   underlyingERC20Address: EthAddress,
@@ -73,16 +67,11 @@ export async function deployAndInitializeTokenAndBridgeContracts(
   underlyingERC20: any;
 }> {
   // deploy the token portal
-  const { address: tokenPortalAddress } = await deployL1Contract(
-    walletClient,
-    publicClient,
-    TokenPortalAbi,
-    TokenPortalBytecode,
-  );
+  const { address: tokenPortalAddress } = await deployL1Contract(l1Client, TokenPortalAbi, TokenPortalBytecode);
   const tokenPortal = getContract({
     address: tokenPortalAddress.toString(),
     abi: TokenPortalAbi,
-    client: walletClient,
+    client: l1Client,
   });
 
   // deploy l2 token
@@ -114,7 +103,7 @@ export async function deployAndInitializeTokenAndBridgeContracts(
   const underlyingERC20 = getContract({
     address: underlyingERC20Address.toString(),
     abi: TestERC20Abi,
-    client: walletClient,
+    client: l1Client,
   });
 
   return { token, bridge, tokenPortalAddress, tokenPortal, underlyingERC20 };
@@ -140,21 +129,19 @@ export class CrossChainTestHarness {
   static async new(
     aztecNode: AztecNode,
     pxeService: PXE,
-    publicClient: ViemPublicClient,
-    walletClient: ViemWalletClient,
+    l1Client: ExtendedViemWalletClient,
     wallet: AccountWallet,
     logger: Logger,
     underlyingERC20Address: EthAddress,
   ): Promise<CrossChainTestHarness> {
-    const ethAccount = EthAddress.fromString((await walletClient.getAddresses())[0]);
+    const ethAccount = EthAddress.fromString((await l1Client.getAddresses())[0]);
     const l1ContractAddresses = (await pxeService.getNodeInfo()).l1ContractAddresses;
 
     // Deploy and initialize all required contracts
     logger.info('Deploying and initializing token, portal and its bridge...');
     const { token, bridge, tokenPortalAddress, underlyingERC20 } = await deployAndInitializeTokenAndBridgeContracts(
       wallet,
-      walletClient,
-      publicClient,
+      l1Client,
       l1ContractAddresses.registryAddress,
       wallet.getAddress(),
       underlyingERC20Address,
@@ -170,8 +157,7 @@ export class CrossChainTestHarness {
       ethAccount,
       tokenPortalAddress,
       underlyingERC20.address,
-      publicClient,
-      walletClient,
+      l1Client,
       l1ContractAddresses,
       wallet,
     );
@@ -202,10 +188,8 @@ export class CrossChainTestHarness {
     public tokenPortalAddress: EthAddress,
     /** Underlying token for portal tests. */
     public underlyingERC20Address: EthAddress,
-    /** Viem Public client instance. */
-    public publicClient: ViemPublicClient,
-    /** Viem Wallet Client instance. */
-    public walletClient: ViemWalletClient,
+    /** Viem Extended client instance. */
+    public l1Client: ExtendedViemWalletClient,
 
     /** Deployment addresses for all L1 contracts */
     public readonly l1ContractAddresses: L1ContractAddresses,
@@ -218,8 +202,7 @@ export class CrossChainTestHarness {
       this.underlyingERC20Address,
       this.l1ContractAddresses.feeAssetHandlerAddress,
       this.l1ContractAddresses.outboxAddress,
-      this.publicClient,
-      this.walletClient,
+      this.l1Client,
       this.logger,
     );
     this.l1TokenManager = this.l1TokenPortalManager.getTokenManager();
@@ -230,11 +213,11 @@ export class CrossChainTestHarness {
     const contract = getContract({
       abi: TestERC20Abi,
       address: this.l1TokenManager.tokenAddress.toString(),
-      client: this.walletClient,
+      client: this.l1Client,
     });
     const balanceBefore = await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString());
     const hash = await contract.write.mint([this.ethAccount.toString(), amount]);
-    await this.publicClient.waitForTransactionReceipt({ hash });
+    await this.l1Client.waitForTransactionReceipt({ hash });
     expect(await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString())).toEqual(balanceBefore + amount);
   }
 

package/src/shared/gas_portal_test_harness.ts

@@ -11,7 +11,7 @@ import {
   type Wallet,
   retryUntil,
 } from '@aztec/aztec.js';
-import type { ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum';
 import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
@@ -31,8 +31,7 @@ export interface FeeJuicePortalTestingHarnessFactoryConfig {
   aztecNode: AztecNode;
   aztecNodeAdmin?: AztecNodeAdmin;
   pxeService: PXE;
-  publicClient: ViemPublicClient;
-  walletClient: ViemWalletClient;
+  l1Client: ExtendedViemWalletClient;
   wallet: Wallet;
   logger: Logger;
   mockL1?: boolean;
@@ -42,9 +41,9 @@ export class FeeJuicePortalTestingHarnessFactory {
   private constructor(private config: FeeJuicePortalTestingHarnessFactoryConfig) {}
 
   private async createReal() {
-    const { aztecNode, aztecNodeAdmin, pxeService, publicClient, walletClient, wallet, logger } = this.config;
+    const { aztecNode, aztecNodeAdmin, pxeService, l1Client, wallet, logger } = this.config;
 
-    const ethAccount = EthAddress.fromString((await walletClient.getAddresses())[0]);
+    const ethAccount = EthAddress.fromString((await l1Client.getAddresses())[0]);
     const l1ContractAddresses = (await pxeService.getNodeInfo()).l1ContractAddresses;
 
     const feeJuiceAddress = l1ContractAddresses.feeJuiceAddress;
@@ -66,8 +65,7 @@ export class FeeJuicePortalTestingHarnessFactory {
       feeJuicePortalAddress,
       feeJuiceAddress,
       l1ContractAddresses.feeAssetHandlerAddress!,
-      publicClient,
-      walletClient,
+      l1Client,
     );
   }
 
@@ -107,17 +105,14 @@ export class GasBridgingTestHarness implements IGasBridgingTestHarness {
     public l1FeeJuiceAddress: EthAddress,
     /** Fee asset handler address. */
     public feeAssetHandlerAddress: EthAddress,
-    /** Viem Public client instance. */
-    public publicClient: ViemPublicClient,
-    /** Viem Wallet Client instance. */
-    public walletClient: ViemWalletClient,
+    /** Viem Extended client instance. */
+    public l1Client: ExtendedViemWalletClient,
   ) {
     this.feeJuicePortalManager = new L1FeeJuicePortalManager(
       this.feeJuicePortalAddress,
       this.l1FeeJuiceAddress,
       this.feeAssetHandlerAddress,
-      this.publicClient,
-      this.walletClient,
+      this.l1Client,
       this.logger,
     );
 
@@ -130,7 +125,7 @@ export class GasBridgingTestHarness implements IGasBridgingTestHarness {
     const feeAssetL1 = getContract({
       address: this.l1FeeJuiceAddress.toString(),
       abi: TestERC20Abi,
-      client: this.walletClient,
+      client: this.l1Client,
     });
 
     await feeAssetL1.write.mint([to.toString(), amount]);

package/src/shared/uniswap_l1_l2.ts

@@ -12,9 +12,8 @@ import {
 import { CheatCodes } from '@aztec/aztec.js/testing';
 import {
   type DeployL1ContractsReturnType,
+  type ExtendedViemWalletClient,
   RollupContract,
-  type ViemPublicClient,
-  type ViemWalletClient,
   deployL1Contract,
   extractEvent,
 } from '@aztec/ethereum';
@@ -46,10 +45,8 @@ export type UniswapSetupContext = {
   pxe: PXE;
   /** Logger instance named as the current test. */
   logger: Logger;
-  /** Viem Public client instance. */
-  publicClient: ViemPublicClient;
-  /** Viem Wallet Client instance. */
-  walletClient: ViemWalletClient;
+  /** The L1 wallet client, extended with public actions. */
+  l1Client: ExtendedViemWalletClient;
   /** The owner wallet. */
   ownerWallet: AccountWallet;
   /** The sponsor wallet. */
@@ -77,8 +74,7 @@ export const uniswapL1L2TestSuite = (
     let pxe: PXE;
     let logger: Logger;
 
-    let walletClient: ViemWalletClient;
-    let publicClient: ViemPublicClient;
+    let l1Client: ExtendedViemWalletClient;
 
     let ownerWallet: AccountWallet;
     let ownerAddress: AztecAddress;
@@ -92,7 +88,7 @@ export const uniswapL1L2TestSuite = (
 
     let deployL1ContractsValues: DeployL1ContractsReturnType;
     let rollup: RollupContract;
-    let uniswapPortal: GetContractReturnType<typeof UniswapPortalAbi, ViemWalletClient>;
+    let uniswapPortal: GetContractReturnType<typeof UniswapPortalAbi, ExtendedViemWalletClient>;
     let uniswapPortalAddress: EthAddress;
     let uniswapL2Contract: UniswapContract;
 
@@ -103,30 +99,21 @@ export const uniswapL1L2TestSuite = (
     let cheatCodes: CheatCodes;
     let version: number;
     beforeAll(async () => {
-      ({
-        aztecNode,
-        pxe,
-        logger,
-        publicClient,
-        walletClient,
-        ownerWallet,
-        sponsorWallet,
-        deployL1ContractsValues,
-        cheatCodes,
-      } = await setup());
+      ({ aztecNode, pxe, logger, l1Client, ownerWallet, sponsorWallet, deployL1ContractsValues, cheatCodes } =
+        await setup());
 
-      if (Number(await publicClient.getBlockNumber()) < expectedForkBlockNumber) {
+      if (Number(await l1Client.getBlockNumber()) < expectedForkBlockNumber) {
         throw new Error('This test must be run on a fork of mainnet with the expected fork block');
       }
 
       rollup = new RollupContract(
-        deployL1ContractsValues.publicClient,
+        deployL1ContractsValues.l1Client,
         deployL1ContractsValues.l1ContractAddresses.rollupAddress,
       );
       version = Number(await rollup.getVersion());
       ownerAddress = ownerWallet.getAddress();
       // sponsorAddress = sponsorWallet.getAddress();
-      ownerEthAddress = EthAddress.fromString((await walletClient.getAddresses())[0]);
+      ownerEthAddress = EthAddress.fromString((await l1Client.getAddresses())[0]);
 
       await ensureAccountsPubliclyDeployed(ownerWallet, [ownerWallet, sponsorWallet]);
 
@@ -134,8 +121,7 @@ export const uniswapL1L2TestSuite = (
       daiCrossChainHarness = await CrossChainTestHarness.new(
         aztecNode,
         pxe,
-        publicClient,
-        walletClient,
+        deployL1ContractsValues.l1Client,
         ownerWallet,
         logger,
         DAI_ADDRESS,
@@ -145,25 +131,21 @@ export const uniswapL1L2TestSuite = (
       wethCrossChainHarness = await CrossChainTestHarness.new(
         aztecNode,
         pxe,
-        publicClient,
-        walletClient,
+        l1Client,
         ownerWallet,
         logger,
         WETH9_ADDRESS,
       );
 
       logger.info('Deploy Uniswap portal on L1 and L2...');
-      uniswapPortalAddress = await deployL1Contract(
-        walletClient,
-        publicClient,
-        UniswapPortalAbi,
-        UniswapPortalBytecode,
-      ).then(({ address }) => address);
+      uniswapPortalAddress = await deployL1Contract(l1Client, UniswapPortalAbi, UniswapPortalBytecode).then(
+        ({ address }) => address,
+      );
 
       uniswapPortal = getContract({
         address: uniswapPortalAddress.toString(),
         abi: UniswapPortalAbi,
-        client: walletClient,
+        client: l1Client,
       });
       // deploy l2 uniswap contract and attach to portal
       uniswapL2Contract = await UniswapContract.deploy(ownerWallet, uniswapPortalAddress).send().deployed();
@@ -177,8 +159,8 @@ export const uniswapL1L2TestSuite = (
 
       // Give me some WETH so I can deposit to L2 and do the swap...
       logger.info('Getting some weth');
-      const hash = await walletClient.sendTransaction({ to: WETH9_ADDRESS.toString(), value: parseEther('1000') });
-      await publicClient.waitForTransactionReceipt({ hash });
+      const hash = await l1Client.sendTransaction({ to: WETH9_ADDRESS.toString(), value: parseEther('1000') });
+      await l1Client.waitForTransactionReceipt({ hash });
 
       const wethBalance = await wethCrossChainHarness.getL1BalanceOf(ownerEthAddress);
       expect(wethBalance).toBe(parseEther('1000'));
@@ -263,7 +245,7 @@ export const uniswapL1L2TestSuite = (
         uniswapL2Contract.address,
         new Fr(version), // aztec version
         EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-        new Fr(publicClient.chain.id), // chain id
+        new Fr(l1Client.chain.id), // chain id
         swapPrivateContent,
       ]);
 
@@ -278,7 +260,7 @@ export const uniswapL1L2TestSuite = (
         wethCrossChainHarness.l2Bridge.address,
         new Fr(version), // aztec version
         wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-        new Fr(publicClient.chain.id), // chain id
+        new Fr(l1Client.chain.id), // chain id
         withdrawContent,
       ]);
 
@@ -333,7 +315,7 @@ export const uniswapL1L2TestSuite = (
       ] as const;
 
       // this should also insert a message into the inbox.
-      const txReceipt = await daiCrossChainHarness.publicClient.waitForTransactionReceipt({
+      const txReceipt = await daiCrossChainHarness.l1Client.waitForTransactionReceipt({
         hash: await uniswapPortal.write.swapPrivate(swapArgs),
       });
 
@@ -851,7 +833,7 @@ export const uniswapL1L2TestSuite = (
         uniswapL2Contract.address,
         new Fr(version), // aztec version
         EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-        new Fr(publicClient.chain.id), // chain id
+        new Fr(l1Client.chain.id), // chain id
         swapPrivateContent,
       ]);
 
@@ -866,7 +848,7 @@ export const uniswapL1L2TestSuite = (
         wethCrossChainHarness.l2Bridge.address,
         new Fr(version), // aztec version
         wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-        new Fr(publicClient.chain.id), // chain id
+        new Fr(l1Client.chain.id), // chain id
         withdrawContent,
       ]);
 
@@ -981,7 +963,7 @@ export const uniswapL1L2TestSuite = (
         uniswapL2Contract.address,
         new Fr(version), // aztec version
         EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-        new Fr(publicClient.chain.id), // chain id
+        new Fr(l1Client.chain.id), // chain id
         swapPublicContent,
       ]);
 
@@ -996,7 +978,7 @@ export const uniswapL1L2TestSuite = (
         wethCrossChainHarness.l2Bridge.address,
         new Fr(version), // aztec version
         wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-        new Fr(publicClient.chain.id), // chain id
+        new Fr(l1Client.chain.id), // chain id
         withdrawContent,
       ]);
 

package/src/spartan/setup_test_wallets.ts

@@ -12,7 +12,7 @@ import {
   createCompatibleClient,
   retryUntil,
 } from '@aztec/aztec.js';
-import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
+import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import type { Logger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
@@ -105,10 +105,10 @@ async function bridgeL1FeeJuice(
 ) {
   const { l1ChainId } = await pxe.getNodeInfo();
   const chain = createEthereumChain(l1RpcUrls, l1ChainId);
-  const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
+  const l1Client = createExtendedL1Client(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
 
   // docs:start:bridge_fee_juice
-  const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, log);
+  const portal = await L1FeeJuicePortalManager.new(pxe, l1Client, log);
   const claim = await portal.bridgeTokensPublic(recipient, amount, true /* mint */);
   // docs:end:bridge_fee_juice