@aztec/end-to-end 0.0.1-commit.d3ec352c → 0.0.1-commit.d58ff9d0

package/dest/p2p/p2p_network.js

@@ -0,0 +1,389 @@
+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 { 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 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 { 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_NO_PRUNES = {
+    aztecSlotDuration: 12,
+    ethereumSlotDuration: 4,
+    aztecProofSubmissionEpochs: 640
+};
+export class P2PNetworkTest {
+    testName;
+    bootstrapNodeEnr;
+    bootNodePort;
+    numberOfValidators;
+    numberOfNodes;
+    metricsPort;
+    context;
+    baseAccountPrivateKey;
+    baseAccount;
+    logger;
+    monitor;
+    ctx;
+    attesterPrivateKeys;
+    attesterPublicKeys;
+    peerIdPrivateKeys;
+    validators;
+    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;
+    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.peerIdPrivateKeys = [];
+        this.validators = [];
+        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')}`;
+        this.baseAccount = privateKeyToAccount(this.baseAccountPrivateKey);
+        this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX + numberOfNodes, numberOfValidators);
+        this.attesterPublicKeys = this.attesterPrivateKeys.map((privateKey)=>privateKeyToAccount(privateKey).address);
+        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,
+            aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
+            slashingRoundSizeInEpochs: initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
+            slasherEnabled: initialValidatorConfig.slasherEnabled ?? true,
+            aztecTargetCommitteeSize: numberOfValidators,
+            metricsPort: metricsPort,
+            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,
+            aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
+            aztecTargetCommitteeSize: numberOfValidators,
+            initialValidators: [],
+            zkPassportArgs: {
+                zkPassportDomain: zkPassportParams.domain,
+                zkPassportScope: zkPassportParams.scope
+            }
+        };
+    }
+    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, numberOfValidators, initialValidatorConfig, numberOfNodes, metricsPort, startProverNode);
+    }
+    get fundedAccount() {
+        if (!this.hardcodedAccountData) {
+            throw new Error('Call setup to initialize the hardcoded account.');
+        }
+        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');
+        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();
+    }
+    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
+        });
+        this.logger.info(`Adding ${this.numberOfValidators} validators`);
+        const stakingAsset = getContract({
+            address: this.context.deployL1ContractsValues.l1ContractAddresses.stakingAssetAddress.toString(),
+            abi: TestERC20Abi,
+            client: this.context.deployL1ContractsValues.l1Client
+        });
+        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
+        });
+        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);
+    }
+    /** 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() {
+        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() {
+        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.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,
+            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.
+        {
+            syncChainTip: 'checkpointed'
+        });
+        this.ctx = this.context;
+        const sponsoredFPCAddress = await getSponsoredFPCAddress();
+        const initialFundedAccounts = [
+            ...this.context.additionallyFundedAccounts.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');
+        if (!nodes || !nodes.length) {
+            this.logger.info('No nodes to stop');
+            return;
+        }
+        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
+    ], 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)...`);
+        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 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) {
+            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/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/p2p/reqresp/utils.js

@@ -0,0 +1,193 @@
+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 { CheckpointNumber, SlotNumber } from '@aztec/foundation/branded-types';
+import { timesAsync } from '@aztec/foundation/collection';
+import { retryUntil } from '@aztec/foundation/retry';
+import { expect, jest } from '@jest/globals';
+import { getBootNodeUdpPort, shouldCollectMetrics } from '../../fixtures/fixtures.js';
+import { createNodes } from '../../fixtures/setup_p2p_test.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 = 4;
+export const BOOT_NODE_UDP_PORT = getBootNodeUdpPort();
+export async function createReqrespTest(options = {}) {
+    const { disableStatusHandshake = false } = options;
+    const t = await P2PNetworkTest.create({
+        testName: 'e2e_p2p_reqresp_tx',
+        numberOfNodes: 0,
+        numberOfValidators: NUM_VALIDATORS,
+        basePort: BOOT_NODE_UDP_PORT,
+        // To collect metrics - run in aztec-packages `docker compose --profile metrics up`
+        metricsPort: shouldCollectMetrics(),
+        initialConfig: {
+            ethereumSlotDuration: 12,
+            aztecSlotDuration: 36,
+            blockDurationMs: 6000,
+            minTxsPerBlock: 1,
+            maxTxsPerBlock: 2,
+            aztecProofSubmissionEpochs: 1024,
+            ...disableStatusHandshake ? {
+                p2pDisableStatusHandshake: true
+            } : {},
+            listenAddress: '127.0.0.1',
+            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();
+    await t.applyBaseSetup();
+    return t;
+}
+export async function cleanupReqrespTest(params) {
+    const { t, nodes } = params;
+    if (nodes) {
+        await t.stopNodes(nodes);
+    }
+    await t.teardown();
+}
+const getNodePort = (nodeIndex)=>BOOT_NODE_UDP_PORT + 1 + nodeIndex;
+export async function runReqrespTxTest(params) {
+    const { t, disableStatusHandshake = false } = params;
+    if (!t.bootstrapNodeEnr) {
+        throw new Error('Bootstrap node ENR is not available');
+    }
+    t.logger.info('Creating nodes');
+    const aztecNodeConfig = disableStatusHandshake ? {
+        ...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.genesis, t.dataDirFor('validator'), shouldCollectMetrics());
+    t.logger.info('Waiting for nodes to connect');
+    await t.waitForP2PMeshConnectivity(nodes, NUM_VALIDATORS);
+    await t.setupAccount();
+    const targetBlockNumber = await t.ctx.aztecNodeService.getBlockNumber();
+    await retryUntil(async ()=>{
+        const blockNumbers = await Promise.all(nodes.map((node)=>node.getBlockNumber()));
+        return blockNumbers.every((blockNumber)=>blockNumber >= targetBlockNumber) ? true : undefined;
+    }, `validators to sync to L2 block ${targetBlockNumber}`, 60, 0.5);
+    t.logger.info('Preparing transactions to send');
+    const txBatches = await timesAsync(2, ()=>prepareTransactions(t.logger, t.ctx.aztecNodeService, NUM_TXS_PER_NODE, t.fundedAccount));
+    t.logger.info('Removing initial node');
+    await t.removeInitialNode();
+    t.logger.info('Starting fresh slot');
+    const [timestamp] = await t.ctx.cheatCodes.rollup.advanceToNextSlot();
+    t.ctx.dateProvider.setTime(Number(timestamp) * 1000);
+    const startSlotTimestamp = BigInt(timestamp);
+    // 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
+    // Original implementation of `handleGossipedTx` will store received transactions in the tx pool.
+    // We chose the first 2 nodes that will be the proposers for the next few slots
+    for (const nodeIndex of nodesToTurnOffTxGossip){
+        const logger = createLogger(`p2p:${getNodePort(nodeIndex)}`);
+        jest.spyOn(nodes[nodeIndex].p2pClient.p2pService, 'handleGossipedTx').mockImplementation((payloadData)=>{
+            const txHash = Tx.fromBuffer(payloadData).getTxHash();
+            logger.info(`Skipping storage of gossiped transaction ${txHash.toString()}`);
+            return Promise.resolve();
+        });
+    }
+    // We send the tx to the proposer nodes directly, ignoring the pxe and node in each context
+    // We cannot just call tx.send since they were created using a pxe wired to the first node which is now stopped
+    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);
+            } catch (err) {
+                t.logger.error(`Error sending tx: ${err}`);
+                throw err;
+            }
+        }));
+        return batch.map((tx)=>({
+                node: proposerNode,
+                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: 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, 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();
+    const startSlot = await rollupContract.getSlotAt(startSlotTimestamp);
+    const proposers = await Promise.all(Array.from({
+        length: 3
+    }, async (_, i)=>{
+        const slot = SlotNumber(startSlot + slotOffset + i);
+        const slotTimestamp = await rollupContract.getTimestampForSlot(slot);
+        return await rollupContract.getProposerAt(slotTimestamp);
+    }));
+    // Get the indexes of the nodes that are responsible for the next two slots
+    const proposerIndexes = proposers.map((proposer)=>attesters.findIndex((a)=>a.equals(proposer)));
+    if (proposerIndexes.some((i)=>i === -1)) {
+        throw new Error(`Proposer index not found for proposer ` + `(proposers=${proposers.map((p)=>p.toString()).join(',')}, indices=${proposerIndexes.join(',')})`);
+    }
+    const nodesToTurnOffTxGossip = Array.from({
+        length: NUM_VALIDATORS
+    }, (_, i)=>i).filter((i)=>!proposerIndexes.includes(i));
+    return {
+        proposerIndexes,
+        nodesToTurnOffTxGossip
+    };
+}