@aztec/end-to-end 0.0.1-commit.4d79d1f2d → 0.0.1-commit.4d9804df

package/dest/{e2e_p2p → p2p}/p2p_network.js

@@ -1,10 +1,12 @@
+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 { createL1TxUtilsFromViemWallet } from '@aztec/ethereum/l1-tx-utils';
+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';
@@ -14,13 +16,17 @@ 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 { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
+import { TopicType } from '@aztec/stdlib/p2p';
 import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
 import { getGenesisValues } from '@aztec/world-state/testing';
+import fs from 'fs';
 import getPort from 'get-port';
+import os from 'os';
+import path from 'path';
 import { getAddress, getContract } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
-import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, teardown } from '../fixtures/setup.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
@@ -30,7 +36,7 @@ export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
 export const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES = {
     aztecSlotDuration: 12,
     ethereumSlotDuration: 4,
-    aztecProofSubmissionWindow: 640
+    aztecProofSubmissionEpochs: 640
 };
 export class P2PNetworkTest {
     testName;
@@ -49,13 +55,15 @@ export class P2PNetworkTest {
     attesterPublicKeys;
     peerIdPrivateKeys;
     validators;
-    deployedAccounts;
-    prefilledPublicData;
+    hardcodedAccountData;
+    genesis;
     // The re-execution test needs a wallet and a spam contract
     wallet;
     defaultAccountAddress;
     spamContract;
     bootstrapNode;
+    // Root temp directory holding every node's data dir. Created in setup(), removed in teardown().
+    dataDir;
     // Store setup options for use in setup()
     setupOptions;
     deployL1ContractsArgs;
@@ -71,8 +79,6 @@ export class P2PNetworkTest {
         this.attesterPublicKeys = [];
         this.peerIdPrivateKeys = [];
         this.validators = [];
-        this.deployedAccounts = [];
-        this.prefilledPublicData = [];
         this.logger = createLogger(`e2e:e2e_p2p:${testName}`);
         // Set up the base account and node private keys for the initial network deployment
         this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(1).toString('hex')}`;
@@ -88,18 +94,16 @@ export class P2PNetworkTest {
             aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
             aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
             slashingRoundSizeInEpochs: initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
-            slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
+            slasherEnabled: initialValidatorConfig.slasherEnabled ?? true,
             aztecTargetCommitteeSize: numberOfValidators,
             metricsPort: metricsPort,
-            numberOfInitialFundedAccounts: 2,
-            startProverNode,
-            walletMinFeePadding: 2.0
+            startProverNode
         };
         this.deployL1ContractsArgs = {
             ...initialValidatorConfig,
             aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
             slashingRoundSizeInEpochs: initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
-            slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
+            slasherEnabled: initialValidatorConfig.slasherEnabled ?? true,
             ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
             aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
             aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
@@ -119,10 +123,21 @@ export class P2PNetworkTest {
         return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfValidators, initialValidatorConfig, numberOfNodes, metricsPort, startProverNode);
     }
     get fundedAccount() {
-        if (!this.deployedAccounts[0]) {
-            throw new Error('Call 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;
+    }
+    /**
+   * Returns a per-role data directory nested under this test's root data dir. The multi-node factories
+   * (`createNodes`) append `-<index>` to this base for each node they spawn; single-node factories
+   * (`createProverNode`, `createNonValidatorNode`, `createNode`) use it verbatim. Everything lives under
+   * `this.dataDir`, so a single recursive remove in teardown() cleans up all of it.
+   */ dataDirFor(label) {
+        if (!this.dataDir) {
+            throw new Error('Call setup to initialize the data directory.');
+        }
+        return path.join(this.dataDir, label);
     }
     async addBootstrapNode() {
         this.logger.info('Adding bootstrap node');
@@ -204,14 +219,19 @@ export class P2PNetworkTest {
         // 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() {
-        this.logger.info('Setting up account');
-        const { deployedAccounts } = await deployAccounts(1, this.logger)({
-            wallet: this.context.wallet,
-            initialFundedAccounts: this.context.initialFundedAccounts
+    /** 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.deployedAccounts = deployedAccounts;
-        [{ address: this.defaultAccountAddress }] = deployedAccounts;
+        this.defaultAccountAddress = accountManager.address;
         this.wallet = this.context.wallet;
     }
     async deploySpamContract() {
@@ -219,10 +239,9 @@ export class P2PNetworkTest {
         if (!this.wallet) {
             throw new Error('Call setupAccount before deploying spam contract');
         }
-        const spamContract = await SpamContract.deploy(this.wallet).send({
+        ({ contract: this.spamContract } = await SpamContract.deploy(this.wallet).send({
             from: this.defaultAccountAddress
-        });
-        this.spamContract = spamContract;
+        }));
     }
     async removeInitialNode() {
         this.logger.info('Removing initial node');
@@ -238,7 +257,7 @@ export class P2PNetworkTest {
         return await this._sendDummyTx(this.ctx.deployL1ContractsValues.l1Client);
     }
     async _sendDummyTx(l1Client) {
-        const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client);
+        const l1TxUtils = createL1TxUtils(l1Client);
         return await l1TxUtils.sendAndMonitorTransaction({
             to: l1Client.account.address,
             value: 1n
@@ -246,11 +265,28 @@ export class P2PNetworkTest {
     }
     async setup() {
         this.logger.info('Setting up subsystems from fresh');
+        this.dataDir = fs.mkdtempSync(path.join(os.tmpdir(), `${this.testName}-`));
+        // 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 funded (initializerless) Schnorr accounts for tests that create accounts from them (e.g. add_rollup).
+        const fundedAccounts = await generateSchnorrAccounts(2);
         this.context = await setup(0, {
             ...this.setupOptions,
             fundSponsoredFPC: true,
-            skipAccountDeployment: true,
-            slasherFlavor: this.setupOptions.slasherFlavor ?? this.deployL1ContractsArgs.slasherFlavor ?? 'none',
+            skipInitialSequencer: true,
+            additionallyFundedAccounts: [
+                ...fundedAccounts,
+                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.
@@ -260,11 +296,11 @@ export class P2PNetworkTest {
         this.ctx = this.context;
         const sponsoredFPCAddress = await getSponsoredFPCAddress();
         const initialFundedAccounts = [
-            ...this.context.initialFundedAccounts.map((a)=>a.address),
+            ...this.context.additionallyFundedAccounts.map((a)=>a.address),
             sponsoredFPCAddress
         ];
-        const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
-        this.prefilledPublicData = prefilledPublicData;
+        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));
@@ -287,7 +323,9 @@ export class P2PNetworkTest {
    * @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) {
+   */ async waitForP2PMeshConnectivity(nodes, expectedNodeCount, timeoutSeconds = 30, checkIntervalSeconds = 0.1, topics = [
+        TopicType.tx
+    ], minMeshPeerCount = 1) {
         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)...`);
@@ -300,11 +338,35 @@ export class P2PNetworkTest {
             }, `Node ${index} to connect to at least ${minPeerCount} peers`, timeoutSeconds, checkIntervalSeconds);
         }));
         this.logger.warn('All nodes connected to P2P mesh');
