@aztec/end-to-end 2.0.3-rc.16 → 2.0.3-rc.18

package/dest/e2e_p2p/shared.d.ts

@@ -23,11 +23,12 @@ export declare function awaitCommitteeExists({ rollup, logger, }: {
     rollup: RollupContract;
     logger: Logger;
 }): Promise<readonly `0x${string}`[]>;
-export declare function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, }: {
+export declare function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount, }: {
     nodeAdmin: AztecNodeAdmin;
     logger: Logger;
     slashingRoundSize: number;
     epochDuration: number;
+    waitUntilOffenseCount?: number;
 }): Promise<import("@aztec/slasher").Offense[]>;
 /**
  * Await the committee to be slashed out of the validator set.

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":"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"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/e2e_p2p/shared.ts"],"names":[],"mappings":"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"}

package/dest/e2e_p2p/shared.js

@@ -1,6 +1,7 @@
 import { getSchnorrAccount } from '@aztec/accounts/schnorr';
 import { Fr, TxStatus, getContractInstanceFromInstantiationParams, retryUntil } from '@aztec/aztec.js';
 import { timesAsync, unique } from '@aztec/foundation/collection';
+import { pluralize } from '@aztec/foundation/string';
 import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
 import { createPXEService, getPXEServiceConfig as getRpcConfig } from '@aztec/pxe/server';
 import { getRoundForOffense } from '@aztec/slasher';
@@ -107,11 +108,12 @@ export async function awaitCommitteeExists({ rollup, logger }) {
     }, 'non-empty committee', 60);
     return committee;
 }
-export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration }) {
-    logger.info(`Waiting for an offense to be detected`);
+export async function awaitOffenseDetected({ logger, nodeAdmin, slashingRoundSize, epochDuration, waitUntilOffenseCount }) {
+    const targetOffenseCount = waitUntilOffenseCount ?? 1;
+    logger.warn(`Waiting for ${pluralize('offense', targetOffenseCount)} to be detected`);
     const offenses = await retryUntil(async ()=>{
         const offenses = await nodeAdmin.getSlashOffenses('all');
-        if (offenses.length > 0) {
+        if (offenses.length >= targetOffenseCount) {
             return offenses;
         }
     }, 'non-empty offenses', 60);

package/dest/fixtures/setup_p2p_test.d.ts

@@ -16,7 +16,11 @@ export interface NodeContext {
 }
 export declare function generatePrivateKeys(startIndex: number, numberOfKeys: number): `0x${string}`[];
 export declare function createNodes(config: AztecNodeConfig, dateProvider: DateProvider, bootstrapNodeEnr: string, numNodes: number, bootNodePort: number, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number, indexOffset?: number): Promise<AztecNodeService[]>;
+/** Creates a P2P enabled instance of Aztec Node Service with a validator */
 export declare function createNode(config: AztecNodeConfig, dateProvider: DateProvider, tcpPort: number, bootstrapNode: string | undefined, addressIndex: number, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number, loggerIdStorage?: AsyncLocalStorage<string>): Promise<AztecNodeService>;
+/** Creates a P2P enabled instance of Aztec Node Service without a validator */
+export declare function createNonValidatorNode(baseConfig: AztecNodeConfig, dateProvider: DateProvider, tcpPort: number, bootstrapNode: string | undefined, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number, loggerIdStorage?: AsyncLocalStorage<string>): Promise<AztecNodeService>;
 export declare function createProverNode(config: AztecNodeConfig, tcpPort: number, bootstrapNode: string | undefined, addressIndex: number, proverNodeDeps: ProverNodeDeps & Required<Pick<ProverNodeDeps, 'dateProvider'>>, prefilledPublicData?: PublicDataTreeLeaf[], dataDirectory?: string, metricsPort?: number, loggerIdStorage?: AsyncLocalStorage<string>): Promise<import("@aztec/prover-node").ProverNode>;
