@aztec/end-to-end 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/e2e_p2p/p2p_network.js

@@ -1,251 +1,294 @@
-import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
-import { ChainMonitor } from '@aztec/aztec.js/ethereum';
-import { RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
-import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
-import { EthCheatCodesWithState } from '@aztec/ethereum/test';
+import { generateSchnorrAccounts } from '@aztec/accounts/testing';
+import { getAccountContractAddress } from '@aztec/aztec.js/account';
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
+import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
+import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
+import { MultiAdderArtifact } from '@aztec/ethereum/l1-artifacts';
+import { createL1TxUtils } from '@aztec/ethereum/l1-tx-utils';
+import { ChainMonitor } from '@aztec/ethereum/test';
+import { EpochNumber } from '@aztec/foundation/branded-types';
+import { SecretValue } from '@aztec/foundation/config';
 import { createLogger } from '@aztec/foundation/log';
-import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
-import { SpamContract } from '@aztec/noir-contracts.js/Spam';
+import { retryUntil } from '@aztec/foundation/retry';
+import { RollupAbi, SlasherAbi, TestERC20Abi } from '@aztec/l1-artifacts';
+import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers';
+import { tryStop } from '@aztec/stdlib/interfaces/server';
+import { TopicType } from '@aztec/stdlib/p2p';
+import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import getPort from 'get-port';
-import { getContract } from 'viem';
+import { getAddress, getContract } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
-import { ATTESTER_PRIVATE_KEYS_START_INDEX, PROPOSER_PRIVATE_KEYS_START_INDEX, createValidatorConfig, generatePrivateKeys } from '../fixtures/setup_p2p_test.js';
-import { createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
-import { getPrivateKeyFromIndex } from '../fixtures/utils.js';
+import { SCHNORR_HARDCODED_PRIVATE_KEY, SchnorrHardcodedKeyAccountContract } from '../fixtures/schnorr_hardcoded_account_contract.js';
+import { getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, teardown } from '../fixtures/setup.js';
+import { ATTESTER_PRIVATE_KEYS_START_INDEX, createValidatorConfig, generatePrivateKeys } from '../fixtures/setup_p2p_test.js';
 import { getEndToEndTestTelemetryClient } from '../fixtures/with_telemetry_utils.js';
 // Use a fixed bootstrap node private key so that we can re-use the same snapshot and the nodes can find each other
 const BOOTSTRAP_NODE_PRIVATE_KEY = '080212208f988fc0899e4a73a5aee4d271a5f20670603a756ad8d84f2c94263a6427c591';
 const l1ContractsConfig = getL1ContractsConfigEnvVars();
 export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
-export const SHORTENED_BLOCK_TIME_CONFIG = {
+export const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES = {
     aztecSlotDuration: 12,
-    ethereumSlotDuration: 4
+    ethereumSlotDuration: 4,
+    aztecProofSubmissionEpochs: 640
 };
 export class P2PNetworkTest {
+    testName;
     bootstrapNodeEnr;
     bootNodePort;
+    numberOfValidators;
     numberOfNodes;
     metricsPort;
-    snapshotManager;
+    context;
+    baseAccountPrivateKey;
     baseAccount;
     logger;
     monitor;
     ctx;
     attesterPrivateKeys;
     attesterPublicKeys;
-    proposerPrivateKeys;
     peerIdPrivateKeys;
-    deployedAccounts;
-    prefilledPublicData;
+    validators;
+    hardcodedAccountData;
+    genesis;
     // The re-execution test needs a wallet and a spam contract
     wallet;
+    defaultAccountAddress;
     spamContract;
     bootstrapNode;
-    cleanupInterval;
-    gasUtils;
-    constructor(testName, bootstrapNodeEnr, bootNodePort, numberOfNodes, initialValidatorConfig, // If set enable metrics collection
-    metricsPort){
+    // Store setup options for use in setup()
+    setupOptions;
+    deployL1ContractsArgs;
+    constructor(testName, bootstrapNodeEnr, bootNodePort, numberOfValidators, initialValidatorConfig, numberOfNodes = 0, // If set enable metrics collection
+    metricsPort, startProverNode){
+        this.testName = testName;
         this.bootstrapNodeEnr = bootstrapNodeEnr;
         this.bootNodePort = bootNodePort;
+        this.numberOfValidators = numberOfValidators;
         this.numberOfNodes = numberOfNodes;
         this.metricsPort = metricsPort;
         this.attesterPrivateKeys = [];
         this.attesterPublicKeys = [];
-        this.proposerPrivateKeys = [];
         this.peerIdPrivateKeys = [];
-        this.deployedAccounts = [];
-        this.prefilledPublicData = [];
-        this.cleanupInterval = undefined;
-        this.gasUtils = undefined;
+        this.validators = [];
         this.logger = createLogger(`e2e:e2e_p2p:${testName}`);
         // Set up the base account and node private keys for the initial network deployment
-        this.baseAccount = privateKeyToAccount(`0x${getPrivateKeyFromIndex(0).toString('hex')}`);
-        this.proposerPrivateKeys = generatePrivateKeys(PROPOSER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
-        this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
+        this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(1).toString('hex')}`;
+        this.baseAccount = privateKeyToAccount(this.baseAccountPrivateKey);
+        this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX + numberOfNodes, numberOfValidators);
         this.attesterPublicKeys = this.attesterPrivateKeys.map((privateKey)=>privateKeyToAccount(privateKey).address);
-        this.snapshotManager = createSnapshotManager(`e2e_p2p_network/${testName}`, process.env.E2E_DATA_PATH, {
+        const zkPassportParams = ZkPassportProofParams.random();
+        // Store setup options for later use
+        this.setupOptions = {
             ...initialValidatorConfig,
             ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
             aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
             aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
-            aztecProofSubmissionWindow: initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
-            salt: 420,
+            aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
+            slashingRoundSizeInEpochs: initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
+            slasherEnabled: initialValidatorConfig.slasherEnabled ?? true,
+            aztecTargetCommitteeSize: numberOfValidators,
             metricsPort: metricsPort,
-            numberOfInitialFundedAccounts: 1
-        }, {
+            numberOfInitialFundedAccounts: 2,
+            startProverNode
+        };
+        this.deployL1ContractsArgs = {
+            ...initialValidatorConfig,
             aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
+            slashingRoundSizeInEpochs: initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
+            slasherEnabled: initialValidatorConfig.slasherEnabled ?? true,
             ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
             aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
-            aztecProofSubmissionWindow: initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
-            initialValidators: []
-        });
+            aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
+            aztecTargetCommitteeSize: numberOfValidators,
+            initialValidators: [],
+            zkPassportArgs: {
+                zkPassportDomain: zkPassportParams.domain,
+                zkPassportScope: zkPassportParams.scope
+            }
+        };
     }
-    static async create({ testName, numberOfNodes, basePort, metricsPort, initialConfig }) {
+    static async create({ testName, numberOfNodes, numberOfValidators, basePort, metricsPort, initialConfig, startProverNode }) {
         const port = basePort || await getPort();
         const bootstrapNodeENR = await getBootstrapNodeEnr(BOOTSTRAP_NODE_PRIVATE_KEY, port);
         const bootstrapNodeEnr = bootstrapNodeENR.encodeTxt();
         const initialValidatorConfig = await createValidatorConfig(initialConfig ?? {}, bootstrapNodeEnr);
-        return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfNodes, initialValidatorConfig, metricsPort);
+        return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfValidators, initialValidatorConfig, numberOfNodes, metricsPort, startProverNode);
     }
     get fundedAccount() {
-        if (!this.deployedAccounts[0]) {
-            throw new Error('Call snapshot t.setupAccount to create a funded account.');
+        if (!this.hardcodedAccountData) {
+            throw new Error('Call setup to initialize the hardcoded account.');
         }
-        return this.deployedAccounts[0];
+        return this.hardcodedAccountData;
     }
-    /**
-   * Start a loop to sync the mock system time with the L1 block time
-   */ startSyncMockSystemTimeInterval() {
-        this.cleanupInterval = setInterval(()=>{
-            void this.syncMockSystemTime().catch((err)=>this.logger.error('Error syncing mock system time', err));
-        }, l1ContractsConfig.aztecSlotDuration * 1000);
+    async addBootstrapNode() {
+        this.logger.info('Adding bootstrap node');
+        const telemetry = await getEndToEndTestTelemetryClient(this.metricsPort);
+        this.bootstrapNode = await createBootstrapNodeFromPrivateKey(BOOTSTRAP_NODE_PRIVATE_KEY, this.bootNodePort, telemetry, this.context.config);
+        // Overwrite enr with updated info
+        this.bootstrapNodeEnr = this.bootstrapNode.getENR().encodeTxt();
     }
-    /**
-   * When using fake timers, we need to keep the system and anvil clocks in sync.
-   */ async syncMockSystemTime() {
-        this.logger.info('Syncing mock system time');
-        const { dateProvider, deployL1ContractsValues } = this.ctx;
-        // Send a tx and only update the time after the tx is mined, as eth time is not continuous
-        const { receipt } = await this.gasUtils.sendAndMonitorTransaction({
-            to: this.baseAccount.address,
-            data: '0x',
-            value: 1n
+    getValidators() {
+        const validators = [];
+        for(let i = 0; i < this.numberOfValidators; i++){
+            const keyIndex = i;
+            const attester = privateKeyToAccount(this.attesterPrivateKeys[keyIndex]);
+            validators.push({
+                attester: EthAddress.fromString(attester.address),
+                withdrawer: EthAddress.fromString(attester.address),
+                bn254SecretKey: new SecretValue(Fr.random().toBigInt())
+            });
+            this.logger.info(`Adding attester ${attester.address} as validator`);
+        }
+        return {
+            validators
+        };
+    }
+    async applyBaseSetup() {
+        await this.addBootstrapNode();
+        this.logger.info('Adding validators');
+        const rollup = getContract({
+            address: this.context.deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
+            abi: RollupAbi,
+            client: this.context.deployL1ContractsValues.l1Client
         });
-        const timestamp = await deployL1ContractsValues.publicClient.getBlock({
-            blockNumber: receipt.blockNumber
+        this.logger.info(`Adding ${this.numberOfValidators} validators`);
+        const stakingAsset = getContract({
+            address: this.context.deployL1ContractsValues.l1ContractAddresses.stakingAssetAddress.toString(),
+            abi: TestERC20Abi,
+            client: this.context.deployL1ContractsValues.l1Client
         });
-        this.logger.info(`Timestamp: ${timestamp.timestamp}`);
-        dateProvider.setTime(Number(timestamp.timestamp) * 1000);
-    }
-    async applyBaseSnapshots() {
-        await this.snapshotManager.snapshot('add-bootstrap-node', async ({ aztecNodeConfig })=>{
-            const telemetry = getEndToEndTestTelemetryClient(this.metricsPort);
-            this.bootstrapNode = await createBootstrapNodeFromPrivateKey(BOOTSTRAP_NODE_PRIVATE_KEY, this.bootNodePort, telemetry, aztecNodeConfig);
-            // Overwrite enr with updated info
-            this.bootstrapNodeEnr = this.bootstrapNode.getENR().encodeTxt();
+        const { address: multiAdderAddress } = await deployL1Contract(this.context.deployL1ContractsValues.l1Client, MultiAdderArtifact.contractAbi, MultiAdderArtifact.contractBytecode, [
+            rollup.address,
+            this.context.deployL1ContractsValues.l1Client.account.address
+        ]);
+        const multiAdder = getContract({
+            address: multiAdderAddress.toString(),
+            abi: MultiAdderArtifact.contractAbi,
+            client: this.context.deployL1ContractsValues.l1Client
         });
-        await this.snapshotManager.snapshot('add-validators', async ({ deployL1ContractsValues, aztecNodeConfig, dateProvider })=>{
-            const rollup = getContract({
-                address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
-                abi: RollupAbi,
-                client: deployL1ContractsValues.walletClient
-            });
-            this.logger.verbose(`Adding ${this.numberOfNodes} validators`);
-            const stakingAsset = getContract({
-                address: deployL1ContractsValues.l1ContractAddresses.stakingAssetAddress.toString(),
-                abi: TestERC20Abi,
-                client: deployL1ContractsValues.walletClient
-            });
-            const stakeNeeded = l1ContractsConfig.minimumStake * BigInt(this.numberOfNodes);
-            await Promise.all([
-                await stakingAsset.write.mint([
-                    deployL1ContractsValues.walletClient.account.address,
-                    stakeNeeded
-                ], {}),
-                await stakingAsset.write.approve([
-                    deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
-                    stakeNeeded
-                ], {})
-            ].map((txHash)=>deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-                    hash: txHash
-                })));
-            const validators = [];
-            for(let i = 0; i < this.numberOfNodes; i++){
-                const attester = privateKeyToAccount(this.attesterPrivateKeys[i]);
-                const proposerEOA = privateKeyToAccount(this.proposerPrivateKeys[i]);
-                const forwarder = getExpectedAddress(ForwarderAbi, ForwarderBytecode, [
-                    proposerEOA.address
-                ], proposerEOA.address).address;
-                validators.push({
-                    attester: attester.address,
-                    proposer: forwarder,
-                    withdrawer: attester.address,
-                    amount: l1ContractsConfig.minimumStake
-                });
-                this.logger.verbose(`Adding (attester, proposer) pair: (${attester.address}, ${forwarder}) as validator`);
-            }
-            await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-                hash: await rollup.write.cheat__InitialiseValidatorSet([
-                    validators
-                ])
-            });
-            const slotsInEpoch = await rollup.read.getEpochDuration();
-            const timestamp = await rollup.read.getTimestampForSlot([
-                slotsInEpoch
-            ]);
-            const cheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
-            try {
-                await cheatCodes.warp(Number(timestamp));
-            } catch (err) {
-                this.logger.debug('Warp failed, time already satisfied');
-            }
-            // Send and await a tx to make sure we mine a block for the warp to correctly progress.
-            await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-                hash: await deployL1ContractsValues.walletClient.sendTransaction({
-                    to: this.baseAccount.address,
-                    value: 1n,
-                    account: this.baseAccount
-                })
-            });
-            // Set the system time in the node, only after we have warped the time and waited for a block
-            // Time is only set in the NEXT block
-            dateProvider.setTime(Number(timestamp) * 1000);
+        const stakeNeeded = await rollup.read.getActivationThreshold() * BigInt(this.numberOfValidators);
+        await Promise.all([
+            await stakingAsset.write.mint([
+                multiAdder.address,
+                stakeNeeded
+            ], {})
+        ].map((txHash)=>this.context.deployL1ContractsValues.l1Client.waitForTransactionReceipt({
+                hash: txHash
+            })));
+        const { validators } = this.getValidators();
+        this.validators = validators;
+        const gseAddress = this.context.deployL1ContractsValues.l1ContractAddresses.gseAddress;
+        if (!gseAddress) {
+            throw new Error('GSE contract not deployed');
+        }
+        const gseContract = new GSEContract(this.context.deployL1ContractsValues.l1Client, gseAddress.toString());
+        const makeValidatorTuples = async (validator)=>{
+            const registrationTuple = await gseContract.makeRegistrationTuple(validator.bn254SecretKey.getValue());
+            return {
+                attester: validator.attester.toString(),
+                withdrawer: validator.withdrawer.toString(),
+                ...registrationTuple
+            };
+        };
+        const validatorTuples = await Promise.all(validators.map(makeValidatorTuples));
+        await this.context.deployL1ContractsValues.l1Client.waitForTransactionReceipt({
+            hash: await multiAdder.write.addValidators([
+                validatorTuples
+            ])
         });
+        await this.context.cheatCodes.rollup.advanceToEpoch(EpochNumber.fromBigInt(BigInt(await this.context.cheatCodes.rollup.getEpoch()) + await rollup.read.getLagInEpochsForValidatorSet() + 1n));
+        // Send and await a tx to make sure we mine a block for the warp to correctly progress.
+        await this._sendDummyTx(this.context.deployL1ContractsValues.l1Client);
     }
-    async setupAccount() {
-        await this.snapshotManager.snapshot('setup-account', deployAccounts(1, this.logger, false), async ({ deployedAccounts }, { pxe })=>{
-            this.deployedAccounts = deployedAccounts;
-            const [account] = deployedAccounts;
-            this.wallet = await getSchnorrWalletWithSecretKey(pxe, account.secret, account.signingKey, account.salt);
+    /** Points the wallet to a P2P-enabled node so transactions can propagate through the network. */ setupWalletOnNode(node) {
+        this.logger.info('Pointing wallet to a P2P-enabled node');
+        this.context.wallet.updateNode(node);
+    }
+    /** Registers the hardcoded account in PXE without on-chain deployment. No sequencer needed. */ async setupAccount() {
+        this.logger.info('Registering hardcoded account (no deployment)');
+        const contract = new SchnorrHardcodedKeyAccountContract();
+        const accountManager = await this.context.wallet.createAccount({
+            secret: this.hardcodedAccountData.secret,
+            salt: this.hardcodedAccountData.salt,
+            contract
         });
+        this.defaultAccountAddress = accountManager.address;
+        this.wallet = this.context.wallet;
     }
     async deploySpamContract() {
-        await this.snapshotManager.snapshot('add-spam-contract', async ()=>{
-            if (!this.wallet) {
-                throw new Error('Call snapshot t.setupAccount before deploying account contract');
-            }
-            const spamContract = await SpamContract.deploy(this.wallet).send().deployed();
-            return {
-                contractAddress: spamContract.address
-            };
-        }, async ({ contractAddress })=>{
-            if (!this.wallet) {
-                throw new Error('Call snapshot t.setupAccount before deploying account contract');
-            }
-            this.spamContract = await SpamContract.at(contractAddress, this.wallet);
-        });
+        this.logger.info('Deploying spam contract');
+        if (!this.wallet) {
+            throw new Error('Call setupAccount before deploying spam contract');
+        }
+        ({ contract: this.spamContract } = await SpamContract.deploy(this.wallet).send({
+            from: this.defaultAccountAddress
+        }));
     }
     async removeInitialNode() {
-        await this.snapshotManager.snapshot('remove-inital-validator', async ({ deployL1ContractsValues, aztecNode, dateProvider })=>{
-            // Send and await a tx to make sure we mine a block for the warp to correctly progress.
-            const receipt = await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-                hash: await deployL1ContractsValues.walletClient.sendTransaction({
-                    to: this.baseAccount.address,
-                    value: 1n,
-                    account: this.baseAccount
-                })
-            });
-            const block = await deployL1ContractsValues.publicClient.getBlock({
-                blockNumber: receipt.blockNumber
-            });
-            dateProvider.setTime(Number(block.timestamp) * 1000);
-            await aztecNode.stop();
+        this.logger.info('Removing initial node');
+        // Send and await a tx to make sure we mine a block for the warp to correctly progress.
+        const { receipt } = await this._sendDummyTx(this.context.deployL1ContractsValues.l1Client);
+        const block = await this.context.deployL1ContractsValues.l1Client.getBlock({
+            blockNumber: receipt.blockNumber
+        });
+        this.context.dateProvider.setTime(Number(block.timestamp) * 1000);
+        await this.context.aztecNodeService.stop();
+    }
+    async sendDummyTx() {
+        return await this._sendDummyTx(this.ctx.deployL1ContractsValues.l1Client);
+    }
+    async _sendDummyTx(l1Client) {
+        const l1TxUtils = createL1TxUtils(l1Client);
+        return await l1TxUtils.sendAndMonitorTransaction({
+            to: l1Client.account.address,
+            value: 1n
         });
     }
     async setup() {
-        this.ctx = await this.snapshotManager.setup();
-        this.prefilledPublicData = (await getGenesisValues(this.ctx.initialFundedAccounts.map((a)=>a.address))).prefilledPublicData;
-        this.startSyncMockSystemTimeInterval();
-        this.gasUtils = new L1TxUtilsWithBlobs(this.ctx.deployL1ContractsValues.publicClient, this.ctx.deployL1ContractsValues.walletClient, this.logger, {
-            gasLimitBufferPercentage: 20,
-            maxGwei: 500n,
-            maxAttempts: 3,
-            checkIntervalMs: 100,
-            stallTimeMs: 1000
+        this.logger.info('Setting up subsystems from fresh');
+        // Pre-compute hardcoded account data so it gets funded in genesis.
+        const contract = new SchnorrHardcodedKeyAccountContract();
+        const secret = Fr.random();
+        const salt = Fr.random();
+        this.hardcodedAccountData = {
+            secret,
+            salt,
+            signingKey: SCHNORR_HARDCODED_PRIVATE_KEY,
+            address: await getAccountContractAddress(contract, secret, salt)
+        };
+        // Generate regular Schnorr accounts for tests that need deployable accounts (e.g. add_rollup).
+        const regularAccounts = await generateSchnorrAccounts(this.setupOptions.numberOfInitialFundedAccounts ?? 2);
+        this.context = await setup(0, {
+            ...this.setupOptions,
+            fundSponsoredFPC: true,
+            skipAccountDeployment: true,
+            skipInitialSequencer: true,
+            initialFundedAccounts: [
+                ...regularAccounts,
+                this.hardcodedAccountData
+            ],
+            slasherEnabled: this.setupOptions.slasherEnabled ?? this.deployL1ContractsArgs.slasherEnabled ?? false,
+            aztecTargetCommitteeSize: 0,
+            l1ContractsArgs: this.deployL1ContractsArgs
+        }, // Use checkpointed chain tip for PXE to avoid issues with blocks being dropped due to pruned anchor blocks.
+        {
+            syncChainTip: 'checkpointed'
         });
-        this.monitor = new ChainMonitor(RollupContract.getFromL1ContractsValues(this.ctx.deployL1ContractsValues)).start();
+        this.ctx = this.context;
+        const sponsoredFPCAddress = await getSponsoredFPCAddress();
+        const initialFundedAccounts = [
+            ...this.context.initialFundedAccounts.map((a)=>a.address),
+            sponsoredFPCAddress
+        ];
+        const { genesis } = await getGenesisValues(initialFundedAccounts, undefined, undefined, this.context.genesis.genesisTimestamp);
+        this.genesis = genesis;
+        const rollupContract = RollupContract.getFromL1ContractsValues(this.context.deployL1ContractsValues);
+        this.monitor = new ChainMonitor(rollupContract, this.context.dateProvider).start();
+        this.monitor.on('l1-block', ({ timestamp })=>this.context.dateProvider.setTime(Number(timestamp) * 1000));
     }
     async stopNodes(nodes) {
         this.logger.info('Stopping nodes');
@@ -256,12 +299,67 @@ export class P2PNetworkTest {
         await Promise.all(nodes.map((node)=>node.stop()));
         this.logger.info('Nodes stopped');
     }
+    /**
+   * Wait for P2P mesh to be fully formed across all nodes.
+   * This ensures that all nodes are connected to each other before proceeding,
+   * preventing race conditions where validators propose blocks before the network is ready.
+   *
+   * @param nodes - Array of nodes to check for P2P connectivity
+   * @param expectedNodeCount - Expected number of nodes in the network (defaults to nodes.length)
+   * @param timeoutSeconds - Maximum time to wait for connections (default: 30 seconds)
+   * @param checkIntervalSeconds - How often to check connectivity (default: 0.1 seconds)
+   */ async waitForP2PMeshConnectivity(nodes, expectedNodeCount, timeoutSeconds = 30, checkIntervalSeconds = 0.1, topics = [
+        TopicType.tx
+    ]) {
+        const nodeCount = expectedNodeCount ?? nodes.length;
+        const minPeerCount = nodeCount - 1;
+        this.logger.warn(`Waiting for all ${nodeCount} nodes to connect to P2P mesh (at least ${minPeerCount} peers each)...`);
+        await Promise.all(nodes.map(async (node, index)=>{
+            const p2p = node.getP2P();
+            await retryUntil(async ()=>{
+                const peers = await p2p.getPeers();
+                // Each node should be connected to at least N-1 other nodes
+                return peers.length >= minPeerCount ? true : undefined;
+            }, `Node ${index} to connect to at least ${minPeerCount} peers`, timeoutSeconds, checkIntervalSeconds);
+        }));
+        this.logger.warn('All nodes connected to P2P mesh');
+        // Wait for GossipSub mesh to form for all specified topics.
+        // We only require at least 1 mesh peer per node because GossipSub
+        // stops grafting once it reaches Dlo peers and won't fill the mesh to all available peers.
+        for (const topic of topics){
+            this.logger.warn(`Waiting for GossipSub mesh to form for ${topic} topic...`);
+            await Promise.all(nodes.map(async (node, index)=>{
+                const p2p = node.getP2P();
+                await retryUntil(async ()=>{
+                    const meshPeers = await p2p.getGossipMeshPeerCount(topic);
+                    this.logger.debug(`Node ${index} has ${meshPeers} gossip mesh peers for ${topic} topic`);
+                    return meshPeers >= 1 ? true : undefined;
+                }, `Node ${index} to have gossip mesh peers for ${topic} topic`, timeoutSeconds, checkIntervalSeconds);
+            }));
+            this.logger.warn(`All nodes have gossip mesh peers for ${topic} topic`);
+        }
+    }
     async teardown() {
-        this.monitor.stop();
-        await this.bootstrapNode?.stop();
-        await this.snapshotManager.teardown();
-        if (this.cleanupInterval) {
-            clearInterval(this.cleanupInterval);
+        await this.monitor.stop();
+        await tryStop(this.bootstrapNode, this.logger);
+        await teardown(this.context);
+    }
+    async getContracts() {
+        if (!this.ctx.deployL1ContractsValues) {
+            throw new Error('DeployAztecL1ContractsValues not set');
         }
+        const rollup = new RollupContract(this.ctx.deployL1ContractsValues.l1Client, this.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress);
+        const slasherContract = getContract({
+            address: getAddress((await rollup.getSlasherAddress()).toString()),
+            abi: SlasherAbi,
+            client: this.ctx.deployL1ContractsValues.l1Client
+        });
+        // Get the actual slashing proposer from rollup
+        const slashingProposer = await rollup.getSlashingProposer();
+        return {
+            rollup,
+            slasherContract,
+            slashingProposer
+        };
     }
 }

package/dest/e2e_p2p/reqresp/utils.d.ts

@@ -0,0 +1,22 @@
+import type { AztecNodeService } from '@aztec/aztec-node';
+import { P2PNetworkTest } from '../p2p_network.js';
+export declare const NUM_VALIDATORS = 6;
+export declare const NUM_TXS_PER_NODE = 4;
+export declare const BOOT_NODE_UDP_PORT: number;
+export declare const createReqrespDataDir: () => string;
+type ReqrespOptions = {
+    disableStatusHandshake?: boolean;
+};
+export declare function createReqrespTest(options?: ReqrespOptions): Promise<P2PNetworkTest>;
+export declare function cleanupReqrespTest(params: {
+    t: P2PNetworkTest;
+    nodes?: AztecNodeService[];
+    dataDir: string;
+}): Promise<void>;
+export declare function runReqrespTxTest(params: {
+    t: P2PNetworkTest;
+    dataDir: string;
+    disableStatusHandshake?: boolean;
+}): Promise<AztecNodeService[]>;
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lMmVfcDJwL3JlcXJlc3AvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQWlCMUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBSW5ELGVBQU8sTUFBTSxjQUFjLElBQUksQ0FBQztBQUNoQyxlQUFPLE1BQU0sZ0JBQWdCLElBQUksQ0FBQztBQUNsQyxlQUFPLE1BQU0sa0JBQWtCLFFBQXVCLENBQUM7QUFFdkQsZUFBTyxNQUFNLG9CQUFvQixjQUEyRCxDQUFDO0FBRTdGLEtBQUssY0FBYyxHQUFHO0lBQ3BCLHNCQUFzQixDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ2xDLENBQUM7QUFFRix3QkFBc0IsaUJBQWlCLENBQUMsT0FBTyxHQUFFLGNBQW1CLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQTZCN0Y7QUFFRCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSxFQUFFO0lBQUUsQ0FBQyxFQUFFLGNBQWMsQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLGdCQUFnQixFQUFFLENBQUM7SUFBQyxPQUFPLEVBQUUsTUFBTSxDQUFBO0NBQUUsaUJBU2xIO0FBSUQsd0JBQXNCLGdCQUFnQixDQUFDLE1BQU0sRUFBRTtJQUM3QyxDQUFDLEVBQUUsY0FBYyxDQUFDO0lBQ2xCLE9BQU8sRUFBRSxNQUFNLENBQUM7SUFDaEIsc0JBQXNCLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDbEMsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQWlLOUIifQ==

package/dest/e2e_p2p/reqresp/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/e2e_p2p/reqresp/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAiB1D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAInD,eAAO,MAAM,cAAc,IAAI,CAAC;AAChC,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAClC,eAAO,MAAM,kBAAkB,QAAuB,CAAC;AAEvD,eAAO,MAAM,oBAAoB,cAA2D,CAAC;AAE7F,KAAK,cAAc,GAAG;IACpB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,cAAc,CAAC,CA6B7F;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAAE,CAAC,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,iBASlH;AAID,wBAAsB,gBAAgB,CAAC,MAAM,EAAE;IAC7C,CAAC,EAAE,cAAc,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAiK9B"}