@aztec/end-to-end 0.0.1-commit.4d79d1f2d → 0.0.1-commit.4d9804df

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

@@ -0,0 +1,53 @@
+import type { CallIntent, IntentInnerHash } from '@aztec/aztec.js/authorization';
+import type { InteractionWaitOptions, SendReturn } from '@aztec/aztec.js/contracts';
+import type { Aliased, AppCapabilities, BatchResults, BatchedMethod, ContractClassMetadata, ContractMetadata, ExecuteUtilityOptions, PrivateEvent, PrivateEventFilter, ProfileOptions, SendOptions, SimulateOptions, TxSimulationResultWithAppOffset, Wallet, WalletCapabilities } from '@aztec/aztec.js/wallet';
+import type { ChainInfo } from '@aztec/entrypoints/interfaces';
+import type { Fq, Fr } from '@aztec/foundation/curves/bn254';
+import type { PXEConfig } from '@aztec/pxe/config';
+import type { ContractArtifact, EventMetadataDefinition, FunctionCall } from '@aztec/stdlib/abi';
+import type { AuthWitness } from '@aztec/stdlib/auth-witness';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { ContractInstancePreimage } from '@aztec/stdlib/contract';
+import type { ExecutionPayload, TxProfileResult, UtilityExecutionResult } from '@aztec/stdlib/tx';
+import { Tx } from '@aztec/stdlib/tx';
+/**
+ * Wallet implementation that offloads all work to a worker thread.
+ * Implements the Wallet interface by proxying calls over a transport layer
+ * using JSON serialization with Zod schema parsing on both ends.
+ */
+export declare class WorkerWallet implements Wallet {
+    private worker;
+    private client;
+    private constructor();
+    /**
+     * Creates a WorkerWallet by spawning a worker thread that creates a TestWallet internally.
+     * @param nodeUrl - URL of the Aztec node to connect to.
+     * @param pxeConfig - Optional PXE configuration overrides.
+     * @returns A WorkerWallet ready to use.
+     */
+    static create(nodeUrl: string, pxeConfig?: Partial<PXEConfig>): Promise<WorkerWallet>;
+    private callRaw;
+    private call;
+    getChainInfo(): Promise<ChainInfo>;
+    getContractMetadata(address: AztecAddress): Promise<ContractMetadata>;
+    getContractClassMetadata(id: Fr): Promise<ContractClassMetadata>;
+    getPrivateEvents<T>(eventMetadata: EventMetadataDefinition, eventFilter: PrivateEventFilter): Promise<PrivateEvent<T>[]>;
+    registerSender(address: AztecAddress, alias?: string): Promise<AztecAddress>;
+    getAddressBook(): Promise<Aliased<AztecAddress>[]>;
+    getAccounts(): Promise<Aliased<AztecAddress>[]>;
+    registerContract(instance: ContractInstancePreimage, artifact?: ContractArtifact, secretKey?: Fr): Promise<void>;
+    registerContractClass(artifact: ContractArtifact): Promise<void>;
+    simulateTx(exec: ExecutionPayload, opts: SimulateOptions): Promise<TxSimulationResultWithAppOffset>;
+    executeUtility(call: FunctionCall, opts: ExecuteUtilityOptions): Promise<UtilityExecutionResult>;
+    profileTx(exec: ExecutionPayload, opts: ProfileOptions): Promise<TxProfileResult>;
+    sendTx<W extends InteractionWaitOptions = undefined>(exec: ExecutionPayload, opts: SendOptions<W>): Promise<SendReturn<W>>;
+    proveTx(exec: ExecutionPayload, opts: Omit<SendOptions, 'wait'>): Promise<Tx>;
+    /** Registers an account inside the worker's TestWallet, populating its accounts map. */
+    registerAccount(secret: Fr, salt: Fr, signingKey: Fq): Promise<AztecAddress>;
+    createAuthWit(from: AztecAddress, messageHashOrIntent: IntentInnerHash | CallIntent): Promise<AuthWitness>;
+    requestCapabilities(manifest: AppCapabilities): Promise<WalletCapabilities>;
+    batch<const T extends readonly BatchedMethod[]>(methods: T): Promise<BatchResults<T>>;
+    /** Shuts down the worker thread and closes the transport. */
+    stop(): Promise<void>;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3dhbGxldC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3Qtd2FsbGV0L3dvcmtlcl93YWxsZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLGVBQWUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2pGLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3BGLE9BQU8sS0FBSyxFQUNWLE9BQU8sRUFDUCxlQUFlLEVBQ2YsWUFBWSxFQUNaLGFBQWEsRUFDYixxQkFBcUIsRUFDckIsZ0JBQWdCLEVBQ2hCLHFCQUFxQixFQUNyQixZQUFZLEVBQ1osa0JBQWtCLEVBQ2xCLGNBQWMsRUFDZCxXQUFXLEVBQ1gsZUFBZSxFQUNmLCtCQUErQixFQUMvQixNQUFNLEVBQ04sa0JBQWtCLEVBQ25CLE1BQU0sd0JBQXdCLENBQUM7QUFDaEMsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBTzdELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLHVCQUF1QixFQUFFLFlBQVksRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2pHLE9BQU8sS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLDRCQUE0QixDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLHdCQUF3QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDdkUsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsZUFBZSxFQUFFLHNCQUFzQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7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

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

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

package/dest/test-wallet/worker_wallet.js

@@ -0,0 +1,157 @@
+import { jsonStringify } from '@aztec/foundation/json-rpc';
+import { createLogger } from '@aztec/foundation/log';
+import { promiseWithResolvers } from '@aztec/foundation/promise';
+import { getSchemaReturnType } from '@aztec/foundation/schemas';
+import { sleep } from '@aztec/foundation/sleep';
+import { NodeConnector, TransportClient } from '@aztec/foundation/transport';
+import { Worker } from 'worker_threads';
+import { WorkerWalletSchema } from './worker_wallet_schema.js';
+const log = createLogger('e2e:test-wallet:worker-wallet');
+const WORKER_READY_TIMEOUT_MS = 120_000;
+/**
+ * Wallet implementation that offloads all work to a worker thread.
+ * Implements the Wallet interface by proxying calls over a transport layer
+ * using JSON serialization with Zod schema parsing on both ends.
+ */ export class WorkerWallet {
+    worker;
+    client;
+    constructor(worker, client){
+        this.worker = worker;
+        this.client = client;
+    }
+    /**
+   * Creates a WorkerWallet by spawning a worker thread that creates a TestWallet internally.
+   * @param nodeUrl - URL of the Aztec node to connect to.
+   * @param pxeConfig - Optional PXE configuration overrides.
+   * @returns A WorkerWallet ready to use.
+   */ static async create(nodeUrl, pxeConfig) {
+        // replace stc/ with dest/ so the wallet works in Jest tests
+        const workerUrl = new URL('./wallet_worker_script.js', import.meta.url);
+        workerUrl.pathname = workerUrl.pathname.replace('/src/', '/dest/');
+        // remove JEST_WORKER_ID so the worker uses pino-pretty transport instead of Jest's raw output.
+        const { JEST_WORKER_ID: _, ...parentEnv } = process.env;
+        const worker = new Worker(workerUrl, {
+            workerData: {
+                nodeUrl,
+                pxeConfig
+            },
+            env: {
+                ...parentEnv,
+                ...process.stderr.isTTY || process.env.FORCE_COLOR ? {
+                    FORCE_COLOR: '1'
+                } : {},
+                LOG_LEVEL: process.env.WORKER_LOG_LEVEL ?? 'info'
+            }
+        });
+        const connector = new NodeConnector(worker);
+        const client = new TransportClient(connector);
+        await client.open();
+        const wallet = new WorkerWallet(worker, client);
+        const { promise: workerDied, reject: rejectWorkerDied } = promiseWithResolvers();
+        // reject if the worker exits or errors before the warmup completes.
+        const onError = (err)=>{
+            worker.off('exit', onExit);
+            rejectWorkerDied(new Error(`Worker wallet thread error: ${err.message}`));
+        };
+        const onExit = (code)=>{
+            worker.off('error', onError);
+            rejectWorkerDied(new Error(`Worker wallet thread exited with code ${code} before becoming ready`));
+        };
+        worker.once('error', onError);
+        worker.once('exit', onExit);
+        const timeout = sleep(WORKER_READY_TIMEOUT_MS).then(()=>{
+            throw new Error(`Worker wallet creation timed out after ${WORKER_READY_TIMEOUT_MS / 1000}s`);
+        });
+        try {
+            // wait for worker wallet to start
+            await Promise.race([
+                wallet.getChainInfo(),
+                workerDied,
+                timeout
+            ]);
+        } catch (err) {
+            log.error('Worker wallet creation failed, cleaning up', {
+                error: String(err)
+            });
+            client.close();
+            await worker.terminate();
+            throw err;
+        } finally{
+            worker.off('error', onError);
+            worker.off('exit', onExit);
+        }
+        return wallet;
+    }
+    async callRaw(fn, ...args) {
+        const argsJson = jsonStringify(args);
+        return await this.client.request({
+            fn,
+            args: argsJson
+        });
+    }
+    async call(fn, ...args) {
+        const resultJson = await this.callRaw(fn, ...args);
+        const methodSchema = WorkerWalletSchema[fn];
+        // Void-returning methods (e.g. registerContract) serialize to `undefined` on the worker side, which
+        // JSON.parse cannot handle; hand it straight to the schema, whose `z.void()` output accepts undefined.
+        return getSchemaReturnType(methodSchema).parseAsync(resultJson === undefined ? undefined : JSON.parse(resultJson));
+    }
+    getChainInfo() {
+        return this.call('getChainInfo');
+    }
+    getContractMetadata(address) {
+        return this.call('getContractMetadata', address);
+    }
+    getContractClassMetadata(id) {
+        return this.call('getContractClassMetadata', id);
+    }
+    getPrivateEvents(eventMetadata, eventFilter) {
+        return this.call('getPrivateEvents', eventMetadata, eventFilter);
+    }
+    registerSender(address, alias) {
+        return this.call('registerSender', address, alias);
+    }
+    getAddressBook() {
+        return this.call('getAddressBook');
+    }
+    getAccounts() {
+        return this.call('getAccounts');
+    }
+    registerContract(instance, artifact, secretKey) {
+        return this.call('registerContract', instance, artifact, secretKey);
+    }
+    registerContractClass(artifact) {
+        return this.call('registerContractClass', artifact);
+    }
+    simulateTx(exec, opts) {
+        return this.call('simulateTx', exec, opts);
+    }
+    executeUtility(call, opts) {
+        return this.call('executeUtility', call, opts);
+    }
+    profileTx(exec, opts) {
+        return this.call('profileTx', exec, opts);
+    }
+    sendTx(exec, opts) {
+        return this.call('sendTx', exec, opts);
+    }
+    proveTx(exec, opts) {
+        return this.call('proveTx', exec, opts);
+    }
+    /** Registers an account inside the worker's TestWallet, populating its accounts map. */ registerAccount(secret, salt, signingKey) {
+        return this.call('registerAccount', secret, salt, signingKey);
+    }
+    createAuthWit(from, messageHashOrIntent) {
+        return this.call('createAuthWit', from, messageHashOrIntent);
+    }
+    requestCapabilities(manifest) {
+        return this.call('requestCapabilities', manifest);
+    }
+    batch(methods) {
+        return this.call('batch', methods);
+    }
+    /** Shuts down the worker thread and closes the transport. */ async stop() {
+        this.client.close();
+        await this.worker.terminate();
+    }
+}

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

@@ -0,0 +1,4 @@
+import type { ApiSchema } from '@aztec/foundation/schemas';
+/** Schema for the WorkerWallet API — extends WalletSchema with proveTx and registerAccount. */
+export declare const WorkerWalletSchema: ApiSchema;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX3dhbGxldF9zY2hlbWEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0LXdhbGxldC93b3JrZXJfd2FsbGV0X3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQU8zRCxpR0FBK0Y7QUFDL0YsZUFBTyxNQUFNLGtCQUFrQixFQUFFLFNBSWhDLENBQUMifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"worker_wallet_schema.d.ts","sourceRoot":"","sources":["../../src/test-wallet/worker_wallet_schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAO3D,iGAA+F;AAC/F,eAAO,MAAM,kBAAkB,EAAE,SAIhC,CAAC"}

package/dest/test-wallet/worker_wallet_schema.js

@@ -0,0 +1,23 @@
+import { ExecutionPayloadSchema, SendOptionsSchema, WalletSchema } from '@aztec/aztec.js/wallet';
+import { schemas } from '@aztec/foundation/schemas';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Tx } from '@aztec/stdlib/tx';
+import { z } from 'zod';
+/** Schema for the WorkerWallet API — extends WalletSchema with proveTx and registerAccount. */ export const WorkerWalletSchema = {
+    ...WalletSchema,
+    proveTx: z.function({
+        input: z.tuple([
+            ExecutionPayloadSchema,
+            SendOptionsSchema
+        ]),
+        output: Tx.schema
+    }),
+    registerAccount: z.function({
+        input: z.tuple([
+            schemas.Fr,
+            schemas.Fr,
+            schemas.Fq
+        ]),
+        output: AztecAddress.schema
+    })
+};

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.0.1-commit.4d79d1f2d",
+  "version": "0.0.1-commit.4d9804df",
   "type": "module",