+export declare function createP2PConfig(config: AztecNodeConfig, bootstrapNodeEnr?: string, port?: number, dataDirectory?: string): Promise<AztecNodeConfig>;
 export declare function createValidatorConfig(config: AztecNodeConfig, bootstrapNodeEnr?: string, port?: number, addressIndex?: number, dataDirectory?: string): Promise<AztecNodeConfig>;
 //# sourceMappingURL=setup_p2p_test.d.ts.map

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;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"}
+{"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;AAED,4EAA4E;AAC5E,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,+EAA+E;AAC/E,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,eAAe,EAC3B,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,EAC1C,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,MAAM,EACpB,eAAe,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,6BAc5C;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,oDAwB5C;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,eAAe,EACvB,gBAAgB,CAAC,EAAE,MAAM,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,4BAgBvB;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,4BAYvB"}

package/dest/fixtures/setup_p2p_test.js

@@ -43,8 +43,7 @@ export async function createNodes(config, dateProvider, bootstrapNodeEnr, numNod
     removeLogNameHandler(logNameHandler);
     return nodes;
 }
-// creates a P2P enabled instance of Aztec Node Service
-export async function createNode(config, dateProvider, tcpPort, bootstrapNode, addressIndex, prefilledPublicData, dataDirectory, metricsPort, loggerIdStorage) {
+/** Creates a P2P enabled instance of Aztec Node Service with a validator */ export async function createNode(config, dateProvider, tcpPort, bootstrapNode, addressIndex, prefilledPublicData, dataDirectory, metricsPort, loggerIdStorage) {
     const createNode = async ()=>{
         const validatorConfig = await createValidatorConfig(config, bootstrapNode, tcpPort, addressIndex, dataDirectory);
         const telemetry = getEndToEndTestTelemetryClient(metricsPort);
@@ -57,20 +56,30 @@ export async function createNode(config, dateProvider, tcpPort, bootstrapNode, a
     };
     return loggerIdStorage ? await loggerIdStorage.run(tcpPort.toString(), createNode) : createNode();
 }
+/** Creates a P2P enabled instance of Aztec Node Service without a validator */ export async function createNonValidatorNode(baseConfig, dateProvider, tcpPort, bootstrapNode, prefilledPublicData, dataDirectory, metricsPort, loggerIdStorage) {
+    const createNode = async ()=>{
+        const p2pConfig = await createP2PConfig(baseConfig, bootstrapNode, tcpPort, dataDirectory);
+        const config = {
+            ...p2pConfig,
+            disableValidator: true,
+            validatorPrivateKeys: undefined,
+            publisherPrivateKeys: []
+        };
+        const telemetry = getEndToEndTestTelemetryClient(metricsPort);
+        return await AztecNodeService.createAndSync(config, {
+            telemetry,
+            dateProvider
+        }, {
+            prefilledPublicData
+        });
+    };
+    return loggerIdStorage ? await loggerIdStorage.run(tcpPort.toString(), createNode) : createNode();
+}
 export async function createProverNode(config, tcpPort, bootstrapNode, addressIndex, proverNodeDeps, prefilledPublicData, dataDirectory, metricsPort, loggerIdStorage) {
     const createProverNode = async ()=>{
         const proverNodePrivateKey = getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex);
         const telemetry = getEndToEndTestTelemetryClient(metricsPort);
-        const proverConfig = {
-            p2pIp: `127.0.0.1`,
-            p2pPort: tcpPort ?? await getPort(),
-            p2pEnabled: true,
-            peerCheckIntervalMS: TEST_PEER_CHECK_INTERVAL_MS,
-            blockCheckIntervalMS: 1000,
-            bootstrapNodes: bootstrapNode ? [
-                bootstrapNode
-            ] : []
-        };
+        const proverConfig = await createP2PConfig(config, bootstrapNode, tcpPort, dataDirectory);
         const aztecNodeRpcTxProvider = undefined;
         return await createAndSyncProverNode(bufferToHex(proverNodePrivateKey), config, {
             ...proverConfig,
@@ -82,15 +91,8 @@ export async function createProverNode(config, tcpPort, bootstrapNode, addressIn
     };
     return loggerIdStorage ? await loggerIdStorage.run(tcpPort.toString(), createProverNode) : createProverNode();
 }
-export async function createValidatorConfig(config, bootstrapNodeEnr, port, addressIndex = 1, dataDirectory) {
+export async function createP2PConfig(config, bootstrapNodeEnr, port, dataDirectory) {
     port = port ?? await getPort();
-    const attesterPrivateKey = bufferToHex(getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex));
-    config.validatorPrivateKeys = new SecretValue([
-        attesterPrivateKey
-    ]);
-    config.publisherPrivateKeys = [
-        new SecretValue(attesterPrivateKey)
-    ];
     const nodeConfig = {
         ...config,
         p2pIp: `127.0.0.1`,
@@ -105,3 +107,18 @@ export async function createValidatorConfig(config, bootstrapNodeEnr, port, addr
     };
     return nodeConfig;
 }
+export async function createValidatorConfig(config, bootstrapNodeEnr, port, addressIndex = 1, dataDirectory) {
+    const attesterPrivateKey = bufferToHex(getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex));
+    const p2pConfig = await createP2PConfig(config, bootstrapNodeEnr, port, dataDirectory);
+    const nodeConfig = {
+        ...config,
+        ...p2pConfig,
+        validatorPrivateKeys: new SecretValue([
+            attesterPrivateKey
+        ]),
+        publisherPrivateKeys: [
+            new SecretValue(attesterPrivateKey)
+        ]
+    };
+    return nodeConfig;
+}

package/dest/fixtures/web3signer.d.ts

@@ -0,0 +1,5 @@
+export declare function createWeb3SignerKeystore(dir: string, ...privateKeys: string[]): Promise<void>;
+export declare function refreshWeb3Signer(url: string): Promise<void>;
+export declare function getWeb3SignerTestKeystoreDir(): string;
+export declare function getWeb3SignerUrl(): string;
+//# sourceMappingURL=web3signer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"web3signer.d.ts","sourceRoot":"","sources":["../../src/fixtures/web3signer.ts"],"names":[],"mappings":"AAOA,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,MAAM,EAAE,iBAcnF;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,iBAKlD;AAED,wBAAgB,4BAA4B,IAAI,MAAM,CAOrD;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAMzC"}

package/dest/fixtures/web3signer.js

@@ -0,0 +1,42 @@
+import { sleep } from '@aztec/aztec.js';
+import { randomBytes } from '@aztec/foundation/crypto';
+import { mkdirSync } from 'node:fs';
+import { writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+export async function createWeb3SignerKeystore(dir, ...privateKeys) {
+    const yaml = privateKeys.map((pk)=>`\
+type: file-raw
+keyType: SECP256K1
+privateKey: ${pk}`).join('\n---\n');
+    // NOTE: nodejs stdlib can only create temp directories, not temp files!
+    // this write uses wx (write-exclusive) so it'll throw if the file already exists
+    const path = join(dir, `keystore-${randomBytes(4).toString('hex')}.yaml`);
+    await writeFile(path, yaml, {
+        flag: 'wx'
+    });
+}
+export async function refreshWeb3Signer(url) {
+    await fetch(new URL('reload', url), {
+        method: 'POST'
+    });
+    // give the service a chance to load up the new files
+    // 1s might not be enough if there are a lot of files to scan
+    await sleep(1000);
+}
+export function getWeb3SignerTestKeystoreDir() {
+    if (process.env.WEB3_SIGNER_TEST_KEYSTORE_DIR) {
+        mkdirSync(process.env.WEB3_SIGNER_TEST_KEYSTORE_DIR, {
+            recursive: true
+        });
+        return process.env.WEB3_SIGNER_TEST_KEYSTORE_DIR;
+    } else {
+        throw new Error('Web3signer not running');
+    }
+}
+export function getWeb3SignerUrl() {
+    if (process.env.WEB3_SIGNER_URL) {
+        return process.env.WEB3_SIGNER_URL;
+    } else {
+        throw new Error('Web3signer not running');
+    }
+}

package/package.json

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

package/src/e2e_p2p/shared.ts

@@ -14,6 +14,7 @@ import {
 import type { RollupCheatCodes } from '@aztec/aztec/testing';
 import type { EmpireSlashingProposerContract, RollupContract, TallySlashingProposerContract } from '@aztec/ethereum';
 import { timesAsync, unique } from '@aztec/foundation/collection';
+import { pluralize } from '@aztec/foundation/string';
 import type { TestDateProvider } from '@aztec/foundation/timer';
 import type { SpamContract } from '@aztec/noir-test-contracts.js/Spam';
 import { TestContract, TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
@@ -164,17 +165,20 @@ export async function awaitOffenseDetected({
   nodeAdmin,
   slashingRoundSize,
   epochDuration,
+  waitUntilOffenseCount,
 }: {
   nodeAdmin: AztecNodeAdmin;
   logger: Logger;
   slashingRoundSize: number;
   epochDuration: number;
+  waitUntilOffenseCount?: number;
 }) {
-  logger.info(`Waiting for an offense to be detected`);
+  const targetOffenseCount = waitUntilOffenseCount ?? 1;
+  logger.warn(`Waiting for ${pluralize('offense', targetOffenseCount)} to be detected`);
   const offenses = await retryUntil(
     async () => {
       const offenses = await nodeAdmin.getSlashOffenses('all');
-      if (offenses.length > 0) {
+      if (offenses.length >= targetOffenseCount) {
         return offenses;
       }
     },

package/src/fixtures/setup_p2p_test.ts

@@ -86,7 +86,7 @@ export async function createNodes(
   return nodes;
 }
 
-// creates a P2P enabled instance of Aztec Node Service
+/** Creates a P2P enabled instance of Aztec Node Service with a validator */
 export async function createNode(
   config: AztecNodeConfig,
   dateProvider: DateProvider,
@@ -106,6 +106,31 @@ export async function createNode(
   return loggerIdStorage ? await loggerIdStorage.run(tcpPort.toString(), createNode) : createNode();
 }
 
+/** Creates a P2P enabled instance of Aztec Node Service without a validator */
+export async function createNonValidatorNode(
+  baseConfig: AztecNodeConfig,
+  dateProvider: DateProvider,
+  tcpPort: number,
+  bootstrapNode: string | undefined,
+  prefilledPublicData?: PublicDataTreeLeaf[],
+  dataDirectory?: string,
+  metricsPort?: number,
+  loggerIdStorage?: AsyncLocalStorage<string>,
+) {
+  const createNode = async () => {
+    const p2pConfig = await createP2PConfig(baseConfig, bootstrapNode, tcpPort, dataDirectory);
+    const config: AztecNodeConfig = {
+      ...p2pConfig,
+      disableValidator: true,
+      validatorPrivateKeys: undefined,
+      publisherPrivateKeys: [],
+    };
+    const telemetry = getEndToEndTestTelemetryClient(metricsPort);
+    return await AztecNodeService.createAndSync(config, { telemetry, dateProvider }, { prefilledPublicData });
+  };
+  return loggerIdStorage ? await loggerIdStorage.run(tcpPort.toString(), createNode) : createNode();
+}
+
 export async function createProverNode(
   config: AztecNodeConfig,
   tcpPort: number,
@@ -121,14 +146,13 @@ export async function createProverNode(
     const proverNodePrivateKey = getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex)!;
     const telemetry = getEndToEndTestTelemetryClient(metricsPort);
 
-    const proverConfig: Partial<ProverNodeConfig> = {
-      p2pIp: `127.0.0.1`,
-      p2pPort: tcpPort ?? (await getPort()),
-      p2pEnabled: true,
-      peerCheckIntervalMS: TEST_PEER_CHECK_INTERVAL_MS,
-      blockCheckIntervalMS: 1000,
-      bootstrapNodes: bootstrapNode ? [bootstrapNode] : [],
-    };
+    const proverConfig: Partial<ProverNodeConfig> = await createP2PConfig(
+      config,
+      bootstrapNode,
+      tcpPort,
+      dataDirectory,
+    );
+
     const aztecNodeRpcTxProvider = undefined;
     return await createAndSyncProverNode(
       bufferToHex(proverNodePrivateKey),
@@ -142,20 +166,14 @@ export async function createProverNode(
   return loggerIdStorage ? await loggerIdStorage.run(tcpPort.toString(), createProverNode) : createProverNode();
 }
 
-export async function createValidatorConfig(
+export async function createP2PConfig(
   config: AztecNodeConfig,
   bootstrapNodeEnr?: string,
   port?: number,
-  addressIndex: number = 1,
   dataDirectory?: string,
 ) {
   port = port ?? (await getPort());
 
-  const attesterPrivateKey = bufferToHex(getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex)!);
-
-  config.validatorPrivateKeys = new SecretValue([attesterPrivateKey]);
-  config.publisherPrivateKeys = [new SecretValue(attesterPrivateKey)];
-
   const nodeConfig: AztecNodeConfig = {
     ...config,
     p2pIp: `127.0.0.1`,
@@ -169,3 +187,22 @@ export async function createValidatorConfig(
 
   return nodeConfig;
 }
+
+export async function createValidatorConfig(
+  config: AztecNodeConfig,
+  bootstrapNodeEnr?: string,
+  port?: number,
+  addressIndex: number = 1,
+  dataDirectory?: string,
+) {
+  const attesterPrivateKey = bufferToHex(getPrivateKeyFromIndex(ATTESTER_PRIVATE_KEYS_START_INDEX + addressIndex)!);
+  const p2pConfig = await createP2PConfig(config, bootstrapNodeEnr, port, dataDirectory);
+  const nodeConfig: AztecNodeConfig = {
+    ...config,
+    ...p2pConfig,
+    validatorPrivateKeys: new SecretValue([attesterPrivateKey]),
+    publisherPrivateKeys: [new SecretValue(attesterPrivateKey)],
+  };
+
+  return nodeConfig;
+}

package/src/fixtures/web3signer.ts

@@ -0,0 +1,46 @@
+import { sleep } from '@aztec/aztec.js';
+import { randomBytes } from '@aztec/foundation/crypto';
+
+import { mkdirSync } from 'node:fs';
+import { writeFile } from 'node:fs/promises';
+import { join } from 'node:path';
+
+export async function createWeb3SignerKeystore(dir: string, ...privateKeys: string[]) {
+  const yaml = privateKeys
+    .map(
+      pk => `\
+type: file-raw
+keyType: SECP256K1
+privateKey: ${pk}`,
+    )
+    .join('\n---\n');
+
+  // NOTE: nodejs stdlib can only create temp directories, not temp files!
+  // this write uses wx (write-exclusive) so it'll throw if the file already exists
+  const path = join(dir, `keystore-${randomBytes(4).toString('hex')}.yaml`);
+  await writeFile(path, yaml, { flag: 'wx' });
+}
+
+export async function refreshWeb3Signer(url: string) {
+  await fetch(new URL('reload', url), { method: 'POST' });
+  // give the service a chance to load up the new files
+  // 1s might not be enough if there are a lot of files to scan
+  await sleep(1000);
+}
+
+export function getWeb3SignerTestKeystoreDir(): string {
+  if (process.env.WEB3_SIGNER_TEST_KEYSTORE_DIR) {
+    mkdirSync(process.env.WEB3_SIGNER_TEST_KEYSTORE_DIR, { recursive: true });
+    return process.env.WEB3_SIGNER_TEST_KEYSTORE_DIR;
+  } else {
+    throw new Error('Web3signer not running');
+  }
+}
+
+export function getWeb3SignerUrl(): string {
+  if (process.env.WEB3_SIGNER_URL) {
+    return process.env.WEB3_SIGNER_URL;
+  } else {
+    throw new Error('Web3signer not running');
+  }
+}