@aztec/end-to-end 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/fixtures/utils.js

@@ -2,25 +2,32 @@ 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 { AnvilTestWatcher, BatchCall, CheatCodes, FeeJuicePaymentMethod, SignerlessWallet, createAztecNodeClient, createLogger, createPXEClient, deployL1Contracts, makeFetch, waitForPXE } from '@aztec/aztec.js';
-import { deployInstance, registerContractClass } from '@aztec/aztec.js/deployment';
+import { BatchCall, createAztecNodeClient, createLogger, createPXEClient, makeFetch, sleep, waitForPXE } from '@aztec/aztec.js';
+import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
+import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/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 } from '@aztec/constants';
-import { ForwarderContract, NULL_KEY, createL1Clients, getL1ContractsConfigEnvVars, isAnvilTestChain, l1Artifacts } from '@aztec/ethereum';
-import { DelayedTxUtils, EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
+import { GENESIS_ARCHIVE_ROOT, SPONSORED_FPC_SALT } from '@aztec/constants';
+import { FeeAssetArtifact, NULL_KEY, RollupContract, createExtendedL1Client, deployL1Contracts, deployMulticall3, getL1ContractsConfigEnvVars, isAnvilTestChain } from '@aztec/ethereum';
+import { DelayedTxUtils, EthCheatCodes, EthCheatCodesWithState, createDelayedL1TxUtilsFromViemWallet, startAnvil } from '@aztec/ethereum/test';
+import { SecretValue } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
+import { tryRmDir } from '@aztec/foundation/fs';
+import { withLogNameSuffix } from '@aztec/foundation/log';
 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 { MockGossipSubNetwork, getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { createProverNode } from '@aztec/prover-node';
-import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
-import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
-import { Gas } from '@aztec/stdlib/gas';
+import { createPXEServiceWithSimulator, getPXEServiceConfig } from '@aztec/pxe/server';
+import { MemoryCircuitRecorder, SimulatorRecorderWrapper, WASMSimulator } from '@aztec/simulator/client';
+import { FileCircuitRecorder } from '@aztec/simulator/testing';
+import { getContractClassFromArtifact, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
+import { tryStop } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryConfig, initTelemetryClient } from '@aztec/telemetry-client';
 import { BenchmarkTelemetryClient } from '@aztec/telemetry-client/bench';
 import { getGenesisValues } from '@aztec/world-state/testing';
@@ -28,9 +35,8 @@ 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 { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
 import { MNEMONIC, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
 import { getACVMConfig } from './get_acvm_config.js';
@@ -65,14 +71,13 @@ 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),
-        genesisBlockHash: args.genesisBlockHash ?? new Fr(GENESIS_BLOCK_HASH),
         salt: args.salt,
         initialValidators: args.initialValidators,
         ...getL1ContractsConfigEnvVars(),
+        realVerifier: false,
         ...args
     });
     return l1Data;
@@ -81,35 +86,28 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
  * Sets up Private eXecution Environment (PXE).
  * @param aztecNode - An instance of Aztec Node.
  * @param opts - Partial configuration for the PXE service.
- * @param firstPrivKey - The private key of the first account to be created.
  * @param logger - The logger to be used.
  * @param useLogSuffix - Whether to add a randomly generated suffix to the PXE debug logs.
- * @param proofCreator - An optional proof creator to use
- * @returns Private eXecution Environment (PXE), accounts, wallets and logger.
- */ export async function setupPXEService(aztecNode, opts = {}, logger = getLogger(), useLogSuffix = false, proofCreator) {
+ * @returns Private eXecution Environment (PXE), logger and teardown function.
+ */ export async function setupPXEService(aztecNode, opts = {}, logger = getLogger(), useLogSuffix = false) {
     const pxeServiceConfig = {
         ...getPXEServiceConfig(),
         ...opts
     };
+    // For tests we only want proving enabled if specifically requested
+    pxeServiceConfig.proverEnabled = !!opts.proverEnabled;
     // If no data directory provided, create a temp directory and clean up afterwards
     const configuredDataDirectory = pxeServiceConfig.dataDirectory;
     if (!configuredDataDirectory) {
         pxeServiceConfig.dataDirectory = path.join(tmpdir(), randomBytes(8).toString('hex'));
     }
-    const pxe = await createPXEService(aztecNode, pxeServiceConfig, useLogSuffix, proofCreator);
-    const teardown = async ()=>{
-        if (!configuredDataDirectory) {
-            try {
-                await fs.rm(pxeServiceConfig.dataDirectory, {
-                    recursive: true,
-                    force: true,
-                    maxRetries: 3
-                });
-            } catch (err) {
-                logger.warn(`Failed to delete tmp PXE data directory ${pxeServiceConfig.dataDirectory}: ${err}`);
-            }
-        }
-    };
+    const simulator = new WASMSimulator();
+    const recorder = process.env.CIRCUIT_RECORD_DIR ? new FileCircuitRecorder(process.env.CIRCUIT_RECORD_DIR) : new MemoryCircuitRecorder();
+    const simulatorWithRecorder = new SimulatorRecorderWrapper(simulator, recorder);
+    const pxe = await createPXEServiceWithSimulator(aztecNode, simulatorWithRecorder, pxeServiceConfig, {
+        useLogSuffix
+    });
+    const teardown = configuredDataDirectory ? ()=>Promise.resolve() : ()=>tryRmDir(pxeServiceConfig.dataDirectory);
     return {
         pxe,
         logger,
@@ -138,16 +136,16 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
     await waitForPXE(pxeClient, logger);
     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 { l1ContractAddresses, rollupVersion } = await pxeClient.getNodeInfo();
+    const l1Client = createExtendedL1Client(config.l1RpcUrls, account, foundry);
     const deployL1ContractsValues = {
-        l1ContractAddresses: l1Contracts,
-        walletClient,
-        publicClient
+        l1ContractAddresses,
+        l1Client,
+        rollupVersion
     };
+    const ethCheatCodes = new EthCheatCodes(config.l1RpcUrls);
     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);
@@ -157,17 +155,21 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
     }
     return {
         aztecNode,
+        aztecNodeAdmin: undefined,
         sequencer: undefined,
         proverNode: undefined,
         pxe: pxeClient,
         deployL1ContractsValues,
-        accounts: await pxeClient.getRegisteredAccounts(),
         config,
         initialFundedAccounts,
+        wallets,
         wallet: wallets[0],
-        wallets: wallets.slice(0, numberOfAccounts),
+        accounts: wallets.slice(0, numberOfAccounts).map((w)=>w.getAddress()),
         logger,
         cheatCodes,
+        ethCheatCodes,
+        prefilledPublicData: undefined,
+        mockGossipSubNetwork: undefined,
         watcher: undefined,
         dateProvider: undefined,
         blobSink: undefined,
@@ -180,215 +182,305 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
  * @param numberOfAccounts - The number of new accounts to be created once the PXE is initiated.
  * @param opts - Options to pass to the node initialization and to the setup script.
  * @param pxeOpts - Options to pass to the PXE initialization.
- */ export async function setup(numberOfAccounts = 1, opts = {
-    customForwarderContractAddress: EthAddress.ZERO
-}, pxeOpts = {}, chain = foundry) {
-    const config = {
-        ...getConfigEnvVars(),
-        ...opts
-    };
-    config.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
-    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;
-    }
+ */ export async function setup(numberOfAccounts = 1, opts = {}, pxeOpts = {}, chain = foundry) {
     let anvil;
-    if (!config.l1RpcUrls?.length) {
-        if (!isAnvilTestChain(chain.id)) {
-            throw new Error(`No ETHEREUM_HOSTS set but non anvil chain requested`);
+    try {
+        opts.aztecTargetCommitteeSize ??= 0;
+        opts.slasherFlavor ??= 'none';
+        const config = {
+            ...getConfigEnvVars(),
+            ...opts
+        };
+        // use initialValidators for the node config
+        config.validatorPrivateKeys = new SecretValue(opts.initialValidators?.map((v)=>v.privateKey) ?? []);
+        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,
+                accounts: opts.anvilAccounts,
+                port: opts.anvilPort
+            });
+            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, {
+                resetBlockInterval: true
+            });
+        }
+        let publisherPrivKey = undefined;
+        let publisherHdAccount = undefined;
+        if (opts.l1PublisherKey && opts.l1PublisherKey.getValue() && opts.l1PublisherKey.getValue() != NULL_KEY) {
+            publisherHdAccount = privateKeyToAccount(opts.l1PublisherKey.getValue());
+        } else if (config.publisherPrivateKeys && config.publisherPrivateKeys.length > 0 && config.publisherPrivateKeys[0].getValue() != NULL_KEY) {
+            publisherHdAccount = privateKeyToAccount(config.publisherPrivateKeys[0].getValue());
+        } 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.publisherPrivateKeys = [
+                new SecretValue(`0x${publisherPrivKey.toString('hex')}`)
+            ];
+        }
+        config.coinbase = EthAddress.fromString(publisherHdAccount.address);
         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);
-    }
-    // Blob sink service - blobs get posted here and served from here
-    const blobSinkPort = await getPort();
-    const blobSink = await createBlobSinkServer({
-        port: blobSinkPort
-    });
-    await blobSink.start();
-    config.blobSinkUrl = `http://localhost:${blobSinkPort}`;
-    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 initialFundedAccounts = opts.initialFundedAccounts ?? await generateSchnorrAccounts(opts.numberOfInitialFundedAccounts ?? numberOfAccounts);
+        const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address), opts.initialAccountFeeJuice, opts.genesisPublicData);
+        const wasAutomining = await ethCheatCodes.isAutoMining();
+        const enableAutomine = opts.automineL1Setup && !wasAutomining && isAnvilTestChain(chain.id);
+        if (enableAutomine) {
+            await ethCheatCodes.setAutomine(true);
+        }
+        const l1Client = createExtendedL1Client(config.l1RpcUrls, publisherHdAccount, chain);
+        await deployMulticall3(l1Client, logger);
+        const deployL1ContractsValues = opts.deployL1ContractsValues ?? await setupL1Contracts(config.l1RpcUrls, publisherHdAccount, logger, {
+            ...opts,
+            genesisArchiveRoot,
+            feeJuicePortalInitialBalance: fundingNeeded,
+            initialValidators: opts.initialValidators
+        }, chain);
+        config.l1Contracts = deployL1ContractsValues.l1ContractAddresses;
+        config.rollupVersion = deployL1ContractsValues.rollupVersion;
+        if (opts.fundRewardDistributor) {
+            // Mints block rewards for 10000 blocks to the rewardDistributor contract
+            const rollup = new RollupContract(deployL1ContractsValues.l1Client, deployL1ContractsValues.l1ContractAddresses.rollupAddress);
+            const blockReward = await rollup.getBlockReward();
+            const mintAmount = 10_000n * blockReward;
+            const feeJuice = getContract({
+                address: deployL1ContractsValues.l1ContractAddresses.feeJuiceAddress.toString(),
+                abi: FeeAssetArtifact.contractAbi,
+                client: deployL1ContractsValues.l1Client
+            });
+            const rewardDistributorMintTxHash = await feeJuice.write.mint([
+                deployL1ContractsValues.l1ContractAddresses.rewardDistributorAddress.toString(),
+                mintAmount
+            ], {});
+            await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
+                hash: rewardDistributorMintTxHash
+            });
+            logger.info(`Funding rewardDistributor in ${rewardDistributorMintTxHash}`);
+        }
+        if (enableAutomine) {
+            await ethCheatCodes.setAutomine(false);
+            await ethCheatCodes.setIntervalMining(config.ethereumSlotDuration);
+        }
+        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, {
+                resetBlockInterval: true
+            });
+        }
+        const dateProvider = new TestDateProvider();
+        dateProvider.setTime(await ethCheatCodes.timestamp() * 1000);
+        const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
+        if (!opts.disableAnvilTestWatcher) {
+            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,
+            l1Contracts: config.l1Contracts,
+            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', config);
+        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;
+        }
+        const blobSinkClient = createBlobSinkClient(config, {
+            logger: createLogger('node:blob-sink:client')
         });