-  "exports": "./dest/index.js",
+  "exports": {
+    ".": "./dest/index.js",
+    "./*": "./dest/*"
+  },
   "inherits": [
     "../package.common.json",
     "./package.local.json"
@@ -12,12 +15,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 +29,45 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.4d79d1f2d",
-    "@aztec/archiver": "0.0.1-commit.4d79d1f2d",
-    "@aztec/aztec": "0.0.1-commit.4d79d1f2d",
-    "@aztec/aztec-node": "0.0.1-commit.4d79d1f2d",
-    "@aztec/aztec.js": "0.0.1-commit.4d79d1f2d",
-    "@aztec/bb-prover": "0.0.1-commit.4d79d1f2d",
-    "@aztec/bb.js": "0.0.1-commit.4d79d1f2d",
-    "@aztec/blob-client": "0.0.1-commit.4d79d1f2d",
-    "@aztec/blob-lib": "0.0.1-commit.4d79d1f2d",
-    "@aztec/bot": "0.0.1-commit.4d79d1f2d",
-    "@aztec/cli": "0.0.1-commit.4d79d1f2d",
-    "@aztec/constants": "0.0.1-commit.4d79d1f2d",
-    "@aztec/entrypoints": "0.0.1-commit.4d79d1f2d",
-    "@aztec/epoch-cache": "0.0.1-commit.4d79d1f2d",
-    "@aztec/ethereum": "0.0.1-commit.4d79d1f2d",
-    "@aztec/foundation": "0.0.1-commit.4d79d1f2d",
-    "@aztec/kv-store": "0.0.1-commit.4d79d1f2d",
-    "@aztec/l1-artifacts": "0.0.1-commit.4d79d1f2d",
-    "@aztec/merkle-tree": "0.0.1-commit.4d79d1f2d",
-    "@aztec/node-keystore": "0.0.1-commit.4d79d1f2d",
-    "@aztec/noir-contracts.js": "0.0.1-commit.4d79d1f2d",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.4d79d1f2d",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.4d79d1f2d",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.4d79d1f2d",
-    "@aztec/p2p": "0.0.1-commit.4d79d1f2d",
-    "@aztec/protocol-contracts": "0.0.1-commit.4d79d1f2d",
-    "@aztec/prover-client": "0.0.1-commit.4d79d1f2d",
-    "@aztec/prover-node": "0.0.1-commit.4d79d1f2d",
-    "@aztec/pxe": "0.0.1-commit.4d79d1f2d",
-    "@aztec/sequencer-client": "0.0.1-commit.4d79d1f2d",
-    "@aztec/simulator": "0.0.1-commit.4d79d1f2d",
-    "@aztec/slasher": "0.0.1-commit.4d79d1f2d",
-    "@aztec/stdlib": "0.0.1-commit.4d79d1f2d",
-    "@aztec/telemetry-client": "0.0.1-commit.4d79d1f2d",
-    "@aztec/validator-client": "0.0.1-commit.4d79d1f2d",
-    "@aztec/validator-ha-signer": "0.0.1-commit.4d79d1f2d",
-    "@aztec/wallet-sdk": "0.0.1-commit.4d79d1f2d",
-    "@aztec/wallets": "0.0.1-commit.4d79d1f2d",
-    "@aztec/world-state": "0.0.1-commit.4d79d1f2d",
+    "@aztec/accounts": "0.0.1-commit.4d9804df",
+    "@aztec/archiver": "0.0.1-commit.4d9804df",
+    "@aztec/aztec": "0.0.1-commit.4d9804df",
+    "@aztec/aztec-node": "0.0.1-commit.4d9804df",
+    "@aztec/aztec.js": "0.0.1-commit.4d9804df",
+    "@aztec/bb-prover": "0.0.1-commit.4d9804df",
+    "@aztec/bb.js": "0.0.1-commit.4d9804df",
+    "@aztec/blob-client": "0.0.1-commit.4d9804df",
+    "@aztec/blob-lib": "0.0.1-commit.4d9804df",
+    "@aztec/bot": "0.0.1-commit.4d9804df",
+    "@aztec/cli": "0.0.1-commit.4d9804df",
+    "@aztec/constants": "0.0.1-commit.4d9804df",
+    "@aztec/entrypoints": "0.0.1-commit.4d9804df",
+    "@aztec/epoch-cache": "0.0.1-commit.4d9804df",
+    "@aztec/ethereum": "0.0.1-commit.4d9804df",
+    "@aztec/foundation": "0.0.1-commit.4d9804df",
+    "@aztec/kv-store": "0.0.1-commit.4d9804df",
+    "@aztec/l1-artifacts": "0.0.1-commit.4d9804df",
+    "@aztec/node-keystore": "0.0.1-commit.4d9804df",
+    "@aztec/noir-contracts.js": "0.0.1-commit.4d9804df",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.4d9804df",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.4d9804df",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.4d9804df",
+    "@aztec/p2p": "0.0.1-commit.4d9804df",
+    "@aztec/protocol-contracts": "0.0.1-commit.4d9804df",
+    "@aztec/prover-client": "0.0.1-commit.4d9804df",
+    "@aztec/prover-node": "0.0.1-commit.4d9804df",
+    "@aztec/pxe": "0.0.1-commit.4d9804df",
+    "@aztec/sequencer-client": "0.0.1-commit.4d9804df",
+    "@aztec/simulator": "0.0.1-commit.4d9804df",
+    "@aztec/slasher": "0.0.1-commit.4d9804df",
+    "@aztec/standard-contracts": "0.0.1-commit.4d9804df",
+    "@aztec/stdlib": "0.0.1-commit.4d9804df",
+    "@aztec/telemetry-client": "0.0.1-commit.4d9804df",
+    "@aztec/validator-client": "0.0.1-commit.4d9804df",
+    "@aztec/validator-ha-signer": "0.0.1-commit.4d9804df",
+    "@aztec/wallet-sdk": "0.0.1-commit.4d9804df",
+    "@aztec/wallets": "0.0.1-commit.4d9804df",
+    "@aztec/world-state": "0.0.1-commit.4d9804df",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",
@@ -76,7 +79,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",
@@ -103,7 +105,7 @@
     "typescript": "^5.3.3",
     "util": "^0.12.5",
     "viem": "npm:@aztec/viem@2.38.2",
-    "zod": "^3.23.8"
+    "zod": "^4"
   },
   "devDependencies": {
     "0x": "^5.7.0",
@@ -161,12 +163,13 @@
     "moduleNameMapper": {
       "^(\\.{1,2}/.*)\\.[cm]?js$": "$1"
     },
+    "resolver": "<rootDir>/legacy-jest-resolver.cjs",
     "testRegex": "./src/.*\\.test\\.(js|mjs|ts)$",
     "rootDir": "./src",
     "testTimeout": 120000,
     "setupFiles": [
       "../../foundation/src/jest/setup.mjs"
     ],
-    "testEnvironment": "../../foundation/src/jest/env.mjs"
+    "testEnvironment": "./shared/timing_env.mjs"
   }
 }

