@aztec/end-to-end 5.0.0-rc.1 → 5.0.0-rc.2

package/dest/shared/timing_env.js

@@ -0,0 +1,254 @@
+import { appendFileSync, writeFileSync } from 'node:fs';
+import { basename } from 'node:path';
+import CustomEnvironment from '../../../foundation/src/jest/env.mjs';
+// Per-test e2e timing environment. Gated entirely on the TEST_TIMING_FILE env var: when unset, this
+// behaves exactly like the base CustomEnvironment (it only delegates). When set, it records, per test
+// worker process, the time spent in jest before/after hooks and the test body, and merges in the
+// function-level time captured by setup.ts/teardown.ts via a collector shared on `this.global`.
+//
+// Output is one JSONL file per worker process (the env runs once per worker). Each line carries a
+// `type` discriminator and is one of:
+//   - `type: 'test'` (`name` set): beforeEach hooks, the it() body, afterEach hooks for one test; or
+//   - `type: 'suite'` (`name: null`): the suite-scoped beforeAll/afterAll hooks for the whole file.
+export default class TimingEnvironment extends CustomEnvironment {
+    constructor(config, context){
+        super(config, context);
+        this.timingFile = process.env.TEST_TIMING_FILE;
+        if (!this.timingFile) {
+            return;
+        }
+        this.suite = basename(context?.testPath ?? config?.testPath ?? 'unknown').replace(/\.test\.[cm]?[jt]s$/, '');
+        this.meta = {
+            commit: process.env.COMMIT_HASH ?? null,
+            branch: process.env.TARGET_BRANCH ?? process.env.REF_NAME ?? null,
+            runId: process.env.RUN_ID ?? null
+        };
+        // Shared collector. setup.ts (running in the sandbox realm) reads `globalThis.__e2eTimings`; this
+        // env (host realm) reads `this.global.__e2eTimings` — they are the same object. `current` is the
+        // full name of the test currently running (null during beforeAll/afterAll), used to tag fn spans.
+        this.collector = {
+            current: null,
+            fnSpans: []
+        };
+        this.global.__e2eTimings = this.collector;
+        // Records to flush as JSONL on teardown. One per test plus one suite-scoped record.
+        this.records = [];
+        this.recordsByName = new Map();
+        // The suite-scoped record (beforeAll/afterAll); bodyMs/totalMs are computed at flush time.
+        this.suiteRecord = {
+            name: null,
+            status: 'passed',
+            beforeHooksMs: 0,
+            afterHooksMs: 0
+        };
+        // Start times keyed by hook type (beforeAll/beforeEach/afterAll/afterEach).
+        this.hookStarts = {};
+        this.testStarts = new Map();
+        // Guards against double-flushing (we flush on both the teardown event and the teardown method).
+        this.flushed = false;
+    }
+    // Flush on the teardown method too: the jest lifecycle always calls this, whereas the 'teardown'
+    // event is not reliably delivered when a test run is interrupted. Whichever fires first wins.
+    async teardown() {
+        this.finalizeAndFlush();
+        await super.teardown();
+    }
+    async handleTestEvent(event, state) {
+        // Run the base env first so its unhandledRejection patching for after-hooks stays intact.
+        await super.handleTestEvent(event, state);
+        if (!this.timingFile) {
+            return;
+        }
+        const now = Date.now();
+        switch(event.name){
+            case 'hook_start':
+                {
+                    this.hookStarts[event.hook.type] = now;
+                    break;
+                }
+            case 'hook_success':
+            case 'hook_failure':
+                {
+                    const start = this.hookStarts[event.hook.type];
+                    if (start === undefined) {
+                        break;
+                    }
+                    delete this.hookStarts[event.hook.type];
+                    const ms = now - start;
+                    if (event.hook.type === 'beforeEach') {
+                        this.addToCurrent('beforeHooksMs', ms);
+                    } else if (event.hook.type === 'afterEach') {
+                        this.addToCurrent('afterHooksMs', ms);
+                    } else if (event.hook.type === 'beforeAll') {
+                        this.suiteRecord.beforeHooksMs += ms;
+                    } else if (event.hook.type === 'afterAll') {
+                        this.suiteRecord.afterHooksMs += ms;
+                    }
+                    break;
+                }
+            case 'test_start':
+                {
+                    const name = this.fullTestName(event.test);
+                    const record = {
+                        type: 'test',
+                        name,
+                        status: 'passed',
+                        setupFnMs: 0,
+                        beforeHooksMs: 0,
+                        bodyMs: 0,
+                        teardownFnMs: 0,
+                        afterHooksMs: 0,
+                        totalMs: 0,
+                        startedAt: new Date(now).toISOString()
+                    };
+                    this.records.push(record);
+                    this.recordsByName.set(name, record);
+                    this.testStarts.set(name, now);
+                    this.collector.current = name;
+                    break;
+                }
+            case 'test_fn_start':
+                {
+                    this.testStarts.set(`fn:${this.fullTestName(event.test)}`, now);
+                    break;
+                }
+            case 'test_fn_success':
+            case 'test_fn_failure':
+                {
+                    const name = this.fullTestName(event.test);
+                    const start = this.testStarts.get(`fn:${name}`);
+                    const record = this.recordsByName.get(name);
+                    if (record && start !== undefined) {
+                        record.bodyMs = now - start;
+                    }
+                    if (record && event.name === 'test_fn_failure') {
+                        record.status = 'failed';
+                    }
+                    break;
+                }
+            case 'test_done':
+                {
+                    const name = this.fullTestName(event.test);
+                    const record = this.recordsByName.get(name);
+                    const start = this.testStarts.get(name);
+                    if (record && start !== undefined) {
+                        record.totalMs = now - start;
+                    }
+                    if (record && event.test?.errors?.length) {
+                        record.status = 'failed';
+                    }
+                    this.mergeFnSpans(name, record);
+                    this.collector.current = null;
+                    break;
+                }
+            case 'teardown':
+                {
+                    this.finalizeAndFlush();
+                    break;
+                }
+            default:
+                break;
+        }
+    }
+    /** The record for the test currently running, if any. */ currentRecord() {
+        return this.collector.current ? this.recordsByName.get(this.collector.current) : undefined;
+    }
+    /** Adds `ms` to a hook bucket on the current per-test record, or the suite record during beforeAll/afterAll. */ addToCurrent(field, ms) {
+        const record = this.currentRecord();
+        if (record) {
+            record[field] += ms;
+        }
+    }
+    /** Builds the full test name by walking up the describe blocks, matching jest's currentTestName. */ fullTestName(test) {
+        if (!test) {
+            return null;
+        }
+        const parts = [];
+        let node = test;
+        while(node && node.name && node.name !== 'ROOT_DESCRIBE_BLOCK'){
+            parts.unshift(node.name);
+            node = node.parent;
+        }
+        return parts.join(' ');
+    }
+    /** Moves fn spans tagged with `name` into the matching record's setup/teardown buckets. */ mergeFnSpans(name, record) {
+        if (!record) {
+            return;
+        }
+        const remaining = [];
+        for (const span of this.collector.fnSpans){
+            if (span.name === name) {
+                if (span.kind === 'setup') {
+                    record.setupFnMs += span.ms;
+                } else if (span.kind === 'teardown') {
+                    record.teardownFnMs += span.ms;
+                }
+            } else {
+                remaining.push(span);
+            }
+        }
+        this.collector.fnSpans = remaining;
+    }
+    /** Finalizes the suite-scoped record (untagged fn spans + beforeAll/afterAll) and writes all JSONL. */ finalizeAndFlush() {
+        if (this.flushed || !this.timingFile) {
+            return;
+        }
+        this.flushed = true;
+        const suite = {
+            setupFnMs: 0,
+            beforeHooksMs: this.suiteRecord.beforeHooksMs,
+            teardownFnMs: 0,
+            afterHooksMs: this.suiteRecord.afterHooksMs
+        };
+        for (const span of this.collector.fnSpans){
+            if (span.name === null || span.name === undefined) {
+                if (span.kind === 'setup') {
+                    suite.setupFnMs += span.ms;
+                } else if (span.kind === 'teardown') {
+                    suite.teardownFnMs += span.ms;
+                }
+            }
+        }
+        this.collector.fnSpans = [];
+        const lines = [];
+        for (const record of this.records){
+            lines.push(this.toLine({
+                ...record
+            }));
+        }
+        lines.push(this.toLine({
+            type: 'suite',
+            name: null,
+            status: 'passed',
+            setupFnMs: suite.setupFnMs,
+            beforeHooksMs: suite.beforeHooksMs,
+            teardownFnMs: suite.teardownFnMs,
+            afterHooksMs: suite.afterHooksMs,
+            totalMs: suite.beforeHooksMs + suite.afterHooksMs
+        }));
+        const payload = lines.join('\n') + '\n';
+        try {
+            // One file per worker process, but a worker may run several suites: append so we keep them all.
+            appendFileSync(this.timingFile, payload);
+        } catch  {
+            try {
+                writeFileSync(this.timingFile, payload);
+            } catch  {
+            // Timing is best-effort; never fail a test because we couldn't write the file.
+            }
+        }
+    }
+    /** Flattens metadata onto a record and serializes to a single JSON line. */ toLine(record) {
+        const obj = {
+            suite: this.suite,
+            ...record,
+            ...this.meta
+        };
+        for (const key of Object.keys(obj)){
+            if (key.endsWith('Ms') && typeof obj[key] === 'number') {
+                obj[key] = Math.round(obj[key]);
+            }
+        }
+        return JSON.stringify(obj);
+    }
+}

