@aztec/end-to-end 0.0.1-commit.b655e406 → 0.0.1-commit.c0b82b2

package/dest/e2e_p2p/p2p_network.js

@@ -1,7 +1,12 @@
 import { EthAddress } from '@aztec/aztec.js/addresses';
 import { Fr } from '@aztec/aztec.js/fields';
-import { GSEContract, MultiAdderArtifact, RollupContract, createL1TxUtilsFromViemWallet, deployL1Contract, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
+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';
@@ -10,14 +15,14 @@ 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 getPort from 'get-port';
 import { getAddress, getContract } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
+import { deployAccounts, getPrivateKeyFromIndex, getSponsoredFPCAddress, setup, teardown } from '../fixtures/setup.js';
 import { ATTESTER_PRIVATE_KEYS_START_INDEX, createValidatorConfig, generatePrivateKeys } from '../fixtures/setup_p2p_test.js';
-import { createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
-import { getPrivateKeyFromIndex, getSponsoredFPCAddress } from '../fixtures/utils.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';
@@ -35,7 +40,7 @@ export class P2PNetworkTest {
     numberOfValidators;
     numberOfNodes;
     metricsPort;
-    snapshotManager;
+    context;
     baseAccountPrivateKey;
     baseAccount;
     logger;
@@ -52,8 +57,11 @@ export class P2PNetworkTest {
     defaultAccountAddress;
     spamContract;
     bootstrapNode;
+    // Store setup options for use in setup()
+    setupOptions;
+    deployL1ContractsArgs;
     constructor(testName, bootstrapNodeEnr, bootNodePort, numberOfValidators, initialValidatorConfig, numberOfNodes = 0, // If set enable metrics collection
-    metricsPort, startProverNode, mockZkPassportVerifier){
+    metricsPort, startProverNode){
         this.testName = testName;
         this.bootstrapNodeEnr = bootstrapNodeEnr;
         this.bootNodePort = bootNodePort;
@@ -73,7 +81,8 @@ export class P2PNetworkTest {
         this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX + numberOfNodes, numberOfValidators);
         this.attesterPublicKeys = this.attesterPrivateKeys.map((privateKey)=>privateKeyToAccount(privateKey).address);
         const zkPassportParams = ZkPassportProofParams.random();
-        this.snapshotManager = createSnapshotManager(`e2e_p2p_network/${testName}`, process.env.E2E_DATA_PATH, {
+        // Store setup options for later use
+        this.setupOptions = {
             ...initialValidatorConfig,
             ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
             aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
@@ -82,11 +91,12 @@ export class P2PNetworkTest {
             slashingRoundSizeInEpochs: initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
             slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
             aztecTargetCommitteeSize: numberOfValidators,
-            salt: 420,
             metricsPort: metricsPort,
             numberOfInitialFundedAccounts: 2,
-            startProverNode
-        }, {
+            startProverNode,
+            walletMinFeePadding: 2.0
+        };
+        this.deployL1ContractsArgs = {
             ...initialValidatorConfig,
             aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
             slashingRoundSizeInEpochs: initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
@@ -97,32 +107,30 @@ export class P2PNetworkTest {
             aztecTargetCommitteeSize: numberOfValidators,
             initialValidators: [],
             zkPassportArgs: {
-                mockZkPassportVerifier,
                 zkPassportDomain: zkPassportParams.domain,
                 zkPassportScope: zkPassportParams.scope
             }
-        });
+        };
     }
-    static async create({ testName, numberOfNodes, numberOfValidators, basePort, metricsPort, initialConfig, startProverNode, mockZkPassportVerifier }) {
+    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, mockZkPassportVerifier);
+        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.');
+            throw new Error('Call setupAccount to create a funded account.');
         }
         return this.deployedAccounts[0];
     }
     async addBootstrapNode() {
-        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();
-        });
+        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 = [];
@@ -140,123 +148,127 @@ export class P2PNetworkTest {
             validators
         };
     }
-    async applyBaseSnapshots() {
+    async applyBaseSetup() {
         await this.addBootstrapNode();
-        await this.snapshotManager.snapshot('add-validators', async ({ deployL1ContractsValues, cheatCodes })=>{
-            const rollup = getContract({
-                address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
-                abi: RollupAbi,
-                client: deployL1ContractsValues.l1Client
-            });
-            this.logger.info(`Adding ${this.numberOfValidators} validators`);
-            const stakingAsset = getContract({
-                address: deployL1ContractsValues.l1ContractAddresses.stakingAssetAddress.toString(),
-                abi: TestERC20Abi,
-                client: deployL1ContractsValues.l1Client
-            });
-            const { address: multiAdderAddress } = await deployL1Contract(deployL1ContractsValues.l1Client, MultiAdderArtifact.contractAbi, MultiAdderArtifact.contractBytecode, [
-                rollup.address,
-                deployL1ContractsValues.l1Client.account.address
-            ]);
-            const multiAdder = getContract({
-                address: multiAdderAddress.toString(),
-                abi: MultiAdderArtifact.contractAbi,
-                client: deployL1ContractsValues.l1Client
-            });
-            const stakeNeeded = await rollup.read.getActivationThreshold() * BigInt(this.numberOfValidators);
-            await Promise.all([
-                await stakingAsset.write.mint([
-                    multiAdder.address,
-                    stakeNeeded
-                ], {})
-            ].map((txHash)=>deployL1ContractsValues.l1Client.waitForTransactionReceipt({
-                    hash: txHash
-                })));
-            const { validators } = this.getValidators();
-            this.validators = validators;
-            const gseAddress = deployL1ContractsValues.l1ContractAddresses.gseAddress;
-            if (!gseAddress) {
-                throw new Error('GSE contract not deployed');
-            }
-            const gseContract = new GSEContract(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
-                };
+        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 deployL1ContractsValues.l1Client.waitForTransactionReceipt({
-                hash: await multiAdder.write.addValidators([
-                    validatorTuples
-                ])
-            });
-            await cheatCodes.rollup.advanceToEpoch(await cheatCodes.rollup.getEpoch() + await rollup.read.getLagInEpochs() + 1n);
-            // Send and await a tx to make sure we mine a block for the warp to correctly progress.
-            await this._sendDummyTx(deployL1ContractsValues.l1Client);
+        };
+        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), ({ deployedAccounts }, { wallet })=>{
-            this.deployedAccounts = deployedAccounts;
-            [{ address: this.defaultAccountAddress }] = deployedAccounts;
-            this.wallet = wallet;
-            return Promise.resolve();
+        this.logger.info('Setting up account');
+        const { deployedAccounts } = await deployAccounts(1, this.logger)({
+            wallet: this.context.wallet,
+            initialFundedAccounts: this.context.initialFundedAccounts
         });
+        this.deployedAccounts = deployedAccounts;
+        [{ address: this.defaultAccountAddress }] = deployedAccounts;
+        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({
-                from: this.defaultAccountAddress
-            }).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');
+        }
+        const spamContract = await SpamContract.deploy(this.wallet).send({
+            from: this.defaultAccountAddress
         });
+        this.spamContract = spamContract;
     }
     async removeInitialNode() {
-        await this.snapshotManager.snapshot('remove-initial-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 this._sendDummyTx(deployL1ContractsValues.l1Client);
-            const block = await deployL1ContractsValues.l1Client.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 = createL1TxUtilsFromViemWallet(l1Client);
+        const l1TxUtils = createL1TxUtils(l1Client);
         return await l1TxUtils.sendAndMonitorTransaction({
             to: l1Client.account.address,
             value: 1n
         });
     }
     async setup() {
-        this.ctx = await this.snapshotManager.setup();
+        this.logger.info('Setting up subsystems from fresh');
+        this.context = await setup(0, {
+            ...this.setupOptions,
+            fundSponsoredFPC: true,
+            skipAccountDeployment: true,
+            slasherFlavor: this.setupOptions.slasherFlavor ?? this.deployL1ContractsArgs.slasherFlavor ?? 'none',
+            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.ctx.initialFundedAccounts.map((a)=>a.address),
+            ...this.context.initialFundedAccounts.map((a)=>a.address),
             sponsoredFPCAddress
         ];
         const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
         this.prefilledPublicData = prefilledPublicData;
-        const rollupContract = RollupContract.getFromL1ContractsValues(this.ctx.deployL1ContractsValues);
-        this.monitor = new ChainMonitor(rollupContract, this.ctx.dateProvider).start();
-        this.monitor.on('l1-block', ({ timestamp })=>this.ctx.dateProvider.setTime(Number(timestamp) * 1000));
+        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');
@@ -289,19 +301,32 @@ 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 GossipSub mesh to form for the tx topic.
+        // 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.
+        this.logger.warn('Waiting for GossipSub mesh to form for tx topic...');
+        await Promise.all(nodes.map(async (node, index)=>{
+            const p2p = node.getP2P();
+            await retryUntil(async ()=>{
+                const meshPeers = await p2p.getGossipMeshPeerCount(TopicType.tx);
+                this.logger.debug(`Node ${index} has ${meshPeers} gossip mesh peers for tx topic`);
+                return meshPeers >= 1 ? true : undefined;
+            }, `Node ${index} to have gossip mesh peers for tx topic`, timeoutSeconds, checkIntervalSeconds);
+        }));
+        this.logger.warn('All nodes have gossip mesh peers for tx topic');
     }
     async teardown() {
         await this.monitor.stop();
         await tryStop(this.bootstrapNode, this.logger);
-        await this.snapshotManager.teardown();
+        await teardown(this.context);
     }
     async getContracts() {
         if (!this.ctx.deployL1ContractsValues) {
-            throw new Error('DeployL1ContractsValues not set');
+            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()),
+            address: getAddress((await rollup.getSlasherAddress()).toString()),
             abi: SlasherAbi,
             client: this.ctx.deployL1ContractsValues.l1Client
         });

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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9lMmVfcDJwL3JlcXJlc3AvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQWdCMUQsT0FBTyxFQUFFLGNBQWMsRUFBdUIsTUFBTSxtQkFBbUIsQ0FBQztBQUl4RSxlQUFPLE1BQU0sY0FBYyxJQUFJLENBQUM7QUFDaEMsZUFBTyxNQUFNLGdCQUFnQixJQUFJLENBQUM7QUFDbEMsZUFBTyxNQUFNLGtCQUFrQixRQUF1QixDQUFDO0FBRXZELGVBQU8sTUFBTSxvQkFBb0IsY0FBMkQsQ0FBQztBQUU3RixLQUFLLGNBQWMsR0FBRztJQUNwQixzQkFBc0IsQ0FBQyxFQUFFLE9BQU8sQ0FBQztDQUNsQyxDQUFDO0FBRUYsd0JBQXNCLGlCQUFpQixDQUFDLE9BQU8sR0FBRSxjQUFtQixHQUFHLE9BQU8sQ0FBQyxjQUFjLENBQUMsQ0EwQjdGO0FBRUQsd0JBQXNCLGtCQUFrQixDQUFDLE1BQU0sRUFBRTtJQUFFLENBQUMsRUFBRSxjQUFjLENBQUM7SUFBQyxLQUFLLENBQUMsRUFBRSxnQkFBZ0IsRUFBRSxDQUFDO0lBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQTtDQUFFLGlCQVNsSDtBQUlELHdCQUFzQixnQkFBZ0IsQ0FBQyxNQUFNLEVBQUU7SUFDN0MsQ0FBQyxFQUFFLGNBQWMsQ0FBQztJQUNsQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLHNCQUFzQixDQUFDLEVBQUUsT0FBTyxDQUFDO0NBQ2xDLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixFQUFFLENBQUMsQ0E4SDlCIn0=

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;AAgB1D,OAAO,EAAE,cAAc,EAAuB,MAAM,mBAAmB,CAAC;AAIxE,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,CA0B7F;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,CA8H9B"}

package/dest/e2e_p2p/reqresp/utils.js

@@ -0,0 +1,177 @@
+import { createLogger } from '@aztec/aztec.js/log';
+import { waitForTx } from '@aztec/aztec.js/node';
+import { Tx } from '@aztec/aztec.js/tx';
+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 fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { getBootNodeUdpPort, shouldCollectMetrics } from '../../fixtures/fixtures.js';
+import { createNodes } from '../../fixtures/setup_p2p_test.js';
+import { P2PNetworkTest, WAIT_FOR_TX_TIMEOUT } 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 const createReqrespDataDir = ()=>fs.mkdtempSync(path.join(os.tmpdir(), 'reqresp-'));
+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: 8,
+            aztecSlotDuration: 36,
+            blockDurationMs: 6000,
+            l1PublishingTime: 8,
+            minTxsPerBlock: 1,
+            maxTxsPerBlock: 2,
+            enforceTimeTable: true,
+            aztecProofSubmissionEpochs: 1024,
+            ...disableStatusHandshake ? {
+                p2pDisableStatusHandshake: true
+            } : {},
+            listenAddress: '127.0.0.1',
+            aztecEpochDuration: 64
+        }
+    });
+    await t.setup();
+    await t.applyBaseSetup();
+    return t;
+}
+export async function cleanupReqrespTest(params) {
+    const { t, nodes, dataDir } = 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;
+    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.prefilledPublicData, dataDir, 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);
+    const { proposerIndexes, nodesToTurnOffTxGossip } = await getProposerIndexes(t, startSlotTimestamp);
+    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]];
+        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()
+            }));
+    }));
+    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
+            });
+            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');
+    const checkpoints = await nodes[0].getCheckpoints(CheckpointNumber(1), 50);
+    expect(checkpoints.length).toBeGreaterThan(0);
+    let mbpsFound = false;
+    let expectedBlockNumber = checkpoints[0].checkpoint.blocks[0].number;
+    for (const published of checkpoints){
+        const blockCount = published.checkpoint.blocks.length;
+        mbpsFound = mbpsFound || blockCount >= 2;
+        for(let i = 0; i < blockCount; i++){
+            const block = published.checkpoint.blocks[i];
+            expect(block.indexWithinCheckpoint).toBe(i);
+            expect(block.checkpointNumber).toBe(published.checkpoint.number);
+            expect(block.number).toBe(expectedBlockNumber);
+            expectedBlockNumber++;
+        }
+    }
+    expect(mbpsFound).toBe(true);
+    return nodes;
+}
+async function getProposerIndexes(t, startSlotTimestamp) {
+    // 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 + 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
+    };
+}

