@aztec/end-to-end 0.0.0-test.1 → 0.0.1-commit.1142ef1

package/dest/e2e_p2p/p2p_network.js

@@ -1,93 +1,117 @@
-import { getSchnorrWalletWithSecretKey } from '@aztec/accounts/schnorr';
-import { ChainMonitor } from '@aztec/aztec.js/ethereum';
-import { RollupContract, getExpectedAddress, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
-import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
-import { EthCheatCodesWithState } from '@aztec/ethereum/test';
+import { 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 { ChainMonitor } from '@aztec/ethereum/test';
+import { EpochNumber } from '@aztec/foundation/branded-types';
+import { SecretValue } from '@aztec/foundation/config';
 import { createLogger } from '@aztec/foundation/log';
-import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
-import { SpamContract } from '@aztec/noir-contracts.js/Spam';
+import { retryUntil } from '@aztec/foundation/retry';
+import { RollupAbi, SlasherAbi, TestERC20Abi } from '@aztec/l1-artifacts';
+import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers';
+import { tryStop } from '@aztec/stdlib/interfaces/server';
+import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
+import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
 import { getGenesisValues } from '@aztec/world-state/testing';
 import getPort from 'get-port';
-import { getContract } from 'viem';
+import { getAddress, getContract } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
-import { ATTESTER_PRIVATE_KEYS_START_INDEX, PROPOSER_PRIVATE_KEYS_START_INDEX, createValidatorConfig, generatePrivateKeys } from '../fixtures/setup_p2p_test.js';
+import { ATTESTER_PRIVATE_KEYS_START_INDEX, createValidatorConfig, generatePrivateKeys } from '../fixtures/setup_p2p_test.js';
 import { createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
-import { getPrivateKeyFromIndex } from '../fixtures/utils.js';
+import { 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';
 const l1ContractsConfig = getL1ContractsConfigEnvVars();
 export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
-export const SHORTENED_BLOCK_TIME_CONFIG = {
+export const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES = {
     aztecSlotDuration: 12,
-    ethereumSlotDuration: 4
+    ethereumSlotDuration: 4,
+    aztecProofSubmissionWindow: 640
 };
 export class P2PNetworkTest {
+    testName;
     bootstrapNodeEnr;
     bootNodePort;
+    numberOfValidators;
     numberOfNodes;
     metricsPort;
     snapshotManager;
+    baseAccountPrivateKey;
     baseAccount;
     logger;
     monitor;
     ctx;
     attesterPrivateKeys;
     attesterPublicKeys;
-    proposerPrivateKeys;
     peerIdPrivateKeys;
+    validators;
     deployedAccounts;
     prefilledPublicData;
     // The re-execution test needs a wallet and a spam contract
     wallet;
+    defaultAccountAddress;
     spamContract;
     bootstrapNode;
-    cleanupInterval;
-    gasUtils;
-    constructor(testName, bootstrapNodeEnr, bootNodePort, numberOfNodes, initialValidatorConfig, // If set enable metrics collection
-    metricsPort){
+    constructor(testName, bootstrapNodeEnr, bootNodePort, numberOfValidators, initialValidatorConfig, numberOfNodes = 0, // If set enable metrics collection
+    metricsPort, startProverNode){
+        this.testName = testName;
         this.bootstrapNodeEnr = bootstrapNodeEnr;
         this.bootNodePort = bootNodePort;
+        this.numberOfValidators = numberOfValidators;
         this.numberOfNodes = numberOfNodes;
         this.metricsPort = metricsPort;
         this.attesterPrivateKeys = [];
         this.attesterPublicKeys = [];
-        this.proposerPrivateKeys = [];
         this.peerIdPrivateKeys = [];
+        this.validators = [];
         this.deployedAccounts = [];
         this.prefilledPublicData = [];
-        this.cleanupInterval = undefined;
-        this.gasUtils = undefined;
         this.logger = createLogger(`e2e:e2e_p2p:${testName}`);
         // Set up the base account and node private keys for the initial network deployment
-        this.baseAccount = privateKeyToAccount(`0x${getPrivateKeyFromIndex(0).toString('hex')}`);
-        this.proposerPrivateKeys = generatePrivateKeys(PROPOSER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
-        this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX, numberOfNodes);
+        this.baseAccountPrivateKey = `0x${getPrivateKeyFromIndex(1).toString('hex')}`;
+        this.baseAccount = privateKeyToAccount(this.baseAccountPrivateKey);
+        this.attesterPrivateKeys = generatePrivateKeys(ATTESTER_PRIVATE_KEYS_START_INDEX + numberOfNodes, numberOfValidators);
         this.attesterPublicKeys = this.attesterPrivateKeys.map((privateKey)=>privateKeyToAccount(privateKey).address);
+        const zkPassportParams = ZkPassportProofParams.random();
         this.snapshotManager = createSnapshotManager(`e2e_p2p_network/${testName}`, process.env.E2E_DATA_PATH, {
             ...initialValidatorConfig,
             ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
             aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
             aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
-            aztecProofSubmissionWindow: initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
-            salt: 420,
+            aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
+            slashingRoundSizeInEpochs: initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
+            slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
+            aztecTargetCommitteeSize: numberOfValidators,
             metricsPort: metricsPort,
-            numberOfInitialFundedAccounts: 1
+            numberOfInitialFundedAccounts: 2,
+            startProverNode
         }, {
+            ...initialValidatorConfig,
             aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
+            slashingRoundSizeInEpochs: initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
+            slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
             ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
             aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
-            aztecProofSubmissionWindow: initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
-            initialValidators: []
+            aztecProofSubmissionEpochs: initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
+            aztecTargetCommitteeSize: numberOfValidators,
+            initialValidators: [],
+            zkPassportArgs: {
+                zkPassportDomain: zkPassportParams.domain,
+                zkPassportScope: zkPassportParams.scope
+            }
         });
     }
-    static async create({ testName, numberOfNodes, basePort, metricsPort, initialConfig }) {
+    static async create({ testName, numberOfNodes, numberOfValidators, basePort, metricsPort, initialConfig, startProverNode }) {
         const port = basePort || await getPort();
         const bootstrapNodeENR = await getBootstrapNodeEnr(BOOTSTRAP_NODE_PRIVATE_KEY, port);
         const bootstrapNodeEnr = bootstrapNodeENR.encodeTxt();
         const initialValidatorConfig = await createValidatorConfig(initialConfig ?? {}, bootstrapNodeEnr);
-        return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfNodes, initialValidatorConfig, metricsPort);
+        return new P2PNetworkTest(testName, bootstrapNodeEnr, port, numberOfValidators, initialValidatorConfig, numberOfNodes, metricsPort, startProverNode);
     }
     get fundedAccount() {
         if (!this.deployedAccounts[0]) {
@@ -95,110 +119,94 @@ export class P2PNetworkTest {
         }
         return this.deployedAccounts[0];
     }
-    /**
-   * Start a loop to sync the mock system time with the L1 block time
-   */ startSyncMockSystemTimeInterval() {
-        this.cleanupInterval = setInterval(()=>{
-            void this.syncMockSystemTime().catch((err)=>this.logger.error('Error syncing mock system time', err));
-        }, l1ContractsConfig.aztecSlotDuration * 1000);
-    }
-    /**
-   * When using fake timers, we need to keep the system and anvil clocks in sync.
-   */ async syncMockSystemTime() {
-        this.logger.info('Syncing mock system time');
-        const { dateProvider, deployL1ContractsValues } = this.ctx;
-        // Send a tx and only update the time after the tx is mined, as eth time is not continuous
-        const { receipt } = await this.gasUtils.sendAndMonitorTransaction({
-            to: this.baseAccount.address,
-            data: '0x',
-            value: 1n
-        });
-        const timestamp = await deployL1ContractsValues.publicClient.getBlock({
-            blockNumber: receipt.blockNumber
-        });
-        this.logger.info(`Timestamp: ${timestamp.timestamp}`);
-        dateProvider.setTime(Number(timestamp.timestamp) * 1000);
-    }
-    async applyBaseSnapshots() {
+    async addBootstrapNode() {
         await this.snapshotManager.snapshot('add-bootstrap-node', async ({ aztecNodeConfig })=>{
-            const telemetry = getEndToEndTestTelemetryClient(this.metricsPort);
+            const telemetry = await 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();
         });
-        await this.snapshotManager.snapshot('add-validators', async ({ deployL1ContractsValues, aztecNodeConfig, dateProvider })=>{
+    }
+    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 applyBaseSnapshots() {
+        await this.addBootstrapNode();
+        await this.snapshotManager.snapshot('add-validators', async ({ deployL1ContractsValues, cheatCodes })=>{
             const rollup = getContract({
                 address: deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
                 abi: RollupAbi,
-                client: deployL1ContractsValues.walletClient
+                client: deployL1ContractsValues.l1Client
             });
-            this.logger.verbose(`Adding ${this.numberOfNodes} validators`);
+            this.logger.info(`Adding ${this.numberOfValidators} validators`);
             const stakingAsset = getContract({
                 address: deployL1ContractsValues.l1ContractAddresses.stakingAssetAddress.toString(),
                 abi: TestERC20Abi,
-                client: deployL1ContractsValues.walletClient
+                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 = l1ContractsConfig.minimumStake * BigInt(this.numberOfNodes);
+            const stakeNeeded = await rollup.read.getActivationThreshold() * BigInt(this.numberOfValidators);
             await Promise.all([
                 await stakingAsset.write.mint([
-                    deployL1ContractsValues.walletClient.account.address,
-                    stakeNeeded
-                ], {}),
-                await stakingAsset.write.approve([
-                    deployL1ContractsValues.l1ContractAddresses.rollupAddress.toString(),
+                    multiAdder.address,
                     stakeNeeded
                 ], {})
-            ].map((txHash)=>deployL1ContractsValues.publicClient.waitForTransactionReceipt({
+            ].map((txHash)=>deployL1ContractsValues.l1Client.waitForTransactionReceipt({
                     hash: txHash
                 })));
-            const validators = [];
-            for(let i = 0; i < this.numberOfNodes; i++){
-                const attester = privateKeyToAccount(this.attesterPrivateKeys[i]);
-                const proposerEOA = privateKeyToAccount(this.proposerPrivateKeys[i]);
-                const forwarder = getExpectedAddress(ForwarderAbi, ForwarderBytecode, [
-                    proposerEOA.address
-                ], proposerEOA.address).address;
-                validators.push({
-                    attester: attester.address,
-                    proposer: forwarder,
-                    withdrawer: attester.address,
-                    amount: l1ContractsConfig.minimumStake
-                });
-                this.logger.verbose(`Adding (attester, proposer) pair: (${attester.address}, ${forwarder}) as validator`);
+            const { validators } = this.getValidators();
+            this.validators = validators;
+            const gseAddress = deployL1ContractsValues.l1ContractAddresses.gseAddress;
+            if (!gseAddress) {
+                throw new Error('GSE contract not deployed');
             }
-            await deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-                hash: await rollup.write.cheat__InitialiseValidatorSet([
-                    validators
+            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
+                };
+            };
+            const validatorTuples = await Promise.all(validators.map(makeValidatorTuples));
+            await deployL1ContractsValues.l1Client.waitForTransactionReceipt({
+                hash: await multiAdder.write.addValidators([
+                    validatorTuples
                 ])
             });
-            const slotsInEpoch = await rollup.read.getEpochDuration();
-            const timestamp = await rollup.read.getTimestampForSlot([
-                slotsInEpoch
-            ]);
-            const cheatCodes = new EthCheatCodesWithState(aztecNodeConfig.l1RpcUrls);
-            try {
-                await cheatCodes.warp(Number(timestamp));
-            } catch (err) {
-                this.logger.debug('Warp failed, time already satisfied');
-            }
+            await cheatCodes.rollup.advanceToEpoch(EpochNumber.fromBigInt(BigInt(await 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 deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-                hash: await deployL1ContractsValues.walletClient.sendTransaction({
-                    to: this.baseAccount.address,
-                    value: 1n,
-                    account: this.baseAccount
-                })
-            });
-            // Set the system time in the node, only after we have warped the time and waited for a block
-            // Time is only set in the NEXT block
-            dateProvider.setTime(Number(timestamp) * 1000);
+            await this._sendDummyTx(deployL1ContractsValues.l1Client);
         });
     }
     async setupAccount() {
-        await this.snapshotManager.snapshot('setup-account', deployAccounts(1, this.logger, false), async ({ deployedAccounts }, { pxe })=>{
+        await this.snapshotManager.snapshot('setup-account', deployAccounts(1, this.logger), ({ deployedAccounts }, { wallet })=>{
             this.deployedAccounts = deployedAccounts;
-            const [account] = deployedAccounts;
-            this.wallet = await getSchnorrWalletWithSecretKey(pxe, account.secret, account.signingKey, account.salt);
+            [{ address: this.defaultAccountAddress }] = deployedAccounts;
+            this.wallet = wallet;
+            return Promise.resolve();
         });
     }
     async deploySpamContract() {
@@ -206,46 +214,53 @@ export class P2PNetworkTest {
             if (!this.wallet) {
                 throw new Error('Call snapshot t.setupAccount before deploying account contract');
             }
-            const spamContract = await SpamContract.deploy(this.wallet).send().deployed();
+            const spamContract = await SpamContract.deploy(this.wallet).send({
+                from: this.defaultAccountAddress
+            }).deployed();
             return {
                 contractAddress: spamContract.address
             };
-        }, async ({ contractAddress })=>{
+        }, ({ contractAddress })=>{
             if (!this.wallet) {
                 throw new Error('Call snapshot t.setupAccount before deploying account contract');
             }
-            this.spamContract = await SpamContract.at(contractAddress, this.wallet);
+            this.spamContract = SpamContract.at(contractAddress, this.wallet);
+            return Promise.resolve();
         });
     }
     async removeInitialNode() {
-        await this.snapshotManager.snapshot('remove-inital-validator', async ({ deployL1ContractsValues, aztecNode, dateProvider })=>{
+        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 deployL1ContractsValues.publicClient.waitForTransactionReceipt({
-                hash: await deployL1ContractsValues.walletClient.sendTransaction({
-                    to: this.baseAccount.address,
-                    value: 1n,
-                    account: this.baseAccount
-                })
-            });
-            const block = await deployL1ContractsValues.publicClient.getBlock({
+            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();
         });
     }
+    async sendDummyTx() {
+        return await this._sendDummyTx(this.ctx.deployL1ContractsValues.l1Client);
+    }
+    async _sendDummyTx(l1Client) {
+        const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client);
+        return await l1TxUtils.sendAndMonitorTransaction({
+            to: l1Client.account.address,
+            value: 1n
+        });
+    }
     async setup() {
         this.ctx = await this.snapshotManager.setup();
-        this.prefilledPublicData = (await getGenesisValues(this.ctx.initialFundedAccounts.map((a)=>a.address))).prefilledPublicData;
-        this.startSyncMockSystemTimeInterval();
-        this.gasUtils = new L1TxUtilsWithBlobs(this.ctx.deployL1ContractsValues.publicClient, this.ctx.deployL1ContractsValues.walletClient, this.logger, {
-            gasLimitBufferPercentage: 20,
-            maxGwei: 500n,
-            maxAttempts: 3,
-            checkIntervalMs: 100,
-            stallTimeMs: 1000
-        });
-        this.monitor = new ChainMonitor(RollupContract.getFromL1ContractsValues(this.ctx.deployL1ContractsValues)).start();
+        const sponsoredFPCAddress = await getSponsoredFPCAddress();
+        const initialFundedAccounts = [
+            ...this.ctx.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));
     }
     async stopNodes(nodes) {
         this.logger.info('Stopping nodes');
@@ -256,12 +271,52 @@ export class P2PNetworkTest {
         await Promise.all(nodes.map((node)=>node.stop()));
         this.logger.info('Nodes stopped');
     }
+    /**
+   * Wait for P2P mesh to be fully formed across all nodes.
+   * This ensures that all nodes are connected to each other before proceeding,
+   * preventing race conditions where validators propose blocks before the network is ready.
+   *
+   * @param nodes - Array of nodes to check for P2P connectivity
+   * @param expectedNodeCount - Expected number of nodes in the network (defaults to nodes.length)
+   * @param timeoutSeconds - Maximum time to wait for connections (default: 30 seconds)
+   * @param checkIntervalSeconds - How often to check connectivity (default: 0.1 seconds)
+   */ async waitForP2PMeshConnectivity(nodes, expectedNodeCount, timeoutSeconds = 30, checkIntervalSeconds = 0.1) {
+        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');
+    }
     async teardown() {
-        this.monitor.stop();
-        await this.bootstrapNode?.stop();
+        await this.monitor.stop();
+        await tryStop(this.bootstrapNode, this.logger);
         await this.snapshotManager.teardown();
-        if (this.cleanupInterval) {
-            clearInterval(this.cleanupInterval);
+    }
+    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 (which handles both empire and tally)
+        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
+        };
     }
 }

package/dest/e2e_p2p/shared.d.ts

@@ -1,10 +1,46 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { AztecNodeService } from '@aztec/aztec-node';
-import { type Logger, type SentTx } from '@aztec/aztec.js';
-import type { SpamContract } from '@aztec/noir-contracts.js/Spam';
-import type { NodeContext } from '../fixtures/setup_p2p_test.js';
-export declare const submitComplexTxsTo: (logger: Logger, spamContract: SpamContract, numTxs: number, opts?: {
-    callPublic?: boolean;
+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 type { RollupCheatCodes } from '@aztec/aztec/testing';
+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';
+export declare const submitComplexTxsTo: (logger: Logger, from: AztecAddress, spamContract: SpamContract, numTxs: number, opts?: {
+    callPublic?: boolean | undefined;
 }) => Promise<SentTx[]>;
-export declare const createPXEServiceAndSubmitTransactions: (logger: Logger, node: AztecNodeService, numTxs: number, fundedAccount: InitialAccountData) => Promise<NodeContext>;
-//# sourceMappingURL=shared.d.ts.map
+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[]>;
+export declare function awaitProposalExecution(slashingProposer: EmpireSlashingProposerContract | TallySlashingProposerContract, timeoutSeconds: number, logger: Logger): Promise<bigint>;
+export declare function awaitCommitteeExists({ rollup, logger }: {
+    rollup: RollupContract;
+    logger: Logger;
+}): Promise<readonly `0x${string}`[]>;
+export declare function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount, timeoutSeconds }: {
+    nodeAdmin: AztecNodeAdmin;
+    logger: Logger;
+    slashingRoundSize: number;
+    epochDuration: number;
+    waitUntilOffenseCount?: number;
+    timeoutSeconds?: number;
+}): Promise<import("@aztec/slasher").Offense[]>;
+/**
+ * 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 }: {
+    rollup: RollupContract;
+    cheatCodes: RollupCheatCodes;
+    committee: readonly `0x${string}`[];
+    slashFactory: SlashFactoryContract;
+    slashingProposer: EmpireSlashingProposerContract | TallySlashingProposerContract | undefined;
+    slashingRoundSize: number;
+    aztecSlotDuration: number;
+    aztecEpochDuration: number;
+    logger: Logger;
+    offenseEpoch: number;
+}): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZTJlX3AycC9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNsRSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUN6RCxPQUFPLEVBQUUsS0FBSyxNQUFNLEVBQThDLE1BQU0sMkJBQTJCLENBQUM7QUFFcEcsT0FBTyxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbEQsT0FBTyxFQUFFLEVBQUUsRUFBWSxNQUFNLG9CQUFvQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDN0QsT0FBTyxLQUFLLEVBQ1YsOEJBQThCLEVBQzlCLGNBQWMsRUFDZCw2QkFBNkIsRUFDOUIsTUFBTSwyQkFBMkIsQ0FBQztBQU1uQyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUl2RSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUN0RSxPQUFPLEtBQUssRUFBRSxvQkFBb0IsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBTXZFLGVBQU8sTUFBTSxrQkFBa0I7O3VCQTJCOUIsQ0FBQztBQUdGLGVBQU8sTUFBTSxrQkFBa0Isa0hBVzlCLENBQUM7QUFFRix3QkFBc0IsbUJBQW1CLENBQ3ZDLE1BQU0sRUFBRSxNQUFNLEVBQ2QsSUFBSSxFQUFFLGdCQUFnQixFQUN0QixNQUFNLEVBQUUsTUFBTSxFQUNkLGFBQWEsRUFBRSxrQkFBa0IsR0FDaEMsT0FBTyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBcUJmO0FBRUQsd0JBQWdCLHNCQUFzQixDQUNwQyxnQkFBZ0IsRUFBRSw4QkFBOEIsR0FBRyw2QkFBNkIsRUFDaEYsY0FBYyxFQUFFLE1BQU0sRUFDdEIsTUFBTSxFQUFFLE1BQU0sR0FDYixPQUFPLENBQUMsTUFBTSxDQUFDLENBMEJqQjtBQUVELHdCQUFzQixvQkFBb0IsQ0FBQyxFQUN6QyxNQUFNLEVBQ04sTUFBTSxFQUNQLEVBQUU7SUFDRCxNQUFNLEVBQUUsY0FBYyxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxNQUFNLENBQUM7Q0FDaEIsR0FBRyxPQUFPLENBQUMsU0FBUyxLQUFLLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FZcEM7QUFFRCx3QkFBc0Isb0JBQW9CLENBQUMsRUFDekMsTUFBTSxFQUNOLFNBQVMsRUFDVCxpQkFBaUIsRUFDakIsYUFBYSxFQUNiLHFCQUFxQixFQUNyQixjQUFvQixFQUNyQixFQUFFO0lBQ0QsU0FBUyxFQUFFLGNBQWMsQ0FBQztJQUMxQixNQUFNLEVBQUUsTUFBTSxDQUFDO0lBQ2YsaUJBQWlCLEVBQUUsTUFBTSxDQUFDO0lBQzFCLGFBQWEsRUFBRSxNQUFNLENBQUM7SUFDdEIscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDL0IsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3pCLCtDQWtCQTtBQUVEOzs7R0FHRztBQUNILHdCQUFzQixvQkFBb0IsQ0FBQyxFQUN6QyxNQUFNLEVBQ04sVUFBVSxFQUNWLFNBQVMsRUFDVCxZQUFZLEVBQ1osZ0JBQWdCLEVBQ2hCLGlCQUFpQixFQUNqQixpQkFBaUIsRUFDakIsa0JBQWtCLEVBQ2xCLE1BQU0sRUFDTixZQUFZLEVBQ2IsRUFBRTtJQUNELE1BQU0sRUFBRSxjQUFjLENBQUM7SUFDdkIsVUFBVSxFQUFFLGdCQUFnQixDQUFDO0lBQzdCLFNBQVMsRUFBRSxTQUFTLEtBQUssTUFBTSxFQUFFLEVBQUUsQ0FBQztJQUNwQyxZQUFZLEVBQUUsb0JBQW9CLENBQUM7SUFDbkMsZ0JBQWdCLEVBQUUsOEJBQThCLEdBQUcsNkJBQTZCLEdBQUcsU0FBUyxDQUFDO0lBQzdGLGlCQUFpQixFQUFFLE1BQU0sQ0FBQztJQUMxQixpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIsa0JBQWtCLEVBQUUsTUFBTSxDQUFDO0lBQzNCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixZQUFZLEVBQUUsTUFBTSxDQUFDO0NBQ3RCLGlCQTZFQSJ9

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

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAY,MAAM,iBAAiB,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAGlE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,kBAAkB,WACrB,MAAM,gBACA,YAAY,UAClB,MAAM,SACR;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,sBAwB/B,CAAC;AAGF,eAAO,MAAM,qCAAqC,WACxC,MAAM,QACR,gBAAgB,UACd,MAAM,iBACC,kBAAkB,KAChC,QAAQ,WAAW,CAmBrB,CAAC"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAA8C,MAAM,2BAA2B,CAAC;AAEpG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,EAAE,EAAY,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EACV,8BAA8B,EAC9B,cAAc,EACd,6BAA6B,EAC9B,MAAM,2BAA2B,CAAC;AAMnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAIvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAMvE,eAAO,MAAM,kBAAkB;;uBA2B9B,CAAC;AAGF,eAAO,MAAM,kBAAkB,kHAW9B,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAAC,EAAE,EAAE,CAAC,CAqBf;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,8BAA8B,GAAG,6BAA6B,EAChF,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CA0BjB;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,MAAM,EACP,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC,CAYpC;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,aAAa,EACb,qBAAqB,EACrB,cAAoB,EACrB,EAAE;IACD,SAAS,EAAE,cAAc,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,MAAM,CAAC;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,+CAkBA;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,UAAU,EACV,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,MAAM,EACN,YAAY,EACb,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC;IACpC,YAAY,EAAE,oBAAoB,CAAC;IACnC,gBAAgB,EAAE,8BAA8B,GAAG,6BAA6B,GAAG,SAAS,CAAC;IAC7F,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB,iBA6EA"}