@aztec/end-to-end 0.0.1-commit.e558bd1c → 0.0.1-commit.e5a3663dd

package/dest/fixtures/setup.js

@@ -1,15 +1,13 @@
 import { SchnorrAccountContractArtifact } from '@aztec/accounts/schnorr';
-import { generateSchnorrAccounts, getInitialTestAccountsData } from '@aztec/accounts/testing';
-import { createArchiver } from '@aztec/archiver';
+import { generateSchnorrAccounts } from '@aztec/accounts/testing';
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
+import { NO_FROM } from '@aztec/aztec.js/account';
+import { EthAddress } from '@aztec/aztec.js/addresses';
 import { BatchCall, getContractClassFromArtifact, waitForProven } from '@aztec/aztec.js/contracts';
 import { publishContractClass, publishInstance } from '@aztec/aztec.js/deployment';
 import { Fr } from '@aztec/aztec.js/fields';
 import { createLogger } from '@aztec/aztec.js/log';
-import { createAztecNodeClient, waitForNode } from '@aztec/aztec.js/node';
 import { AnvilTestWatcher, CheatCodes } from '@aztec/aztec/testing';
-import { createBlobClientWithFileStores } from '@aztec/blob-client/client';
 import { SPONSORED_FPC_SALT } from '@aztec/constants';
 import { isAnvilTestChain } from '@aztec/ethereum/chain';
 import { createExtendedL1Client } from '@aztec/ethereum/client';
@@ -17,7 +15,7 @@ import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
 import { NULL_KEY } from '@aztec/ethereum/constants';
 import { deployMulticall3 } from '@aztec/ethereum/contracts';
 import { deployAztecL1Contracts } from '@aztec/ethereum/deploy-aztec-l1-contracts';
-import { DelayedTxUtils, EthCheatCodes, EthCheatCodesWithState, createDelayedL1TxUtilsFromViemWallet, startAnvil } from '@aztec/ethereum/test';
+import { EthCheatCodesWithState, startAnvil } from '@aztec/ethereum/test';
 import { EpochNumber } from '@aztec/foundation/branded-types';
 import { SecretValue } from '@aztec/foundation/config';
 import { randomBytes } from '@aztec/foundation/crypto/random';
@@ -25,32 +23,30 @@ import { tryRmDir } from '@aztec/foundation/fs';
 import { withLoggerBindings } from '@aztec/foundation/log/server';
 import { retryUntil } from '@aztec/foundation/retry';
 import { sleep } from '@aztec/foundation/sleep';
-import { DateProvider, TestDateProvider } from '@aztec/foundation/timer';
+import { TestDateProvider } from '@aztec/foundation/timer';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { MockGossipSubNetwork, getMockPubSubP2PServiceFactory } from '@aztec/p2p/test-helpers';
 import { protocolContractsHash } from '@aztec/protocol-contracts';
