@aztec/end-to-end 2.0.0-nightly.20250821 → 2.0.0-nightly.20250823

package/dest/e2e_epochs/epochs_test.d.ts

@@ -68,7 +68,7 @@ export declare class EpochsTestContext {
     /** Waits until the last slot of the proof submission window for a given epoch. */
     waitUntilLastSlotOfProofSubmissionWindow(epochNumber: number | bigint): Promise<void>;
     /** Waits for the aztec node to sync to the target block number. */
-    waitForNodeToSync(blockNumber: number, type: 'proven' | 'finalised' | 'historic'): Promise<void>;
+    waitForNodeToSync(blockNumber: number, type: 'proven' | 'finalized' | 'historic'): Promise<void>;
     /** Registers the SpamContract on the given wallet. */
     registerSpamContract(wallet: Wallet, salt?: Fr): Promise<SpamContract>;
     /** Creates an L1 client using a fresh account with funds from anvil, with a tx delayer already set up. */

package/dest/e2e_epochs/epochs_test.js

@@ -234,8 +234,8 @@ export const DEFAULT_L1_BLOCK_TIME = process.env.CI ? 12 : 8;
             });
             if (type === 'proven') {
                 synched = tips.proven.number >= blockNumber && syncState.latestBlockNumber >= blockNumber;
-            } else if (type === 'finalised') {
-                synched = syncState.finalisedBlockNumber >= blockNumber;
+            } else if (type === 'finalized') {
+                synched = syncState.finalizedBlockNumber >= blockNumber;
             } else {
                 synched = syncState.oldestHistoricBlockNumber >= blockNumber;
             }

package/dest/e2e_p2p/p2p_network.d.ts

