@aztec/end-to-end 0.85.0 → 0.86.0-nightly.20250426

package/dest/fixtures/utils.js

@@ -8,13 +8,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 { 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 { ForwarderContract, NULL_KEY, createL1Clients, deployL1Contracts, getL1ContractsConfigEnvVars, isAnvilTestChain, l1Artifacts } from '@aztec/ethereum';
+import { ForwarderContract, NULL_KEY, createExtendedL1Client, deployL1Contracts, getL1ContractsConfigEnvVars, isAnvilTestChain, l1Artifacts } from '@aztec/ethereum';
 import { DelayedTxUtils, EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
+import { withLogNameSuffix } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 import { TestDateProvider } from '@aztec/foundation/timer';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
@@ -71,7 +72,6 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
         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(),
@@ -143,11 +143,10 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
     logger.verbose('JSON RPC client connected to PXE');
     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 = {
         l1ContractAddresses: l1Contracts,
-        walletClient,
-        publicClient
+        l1Client
     };
     const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxeClient);
     const teardown = ()=>Promise.resolve();
@@ -255,11 +254,10 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             return await setupWithRemoteEnvironment(publisherHdAccount, config, logger, numberOfAccounts);
         }
         const initialFundedAccounts = opts.initialFundedAccounts ?? await generateSchnorrAccounts(opts.numberOfInitialFundedAccounts ?? numberOfAccounts);
-        const { genesisBlockHash, genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address), opts.initialAccountFeeJuice, opts.genesisPublicData);
+        const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address), opts.initialAccountFeeJuice, opts.genesisPublicData);
         const deployL1ContractsValues = opts.deployL1ContractsValues ?? await setupL1Contracts(config.l1RpcUrls, publisherHdAccount, logger, {
             ...opts,
             genesisArchiveRoot,
-            genesisBlockHash,
             feeJuicePortalInitialBalance: fundingNeeded
         }, chain);
         config.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
@@ -268,20 +266,20 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             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();
             const mintAmount = 10_000n * blockReward;
             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
             ], {});
-            await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
+            await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
                 hash: rewardDistributorMintTxHash
             });
             logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
@@ -292,7 +290,7 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             await ethCheatCodes.warp(opts.l2StartTime);
         }
         const dateProvider = new TestDateProvider();
-        const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.publicClient, dateProvider);
+        const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
         await watcher.start();
         const telemetry = getTelemetryClient(opts.telemetryConfig);
         // Blob sink service - blobs get posted here and served from here
@@ -319,7 +317,9 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             config.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
         }
         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,
@@ -337,7 +337,12 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
             logger.verbose('Creating and syncing a simulated prover node...');
             const proverNodePrivateKey = getPrivateKeyFromIndex(2);
             const proverNodePrivateKeyHex = `0x${proverNodePrivateKey.toString('hex')}`;
-            proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, aztecNode, path.join(directoryToCleanup, randomBytes(8).toString('hex')));
+            const proverNodeDataDirectory = path.join(directoryToCleanup, randomBytes(8).toString('hex'));
+            const proverNodeConfig = {
+                ...config.proverNodeConfig,
+                dataDirectory: proverNodeDataDirectory
+            };
+            proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, proverNodeConfig, aztecNode, prefilledPublicData);
         }
         logger.verbose('Creating a pxe...');
         const { pxe, teardown: pxeTeardown } = await setupPXEService(aztecNode, pxeOpts, logger);
@@ -513,61 +518,64 @@ export async function waitForProvenChain(node, targetBlock, timeoutSec = 60, int
     targetBlock ??= await node.getBlockNumber();
     await retryUntil(async ()=>await node.getProvenBlockNumber() >= targetBlock, 'proven chain status', timeoutSec, intervalSec);
 }