-import { createProverNode } from '@aztec/prover-node';
 import { getPXEConfig } from '@aztec/pxe/server';
 import { 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 { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
+import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import fs from 'fs/promises';
 import { tmpdir } from 'os';
 import path from 'path';
 import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 import { foundry } from 'viem/chains';
+import { TestWallet } from '../test-wallet/test_wallet.js';
 import { MNEMONIC, TEST_MAX_PENDING_TX_POOL_COUNT, TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
 import { getACVMConfig } from './get_acvm_config.js';
 import { getBBConfig } from './get_bb_config.js';
 import { isMetricsLoggingRequested, setupMetricsLogger } from './logging.js';
 import { getEndToEndTestTelemetryClient } from './with_telemetry_utils.js';
 export { startAnvil };
-const { AZTEC_NODE_URL = '' } = process.env;
-const getAztecUrl = ()=>AZTEC_NODE_URL;
 let telemetry = undefined;
 async function getTelemetryClient(partialConfig = {}) {
     if (!telemetry) {
@@ -110,65 +106,6 @@ export const getPrivateKeyFromIndex = (index)=>{
         teardown
     };
 }
-/**
- * Function to setup the test against a remote deployment. It is assumed that L1 contract are already deployed
- */ async function setupWithRemoteEnvironment(account, config, logger, numberOfAccounts) {
-    const aztecNodeUrl = getAztecUrl();
-    logger.verbose(`Creating Aztec Node client to remote host ${aztecNodeUrl}`);
-    const aztecNode = createAztecNodeClient(aztecNodeUrl);
-    await waitForNode(aztecNode, logger);
-    logger.verbose('JSON RPC client connected to Aztec Node');
-    logger.verbose(`Retrieving contract addresses from ${aztecNodeUrl}`);
-    const { l1ContractAddresses, rollupVersion } = await aztecNode.getNodeInfo();
-    const l1Client = createExtendedL1Client(config.l1RpcUrls, account, foundry);
-    const deployL1ContractsValues = {
-        l1ContractAddresses,
-        l1Client,
-        rollupVersion
-    };
-    const ethCheatCodes = new EthCheatCodes(config.l1RpcUrls, new DateProvider());
-    const wallet = await TestWallet.create(aztecNode);
-    if (config.walletMinFeePadding !== undefined) {
-        wallet.setMinFeePadding(config.walletMinFeePadding);
-    }
-    const cheatCodes = await CheatCodes.create(config.l1RpcUrls, aztecNode, new DateProvider());
-    const teardown = ()=>Promise.resolve();
-    logger.verbose('Populating wallet from already registered accounts...');
-    const initialFundedAccounts = await getInitialTestAccountsData();
-    if (initialFundedAccounts.length < numberOfAccounts) {
-        throw new Error(`Required ${numberOfAccounts} accounts. Found ${initialFundedAccounts.length}.`);
-    }
-    const testAccounts = await Promise.all(initialFundedAccounts.slice(0, numberOfAccounts).map(async (account)=>{
-        const accountManager = await wallet.createSchnorrAccount(account.secret, account.salt, account.signingKey);
-        return accountManager.address;
-    }));
-    return {
-        anvil: undefined,
-        aztecNode,
-        aztecNodeService: undefined,
-        aztecNodeAdmin: undefined,
-        sequencer: undefined,
-        proverNode: undefined,
-        deployL1ContractsValues,
-        config,
-        aztecNodeConfig: config,
-        initialFundedAccounts,
-        wallet,
-        accounts: testAccounts,
-        logger,
-        cheatCodes,
-        ethCheatCodes,
-        prefilledPublicData: undefined,
-        mockGossipSubNetwork: undefined,
-        watcher: undefined,
-        dateProvider: undefined,
-        telemetryClient: undefined,
-        acvmConfig: undefined,
-        bbConfig: undefined,
-        directoryToCleanup: undefined,
-        teardown
-    };
-}
 /**
  * Sets up the environment for the end-to-end tests.
  * @param numberOfAccounts - The number of new accounts to be created once the PXE is initiated.
@@ -178,7 +115,7 @@ export const getPrivateKeyFromIndex = (index)=>{
     let anvil;
     try {
         opts.aztecTargetCommitteeSize ??= 0;
-        opts.slasherFlavor ??= 'none';
+        opts.slasherEnabled ??= false;
         const config = {
             ...getConfigEnvVars(),
             ...opts
@@ -191,7 +128,10 @@ export const getPrivateKeyFromIndex = (index)=>{
         config.realProofs = !!opts.realProofs;
         // Only enforce the time table if requested
         config.enforceTimeTable = !!opts.enforceTimeTable;
+        // Enable the tx delayer for tests (default config has it disabled, so we force-enable it here)
+        config.enableDelayer = true;
         config.listenAddress = '127.0.0.1';
+        config.minTxPoolAgeMs = opts.minTxPoolAgeMs ?? 0;
         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'));
@@ -201,17 +141,17 @@ export const getPrivateKeyFromIndex = (index)=>{
         if (!config.dataDirectory) {
             config.dataDirectory = directoryToCleanup;
         }
+        const dateProvider = new TestDateProvider();
         if (!config.l1RpcUrls?.length) {
             if (!isAnvilTestChain(chain.id)) {
                 throw new Error(`No ETHEREUM_HOSTS set but non anvil chain requested`);
             }
-            if (AZTEC_NODE_URL) {
-                throw new Error(`AZTEC_NODE_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 ?? (process.env.ANVIL_PORT ? parseInt(process.env.ANVIL_PORT) : undefined)
+                port: opts.anvilPort ?? (process.env.ANVIL_PORT ? parseInt(process.env.ANVIL_PORT) : undefined),
+                slotsInAnEpoch: opts.anvilSlotsInAnEpoch,
+                dateProvider
             });
             anvil = res.anvil;
             config.l1RpcUrls = [
@@ -224,7 +164,6 @@ export const getPrivateKeyFromIndex = (index)=>{
             logger.info(`Logging metrics to ${filename}`);
             setupMetricsLogger(filename);
         }
-        const dateProvider = new TestDateProvider();
         const ethCheatCodes = new EthCheatCodesWithState(config.l1RpcUrls, dateProvider);
         if (opts.stateLoad) {
             await ethCheatCodes.loadChainState(opts.stateLoad);
@@ -239,8 +178,8 @@ export const getPrivateKeyFromIndex = (index)=>{
         if (opts.l1PublisherKey && opts.l1PublisherKey.getValue() && opts.l1PublisherKey.getValue() != NULL_KEY) {
             publisherPrivKeyHex = opts.l1PublisherKey.getValue();
             publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
-        } else if (config.publisherPrivateKeys && config.publisherPrivateKeys.length > 0 && config.publisherPrivateKeys[0].getValue() != NULL_KEY) {
-            publisherPrivKeyHex = config.publisherPrivateKeys[0].getValue();
+        } else if (config.sequencerPublisherPrivateKeys && config.sequencerPublisherPrivateKeys.length > 0 && config.sequencerPublisherPrivateKeys[0].getValue() != NULL_KEY) {
+            publisherPrivKeyHex = config.sequencerPublisherPrivateKeys[0].getValue();
             publisherHdAccount = privateKeyToAccount(publisherPrivKeyHex);
         } else if (!MNEMONIC) {
             throw new Error(`Mnemonic not provided and no publisher private key`);
@@ -251,17 +190,13 @@ export const getPrivateKeyFromIndex = (index)=>{
             const publisherPrivKeyRaw = publisherHdAccount.getHdKey().privateKey;
             const publisherPrivKey = publisherPrivKeyRaw === null ? null : Buffer.from(publisherPrivKeyRaw);
             publisherPrivKeyHex = `0x${publisherPrivKey.toString('hex')}`;
-            config.publisherPrivateKeys = [
+            config.sequencerPublisherPrivateKeys = [
                 new SecretValue(publisherPrivKeyHex)
             ];
         }
         if (config.coinbase === undefined) {
             config.coinbase = EthAddress.fromString(publisherHdAccount.address);
         }
-        if (AZTEC_NODE_URL) {
-            // we are setting up against a remote environment, l1 contracts are assumed to already be deployed
-            return await setupWithRemoteEnvironment(publisherHdAccount, config, logger, numberOfAccounts);
-        }
         // Determine which addresses to fund in genesis
         const initialFundedAccounts = opts.initialFundedAccounts ?? await generateSchnorrAccounts(opts.numberOfInitialFundedAccounts ?? Math.max(numberOfAccounts, 10));
         const addressesToFund = initialFundedAccounts.map((a)=>a.address);
@@ -270,7 +205,8 @@ export const getPrivateKeyFromIndex = (index)=>{
             const sponsoredFPCAddress = await getSponsoredFPCAddress();
             addressesToFund.push(sponsoredFPCAddress);
         }
-        const { genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(addressesToFund, opts.initialAccountFeeJuice, opts.genesisPublicData);
+        const genesisTimestamp = BigInt(Math.floor(Date.now() / 1000));
+        const { genesisArchiveRoot, genesis, fundingNeeded } = await getGenesisValues(addressesToFund, opts.initialAccountFeeJuice, opts.genesisPublicData, genesisTimestamp);
         const wasAutomining = await ethCheatCodes.isAutoMining();
         const enableAutomine = opts.automineL1Setup && !wasAutomining && isAnvilTestChain(chain.id);
         if (enableAutomine) {
@@ -300,14 +236,19 @@ export const getPrivateKeyFromIndex = (index)=>{
         if (enableAutomine) {
             await ethCheatCodes.setAutomine(false);
             await ethCheatCodes.setIntervalMining(config.ethereumSlotDuration);
-            dateProvider.setTime(await ethCheatCodes.timestamp() * 1000);
+        }
+        // In compose mode (no local anvil), sync dateProvider to L1 time since it may have drifted
+        // ahead of system time due to the local-network watcher warping time forward on each filled slot.
+        // When running with a local anvil, the dateProvider is kept in sync via the stdout listener.
+        if (!anvil) {
+            dateProvider.setTime(await ethCheatCodes.lastBlockTimestamp() * 1000);
         }
         if (opts.l2StartTime) {
             await ethCheatCodes.warp(opts.l2StartTime, {
                 resetBlockInterval: true
             });
         }
-        const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls, dateProvider), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider);
+        const watcher = new AnvilTestWatcher(new EthCheatCodesWithState(config.l1RpcUrls, dateProvider), deployL1ContractsValues.l1ContractAddresses.rollupAddress, deployL1ContractsValues.l1Client, dateProvider, opts.anvilTestWatcherOpts);
         if (!opts.disableAnvilTestWatcher) {
             await watcher.start();
         }
@@ -328,7 +269,7 @@ export const getPrivateKeyFromIndex = (index)=>{
         let mockGossipSubNetwork;
         let p2pClientDeps = undefined;
         if (opts.mockGossipSubNetwork) {
-            mockGossipSubNetwork = new MockGossipSubNetwork();
+            mockGossipSubNetwork = new MockGossipSubNetwork(opts.mockGossipSubNetworkLatency);
             p2pClientDeps = {
                 p2pServiceFactory: getMockPubSubP2PServiceFactory(mockGossipSubNetwork)
             };
@@ -355,33 +296,53 @@ export const getPrivateKeyFromIndex = (index)=>{
                 ]);
             }
         }
+        // When skipInitialSequencer is set, the initial node is a lightweight RPC-only node.
+        // We apply these overrides to a copy so they don't leak into the returned config.
+        // Keep P2P enabled if mockGossipSubNetwork is used (needed for tx propagation to validators).
+        const initialNodeConfig = opts.skipInitialSequencer ? {
+            ...config,
+            disableValidator: true,
+            ...opts.mockGossipSubNetwork ? {} : {
+                p2pEnabled: false,
+                bootstrapNodes: []
+            }
+        } : config;
         const aztecNodeService = await withLoggerBindings({
             actor: 'node-0'
-        }, ()=>AztecNodeService.createAndSync(config, {
+        }, ()=>AztecNodeService.createAndSync(initialNodeConfig, {
                 dateProvider,
                 telemetry: telemetryClient,
                 p2pClientDeps
             }, {
-                prefilledPublicData
+                genesis,
+                dontStartSequencer: opts.skipInitialSequencer
             }));
         const sequencerClient = aztecNodeService.getSequencer();
-        if (sequencerClient) {
-            const publisher = sequencerClient.sequencer.publisher;
-            publisher.l1TxUtils = DelayedTxUtils.fromL1TxUtils(publisher.l1TxUtils, config.ethereumSlotDuration, l1Client);
-        }
         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,
-                p2pEnabled: false
+            const p2pClientDeps = {
+                p2pServiceFactory: mockGossipSubNetwork && getMockPubSubP2PServiceFactory(mockGossipSubNetwork),
+                rpcTxProviders: [
+                    aztecNodeService
+                ]
             };
-            proverNode = await createAndSyncProverNode(proverNodePrivateKeyHex, config, proverNodeConfig, aztecNodeService, prefilledPublicData);
+            ({ proverNode } = await createAndSyncProverNode(proverNodePrivateKeyHex, config, {
+                ...config.proverNodeConfig,
+                dataDirectory: proverNodeDataDirectory
+            }, {
+                dateProvider,
+                p2pClientDeps,
+                telemetry: telemetryClient
+            }, {
+                genesis
+            }));
         }
+        const sequencerDelayer = sequencerClient?.getDelayer();
+        const proverDelayer = proverNode?.getProverNode()?.getDelayer();
         logger.verbose('Creating a pxe...');
         const pxeConfig = {
             ...getPXEConfig(),
@@ -404,7 +365,9 @@ export const getPrivateKeyFromIndex = (index)=>{
             await cheatCodes.rollup.debugRollup();
         }
         let accounts = [];
-        if (shouldDeployAccounts) {
+        if (opts.skipInitialSequencer) {
+            logger.info('Sequencer not started on initial node, skipping block progression');
+        } else if (shouldDeployAccounts) {
             logger.info(`${numberOfAccounts} accounts are being deployed. Reliably progressing past genesis by setting minTxsPerBlock to 1 and waiting for the accounts to be deployed`);
             const accountsData = initialFundedAccounts.slice(0, numberOfAccounts);
             const accountManagers = await deployFundedSchnorrAccounts(wallet, accountsData);
@@ -443,7 +406,7 @@ export const getPrivateKeyFromIndex = (index)=>{
                 logger.error(`Error during e2e test teardown`, err);
             } finally{
                 try {
-                    await telemetryClient?.stop();
+                    await telemetryClient.stop();
                 } catch (err) {
                     logger.error(`Error during telemetry client stop`, err);
                 }
@@ -463,8 +426,10 @@ export const getPrivateKeyFromIndex = (index)=>{
             initialFundedAccounts,
             logger,
             mockGossipSubNetwork,
-            prefilledPublicData,
+            genesis,
             proverNode,
+            sequencerDelayer,
+            proverDelayer,
             sequencer: sequencerClient,
             teardown,
             telemetryClient,
@@ -523,79 +488,43 @@ export const getPrivateKeyFromIndex = (index)=>{
 }
 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);
+    await retryUntil(async ()=>await node.getBlockNumber('proven') >= targetBlock, 'proven chain status', timeoutSec, intervalSec);
 }
-export function createAndSyncProverNode(proverNodePrivateKey, aztecNodeConfig, proverNodeConfig, aztecNode, prefilledPublicData = [], proverNodeDeps = {}) {
+/**
+ * Creates an AztecNodeService with the prover node enabled as a subsystem.
+ * Returns both the aztec node service (for lifecycle management) and the prover node (for test internals access).
+ */ export function createAndSyncProverNode(proverNodePrivateKey, baseConfig, configOverrides, deps, options) {
     return withLoggerBindings({
         actor: 'prover-0'
     }, async ()=>{
-        const aztecNodeTxProvider = aztecNode && {
-            getTxByHash: aztecNode.getTxByHash.bind(aztecNode),
-            getTxsByHash: aztecNode.getTxsByHash.bind(aztecNode),
-            stop: ()=>Promise.resolve()
-        };
-        const blobClient = await createBlobClientWithFileStores(aztecNodeConfig, createLogger('blob-client:prover-node'));
-        const archiverConfig = {
-            ...aztecNodeConfig,
-            dataDirectory: proverNodeConfig.dataDirectory
-        };
-        const archiver = await createArchiver(archiverConfig, {
-            blobClient,
-            dateProvider: proverNodeDeps.dateProvider
-        }, {
-            blockUntilSync: true
-        });
-        const proverConfig = {
-            ...aztecNodeConfig,
-            txCollectionNodeRpcUrls: [],
-            realProofs: false,
-            proverAgentCount: 2,
-            publisherPrivateKeys: [
+        const proverNode = await AztecNodeService.createAndSync({
+            ...baseConfig,
+            ...configOverrides,
+            p2pPort: 0,
+            enableProverNode: true,
+            disableValidator: true,
+            proverPublisherPrivateKeys: [
                 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
+            ]
+        }, deps, {
+            genesis: options.genesis,
+            dontStartProverNode: options.dontStart
         });
-        getLogger().info(`Created and synced prover node`, {
-            publisherAddress: l1TxUtils.client.account.address
-        });
-        if (!proverNodeConfig.dontStart) {
-            await proverNode.start();
+        if (!proverNode.getProverNode()) {
+            throw new Error('Prover node subsystem was not created despite enableProverNode being set');
         }
-        return proverNode;
+        getLogger().info(`Created and synced prover node`);
+        return {
+            proverNode
+        };
     });
 }
-function createDelayedL1TxUtils(aztecNodeConfig, privateKey, logName, dateProvider) {
-    const l1Client = createExtendedL1Client(aztecNodeConfig.l1RpcUrls, privateKey, foundry);
-    const log = createLogger(logName);
-    const l1TxUtils = createDelayedL1TxUtilsFromViemWallet(l1Client, log, dateProvider, aztecNodeConfig);
-    l1TxUtils.enableDelayer(aztecNodeConfig.ethereumSlotDuration);
-    return l1TxUtils;
-}
-export function getBalancesFn(symbol, method, from, logger) {
+export function getBalancesFn(symbol, method, 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({
-                from
-            })));
+        const b = await Promise.all(addresses.map(async (address)=>(await method(address).simulate({
+                from: address
+            })).result));
         const debugString = `${symbol} balances: ${addresses.map((address, i)=>`${address}: ${b[i]}`).join(', ')}`;
         logger.verbose(debugString);
         return b;
@@ -639,7 +568,7 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
 /**
  * Helper function to deploy accounts.
  * Returns deployed account data that can be used by tests.
- */ export const deployAccounts = (numberOfAccounts, logger)=>async ({ wallet, initialFundedAccounts })=>{
+ */ export const deployAccounts = (numberOfAccounts, logger, deployOptions)=>async ({ wallet, initialFundedAccounts })=>{
         if (initialFundedAccounts.length < numberOfAccounts) {
             throw new Error(`Cannot deploy more than ${initialFundedAccounts.length} initial accounts.`);
         }
@@ -650,8 +579,9 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
             const accountManager = await wallet.createSchnorrAccount(deployedAccounts[i].secret, deployedAccounts[i].salt, deployedAccounts[i].signingKey);
             const deployMethod = await accountManager.getDeployMethod();
             await deployMethod.send({
-                from: AztecAddress.ZERO,
-                skipClassPublication: i !== 0
+                from: NO_FROM,
+                skipClassPublication: i !== 0,
+                ...deployOptions
             });
         }
         return {
@@ -672,7 +602,7 @@ export async function expectMappingDelta(initialValues, fn, inputs, expectedDiff
         ...instances.map((instance)=>publishInstance(wallet, instance))
     ]);
     const batch = new BatchCall(wallet, calls);
-    const txReceipt = await batch.send({
+    const { receipt: txReceipt } = await batch.send({
         from: accountsToDeploy[0]
     });
     if (waitUntilProven) {

package/dest/fixtures/setup_p2p_test.d.ts

@@ -3,13 +3,12 @@
  */
 import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
 import type { DateProvider } from '@aztec/foundation/timer';
-import type { ProverNodeDeps } from '@aztec/prover-node';
-import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import type { GenesisData } from '@aztec/stdlib/world-state';
 export declare const ATTESTER_PRIVATE_KEYS_START_INDEX = 3;
 export declare function generatePrivateKeys(startIndex: number, numberOfKeys: number): `0x${string}`[];
 export declare function createNodes(config: AztecNodeConfig & {
     dontStartSequencer?: boolean;
-}, dateProvider: DateProvider, bootstrapNodeEnr: string, numNodes: number, bootNodePort: number, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number, indexOffset?: number, validatorsPerNode?: number): Promise<AztecNodeService[]>;
+}, dateProvider: DateProvider, bootstrapNodeEnr: string, numNodes: number, bootNodePort: number, genesis?: GenesisData, dataDirectory?: string, metricsPort?: number, indexOffset?: number, validatorsPerNode?: number): Promise<AztecNodeService[]>;
 /** Extended config type for createNode with test-specific overrides. */
 export type CreateNodeConfig = AztecNodeConfig & {
     /** Whether to skip starting the sequencer. */
@@ -18,10 +17,14 @@ export type CreateNodeConfig = AztecNodeConfig & {
     validatorPrivateKey?: `0x${string}`;
 };
 /** Creates a P2P enabled instance of Aztec Node Service with a validator. */
-export declare function createNode(config: CreateNodeConfig, dateProvider: DateProvider, tcpPort: number, bootstrapNode: string | undefined, addressIndex: number | number[], prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number): Promise<AztecNodeService>;
+export declare function createNode(config: CreateNodeConfig, dateProvider: DateProvider, tcpPort: number, bootstrapNode: string | undefined, addressIndex: number | number[], genesis?: GenesisData, dataDirectory?: string, metricsPort?: number): Promise<AztecNodeService>;
 /** Creates a P2P enabled instance of Aztec Node Service without a validator */
-export declare function createNonValidatorNode(baseConfig: AztecNodeConfig, dateProvider: DateProvider, tcpPort: number, bootstrapNode: string | undefined, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number): Promise<AztecNodeService>;
-export declare function createProverNode(config: AztecNodeConfig, tcpPort: number, bootstrapNode: string | undefined, addressIndex: number, proverNodeDeps: ProverNodeDeps & Required<Pick<ProverNodeDeps, 'dateProvider'>>, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number): Promise<import("@aztec/prover-node").ProverNode>;
+export declare function createNonValidatorNode(baseConfig: AztecNodeConfig, dateProvider: DateProvider, tcpPort: number, bootstrapNode: string | undefined, genesis?: GenesisData, dataDirectory?: string, metricsPort?: number): Promise<AztecNodeService>;
+export declare function createProverNode(config: AztecNodeConfig, tcpPort: number, bootstrapNode: string | undefined, addressIndex: number, deps: {
+    dateProvider: DateProvider;
+}, genesis?: GenesisData, dataDirectory?: string, metricsPort?: number): Promise<{
+    proverNode: AztecNodeService;
+}>;
 export declare function createP2PConfig(config: AztecNodeConfig, bootstrapNodeEnr?: string, port?: number, dataDirectory?: string): Promise<AztecNodeConfig>;
 export declare function createValidatorConfig(config: CreateNodeConfig, bootstrapNodeEnr?: string, port?: number, addressIndex?: number | number[], dataDirectory?: string): Promise<AztecNodeConfig>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfcDJwX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9zZXR1cF9wMnBfdGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBSzNFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFvQixjQUFjLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUMzRSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBVzlELGVBQU8sTUFBTSxpQ0FBaUMsSUFBSSxDQUFDO0FBT25ELHdCQUFnQixtQkFBbUIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxNQUFNLEdBQUcsS0FBSyxNQUFNLEVBQUUsRUFBRSxDQU83RjtBQUVELHdCQUFzQixXQUFXLENBQy9CLE1BQU0sRUFBRSxlQUFlLEdBQUc7SUFBRSxrQkFBa0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUFFLEVBQzFELFlBQVksRUFBRSxZQUFZLEVBQzFCLGdCQUFnQixFQUFFLE1BQU0sRUFDeEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsWUFBWSxFQUFFLE1BQU0sRUFDcEIsbUJBQW1CLENBQUMsRUFBRSxrQkFBa0IsRUFBRSxFQUMxQyxhQUFhLENBQUMsRUFBRSxNQUFNLEVBQ3RCLFdBQVcsQ0FBQyxFQUFFLE1BQU0sRUFDcEIsV0FBVyxTQUFJLEVBQ2YsaUJBQWlCLFNBQUksR0FDcEIsT0FBTyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FtQzdCO0FBRUQsd0VBQXdFO0FBQ3hFLE1BQU0sTUFBTSxnQkFBZ0IsR0FBRyxlQUFlLEdBQUc7SUFDL0MsOENBQThDO0lBQzlDLGtCQUFrQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzdCLHdFQUF3RTtJQUN4RSxtQkFBbUIsQ0FBQyxFQUFFLEtBQUssTUFBTSxFQUFFLENBQUM7Q0FDckMsQ0FBQztBQUVGLDZFQUE2RTtBQUM3RSx3QkFBc0IsVUFBVSxDQUM5QixNQUFNLEVBQUUsZ0JBQWdCLEVBQ3hCLFlBQVksRUFBRSxZQUFZLEVBQzFCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsYUFBYSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ2pDLFlBQVksRUFBRSxNQUFNLEdBQUcsTUFBTSxFQUFFLEVBQy9CLG1CQUFtQixDQUFDLEVBQUUsa0JBQWtCLEVBQUUsRUFDMUMsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUN0QixXQUFXLENBQUMsRUFBRSxNQUFNLDZCQVlyQjtBQUVELCtFQUErRTtBQUMvRSx3QkFBc0Isc0JBQXNCLENBQzFDLFVBQVUsRUFBRSxlQUFlLEVBQzNCLFlBQVksRUFBRSxZQUFZLEVBQzFCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsYUFBYSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ2pDLG1CQUFtQixDQUFDLEVBQUUsa0JBQWtCLEVBQUUsRUFDMUMsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUN0QixXQUFXLENBQUMsRUFBRSxNQUFNLDZCQWNyQjtBQUVELHdCQUFzQixnQkFBZ0IsQ0FDcEMsTUFBTSxFQUFFLGVBQWUsRUFDdkIsT0FBTyxFQUFFLE1BQU0sRUFDZixhQUFhLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDakMsWUFBWSxFQUFFLE1BQU0sRUFDcEIsY0FBYyxFQUFFLGNBQWMsR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFDLGNBQWMsRUFBRSxjQUFjLENBQUMsQ0FBQyxFQUMvRSxtQkFBbUIsQ0FBQyxFQUFFLGtCQUFrQixFQUFFLEVBQzFDLGFBQWEsQ0FBQyxFQUFFLE1BQU0sRUFDdEIsV0FBVyxDQUFDLEVBQUUsTUFBTSxvREF3QnJCO0FBRUQsd0JBQXNCLGVBQWUsQ0FDbkMsTUFBTSxFQUFFLGVBQWUsRUFDdkIsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLEVBQ3pCLElBQUksQ0FBQyxFQUFFLE1BQU0sRUFDYixhQUFhLENBQUMsRUFBRSxNQUFNLDRCQWdCdkI7QUFFRCx3QkFBc0IscUJBQXFCLENBQ3pDLE1BQU0sRUFBRSxnQkFBZ0IsRUFDeEIsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLEVBQ3pCLElBQUksQ0FBQyxFQUFFLE1BQU0sRUFDYixZQUFZLEdBQUUsTUFBTSxHQUFHLE1BQU0sRUFBTSxFQUNuQyxhQUFhLENBQUMsRUFBRSxNQUFNLDRCQW9CdkIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfcDJwX3Rlc3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9maXh0dXJlcy9zZXR1cF9wMnBfdGVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7R0FFRztBQUNILE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBSzNFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzVELE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBVzdELGVBQU8sTUFBTSxpQ0FBaUMsSUFBSSxDQUFDO0FBT25ELHdCQUFnQixtQkFBbUIsQ0FBQyxVQUFVLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxNQUFNLEdBQUcsS0FBSyxNQUFNLEVBQUUsRUFBRSxDQU83RjtBQUVELHdCQUFzQixXQUFXLENBQy9CLE1BQU0sRUFBRSxlQUFlLEdBQUc7SUFBRSxrQkFBa0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQTtDQUFFLEVBQzFELFlBQVksRUFBRSxZQUFZLEVBQzFCLGdCQUFnQixFQUFFLE1BQU0sRUFDeEIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsWUFBWSxFQUFFLE1BQU0sRUFDcEIsT0FBTyxDQUFDLEVBQUUsV0FBVyxFQUNyQixhQUFhLENBQUMsRUFBRSxNQUFNLEVBQ3RCLFdBQVcsQ0FBQyxFQUFFLE1BQU0sRUFDcEIsV0FBVyxTQUFJLEVBQ2YsaUJBQWlCLFNBQUksR0FDcEIsT0FBTyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0FtQzdCO0FBRUQsd0VBQXdFO0FBQ3hFLE1BQU0sTUFBTSxnQkFBZ0IsR0FBRyxlQUFlLEdBQUc7SUFDL0MsOENBQThDO0lBQzlDLGtCQUFrQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzdCLHdFQUF3RTtJQUN4RSxtQkFBbUIsQ0FBQyxFQUFFLEtBQUssTUFBTSxFQUFFLENBQUM7Q0FDckMsQ0FBQztBQUVGLDZFQUE2RTtBQUM3RSx3QkFBc0IsVUFBVSxDQUM5QixNQUFNLEVBQUUsZ0JBQWdCLEVBQ3hCLFlBQVksRUFBRSxZQUFZLEVBQzFCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsYUFBYSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ2pDLFlBQVksRUFBRSxNQUFNLEdBQUcsTUFBTSxFQUFFLEVBQy9CLE9BQU8sQ0FBQyxFQUFFLFdBQVcsRUFDckIsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUN0QixXQUFXLENBQUMsRUFBRSxNQUFNLDZCQVlyQjtBQUVELCtFQUErRTtBQUMvRSx3QkFBc0Isc0JBQXNCLENBQzFDLFVBQVUsRUFBRSxlQUFlLEVBQzNCLFlBQVksRUFBRSxZQUFZLEVBQzFCLE9BQU8sRUFBRSxNQUFNLEVBQ2YsYUFBYSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ2pDLE9BQU8sQ0FBQyxFQUFFLFdBQVcsRUFDckIsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUN0QixXQUFXLENBQUMsRUFBRSxNQUFNLDZCQWNyQjtBQUVELHdCQUFzQixnQkFBZ0IsQ0FDcEMsTUFBTSxFQUFFLGVBQWUsRUFDdkIsT0FBTyxFQUFFLE1BQU0sRUFDZixhQUFhLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDakMsWUFBWSxFQUFFLE1BQU0sRUFDcEIsSUFBSSxFQUFFO0lBQUUsWUFBWSxFQUFFLFlBQVksQ0FBQTtDQUFFLEVBQ3BDLE9BQU8sQ0FBQyxFQUFFLFdBQVcsRUFDckIsYUFBYSxDQUFDLEVBQUUsTUFBTSxFQUN0QixXQUFXLENBQUMsRUFBRSxNQUFNLEdBQ25CLE9BQU8sQ0FBQztJQUFFLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQTtDQUFFLENBQUMsQ0FnQjNDO0FBRUQsd0JBQXNCLGVBQWUsQ0FDbkMsTUFBTSxFQUFFLGVBQWUsRUFDdkIsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLEVBQ3pCLElBQUksQ0FBQyxFQUFFLE1BQU0sRUFDYixhQUFhLENBQUMsRUFBRSxNQUFNLDRCQWdCdkI7QUFFRCx3QkFBc0IscUJBQXFCLENBQ3pDLE1BQU0sRUFBRSxnQkFBZ0IsRUFDeEIsZ0JBQWdCLENBQUMsRUFBRSxNQUFNLEVBQ3pCLElBQUksQ0FBQyxFQUFFLE1BQU0sRUFDYixZQUFZLEdBQUUsTUFBTSxHQUFHLE1BQU0sRUFBTSxFQUNuQyxhQUFhLENBQUMsRUFBRSxNQUFNLDRCQW9CdkIifQ==

package/dest/fixtures/setup_p2p_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAK3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAW9D,eAAO,MAAM,iCAAiC,IAAI,CAAC;AAOnD,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,GAAG;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC1D,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,SAAI,EACf,iBAAiB,SAAI,GACpB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAmC7B;AAED,wEAAwE;AACxE,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG;IAC/C,8CAA8C;IAC9C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wEAAwE;IACxE,mBAAmB,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CACrC,CAAC;AAEF,6EAA6E;AAC7E,wBAAsB,UAAU,CAC9B,MAAM,EAAE,gBAAgB,EACxB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,EAC/B,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,6BAYrB;AAED,+EAA+E;AAC/E,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,6BAcrB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,EAC/E,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,oDAwBrB;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,4BAgBvB;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,gBAAgB,EACxB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAM,GAAG,MAAM,EAAM,EACnC,aAAa,CAAC,EAAE,MAAM,4BAoBvB"}
+{"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAK3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAW7D,eAAO,MAAM,iCAAiC,IAAI,CAAC;AAOnD,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,GAAG;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAA;CAAE,EAC1D,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,SAAI,EACf,iBAAiB,SAAI,GACpB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAmC7B;AAED,wEAAwE;AACxE,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG;IAC/C,8CAA8C;IAC9C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,wEAAwE;IACxE,mBAAmB,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CACrC,CAAC;AAEF,6EAA6E;AAC7E,wBAAsB,UAAU,CAC9B,MAAM,EAAE,gBAAgB,EACxB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,EAC/B,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,6BAYrB;AAED,+EAA+E;AAC/E,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,6BAcrB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE;IAAE,YAAY,EAAE,YAAY,CAAA;CAAE,EACpC,OAAO,CAAC,EAAE,WAAW,EACrB,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC;IAAE,UAAU,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAgB3C;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,4BAgBvB;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,gBAAgB,EACxB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAM,GAAG,MAAM,EAAM,EACnC,aAAa,CAAC,EAAE,MAAM,4BAoBvB"}

package/dest/fixtures/setup_p2p_test.js

@@ -25,7 +25,7 @@ export function generatePrivateKeys(startIndex, numberOfKeys) {
     }
     return privateKeys;
 }
-export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNodes, bootNodePort, prefilledPublicData, dataDirectory, metricsPort, indexOffset = 0, validatorsPerNode = 1) {
+export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNodes, bootNodePort, genesis, dataDirectory, metricsPort, indexOffset = 0, validatorsPerNode = 1) {
     const nodePromises = [];
     for(let i = 0; i < numNodes; i++){
         const index = indexOffset + i;
@@ -35,7 +35,7 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
         const validatorIndices = validatorsPerNode === 1 ? index : range(validatorsPerNode, validatorsPerNode * index);
         // Assign data directory
         const dataDir = dataDirectory ? `${dataDirectory}-${index}` : undefined;
-        const nodePromise = createNode(config, dateProvider, port, bootstrapNodeEnr, validatorIndices, prefilledPublicData, dataDir, metricsPort);
+        const nodePromise = createNode(config, dateProvider, port, bootstrapNodeEnr, validatorIndices, genesis, dataDir, metricsPort);
         nodePromises.push(nodePromise);
     }
     const nodes = await Promise.all(nodePromises);
@@ -46,7 +46,7 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
     }
     return nodes;
 }
-/** Creates a P2P enabled instance of Aztec Node Service with a validator. */ export async function createNode(config, dateProvider, tcpPort, bootstrapNode, addressIndex, prefilledPublicData, dataDirectory, metricsPort) {
+/** Creates a P2P enabled instance of Aztec Node Service with a validator. */ export async function createNode(config, dateProvider, tcpPort, bootstrapNode, addressIndex, genesis, dataDirectory, metricsPort) {
     const actorIndex = validatorCounter++;
     return await withLoggerBindings({
         actor: `validator-${actorIndex}`
@@ -57,12 +57,12 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
             telemetry,
             dateProvider
         }, {
-            prefilledPublicData,
+            genesis,
             dontStartSequencer: config.dontStartSequencer
         });
     });
 }
-/** Creates a P2P enabled instance of Aztec Node Service without a validator */ export async function createNonValidatorNode(baseConfig, dateProvider, tcpPort, bootstrapNode, prefilledPublicData, dataDirectory, metricsPort) {
+/** Creates a P2P enabled instance of Aztec Node Service without a validator */ export async function createNonValidatorNode(baseConfig, dateProvider, tcpPort, bootstrapNode, genesis, dataDirectory, metricsPort) {
     const actorIndex = nodeCounter++;
     return await withLoggerBindings({
         actor: `node-${actorIndex}`
@@ -72,32 +72,35 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
             ...p2pConfig,
             disableValidator: true,
             validatorPrivateKeys: undefined,
-            publisherPrivateKeys: []
+            sequencerPublisherPrivateKeys: []
         };
         const telemetry = await getEndToEndTestTelemetryClient(metricsPort);
         return await AztecNodeService.createAndSync(config, {
             telemetry,
             dateProvider
         }, {
-            prefilledPublicData
+            genesis
         });
     });
 }
-export async function createProverNode(config, tcpPort, bootstrapNode, addressIndex, proverNodeDeps, prefilledPublicData, dataDirectory, metricsPort) {
+export async function createProverNode(config, tcpPort, bootstrapNode, addressIndex, deps, genesis, dataDirectory, metricsPort) {
     const actorIndex = proverCounter++;
     return await withLoggerBindings({
         actor: `prover-${actorIndex}`
     }, async ()=>{
         const proverNodePrivateKey = getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex);
         const telemetry = await getEndToEndTestTelemetryClient(metricsPort);
-        const proverConfig = await createP2PConfig(config, bootstrapNode, tcpPort, dataDirectory);
-        const aztecNodeRpcTxProvider = undefined;
-        return await createAndSyncProverNode(bufferToHex(proverNodePrivateKey), config, {
-            ...proverConfig,
+        const p2pConfig = await createP2PConfig(config, bootstrapNode, tcpPort, dataDirectory);
+        return await createAndSyncProverNode(bufferToHex(proverNodePrivateKey), {
+            ...config,
+            ...p2pConfig
+        }, {
             dataDirectory
-        }, aztecNodeRpcTxProvider, prefilledPublicData, {
-            ...proverNodeDeps,
+        }, {
+            ...deps,
             telemetry
+        }, {
+            genesis
         });
     });
 }
@@ -133,7 +136,7 @@ export async function createValidatorConfig(config, bootstrapNodeEnr, port, addr
         ...config,
         ...p2pConfig,
         validatorPrivateKeys: new SecretValue(attesterPrivateKeys),
-        publisherPrivateKeys: [
+        sequencerPublisherPrivateKeys: [
             new SecretValue(attesterPrivateKeys[0])
         ]
     };