+        // Wait for the GossipSub mesh to form for all specified topics. By default we only require at
+        // least 1 mesh peer per node, since GossipSub stops grafting once it reaches Dlo peers and won't
+        // fill the mesh to every available peer. Callers that need a proposal to reach the whole
+        // committee within a slot (e.g. quorum-from-genesis tests) raise `minMeshPeerCount` so the mesh
+        // is fully formed — a single mesh peer can leave some committee members unreached at first.
+        for (const topic of topics){
+            this.logger.warn(`Waiting for GossipSub mesh (>= ${minMeshPeerCount} peers per node) 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 >= minMeshPeerCount ? true : undefined;
+                }, `Node ${index} to have >= ${minMeshPeerCount} gossip mesh peers for ${topic} topic`, timeoutSeconds, checkIntervalSeconds);
+            }));
+            this.logger.warn(`All nodes have >= ${minMeshPeerCount} gossip mesh peers for ${topic} topic`);
+        }
     }
     async teardown() {
         await this.monitor.stop();
         await tryStop(this.bootstrapNode, this.logger);
         await teardown(this.context);
+        if (this.dataDir) {
+            fs.rmSync(this.dataDir, {
+                recursive: true,
+                force: true,
+                maxRetries: 3
+            });
+        }
     }
     async getContracts() {
         if (!this.ctx.deployL1ContractsValues) {
@@ -316,14 +378,12 @@ export class P2PNetworkTest {
             abi: SlasherAbi,
             client: this.ctx.deployL1ContractsValues.l1Client
         });
-        // Get the actual slashing proposer from rollup (which handles both empire and tally)
+        // Get the actual slashing proposer from rollup
         const slashingProposer = await rollup.getSlashingProposer();
-        const slashFactory = new SlashFactoryContract(this.ctx.deployL1ContractsValues.l1Client, getAddress(this.ctx.deployL1ContractsValues.l1ContractAddresses.slashFactoryAddress.toString()));
         return {
             rollup,
             slasherContract,
-            slashingProposer,
-            slashFactory
+            slashingProposer
         };
     }
 }

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

@@ -0,0 +1,19 @@
+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;
+type ReqrespOptions = {
+    disableStatusHandshake?: boolean;
+};
+export declare function createReqrespTest(options?: ReqrespOptions): Promise<P2PNetworkTest>;
+export declare function cleanupReqrespTest(params: {
+    t: P2PNetworkTest;
+    nodes?: AztecNodeService[];
+}): Promise<void>;
+export declare function runReqrespTxTest(params: {
+    t: P2PNetworkTest;
+    disableStatusHandshake?: boolean;
+}): Promise<AztecNodeService[]>;
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9wMnAvcmVxcmVzcC91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBYzFELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUluRCxlQUFPLE1BQU0sY0FBYyxJQUFJLENBQUM7QUFDaEMsZUFBTyxNQUFNLGdCQUFnQixJQUFJLENBQUM7QUFDbEMsZUFBTyxNQUFNLGtCQUFrQixRQUF1QixDQUFDO0FBRXZELEtBQUssY0FBYyxHQUFHO0lBQ3BCLHNCQUFzQixDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ2xDLENBQUM7QUFFRix3QkFBc0IsaUJBQWlCLENBQUMsT0FBTyxHQUFFLGNBQW1CLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQTJCN0Y7QUFFRCx3QkFBc0Isa0JBQWtCLENBQUMsTUFBTSxFQUFFO0lBQUUsQ0FBQyxFQUFFLGNBQWMsQ0FBQztJQUFDLEtBQUssQ0FBQyxFQUFFLGdCQUFnQixFQUFFLENBQUE7Q0FBRSxpQkFNakc7QUFJRCx3QkFBc0IsZ0JBQWdCLENBQUMsTUFBTSxFQUFFO0lBQzdDLENBQUMsRUFBRSxjQUFjLENBQUM7SUFDbEIsc0JBQXNCLENBQUMsRUFBRSxPQUFPLENBQUM7Q0FDbEMsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxDQWlLOUIifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/p2p/reqresp/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAc1D,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,KAAK,cAAc,GAAG;IACpB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,wBAAsB,iBAAiB,CAAC,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,cAAc,CAAC,CA2B7F;AAED,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAAE,CAAC,EAAE,cAAc,CAAC;IAAC,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAA;CAAE,iBAMjG;AAID,wBAAsB,gBAAgB,CAAC,MAAM,EAAE;IAC7C,CAAC,EAAE,cAAc,CAAC;IAClB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAiK9B"}

package/dest/{e2e_p2p → p2p}/reqresp/utils.js

@@ -1,23 +1,20 @@
 import { createLogger } from '@aztec/aztec.js/log';
 import { waitForTx } from '@aztec/aztec.js/node';
 import { Tx } from '@aztec/aztec.js/tx';
+import { PROPOSER_PIPELINING_SLOT_OFFSET } from '@aztec/epoch-cache';
 import { RollupContract } from '@aztec/ethereum/contracts';
-import { SlotNumber } from '@aztec/foundation/branded-types';
+import { CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
 import { timesAsync } from '@aztec/foundation/collection';
 import { retryUntil } from '@aztec/foundation/retry';
-import { jest } from '@jest/globals';
-import fs from 'fs';
-import os from 'os';
-import path from 'path';
-import { shouldCollectMetrics } from '../../fixtures/fixtures.js';
+import { expect, jest } from '@jest/globals';
+import { getBootNodeUdpPort, shouldCollectMetrics } from '../../fixtures/fixtures.js';
 import { createNodes } from '../../fixtures/setup_p2p_test.js';
-import { P2PNetworkTest, SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES, WAIT_FOR_TX_TIMEOUT } from '../p2p_network.js';
+import { P2PNetworkTest } from '../p2p_network.js';
 import { prepareTransactions } from '../shared.js';
 // Don't set this to a higher value than 9 because each node will use a different L1 publisher account and anvil seeds
 export const NUM_VALIDATORS = 6;
-export const NUM_TXS_PER_NODE = 2;
-export const BOOT_NODE_UDP_PORT = 4500;
-export const createReqrespDataDir = ()=>fs.mkdtempSync(path.join(os.tmpdir(), 'reqresp-'));
+export const NUM_TXS_PER_NODE = 4;
+export const BOOT_NODE_UDP_PORT = getBootNodeUdpPort();
 export async function createReqrespTest(options = {}) {
     const { disableStatusHandshake = false } = options;
     const t = await P2PNetworkTest.create({
@@ -28,13 +25,20 @@ export async function createReqrespTest(options = {}) {
         // To collect metrics - run in aztec-packages `docker compose --profile metrics up`
         metricsPort: shouldCollectMetrics(),
         initialConfig: {
-            ...SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES,
-            aztecSlotDuration: 24,
+            ethereumSlotDuration: 12,
+            aztecSlotDuration: 36,
+            blockDurationMs: 6000,
+            minTxsPerBlock: 1,
+            maxTxsPerBlock: 2,
+            aztecProofSubmissionEpochs: 1024,
             ...disableStatusHandshake ? {
                 p2pDisableStatusHandshake: true
             } : {},
             listenAddress: '127.0.0.1',
-            aztecEpochDuration: 64
+            aztecEpochDuration: 64,
+            // Pipelining: target-slot is one ahead of build-slot; inboxLag sources L1->L2
+            // messages from the previous checkpoint to avoid L1ToL2MessagesNotReadyError.
+            inboxLag: 2
         }
     });
     await t.setup();
@@ -42,22 +46,15 @@ export async function createReqrespTest(options = {}) {
     return t;
 }
 export async function cleanupReqrespTest(params) {
-    const { t, nodes, dataDir } = params;
+    const { t, nodes } = params;
     if (nodes) {
         await t.stopNodes(nodes);
     }
     await t.teardown();
-    for(let i = 0; i < NUM_VALIDATORS; i++){
-        fs.rmSync(`${dataDir}-${i}`, {
-            recursive: true,
-            force: true,
-            maxRetries: 3
-        });
-    }
 }
 const getNodePort = (nodeIndex)=>BOOT_NODE_UDP_PORT + 1 + nodeIndex;
 export async function runReqrespTxTest(params) {
-    const { t, dataDir, disableStatusHandshake = false } = params;
+    const { t, disableStatusHandshake = false } = params;
     if (!t.bootstrapNodeEnr) {
         throw new Error('Bootstrap node ENR is not available');
     }
@@ -66,7 +63,7 @@ export async function runReqrespTxTest(params) {
         ...t.ctx.aztecNodeConfig,
         p2pDisableStatusHandshake: true
     } : t.ctx.aztecNodeConfig;
-    const nodes = await createNodes(aztecNodeConfig, t.ctx.dateProvider, t.bootstrapNodeEnr, NUM_VALIDATORS, BOOT_NODE_UDP_PORT, t.prefilledPublicData, dataDir, shouldCollectMetrics());
+    const nodes = await createNodes(aztecNodeConfig, t.ctx.dateProvider, t.bootstrapNodeEnr, NUM_VALIDATORS, BOOT_NODE_UDP_PORT, t.genesis, t.dataDirFor('validator'), shouldCollectMetrics());
     t.logger.info('Waiting for nodes to connect');
     await t.waitForP2PMeshConnectivity(nodes, NUM_VALIDATORS);
     await t.setupAccount();
@@ -83,7 +80,11 @@ export async function runReqrespTxTest(params) {
     const [timestamp] = await t.ctx.cheatCodes.rollup.advanceToNextSlot();
     t.ctx.dateProvider.setTime(Number(timestamp) * 1000);
     const startSlotTimestamp = BigInt(timestamp);
-    const { proposerIndexes, nodesToTurnOffTxGossip } = await getProposerIndexes(t, startSlotTimestamp);
+    // Under pipelining the active builder during wallclock slot S targets slot S+1, so
+    // we must address the proposer of S+1 (not S) for batch 0. Shift the proposer lookup
+    // window by the pipelining offset so we always send to the currently-building proposer.
+    const proposerSlotOffset = PROPOSER_PIPELINING_SLOT_OFFSET;
+    const { proposerIndexes, nodesToTurnOffTxGossip } = await getProposerIndexes(t, startSlotTimestamp, proposerSlotOffset);
     t.logger.info(`Turning off tx gossip for nodes: ${nodesToTurnOffTxGossip.map(getNodePort)}`);
     t.logger.info(`Sending txs to proposer nodes: ${proposerIndexes.map(getNodePort)}`);
     // Replace the p2p node implementation of some of the nodes with a spy such that it does not store transactions that are gossiped to it
@@ -102,6 +103,11 @@ export async function runReqrespTxTest(params) {
     t.logger.info('Sending transactions through proposer nodes');
     const submittedTxs = await Promise.all(txBatches.map(async (batch, batchIndex)=>{
         const proposerNode = nodes[proposerIndexes[batchIndex]];
+        for (const tx of batch){
+            t.logger.info(`Tx ${tx.getTxHash().toString()} base64: ${tx.toBuffer().toString('base64')}`);
+        }
+        const txHashes = batch.map((tx)=>tx.getTxHash().toString());
+        t.logger.info(`Sending batch ${batchIndex} to proposer ${getNodePort(proposerIndexes[batchIndex])}: ${txHashes.join(', ')}`);
         await Promise.all(batch.map(async (tx)=>{
             try {
                 await proposerNode.sendTx(tx);
@@ -115,18 +121,52 @@ export async function runReqrespTxTest(params) {
                 txHash: tx.getTxHash()
             }));
     }));
+    // Log pool state per node after sending
+    for(let i = 0; i < NUM_VALIDATORS; i++){
+        const count = await nodes[i].getPendingTxCount();
+        t.logger.info(`Node ${getNodePort(i)} pool has ${count} pending txs`);
+    }
+    // Use the test's own aztecSlotDuration (not the env default that p2p_network's
+    // WAIT_FOR_TX_TIMEOUT is derived from) so the timeout scales with this test's 36s slot.
+    // Under pipelining the round-trip is roughly build-slot + target-slot + L1 publish, so
+    // budget for >= 3 slots.
+    const waitForTxTimeout = t.ctx.aztecNodeConfig.aztecSlotDuration * 4.5;
     t.logger.info('Waiting for all transactions to be mined');
     await Promise.all(submittedTxs.flatMap((batch, batchIndex)=>batch.map(async (submittedTx, txIndex)=>{
             t.logger.info(`Waiting for tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} to be mined`);
             await waitForTx(submittedTx.node, submittedTx.txHash, {
-                timeout: WAIT_FOR_TX_TIMEOUT * 1.5
+                timeout: waitForTxTimeout
             });
             t.logger.info(`Tx ${batchIndex}-${txIndex} ${submittedTx.txHash.toString()} has been mined`);
         })));
     t.logger.info('All transactions mined');
+    // Assert that multiple blocks were built for at least one slot
+    t.logger.info('Verifying multiple blocks for at least one checkpoint');
+    // Wait for L1 checkpoint sync, which may lag behind P2P block propagation.
+    const checkpoints = await retryUntil(async ()=>{
+        const cps = await nodes[0].getCheckpoints(CheckpointNumber(1), 50, {
+            includeBlocks: true
+        });
+        return cps.length > 0 && cps.some((cp)=>(cp.blocks?.length ?? 0) >= 2) ? cps : undefined;
+    }, 'waiting for multi-block checkpoint to sync from L1', 30, 1);
+    let mbpsFound = false;
+    let expectedBlockNumber = checkpoints[0].blocks[0].number;
+    for (const published of checkpoints){
+        const blocks = published.blocks;
+        const blockCount = blocks.length;
+        mbpsFound = mbpsFound || blockCount >= 2;
+        for(let i = 0; i < blockCount; i++){
+            const block = blocks[i];
+            expect(block.indexWithinCheckpoint).toBe(i);
+            expect(block.checkpointNumber).toBe(published.number);
+            expect(block.number).toBe(expectedBlockNumber);
+            expectedBlockNumber++;
+        }
+    }
+    expect(mbpsFound).toBe(true);
     return nodes;
 }
-async function getProposerIndexes(t, startSlotTimestamp) {
+async function getProposerIndexes(t, startSlotTimestamp, slotOffset = 0) {
     // Get the nodes for the next set of slots
     const rollupContract = new RollupContract(t.ctx.deployL1ContractsValues.l1Client, t.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress);
     const attesters = await rollupContract.getAttesters();
@@ -134,7 +174,7 @@ async function getProposerIndexes(t, startSlotTimestamp) {
     const proposers = await Promise.all(Array.from({
         length: 3
     }, async (_, i)=>{
-        const slot = SlotNumber(startSlot + i);
+        const slot = SlotNumber(startSlot + slotOffset + i);
         const slotTimestamp = await rollupContract.getTimestampForSlot(slot);
         return await rollupContract.getProposerAt(slotTimestamp);
     }));

package/dest/p2p/shared.d.ts

@@ -0,0 +1,72 @@
+import type { InitialAccountData } from '@aztec/accounts/testing';
+import type { Archiver } from '@aztec/archiver';
+import type { AztecNodeService } from '@aztec/aztec-node';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { Logger } from '@aztec/aztec.js/log';
+import { TxHash } from '@aztec/aztec.js/tx';
+import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
+import { type TopicType } from '@aztec/stdlib/p2p';
+import { type ProvenTx } from '../test-wallet/utils.js';
+import { type P2PNetworkTest } from './p2p_network.js';
+/** One published checkpoint as returned by the archiver, including its attestations. */
+type PublishedCheckpoint = Awaited<ReturnType<Archiver['getCheckpoints']>>[number];
+export declare const submitComplexTxsTo: (logger: Logger, from: AztecAddress, spamContract: SpamContract, numTxs: number, opts?: {
+    callPublic?: boolean | undefined;
+}) => Promise<TxHash[]>;
+export declare const submitTransactions: (logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData) => Promise<TxHash[]>;
+export declare function prepareTransactions(logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData): Promise<ProvenTx[]>;
+/** Runs the shared p2p QoS Grafana alert check when CHECK_ALERTS=true; a no-op otherwise. */
+export declare function maybeCheckQosAlerts(logger: Logger): Promise<void>;
+/** Waits until every node's synced block number reaches the initial node's current tip. */
+export declare function waitForNodesToSync(t: P2PNetworkTest, nodes: AztecNodeService[]): Promise<void>;
+/** Reads the published checkpoint containing the block that mined the given tx. */
+export declare function getPublishedCheckpointForTx(node: AztecNodeService, txHash: TxHash): Promise<PublishedCheckpoint>;
+/** Polls until the archiver has indexed the first published checkpoint, then returns it. */
+export declare function waitForFirstPublishedCheckpoint(t: P2PNetworkTest, nodes: AztecNodeService[], timeoutSeconds?: number): Promise<PublishedCheckpoint>;
+/**
+ * Recovers the attestation signers from a published checkpoint and asserts each one belongs to the
+ * validator set formed by the given nodes. Returns the recovered signer addresses so callers can add
+ * scenario-specific assertions (e.g. an exact signer count).
+ */
+export declare function verifyAttestationSigners(t: P2PNetworkTest, nodes: AztecNodeService[], publishedCheckpoint: PublishedCheckpoint): Promise<string[]>;
+/** Options that parameterize {@link runGossipScenario}. */
+export interface GossipScenarioOptions {
+    /** The initialized P2P network test (setup() + validator registration already done). */
+    t: P2PNetworkTest;
+    /** Number of validator nodes forming the committee. */
+    numValidators: number;
+    /** Base UDP port for the validator nodes. */
+    bootNodePort: number;
+    /** Transactions submitted per validator node; 0 skips tx submission entirely (e.g. the oracle test). */
+    txsPerNode: number;
+    /** Submit tx batches sequentially instead of concurrently. */
+    submitSequentially?: boolean;
+    /** Overrides for the P2P mesh-connectivity wait; unset fields fall back to waitForP2PMeshConnectivity defaults. */
+    mesh?: {
+        expectedNodeCount?: number;
+        timeoutSeconds?: number;
+        checkIntervalSeconds?: number;
+        topics?: TopicType[];
+        minMeshPeerCount?: number;
+    };
+    /** Which published checkpoint the attestation signers are read from (defaults to the first tx's block). */
+    checkpointSource?: 'first-tx' | 'first-published';
+    /** Runs after validator registration but before the validator nodes are created. */
+    beforeCreateNodes?: () => Promise<void>;
+    /** Creates extra non-validator nodes (prover/monitor) once the validator nodes exist. */
+    createExtraNodes?: (nodes: AztecNodeService[]) => Promise<void>;
+    /** Runs after the account is registered but before txs are submitted (sync waits, checkpoint waits, sleeps). */
+    beforeSubmit?: (nodes: AztecNodeService[]) => Promise<void>;
+    /** Scenario-specific verification run after attestation-signer verification (proven block, price convergence). */
+    afterVerify?: (nodes: AztecNodeService[]) => Promise<void>;
+}
+/**
+ * Shared skeleton for the p2p gossip tests: create the validator nodes and any extra nodes, wait for
+ * the mesh to form, register the account, optionally submit and mine txs, then verify the attestation
+ * signers of a published checkpoint. Each varying part (validator registration, extra nodes, pre-submit
+ * waits, scenario-specific verification) is supplied via the callbacks in {@link GossipScenarioOptions}.
+ * Returns the validator nodes so the caller can track them for teardown.
+ */
+export declare function runGossipScenario(opts: GossipScenarioOptions): Promise<AztecNodeService[]>;
+export {};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcDJwL3NoYXJlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ2xFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBQ2hELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDMUQsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFHOUQsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBSzVDLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBSXZFLE9BQU8sRUFBMkMsS0FBSyxTQUFTLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQVc1RixPQUFPLEVBQUUsS0FBSyxRQUFRLEVBQW9CLE1BQU0seUJBQXlCLENBQUM7QUFDMUUsT0FBTyxFQUFFLEtBQUssY0FBYyxFQUF1QixNQUFNLGtCQUFrQixDQUFDO0FBRTVFLHdGQUF3RjtBQUN4RixLQUFLLG1CQUFtQixHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBR25GLGVBQU8sTUFBTSxrQkFBa0I7O3VCQWtCOUIsQ0FBQztBQUdGLGVBQU8sTUFBTSxrQkFBa0Isa0hBc0I5QixDQUFDO0FBRUYsd0JBQXNCLG1CQUFtQixDQUN2QyxNQUFNLEVBQUUsTUFBTSxFQUNkLElBQUksRUFBRSxnQkFBZ0IsRUFDdEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxhQUFhLEVBQUUsa0JBQWtCLEdBQ2hDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQTZCckI7QUFjRCw2RkFBNkY7QUFDN0Ysd0JBQXNCLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUt2RTtBQUVELDJGQUEyRjtBQUMzRix3QkFBc0Isa0JBQWtCLENBQUMsQ0FBQyxFQUFFLGNBQWMsRUFBRSxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBY3BHO0FBRUQsbUZBQW1GO0FBQ25GLHdCQUFzQiwyQkFBMkIsQ0FDL0MsSUFBSSxFQUFFLGdCQUFnQixFQUN0QixNQUFNLEVBQUUsTUFBTSxHQUNiLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQU85QjtBQUVELDRGQUE0RjtBQUM1Rix3QkFBc0IsK0JBQStCLENBQ25ELENBQUMsRUFBRSxjQUFjLEVBQ2pCLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxFQUN6QixjQUFjLFNBQU0sR0FDbkIsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBZTlCO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQix3QkFBd0IsQ0FDNUMsQ0FBQyxFQUFFLGNBQWMsRUFDakIsS0FBSyxFQUFFLGdCQUFnQixFQUFFLEVBQ3pCLG1CQUFtQixFQUFFLG1CQUFtQixHQUN2QyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FxQm5CO0FBRUQsMkRBQTJEO0FBQzNELE1BQU0sV0FBVyxxQkFBcUI7SUFDcEMsd0ZBQXdGO0lBQ3hGLENBQUMsRUFBRSxjQUFjLENBQUM7SUFDbEIsdURBQXVEO0lBQ3ZELGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIsNkNBQTZDO0lBQzdDLFlBQVksRUFBRSxNQUFNLENBQUM7SUFDckIsd0dBQXdHO0lBQ3hHLFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsOERBQThEO0lBQzlELGtCQUFrQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQzdCLG1IQUFtSDtJQUNuSCxJQUFJLENBQUMsRUFBRTtRQUNMLGlCQUFpQixDQUFDLEVBQUUsTUFBTSxDQUFDO1FBQzNCLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUN4QixvQkFBb0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUM5QixNQUFNLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FBQztRQUNyQixnQkFBZ0IsQ0FBQyxFQUFFLE1BQU0sQ0FBQztLQUMzQixDQUFDO0lBQ0YsMkdBQTJHO0lBQzNHLGdCQUFnQixDQUFDLEVBQUUsVUFBVSxHQUFHLGlCQUFpQixDQUFDO0lBQ2xELG9GQUFvRjtJQUNwRixpQkFBaUIsQ0FBQyxFQUFFLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hDLHlGQUF5RjtJQUN6RixnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLGdCQUFnQixFQUFFLEtBQUssT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2hFLGdIQUFnSDtJQUNoSCxZQUFZLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxLQUFLLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUM1RCxrSEFBa0g7SUFDbEgsV0FBVyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsS0FBSyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7Q0FDNUQ7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBc0IsaUJBQWlCLENBQUMsSUFBSSxFQUFFLHFCQUFxQixHQUFHLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBc0VoRyJ9

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

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