@aztec/end-to-end 0.0.1-commit.8c0b8ff → 0.0.1-commit.8cb2d04d8

package/dest/spartan/utils/nodes.js

@@ -119,7 +119,7 @@ export async function withSequencersAdmin(env, fn) {
                 if (statusRes.status !== 200) {
                     throw new Error(`Admin endpoint returned status ${statusRes.status}`);
                 }
-                const client = createAztecNodeAdminClient(url);
+                const client = createAztecNodeAdminClient(url, {}, undefined, env.AZTEC_ADMIN_API_KEY);
                 return {
                     result: await fn(client),
                     process: process1
@@ -193,10 +193,9 @@ export async function initHADb(namespace) {
     ]), logger, true);
 }
 /**
- * Enables or disables probabilistic transaction dropping on validators and waits for rollout.
- * Wired to env vars P2P_DROP_TX and P2P_DROP_TX_CHANCE via Helm values.
- */ export async function setValidatorTxDrop({ namespace, enabled, probability, logger: log }) {
-    const drop = enabled ? 'true' : 'false';
+ * Sets probabilistic transaction dropping on validators and waits for rollout.
+ * Use probability=0 to disable. Wired to env var P2P_DROP_TX_CHANCE via Helm values.
+ */ export async function setValidatorTxDrop({ namespace, probability, logger: log }) {
     const prob = String(probability);
     const selectors = [
         'app.kubernetes.io/name=validator',
@@ -211,7 +210,7 @@ export async function initHADb(namespace) {
             if (names.length === 0) {
                 continue;
             }
-            const cmd = `kubectl set env statefulset -l ${selector} -n ${namespace} P2P_DROP_TX=${drop} P2P_DROP_TX_CHANCE=${prob}`;
+            const cmd = `kubectl set env statefulset -l ${selector} -n ${namespace} P2P_DROP_TX_CHANCE=${prob}`;
             log.info(`command: ${cmd}`);
             await execAsync(cmd);
             updated = true;
@@ -291,13 +290,14 @@ export async function enableValidatorDynamicBootNode(instanceName, namespace, sp
  *        Defaults to false, which preserves the existing storage.
  */ export async function rollAztecPods(namespace, clearState = false) {
     // Pod components use 'validator', but StatefulSets and PVCs use 'sequencer-node' for validators
+    // RPC nodes have nodeType='rpc-node' in Helm values, so their component label is 'rpc-node' (not 'rpc')
     const podComponents = [
         'p2p-bootstrap',
         'prover-node',
         'prover-broker',
         'prover-agent',
         'sequencer-node',
-        'rpc',
+        'rpc-node',
         'validator-ha-db'
     ];
     const pvcComponents = [
@@ -305,7 +305,7 @@ export async function enableValidatorDynamicBootNode(instanceName, namespace, sp
         'prover-node',
         'prover-broker',
         'sequencer-node',
-        'rpc',
+        'rpc-node',
         'validator-ha-db'
     ];
     // StatefulSet components that need to be scaled down before PVC deletion
@@ -315,7 +315,7 @@ export async function enableValidatorDynamicBootNode(instanceName, namespace, sp
         'prover-node',
         'prover-broker',
         'sequencer-node',
-        'rpc',
+        'rpc-node',
         'validator-ha-db'
     ];
     if (clearState) {

package/dest/spartan/utils/pod_logs.d.ts

@@ -0,0 +1,25 @@
+import type { Logger } from '@aztec/foundation/log';
+/** Parsed l2-block-built stats from a sequencer pod log line. */
+export type BlockBuiltLogEntry = {
+    blockNumber: number;
+    txCount: number;
+    duration: number;
+    publicProcessDuration: number;
+    manaPerSec: number;
+    privateLogCount: number;
+    publicLogCount: number;
+    contractClassLogCount: number;
+    contractClassLogSize: number;
+};
+/**
+ * Fetches l2-block-built log entries from sequencer pods for given block numbers.
+ * Queries all validator pods (only the proposer will have the log for a given block).
+ *
+ * @param namespace - Kubernetes namespace
+ * @param sinceTime - ISO 8601 timestamp to limit log search (e.g., from before block building was re-enabled)
+ * @param blockNumbers - Set of block numbers to filter for
+ * @param logger - Logger instance
+ * @returns Array of parsed BlockBuiltLogEntry, de-duplicated by blockNumber, sorted ascending
+ */
+export declare function fetchBlockBuiltLogs(namespace: string, sinceTime: string, blockNumbers: Set<number>, logger: Logger): Promise<BlockBuiltLogEntry[]>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicG9kX2xvZ3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zcGFydGFuL3V0aWxzL3BvZF9sb2dzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBU3BELGlFQUFpRTtBQUNqRSxNQUFNLE1BQU0sa0JBQWtCLEdBQUc7SUFDL0IsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUNwQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLFFBQVEsRUFBRSxNQUFNLENBQUM7SUFDakIscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLFVBQVUsRUFBRSxNQUFNLENBQUM7SUFDbkIsZUFBZSxFQUFFLE1BQU0sQ0FBQztJQUN4QixjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUM5QixvQkFBb0IsRUFBRSxNQUFNLENBQUM7Q0FDOUIsQ0FBQztBQWNGOzs7Ozs7Ozs7R0FTRztBQUNILHdCQUFzQixtQkFBbUIsQ0FDdkMsU0FBUyxFQUFFLE1BQU0sRUFDakIsU0FBUyxFQUFFLE1BQU0sRUFDakIsWUFBWSxFQUFFLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFDekIsTUFBTSxFQUFFLE1BQU0sR0FDYixPQUFPLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxDQWlEL0IifQ==

package/dest/spartan/utils/pod_logs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pod_logs.d.ts","sourceRoot":"","sources":["../../../src/spartan/utils/pod_logs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AASpD,iEAAiE;AACjE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CAAC;AAcF;;;;;;;;;GASG;AACH,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAiD/B"}

package/dest/spartan/utils/pod_logs.js

@@ -0,0 +1,74 @@
+import { exec } from 'child_process';
+import { promisify } from 'util';
+import { getSequencers } from './nodes.js';
+const execAsync = promisify(exec);
+const FIELDS = [
+    'blockNumber',
+    'txCount',
+    'duration',
+    'publicProcessDuration',
+    'manaPerSec',
+    'privateLogCount',
+    'publicLogCount',
+    'contractClassLogCount',
+    'contractClassLogSize'
+];
+/**
+ * Fetches l2-block-built log entries from sequencer pods for given block numbers.
+ * Queries all validator pods (only the proposer will have the log for a given block).
+ *
+ * @param namespace - Kubernetes namespace
+ * @param sinceTime - ISO 8601 timestamp to limit log search (e.g., from before block building was re-enabled)
+ * @param blockNumbers - Set of block numbers to filter for
+ * @param logger - Logger instance
+ * @returns Array of parsed BlockBuiltLogEntry, de-duplicated by blockNumber, sorted ascending
+ */ export async function fetchBlockBuiltLogs(namespace, sinceTime, blockNumbers, logger) {
+    const pods = await getSequencers(namespace);
+    const entriesByBlock = new Map();
+    // Subtract 60s from sinceTime to account for clock skew between test runner and k8s pods.
+    // Block number filtering ensures we only match the right blocks, so extra lines are harmless.
+    const sinceDate = new Date(new Date(sinceTime).getTime() - 60_000);
+    const sinceFlag = sinceDate.toISOString();
+    for (const pod of pods){
+        try {
+            const cmd = `kubectl logs ${pod} -n ${namespace} -c aztec --since-time=${sinceFlag}`;
+            logger.info(`Fetching logs: ${cmd}`);
+            const { stdout } = await execAsync(cmd, {
+                maxBuffer: 10 * 1024 * 1024
+            });
+            const lines = stdout.split('\n');
+            const matchingLines = lines.filter((l)=>l.includes('l2-block-built'));
+            logger.info(`Pod ${pod}: ${lines.length} log lines, ${matchingLines.length} contain l2-block-built`);
+            for (const line of matchingLines){
+                try {
+                    const parsed = JSON.parse(line);
+                    if (parsed.eventName !== 'l2-block-built' || !blockNumbers.has(parsed.blockNumber)) {
+                        continue;
+                    }
+                    if (entriesByBlock.has(parsed.blockNumber)) {
+                        continue;
+                    }
+                    const entry = {};
+                    for (const field of FIELDS){
+                        entry[field] = parsed[field] ?? 0;
+                    }
+                    entriesByBlock.set(entry.blockNumber, entry);
+                    logger.verbose(`Parsed l2-block-built log for block ${entry.blockNumber}`, entry);
+                } catch  {
+                // Not valid JSON, skip
+                }
+            }
+        } catch (err) {
+            logger.warn(`Failed to fetch logs from pod ${pod}: ${err}`);
+        }
+    }
+    if (entriesByBlock.size < blockNumbers.size) {
+        const missing = [
+            ...blockNumbers
+        ].filter((bn)=>!entriesByBlock.has(bn));
+        logger.warn(`Missing l2-block-built logs for block(s): ${missing.join(', ')}`);
+    }
+    return [
+        ...entriesByBlock.values()
+    ].sort((a, b)=>a.blockNumber - b.blockNumber);
+}

package/dest/test-wallet/worker_wallet_schema.d.ts

@@ -162,6 +162,7 @@ export declare const WorkerWalletSchema: {
                     feePerL2Gas: string | number | bigint;
                 } | undefined;
             }>>;
+            congestionEstimate: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNativeEnum<typeof import("@aztec/stdlib/gas").ManaUsageEstimate>>;
         }, "strip", z.ZodTypeAny, {
             gasSettings?: {
                 gasLimits?: import("@aztec/stdlib/gas").Gas | undefined;
@@ -175,6 +176,7 @@ export declare const WorkerWalletSchema: {
                     feePerL2Gas: bigint;
                 } | undefined;
             } | undefined;
+            congestionEstimate?: import("@aztec/stdlib/gas").ManaUsageEstimate | undefined;
         }, {
             gasSettings?: {
                 gasLimits?: {
@@ -194,6 +196,7 @@ export declare const WorkerWalletSchema: {
                     feePerL2Gas: string | number | bigint;
                 } | undefined;
             } | undefined;
+            congestionEstimate?: import("@aztec/stdlib/gas").ManaUsageEstimate | undefined;
         }>>;
         wait: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodUnion<[z.ZodLiteral<"NO_WAIT">, z.ZodObject<{
             ignoreDroppedReceiptsFor: import("@aztec/foundation/schemas").ZodNullableOptional<z.ZodNumber>;
@@ -229,6 +232,7 @@ export declare const WorkerWalletSchema: {
                     feePerL2Gas: bigint;
                 } | undefined;
             } | undefined;
+            congestionEstimate?: import("@aztec/stdlib/gas").ManaUsageEstimate | undefined;
         } | undefined;
         wait?: "NO_WAIT" | {
             ignoreDroppedReceiptsFor?: number | undefined;
@@ -260,6 +264,7 @@ export declare const WorkerWalletSchema: {
                     feePerL2Gas: string | number | bigint;
                 } | undefined;
             } | undefined;
+            congestionEstimate?: import("@aztec/stdlib/gas").ManaUsageEstimate | undefined;
         } | undefined;
         wait?: "NO_WAIT" | {
             ignoreDroppedReceiptsFor?: number | undefined;
@@ -271,4 +276,4 @@ export declare const WorkerWalletSchema: {
     }>], z.ZodUnknown>, import("@aztec/foundation/schemas").ZodFor<Tx>>;
     registerAccount: z.ZodFunction<z.ZodTuple<[z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>, z.ZodType<import("@aztec/foundation/schemas").Fr, any, string>], z.ZodUnknown>, import("@aztec/foundation/schemas").ZodFor<AztecAddress>>;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3dhbGxldF9zY2hlbWEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC93b3JrZXJfd2FsbGV0X3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXRDLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsaUdBQStGO0FBQy9GLGVBQU8sTUFBTSxrQkFBa0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0FJOUIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3dhbGxldF9zY2hlbWEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC93b3JrZXJfd2FsbGV0X3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDM0QsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXRDLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEIsaUdBQStGO0FBQy9GLGVBQU8sTUFBTSxrQkFBa0I7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQUk5QixDQUFDIn0=

package/dest/test-wallet/worker_wallet_schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker_wallet_schema.d.ts","sourceRoot":"","sources":["../../src/test-wallet/worker_wallet_schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,iGAA+F;AAC/F,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAI9B,CAAC"}
+{"version":3,"file":"worker_wallet_schema.d.ts","sourceRoot":"","sources":["../../src/test-wallet/worker_wallet_schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,iGAA+F;AAC/F,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAI9B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.0.1-commit.8c0b8ff",
+  "version": "0.0.1-commit.8cb2d04d8",
   "type": "module",
   "exports": "./dest/index.js",
   "inherits": [
@@ -12,12 +12,12 @@
     "build:dev": "../scripts/tsc.sh --watch",
     "clean": "rm -rf ./dest .tsbuildinfo",
     "test:with-alerts": "./scripts/test-with-alerts.sh",
-    "test:e2e": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit",
+    "test:e2e": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000",
     "test:e2e-docker": "./scripts/run_test.sh simple",
     "test:e2e-no-docker": "echo 'The command test:e2e-no-docker is now the same as test:e2e. You can now run this dropping the no-docker suffix.'; yarn test:e2e",
-    "test:profile": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 0x --output-dir \"flame_graph/{pid}.0x\" -- node --experimental-vm-modules ../node_modules/jest/bin/jest.js --runInBand --testTimeout=300000 --forceExit",
+    "test:profile": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 0x --output-dir \"flame_graph/{pid}.0x\" -- node --experimental-vm-modules ../node_modules/jest/bin/jest.js --runInBand --testTimeout=300000",
     "serve:flames": "python3 -m http.server --directory \"flame_graph\" 8000",
-    "test:debug": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --inspect --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000 --forceExit",
+    "test:debug": "LOG_LEVEL=${LOG_LEVEL:-verbose} NODE_NO_WARNINGS=1 node --inspect --experimental-vm-modules ../node_modules/.bin/jest --testTimeout=300000",
     "test:integration": "concurrently -k -s first -c reset,dim -n test,anvil \"yarn test:integration:run\" \"anvil\"",
     "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --no-cache --runInBand --config jest.integration.config.json",
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests src/fixtures",
@@ -26,45 +26,44 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.8c0b8ff",
-    "@aztec/archiver": "0.0.1-commit.8c0b8ff",
-    "@aztec/aztec": "0.0.1-commit.8c0b8ff",
-    "@aztec/aztec-node": "0.0.1-commit.8c0b8ff",
-    "@aztec/aztec.js": "0.0.1-commit.8c0b8ff",
-    "@aztec/bb-prover": "0.0.1-commit.8c0b8ff",
-    "@aztec/bb.js": "0.0.1-commit.8c0b8ff",
-    "@aztec/blob-client": "0.0.1-commit.8c0b8ff",
-    "@aztec/blob-lib": "0.0.1-commit.8c0b8ff",
-    "@aztec/bot": "0.0.1-commit.8c0b8ff",
-    "@aztec/cli": "0.0.1-commit.8c0b8ff",
-    "@aztec/constants": "0.0.1-commit.8c0b8ff",
-    "@aztec/entrypoints": "0.0.1-commit.8c0b8ff",
-    "@aztec/epoch-cache": "0.0.1-commit.8c0b8ff",
-    "@aztec/ethereum": "0.0.1-commit.8c0b8ff",
-    "@aztec/foundation": "0.0.1-commit.8c0b8ff",
-    "@aztec/kv-store": "0.0.1-commit.8c0b8ff",
-    "@aztec/l1-artifacts": "0.0.1-commit.8c0b8ff",
-    "@aztec/merkle-tree": "0.0.1-commit.8c0b8ff",
-    "@aztec/node-keystore": "0.0.1-commit.8c0b8ff",
-    "@aztec/noir-contracts.js": "0.0.1-commit.8c0b8ff",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.8c0b8ff",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.8c0b8ff",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.8c0b8ff",
-    "@aztec/p2p": "0.0.1-commit.8c0b8ff",
-    "@aztec/protocol-contracts": "0.0.1-commit.8c0b8ff",
-    "@aztec/prover-client": "0.0.1-commit.8c0b8ff",
-    "@aztec/prover-node": "0.0.1-commit.8c0b8ff",
-    "@aztec/pxe": "0.0.1-commit.8c0b8ff",
-    "@aztec/sequencer-client": "0.0.1-commit.8c0b8ff",
-    "@aztec/simulator": "0.0.1-commit.8c0b8ff",
-    "@aztec/slasher": "0.0.1-commit.8c0b8ff",
-    "@aztec/stdlib": "0.0.1-commit.8c0b8ff",
-    "@aztec/telemetry-client": "0.0.1-commit.8c0b8ff",
-    "@aztec/validator-client": "0.0.1-commit.8c0b8ff",
-    "@aztec/validator-ha-signer": "0.0.1-commit.8c0b8ff",
-    "@aztec/wallet-sdk": "0.0.1-commit.8c0b8ff",
-    "@aztec/wallets": "0.0.1-commit.8c0b8ff",
-    "@aztec/world-state": "0.0.1-commit.8c0b8ff",
+    "@aztec/accounts": "0.0.1-commit.8cb2d04d8",
+    "@aztec/archiver": "0.0.1-commit.8cb2d04d8",
+    "@aztec/aztec": "0.0.1-commit.8cb2d04d8",
+    "@aztec/aztec-node": "0.0.1-commit.8cb2d04d8",
+    "@aztec/aztec.js": "0.0.1-commit.8cb2d04d8",
+    "@aztec/bb-prover": "0.0.1-commit.8cb2d04d8",
+    "@aztec/bb.js": "0.0.1-commit.8cb2d04d8",
+    "@aztec/blob-client": "0.0.1-commit.8cb2d04d8",
+    "@aztec/blob-lib": "0.0.1-commit.8cb2d04d8",
+    "@aztec/bot": "0.0.1-commit.8cb2d04d8",
+    "@aztec/cli": "0.0.1-commit.8cb2d04d8",
+    "@aztec/constants": "0.0.1-commit.8cb2d04d8",
+    "@aztec/entrypoints": "0.0.1-commit.8cb2d04d8",
+    "@aztec/epoch-cache": "0.0.1-commit.8cb2d04d8",
+    "@aztec/ethereum": "0.0.1-commit.8cb2d04d8",
+    "@aztec/foundation": "0.0.1-commit.8cb2d04d8",
+    "@aztec/kv-store": "0.0.1-commit.8cb2d04d8",
+    "@aztec/l1-artifacts": "0.0.1-commit.8cb2d04d8",
+    "@aztec/node-keystore": "0.0.1-commit.8cb2d04d8",
+    "@aztec/noir-contracts.js": "0.0.1-commit.8cb2d04d8",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.8cb2d04d8",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.8cb2d04d8",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.8cb2d04d8",
+    "@aztec/p2p": "0.0.1-commit.8cb2d04d8",
+    "@aztec/protocol-contracts": "0.0.1-commit.8cb2d04d8",
+    "@aztec/prover-client": "0.0.1-commit.8cb2d04d8",
+    "@aztec/prover-node": "0.0.1-commit.8cb2d04d8",
+    "@aztec/pxe": "0.0.1-commit.8cb2d04d8",
+    "@aztec/sequencer-client": "0.0.1-commit.8cb2d04d8",
+    "@aztec/simulator": "0.0.1-commit.8cb2d04d8",
+    "@aztec/slasher": "0.0.1-commit.8cb2d04d8",
+    "@aztec/stdlib": "0.0.1-commit.8cb2d04d8",
+    "@aztec/telemetry-client": "0.0.1-commit.8cb2d04d8",
+    "@aztec/validator-client": "0.0.1-commit.8cb2d04d8",
+    "@aztec/validator-ha-signer": "0.0.1-commit.8cb2d04d8",
+    "@aztec/wallet-sdk": "0.0.1-commit.8cb2d04d8",
+    "@aztec/wallets": "0.0.1-commit.8cb2d04d8",
+    "@aztec/world-state": "0.0.1-commit.8cb2d04d8",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",
@@ -76,7 +75,6 @@
     "@types/koa-static": "^4.0.2",
     "@types/lodash.every": "^4.6.7",
     "@types/node": "^22.15.17",
-    "@viem/anvil": "^0.0.9",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.1",
     "fs-extra": "^11.2.0",

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -152,6 +152,7 @@ export class ClientFlowsBenchmark {
 
   async teardown() {
     await this.chainMonitor.stop();
+    await this.userWallet?.stop();
     await teardown(this.context);
   }
 
@@ -249,11 +250,14 @@ export class ClientFlowsBenchmark {
 
   async applyDeployBananaToken() {
     this.logger.info('Applying banana token deployment');
-    const {
-      receipt: { contract: bananaCoin, instance: bananaCoinInstance },
-    } = await BananaCoin.deploy(this.adminWallet, this.adminAddress, 'BC', 'BC', 18n).send({
+    const { contract: bananaCoin, instance: bananaCoinInstance } = await BananaCoin.deploy(
+      this.adminWallet,
+      this.adminAddress,
+      'BC',
+      'BC',
+      18n,
+    ).send({
       from: this.adminAddress,
-      wait: { returnReceipt: true },
     });
     this.logger.info(`BananaCoin deployed at ${bananaCoin.address}`);
     this.bananaCoin = bananaCoin;
@@ -262,11 +266,14 @@ export class ClientFlowsBenchmark {
 
   async applyDeployCandyBarToken() {
     this.logger.info('Applying candy bar token deployment');
-    const {
-      receipt: { contract: candyBarCoin, instance: candyBarCoinInstance },
-    } = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'CBC', 'CBC', 18n).send({
+    const { contract: candyBarCoin, instance: candyBarCoinInstance } = await TokenContract.deploy(
+      this.adminWallet,
+      this.adminAddress,
+      'CBC',
+      'CBC',
+      18n,
+    ).send({
       from: this.adminAddress,
-      wait: { returnReceipt: true },
     });
     this.logger.info(`CandyBarCoin deployed at ${candyBarCoin.address}`);
     this.candyBarCoin = candyBarCoin;
@@ -279,11 +286,12 @@ export class ClientFlowsBenchmark {
     expect((await this.context.wallet.getContractMetadata(feeJuiceContract.address)).isContractPublished).toBe(true);
 
     const bananaCoin = this.bananaCoin;
-    const {
-      receipt: { contract: bananaFPC, instance: bananaFPCInstance },
-    } = await FPCContract.deploy(this.adminWallet, bananaCoin.address, this.adminAddress).send({
+    const { contract: bananaFPC, instance: bananaFPCInstance } = await FPCContract.deploy(
+      this.adminWallet,
+      bananaCoin.address,
+      this.adminAddress,
+    ).send({
       from: this.adminAddress,
-      wait: { returnReceipt: true },
     });
 
     this.logger.info(`BananaPay deployed at ${bananaFPC.address}`);
@@ -347,20 +355,21 @@ export class ClientFlowsBenchmark {
 
   public async applyDeployAmm() {
     this.logger.info('Applying AMM deployment');
-    const {
-      receipt: { contract: liquidityToken, instance: liquidityTokenInstance },
-    } = await TokenContract.deploy(this.adminWallet, this.adminAddress, 'LPT', 'LPT', 18n).send({
+    const { contract: liquidityToken, instance: liquidityTokenInstance } = await TokenContract.deploy(
+      this.adminWallet,
+      this.adminAddress,
+      'LPT',
+      'LPT',
+      18n,
+    ).send({
       from: this.adminAddress,
-      wait: { returnReceipt: true },
     });
-    const {
-      receipt: { contract: amm, instance: ammInstance },
-    } = await AMMContract.deploy(
+    const { contract: amm, instance: ammInstance } = await AMMContract.deploy(
       this.adminWallet,
       this.bananaCoin.address,
       this.candyBarCoin.address,
       liquidityToken.address,
-    ).send({ from: this.adminAddress, wait: { returnReceipt: true } });
+    ).send({ from: this.adminAddress });
     this.logger.info(`AMM deployed at ${amm.address}`);
     await liquidityToken.methods.set_minter(amm.address, true).send({ from: this.adminAddress });
     this.liquidityToken = liquidityToken;

package/src/e2e_epochs/epochs_test.ts

@@ -145,7 +145,7 @@ export class EpochsTestContext {
         proverId: EthAddress.fromNumber(1),
         worldStateCheckpointHistory: WORLD_STATE_CHECKPOINT_HISTORY,
         exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
-        slasherFlavor: 'none',
+        slasherEnabled: false,
         l1PublishingTime,
         ...opts,
       },
@@ -223,7 +223,7 @@ export class EpochsTestContext {
           },
         },
         {
-          prefilledPublicData: this.context.prefilledPublicData ?? [],
+          genesis: this.context.genesis,
           dontStart: opts.dontStart,
         },
       ),
@@ -278,7 +278,7 @@ export class EpochsTestContext {
           slashingProtectionDb: opts.slashingProtectionDb,
         },
         {
-          prefilledPublicData: this.context.prefilledPublicData,
+          genesis: this.context.genesis,
           ...opts,
         },
       ),

package/src/e2e_p2p/inactivity_slash_test.ts

@@ -67,7 +67,6 @@ export class P2PInactivityTest {
         listenAddress: '127.0.0.1',
         minTxsPerBlock: 0,
         aztecEpochDuration: EPOCH_DURATION,
-        validatorReexecute: false,
         sentinelEnabled: true,
         slashingQuorum: SLASHING_QUORUM,
         slashingRoundSizeInEpochs: SLASHING_ROUND_SIZE_IN_EPOCHS,
@@ -109,7 +108,7 @@ export class P2PInactivityTest {
       this.test.bootstrapNodeEnr,
       NUM_NODES - this.inactiveNodeCount - Number(this.keepInitialNode),
       BOOT_NODE_UDP_PORT,
-      this.test.prefilledPublicData,
+      this.test.genesis,
       this.dataDir,
       undefined,
       Number(this.keepInitialNode),
@@ -123,7 +122,7 @@ export class P2PInactivityTest {
       this.test.bootstrapNodeEnr,
       this.inactiveNodeCount,
       BOOT_NODE_UDP_PORT,
-      this.test.prefilledPublicData,
+      this.test.genesis,
       this.dataDir,
       undefined,
       NUM_NODES - this.inactiveNodeCount,

package/src/e2e_p2p/p2p_network.ts

@@ -3,12 +3,7 @@ import type { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
 import { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
 import { Fr } from '@aztec/aztec.js/fields';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
-import {
-  type EmpireSlashingProposerContract,
-  GSEContract,
-  RollupContract,
-  type TallySlashingProposerContract,
-} from '@aztec/ethereum/contracts';
+import { GSEContract, RollupContract, type SlashingProposerContract } from '@aztec/ethereum/contracts';
 import type { Operator } from '@aztec/ethereum/deploy-aztec-l1-contracts';
 import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import { MultiAdderArtifact } from '@aztec/ethereum/l1-artifacts';
@@ -24,9 +19,9 @@ 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 { TopicType } from '@aztec/stdlib/p2p';
-import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
+import { TxStatus } from '@aztec/stdlib/tx';
+import type { GenesisData } from '@aztec/stdlib/world-state';
 import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
@@ -59,7 +54,7 @@ export const WAIT_FOR_TX_TIMEOUT = l1ContractsConfig.aztecSlotDuration * 3;
 export const SHORTENED_BLOCK_TIME_CONFIG_NO_PRUNES = {
   aztecSlotDuration: 12,
   ethereumSlotDuration: 4,
-  aztecProofSubmissionWindow: 640,
+  aztecProofSubmissionEpochs: 640,
 };
 
 export class P2PNetworkTest {
@@ -77,7 +72,7 @@ export class P2PNetworkTest {
   public validators: Operator[] = [];
 
   public deployedAccounts: InitialAccountData[] = [];
-  public prefilledPublicData: PublicDataTreeLeaf[] = [];
+  public genesis: GenesisData | undefined;
 
   // The re-execution test needs a wallet and a spam contract
   public wallet?: TestWallet;
@@ -124,7 +119,7 @@ export class P2PNetworkTest {
         initialValidatorConfig.aztecProofSubmissionEpochs ?? l1ContractsConfig.aztecProofSubmissionEpochs,
       slashingRoundSizeInEpochs:
         initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
-      slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
+      slasherEnabled: initialValidatorConfig.slasherEnabled ?? true,
       aztecTargetCommitteeSize: numberOfValidators,
       metricsPort: metricsPort,
       numberOfInitialFundedAccounts: 2,
@@ -137,7 +132,7 @@ export class P2PNetworkTest {
       aztecEpochDuration: initialValidatorConfig.aztecEpochDuration ?? l1ContractsConfig.aztecEpochDuration,
       slashingRoundSizeInEpochs:
         initialValidatorConfig.slashingRoundSizeInEpochs ?? l1ContractsConfig.slashingRoundSizeInEpochs,
-      slasherFlavor: initialValidatorConfig.slasherFlavor ?? 'tally',
+      slasherEnabled: initialValidatorConfig.slasherEnabled ?? true,
 
       ethereumSlotDuration: initialValidatorConfig.ethereumSlotDuration ?? l1ContractsConfig.ethereumSlotDuration,
       aztecSlotDuration: initialValidatorConfig.aztecSlotDuration ?? l1ContractsConfig.aztecSlotDuration,
@@ -305,10 +300,11 @@ export class P2PNetworkTest {
 
   async setupAccount() {
     this.logger.info('Setting up account');
-    const { deployedAccounts } = await deployAccounts(
-      1,
-      this.logger,
-    )({
+    const { deployedAccounts } = await deployAccounts(1, this.logger, {
+      wait: {
+        waitForStatus: TxStatus.CHECKPOINTED,
+      },
+    })({
       wallet: this.context.wallet,
       initialFundedAccounts: this.context.initialFundedAccounts,
     });
@@ -360,7 +356,7 @@ export class P2PNetworkTest {
         ...this.setupOptions,
         fundSponsoredFPC: true,
         skipAccountDeployment: true,
-        slasherFlavor: this.setupOptions.slasherFlavor ?? this.deployL1ContractsArgs.slasherFlavor ?? 'none',
+        slasherEnabled: this.setupOptions.slasherEnabled ?? this.deployL1ContractsArgs.slasherEnabled ?? false,
         aztecTargetCommitteeSize: 0,
         l1ContractsArgs: this.deployL1ContractsArgs,
       },
@@ -372,8 +368,13 @@ export class P2PNetworkTest {
     const sponsoredFPCAddress = await getSponsoredFPCAddress();
     const initialFundedAccounts = [...this.context.initialFundedAccounts.map(a => a.address), sponsoredFPCAddress];
 
-    const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
-    this.prefilledPublicData = prefilledPublicData;
+    const { genesis } = await getGenesisValues(
+      initialFundedAccounts,
+      undefined,
+      undefined,
+      this.context.genesis!.genesisTimestamp,
+    );
+    this.genesis = genesis;
 
     const rollupContract = RollupContract.getFromL1ContractsValues(this.context.deployL1ContractsValues);
     this.monitor = new ChainMonitor(rollupContract, this.context.dateProvider).start();
@@ -468,8 +469,7 @@ export class P2PNetworkTest {
   async getContracts(): Promise<{
     rollup: RollupContract;
     slasherContract: GetContractReturnType<typeof SlasherAbi, ViemClient>;
-    slashingProposer: EmpireSlashingProposerContract | TallySlashingProposerContract | undefined;
-    slashFactory: SlashFactoryContract;
+    slashingProposer: SlashingProposerContract | undefined;
   }> {
     if (!this.ctx.deployL1ContractsValues) {
       throw new Error('DeployAztecL1ContractsValues not set');
@@ -486,14 +486,9 @@ export class P2PNetworkTest {
       client: this.ctx.deployL1ContractsValues.l1Client,
     });
 
-    // Get the actual slashing proposer from rollup (which handles both empire and tally)
+    // Get the actual slashing proposer from rollup
     const slashingProposer = await rollup.getSlashingProposer();
 
-    const slashFactory = new SlashFactoryContract(
-      this.ctx.deployL1ContractsValues.l1Client,
-      getAddress(this.ctx.deployL1ContractsValues.l1ContractAddresses.slashFactoryAddress!.toString()),
-    );
-
-    return { rollup, slasherContract, slashingProposer, slashFactory };
+    return { rollup, slasherContract, slashingProposer };
   }
 }