@@ -4,9 +4,10 @@ import { type AccountWalletWithSecretKey, AztecAddress } from '@aztec/aztec.js';
 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 { EmpireSlashingProposerAbi, SlasherAbi } from '@aztec/l1-artifacts';
 import { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import type { BootstrapNode } from '@aztec/p2p/bootstrap';
+import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { type GetContractReturnType } from 'viem';
 import { type SubsystemsContext } from '../fixtures/snapshot_manager.js';
@@ -86,8 +87,8 @@ export declare class P2PNetworkTest {
     getContracts(): Promise<{
         rollup: RollupContract;
         slasherContract: GetContractReturnType<typeof SlasherAbi, ViemClient>;
-        slashingProposer: GetContractReturnType<typeof SlashingProposerAbi, ViemClient>;
-        slashFactory: GetContractReturnType<typeof SlashFactoryAbi, ViemClient>;
+        slashingProposer: GetContractReturnType<typeof EmpireSlashingProposerAbi, ViemClient>;
+        slashFactory: SlashFactoryContract;
     }>;
 }
 //# 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":"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"}
+{"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

@@ -4,10 +4,11 @@ import { GSEContract, L1TxUtils, MultiAdderArtifact, RollupContract, deployL1Con
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { SecretValue } from '@aztec/foundation/config';
 import { createLogger } from '@aztec/foundation/log';
-import { RollupAbi, SlashFactoryAbi, SlasherAbi, SlashingProposerAbi, TestERC20Abi } from '@aztec/l1-artifacts';
+import { EmpireSlashingProposerAbi, 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';
@@ -281,14 +282,10 @@ export class P2PNetworkTest {
         });
         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,
+            abi: EmpireSlashingProposerAbi,
             client: this.ctx.deployL1ContractsValues.l1Client
         });
+        const slashFactory = new SlashFactoryContract(this.ctx.deployL1ContractsValues.l1Client, getAddress(this.ctx.deployL1ContractsValues.l1ContractAddresses.slashFactoryAddress.toString()));
         return {
             rollup,
             slasherContract,

package/dest/e2e_p2p/shared.d.ts

@@ -3,11 +3,10 @@ import type { AztecNodeService } from '@aztec/aztec-node';
 import { AztecAddress, type Logger, ProvenTx, type SentTx } from '@aztec/aztec.js';
 import type { RollupCheatCodes } from '@aztec/aztec/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 { EmpireSlashingProposerAbi } from '@aztec/l1-artifacts/EmpireSlashingProposerAbi';
 import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { PXEService } from '@aztec/pxe/server';
-import { Offense } from '@aztec/slasher';
+import type { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
 import type { GetContractReturnType } from 'viem';
 import type { NodeContext } from '../fixtures/setup_p2p_test.js';
 export declare const submitComplexTxsTo: (logger: Logger, from: AztecAddress, spamContract: SpamContract, numTxs: number, opts?: {
@@ -19,7 +18,7 @@ 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 awaitProposalExecution(slashingProposer: GetContractReturnType<typeof EmpireSlashingProposerAbi, ViemClient>, timeoutSeconds: number): Promise<void>;
 export declare function awaitCommitteeExists({ rollup, logger, }: {
     rollup: RollupContract;
     logger: Logger;
@@ -28,14 +27,12 @@ export declare function awaitCommitteeExists({ rollup, logger, }: {
  * 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({ offense, rollup, cheatCodes, committee, slashingAmount, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, logger, sendDummyTx, }: {
-    offense: Offense;
+export declare function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, logger, sendDummyTx, }: {
     rollup: RollupContract;
     cheatCodes: RollupCheatCodes;
     committee: readonly `0x${string}`[];
-    slashingAmount: bigint;
-    slashFactory: GetContractReturnType<typeof SlashFactoryAbi, ViemClient>;
-    slashingProposer: GetContractReturnType<typeof SlashingProposerAbi, ViemClient>;
+    slashFactory: SlashFactoryContract;
+    slashingProposer: GetContractReturnType<typeof EmpireSlashingProposerAbi, ViemClient>;
     slashingRoundSize: number;
     aztecSlotDuration: number;
     logger: Logger;

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,EACL,YAAY,EAEZ,KAAK,MAAM,EACX,QAAQ,EACR,KAAK,MAAM,EAIZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,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,MAAM,YAAY,EAClB,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,EACzC,MAAM,EACN,MAAM,GACP,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC,CAYpC;AAED;;;GAGG;AACH,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,iBAgEA"}
+{"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,EACL,YAAY,EAEZ,KAAK,MAAM,EACX,QAAQ,EACR,KAAK,MAAM,EAIZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAC;AAC/F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAE,UAAU,EAAyD,MAAM,mBAAmB,CAAC;AACtG,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAEvE,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,MAAM,YAAY,EAClB,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,yBAAyB,EAAE,UAAU,CAAC,EACrF,cAAc,EAAE,MAAM,iBAiBvB;AAED,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,MAAM,GACP,EAAE;IACD,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC,CAYpC;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,UAAU,EACV,SAAS,EACT,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,MAAM,EACN,WAAW,GACZ,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,qBAAqB,CAAC,OAAO,yBAAyB,EAAE,UAAU,CAAC,CAAC;IACtF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAClC,iBA+DA"}

package/dest/e2e_p2p/shared.js

@@ -1,9 +1,8 @@
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
 import { Fr, TxStatus, getContractInstanceFromInstantiationParams, retryUntil } from '@aztec/aztec.js';
-import { timesAsync } from '@aztec/foundation/collection';
+import { timesAsync, unique } 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, from, spamContract, numTxs, opts = {})=>{
@@ -96,26 +95,19 @@ export async function awaitCommitteeExists({ rollup, logger }) {
 /**
  * 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 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();
+ */ export async function awaitCommitteeKicked({ rollup, cheatCodes, committee, slashFactory, slashingProposer, slashingRoundSize, aztecSlotDuration, logger, sendDummyTx }) {
+    logger.info(`Advancing epochs so slash payload gets deployed`);
+    await cheatCodes.debugRollup();
+    await cheatCodes.advanceToNextEpoch();
+    await cheatCodes.advanceToNextEpoch();
+    // Await for the slash payload to be created and check that all committee members are slashed
+    const slashPayloadEvents = await retryUntil(async ()=>{
+        const events = await slashFactory.getSlashPayloadCreatedEvents();
+        return events.length > 0 ? events : undefined;
+    }, 'slash payload created', 120, 1);
     expect(slashPayloadEvents.length).toBe(1);
-    expect(slashPayloadEvents[0].args.offenses).toEqual(Array.from({
-        length: committee.length
-    }, ()=>OffenseToBigInt[offense]));
+    // The uniqueness check is needed since a validator may be slashed more than once on the same round (eg because they let two epochs be pruned)
+    expect(unique(slashPayloadEvents[0].slashes.map((slash)=>slash.validator.toString()))).toHaveLength(committee.length);
     const attestersPre = await rollup.getAttesters();
     expect(attestersPre.length).toBe(committee.length);
     for (const attester of attestersPre){
@@ -132,11 +124,12 @@ export async function awaitCommitteeExists({ rollup, logger }) {
     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);
-    }
+    // TODO(palla/slash): Reinstate this check if applies
+    // for (const attester of attestersPre) {
+    //   const attesterInfo = await rollup.getAttesterView(attester);
+    //   // Check that status is Living
+    //   expect(attesterInfo.status).toEqual(2);
+    // }
     await cheatCodes.debugRollup();
     await cheatCodes.advanceToNextEpoch();
     await sendDummyTx();

package/dest/fixtures/setup_p2p_test.d.ts

@@ -8,8 +8,7 @@ import type { ProverNodeDeps } from '@aztec/prover-node';
 import type { PXEService } from '@aztec/pxe/server';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { AsyncLocalStorage } from 'node:async_hooks';
-export declare const ATTESTER_PRIVATE_KEYS_START_INDEX = 2;
-export declare const SLASHER_PRIVATE_KEYS_START_INDEX = 12;
+export declare const ATTESTER_PRIVATE_KEYS_START_INDEX = 3;
 export interface NodeContext {
     node: AztecNodeService;
     pxeService: PXEService;

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;AAI9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3E,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,eAAO,MAAM,gCAAgC,KAAK,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,EACpB,WAAW,SAAI,GACd,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAoC7B;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,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,EAC/E,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,oDAyB5C;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;AAI9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAoB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3E,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;AASrD,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,EACpB,WAAW,SAAI,GACd,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAoC7B;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,gBAAgB,CACpC,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,EAC/E,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,oDAyB5C;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,4BAqBvB"}

package/dest/fixtures/setup_p2p_test.js

@@ -10,10 +10,9 @@ import { TEST_PEER_CHECK_INTERVAL_MS } from './fixtures.js';
 import { createAndSyncProverNode, getPrivateKeyFromIndex } from './utils.js';
 import { getEndToEndTestTelemetryClient } from './with_telemetry_utils.js';
 // Setup snapshots will create a node with index 0, and run extra bootstrap with
-// index 1, so all of our loops here need to start from 2 to avoid running validators with the same key
-export const ATTESTER_PRIVATE_KEYS_START_INDEX = 2;
-// We use slasher keys after the first 10 anvil keys, note that this requires anvil to be started with more than the default 10 accounts
-export const SLASHER_PRIVATE_KEYS_START_INDEX = 12;
+// index 1, and prover node with index 2, so all of our loops here need to start from 3
+// to avoid running validators with the same key
+export const ATTESTER_PRIVATE_KEYS_START_INDEX = 3;
 export function generatePrivateKeys(startIndex, numberOfKeys) {
     const privateKeys = [];
     // Do not start from 0 as it is used during setup
@@ -86,12 +85,10 @@ export async function createProverNode(config, tcpPort, bootstrapNode, addressIn
 export async function createValidatorConfig(config, bootstrapNodeEnr, port, addressIndex = 1, dataDirectory) {
     port = port ?? await getPort();
     const attesterPrivateKey = bufferToHex(getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex));
-    const slasherPrivateKey = bufferToHex(getPrivateKeyFromIndex(SLASHER_PRIVATE_KEYS_START_INDEX + addressIndex));
     config.validatorPrivateKeys = new SecretValue([
         attesterPrivateKey
     ]);
     config.publisherPrivateKey = new SecretValue(attesterPrivateKey);
-    config.slasherPrivateKey = new SecretValue(slasherPrivateKey);
     const nodeConfig = {
         ...config,
         p2pIp: `127.0.0.1`,

package/dest/shared/uniswap_l1_l2.js

@@ -504,7 +504,7 @@ export const uniswapL1L2TestSuite = (setup, cleanup, expectedForkBlockNumber = 1
                 action
             }, true);
             await validateActionInteraction.send({
-                from: sponsorAddress
+                from: ownerAddress
             }).wait();
             await expect(action.simulate({
                 from: sponsorAddress

package/package.json

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

package/src/e2e_epochs/epochs_test.ts

@@ -307,7 +307,7 @@ export class EpochsTestContext {
   }
 
   /** Waits for the aztec node to sync to the target block number. */
-  public async waitForNodeToSync(blockNumber: number, type: 'proven' | 'finalised' | 'historic') {
+  public async waitForNodeToSync(blockNumber: number, type: 'proven' | 'finalized' | 'historic') {
     const waitTime = ARCHIVER_POLL_INTERVAL + WORLD_STATE_BLOCK_CHECK_INTERVAL;
     let synched = false;
     while (!synched) {
@@ -319,8 +319,8 @@ export class EpochsTestContext {
       this.logger.info(`Wait for node synch ${blockNumber} ${type}`, { blockNumber, type, syncState, tips });
       if (type === 'proven') {
         synched = tips.proven.number >= blockNumber && syncState.latestBlockNumber >= blockNumber;
-      } else if (type === 'finalised') {
-        synched = syncState.finalisedBlockNumber >= blockNumber;
+      } else if (type === 'finalized') {
+        synched = syncState.finalizedBlockNumber >= blockNumber;
       } else {
         synched = syncState.oldestHistoricBlockNumber >= blockNumber;
       }

package/src/e2e_p2p/p2p_network.ts

@@ -16,11 +16,12 @@ import {
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { SecretValue } from '@aztec/foundation/config';
 import { type Logger, createLogger } from '@aztec/foundation/log';
-import { RollupAbi, SlashFactoryAbi, SlasherAbi, SlashingProposerAbi, TestERC20Abi } from '@aztec/l1-artifacts';
+import { EmpireSlashingProposerAbi, RollupAbi, SlasherAbi, 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';
 import { tryStop } from '@aztec/stdlib/interfaces/server';
+import { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
 import { getGenesisValues } from '@aztec/world-state/testing';
@@ -391,8 +392,8 @@ export class P2PNetworkTest {
   async getContracts(): Promise<{
     rollup: RollupContract;
     slasherContract: GetContractReturnType<typeof SlasherAbi, ViemClient>;
-    slashingProposer: GetContractReturnType<typeof SlashingProposerAbi, ViemClient>;
-    slashFactory: GetContractReturnType<typeof SlashFactoryAbi, ViemClient>;
+    slashingProposer: GetContractReturnType<typeof EmpireSlashingProposerAbi, ViemClient>;
+    slashFactory: SlashFactoryContract;
   }> {
     if (!this.ctx.deployL1ContractsValues) {
       throw new Error('DeployL1ContractsValues not set');
@@ -411,15 +412,14 @@ export class P2PNetworkTest {
 
     const slashingProposer = getContract({
       address: getAddress(await slasherContract.read.PROPOSER()),
-      abi: SlashingProposerAbi,
+      abi: EmpireSlashingProposerAbi,
       client: this.ctx.deployL1ContractsValues.l1Client,
     });
 
-    const slashFactory = getContract({
-      address: getAddress(this.ctx.deployL1ContractsValues.l1ContractAddresses.slashFactoryAddress!.toString()),
-      abi: SlashFactoryAbi,
-      client: this.ctx.deployL1ContractsValues.l1Client,
-    });
+    const slashFactory = new SlashFactoryContract(
+      this.ctx.deployL1ContractsValues.l1Client,
+      getAddress(this.ctx.deployL1ContractsValues.l1ContractAddresses.slashFactoryAddress!.toString()),
+    );
 
     return { rollup, slasherContract, slashingProposer, slashFactory };
   }

package/src/e2e_p2p/shared.ts

@@ -13,13 +13,12 @@ import {
 } from '@aztec/aztec.js';
 import type { RollupCheatCodes } from '@aztec/aztec/testing';
 import type { RollupContract, ViemClient } from '@aztec/ethereum';
-import { timesAsync } from '@aztec/foundation/collection';
-import type { SlashFactoryAbi } from '@aztec/l1-artifacts/SlashFactoryAbi';
-import type { SlashingProposerAbi } from '@aztec/l1-artifacts/SlashingProposerAbi';
+import { timesAsync, unique } from '@aztec/foundation/collection';
+import type { EmpireSlashingProposerAbi } from '@aztec/l1-artifacts/EmpireSlashingProposerAbi';
 import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
 import { PXEService, createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
-import { Offense, OffenseToBigInt } from '@aztec/slasher';
+import type { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
 
 import type { GetContractReturnType } from 'viem';
 
@@ -109,7 +108,7 @@ export async function createPXEServiceAndPrepareTransactions(
 }
 
 export async function awaitProposalExecution(
-  slashingProposer: GetContractReturnType<typeof SlashingProposerAbi, ViemClient>,
+  slashingProposer: GetContractReturnType<typeof EmpireSlashingProposerAbi, ViemClient>,
   timeoutSeconds: number,
 ) {
   await retryUntil(
@@ -154,11 +153,9 @@ export async function awaitCommitteeExists({
  * Currently assumes that the committee is the same size as the validator set.
  */
 export async function awaitCommitteeKicked({
-  offense,
   rollup,
   cheatCodes,
   committee,
-  slashingAmount,
   slashFactory,
   slashingProposer,
   slashingRoundSize,
@@ -166,39 +163,35 @@ export async function awaitCommitteeKicked({
   logger,
   sendDummyTx,
 }: {
-  offense: Offense;
   rollup: RollupContract;
   cheatCodes: RollupCheatCodes;
   committee: readonly `0x${string}`[];
-  slashingAmount: bigint;
-  slashFactory: GetContractReturnType<typeof SlashFactoryAbi, ViemClient>;
-  slashingProposer: GetContractReturnType<typeof SlashingProposerAbi, ViemClient>;
+  slashFactory: SlashFactoryContract;
+  slashingProposer: GetContractReturnType<typeof EmpireSlashingProposerAbi, ViemClient>;
   slashingRoundSize: number;
   aztecSlotDuration: number;
   logger: Logger;
   sendDummyTx: () => Promise<void>;
 }) {
-  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(
+  logger.info(`Advancing epochs so slash payload gets deployed`);
+  await cheatCodes.debugRollup();
+  await cheatCodes.advanceToNextEpoch();
+  await cheatCodes.advanceToNextEpoch();
+
+  // Await for the slash payload to be created and check that all committee members are slashed
+  const slashPayloadEvents = await retryUntil(
     async () => {
-      const [address, _, isDeployed] = await slashFactory.read.getAddressAndIsDeployed([
-        sortedCommittee,
-        expectedSlashes,
-      ]);
-      return address && isDeployed;
+      const events = await slashFactory.getSlashPayloadCreatedEvents();
+      return events.length > 0 ? events : undefined;
     },
-    'slash payload deployed',
-    60,
+    'slash payload created',
+    120,
     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]),
-  );
+
+  // The uniqueness check is needed since a validator may be slashed more than once on the same round (eg because they let two epochs be pruned)
+  expect(unique(slashPayloadEvents[0].slashes.map(slash => slash.validator.toString()))).toHaveLength(committee.length);
 
   const attestersPre = await rollup.getAttesters();
   expect(attestersPre.length).toBe(committee.length);
@@ -221,11 +214,12 @@ export async function awaitCommitteeKicked({
   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);
-  }
+  // TODO(palla/slash): Reinstate this check if applies
+  // for (const attester of attestersPre) {
+  //   const attesterInfo = await rollup.getAttesterView(attester);
+  //   // Check that status is Living
+  //   expect(attesterInfo.status).toEqual(2);
+  // }
 
   await cheatCodes.debugRollup();
   await cheatCodes.advanceToNextEpoch();

package/src/fixtures/setup_p2p_test.ts

@@ -19,10 +19,9 @@ import { createAndSyncProverNode, getPrivateKeyFromIndex } from './utils.js';
 import { getEndToEndTestTelemetryClient } from './with_telemetry_utils.js';
 
 // Setup snapshots will create a node with index 0, and run extra bootstrap with
-// index 1, so all of our loops here need to start from 2 to avoid running validators with the same key
-export const ATTESTER_PRIVATE_KEYS_START_INDEX = 2;
-// We use slasher keys after the first 10 anvil keys, note that this requires anvil to be started with more than the default 10 accounts
-export const SLASHER_PRIVATE_KEYS_START_INDEX = 12;
+// index 1, and prover node with index 2, so all of our loops here need to start from 3
+// to avoid running validators with the same key
+export const ATTESTER_PRIVATE_KEYS_START_INDEX = 3;
 
 export interface NodeContext {
   node: AztecNodeService;
@@ -153,11 +152,9 @@ export async function createValidatorConfig(
   port = port ?? (await getPort());
 
   const attesterPrivateKey = bufferToHex(getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex)!);
-  const slasherPrivateKey = bufferToHex(getPrivateKeyFromIndex(SLASHER_PRIVATE_KEYS_START_INDEX + addressIndex)!);
 
   config.validatorPrivateKeys = new SecretValue([attesterPrivateKey]);
   config.publisherPrivateKey = new SecretValue(attesterPrivateKey);
-  config.slasherPrivateKey = new SecretValue(slasherPrivateKey);
 
   const nodeConfig: AztecNodeConfig = {
     ...config,

package/src/shared/uniswap_l1_l2.ts

@@ -747,7 +747,7 @@ export const uniswapL1L2TestSuite = (
           nonceForSwap,
         );
       const validateActionInteraction = await ownerWallet.setPublicAuthWit({ caller: approvedUser, action }, true);
-      await validateActionInteraction.send({ from: sponsorAddress }).wait();
+      await validateActionInteraction.send({ from: ownerAddress }).wait();
 
       await expect(action.simulate({ from: sponsorAddress })).rejects.toThrow(/unauthorized/);
     });