package/dest/simulators/lending_simulator.js

@@ -172,7 +172,7 @@ const computeMultiplier = (rate, dt)=>{
         expect(asset['last_updated_ts']).toEqual(BigInt(this.time));
         for (const key of [
             this.account.address,
-            AztecAddress.fromField(await this.account.key())
+            AztecAddress.fromFieldUnsafe(await this.account.key())
         ]){
             const { result: privatePos } = await this.lendingContract.methods.get_position(key).simulate({
                 from: this.account.address

package/dest/spartan/setup_test_wallets.d.ts

@@ -42,4 +42,4 @@ export type WorkerWalletWrapper = {
     cleanup: () => Promise<void>;
 };
 export declare function createWorkerWalletClient(nodeUrl: string, proverEnabled: boolean, logger: Logger): Promise<WorkerWalletWrapper>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfdGVzdF93YWxsZXRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3BhcnRhbi9zZXR1cF90ZXN0X3dhbGxldHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSXpELE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUE2QixNQUFNLHFCQUFxQixDQUFDO0FBR3ZGLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBb0MsTUFBTSxzQkFBc0IsQ0FBQztBQUl4RixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFTL0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUvRCxNQUFNLFdBQVcsWUFBWTtJQUMzQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLE1BQU0sRUFBRSxVQUFVLENBQUM7SUFDbkIsUUFBUSxFQUFFLFlBQVksRUFBRSxDQUFDO0lBQ3pCLGFBQWEsRUFBRSxhQUFhLENBQUM7SUFDN0IsaUJBQWlCLEVBQUUsWUFBWSxDQUFDO0lBQ2hDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsZ0JBQWdCLEVBQUUsWUFBWSxDQUFDO0lBQy9CLFlBQVksRUFBRSxZQUFZLENBQUM7Q0FDNUI7QUFFRCxNQUFNLE1BQU0seUJBQXlCLEdBQUcsSUFBSSxDQUMxQyxZQUFZLEVBQ1osY0FBYyxHQUFHLGVBQWUsR0FBRyxXQUFXLEdBQUcsbUJBQW1CLENBQ3JFLENBQUM7QUFNRix3QkFBc0IsMkJBQTJCLENBQy9DLE9BQU8sRUFBRSxNQUFNLEVBQ2YsVUFBVSxFQUFFLE1BQU0sRUFDbEIsTUFBTSxFQUFFLE1BQU0sR0FDYixPQUFPLENBQUMsWUFBWSxDQUFDLENBeUJ2QjtBQUVELHdCQUFzQixxQ0FBcUMsQ0FDekQsTUFBTSxFQUFFLFVBQVUsRUFDbEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsVUFBVSxFQUFFLE1BQU0sRUFDbEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxxQkFBcUIsU0FBSSxHQUN4QixPQUFPLENBQUMsWUFBWSxDQUFDLENBK0N2QjtBQThGRCx3QkFBc0IsMkJBQTJCLENBQy9DLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QscUJBQXFCLFNBQUksRUFDekIsSUFBSSxDQUFDLEVBQUU7SUFBRSxXQUFXLENBQUMsRUFBRSxPQUFPLENBQUE7Q0FBRSxHQUMvQixPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FpQ3BDO0FBRUQsd0JBQXNCLDRCQUE0QixDQUNoRCxPQUFPLEVBQUUsTUFBTSxFQUNmLFNBQVMsRUFBRSxNQUFNLEVBQUUsRUFDbkIsb0JBQW9CLEVBQUUsTUFBTSxFQUM1QixVQUFVLEVBQUUsTUFBTSxFQUNsQixNQUFNLEVBQUUsTUFBTSxFQUNkLHFCQUFxQixTQUFJLEdBQ3hCLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0ErQ3ZCO0FBK0VELHdCQUFzQixnQkFBZ0IsQ0FBQyxFQUNyQyxNQUFNLEVBQ04sWUFBWSxFQUNaLE1BQU0sRUFDTixjQUFjLEVBQ2QsTUFBTSxFQUNOLGdCQUFnQixFQUNqQixFQUFFO0lBQ0QsTUFBTSxFQUFFLFVBQVUsQ0FBQztJQUNuQixZQUFZLEVBQUUsWUFBWSxDQUFDO0lBQzNCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixnQkFBZ0IsQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0NBQ3JDLGlCQXFCQTtBQUVELE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsTUFBTSxFQUFFLFVBQVUsQ0FBQztJQUNuQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLE9BQU8sRUFBRSxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztDQUM5QixDQUFDO0FBRUYsd0JBQXNCLDhCQUE4QixDQUNsRCxPQUFPLEVBQUUsTUFBTSxFQUNmLGFBQWEsRUFBRSxPQUFPLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEdBQ2IsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQXFCeEI7QUFFRCxNQUFNLE1BQU0sbUJBQW1CLEdBQUc7SUFDaEMsTUFBTSxFQUFFLFlBQVksQ0FBQztJQUNyQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLE9BQU8sRUFBRSxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztDQUM5QixDQUFDO0FBRUYsd0JBQXNCLHdCQUF3QixDQUM1QyxPQUFPLEVBQUUsTUFBTSxFQUNmLGFBQWEsRUFBRSxPQUFPLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEdBQ2IsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBMkI5QiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfdGVzdF93YWxsZXRzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3BhcnRhbi9zZXR1cF90ZXN0X3dhbGxldHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSXpELE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUE2QixNQUFNLHFCQUFxQixDQUFDO0FBR3ZGLE9BQU8sRUFBRSxLQUFLLFNBQVMsRUFBb0MsTUFBTSxzQkFBc0IsQ0FBQztBQUl4RixPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFVL0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUUvRCxNQUFNLFdBQVcsWUFBWTtJQUMzQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLE1BQU0sRUFBRSxVQUFVLENBQUM7SUFDbkIsUUFBUSxFQUFFLFlBQVksRUFBRSxDQUFDO0lBQ3pCLGFBQWEsRUFBRSxhQUFhLENBQUM7SUFDN0IsaUJBQWlCLEVBQUUsWUFBWSxDQUFDO0lBQ2hDLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsZ0JBQWdCLEVBQUUsWUFBWSxDQUFDO0lBQy9CLFlBQVksRUFBRSxZQUFZLENBQUM7Q0FDNUI7QUFFRCxNQUFNLE1BQU0seUJBQXlCLEdBQUcsSUFBSSxDQUMxQyxZQUFZLEVBQ1osY0FBYyxHQUFHLGVBQWUsR0FBRyxXQUFXLEdBQUcsbUJBQW1CLENBQ3JFLENBQUM7QUFNRix3QkFBc0IsMkJBQTJCLENBQy9DLE9BQU8sRUFBRSxNQUFNLEVBQ2YsVUFBVSxFQUFFLE1BQU0sRUFDbEIsTUFBTSxFQUFFLE1BQU0sR0FDYixPQUFPLENBQUMsWUFBWSxDQUFDLENBeUJ2QjtBQUVELHdCQUFzQixxQ0FBcUMsQ0FDekQsTUFBTSxFQUFFLFVBQVUsRUFDbEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsVUFBVSxFQUFFLE1BQU0sRUFDbEIsTUFBTSxFQUFFLE1BQU0sRUFDZCxxQkFBcUIsU0FBSSxHQUN4QixPQUFPLENBQUMsWUFBWSxDQUFDLENBK0N2QjtBQThGRCx3QkFBc0IsMkJBQTJCLENBQy9DLE1BQU0sRUFBRSxVQUFVLEVBQ2xCLFNBQVMsRUFBRSxTQUFTLEVBQ3BCLE1BQU0sRUFBRSxNQUFNLEVBQ2QscUJBQXFCLFNBQUksRUFDekIsSUFBSSxDQUFDLEVBQUU7SUFBRSxXQUFXLENBQUMsRUFBRSxPQUFPLENBQUE7Q0FBRSxHQUMvQixPQUFPLENBQUMseUJBQXlCLENBQUMsQ0FpQ3BDO0FBRUQsd0JBQXNCLDRCQUE0QixDQUNoRCxPQUFPLEVBQUUsTUFBTSxFQUNmLFNBQVMsRUFBRSxNQUFNLEVBQUUsRUFDbkIsb0JBQW9CLEVBQUUsTUFBTSxFQUM1QixVQUFVLEVBQUUsTUFBTSxFQUNsQixNQUFNLEVBQUUsTUFBTSxFQUNkLHFCQUFxQixTQUFJLEdBQ3hCLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0ErQ3ZCO0FBK0VELHdCQUFzQixnQkFBZ0IsQ0FBQyxFQUNyQyxNQUFNLEVBQ04sWUFBWSxFQUNaLE1BQU0sRUFDTixjQUFjLEVBQ2QsTUFBTSxFQUNOLGdCQUFnQixFQUNqQixFQUFFO0lBQ0QsTUFBTSxFQUFFLFVBQVUsQ0FBQztJQUNuQixZQUFZLEVBQUUsWUFBWSxDQUFDO0lBQzNCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLE1BQU0sRUFBRSxNQUFNLENBQUM7SUFDZixnQkFBZ0IsQ0FBQyxFQUFFLGdCQUFnQixDQUFDO0NBQ3JDLGlCQXVCQTtBQUVELE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsTUFBTSxFQUFFLFVBQVUsQ0FBQztJQUNuQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLE9BQU8sRUFBRSxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztDQUM5QixDQUFDO0FBRUYsd0JBQXNCLDhCQUE4QixDQUNsRCxPQUFPLEVBQUUsTUFBTSxFQUNmLGFBQWEsRUFBRSxPQUFPLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEdBQ2IsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQXFCeEI7QUFFRCxNQUFNLE1BQU0sbUJBQW1CLEdBQUc7SUFDaEMsTUFBTSxFQUFFLFlBQVksQ0FBQztJQUNyQixTQUFTLEVBQUUsU0FBUyxDQUFDO0lBQ3JCLE9BQU8sRUFBRSxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztDQUM5QixDQUFDO0FBRUYsd0JBQXNCLHdCQUF3QixDQUM1QyxPQUFPLEVBQUUsTUFBTSxFQUNmLGFBQWEsRUFBRSxPQUFPLEVBQ3RCLE1BQU0sRUFBRSxNQUFNLEdBQ2IsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBMkI5QiJ9

package/dest/spartan/setup_test_wallets.d.ts.map

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

package/dest/spartan/setup_test_wallets.js

@@ -12,6 +12,7 @@ import { createExtendedL1Client } from '@aztec/ethereum/client';
 import { makeBackoff, retry, retryUntil } from '@aztec/foundation/retry';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { Gas } from '@aztec/stdlib/gas';
+import { TxStatus } from '@aztec/stdlib/tx';
 import { getGasLimits } from '@aztec/wallet-sdk/base-wallet';
 import { registerInitialLocalNetworkAccountsInWallet } from '@aztec/wallets/testing';
 import { getACVMConfig } from '../fixtures/get_acvm_config.js';
@@ -276,9 +277,12 @@ export async function performTransfers({ wallet, testAccounts, rounds, transferA
             });
         });
         const provenTxs = await Promise.all(txs);
+        // Wait only for the txs to be proposed, not checkpointed. This is enough to keep the chain
+        // loaded for the reorg scenario, and avoids each round blocking on the (slower) checkpoint lag.
         await Promise.all(provenTxs.map((t)=>t.send({
                 wait: {
-                    timeout: 600
+                    timeout: 600,
+                    waitForStatus: TxStatus.PROPOSED
                 }
             })));
         logger.info(`Completed round ${i + 1} / ${rounds}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.2",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -29,45 +29,45 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "5.0.0-rc.1",
-    "@aztec/archiver": "5.0.0-rc.1",
-    "@aztec/aztec": "5.0.0-rc.1",
-    "@aztec/aztec-node": "5.0.0-rc.1",
-    "@aztec/aztec.js": "5.0.0-rc.1",
-    "@aztec/bb-prover": "5.0.0-rc.1",
-    "@aztec/bb.js": "5.0.0-rc.1",
-    "@aztec/blob-client": "5.0.0-rc.1",
-    "@aztec/blob-lib": "5.0.0-rc.1",
-    "@aztec/bot": "5.0.0-rc.1",
-    "@aztec/cli": "5.0.0-rc.1",
-    "@aztec/constants": "5.0.0-rc.1",
-    "@aztec/entrypoints": "5.0.0-rc.1",
-    "@aztec/epoch-cache": "5.0.0-rc.1",
-    "@aztec/ethereum": "5.0.0-rc.1",
-    "@aztec/foundation": "5.0.0-rc.1",
-    "@aztec/kv-store": "5.0.0-rc.1",
-    "@aztec/l1-artifacts": "5.0.0-rc.1",
-    "@aztec/node-keystore": "5.0.0-rc.1",
-    "@aztec/noir-contracts.js": "5.0.0-rc.1",
-    "@aztec/noir-noirc_abi": "5.0.0-rc.1",
-    "@aztec/noir-protocol-circuits-types": "5.0.0-rc.1",
-    "@aztec/noir-test-contracts.js": "5.0.0-rc.1",
-    "@aztec/p2p": "5.0.0-rc.1",
-    "@aztec/protocol-contracts": "5.0.0-rc.1",
-    "@aztec/prover-client": "5.0.0-rc.1",
-    "@aztec/prover-node": "5.0.0-rc.1",
-    "@aztec/pxe": "5.0.0-rc.1",
-    "@aztec/sequencer-client": "5.0.0-rc.1",
-    "@aztec/simulator": "5.0.0-rc.1",
-    "@aztec/slasher": "5.0.0-rc.1",
-    "@aztec/standard-contracts": "5.0.0-rc.1",
-    "@aztec/stdlib": "5.0.0-rc.1",
-    "@aztec/telemetry-client": "5.0.0-rc.1",
-    "@aztec/validator-client": "5.0.0-rc.1",
-    "@aztec/validator-ha-signer": "5.0.0-rc.1",
-    "@aztec/wallet-sdk": "5.0.0-rc.1",
-    "@aztec/wallets": "5.0.0-rc.1",
-    "@aztec/world-state": "5.0.0-rc.1",
+    "@aztec/accounts": "5.0.0-rc.2",
+    "@aztec/archiver": "5.0.0-rc.2",
+    "@aztec/aztec": "5.0.0-rc.2",
+    "@aztec/aztec-node": "5.0.0-rc.2",
+    "@aztec/aztec.js": "5.0.0-rc.2",
+    "@aztec/bb-prover": "5.0.0-rc.2",
+    "@aztec/bb.js": "5.0.0-rc.2",
+    "@aztec/blob-client": "5.0.0-rc.2",
+    "@aztec/blob-lib": "5.0.0-rc.2",
+    "@aztec/bot": "5.0.0-rc.2",
+    "@aztec/cli": "5.0.0-rc.2",
+    "@aztec/constants": "5.0.0-rc.2",
+    "@aztec/entrypoints": "5.0.0-rc.2",
+    "@aztec/epoch-cache": "5.0.0-rc.2",
+    "@aztec/ethereum": "5.0.0-rc.2",
+    "@aztec/foundation": "5.0.0-rc.2",
+    "@aztec/kv-store": "5.0.0-rc.2",
+    "@aztec/l1-artifacts": "5.0.0-rc.2",
+    "@aztec/node-keystore": "5.0.0-rc.2",
+    "@aztec/noir-contracts.js": "5.0.0-rc.2",
+    "@aztec/noir-noirc_abi": "5.0.0-rc.2",
+    "@aztec/noir-protocol-circuits-types": "5.0.0-rc.2",
+    "@aztec/noir-test-contracts.js": "5.0.0-rc.2",
+    "@aztec/p2p": "5.0.0-rc.2",
+    "@aztec/protocol-contracts": "5.0.0-rc.2",
+    "@aztec/prover-client": "5.0.0-rc.2",
+    "@aztec/prover-node": "5.0.0-rc.2",
+    "@aztec/pxe": "5.0.0-rc.2",
+    "@aztec/sequencer-client": "5.0.0-rc.2",
+    "@aztec/simulator": "5.0.0-rc.2",
+    "@aztec/slasher": "5.0.0-rc.2",
+    "@aztec/standard-contracts": "5.0.0-rc.2",
+    "@aztec/stdlib": "5.0.0-rc.2",
+    "@aztec/telemetry-client": "5.0.0-rc.2",
+    "@aztec/validator-client": "5.0.0-rc.2",
+    "@aztec/validator-ha-signer": "5.0.0-rc.2",
+    "@aztec/wallet-sdk": "5.0.0-rc.2",
+    "@aztec/wallets": "5.0.0-rc.2",
+    "@aztec/world-state": "5.0.0-rc.2",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",
@@ -170,6 +170,6 @@
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
     ],
-    "testEnvironment": "../../foundation/src/jest/env.mjs"
+    "testEnvironment": "./shared/timing_env.mjs"
   }
 }

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -20,7 +20,7 @@ import { AMMContract } from '@aztec/noir-contracts.js/AMM';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { FeeJuiceContract } from '@aztec/noir-contracts.js/FeeJuice';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
-import { TokenContract as BananaCoin, TokenContract } from '@aztec/noir-contracts.js/Token';
+import { TestTokenContract as BananaCoin, TestTokenContract } from '@aztec/noir-test-contracts.js/TestToken';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { type PXEConfig, getPXEConfig } from '@aztec/pxe/server';
@@ -28,7 +28,12 @@ import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import { Gas, GasSettings } from '@aztec/stdlib/gas';
 import { deriveSigningKey } from '@aztec/stdlib/keys';
 
-import { AUTOMINE_E2E_OPTS, MNEMONIC, getPaddedMaxFeesPerGas } from '../../fixtures/fixtures.js';
+import {
+  AUTOMINE_E2E_OPTS,
+  L1_DIRECT_WRITE_ACCOUNT_INDEX,
+  MNEMONIC,
+  getPaddedMaxFeesPerGas,
+} from '../../fixtures/fixtures.js';
 import { type EndToEndContext, type SetupOptions, setup, teardown } from '../../fixtures/setup.js';
 import { mintTokensToPrivate } from '../../fixtures/token_utils.js';
 import { setupSponsoredFPC } from '../../fixtures/utils.js';
@@ -71,13 +76,13 @@ export class ClientFlowsBenchmark {
   public bananaFPC!: FPCContract;
   public bananaFPCInstance!: ContractInstanceWithAddress;
   // Random asset we want to trade
-  public candyBarCoin!: TokenContract;
+  public candyBarCoin!: TestTokenContract;
   public candyBarCoinInstance!: ContractInstanceWithAddress;
   // AMM contract
   public amm!: AMMContract;
   public ammInstance!: ContractInstanceWithAddress;
   // Liquidity token for AMM
-  public liquidityToken!: TokenContract;
+  public liquidityToken!: TestTokenContract;
   public liquidityTokenInstance!: ContractInstanceWithAddress;
   // Sponsored FPC contract
   public sponsoredFPC!: SponsoredFPCContract;
@@ -134,7 +139,8 @@ export class ClientFlowsBenchmark {
   async setup() {
     this.logger.info('Setting up subsystems from fresh');
     // Token allowlist entries are test-only: FPC-based fee payment with custom tokens won't work on mainnet alpha.
-    const tokenAllowList = await getTokenAllowedSetupFunctions();
+    // BananaCoin is the codegen'd TestToken here, so the allowlist must key on its class, not canonical Token's.
+    const tokenAllowList = await getTokenAllowedSetupFunctions(BananaCoin.artifact);
     this.context = await setup(2, {
       ...this.setupOptions,
       fundSponsoredFPC: true,
@@ -235,7 +241,15 @@ export class ClientFlowsBenchmark {
     this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
       aztecNode: this.context.aztecNodeService,
       aztecNodeAdmin: this.context.aztecNodeService,
-      l1Client: this.context.deployL1ContractsValues.l1Client,
+      // Bridge from a dedicated L1 account so its direct writes don't race the sequencer publisher's
+      // txs on the deployer account (see L1_DIRECT_WRITE_ACCOUNT_INDEX).
+      l1Client: createExtendedL1Client(
+        this.context.config.l1RpcUrls,
+        MNEMONIC,
+        undefined,
+        undefined,
+        L1_DIRECT_WRITE_ACCOUNT_INDEX,
+      ),
       wallet: this.adminWallet,
       logger: this.logger,
     });
@@ -259,7 +273,7 @@ export class ClientFlowsBenchmark {
 
   async applyDeployCandyBarToken() {
     this.logger.info('Applying candy bar token deployment');
-    const { contract: candyBarCoin, instance: candyBarCoinInstance } = await TokenContract.deploy(
+    const { contract: candyBarCoin, instance: candyBarCoinInstance } = await TestTokenContract.deploy(
       this.adminWallet,
       this.adminAddress,
       'CBC',
@@ -348,7 +362,7 @@ export class ClientFlowsBenchmark {
 
   public async applyDeployAmm() {
     this.logger.info('Applying AMM deployment');
-    const { contract: liquidityToken, instance: liquidityTokenInstance } = await TokenContract.deploy(
+    const { contract: liquidityToken, instance: liquidityTokenInstance } = await TestTokenContract.deploy(
       this.adminWallet,
       this.adminAddress,
       'LPT',

package/src/e2e_cross_chain_messaging/cross_chain_messaging_test.ts

@@ -40,6 +40,7 @@ export class CrossChainMessagingTest {
   private setupOptions: SetupOptions;
   private deployL1ContractsArgs: Partial<DeployAztecL1ContractsArgs>;
   private pxeOpts: Partial<PXEConfig>;
+  private l1HarnessAccountIndex?: number;
   logger: Logger;
   context!: EndToEndContext;
   aztecNode!: AztecNode;
@@ -79,6 +80,7 @@ export class CrossChainMessagingTest {
     opts: SetupOptions = {},
     deployL1ContractsArgs: Partial<DeployAztecL1ContractsArgs> = {},
     pxeOpts: Partial<PXEConfig> = {},
+    l1HarnessAccountIndex?: number,
   ) {
     this.logger = createLogger(`e2e:e2e_cross_chain_messaging:${testName}`);
     this.setupOptions = opts;
@@ -87,6 +89,7 @@ export class CrossChainMessagingTest {
       ...deployL1ContractsArgs,
     };
     this.pxeOpts = pxeOpts;
+    this.l1HarnessAccountIndex = l1HarnessAccountIndex;
     this.requireEpochProven = opts.startProverNode ?? false;
   }
 
@@ -177,18 +180,24 @@ export class CrossChainMessagingTest {
 
     await ensureAuthRegistryPublished(this.wallet, this.ownerAddress);
 
-    this.l1Client = createExtendedL1Client(this.aztecNodeConfig.l1RpcUrls, MNEMONIC);
+    const harnessL1Client = createExtendedL1Client(
+      this.aztecNodeConfig.l1RpcUrls,
+      MNEMONIC,
+      undefined,
+      undefined,
+      this.l1HarnessAccountIndex,
+    );
 
-    const underlyingERC20Address = await deployL1Contract(this.l1Client, TestERC20Abi, TestERC20Bytecode, [
+    const underlyingERC20Address = await deployL1Contract(harnessL1Client, TestERC20Abi, TestERC20Bytecode, [
       'Underlying',
       'UND',
-      this.l1Client.account.address,
+      harnessL1Client.account.address,
     ]).then(({ address }) => address);
 
     this.logger.verbose(`Setting up cross chain harness...`);
     this.crossChainTestHarness = await CrossChainTestHarness.new(
       this.aztecNode,
-      this.l1Client,
+      harnessL1Client,
       this.wallet,
       this.ownerAddress,
       this.logger,
@@ -222,7 +231,7 @@ export class CrossChainMessagingTest {
       this.ethAccount,
       tokenPortalAddress,
       crossChainContext.underlying,
-      l1Client,
+      harnessL1Client,
       pickL1ContractAddresses(this.aztecNodeConfig),
       this.wallet,
       this.ownerAddress,

package/src/e2e_epochs/epochs_test.ts

@@ -1,6 +1,6 @@
 import type { InitialAccountData } from '@aztec/accounts/testing';
 import type { Archiver } from '@aztec/archiver';
-import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
+import { type AztecNodeConfig, AztecNodeService, createAztecNodeService } from '@aztec/aztec-node';
 import { getAccountContractAddress } from '@aztec/aztec.js/account';
 import type { AztecAddress } from '@aztec/aztec.js/addresses';
 import { getTimestampRangeForEpoch } from '@aztec/aztec.js/block';
@@ -310,7 +310,7 @@ export class EpochsTestContext {
     const p2pEnabled = resolvedConfig.p2pEnabled || mockGossipSubNetwork !== undefined;
     const p2pIp = resolvedConfig.p2pIp ?? (p2pEnabled ? '127.0.0.1' : undefined);
     const node = await withLoggerBindings({ actor: `${actorPrefix}-${nodeIndex}` }, () =>
-      AztecNodeService.createAndSync(
+      createAztecNodeService(
         {
           ...resolvedConfig,
           dataDirectory: join(this.context.config.dataDirectory!, randomBytes(8).toString('hex')),

package/src/e2e_fees/bridging_race.notest.ts

@@ -15,6 +15,10 @@ jest.setTimeout(300_000);
 
 // Regression for https://github.com/AztecProtocol/aztec-packages/issues/12366
 // Similar to e2e_fees/account_init but with no automine
+// Disabled (.notest.ts): this regression was covered by fixes applied at each "wait for two blocks"
+// site in the codebase; keeping the file as reference for the original race scenario. Uses FeesTest
+// with prod sequencer (ethSlot=4s, aztecSlot=8s, inboxLag default, minTxsPerBlock=0) and
+// GasBridgingTestHarness for L1↔L2 fee-juice bridging. Single account, fake in-proc prover node.
 describe('e2e_fees bridging_race', () => {
   const ETHEREUM_SLOT_DURATION = 4;
   const AZTEC_SLOT_DURATION = ETHEREUM_SLOT_DURATION * 2;
@@ -50,6 +54,10 @@ describe('e2e_fees bridging_race', () => {
     bobsAddress = bobsAccountManager.address;
   });
 
+  // Reproduces a timing race where an L1→L2 fee-juice bridge message lands just before the end of an
+  // L2 slot, causing the archiver to miss it. The fix was to wait for the archiver to see the message
+  // before waiting for the required two-block confirmation. The sleep injected into approve() simulates
+  // the near-slot-boundary timing.
   it('Alice bridges funds to Bob', async () => {
     // Tweak the token manager so the bridging happens immediately before the end of the current L2 slot
     // This caused the message to be "not in state" when tried to be used
@@ -59,6 +67,8 @@ describe('e2e_fees bridging_race', () => {
       await origApprove(amount, address, addressName);
       const sleepTime = (Number(t.chainMonitor.checkpointTimestamp) + AZTEC_SLOT_DURATION) * 1000 - Date.now() - 500;
       logger.info(`Sleeping for ${sleepTime}ms until near end of L2 slot before sending L1 fee juice to L2 inbox`);
+      // REFACTOR: hand-rolled slot-boundary sleep; replace with a timing helper that derives the remaining
+      // slot time from the chain monitor's slot boundaries rather than computing it inline.
       await sleep(sleepTime);
     };
 

package/src/e2e_fees/fees_test.ts

@@ -23,7 +23,7 @@ import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 
 import { getContract } from 'viem';
 
-import { MNEMONIC, getPaddedMaxFeesPerGas } from '../fixtures/fixtures.js';
+import { L1_DIRECT_WRITE_ACCOUNT_INDEX, MNEMONIC, getPaddedMaxFeesPerGas } from '../fixtures/fixtures.js';
 import {
   type EndToEndContext,
   type SetupOptions,
@@ -213,7 +213,15 @@ export class FeesTest {
     this.feeJuiceBridgeTestHarness = await FeeJuicePortalTestingHarnessFactory.create({
       aztecNode: this.context.aztecNodeService,
       aztecNodeAdmin: this.context.aztecNodeService,
-      l1Client: this.context.deployL1ContractsValues.l1Client,
+      // Bridge from a dedicated L1 account so its direct writes don't race the sequencer publisher's
+      // txs on the deployer account (see L1_DIRECT_WRITE_ACCOUNT_INDEX).
+      l1Client: createExtendedL1Client(
+        this.context.config.l1RpcUrls,
+        MNEMONIC,
+        undefined,
+        undefined,
+        L1_DIRECT_WRITE_ACCOUNT_INDEX,
+      ),
       wallet: this.wallet,
       logger: this.logger,
     });

package/src/e2e_l1_publisher/write_json.ts

@@ -66,6 +66,7 @@ export async function writeJson(
           feePerL2Gas: Number(checkpointHeader.gasFees.feePerL2Gas),
         },
         totalManaUsed: checkpointHeader.totalManaUsed.toNumber(),
+        accumulatedFees: checkpointHeader.accumulatedFees.toNumber(),
       },
       headerHash: asHex(checkpointHeader.hash()),
       numTxs: block.body.txEffects.length,