-        const rewardDistributorMintTxHash = await feeJuice.write.mint([
-            rewardDistributor.address,
-            mintAmount
-        ], {});
-        await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-            hash: rewardDistributorMintTxHash
+        let mockGossipSubNetwork;
+        let p2pClientDeps = undefined;
+        if (opts.mockGossipSubNetwork) {
+            mockGossipSubNetwork = new MockGossipSubNetwork();
+            p2pClientDeps = {
+                p2pServiceFactory: getMockPubSubP2PServiceFactory(mockGossipSubNetwork)
+            };
+        }
+        // Transactions built against the genesis state must be included in block 1, otherwise they are dropped.
+        // To avoid test failures from dropped transactions, we ensure progression beyond genesis before proceeding.
+        // For account deployments, we set minTxsPerBlock=1 and deploy accounts sequentially for guaranteed success.
+        // If no accounts need deployment, we await an empty block to confirm network progression. After either path
+        // completes, we restore the original minTxsPerBlock setting. The deployment and waiting for empty block is
+        // handled by the if-else branches on line 632.
+        // For more details on why the tx would be dropped see `validate_include_by_timestamp` function in
+        // `noir-projects/noir-protocol-circuits/crates/rollup-lib/src/base/components/validation_requests.nr`.
+        //
+        // Note: If the following seems too convoluted or if it starts making problems, we could drop the "progressing
+        // past genesis via an account contract deployment" optimization and just call flush() on the sequencer and wait
+        // for an empty block to be mined. This would simplify it all quite a bit but the setup would be slower for tests
+        // deploying accounts.
+        const originalMinTxsPerBlock = config.minTxsPerBlock;
+        if (originalMinTxsPerBlock === undefined) {
+            throw new Error('minTxsPerBlock is undefined in e2e test setup');
+        }
+        config.minTxsPerBlock = numberOfAccounts === 0 ? 0 : 1;
+        config.p2pEnabled = opts.mockGossipSubNetwork || config.p2pEnabled;
+        config.p2pIp = opts.p2pIp ?? config.p2pIp ?? '127.0.0.1';
+        if (!config.disableValidator) {
+            if ((config.validatorPrivateKeys?.getValue().length ?? 0) === 0) {
+                config.validatorPrivateKeys = new SecretValue([
+                    generatePrivateKey()
+                ]);
+            }
+        }
+        const aztecNode = await AztecNodeService.createAndSync(config, {
+            dateProvider,
+            blobSinkClient,
+            telemetry,
+            p2pClientDeps,
+            logger: createLogger('node:MAIN-aztec-node')
+        }, {
+            prefilledPublicData
         });
