@aztec/end-to-end 1.0.0-nightly.20250608 → 1.0.0-nightly.20250611

package/dest/e2e_p2p/p2p_network.d.ts

@@ -1,12 +1,14 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
 import { type AccountWalletWithSecretKey } from '@aztec/aztec.js';
-import { type Operator } from '@aztec/ethereum';
+import { type Operator, RollupContract, type ViemClient } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { type Logger } from '@aztec/foundation/log';
+import { SlashFactoryAbi, SlasherAbi, SlashingProposerAbi } from '@aztec/l1-artifacts';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import type { BootstrapNode } from '@aztec/p2p/bootstrap';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import { type GetContractReturnType } from 'viem';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
 export declare const WAIT_FOR_TX_TIMEOUT: number;
 export declare const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES: {
@@ -78,5 +80,11 @@ export declare class P2PNetworkTest {
     setup(): Promise<void>;
     stopNodes(nodes: AztecNodeService[]): Promise<void>;
     teardown(): Promise<void>;
+    getContracts(): Promise<{
+        rollup: RollupContract;
+        slasherContract: GetContractReturnType<typeof SlasherAbi, ViemClient>;
+        slashingProposer: GetContractReturnType<typeof SlashingProposerAbi, ViemClient>;
+        slashFactory: GetContractReturnType<typeof SlashFactoryAbi, ViemClient>;
+    }>;
 }
 //# sourceMappingURL=p2p_network.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,KAAK,0BAA0B,EAAc,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAGL,KAAK,QAAQ,EAKd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAY9D,OAAO,EAEL,KAAK,iBAAiB,EAGvB,MAAM,iCAAiC,CAAC;AAOzC,eAAO,MAAM,mBAAmB,QAA0C,CAAC;AAE3E,eAAO,MAAM,qCAAqC;;;;CAIjD,CAAC;AAEF,qBAAa,cAAc;IAwBhB,gBAAgB,EAAE,MAAM;IACxB,YAAY,EAAE,MAAM;IAC3B,OAAO,CAAC,aAAa;IAGrB,OAAO,CAAC,WAAW,CAAC;IA5BtB,OAAO,CAAC,eAAe,CAAmB;IACnC,qBAAqB,EAAE,KAAK,MAAM,EAAE,CAAC;IACrC,WAAW;;;;;;;;;;wTAdgD,CAAC;sBAAsB,CAAC;;;;;;MAcvE;IAEZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAG,YAAY,CAAC;IAEvB,GAAG,EAAG,iBAAiB,CAAC;IACxB,mBAAmB,EAAE,KAAK,MAAM,EAAE,EAAE,CAAM;IAC1C,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAClC,iBAAiB,EAAE,MAAM,EAAE,CAAM;IACjC,UAAU,EAAE,QAAQ,EAAE,CAAM;IAE5B,gBAAgB,EAAE,kBAAkB,EAAE,CAAM;IAC5C,mBAAmB,EAAE,kBAAkB,EAAE,CAAM;IAE/C,MAAM,CAAC,EAAE,0BAA0B,CAAC;IACpC,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,aAAa,CAAC,EAAE,aAAa,CAAC;gBAGnC,QAAQ,EAAE,MAAM,EACT,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EAC7B,sBAAsB,EAAE,eAAe,EAE/B,WAAW,CAAC,EAAE,MAAM,YAAA,EAC5B,eAAe,CAAC,EAAE,OAAO,EACzB,sBAAsB,CAAC,EAAE,OAAO;WAsCrB,MAAM,CAAC,EAClB,QAAQ,EACR,aAAa,EACb,QAAQ,EACR,WAAW,EACX,aAAa,EACb,eAAe,EACf,sBAAsB,GACvB,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,aAAa,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;QACzC,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,sBAAsB,CAAC,EAAE,OAAO,CAAC;KAClC;IAuBD,IAAI,aAAa,uBAKhB;IAEK,gBAAgB;IActB,aAAa;;;IAgBP,kBAAkB;IAkElB,YAAY;IAYZ,kBAAkB;IAoBlB,iBAAiB;IAgBjB,WAAW;;;;YAIH,YAAY;IAQpB,KAAK;IAaL,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE;IAanC,QAAQ;CAKf"}
+{"version":3,"file":"p2p_network.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/p2p_network.ts"],"names":[],"mappings":"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"}

