@aztec/end-to-end 0.85.0-nightly.20250423 → 0.85.0-nightly.20250424

package/package.json

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

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -16,7 +16,7 @@ import {
 } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
 import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
-import { type DeployL1ContractsArgs, RollupContract, createL1Clients, deployL1Contract } from '@aztec/ethereum';
+import { type DeployL1ContractsArgs, RollupContract, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -234,8 +234,7 @@ export class ClientFlowsBenchmark {
           aztecNode: context.aztecNode,
           aztecNodeAdmin: context.aztecNode,
           pxeService: context.pxe,
-          publicClient: context.deployL1ContractsValues.publicClient,
-          walletClient: context.deployL1ContractsValues.walletClient,
+          l1Client: context.deployL1ContractsValues.l1Client,
           wallet: this.adminWallet,
           logger: this.logger,
         });
@@ -314,20 +313,19 @@ export class ClientFlowsBenchmark {
   }
 
   public async createCrossChainTestHarness(owner: AccountWallet) {
-    const { publicClient, walletClient } = createL1Clients(this.context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+    const l1Client = createExtendedL1Client(this.context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
-    const underlyingERC20Address = await deployL1Contract(walletClient, publicClient, TestERC20Abi, TestERC20Bytecode, [
+    const underlyingERC20Address = await deployL1Contract(l1Client, TestERC20Abi, TestERC20Bytecode, [
       'Underlying',
       'UND',
-      walletClient.account.address,
+      l1Client.account.address,
     ]).then(({ address }) => address);
 
     this.logger.verbose(`Setting up cross chain harness...`);
     const crossChainTestHarness = await CrossChainTestHarness.new(
       this.aztecNode,
       this.pxe,
-      publicClient,
-      walletClient,
+      l1Client,
       owner,
       this.logger,
       underlyingERC20Address,

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -11,7 +11,7 @@ import {
   createLogger,
 } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
-import { type ViemPublicClient, createL1Clients, deployL1Contract } from '@aztec/ethereum';
+import { type ExtendedViemWalletClient, createExtendedL1Client, deployL1Contract } from '@aztec/ethereum';
 import { InboxAbi, OutboxAbi, TestERC20Abi, TestERC20Bytecode } from '@aztec/l1-artifacts';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
@@ -39,7 +39,7 @@ export class CrossChainMessagingTest {
   pxe!: PXE;
   aztecNodeConfig!: AztecNodeConfig;
 
-  publicClient!: ViemPublicClient | undefined;
+  l1Client!: ExtendedViemWalletClient | undefined;
 
   user1Wallet!: AccountWallet;
   user2Wallet!: AccountWallet;
@@ -109,22 +109,19 @@ export class CrossChainMessagingTest {
         this.logger.verbose(`Public deploy accounts...`);
         await publicDeployAccounts(this.wallets[0], this.accounts.slice(0, 3));
 
-        const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+        this.l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
-        const underlyingERC20Address = await deployL1Contract(
-          walletClient,
-          publicClient,
-          TestERC20Abi,
-          TestERC20Bytecode,
-          ['Underlying', 'UND', walletClient.account.address],
-        ).then(({ address }) => address);
+        const underlyingERC20Address = await deployL1Contract(this.l1Client, TestERC20Abi, TestERC20Bytecode, [
+          'Underlying',
+          'UND',
+          this.l1Client.account.address,
+        ]).then(({ address }) => address);
 
         this.logger.verbose(`Setting up cross chain harness...`);
         this.crossChainTestHarness = await CrossChainTestHarness.new(
           this.aztecNode,
           this.pxe,
-          publicClient,
-          walletClient,
+          this.l1Client,
           this.wallets[0],
           this.logger,
           underlyingERC20Address,
@@ -143,17 +140,17 @@ export class CrossChainMessagingTest {
         this.ownerAddress = AztecAddress.fromString(crossChainContext.ownerAddress.toString());
         const tokenPortalAddress = EthAddress.fromString(crossChainContext.tokenPortal.toString());
 
-        const { publicClient, walletClient } = createL1Clients(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+        const l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
 
         const inbox = getContract({
           address: this.aztecNodeConfig.l1Contracts.inboxAddress.toString(),
           abi: InboxAbi,
-          client: walletClient,
+          client: l1Client,
         });
         const outbox = getContract({
           address: this.aztecNodeConfig.l1Contracts.outboxAddress.toString(),
           abi: OutboxAbi,
-          client: walletClient,
+          client: l1Client,
         });
 
         this.crossChainTestHarness = new CrossChainTestHarness(
@@ -165,13 +162,12 @@ export class CrossChainMessagingTest {
           this.ethAccount,
           tokenPortalAddress,
           crossChainContext.underlying,
-          publicClient,
-          walletClient,
+          l1Client,
           this.aztecNodeConfig.l1Contracts,
           this.user1Wallet,
         );
 
-        this.publicClient = publicClient;
+        this.l1Client = l1Client;
         this.inbox = inbox;
         this.outbox = outbox;
       },

package/src/e2e_epochs/epochs_test.ts

@@ -1,5 +1,6 @@
 import { AztecNodeService } from '@aztec/aztec-node';
 import { Fr, type Logger, MerkleTreeId, getTimestampRangeForEpoch, retryUntil, sleep } from '@aztec/aztec.js';
+import type { ViemClient } from '@aztec/ethereum';
 import { RollupContract } from '@aztec/ethereum/contracts';
 import { ChainMonitor, DelayedTxUtils, type Delayer, waitUntilL1Timestamp } from '@aztec/ethereum/test';
 import { randomBytes } from '@aztec/foundation/crypto';
@@ -12,7 +13,7 @@ import type { L2BlockNumber } from '@aztec/stdlib/block';
 import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 
 import { join } from 'path';
-import type { Hex, PublicClient } from 'viem';
+import type { Hex } from 'viem';
 
 import {
   type EndToEndContext,
@@ -40,7 +41,7 @@ export type EpochsTestOpts = Partial<
  */
 export class EpochsTestContext {
   public context!: EndToEndContext;
-  public l1Client!: PublicClient;
+  public l1Client!: ViemClient;
   public rollup!: RollupContract;
   public constants!: L1RollupConstants;
   public logger!: Logger;
@@ -92,7 +93,7 @@ export class EpochsTestContext {
     this.proverNodes = context.proverNode ? [context.proverNode] : [];
     this.nodes = context.aztecNode ? [context.aztecNode as AztecNodeService] : [];
     this.logger = context.logger;
-    this.l1Client = context.deployL1ContractsValues.publicClient;
+    this.l1Client = context.deployL1ContractsValues.l1Client;
     this.rollup = RollupContract.getFromConfig(context.config);
 
     // Loop that tracks L1 and L2 block numbers and logs whenever there's a new one.

package/src/e2e_fees/fees_test.ts

@@ -13,7 +13,7 @@ import { FEE_FUNDING_FOR_TESTER_ACCOUNT } from '@aztec/constants';
 import {
   type DeployL1ContractsArgs,
   RollupContract,
-  createL1Clients,
+  createExtendedL1Client,
   getPublicClient,
   l1Artifacts,
 } from '@aztec/ethereum';
@@ -150,7 +150,7 @@ export class FeesTest {
     const rewardDistributor = getContract({
       address: this.context.deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
       abi: l1Artifacts.rewardDistributor.contractAbi,
-      client: this.context.deployL1ContractsValues.publicClient,
+      client: this.context.deployL1ContractsValues.l1Client,
     });
 
     const blockReward = await rewardDistributor.read.BLOCK_REWARD();
@@ -235,8 +235,7 @@ export class FeesTest {
           aztecNode: context.aztecNode,
           aztecNodeAdmin: context.aztecNode,
           pxeService: context.pxe,
-          publicClient: context.deployL1ContractsValues.publicClient,
-          walletClient: context.deployL1ContractsValues.walletClient,
+          l1Client: context.deployL1ContractsValues.l1Client,
           wallet: this.aliceWallet,
           logger: this.logger,
         });
@@ -295,21 +294,18 @@ export class FeesTest {
         this.bananaFPC = bananaFPC;
 
         this.getCoinbaseBalance = async () => {
-          const { walletClient } = createL1Clients(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+          const l1Client = createExtendedL1Client(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
           const gasL1 = getContract({
             address: data.l1FeeJuiceAddress.toString(),
             abi: TestERC20Abi,
-            client: walletClient,
+            client: l1Client,
           });
           return await gasL1.read.balanceOf([this.coinbase.toString()]);
         };
 
         this.getCoinbaseSequencerRewards = async () => {
-          const publicClient = getPublicClient({
-            l1RpcUrls: context.aztecNodeConfig.l1RpcUrls,
-            l1ChainId: context.aztecNodeConfig.l1ChainId,
-          });
-          const rollup = new RollupContract(publicClient, data.rollupAddress);
+          const l1Client = createExtendedL1Client(context.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+          const rollup = new RollupContract(l1Client, data.rollupAddress);
           return await rollup.getSequencerRewards(this.coinbase);
         };
 

package/src/e2e_p2p/p2p_network.ts

@@ -3,10 +3,9 @@ import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
 import type { AccountWalletWithSecretKey } from '@aztec/aztec.js';
 import {
+  type ExtendedViemWalletClient,
   L1TxUtils,
   RollupContract,
-  type ViemPublicClient,
-  type ViemWalletClient,
   getExpectedAddress,
   getL1ContractsConfigEnvVars,
 } from '@aztec/ethereum';
@@ -197,7 +196,7 @@ export class P2PNetworkTest {
         const rollup = getContract({
           address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
           abi: RollupAbi,
-          client: deployL1ContractsValues.walletClient,
+          client: deployL1ContractsValues.l1Client,
         });
 
         this.logger.verbose(`Adding ${this.numberOfNodes} validators`);
@@ -205,26 +204,23 @@ export class P2PNetworkTest {
         const stakingAsset = getContract({
           address: deployL1ContractsValues.l1ContractAddresses.stakingAssetAddress.toString(),
           abi: TestERC20Abi,
-          client: deployL1ContractsValues.walletClient,
+          client: deployL1ContractsValues.l1Client,
         });
 
         const stakeNeeded = l1ContractsConfig.minimumStake * BigInt(this.numberOfNodes);
         await Promise.all(
           [
-            await stakingAsset.write.mint(
-              [deployL1ContractsValues.walletClient.account.address, stakeNeeded],
-              {} as any,
-            ),
+            await stakingAsset.write.mint([deployL1ContractsValues.l1Client.account.address, stakeNeeded], {} as any),
             await stakingAsset.write.approve(
               [deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(), stakeNeeded],
               {} as any,
             ),
-          ].map(txHash => deployL1ContractsValues.publicClient.waitForTransactionReceipt({ hash: txHash })),
+          ].map(txHash => deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: txHash })),
         );
 
         const { validators } = this.getValidators();
         this.validators = validators;
-        await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
+        await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
           hash: await rollup.write.cheat__InitialiseValidatorSet([this.validators]),
         });
 
@@ -238,7 +234,7 @@ export class P2PNetworkTest {
         }
 
         // Send and await a tx to make sure we mine a block for the warp to correctly progress.
-        await this._sendDummyTx(deployL1ContractsValues.publicClient, deployL1ContractsValues.walletClient);
+        await this._sendDummyTx(deployL1ContractsValues.l1Client);
 
         // Set the system time in the node, only after we have warped the time and waited for a block
         // Time is only set in the NEXT block
@@ -284,11 +280,8 @@ export class P2PNetworkTest {
       'remove-inital-validator',
       async ({ deployL1ContractsValues, aztecNode, dateProvider }) => {
         // Send and await a tx to make sure we mine a block for the warp to correctly progress.
-        const { receipt } = await this._sendDummyTx(
-          deployL1ContractsValues.publicClient,
-          deployL1ContractsValues.walletClient,
-        );
-        const block = await deployL1ContractsValues.publicClient.getBlock({
+        const { receipt } = await this._sendDummyTx(deployL1ContractsValues.l1Client);
+        const block = await deployL1ContractsValues.l1Client.getBlock({
           blockNumber: receipt.blockNumber,
         });
         dateProvider.setTime(Number(block.timestamp) * 1000);
@@ -299,16 +292,13 @@ export class P2PNetworkTest {
   }
 
   async sendDummyTx() {
-    return await this._sendDummyTx(
-      this.ctx.deployL1ContractsValues.publicClient,
-      this.ctx.deployL1ContractsValues.walletClient,
-    );
+    return await this._sendDummyTx(this.ctx.deployL1ContractsValues.l1Client);
   }
 
-  private async _sendDummyTx(publicClient: ViemPublicClient, walletClient: ViemWalletClient) {
-    const l1TxUtils = new L1TxUtils(publicClient, walletClient);
+  private async _sendDummyTx(l1Client: ExtendedViemWalletClient) {
+    const l1TxUtils = new L1TxUtils(l1Client);
     return await l1TxUtils.sendAndMonitorTransaction({
-      to: walletClient.account!.address,
+      to: l1Client.account!.address,
       value: 1n,
     });
   }

package/src/e2e_prover/e2e_prover_test.ts

@@ -316,10 +316,10 @@ export class FullProverTest {
 
   private async mintL1ERC20(recipient: Hex, amount: bigint) {
     const erc20Address = this.context.deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress;
-    const client = this.context.deployL1ContractsValues.walletClient;
+    const client = this.context.deployL1ContractsValues.l1Client;
     const erc20 = getContract({ abi: TestERC20Abi, address: erc20Address.toString(), client });
     const hash = await erc20.write.mint([recipient, amount]);
-    await this.context.deployL1ContractsValues.publicClient.waitForTransactionReceipt({ hash });
+    await this.context.deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash });
   }
 
   snapshot = <T>(
@@ -399,19 +399,14 @@ export class FullProverTest {
       throw new Error('No verifier');
     }
 
-    const { walletClient, publicClient, l1ContractAddresses } = this.context.deployL1ContractsValues;
+    const { l1Client, l1ContractAddresses } = this.context.deployL1ContractsValues;
     const rollup = getContract({
       abi: RollupAbi,
       address: l1ContractAddresses.rollupAddress.toString(),
-      client: walletClient,
+      client: l1Client,
     });
 
-    const { address: verifierAddress } = await deployL1Contract(
-      walletClient,
-      publicClient,
-      HonkVerifierAbi,
-      HonkVerifierBytecode,
-    );
+    const { address: verifierAddress } = await deployL1Contract(l1Client, HonkVerifierAbi, HonkVerifierBytecode);
     this.logger.info(`Deployed honk verifier at ${verifierAddress}`);
 
     await rollup.write.setEpochVerifier([verifierAddress.toString()]);

package/src/fixtures/l1_to_l2_messaging.ts

@@ -1,9 +1,4 @@
-import {
-  type L1ContractAddresses,
-  RollupContract,
-  type ViemPublicClient,
-  type ViemWalletClient,
-} from '@aztec/ethereum';
+import { type ExtendedViemWalletClient, type L1ContractAddresses, RollupContract } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { InboxAbi } from '@aztec/l1-artifacts';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
@@ -14,23 +9,19 @@ import { decodeEventLog, getContract } from 'viem';
 export async function sendL1ToL2Message(
   message: { recipient: AztecAddress; content: Fr; secretHash: Fr },
   ctx: {
-    walletClient: ViemWalletClient;
-    publicClient: ViemPublicClient;
+    l1Client: ExtendedViemWalletClient;
     l1ContractAddresses: Pick<L1ContractAddresses, 'inboxAddress' | 'rollupAddress'>;
   },
 ) {
   const inbox = getContract({
     address: ctx.l1ContractAddresses.inboxAddress.toString(),
     abi: InboxAbi,
-    client: ctx.walletClient,
+    client: ctx.l1Client,
   });
 
   const { recipient, content, secretHash } = message;
 
-  const version = await new RollupContract(
-    ctx.publicClient,
-    ctx.l1ContractAddresses.rollupAddress.toString(),
-  ).getVersion();
+  const version = await new RollupContract(ctx.l1Client, ctx.l1ContractAddresses.rollupAddress.toString()).getVersion();
 
   // We inject the message to Inbox
   const txHash = await inbox.write.sendL2Message([
@@ -40,7 +31,7 @@ export async function sendL1ToL2Message(
   ]);
 
   // We check that the message was correctly injected by checking the emitted event
-  const txReceipt = await ctx.publicClient.waitForTransactionReceipt({ hash: txHash });
+  const txReceipt = await ctx.l1Client.waitForTransactionReceipt({ hash: txHash });
 
   // Exactly 1 event should be emitted in the transaction
   expect(txReceipt.logs.length).toBe(1);

package/src/fixtures/snapshot_manager.ts

@@ -20,7 +20,7 @@ import { type BlobSinkServer, createBlobSinkServer } from '@aztec/blob-sink/serv
 import {
   type DeployL1ContractsArgs,
   type DeployL1ContractsReturnType,
-  createL1Clients,
+  createExtendedL1Client,
   getL1ContractsConfigEnvVars,
   l1Artifacts,
 } from '@aztec/ethereum';
@@ -370,7 +370,7 @@ async function setupFromFresh(
     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();
@@ -379,18 +379,18 @@ async function setupFromFresh(
     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}`);
   }
 
   const watcher = new AnvilTestWatcher(
     new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls),
     deployL1ContractsValues.l1ContractAddresses.rollupAddress,
-    deployL1ContractsValues.publicClient,
+    deployL1ContractsValues.l1Client,
   );
   await watcher.start();
 
@@ -521,12 +521,12 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
   }
 
   logger.verbose('Creating ETH clients...');
-  const { publicClient, walletClient } = createL1Clients(aztecNodeConfig.l1RpcUrls, mnemonicToAccount(MNEMONIC));
+  const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, mnemonicToAccount(MNEMONIC));
 
   const watcher = new AnvilTestWatcher(
     new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls),
     aztecNodeConfig.l1Contracts.rollupAddress,
-    publicClient,
+    l1Client,
   );
   await watcher.start();
 
@@ -582,8 +582,7 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys
     bbConfig,
     proverNode,
     deployL1ContractsValues: {
-      walletClient,
-      publicClient,
+      l1Client,
       l1ContractAddresses: aztecNodeConfig.l1Contracts,
     },
     watcher,

package/src/fixtures/utils.ts

@@ -36,7 +36,7 @@ import {
   type DeployL1ContractsReturnType,
   ForwarderContract,
   NULL_KEY,
-  createL1Clients,
+  createExtendedL1Client,
   deployL1Contracts,
   getL1ContractsConfigEnvVars,
   isAnvilTestChain,
@@ -223,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();
@@ -448,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();
@@ -457,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}`);
     }
 
@@ -476,7 +475,7 @@ export async function setup(
     const watcher = new AnvilTestWatcher(
       new EthCheatCodesWithState(config.l1RpcUrls),
       deployL1ContractsValues.l1ContractAddresses.rollupAddress,
-      deployL1ContractsValues.publicClient,
+      deployL1ContractsValues.l1Client,
       dateProvider,
     );
 
@@ -826,16 +825,16 @@ export async function createAndSyncProverNode(
     },
     { prefilledPublicData },
   );
-  getLogger().info(`Created and synced prover node`, { publisherAddress: l1TxUtils.walletClient.account.address });
+  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;
 }
@@ -845,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,
   );