-        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();
-    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 telemetry = getTelemetryClient(opts.telemetryConfig);
-    const blobSinkClient = createBlobSinkClient(config);
-    const aztecNode = await AztecNodeService.createAndSync(config, {
-        dateProvider,
-        blobSinkClient
-    }, {
-        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 sequencerClient = aztecNode.getSequencer();
+        if (sequencerClient) {
+            const publisher = sequencerClient.sequencer.publisher;
+            publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration, l1Client);
         }
-        if (proverNode) {
-            await proverNode.stop();
+        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')}`;
+            const proverNodeDataDirectory = path.join(directoryToCleanup, randomBytes(8).toString('hex'));
+            const proverNodeConfig = {
+                ...config.proverNodeConfig,
+                dataDirectory: proverNodeDataDirectory
+            };
+            proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, proverNodeConfig, aztecNode, prefilledPublicData);
         }
-        if (acvmConfig?.cleanup) {
-            // remove the temp directory created for the acvm
-            logger.verbose(`Cleaning up ACVM state`);
-            await acvmConfig.cleanup();
+        logger.verbose('Creating a pxe...');
+        const { pxe, teardown: pxeTeardown } = await setupPXEService(aztecNode, pxeOpts, logger);
+        const cheatCodes = await CheatCodes.create(config.l1RpcUrls, pxe);
+        if (opts.aztecTargetCommitteeSize && opts.aztecTargetCommitteeSize > 0 || opts.initialValidators && opts.initialValidators.length > 0) {
+            // We need to advance such that the committee is set up.
+            await cheatCodes.rollup.advanceToEpoch(await cheatCodes.rollup.getEpoch() + BigInt(config.lagInEpochs + 1), {
+                updateDateProvider: dateProvider
+            });
+            await cheatCodes.rollup.setupEpoch();
+            await cheatCodes.rollup.debugRollup();
         }
-        if (bbConfig?.cleanup) {
-            // remove the temp directory created for the acvm
-            logger.verbose(`Cleaning up BB state`);
-            await bbConfig.cleanup();
+        // Below we continue with what we described in the long comment on line 571.
+        let accountManagers = [];
+        if (numberOfAccounts === 0) {
+            logger.info('No accounts are being deployed, waiting for an empty block 1 to be mined');
+            while(await pxe.getBlockNumber() === 0){
+                await sleep(2000);
+            }
+        } else {
+            logger.info(`${numberOfAccounts} accounts are being deployed. Reliably progressing past genesis by setting minTxsPerBlock to 1 and waiting for the accounts to be deployed`);
+            accountManagers = await deployFundedSchnorrAccounts(pxe, initialFundedAccounts.slice(0, numberOfAccounts));
+        }
+        // Now we restore the original minTxsPerBlock setting.
+        sequencerClient.getSequencer().updateConfig({
+            minTxsPerBlock: originalMinTxsPerBlock
+        });
+        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.`);
         }
-        await anvil?.stop().catch((err)=>getLogger().error(err));
-        await watcher.stop();
-        await blobSink?.stop();
-        if (directoryToCleanup) {
+        const teardown = async ()=>{
             try {
-                logger.verbose(`Cleaning up data directory at ${directoryToCleanup}`);
-                await fs.rm(directoryToCleanup, {
-                    recursive: true,
-                    force: true,
-                    maxRetries: 3
-                });
+                await pxeTeardown();
+                await tryStop(aztecNode, logger);
+                await tryStop(proverNode, logger);
+                if (acvmConfig?.cleanup) {
+                    await acvmConfig.cleanup();
+                }
+                if (bbConfig?.cleanup) {
+                    await bbConfig.cleanup();
+                }
+                await tryStop(watcher, logger);
+                await tryStop(anvil, logger);
+                await tryStop(blobSink, logger);
+                await tryRmDir(directoryToCleanup, logger);
             } catch (err) {
-                logger.warn(`Failed to delete data directory at ${directoryToCleanup}: ${err}`);
+                logger.error(`Error during e2e test teardown`, err);
             }
-        }
-    };
-    return {
-        aztecNode,
-        blobSink,
-        cheatCodes,
-        config,
-        dateProvider,
-        deployL1ContractsValues,
-        initialFundedAccounts,
-        logger,
-        proverNode,
-        pxe,
-        sequencer,
-        teardown,
-        telemetryClient: telemetry,
-        wallet: wallets[0],
-        wallets,
-        watcher
-    };
+        };
+        return {
+            aztecNode,
+            aztecNodeAdmin: aztecNode,
+            blobSink,
+            cheatCodes,
+            ethCheatCodes,
+            config,
+            dateProvider,
+            deployL1ContractsValues,
+            initialFundedAccounts,
+            logger,
+            mockGossipSubNetwork,
+            prefilledPublicData,
+            proverNode,
+            pxe,
+            sequencer: sequencerClient,
+            teardown,
+            telemetryClient: telemetry,
+            wallets,
+            wallet: wallets[0],
+            accounts: wallets.map((w)=>w.getAddress()),
+            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.
@@ -396,26 +488,28 @@ export const setupL1Contracts = async (l1RpcUrls, account, logger, args = {}, ch
  * @param sender - Wallet to send the deployment tx.
  * @param accountsToDeploy - Which accounts to publicly deploy.
  */ // docs:start:public_deploy_accounts
-export async function ensureAccountsPubliclyDeployed(sender, accountsToDeploy) {
+export async function ensureAccountContractsPublished(sender, accountsToDeploy) {
     // We have to check whether the accounts are already deployed. This can happen if the test runs against
     // the sandbox and the test accounts exist
     const accountsAndAddresses = await Promise.all(accountsToDeploy.map(async (account)=>{
         const address = account.getAddress();
         return {
             address,
-            deployed: (await sender.getContractMetadata(address)).isContractPubliclyDeployed
+            deployed: (await sender.getContractMetadata(address)).isContractPublished
         };
     }));
     const instances = (await Promise.all(accountsAndAddresses.filter(({ deployed })=>!deployed).map(({ address })=>sender.getContractMetadata(address)))).map((contractMetadata)=>contractMetadata.contractInstance);
     const contractClass = await getContractClassFromArtifact(SchnorrAccountContractArtifact);
     if (!(await sender.getContractClassMetadata(contractClass.id, true)).isContractClassPubliclyRegistered) {
-        await (await registerContractClass(sender, SchnorrAccountContractArtifact)).send().wait();
+        await (await publishContractClass(sender, SchnorrAccountContractArtifact)).send({
+            from: accountsToDeploy[0].getAddress()
+        }).wait();
     }
-    const requests = await Promise.all(instances.map(async (instance)=>(await deployInstance(sender, instance)).request()));
-    const batch = new BatchCall(sender, [
-        ...requests
-    ]);
-    await batch.send().wait();
+    const requests = await Promise.all(instances.map(async (instance)=>await publishInstance(sender, instance)));
+    const batch = new BatchCall(sender, requests);
+    await batch.send({
+        from: accountsToDeploy[0].getAddress()
+    }).wait();
 }
 // docs:end:public_deploy_accounts
 /**
@@ -446,10 +540,12 @@ export async function ensureAccountsPubliclyDeployed(sender, accountsToDeploy) {
     }
     return createLogger('e2e:' + describeBlockName);
 }
-export function getBalancesFn(symbol, method, logger) {
+export function getBalancesFn(symbol, method, from, logger) {
     const balances = async (...addressLikes)=>{
         const addresses = addressLikes.map((addressLike)=>'address' in addressLike ? addressLike.address : addressLike);
-        const b = await Promise.all(addresses.map((address)=>method(address).simulate()));
+        const b = await Promise.all(addresses.map((address)=>method(address).simulate({
+                from
+            })));
         const debugString = `${symbol} balances: ${addresses.map((address, i)=>`${address}: ${b[i]}`).join(', ')}`;
         logger.verbose(debugString);
         return b;
@@ -468,86 +564,111 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
     expect(diffs).toEqual(expectedDiffs);
 }
 /**
- * Deploy the protocol contracts 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.
+ * @returns The address of the sponsored FPC contract
+ */ export function getSponsoredFPCInstance() {
+    return Promise.resolve(getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
+        salt: new Fr(SPONSORED_FPC_SALT)
+    }));
+}
+/**
+ * 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.
+ * @returns The address of the sponsored FPC contract
+ */ export async function getSponsoredFPCAddress() {
+    const sponsoredFPCInstance = await getSponsoredFPCInstance();
+    return sponsoredFPCInstance.address;
+}
+/**
+ * Deploy a sponsored FPC contract to a running instance.
+ */ export async function setupSponsoredFPC(pxe) {
+    const instance = await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
+        salt: new Fr(SPONSORED_FPC_SALT)
+    });
+    await pxe.registerContract({
+        instance,
+        artifact: SponsoredFPCContract.artifact
+    });
+    getLogger().info(`SponsoredFPC: ${instance.address}`);
+    return instance;
+}
+/**
+ * Registers the SponsoredFPC in this PXE instance
+ * @param pxe - The pxe client
+ */ export async function registerSponsoredFPC(pxe) {
+    await pxe.registerContract({
+        instance: await getSponsoredFPCInstance(),
+        artifact: SponsoredFPCContract.artifact
+    });
 }
 export async function waitForProvenChain(node, targetBlock, timeoutSec = 60, intervalSec = 1) {
     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 = [], proverNodeDeps = {}) {
+    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 = aztecNode && {
+            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,
+            txCollectionNodeRpcUrls: [],
+            realProofs: false,
+            proverAgentCount: 2,
+            publisherPrivateKeys: [
+                new SecretValue(proverNodePrivateKey)
+            ],
+            proverNodeMaxPendingJobs: 10,
+            proverNodeMaxParallelBlocksPerEpoch: 32,
+            proverNodePollingIntervalMs: 200,
+            txGatheringIntervalMs: 1000,
+            txGatheringBatchSize: 10,
+            txGatheringMaxParallelRequestsPerNode: 10,
+            txGatheringTimeoutMs: 24_000,
+            proverNodeFailedEpochStore: undefined,
+            proverId: EthAddress.fromNumber(1),
+            proverNodeEpochProvingDelayMs: undefined,
+            ...proverNodeConfig
+        };
+        const l1TxUtils = createDelayedL1TxUtils(aztecNodeConfig, proverNodePrivateKey, 'prover-node', proverNodeDeps.dateProvider);
+        const proverNode = await createProverNode(proverConfig, {
+            ...proverNodeDeps,
+            aztecNodeTxProvider,
+            archiver: archiver,
+            l1TxUtils
+        }, {
+            prefilledPublicData
+        });
+        getLogger().info(`Created and synced prover node`, {
+            publisherAddress: l1TxUtils.client.account.address
+        });
+        if (!proverNodeConfig.dontStart) {
+            await proverNode.start();
+        }
+        return proverNode;
     });
-    proverNode.start();
-    return proverNode;
 }
-function createDelayedL1TxUtils(aztecNodeConfig, privateKey, logName) {
-    const { publicClient, walletClient } = createL1Clients(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
+function createDelayedL1TxUtils(aztecNodeConfig, privateKey, logName, dateProvider) {
+    const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
     const log = createLogger(logName);
-    const l1TxUtils = new DelayedTxUtils(publicClient, walletClient, log, aztecNodeConfig);
+    const l1TxUtils = createDelayedL1TxUtilsFromViemWallet(l1Client, log, dateProvider, 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);
-    return forwarderContract;
-}