package/dest/e2e_p2p/shared.d.ts

@@ -1,25 +1,25 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { AztecNodeService } from '@aztec/aztec-node';
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { type SentTx } from '@aztec/aztec.js/contracts';
 import type { Logger } from '@aztec/aztec.js/log';
-import { Tx } from '@aztec/aztec.js/tx';
+import { TxHash } from '@aztec/aztec.js/tx';
 import type { RollupCheatCodes } from '@aztec/aztec/testing';
-import type { EmpireSlashingProposerContract, RollupContract, TallySlashingProposerContract } from '@aztec/ethereum';
+import type { EmpireSlashingProposerContract, RollupContract, TallySlashingProposerContract } from '@aztec/ethereum/contracts';
 import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import type { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
+import { type ProvenTx } from '../test-wallet/utils.js';
 export declare const submitComplexTxsTo: (logger: Logger, from: AztecAddress, spamContract: SpamContract, numTxs: number, opts?: {
-    callPublic?: boolean;
-}) => Promise<SentTx[]>;
-export declare const submitTransactions: (logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData) => Promise<SentTx[]>;
-export declare function prepareTransactions(logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData): Promise<Tx[]>;
+    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[]>;
 export declare function awaitProposalExecution(slashingProposer: EmpireSlashingProposerContract | TallySlashingProposerContract, timeoutSeconds: number, logger: Logger): Promise<bigint>;
-export declare function awaitCommitteeExists({ rollup, logger, }: {
+export declare function awaitCommitteeExists({ rollup, logger }: {
     rollup: RollupContract;
     logger: Logger;
 }): Promise<readonly `0x${string}`[]>;
-export declare function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount, timeoutSeconds, }: {
+export declare function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount, timeoutSeconds }: {
     nodeAdmin: AztecNodeAdmin;
     logger: Logger;
     slashingRoundSize: number;
@@ -31,7 +31,7 @@ export declare function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundS
  * Await the committee to be slashed out of the validator set.
  * Currently assumes that the committee is the same size as the validator set.
  */
-export declare function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, aztecEpochDuration, logger, offenseEpoch, }: {
+export declare function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, aztecEpochDuration, logger, offenseEpoch }: {
     rollup: RollupContract;
     cheatCodes: RollupCheatCodes;
     committee: readonly `0x${string}`[];
@@ -43,4 +43,4 @@ export declare function awaitCommitteeKicked({ rollup, cheatCodes, committee, sl
     logger: Logger;
     offenseEpoch: number;
 }): Promise<void>;
-//# sourceMappingURL=shared.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX3AycC9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUd6RCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUNsRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDNUMsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUM3RCxPQUFPLEtBQUssRUFDViw4QkFBOEIsRUFDOUIsY0FBYyxFQUNkLDZCQUE2QixFQUM5QixNQUFNLDJCQUEyQixDQUFDO0FBTW5DLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLG9DQUFvQyxDQUFDO0FBSXZFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3RFLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sNEJBQTRCLENBQUM7QUFJdkUsT0FBTyxFQUFFLEtBQUssUUFBUSxFQUFvQixNQUFNLHlCQUF5QixDQUFDO0FBRzFFLGVBQU8sTUFBTSxrQkFBa0I7O3VCQWtCOUIsQ0FBQztBQUdGLGVBQU8sTUFBTSxrQkFBa0Isa0hBZTlCLENBQUM7QUFFRix3QkFBc0IsbUJBQW1CLENBQ3ZDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLGdCQUFnQixFQUN0QixNQUFNLEVBQUUsTUFBTSxFQUNkLGFBQWEsRUFBRSxrQkFBa0IsR0FDaEMsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBd0JyQjtBQUVELHdCQUFnQixzQkFBc0IsQ0FDcEMsZ0JBQWdCLEVBQUUsOEJBQThCLEdBQUcsNkJBQTZCLEVBQ2hGLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEdBQ2IsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQTBCakI7QUFFRCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLE1BQU0sRUFDUCxFQUFFO0lBQ0QsTUFBTSxFQUFFLGNBQWMsQ0FBQztJQUN2QixNQUFNLEVBQUUsTUFBTSxDQUFDO0NBQ2hCLEdBQUcsT0FBTyxDQUFDLFNBQVMsS0FBSyxNQUFNLEVBQUUsRUFBRSxDQUFDLENBYXBDO0FBRUQsd0JBQXNCLG9CQUFvQixDQUFDLEVBQ3pDLE1BQU0sRUFDTixTQUFTLEVBQ1QsaUJBQWlCLEVBQ2pCLGFBQWEsRUFDYixxQkFBcUIsRUFDckIsY0FBb0IsRUFDckIsRUFBRTtJQUNELFNBQVMsRUFBRSxjQUFjLENBQUM7SUFDMUIsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixhQUFhLEVBQUUsTUFBTSxDQUFDO0lBQ3RCLHFCQUFxQixDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQy9CLGNBQWMsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUN6QiwrQ0FrQkE7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLFVBQVUsRUFDVixTQUFTLEVBQ1QsWUFBWSxFQUNaLGdCQUFnQixFQUNoQixpQkFBaUIsRUFDakIsaUJBQWlCLEVBQ2pCLGtCQUFrQixFQUNsQixNQUFNLEVBQ04sWUFBWSxFQUNiLEVBQUU7SUFDRCxNQUFNLEVBQUUsY0FBYyxDQUFDO0lBQ3ZCLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQztJQUM3QixTQUFTLEVBQUUsU0FBUyxLQUFLLE1BQU0sRUFBRSxFQUFFLENBQUM7SUFDcEMsWUFBWSxFQUFFLG9CQUFvQixDQUFDO0lBQ25DLGdCQUFnQixFQUFFLDhCQUE4QixHQUFHLDZCQUE2QixHQUFHLFNBQVMsQ0FBQztJQUM3RixpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsWUFBWSxFQUFFLE1BQU0sQ0FBQztDQUN0QixpQkE2RUEifQ==