package/dest/e2e_p2p/p2p_network.js

@@ -3,13 +3,13 @@ import { EthAddress } from '@aztec/aztec.js';
 import { L1TxUtils, RollupContract, deployL1Contract, getL1ContractsConfigEnvVars, l1Artifacts } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { createLogger } from '@aztec/foundation/log';
-import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
+import { RollupAbi, SlashFactoryAbi, SlasherAbi, SlashingProposerAbi, 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 { 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, createValidatorConfig, generatePrivateKeys } from '../fixtures/setup_p2p_test.js';
 import { createSnapshotManager, deployAccounts } from '../fixtures/snapshot_manager.js';
@@ -80,7 +80,9 @@ export class P2PNetworkTest {
             aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
             aztecProofSubmissionWindow: initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
             initialValidators: [],
-            mockZkPassportVerifier
+            zkPassportArgs: {
+                mockZkPassportVerifier
+            }
         });
     }
     static async create({ testName, numberOfNodes, basePort, metricsPort, initialConfig, startProverNode, mockZkPassportVerifier }) {
@@ -141,7 +143,7 @@ export class P2PNetworkTest {
                 abi: l1Artifacts.multiAdder.contractAbi,
                 client: deployL1ContractsValues.l1Client
             });
-            const stakeNeeded = l1ContractsConfig.minimumStake * BigInt(this.numberOfNodes);
+            const stakeNeeded = l1ContractsConfig.depositAmount * BigInt(this.numberOfNodes);
             await Promise.all([
                 await stakingAsset.write.mint([
                     multiAdder.address,
@@ -238,4 +240,31 @@ export class P2PNetworkTest {
         await tryStop(this.bootstrapNode, this.logger);
         await this.snapshotManager.teardown();
     }
+    async getContracts() {
+        if (!this.ctx.deployL1ContractsValues) {
+            throw new Error('DeployL1ContractsValues not set');
+        }
+        const rollup = new RollupContract(this.ctx.deployL1ContractsValues.l1Client, this.ctx.deployL1ContractsValues.l1ContractAddresses.rollupAddress);
+        const slasherContract = getContract({
+            address: getAddress(await rollup.getSlasher()),
+            abi: SlasherAbi,
+            client: this.ctx.deployL1ContractsValues.l1Client
+        });
+        const slashingProposer = getContract({
+            address: getAddress(await slasherContract.read.PROPOSER()),
+            abi: SlashingProposerAbi,
+            client: this.ctx.deployL1ContractsValues.l1Client
+        });
+        const slashFactory = getContract({
+            address: getAddress(this.ctx.deployL1ContractsValues.l1ContractAddresses.slashFactoryAddress.toString()),
+            abi: SlashFactoryAbi,
+            client: this.ctx.deployL1ContractsValues.l1Client
+        });
+        return {
+            rollup,
+            slasherContract,
+            slashingProposer,
+            slashFactory
+        };
+    }
 }

package/dest/e2e_p2p/shared.d.ts

@@ -1,8 +1,14 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { AztecNodeService } from '@aztec/aztec-node';
 import { type Logger, ProvenTx, type SentTx } from '@aztec/aztec.js';
+import type { RollupCheatCodes } from '@aztec/aztec.js/testing';
+import type { RollupContract, ViemClient } from '@aztec/ethereum';
+import type { SlashFactoryAbi } from '@aztec/l1-artifacts/SlashFactoryAbi';
+import type { SlashingProposerAbi } from '@aztec/l1-artifacts/SlashingProposerAbi';
 import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { PXEService } from '@aztec/pxe/server';
+import { Offense } from '@aztec/slasher';
+import type { GetContractReturnType } from 'viem';
 import type { NodeContext } from '../fixtures/setup_p2p_test.js';
 export declare const submitComplexTxsTo: (logger: Logger, spamContract: SpamContract, numTxs: number, opts?: {
     callPublic?: boolean;
@@ -13,4 +19,22 @@ export declare function createPXEServiceAndPrepareTransactions(logger: Logger, n
     txs: ProvenTx[];
     node: AztecNodeService;
 }>;
+export declare function awaitProposalExecution(slashingProposer: GetContractReturnType<typeof SlashingProposerAbi, ViemClient>, timeoutSeconds: number): Promise<void>;
+export declare function awaitCommitteeExists({ rollup, logger }: {
+    rollup: RollupContract;
+    logger: Logger;
+}): Promise<readonly `0x${string}`[]>;
+export declare function awaitCommitteeKicked({ offense, rollup, cheatCodes, committee, slashingAmount, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, logger, sendDummyTx, }: {
+    offense: Offense;
+    rollup: RollupContract;
+    cheatCodes: RollupCheatCodes;
+    committee: readonly `0x${string}`[];
+    slashingAmount: bigint;
+    slashFactory: GetContractReturnType<typeof SlashFactoryAbi, ViemClient>;
+    slashingProposer: GetContractReturnType<typeof SlashingProposerAbi, ViemClient>;
+    slashingRoundSize: number;
+    aztecSlotDuration: number;
+    logger: Logger;
+    sendDummyTx: () => Promise<void>;
+}): Promise<void>;
 //# sourceMappingURL=shared.d.ts.map

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,EAAM,KAAK,MAAM,EAAE,QAAQ,EAAE,KAAK,MAAM,EAAiD,MAAM,iBAAiB,CAAC;AAExH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAyD,MAAM,mBAAmB,CAAC;AAEtG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,MAAM,EACd,cAAc,YAAY,EAC1B,QAAQ,MAAM,EACd,OAAM;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,sBAsBpC,CAAC;AAGF,eAAO,MAAM,qCAAqC,GAChD,QAAQ,MAAM,EACd,MAAM,gBAAgB,EACtB,QAAQ,MAAM,EACd,eAAe,kBAAkB,KAChC,OAAO,CAAC,WAAW,CAgBrB,CAAC;AAEF,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAAC;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,QAAQ,EAAE,CAAC;IAAC,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAqB9E"}
+{"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,EAEL,KAAK,MAAM,EACX,QAAQ,EACR,KAAK,MAAM,EAIZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAyD,MAAM,mBAAmB,CAAC;AACtG,OAAO,EAAE,OAAO,EAAmB,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,MAAM,CAAC;AAElD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAIjE,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,MAAM,EACd,cAAc,YAAY,EAC1B,QAAQ,MAAM,EACd,OAAM;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAO,sBAsBpC,CAAC;AAGF,eAAO,MAAM,qCAAqC,GAChD,QAAQ,MAAM,EACd,MAAM,gBAAgB,EACtB,QAAQ,MAAM,EACd,eAAe,kBAAkB,KAChC,OAAO,CAAC,WAAW,CAgBrB,CAAC;AAEF,wBAAsB,sCAAsC,CAC1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,kBAAkB,GAChC,OAAO,CAAC;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,GAAG,EAAE,QAAQ,EAAE,CAAC;IAAC,IAAI,EAAE,gBAAgB,CAAA;CAAE,CAAC,CAqB9E;AAED,wBAAsB,sBAAsB,CAC1C,gBAAgB,EAAE,qBAAqB,CAAC,OAAO,mBAAmB,EAAE,UAAU,CAAC,EAC/E,cAAc,EAAE,MAAM,iBAiBvB;AAED,wBAAsB,oBAAoB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,qCAYxG;AAED,wBAAsB,oBAAoB,CAAC,EACzC,OAAO,EACP,MAAM,EACN,UAAU,EACV,SAAS,EACT,cAAc,EACd,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,MAAM,EACN,WAAW,GACZ,EAAE;IACD,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,qBAAqB,CAAC,OAAO,eAAe,EAAE,UAAU,CAAC,CAAC;IACxE,gBAAgB,EAAE,qBAAqB,CAAC,OAAO,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAChF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC,iBA2DA"}

package/dest/e2e_p2p/shared.js

@@ -1,8 +1,9 @@
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
-import { Fr, TxStatus, getContractInstanceFromDeployParams } from '@aztec/aztec.js';
+import { Fr, TxStatus, getContractInstanceFromDeployParams, retryUntil } from '@aztec/aztec.js';
 import { timesAsync } from '@aztec/foundation/collection';
 import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
 import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
+import { OffenseToBigInt } from '@aztec/slasher';
 import { submitTxsTo } from '../shared/submit-transactions.js';
 // submits a set of transactions to the provided Private eXecution Environment (PXE)
 export const submitComplexTxsTo = async (logger, spamContract, numTxs, opts = {})=>{
@@ -67,3 +68,73 @@ export async function createPXEServiceAndPrepareTransactions(logger, node, numTx
         node
     };
 }
+export async function awaitProposalExecution(slashingProposer, timeoutSeconds) {
+    await retryUntil(async ()=>{
+        const events = await slashingProposer.getEvents.ProposalExecuted();
+        if (events.length === 0) {
+            return false;
+        }
+        const event = events[0];
+        const roundNumber = event.args.round;
+        const proposal = event.args.proposal;
+        return roundNumber && proposal;
+    }, 'proposal executed', timeoutSeconds, 1);
+}
+export async function awaitCommitteeExists({ rollup, logger }) {
+    logger.info(`Waiting for committee to be set`);
+    let committee = [];
+    await retryUntil(async ()=>{
+        committee = await rollup.getCurrentEpochCommittee();
+        return committee.length > 0;
+    }, 'non-empty committee', 60);
+    return committee;
+}
+export async function awaitCommitteeKicked({ offense, rollup, cheatCodes, committee, slashingAmount, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, logger, sendDummyTx }) {
+    logger.info(`Waiting for slash payload to be deployed`);
+    const expectedSlashes = Array.from({
+        length: committee.length
+    }, ()=>slashingAmount);
+    const sortedCommittee = [
+        ...committee
+    ].sort((a, b)=>a.localeCompare(b));
+    await retryUntil(async ()=>{
+        const [address, _, isDeployed] = await slashFactory.read.getAddressAndIsDeployed([
+            sortedCommittee,
+            expectedSlashes
+        ]);
+        return address && isDeployed;
+    }, 'slash payload deployed', 60, 1);
+    const slashPayloadEvents = await slashFactory.getEvents.SlashPayloadCreated();
+    expect(slashPayloadEvents.length).toBe(1);
+    expect(slashPayloadEvents[0].args.offenses).toEqual(Array.from({
+        length: committee.length
+    }, ()=>OffenseToBigInt[offense]));
+    const attestersPre = await rollup.getAttesters();
+    expect(attestersPre.length).toBe(committee.length);
+    for (const attester of attestersPre){
+        const attesterInfo = await rollup.getAttesterView(attester);
+        // Check that status isValidating
+        expect(attesterInfo.status).toEqual(1);
+    }
+    logger.info(`Waiting for slash proposal to be executed`);
+    await awaitProposalExecution(slashingProposer, slashingRoundSize * 2 * aztecSlotDuration);
+    // The attesters should still form the committee
+    // but they should be reduced to the "living" status
+    await cheatCodes.debugRollup();
+    const committeePostSlashing = await rollup.getCurrentEpochCommittee();
+    expect(committeePostSlashing.length).toBe(attestersPre.length);
+    const attestersPostSlashing = await rollup.getAttesters();
+    expect(attestersPostSlashing.length).toBe(0);
+    for (const attester of attestersPre){
+        const attesterInfo = await rollup.getAttesterView(attester);
+        // Check that status is Living
+        expect(attesterInfo.status).toEqual(2);
+    }
+    await cheatCodes.advanceToNextEpoch();
+    await sendDummyTx();
+    await cheatCodes.debugRollup();
+    const committeeNextEpoch = await rollup.getCurrentEpochCommittee();
+    expect(committeeNextEpoch.length).toBe(0);
+    const attestersNextEpoch = await rollup.getAttesters();
+    expect(attestersNextEpoch.length).toBe(0);
+}

package/dest/fixtures/setup_p2p_test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAQrD,eAAO,MAAM,iCAAiC,IAAI,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,GAAG,EAAE,MAAM,EAAE,CAAC;CACf;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA4B7B;AAGD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,6BAQ5C;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAU,EACxB,aAAa,CAAC,EAAE,MAAM,4BAuBvB"}
+{"version":3,"file":"setup_p2p_test.d.ts","sourceRoot":"","sources":["../../src/fixtures/setup_p2p_test.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAQrD,eAAO,MAAM,iCAAiC,IAAI,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,GAAG,EAAE,MAAM,EAAE,CAAC;CACf;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAO7F;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAmC7B;AAGD,wBAAsB,UAAU,CAC9B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,6BAQ5C;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,GAAE,MAAU,EACxB,aAAa,CAAC,EAAE,MAAM,4BAuBvB"}

package/dest/fixtures/setup_p2p_test.js

@@ -31,6 +31,11 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
         nodePromises.push(nodePromise);
     }
     const nodes = await Promise.all(nodePromises);
+    // Sanity check that we have a sequencer
+    const seqClient = nodes[0].getSequencer();
+    if (!seqClient) {
+        throw new Error('Sequencer not found');
+    }
     removeLogNameHandler(logNameHandler);
     return nodes;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,SAAS,EAGd,KAAK,MAAM,EACX,KAAK,GAAG,EAGT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAI9B,MAAM,iBAAiB,CAAC;AAsBzB,2DAA2D;AAC3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,+CAA+C;IAC/C,GAAG,EAAE,GAAG,CAAC;IACT,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,QAAQ,EAAE,wBAAwB,CAAC;IACnC,wBAAwB;IACxB,WAAW,EAAE,aAAa,CAAC;IAC3B,0BAA0B;IAC1B,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO;IACP,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,4BAA4B;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAGF,eAAO,MAAM,oBAAoB,GAC/B,OAAO,MAAM,OAAO,CAAC,mBAAmB,CAAC,EACzC,SAAS,MAAM,OAAO,CAAC,IAAI,CAAC,EAC5B,gCAAkC,SA49BnC,CAAC"}
+{"version":3,"file":"uniswap_l1_l2.d.ts","sourceRoot":"","sources":["../../src/shared/uniswap_l1_l2.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAElB,KAAK,SAAS,EAGd,KAAK,MAAM,EACX,KAAK,GAAG,EAGT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAI9B,MAAM,iBAAiB,CAAC;AAuBzB,2DAA2D;AAC3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0BAA0B;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,+CAA+C;IAC/C,GAAG,EAAE,GAAG,CAAC;IACT,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,QAAQ,EAAE,wBAAwB,CAAC;IACnC,wBAAwB;IACxB,WAAW,EAAE,aAAa,CAAC;IAC3B,0BAA0B;IAC1B,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO;IACP,uBAAuB,EAAE,2BAA2B,CAAC;IACrD,4BAA4B;IAC5B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAGF,eAAO,MAAM,oBAAoB,GAC/B,OAAO,MAAM,OAAO,CAAC,mBAAmB,CAAC,EACzC,SAAS,MAAM,OAAO,CAAC,IAAI,CAAC,EAC5B,gCAAkC,SA49BnC,CAAC"}

package/dest/shared/uniswap_l1_l2.js

@@ -3,6 +3,7 @@ import { RollupContract, deployL1Contract, extractEvent } from '@aztec/ethereum'
 import { sha256ToField } from '@aztec/foundation/crypto';
 import { InboxAbi, UniswapPortalAbi, UniswapPortalBytecode } from '@aztec/l1-artifacts';
 import { UniswapContract } from '@aztec/noir-contracts.js/Uniswap';
+import { computeL2ToL1MessageHash } from '@aztec/stdlib/hash';
 import { computeL2ToL1MembershipWitness } from '@aztec/stdlib/messaging';
 import { jest } from '@jest/globals';
 import { getContract, parseEther, toFunctionSelector } from 'viem';
@@ -135,26 +136,26 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 secretHashForDepositingSwappedDai,
                 ownerEthAddress.toBuffer32()
             ]);
-            const swapPrivateLeaf = sha256ToField([
-                uniswapL2Contract.address,
-                new Fr(version),
-                EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-                new Fr(l1Client.chain.id),
-                swapPrivateContent
-            ]);
+            const swapPrivateLeaf = computeL2ToL1MessageHash({
+                l2Sender: uniswapL2Contract.address,
+                l1Recipient: EthAddress.fromString(uniswapPortal.address),
+                content: swapPrivateContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
             const withdrawContent = sha256ToField([
                 Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
                 uniswapPortalAddress.toBuffer32(),
                 new Fr(wethAmountToBridge),
                 uniswapPortalAddress.toBuffer32()
             ]);
-            const withdrawLeaf = sha256ToField([
-                wethCrossChainHarness.l2Bridge.address,
-                new Fr(version),
-                wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-                new Fr(l1Client.chain.id),
-                withdrawContent
-            ]);
+            const withdrawLeaf = computeL2ToL1MessageHash({
+                l2Sender: wethCrossChainHarness.l2Bridge.address,
+                l1Recipient: wethCrossChainHarness.tokenPortalAddress,
+                content: withdrawContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
             // ensure that user's funds were burnt
             await wethCrossChainHarness.expectPrivateBalanceOnL2(ownerAddress, wethL2BalanceBeforeSwap - wethAmountToBridge);
             // ensure that uniswap contract didn't eat the funds.
@@ -536,26 +537,26 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 secretHashForDepositingSwappedDai,
                 ownerEthAddress.toBuffer32()
             ]);
-            const swapPrivateLeaf = sha256ToField([
-                uniswapL2Contract.address,
-                new Fr(version),
-                EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-                new Fr(l1Client.chain.id),
-                swapPrivateContent
-            ]);
+            const swapPrivateLeaf = computeL2ToL1MessageHash({
+                l2Sender: uniswapL2Contract.address,
+                l1Recipient: EthAddress.fromString(uniswapPortal.address),
+                content: swapPrivateContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
             const withdrawContent = sha256ToField([
                 Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
                 uniswapPortalAddress.toBuffer32(),
                 new Fr(wethAmountToBridge),
                 uniswapPortalAddress.toBuffer32()
             ]);
-            const withdrawLeaf = sha256ToField([
-                wethCrossChainHarness.l2Bridge.address,
-                new Fr(version),
-                wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-                new Fr(l1Client.chain.id),
-                withdrawContent
-            ]);
+            const withdrawLeaf = computeL2ToL1MessageHash({
+                l2Sender: wethCrossChainHarness.l2Bridge.address,
+                l1Recipient: wethCrossChainHarness.tokenPortalAddress,
+                content: withdrawContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
             const swapResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, swapPrivateLeaf);
             const withdrawResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, withdrawLeaf);
             const swapPrivateL2MessageIndex = swapResult.l2MessageIndex;
@@ -620,26 +621,26 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 secretHashForDepositingSwappedDai,
                 ownerEthAddress.toBuffer32()
             ]);
-            const swapPublicLeaf = sha256ToField([
-                uniswapL2Contract.address,
-                new Fr(version),
-                EthAddress.fromString(uniswapPortal.address).toBuffer32(),
-                new Fr(l1Client.chain.id),
-                swapPublicContent
-            ]);
+            const swapPublicLeaf = computeL2ToL1MessageHash({
+                l2Sender: uniswapL2Contract.address,
+                l1Recipient: EthAddress.fromString(uniswapPortal.address),
+                content: swapPublicContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
             const withdrawContent = sha256ToField([
                 Buffer.from(toFunctionSelector('withdraw(address,uint256,address)').substring(2), 'hex'),
                 uniswapPortalAddress.toBuffer32(),
                 new Fr(wethAmountToBridge),
                 uniswapPortalAddress.toBuffer32()
             ]);
-            const withdrawLeaf = sha256ToField([
-                wethCrossChainHarness.l2Bridge.address,
-                new Fr(version),
-                wethCrossChainHarness.tokenPortalAddress.toBuffer32(),
-                new Fr(l1Client.chain.id),
-                withdrawContent
-            ]);
+            const withdrawLeaf = computeL2ToL1MessageHash({
+                l2Sender: wethCrossChainHarness.l2Bridge.address,
+                l1Recipient: wethCrossChainHarness.tokenPortalAddress,
+                content: withdrawContent,
+                rollupVersion: new Fr(version),
+                chainId: new Fr(l1Client.chain.id)
+            });
             const swapResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, swapPublicLeaf);
             const withdrawResult = await computeL2ToL1MembershipWitness(aztecNode, withdrawReceipt.blockNumber, withdrawLeaf);
             const swapPublicL2MessageIndex = swapResult.l2MessageIndex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "1.0.0-nightly.20250608",
+  "version": "1.0.0-nightly.20250611",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -25,40 +25,40 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "1.0.0-nightly.20250608",
-    "@aztec/archiver": "1.0.0-nightly.20250608",
-    "@aztec/aztec": "1.0.0-nightly.20250608",
-    "@aztec/aztec-node": "1.0.0-nightly.20250608",
-    "@aztec/aztec.js": "1.0.0-nightly.20250608",
-    "@aztec/bb-prover": "1.0.0-nightly.20250608",
-    "@aztec/blob-lib": "1.0.0-nightly.20250608",
-    "@aztec/blob-sink": "1.0.0-nightly.20250608",
-    "@aztec/bot": "1.0.0-nightly.20250608",
-    "@aztec/cli": "1.0.0-nightly.20250608",
-    "@aztec/constants": "1.0.0-nightly.20250608",
-    "@aztec/entrypoints": "1.0.0-nightly.20250608",
-    "@aztec/epoch-cache": "1.0.0-nightly.20250608",
-    "@aztec/ethereum": "1.0.0-nightly.20250608",
-    "@aztec/foundation": "1.0.0-nightly.20250608",
-    "@aztec/kv-store": "1.0.0-nightly.20250608",
-    "@aztec/l1-artifacts": "1.0.0-nightly.20250608",
-    "@aztec/merkle-tree": "1.0.0-nightly.20250608",
-    "@aztec/noir-contracts.js": "1.0.0-nightly.20250608",
-    "@aztec/noir-noirc_abi": "1.0.0-nightly.20250608",
-    "@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250608",
-    "@aztec/noir-test-contracts.js": "1.0.0-nightly.20250608",
-    "@aztec/p2p": "1.0.0-nightly.20250608",
-    "@aztec/protocol-contracts": "1.0.0-nightly.20250608",
-    "@aztec/prover-client": "1.0.0-nightly.20250608",
-    "@aztec/prover-node": "1.0.0-nightly.20250608",
-    "@aztec/pxe": "1.0.0-nightly.20250608",
-    "@aztec/sequencer-client": "1.0.0-nightly.20250608",
-    "@aztec/simulator": "1.0.0-nightly.20250608",
-    "@aztec/slasher": "1.0.0-nightly.20250608",
-    "@aztec/stdlib": "1.0.0-nightly.20250608",
-    "@aztec/telemetry-client": "1.0.0-nightly.20250608",
-    "@aztec/validator-client": "1.0.0-nightly.20250608",
-    "@aztec/world-state": "1.0.0-nightly.20250608",
+    "@aztec/accounts": "1.0.0-nightly.20250611",
+    "@aztec/archiver": "1.0.0-nightly.20250611",
+    "@aztec/aztec": "1.0.0-nightly.20250611",
+    "@aztec/aztec-node": "1.0.0-nightly.20250611",
+    "@aztec/aztec.js": "1.0.0-nightly.20250611",
+    "@aztec/bb-prover": "1.0.0-nightly.20250611",
+    "@aztec/blob-lib": "1.0.0-nightly.20250611",
+    "@aztec/blob-sink": "1.0.0-nightly.20250611",
+    "@aztec/bot": "1.0.0-nightly.20250611",
+    "@aztec/cli": "1.0.0-nightly.20250611",
+    "@aztec/constants": "1.0.0-nightly.20250611",
+    "@aztec/entrypoints": "1.0.0-nightly.20250611",
+    "@aztec/epoch-cache": "1.0.0-nightly.20250611",
+    "@aztec/ethereum": "1.0.0-nightly.20250611",
+    "@aztec/foundation": "1.0.0-nightly.20250611",
+    "@aztec/kv-store": "1.0.0-nightly.20250611",
+    "@aztec/l1-artifacts": "1.0.0-nightly.20250611",
+    "@aztec/merkle-tree": "1.0.0-nightly.20250611",
+    "@aztec/noir-contracts.js": "1.0.0-nightly.20250611",
+    "@aztec/noir-noirc_abi": "1.0.0-nightly.20250611",
+    "@aztec/noir-protocol-circuits-types": "1.0.0-nightly.20250611",
+    "@aztec/noir-test-contracts.js": "1.0.0-nightly.20250611",
+    "@aztec/p2p": "1.0.0-nightly.20250611",
+    "@aztec/protocol-contracts": "1.0.0-nightly.20250611",
+    "@aztec/prover-client": "1.0.0-nightly.20250611",
+    "@aztec/prover-node": "1.0.0-nightly.20250611",
+    "@aztec/pxe": "1.0.0-nightly.20250611",
+    "@aztec/sequencer-client": "1.0.0-nightly.20250611",
+    "@aztec/simulator": "1.0.0-nightly.20250611",
+    "@aztec/slasher": "1.0.0-nightly.20250611",
+    "@aztec/stdlib": "1.0.0-nightly.20250611",
+    "@aztec/telemetry-client": "1.0.0-nightly.20250611",
+    "@aztec/validator-client": "1.0.0-nightly.20250611",
+    "@aztec/world-state": "1.0.0-nightly.20250611",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^29.5.0",
     "@noble/curves": "^1.0.0",
@@ -155,6 +155,7 @@
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
-    ]
+    ],
+    "testEnvironment": "../../foundation/src/jest/env.mjs"
   }
 }

package/src/e2e_p2p/p2p_network.ts

@@ -7,13 +7,14 @@ import {
   L1TxUtils,
   type Operator,
   RollupContract,
+  type ViemClient,
   deployL1Contract,
   getL1ContractsConfigEnvVars,
   l1Artifacts,
 } from '@aztec/ethereum';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { type Logger, createLogger } from '@aztec/foundation/log';
-import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
+import { RollupAbi, SlashFactoryAbi, SlasherAbi, SlashingProposerAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import type { BootstrapNode } from '@aztec/p2p/bootstrap';
 import { createBootstrapNodeFromPrivateKey, getBootstrapNodeEnr } from '@aztec/p2p/test-helpers';
@@ -22,7 +23,7 @@ import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
 import getPort from 'get-port';
-import { getContract } from 'viem';
+import { type GetContractReturnType, getAddress, getContract } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
 
 import {
@@ -114,7 +115,9 @@ export class P2PNetworkTest {
         aztecProofSubmissionWindow:
           initialValidatorConfig.aztecProofSubmissionWindow ?? l1ContractsConfig.aztecProofSubmissionWindow,
         initialValidators: [],
-        mockZkPassportVerifier,
+        zkPassportArgs: {
+          mockZkPassportVerifier,
+        },
       },
     );
   }
@@ -227,7 +230,7 @@ export class P2PNetworkTest {
           client: deployL1ContractsValues.l1Client,
         });
 
-        const stakeNeeded = l1ContractsConfig.minimumStake * BigInt(this.numberOfNodes);
+        const stakeNeeded = l1ContractsConfig.depositAmount * BigInt(this.numberOfNodes);
         await Promise.all(
           [await stakingAsset.write.mint([multiAdder.address, stakeNeeded], {} as any)].map(txHash =>
             deployL1ContractsValues.l1Client.waitForTransactionReceipt({ hash: txHash }),
@@ -352,4 +355,40 @@ export class P2PNetworkTest {
     await tryStop(this.bootstrapNode, this.logger);
     await this.snapshotManager.teardown();
   }
+
+  async getContracts(): Promise<{
+    rollup: RollupContract;
+    slasherContract: GetContractReturnType<typeof SlasherAbi, ViemClient>;
+    slashingProposer: GetContractReturnType<typeof SlashingProposerAbi, ViemClient>;
+    slashFactory: GetContractReturnType<typeof SlashFactoryAbi, ViemClient>;
+  }> {
+    if (!this.ctx.deployL1ContractsValues) {
+      throw new Error('DeployL1ContractsValues not set');
+    }
+
+    const rollup = new RollupContract(
+      this.ctx.deployL1ContractsValues!.l1Client,
+      this.ctx.deployL1ContractsValues!.l1ContractAddresses.rollupAddress,
+    );
+
+    const slasherContract = getContract({
+      address: getAddress(await rollup.getSlasher()),
+      abi: SlasherAbi,
+      client: this.ctx.deployL1ContractsValues.l1Client,
+    });
+
+    const slashingProposer = getContract({
+      address: getAddress(await slasherContract.read.PROPOSER()),
+      abi: SlashingProposerAbi,
+      client: this.ctx.deployL1ContractsValues.l1Client,
+    });
+
+    const slashFactory = getContract({
+      address: getAddress(this.ctx.deployL1ContractsValues.l1ContractAddresses.slashFactoryAddress!.toString()),
+      abi: SlashFactoryAbi,
+      client: this.ctx.deployL1ContractsValues.l1Client,
+    });
+
+    return { rollup, slasherContract, slashingProposer, slashFactory };
+  }
 }