@aztec/end-to-end 0.82.3 → 0.83.0

package/dest/fixtures/utils.js

@@ -2,13 +2,13 @@ import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
 import { deployFundedSchnorrAccounts, generateSchnorrAccounts, getDeployedTestAccounts, getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
 import { createArchiver } from '@aztec/archiver';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { BatchCall, FeeJuicePaymentMethod, SignerlessWallet, createAztecNodeClient, createLogger, createPXEClient, makeFetch, waitForPXE } from '@aztec/aztec.js';
+import { BatchCall, SignerlessWallet, createAztecNodeClient, createLogger, createPXEClient, makeFetch, waitForPXE } from '@aztec/aztec.js';
 import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
 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 { FEE_JUICE_INITIAL_MINT, GENESIS_ARCHIVE_ROOT, GENESIS_BLOCK_HASH, SPONSORED_FPC_SALT } from '@aztec/constants';
+import { GENESIS_ARCHIVE_ROOT, GENESIS_BLOCK_HASH, 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 { DelayedTxUtils, EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
@@ -17,16 +17,14 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { retryUntil } from '@aztec/foundation/retry';
 import { TestDateProvider } from '@aztec/foundation/timer';
-import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { createProverNode } from '@aztec/prover-node';
 import { createPXEServiceWithSimulationProvider, getPXEServiceConfig } from '@aztec/pxe/server';
 import { WASMSimulator } from '@aztec/simulator/client';
 import { SimulationProviderRecorderWrapper } from '@aztec/simulator/testing';
 import { getContractClassFromArtifact, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
-import { Gas } from '@aztec/stdlib/gas';
 import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
 import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
 import { getGenesisValues } from '@aztec/world-state/testing';
@@ -34,7 +32,6 @@ import fs from 'fs/promises';
 import getPort from 'get-port';
 import { tmpdir } from 'os';
 import * as path from 'path';
-import { inspect } from 'util';
 import { getContract } from 'viem';
 import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
@@ -71,7 +68,6 @@ export const getPrivateKeyFromIndex = (index)=>{
 };
 export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, chain = foundry)=>{
     const l1Data = await deployL1Contracts(l1RpcUrls, account, chain, logger, {
-        l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
         vkTreeRoot: getVKTreeRoot(),
         protocolContractTreeRoot,
         genesisArchiveRoot: args.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
@@ -155,7 +151,6 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
     };
     const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxeClient);
     const teardown = ()=>Promise.resolve();
-    await setupCanonicalFeeJuice(pxeClient);
     logger.verbose('Constructing available wallets from already registered accounts...');
     const initialFundedAccounts = await getDeployedTestAccounts(pxeClient);
     const wallets = await getDeployedTestAccountsWallets(pxeClient);
@@ -191,221 +186,226 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
  */ export async function setup(numberOfAccounts = 1, opts = {
     customForwarderContractAddress: EthAddress.ZERO
 }, pxeOpts = {}, chain = foundry) {
-    const config = {
-        ...getConfigEnvVars(),
-        ...opts
-    };
-    config.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
-    // For tests we only want proving enabled if specifically requested
-    config.realProofs = !!opts.realProofs;
-    const logger = getLogger();
-    // Create a temp directory for any services that need it and cleanup later
-    const directoryToCleanup = path.join(tmpdir(), randomBytes(8).toString('hex'));
-    await fs.mkdir(directoryToCleanup, {
-        recursive: true
-    });
-    if (!config.dataDirectory) {
-        config.dataDirectory = directoryToCleanup;
-    }
     let anvil;
-    if (!config.l1RpcUrls?.length) {
-        if (!isAnvilTestChain(chain.id)) {
-            throw new Error(`No ETHEREUM_HOSTS set but non anvil chain requested`);
+    try {
+        const config = {
+            ...getConfigEnvVars(),
+            ...opts
+        };
+        config.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
+        // For tests we only want proving enabled if specifically requested
+        config.realProofs = !!opts.realProofs;
+        // Only enforce the time table if requested
+        config.enforceTimeTable = !!opts.enforceTimeTable;
+        const logger = getLogger();
+        // Create a temp directory for any services that need it and cleanup later
+        const directoryToCleanup = path.join(tmpdir(), randomBytes(8).toString('hex'));
+        await fs.mkdir(directoryToCleanup, {
+            recursive: true
+        });
+        if (!config.dataDirectory) {
+            config.dataDirectory = directoryToCleanup;
         }
+        if (!config.l1RpcUrls?.length) {
+            if (!isAnvilTestChain(chain.id)) {
+                throw new Error(`No ETHEREUM_HOSTS set but non anvil chain requested`);
+            }
+            if (PXE_URL) {
+                throw new Error(`PXE_URL provided but no ETHEREUM_HOSTS set. Refusing to run, please set both variables so tests can deploy L1 contracts to the same Anvil instance`);
+            }
+            const res = await startAnvil({
+                l1BlockTime: opts.ethereumSlotDuration
+            });
+            anvil = res.anvil;
+            config.l1RpcUrls = [
+                res.rpcUrl
+            ];
+        }
+        // Enable logging metrics to a local file named after the test suite
+        if (isMetricsLoggingRequested()) {
+            const filename = path.join('log', getJobName() + '.jsonl');
+            logger.info(`Logging metrics to ${filename}`);
+            setupMetricsLogger(filename);
+        }
+        const ethCheatCodes = new EthCheatCodesWithState(config.l1RpcUrls);
+        if (opts.stateLoad) {
+            await ethCheatCodes.loadChainState(opts.stateLoad);
+        }
+        if (opts.l1StartTime) {
+            await ethCheatCodes.warp(opts.l1StartTime);
+        }
+        let publisherPrivKey = undefined;
+        let publisherHdAccount = undefined;
+        if (config.publisherPrivateKey && config.publisherPrivateKey != NULL_KEY) {
+            publisherHdAccount = privateKeyToAccount(config.publisherPrivateKey);
+        } else if (!MNEMONIC) {
+            throw new Error(`Mnemonic not provided and no publisher private key`);
+        } else {
+            publisherHdAccount = mnemonicToAccount(MNEMONIC, {
+                addressIndex: 0
+            });
+            const publisherPrivKeyRaw = publisherHdAccount.getHdKey().privateKey;
+            publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
+            config.publisherPrivateKey = `0x${publisherPrivKey.toString('hex')}`;
+        }
+        // Made as separate values such that keys can change, but for test they will be the same.
+        config.validatorPrivateKey = config.publisherPrivateKey;
         if (PXE_URL) {
-            throw new Error(`PXE_URL provided but no ETHEREUM_HOSTS set. Refusing to run, please set both variables so tests can deploy L1 contracts to the same Anvil instance`);
+            // we are setting up against a remote environment, l1 contracts are assumed to already be deployed
+            return await setupWithRemoteEnvironment(publisherHdAccount, config, logger, numberOfAccounts);
         }
-        const res = await startAnvil({
-            l1BlockTime: opts.ethereumSlotDuration
-        });
-        anvil = res.anvil;
-        config.l1RpcUrls = [
-            res.rpcUrl
-        ];
-    }
-    // Enable logging metrics to a local file named after the test suite
-    if (isMetricsLoggingRequested()) {
-        const filename = path.join('log', getJobName() + '.jsonl');
-        logger.info(`Logging metrics to ${filename}`);
-        setupMetricsLogger(filename);
-    }
-    const ethCheatCodes = new EthCheatCodesWithState(config.l1RpcUrls);
-    if (opts.stateLoad) {
-        await ethCheatCodes.loadChainState(opts.stateLoad);
-    }
-    if (opts.l1StartTime) {
-        await ethCheatCodes.warp(opts.l1StartTime);
-    }
-    let publisherPrivKey = undefined;
-    let publisherHdAccount = undefined;
-    if (config.publisherPrivateKey && config.publisherPrivateKey != NULL_KEY) {
-        publisherHdAccount = privateKeyToAccount(config.publisherPrivateKey);
-    } else if (!MNEMONIC) {
-        throw new Error(`Mnemonic not provided and no publisher private key`);
-    } else {
-        publisherHdAccount = mnemonicToAccount(MNEMONIC, {
-            addressIndex: 0
-        });
-        const publisherPrivKeyRaw = publisherHdAccount.getHdKey().privateKey;
-        publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
-        config.publisherPrivateKey = `0x${publisherPrivKey.toString('hex')}`;
-    }
-    // Made as separate values such that keys can change, but for test they will be the same.
-    config.validatorPrivateKey = config.publisherPrivateKey;
-    if (PXE_URL) {
-        // we are setting up against a remote environment, l1 contracts are assumed to already be deployed
-        return await setupWithRemoteEnvironment(publisherHdAccount, config, logger, numberOfAccounts);
-    }
-    const initialFundedAccounts = opts.initialFundedAccounts ?? await generateSchnorrAccounts(opts.numberOfInitialFundedAccounts ?? numberOfAccounts);
-    const { genesisBlockHash, genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address), opts.initialAccountFeeJuice, opts.genesisPublicData);
-    const deployL1ContractsValues = opts.deployL1ContractsValues ?? await setupL1Contracts(config.l1RpcUrls, publisherHdAccount, logger, {
-        ...opts,
-        genesisArchiveRoot,
-        genesisBlockHash
-    }, chain);
-    config.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
-    if (opts.fundRewardDistributor) {
-        // Mints block rewards for 10000 blocks to the rewardDistributor contract
-        const rewardDistributor = getContract({
-            address: deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
-            abi: l1Artifacts.rewardDistributor.contractAbi,
-            client: deployL1ContractsValues.publicClient
-        });
-        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
-        });
-        const rewardDistributorMintTxHash = await feeJuice.write.mint([
-            rewardDistributor.address,
-            mintAmount
-        ], {});
-        await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-            hash: rewardDistributorMintTxHash
-        });
-        logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
-    }
-    if (opts.l2StartTime) {
-        // This should only be used in synching test or when you need to have a stable
-        // timestamp for the first l2 block.
-        await ethCheatCodes.warp(opts.l2StartTime);
-    }
-    const dateProvider = new TestDateProvider();
-    const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.publicClient, dateProvider);
-    await watcher.start();
-    const telemetry = getTelemetryClient(opts.telemetryConfig);
-    // Blob sink service - blobs get posted here and served from here
-    const blobSinkPort = await getPort();
-    const blobSink = await createBlobSinkServer({
-        l1ChainId: config.l1ChainId,
-        l1RpcUrls: config.l1RpcUrls,
-        rollupAddress: config.l1Contracts.rollupAddress,
-        port: blobSinkPort,
-        dataDirectory: config.dataDirectory,
-        dataStoreMapSizeKB: config.dataStoreMapSizeKB
-    }, telemetry);
-    await blobSink.start();
-    config.blobSinkUrl = `http://localhost:${blobSinkPort}`;
-    logger.verbose('Creating and synching an aztec node...');
-    const acvmConfig = await getACVMConfig(logger);
-    if (acvmConfig) {
-        config.acvmWorkingDirectory = acvmConfig.acvmWorkingDirectory;
-        config.acvmBinaryPath = acvmConfig.acvmBinaryPath;
-    }
-    const bbConfig = await getBBConfig(logger);
-    if (bbConfig) {
-        config.bbBinaryPath = bbConfig.bbBinaryPath;
-        config.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
-    }
-    config.l1PublishRetryIntervalMS = 100;
-    const blobSinkClient = createBlobSinkClient(config);
-    const aztecNode = await AztecNodeService.createAndSync(config, {
-        dateProvider,
-        blobSinkClient,
-        telemetry
-    }, {
-        prefilledPublicData
-    });
-    const sequencer = aztecNode.getSequencer();
-    if (sequencer) {
-        const publisher = sequencer.sequencer.publisher;
-        publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration);
-    }
-    let proverNode = undefined;
-    if (opts.startProverNode) {
-        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')));
-    }
-    logger.verbose('Creating a pxe...');
-    const { pxe, teardown: pxeTeardown } = await setupPXEService(aztecNode, pxeOpts, logger);
-    if (!config.skipProtocolContracts) {
-        logger.verbose('Setting up Fee Juice...');
-        await setupCanonicalFeeJuice(pxe);
-    }
-    const accountManagers = await deployFundedSchnorrAccounts(pxe, initialFundedAccounts.slice(0, numberOfAccounts));
-    const wallets = await Promise.all(accountManagers.map((account)=>account.getWallet()));
-    if (initialFundedAccounts.length < numberOfAccounts) {
-        // TODO: Create (numberOfAccounts - initialFundedAccounts.length) wallets without funds.
-        throw new Error(`Unable to deploy ${numberOfAccounts} accounts. Only ${initialFundedAccounts.length} accounts were funded.`);
-    }
-    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxe);
-    const teardown = async ()=>{
-        await pxeTeardown();
-        if (aztecNode instanceof AztecNodeService) {
-            await aztecNode?.stop();
+        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 deployL1ContractsValues = opts.deployL1ContractsValues ?? await setupL1Contracts(config.l1RpcUrls, publisherHdAccount, logger, {
+            ...opts,
+            genesisArchiveRoot,
+            genesisBlockHash,
+            feeJuicePortalInitialBalance: fundingNeeded
+        }, chain);
+        config.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
+        if (opts.fundRewardDistributor) {
+            // Mints block rewards for 10000 blocks to the rewardDistributor contract
+            const rewardDistributor = getContract({
+                address: deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
+                abi: l1Artifacts.rewardDistributor.contractAbi,
+                client: deployL1ContractsValues.publicClient
+            });
+            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
+            });
+            const rewardDistributorMintTxHash = await feeJuice.write.mint([
+                rewardDistributor.address,
+                mintAmount
+            ], {});
+            await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
+                hash: rewardDistributorMintTxHash
+            });
+            logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
         }