package/src/automine/README.md

@@ -0,0 +1,60 @@
+# `automine` e2e test category
+
+Automine tests run a single Aztec node driving the deterministic `AutomineSequencer`: one block per
+submitted transaction, synchronous L1 publish, no committee, no prover, and no validator client. The
+node opts into this topology through the `AUTOMINE_E2E_OPTS` preset (`fixtures/fixtures.ts`), which the
+base context applies by default. This is the fast, deterministic counterpart to the `single-node`
+category, whose node runs the production sequencer with interval block production. A test belongs here
+when it exercises contract or protocol behavior that does not depend on real block-building or consensus
+(token transfers, nested calls, note discovery, tx semantics); it belongs in `single-node` when it
+asserts on sequencer, proving, or reorg behavior.
+
+## Base class
+
+All tests use `AutomineTestContext` (`automine_test_context.ts`), which owns:
+
+- The environment: an in-process anvil in automine mode plus the L1 contract deploy, wrapping
+  `fixtures/setup.ts:setup()` with `AUTOMINE_E2E_OPTS` and `fundSponsoredFPC` as defaults.
+- The common handles: `context`, `wallet`, `aztecNode`, `aztecNodeAdmin`, `cheatCodes`, `sequencer`,
+  `accounts`, `defaultAccountAddress`, `logger`.
+- `markProvenAndWarp(seconds)`: marks pending checkpoints proven before warping the L2 clock, so a long
+  warp does not trip the rollup's pruning window (see the method's doc comment).
+- `registerContract(...)`: computes and registers a contract instance without an on-chain deploy.
+- `applyManualParentChild()`: deploys a Parent and Child contract for the nested-call tests.
+
+Tests call the static `AutomineTestContext.setup({ numberOfAccounts })` factory (or `new` plus `setup()`
+for the harness subclasses), passing `numberOfAccounts` rather than spreading `AUTOMINE_E2E_OPTS`.
+
+## Harnesses
+
+Two domain harnesses extend `AutomineTestContext` and run their domain setup after `super.setup()`:
+
+- `token/token_contract_test.ts` — a `TokenSimulator` plus opt-in base/mint snapshots for the Token
+  contract tests.
+- `token/blacklist_token_contract_test.ts` — a `TokenSimulator`, the `Role` helper, and the
+  role-change-delay warp (via `markProvenAndWarp`) for the TokenBlacklist tests.
+
+## Organizing principle
+
+The top level groups tests by node topology (automine); the second level names the primary behavior
+under test rather than the shared setup. Each file has a single top-level `describe` named to match its
+path. A `.parallel` suffix marks files with more than one top-level `it`; CI splits each `it` into its
+own job.
+
+## Subfolders
+
+A second-level folder is created only when it earns its keep: a shared harness, an existing sub-hierarchy,
+or a coherent domain of several files. The remaining miscellaneous protocol/execution behaviors live as flat
+files directly under `automine/` — smoke, tx ordering/double-spend/phase checks, mempool limits, the app demos
+(card game, private voting), and the timestamp/PXE tests.
+
+| Path | Contents |
+|---|---|
+| `token/` | Token-economics tests on the two token harnesses plus the `TokenSimulator`/`LendingSimulator`-adjacent DeFi tests: token transfers/minting/burning/access-control, the blacklist token suite, AMM, lending, NFT, orderbook, crowdfunding, and escrow. |
+| `contracts/` | Contract lifecycle and cross-contract behavior. `deploy/` (class registration, deploy method, legacy deploy, private initialization), `nested/` (importer and the manual private/public nested-call patterns), plus contract updates, storage proofs, static calls, nested utility calls, and the ABI/storage-surface tests (ABI types, option params, state variables). |
+| `accounts/` | Account and key behavior: account contracts, keys, multiple accounts sharing an encryption key, two-PXE interop, authwit, and scope isolation. |
+| `effects/` | Note discovery, events, and offchain effects: note getters, pending note hashes, partial notes, event logs, event-only notes, offchain effects and payments, large public events, custom messages, the tx-effect oracle, and note rediscovery after pruned blocks. |
+| `simulation/` | Circuit simulation surface: the AVM simulator, kernelless simulation, and the circuit recorder. |
+
+The `simulation/avm_simulator` file is a genuine outlier: it dumps AVM circuit inputs for the downstream
+`avm_check_circuit` CI job, so it has a bespoke CI line and is excluded from the generic `simulation/` glob.