-export async function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, aztecNode, dataDirectory, prefilledPublicData = []) {
-    // Disable stopping the aztec node as the prover coordination test will kill it otherwise
-    // This is only required when stopping the prover node for testing
-    const aztecNodeWithoutStop = {
-        getTxByHash: aztecNode.getTxByHash.bind(aztecNode),
-        getTxsByHash: aztecNode.getTxsByHash.bind(aztecNode),
-        stop: ()=>Promise.resolve()
-    };
-    const blobSinkClient = createBlobSinkClient(aztecNodeConfig);
-    // Creating temp store and archiver for simulated prover node
-    const archiverConfig = {
-        ...aztecNodeConfig,
-        dataDirectory
-    };
-    const archiver = await createArchiver(archiverConfig, blobSinkClient, {
-        blockUntilSync: true
-    });
-    // Prover node config is for simulated proofs
-    const proverConfig = {
-        ...aztecNodeConfig,
-        proverCoordinationNodeUrl: undefined,
-        dataDirectory: undefined,
-        realProofs: false,
-        proverAgentCount: 2,
-        publisherPrivateKey: proverNodePrivateKey,
-        proverNodeMaxPendingJobs: 10,
-        proverNodeMaxParallelBlocksPerEpoch: 32,
-        proverNodePollingIntervalMs: 200,
-        txGatheringTimeoutMs: 60000,
-        txGatheringIntervalMs: 1000,
-        txGatheringMaxParallelRequests: 100
-    };
-    const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node');
-    const proverNode = await createProverNode(proverConfig, {
-        aztecNodeTxProvider: aztecNodeWithoutStop,
-        archiver: archiver,
-        l1TxUtils
-    }, {
-        prefilledPublicData
-    });
-    getLogger().info(`Created and synced prover node`, {
-        publisherAddress: l1TxUtils.walletClient.account.address
+export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, proverNodeConfig, aztecNode, prefilledPublicData = []) {
+    return withLogNameSuffix('prover-node', async ()=>{
+        // Disable stopping the aztec node as the prover coordination test will kill it otherwise
+        // This is only required when stopping the prover node for testing
+        const aztecNodeTxProvider = {
+            getTxByHash: aztecNode.getTxByHash.bind(aztecNode),
+            getTxsByHash: aztecNode.getTxsByHash.bind(aztecNode),
+            stop: ()=>Promise.resolve()
+        };
+        const blobSinkClient = createBlobSinkClient(aztecNodeConfig);
+        // Creating temp store and archiver for simulated prover node
+        const archiverConfig = {
+            ...aztecNodeConfig,
+            dataDirectory: proverNodeConfig.dataDirectory
+        };
+        const archiver = await createArchiver(archiverConfig, blobSinkClient, {
+            blockUntilSync: true
+        });
+        // Prover node config is for simulated proofs
+        const proverConfig = {
+            ...aztecNodeConfig,
+            proverCoordinationNodeUrls: [],
+            realProofs: false,
+            proverAgentCount: 2,
+            publisherPrivateKey: proverNodePrivateKey,
+            proverNodeMaxPendingJobs: 10,
+            proverNodeMaxParallelBlocksPerEpoch: 32,
+            proverNodePollingIntervalMs: 200,
+            txGatheringIntervalMs: 1000,
+            txGatheringBatchSize: 10,
+            txGatheringMaxParallelRequestsPerNode: 10,
+            proverNodeFailedEpochStore: undefined,
+            ...proverNodeConfig
+        };
+        const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node');
+        const proverNode = await createProverNode(proverConfig, {
+            aztecNodeTxProvider,
+            archiver: archiver,
+            l1TxUtils
+        }, {
+            prefilledPublicData
+        });
+        getLogger().info(`Created and synced prover node`, {
+            publisherAddress: l1TxUtils.client.account.address
+        });
+        await proverNode.start();
+        return proverNode;
     });
-    proverNode.start();
-    return proverNode;
 }
 function createDelayedL1TxUtils(aztecNodeConfig, privateKey, logName) {
-    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;
 }
 export async function createForwarderContract(aztecNodeConfig, privateKey, rollupAddress) {
-    const { walletClient, publicClient } = createL1Clients(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
-    const forwarderContract = await ForwarderContract.create(walletClient.account.address, walletClient, publicClient, createLogger('forwarder'), rollupAddress);
+    const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
+    const forwarderContract = await ForwarderContract.create(l1Client.account.address, l1Client, createLogger('forwarder'), rollupAddress);
     return forwarderContract;
 }

package/dest/shared/capture_private_execution_steps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"capture_private_execution_steps.d.ts","sourceRoot":"","sources":["../../src/shared/capture_private_execution_steps.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACZ,aAAa,EACb,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AA0BnC,wBAAsB,oCAAoC,CACxD,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,2BAA2B,GAAG,YAAY,EACvD,IAAI,CAAC,EAAE,IAAI,CAAC,oBAAoB,GAAG,aAAa,EAAE,aAAa,CAAC,EAChE,aAAa,CAAC,EAAE,MAAM,iBAqCvB"}
+{"version":3,"file":"capture_private_execution_steps.d.ts","sourceRoot":"","sources":["../../src/shared/capture_private_execution_steps.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EACV,2BAA2B,EAC3B,YAAY,EACZ,aAAa,EACb,oBAAoB,EACrB,MAAM,2BAA2B,CAAC;AASnC,wBAAsB,oCAAoC,CACxD,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,2BAA2B,GAAG,YAAY,EACvD,IAAI,CAAC,EAAE,IAAI,CAAC,oBAAoB,GAAG,aAAa,EAAE,aAAa,CAAC,EAChE,aAAa,CAAC,EAAE,MAAM,iBAsCvB"}

package/dest/shared/capture_private_execution_steps.js

@@ -2,25 +2,10 @@
  * This module exposes the ability to capture the private exection steps that go into our "Client IVC" prover.
  * These are used for debugging and benchmarking barretenberg (the prover component).
  */ import { createLogger } from '@aztec/foundation/log';
-import { serializeWitness } from '@aztec/noir-noirc_abi';
-import { encode } from '@msgpack/msgpack';
+import { serializePrivateExecutionSteps } from '@aztec/stdlib/kernel';
 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, executionSteps) {
-    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, interaction, opts, expectedSteps) {
     // Not included in env_var.ts as internal to e2e tests.
     const ivcFolder = process.env.CAPTURE_IVC_FOLDER;
@@ -45,7 +30,8 @@ export async function capturePrivateExecutionStepsIfEnvSet(label, interaction, o
         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(path.join(resultsDirectory, 'steps.json'), JSON.stringify(result.executionSteps.map((step)=>({

package/dest/shared/cross_chain_test_harness.d.ts

@@ -1,5 +1,5 @@
 import { type AccountWallet, AuthWitness, type AztecAddress, type AztecNode, EthAddress, type FieldsOf, Fr, type L2AmountClaim, type L2AmountClaimWithRecipient, type Logger, type PXE, type SiblingPath, type TxReceipt, type Wallet } from '@aztec/aztec.js';
-import { type L1ContractAddresses, type ViemPublicClient, type ViemWalletClient } from '@aztec/ethereum';
+import { type ExtendedViemWalletClient, type L1ContractAddresses } from '@aztec/ethereum';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBridgeContract } from '@aztec/noir-contracts.js/TokenBridge';
 import { type Hex } from 'viem';
@@ -13,7 +13,7 @@ import { type Hex } from 'viem';
  * @param underlyingERC20Address - address of the underlying ERC20 contract to use (if none supplied, it deploys one)
  * @returns l2 contract instance, bridge contract instance, token portal instance, token portal address and the underlying ERC20 instance
  */
-export declare function deployAndInitializeTokenAndBridgeContracts(wallet: Wallet, walletClient: ViemWalletClient, publicClient: ViemPublicClient, rollupRegistryAddress: EthAddress, owner: AztecAddress, underlyingERC20Address: EthAddress): Promise<{
+export declare function deployAndInitializeTokenAndBridgeContracts(wallet: Wallet, l1Client: ExtendedViemWalletClient, rollupRegistryAddress: EthAddress, owner: AztecAddress, underlyingERC20Address: EthAddress): Promise<{
     /**
      * The L2 token contract instance.
      */
@@ -66,15 +66,13 @@ export declare class CrossChainTestHarness {
     tokenPortalAddress: EthAddress;
     /** Underlying token for portal tests. */
     underlyingERC20Address: EthAddress;
-    /** Viem Public client instance. */
-    publicClient: ViemPublicClient;
-    /** Viem Wallet Client instance. */
-    walletClient: ViemWalletClient;
+    /** Viem Extended client instance. */
+    l1Client: ExtendedViemWalletClient;
     /** Deployment addresses for all L1 contracts */
     readonly l1ContractAddresses: L1ContractAddresses;
     /** Wallet of the owner. */
     readonly ownerWallet: AccountWallet;
-    static new(aztecNode: AztecNode, pxeService: PXE, publicClient: ViemPublicClient, walletClient: ViemWalletClient, wallet: AccountWallet, logger: Logger, underlyingERC20Address: EthAddress): Promise<CrossChainTestHarness>;
+    static new(aztecNode: AztecNode, pxeService: PXE, l1Client: ExtendedViemWalletClient, wallet: AccountWallet, logger: Logger, underlyingERC20Address: EthAddress): Promise<CrossChainTestHarness>;
     private readonly l1TokenManager;
     private readonly l1TokenPortalManager;
     readonly ownerAddress: AztecAddress;
@@ -95,10 +93,8 @@ export declare class CrossChainTestHarness {
     tokenPortalAddress: EthAddress, 
     /** Underlying token for portal tests. */
     underlyingERC20Address: EthAddress, 
-    /** Viem Public client instance. */
-    publicClient: ViemPublicClient, 
-    /** Viem Wallet Client instance. */
-    walletClient: ViemWalletClient, 
+    /** Viem Extended client instance. */
+    l1Client: ExtendedViemWalletClient, 
     /** Deployment addresses for all L1 contracts */
     l1ContractAddresses: L1ContractAddresses, 
     /** Wallet of the owner. */

package/dest/shared/cross_chain_test_harness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cross_chain_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/cross_chain_test_harness.ts"],"names":[],"mappings":"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"}

package/dest/shared/cross_chain_test_harness.js

@@ -16,13 +16,13 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
  * @param owner - owner of the L2 contract
  * @param underlyingERC20Address - address of the underlying ERC20 contract to use (if none supplied, it deploys one)
  * @returns l2 contract instance, bridge contract instance, token portal instance, token portal address and the underlying ERC20 instance
- */ export async function deployAndInitializeTokenAndBridgeContracts(wallet, walletClient, publicClient, rollupRegistryAddress, owner, underlyingERC20Address) {
+ */ export async function deployAndInitializeTokenAndBridgeContracts(wallet, l1Client, rollupRegistryAddress, owner, underlyingERC20Address) {
     // 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
     const token = await TokenContract.deploy(wallet, owner, 'TokenName', 'TokenSymbol', 18).send().deployed();
@@ -48,7 +48,7 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
     const underlyingERC20 = getContract({
         address: underlyingERC20Address.toString(),
         abi: TestERC20Abi,
-        client: walletClient
+        client: l1Client
     });
     return {
         token,
@@ -70,23 +70,22 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
     ethAccount;
     tokenPortalAddress;
     underlyingERC20Address;
-    publicClient;
-    walletClient;
+    l1Client;
     l1ContractAddresses;
     ownerWallet;
-    static async new(aztecNode, pxeService, publicClient, walletClient, wallet, logger, underlyingERC20Address) {
-        const ethAccount = EthAddress.fromString((await walletClient.getAddresses())[0]);
+    static async new(aztecNode, pxeService, l1Client, wallet, logger, underlyingERC20Address) {
+        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, l1ContractAddresses.registryAddress, wallet.getAddress(), underlyingERC20Address);
+        const { token, bridge, tokenPortalAddress, underlyingERC20 } = await deployAndInitializeTokenAndBridgeContracts(wallet, l1Client, l1ContractAddresses.registryAddress, wallet.getAddress(), underlyingERC20Address);
         logger.info('Deployed and initialized token, portal and its bridge.');
-        return new CrossChainTestHarness(aztecNode, pxeService, logger, token, bridge, ethAccount, tokenPortalAddress, underlyingERC20.address, publicClient, walletClient, l1ContractAddresses, wallet);
+        return new CrossChainTestHarness(aztecNode, pxeService, logger, token, bridge, ethAccount, tokenPortalAddress, underlyingERC20.address, l1Client, l1ContractAddresses, wallet);
     }
     l1TokenManager;
     l1TokenPortalManager;
     ownerAddress;
-    constructor(/** Aztec node instance. */ aztecNode, /** Private eXecution Environment (PXE). */ pxeService, /** Logger. */ logger, /** L2 Token contract. */ l2Token, /** L2 Token bridge contract. */ l2Bridge, /** Eth account to interact with. */ ethAccount, /** Portal address. */ tokenPortalAddress, /** Underlying token for portal tests. */ underlyingERC20Address, /** Viem Public client instance. */ publicClient, /** Viem Wallet Client instance. */ walletClient, /** Deployment addresses for all L1 contracts */ l1ContractAddresses, /** Wallet of the owner. */ ownerWallet){
+    constructor(/** Aztec node instance. */ aztecNode, /** Private eXecution Environment (PXE). */ pxeService, /** Logger. */ logger, /** L2 Token contract. */ l2Token, /** L2 Token bridge contract. */ l2Bridge, /** Eth account to interact with. */ ethAccount, /** Portal address. */ tokenPortalAddress, /** Underlying token for portal tests. */ underlyingERC20Address, /** Viem Extended client instance. */ l1Client, /** Deployment addresses for all L1 contracts */ l1ContractAddresses, /** Wallet of the owner. */ ownerWallet){
         this.aztecNode = aztecNode;
         this.pxeService = pxeService;
         this.logger = logger;
@@ -95,11 +94,10 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         this.ethAccount = ethAccount;
         this.tokenPortalAddress = tokenPortalAddress;
         this.underlyingERC20Address = underlyingERC20Address;
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
+        this.l1Client = l1Client;
         this.l1ContractAddresses = l1ContractAddresses;
         this.ownerWallet = ownerWallet;
-        this.l1TokenPortalManager = new L1TokenPortalManager(this.tokenPortalAddress, this.underlyingERC20Address, this.l1ContractAddresses.feeAssetHandlerAddress, this.l1ContractAddresses.outboxAddress, this.publicClient, this.walletClient, this.logger);
+        this.l1TokenPortalManager = new L1TokenPortalManager(this.tokenPortalAddress, this.underlyingERC20Address, this.l1ContractAddresses.feeAssetHandlerAddress, this.l1ContractAddresses.outboxAddress, this.l1Client, this.logger);
         this.l1TokenManager = this.l1TokenPortalManager.getTokenManager();
         this.ownerAddress = this.ownerWallet.getAddress();
     }
@@ -107,14 +105,14 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         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({
+        await this.l1Client.waitForTransactionReceipt({
             hash
         });
         expect(await this.l1TokenManager.getL1TokenBalance(this.ethAccount.toString())).toEqual(balanceBefore + amount);

package/dest/shared/gas_portal_test_harness.d.ts

@@ -1,5 +1,5 @@
 import { type AztecAddress, type AztecNode, EthAddress, L1FeeJuicePortalManager, type L1TokenManager, type L2AmountClaim, type Logger, type PXE, type Wallet } from '@aztec/aztec.js';
-import type { ViemPublicClient, ViemWalletClient } from '@aztec/ethereum';
+import type { ExtendedViemWalletClient } from '@aztec/ethereum';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 export interface IGasBridgingTestHarness {
@@ -13,8 +13,7 @@ export interface FeeJuicePortalTestingHarnessFactoryConfig {
     aztecNode: AztecNode;
     aztecNodeAdmin?: AztecNodeAdmin;
     pxeService: PXE;
-    publicClient: ViemPublicClient;
-    walletClient: ViemWalletClient;
+    l1Client: ExtendedViemWalletClient;
     wallet: Wallet;
     logger: Logger;
     mockL1?: boolean;
@@ -48,10 +47,8 @@ export declare class GasBridgingTestHarness implements IGasBridgingTestHarness {
     l1FeeJuiceAddress: EthAddress;
     /** Fee asset handler address. */
     feeAssetHandlerAddress: EthAddress;
-    /** Viem Public client instance. */
-    publicClient: ViemPublicClient;
-    /** Viem Wallet Client instance. */
-    walletClient: ViemWalletClient;
+    /** Viem Extended client instance. */
+    l1Client: ExtendedViemWalletClient;
     readonly l1TokenManager: L1TokenManager;
     readonly feeJuicePortalManager: L1FeeJuicePortalManager;
     constructor(
@@ -73,10 +70,8 @@ export declare class GasBridgingTestHarness implements IGasBridgingTestHarness {
     l1FeeJuiceAddress: EthAddress, 
     /** Fee asset handler address. */
     feeAssetHandlerAddress: EthAddress, 
-    /** Viem Public client instance. */
-    publicClient: ViemPublicClient, 
-    /** Viem Wallet Client instance. */
-    walletClient: ViemWalletClient);
+    /** Viem Extended client instance. */
+    l1Client: ExtendedViemWalletClient);
     mintTokensOnL1(amount: bigint, to?: EthAddress): Promise<void>;
     getL1FeeJuiceBalance(address: EthAddress): Promise<bigint>;
     sendTokensToPortalPublic(bridgeAmount: bigint, l2Address: AztecAddress): Promise<L2AmountClaim>;

package/dest/shared/gas_portal_test_harness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gas_portal_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/gas_portal_test_harness.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gas_portal_test_harness.d.ts","sourceRoot":"","sources":["../../src/shared/gas_portal_test_harness.ts"],"names":[],"mappings":"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"}

package/dest/shared/gas_portal_test_harness.js

@@ -9,8 +9,8 @@ export class FeeJuicePortalTestingHarnessFactory {
         this.config = config;
     }
     async createReal() {
-        const { aztecNode, aztecNodeAdmin, pxeService, publicClient, walletClient, wallet, logger } = this.config;
-        const ethAccount = EthAddress.fromString((await walletClient.getAddresses())[0]);
+        const { aztecNode, aztecNodeAdmin, pxeService, l1Client, wallet, logger } = this.config;
+        const ethAccount = EthAddress.fromString((await l1Client.getAddresses())[0]);
         const l1ContractAddresses = (await pxeService.getNodeInfo()).l1ContractAddresses;
         const feeJuiceAddress = l1ContractAddresses.feeJuiceAddress;
         const feeJuicePortalAddress = l1ContractAddresses.feeJuicePortalAddress;
@@ -18,7 +18,7 @@ export class FeeJuicePortalTestingHarnessFactory {
             throw new Error('Fee Juice portal not deployed on L1');
         }
         const gasL2 = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, wallet);
-        return new GasBridgingTestHarness(aztecNode, aztecNodeAdmin, pxeService, logger, gasL2, ethAccount, feeJuicePortalAddress, feeJuiceAddress, l1ContractAddresses.feeAssetHandlerAddress, publicClient, walletClient);
+        return new GasBridgingTestHarness(aztecNode, aztecNodeAdmin, pxeService, logger, gasL2, ethAccount, feeJuicePortalAddress, feeJuiceAddress, l1ContractAddresses.feeAssetHandlerAddress, l1Client);
     }
     static create(config) {
         const factory = new FeeJuicePortalTestingHarnessFactory(config);
@@ -38,11 +38,10 @@ export class FeeJuicePortalTestingHarnessFactory {
     feeJuicePortalAddress;
     l1FeeJuiceAddress;
     feeAssetHandlerAddress;
-    publicClient;
-    walletClient;
+    l1Client;
     l1TokenManager;
     feeJuicePortalManager;
-    constructor(/** Aztec node */ aztecNode, /** Aztec node admin interface */ aztecNodeAdmin, /** Private eXecution Environment (PXE). */ pxeService, /** Logger. */ logger, /** L2 Token/Bridge contract. */ feeJuice, /** Eth account to interact with. */ ethAccount, /** Portal address. */ feeJuicePortalAddress, /** Underlying token for portal tests. */ l1FeeJuiceAddress, /** Fee asset handler address. */ feeAssetHandlerAddress, /** Viem Public client instance. */ publicClient, /** Viem Wallet Client instance. */ walletClient){
+    constructor(/** Aztec node */ aztecNode, /** Aztec node admin interface */ aztecNodeAdmin, /** Private eXecution Environment (PXE). */ pxeService, /** Logger. */ logger, /** L2 Token/Bridge contract. */ feeJuice, /** Eth account to interact with. */ ethAccount, /** Portal address. */ feeJuicePortalAddress, /** Underlying token for portal tests. */ l1FeeJuiceAddress, /** Fee asset handler address. */ feeAssetHandlerAddress, /** Viem Extended client instance. */ l1Client){
         this.aztecNode = aztecNode;
         this.aztecNodeAdmin = aztecNodeAdmin;
         this.pxeService = pxeService;
@@ -52,9 +51,8 @@ export class FeeJuicePortalTestingHarnessFactory {
         this.feeJuicePortalAddress = feeJuicePortalAddress;
         this.l1FeeJuiceAddress = l1FeeJuiceAddress;
         this.feeAssetHandlerAddress = feeAssetHandlerAddress;
-        this.publicClient = publicClient;
-        this.walletClient = walletClient;
-        this.feeJuicePortalManager = new L1FeeJuicePortalManager(this.feeJuicePortalAddress, this.l1FeeJuiceAddress, this.feeAssetHandlerAddress, this.publicClient, this.walletClient, this.logger);
+        this.l1Client = l1Client;
+        this.feeJuicePortalManager = new L1FeeJuicePortalManager(this.feeJuicePortalAddress, this.l1FeeJuiceAddress, this.feeAssetHandlerAddress, this.l1Client, this.logger);
         this.l1TokenManager = this.feeJuicePortalManager.getTokenManager();
     }
     async mintTokensOnL1(amount, to = this.ethAccount) {
@@ -63,7 +61,7 @@ export class FeeJuicePortalTestingHarnessFactory {
         const feeAssetL1 = getContract({
             address: this.l1FeeJuiceAddress.toString(),
             abi: TestERC20Abi,
-            client: this.walletClient
+            client: this.l1Client
         });
         await feeAssetL1.write.mint([
             to.toString(),

package/dest/shared/uniswap_l1_l2.d.ts

@@ -1,6 +1,6 @@
 import { type AccountWallet, type AztecNode, type Logger, type PXE } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
-import { type DeployL1ContractsReturnType, type ViemPublicClient, type ViemWalletClient } from '@aztec/ethereum';
+import { type DeployL1ContractsReturnType, type ExtendedViemWalletClient } from '@aztec/ethereum';
 /** Objects to be returned by the uniswap setup function */
 export type UniswapSetupContext = {
     /** Aztec Node instance */
@@ -9,10 +9,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. */

package/dest/shared/uniswap_l1_l2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,SAAS,EAGd,KAAK,MAAM,EACX,KAAK,GAAG,EAGT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EACL,KAAK,2BAA2B,EAEhC,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EAGtB,MAAM,iBAAiB,CAAC;AAqBzB,2DAA2D;AAC3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,+CAA+C;IAC/C,GAAG,EAAE,GAAG,CAAC;IACT,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,mCAAmC;IACnC,YAAY,EAAE,gBAAgB,CAAC;IAC/B,mCAAmC;IACnC,YAAY,EAAE,gBAAgB,CAAC;IAC/B,wBAAwB;IACxB,WAAW,EAAE,aAAa,CAAC;IAC3B,0BAA0B;IAC1B,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO;IACP,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,4BAA4B;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAGF,eAAO,MAAM,oBAAoB,UACxB,MAAM,QAAQ,mBAAmB,CAAC,WAChC,MAAM,QAAQ,IAAI,CAAC,2CA69B7B,CAAC"}
+{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,SAAS,EAGd,KAAK,MAAM,EACX,KAAK,GAAG,EAGT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAI9B,MAAM,iBAAiB,CAAC;AAqBzB,2DAA2D;AAC3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,+CAA+C;IAC/C,GAAG,EAAE,GAAG,CAAC;IACT,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,QAAQ,EAAE,wBAAwB,CAAC;IACnC,wBAAwB;IACxB,WAAW,EAAE,aAAa,CAAC;IAC3B,0BAA0B;IAC1B,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO;IACP,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,4BAA4B;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAGF,eAAO,MAAM,oBAAoB,UACxB,MAAM,QAAQ,mBAAmB,CAAC,WAChC,MAAM,QAAQ,IAAI,CAAC,2CA88B7B,CAAC"}