-        if (proverNode) {
-            await proverNode.stop();
+        if (opts.l2StartTime) {
+            // This should only be used in synching test or when you need to have a stable
+            // timestamp for the first l2 block.
+            await ethCheatCodes.warp(opts.l2StartTime);
         }
-        if (acvmConfig?.cleanup) {
-            // remove the temp directory created for the acvm
-            logger.verbose(`Cleaning up ACVM state`);
-            await acvmConfig.cleanup();
+        const dateProvider = new TestDateProvider();
+        const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.publicClient, dateProvider);
+        await watcher.start();
+        const telemetry = getTelemetryClient(opts.telemetryConfig);
+        // Blob sink service - blobs get posted here and served from here
+        const blobSinkPort = await getPort();
+        const blobSink = await createBlobSinkServer({
+            l1ChainId: config.l1ChainId,
+            l1RpcUrls: config.l1RpcUrls,
+            rollupAddress: config.l1Contracts.rollupAddress,
+            port: blobSinkPort,
+            dataDirectory: config.dataDirectory,
+            dataStoreMapSizeKB: config.dataStoreMapSizeKB
+        }, telemetry);
+        await blobSink.start();
+        config.blobSinkUrl = `http://localhost:${blobSinkPort}`;
+        logger.verbose('Creating and synching an aztec node...');
+        const acvmConfig = await getACVMConfig(logger);
+        if (acvmConfig) {
+            config.acvmWorkingDirectory = acvmConfig.acvmWorkingDirectory;
+            config.acvmBinaryPath = acvmConfig.acvmBinaryPath;
         }
-        if (bbConfig?.cleanup) {
-            // remove the temp directory created for the acvm
-            logger.verbose(`Cleaning up BB state`);
-            await bbConfig.cleanup();
+        const bbConfig = await getBBConfig(logger);
+        if (bbConfig) {
+            config.bbBinaryPath = bbConfig.bbBinaryPath;
+            config.bbWorkingDirectory = bbConfig.bbWorkingDirectory;
         }
-        await anvil?.stop().catch((err)=>getLogger().error(err));
-        await watcher.stop();
-        await blobSink?.stop();
-        if (directoryToCleanup) {
-            try {
-                logger.verbose(`Cleaning up data directory at ${directoryToCleanup}`);
-                await fs.rm(directoryToCleanup, {
-                    recursive: true,
-                    force: true,
-                    maxRetries: 3
-                });
-            } catch (err) {
-                logger.warn(`Failed to delete data directory at ${directoryToCleanup}: ${err}`);
-            }
+        config.l1PublishRetryIntervalMS = 100;
+        const blobSinkClient = createBlobSinkClient(config);
+        const aztecNode = await AztecNodeService.createAndSync(config, {
+            dateProvider,
+            blobSinkClient,
+            telemetry
+        }, {
+            prefilledPublicData
+        });
+        const sequencer = aztecNode.getSequencer();
+        if (sequencer) {
+            const publisher = sequencer.sequencer.publisher;
+            publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration);
         }
-    };
-    return {
-        aztecNode,
-        aztecNodeAdmin: aztecNode,
-        blobSink,
-        cheatCodes,
-        config,
-        dateProvider,
-        deployL1ContractsValues,
-        initialFundedAccounts,
-        logger,
-        proverNode,
-        pxe,
-        sequencer,
-        teardown,
-        telemetryClient: telemetry,
-        wallet: wallets[0],
-        wallets,
-        watcher
-    };
+        let proverNode = undefined;
+        if (opts.startProverNode) {
+            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')));
+        }
+        logger.verbose('Creating a pxe...');
+        const { pxe, teardown: pxeTeardown } = await setupPXEService(aztecNode, pxeOpts, logger);
+        const accountManagers = await deployFundedSchnorrAccounts(pxe, initialFundedAccounts.slice(0, numberOfAccounts));
+        const wallets = await Promise.all(accountManagers.map((account)=>account.getWallet()));
+        if (initialFundedAccounts.length < numberOfAccounts) {
+            // TODO: Create (numberOfAccounts - initialFundedAccounts.length) wallets without funds.
+            throw new Error(`Unable to deploy ${numberOfAccounts} accounts. Only ${initialFundedAccounts.length} accounts were funded.`);
+        }
+        const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxe);
+        const teardown = async ()=>{
+            await pxeTeardown();
+            if (aztecNode instanceof AztecNodeService) {
+                await aztecNode?.stop();
+            }
+            if (proverNode) {
+                await proverNode.stop();
+            }
+            if (acvmConfig?.cleanup) {
+                // remove the temp directory created for the acvm
+                logger.verbose(`Cleaning up ACVM state`);
+                await acvmConfig.cleanup();
+            }
+            if (bbConfig?.cleanup) {
+                // remove the temp directory created for the acvm
+                logger.verbose(`Cleaning up BB state`);
+                await bbConfig.cleanup();
+            }
+            await anvil?.stop().catch((err)=>getLogger().error(err));
+            await watcher.stop();
+            await blobSink?.stop();
+            if (directoryToCleanup) {
+                try {
+                    logger.verbose(`Cleaning up data directory at ${directoryToCleanup}`);
+                    await fs.rm(directoryToCleanup, {
+                        recursive: true,
+                        force: true,
+                        maxRetries: 3
+                    });
+                } catch (err) {
+                    logger.warn(`Failed to delete data directory at ${directoryToCleanup}: ${err}`);
+                }
+            }
+        };
+        return {
+            aztecNode,
+            aztecNodeAdmin: aztecNode,
+            blobSink,
+            cheatCodes,
+            config,
+            dateProvider,
+            deployL1ContractsValues,
+            initialFundedAccounts,
+            logger,
+            proverNode,
+            pxe,
+            sequencer,
+            teardown,
+            telemetryClient: telemetry,
+            wallet: wallets[0],
+            wallets,
+            watcher
+        };
+    } catch (err) {
+        // TODO: Just hoisted anvil for now to ensure cleanup. Prob need to hoist the rest.
+        await anvil?.stop();
+        throw err;
+    }
 }
 /**
  * Registers the contract class used for test accounts and publicly deploys the instances requested.
@@ -482,28 +482,6 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
     const diffs = outputs.map((output, i)=>output - initialValues[i]);
     expect(diffs).toEqual(expectedDiffs);
 }
-/**
- * Deploy the canonical Fee Juice contract to a running instance.
- */ export async function setupCanonicalFeeJuice(pxe) {
-    // "deploy" the Fee Juice as it contains public functions
-    const feeJuicePortalAddress = (await pxe.getNodeInfo()).l1ContractAddresses.feeJuicePortalAddress;
-    const wallet = new SignerlessWallet(pxe);
-    const feeJuice = await FeeJuiceContract.at(ProtocolContractAddress.FeeJuice, wallet);
-    try {
-        const paymentMethod = new FeeJuicePaymentMethod(ProtocolContractAddress.FeeJuice);
-        await feeJuice.methods.initialize(feeJuicePortalAddress, FEE_JUICE_INITIAL_MINT).send({
-            fee: {
-                paymentMethod,
-                gasSettings: {
-                    teardownGasLimits: Gas.empty()
-                }
-            }
-        }).wait();
-        getLogger().info(`Fee Juice successfully setup. Portal address: ${feeJuicePortalAddress}`);
-    } catch (error) {
-        getLogger().warn(`Fee Juice might have already been setup. Got error: ${inspect(error)}.`);
-    }
-}
 /**
  * Computes the address of the "canonical" SponosoredFPCContract. This is not a protocol contract
  * but by conventions its address is computed with a salt of 0.
@@ -517,8 +495,8 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
 /**
  * Deploy a sponsored FPC contract to a running instance.
  */ export async function setupSponsoredFPC(pxe) {
-    const { l1ChainId: chainId, protocolVersion } = await pxe.getNodeInfo();
-    const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, protocolVersion));
+    const { l1ChainId: chainId, rollupVersion } = await pxe.getNodeInfo();
+    const deployer = new SignerlessWallet(pxe, new DefaultMultiCallEntrypoint(chainId, rollupVersion));
     // Make the contract pay for the deployment fee itself
     const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
     const deployed = await SponsoredFPCContract.deploy(deployer).send({

package/dest/shared/cross_chain_test_harness.d.ts

@@ -118,7 +118,7 @@ export declare class CrossChainTestHarness {
     expectPrivateBalanceOnL2(owner: AztecAddress, expectedBalance: bigint): Promise<void>;
     getL2PublicBalanceOf(owner: AztecAddress): Promise<any>;
     expectPublicBalanceOnL2(owner: AztecAddress, expectedBalance: bigint): Promise<void>;
-    getL2ToL1MessageLeaf(withdrawAmount: bigint, callerOnL1?: EthAddress): Fr;
+    getL2ToL1MessageLeaf(withdrawAmount: bigint, callerOnL1?: EthAddress): Promise<Fr>;
     withdrawFundsFromBridgeOnL1(amount: bigint, blockNumber: number | bigint, messageIndex: bigint, siblingPath: SiblingPath<number>): Promise<void>;
     transferToPrivateOnL2(shieldAmount: bigint): Promise<void>;
     transferToPublicOnL2(amount: bigint, nonce?: Fr): Promise<void>;

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

@@ -174,8 +174,8 @@ import { mintTokensToPrivate } from '../fixtures/token_utils.js';
         const balance = await this.getL2PublicBalanceOf(owner);
         expect(balance).toBe(expectedBalance);
     }
-    getL2ToL1MessageLeaf(withdrawAmount, callerOnL1 = EthAddress.ZERO) {
-        return this.l1TokenPortalManager.getL2ToL1MessageLeaf(withdrawAmount, this.ethAccount, this.l2Bridge.address, callerOnL1);
+    async getL2ToL1MessageLeaf(withdrawAmount, callerOnL1 = EthAddress.ZERO) {
+        return await this.l1TokenPortalManager.getL2ToL1MessageLeaf(withdrawAmount, this.ethAccount, this.l2Bridge.address, callerOnL1);
     }
     withdrawFundsFromBridgeOnL1(amount, blockNumber, messageIndex, siblingPath) {
         return this.l1TokenPortalManager.withdrawFunds(amount, this.ethAccount, BigInt(blockNumber), messageIndex, siblingPath);

package/dest/shared/uniswap_l1_l2.js

@@ -44,12 +44,14 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
         const uniswapFeeTier = 3000n;
         const minimumOutputAmount = 0n;
         let cheatCodes;
+        let version;
         beforeAll(async ()=>{
             ({ aztecNode, pxe, logger, publicClient, walletClient, ownerWallet, sponsorWallet, deployL1ContractsValues, cheatCodes } = await setup());
             if (Number(await publicClient.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.l1ContractAddresses.rollupAddress);
+            version = Number(await rollup.getVersion());
             ownerAddress = ownerWallet.getAddress();
             // sponsorAddress = sponsorWallet.getAddress();
             ownerEthAddress = EthAddress.fromString((await walletClient.getAddresses())[0]);
@@ -135,7 +137,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const swapPrivateLeaf = sha256ToField([
                 uniswapL2Contract.address,
-                new Fr(1),
+                new Fr(version),
                 EthAddress.fromString(uniswapPortal.address).toBuffer32(),
                 new Fr(publicClient.chain.id),
                 swapPrivateContent
@@ -148,7 +150,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const withdrawLeaf = sha256ToField([
                 wethCrossChainHarness.l2Bridge.address,
-                new Fr(1),
+                new Fr(version),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
                 new Fr(publicClient.chain.id),
                 withdrawContent
@@ -532,7 +534,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const swapPrivateLeaf = sha256ToField([
                 uniswapL2Contract.address,
-                new Fr(1),
+                new Fr(version),
                 EthAddress.fromString(uniswapPortal.address).toBuffer32(),
                 new Fr(publicClient.chain.id),
                 swapPrivateContent
@@ -545,7 +547,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const withdrawLeaf = sha256ToField([
                 wethCrossChainHarness.l2Bridge.address,
-                new Fr(1),
+                new Fr(version),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
                 new Fr(publicClient.chain.id),
                 withdrawContent
@@ -612,7 +614,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const swapPublicLeaf = sha256ToField([
                 uniswapL2Contract.address,
-                new Fr(1),
+                new Fr(version),
                 EthAddress.fromString(uniswapPortal.address).toBuffer32(),
                 new Fr(publicClient.chain.id),
                 swapPublicContent
@@ -625,7 +627,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
             ]);
             const withdrawLeaf = sha256ToField([
                 wethCrossChainHarness.l2Bridge.address,
-                new Fr(1),
+                new Fr(version),
                 wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
                 new Fr(publicClient.chain.id),
                 withdrawContent