package/src/automine/automine_test_context.ts

@@ -0,0 +1,153 @@
+import type { ContractArtifact } from '@aztec/aztec.js/abi';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import { type ContractBase, getContractInstanceFromInstantiationParams } from '@aztec/aztec.js/contracts';
+import { Fr } from '@aztec/aztec.js/fields';
+import type { PublicKeys } from '@aztec/aztec.js/keys';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import type { CheatCodes } from '@aztec/aztec/testing';
+import { ChildContract } from '@aztec/noir-test-contracts.js/Child';
+import { ParentContract } from '@aztec/noir-test-contracts.js/Parent';
+import type { StatefulTestContract } from '@aztec/noir-test-contracts.js/StatefulTest';
+import type { PXEConfig } from '@aztec/pxe/config';
+import type { SequencerClient } from '@aztec/sequencer-client';
+import type { AztecNodeAdmin, AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
+
+import { AUTOMINE_E2E_OPTS } from '../fixtures/fixtures.js';
+import { type EndToEndContext, type SetupOptions, setup, teardown } from '../fixtures/setup.js';
+import type { TestWallet } from '../test-wallet/test_wallet.js';
+
+export type AutomineTestOpts = Partial<SetupOptions> & {
+  /** Number of accounts to create and deploy during setup. */
+  numberOfAccounts?: number;
+  /** Options forwarded to PXE creation. */
+  pxeOpts?: Partial<PXEConfig>;
+};
+
+/**
+ * Base class for the automine-sequencer test topology: a single in-process node running the
+ * deterministic {@link AUTOMINE_E2E_OPTS} preset (one block per submitted tx, synchronous L1 publish,
+ * no committee, no prover, no validator client). Owns the environment (in-proc anvil in automine mode
+ * plus the L1 deploy) and exposes the handles every automine test uses (`wallet`, `aztecNode`,
+ * `cheatCodes`, `sequencer`, `accounts`, `logger`).
+ *
+ * The sibling of {@link SingleNodeTestContext}: both wrap the same underlying `fixtures/setup.ts:setup()`
+ * but fix opposite sequencer topologies. Making {@link AUTOMINE_E2E_OPTS} the base default removes the
+ * per-test-file spread every automine test would otherwise repeat.
+ *
+ * Domain harnesses (the token simulators) compose on top by extending this base and overriding
+ * {@link setup} to run their domain steps after `super.setup()`.
+ */
+export class AutomineTestContext {
+  public context!: EndToEndContext;
+  public logger!: Logger;
+  public wallet!: TestWallet;
+  public aztecNode!: AztecNode & AztecNodeDebug;
+  public aztecNodeAdmin!: AztecNodeAdmin;
+  public cheatCodes!: CheatCodes;
+  public sequencer!: SequencerClient;
+  public accounts!: AztecAddress[];
+  public defaultAccountAddress!: AztecAddress;
+
+  public parentContract!: ParentContract;
+  public childContract!: ChildContract;
+
+  public static async setup<T extends AutomineTestContext>(this: new () => T, opts: AutomineTestOpts = {}): Promise<T> {
+    const test = new this();
+    await test.setup(opts);
+    return test;
+  }
+
+  public async setup(opts: AutomineTestOpts = {}): Promise<void> {
+    const { numberOfAccounts = 1, pxeOpts, ...setupOpts } = opts;
+    const context = await setup(
+      numberOfAccounts,
+      {
+        ...AUTOMINE_E2E_OPTS,
+        fundSponsoredFPC: true,
+        ...setupOpts,
+      },
+      pxeOpts,
+    );
+    await this.hydrateFromContext(context);
+  }
+
+  /**
+   * Populates the context-derived handles from an already-built {@link EndToEndContext}. Split out of
+   * {@link setup} so domain harnesses that build the environment with their own bespoke `setup(...)`
+   * opts can still reuse the shared handle wiring.
+   */
+  protected hydrateFromContext(context: EndToEndContext): Promise<void> {
+    this.context = context;
+    this.logger = context.logger;
+    this.wallet = context.wallet;
+    this.aztecNode = context.aztecNodeService;
+    this.aztecNodeAdmin = context.aztecNodeService;
+    this.cheatCodes = context.cheatCodes;
+    this.sequencer = context.sequencer!;
+    this.accounts = context.accounts;
+    this.defaultAccountAddress = context.accounts[0];
+    return Promise.resolve();
+  }
+
+  public async teardown(): Promise<void> {
+    await teardown(this.context);
+  }
+
+  /**
+   * Marks the current pending checkpoints as proven, then warps the L2 clock forward by `seconds`.
+   *
+   * Under {@link AUTOMINE_E2E_OPTS} a long warp crosses many epochs with no proofs being submitted, so
+   * without a prior `markAsProven()` the rollup contract's pruning window resets the chain tip to genesis
+   * and the warp's own empty-checkpoint propose fails with `Rollup__InvalidArchive`. Marking proven before
+   * warping keeps the pending chain alive. Composes the existing `cheatCodes.rollup.markAsProven` and
+   * `warpL2TimeAtLeastBy` with that required ordering.
+   */
+  public async markProvenAndWarp(seconds: number | bigint): Promise<void> {
+    await this.cheatCodes.rollup.markAsProven();
+    await this.cheatCodes.warpL2TimeAtLeastBy(this.aztecNode, seconds);
+  }
+
+  /** Computes and registers a contract instance in the wallet without deploying it on-chain. */
+  public async registerContract<T extends ContractBase>(
+    wallet: Wallet,
+    contractArtifact: ContractArtifactClass<T>,
+    opts: {
+      salt?: Fr;
+      publicKeys?: PublicKeys;
+      initArgs?: any[];
+      constructorName?: string;
+      deployer?: AztecAddress;
+    } = {},
+  ): Promise<T> {
+    const { salt, publicKeys, initArgs, constructorName, deployer } = opts;
+    const instance = await getContractInstanceFromInstantiationParams(contractArtifact.artifact, {
+      constructorArgs: initArgs ?? [],
+      constructorArtifact: constructorName,
+      salt: salt ?? Fr.random(),
+      publicKeys,
+      deployer,
+    });
+    await wallet.registerContract(instance, contractArtifact.artifact);
+    return contractArtifact.at(instance.address, wallet);
+  }
+
+  /** Deploys a Parent and a Child contract from the default account for the nested-call tests. */
+  public async applyManualParentChild(): Promise<void> {
+    this.logger.info('Deploying parent and child contracts');
+    ({ contract: this.parentContract } = await ParentContract.deploy(this.wallet).send({
+      from: this.defaultAccountAddress,
+    }));
+    ({ contract: this.childContract } = await ChildContract.deploy(this.wallet).send({
+      from: this.defaultAccountAddress,
+    }));
+  }
+}
+
+export type StatefulContractCtorArgs = Parameters<StatefulTestContract['methods']['constructor']>;
+
+export type ContractArtifactClass<T extends ContractBase> = {
+  at(address: AztecAddress, wallet: Wallet): T;
+  artifact: ContractArtifact;
+};