@aztec/end-to-end 0.0.1-commit.b6e433891 → 0.0.1-commit.b8a057fa

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@aztec/end-to-end",
-  "version": "0.0.1-commit.b6e433891",
+  "version": "0.0.1-commit.b8a057fa",
   "type": "module",
-  "exports": "./dest/index.js",
+  "exports": {
+    ".": "./dest/index.js",
+    "./*": "./dest/*"
+  },
   "inherits": [
     "../package.common.json",
     "./package.local.json"
@@ -26,44 +29,45 @@
     "formatting": "run -T prettier --check ./src && run -T eslint ./src"
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.b6e433891",
-    "@aztec/archiver": "0.0.1-commit.b6e433891",
-    "@aztec/aztec": "0.0.1-commit.b6e433891",
-    "@aztec/aztec-node": "0.0.1-commit.b6e433891",
-    "@aztec/aztec.js": "0.0.1-commit.b6e433891",
-    "@aztec/bb-prover": "0.0.1-commit.b6e433891",
-    "@aztec/bb.js": "0.0.1-commit.b6e433891",
-    "@aztec/blob-client": "0.0.1-commit.b6e433891",
-    "@aztec/blob-lib": "0.0.1-commit.b6e433891",
-    "@aztec/bot": "0.0.1-commit.b6e433891",
-    "@aztec/cli": "0.0.1-commit.b6e433891",
-    "@aztec/constants": "0.0.1-commit.b6e433891",
-    "@aztec/entrypoints": "0.0.1-commit.b6e433891",
-    "@aztec/epoch-cache": "0.0.1-commit.b6e433891",
-    "@aztec/ethereum": "0.0.1-commit.b6e433891",
-    "@aztec/foundation": "0.0.1-commit.b6e433891",
-    "@aztec/kv-store": "0.0.1-commit.b6e433891",
-    "@aztec/l1-artifacts": "0.0.1-commit.b6e433891",
-    "@aztec/node-keystore": "0.0.1-commit.b6e433891",
-    "@aztec/noir-contracts.js": "0.0.1-commit.b6e433891",
-    "@aztec/noir-noirc_abi": "0.0.1-commit.b6e433891",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b6e433891",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.b6e433891",
-    "@aztec/p2p": "0.0.1-commit.b6e433891",
-    "@aztec/protocol-contracts": "0.0.1-commit.b6e433891",
-    "@aztec/prover-client": "0.0.1-commit.b6e433891",
-    "@aztec/prover-node": "0.0.1-commit.b6e433891",
-    "@aztec/pxe": "0.0.1-commit.b6e433891",
-    "@aztec/sequencer-client": "0.0.1-commit.b6e433891",
-    "@aztec/simulator": "0.0.1-commit.b6e433891",
-    "@aztec/slasher": "0.0.1-commit.b6e433891",
-    "@aztec/stdlib": "0.0.1-commit.b6e433891",
-    "@aztec/telemetry-client": "0.0.1-commit.b6e433891",
-    "@aztec/validator-client": "0.0.1-commit.b6e433891",
-    "@aztec/validator-ha-signer": "0.0.1-commit.b6e433891",
-    "@aztec/wallet-sdk": "0.0.1-commit.b6e433891",
-    "@aztec/wallets": "0.0.1-commit.b6e433891",
-    "@aztec/world-state": "0.0.1-commit.b6e433891",
+    "@aztec/accounts": "0.0.1-commit.b8a057fa",
+    "@aztec/archiver": "0.0.1-commit.b8a057fa",
+    "@aztec/aztec": "0.0.1-commit.b8a057fa",
+    "@aztec/aztec-node": "0.0.1-commit.b8a057fa",
+    "@aztec/aztec.js": "0.0.1-commit.b8a057fa",
+    "@aztec/bb-prover": "0.0.1-commit.b8a057fa",
+    "@aztec/bb.js": "0.0.1-commit.b8a057fa",
+    "@aztec/blob-client": "0.0.1-commit.b8a057fa",
+    "@aztec/blob-lib": "0.0.1-commit.b8a057fa",
+    "@aztec/bot": "0.0.1-commit.b8a057fa",
+    "@aztec/cli": "0.0.1-commit.b8a057fa",
+    "@aztec/constants": "0.0.1-commit.b8a057fa",
+    "@aztec/entrypoints": "0.0.1-commit.b8a057fa",
+    "@aztec/epoch-cache": "0.0.1-commit.b8a057fa",
+    "@aztec/ethereum": "0.0.1-commit.b8a057fa",
+    "@aztec/foundation": "0.0.1-commit.b8a057fa",
+    "@aztec/kv-store": "0.0.1-commit.b8a057fa",
+    "@aztec/l1-artifacts": "0.0.1-commit.b8a057fa",
+    "@aztec/node-keystore": "0.0.1-commit.b8a057fa",
+    "@aztec/noir-contracts.js": "0.0.1-commit.b8a057fa",
+    "@aztec/noir-noirc_abi": "0.0.1-commit.b8a057fa",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.b8a057fa",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.b8a057fa",
+    "@aztec/p2p": "0.0.1-commit.b8a057fa",
+    "@aztec/protocol-contracts": "0.0.1-commit.b8a057fa",
+    "@aztec/prover-client": "0.0.1-commit.b8a057fa",
+    "@aztec/prover-node": "0.0.1-commit.b8a057fa",
+    "@aztec/pxe": "0.0.1-commit.b8a057fa",
+    "@aztec/sequencer-client": "0.0.1-commit.b8a057fa",
+    "@aztec/simulator": "0.0.1-commit.b8a057fa",
+    "@aztec/slasher": "0.0.1-commit.b8a057fa",
+    "@aztec/standard-contracts": "0.0.1-commit.b8a057fa",
+    "@aztec/stdlib": "0.0.1-commit.b8a057fa",
+    "@aztec/telemetry-client": "0.0.1-commit.b8a057fa",
+    "@aztec/validator-client": "0.0.1-commit.b8a057fa",
+    "@aztec/validator-ha-signer": "0.0.1-commit.b8a057fa",
+    "@aztec/wallet-sdk": "0.0.1-commit.b8a057fa",
+    "@aztec/wallets": "0.0.1-commit.b8a057fa",
+    "@aztec/world-state": "0.0.1-commit.b8a057fa",
     "@iarna/toml": "^2.2.5",
     "@jest/globals": "^30.0.0",
     "@noble/curves": "=1.0.0",
@@ -101,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",
@@ -159,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;
+};

package/src/automine/delivery/onchain_delivery_harness.ts

@@ -0,0 +1,177 @@
+import { type InitialAccountData, generateSchnorrAccounts } from '@aztec/accounts/testing';
+import type { FieldLike } from '@aztec/aztec.js/abi';
+import { NO_FROM } from '@aztec/aztec.js/account';
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { type DeliveryEvent, OnchainDeliveryTestContract } from '@aztec/noir-test-contracts.js/OnchainDeliveryTest';
+import type { PXECreationOptions } from '@aztec/pxe/server';
+import type { AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
+
+import { jest } from '@jest/globals';
+
+import { AUTOMINE_E2E_OPTS } from '../../fixtures/fixtures.js';
+import { ensureHandshakeRegistryPublished, setup, setupPXEAndGetWallet } from '../../fixtures/setup.js';
+import { TestWallet } from '../../test-wallet/test_wallet.js';
+
+// The wallet hook that selects a message's tagging-secret source. Derived from the exported PXE options
+// rather than importing the hook type, which `@aztec/pxe/server` does not re-export.
+export type SenderHook = NonNullable<NonNullable<PXECreationOptions['hooks']>['resolveTaggingSecretStrategy']>;
+
+export type Mode = 'constrained' | 'unconstrained';
+
+// A single mode applies to both the event and note sends; `{ events, notes }` sends each in its own mode, which
+// exercises cross-mode handshake reuse: bootstrap in one mode, deliver in the other on the same handshake.
+export type DeliveryMode = Mode | { events: Mode; notes: Mode };
+
+const formatMode = (mode: DeliveryMode): string => (typeof mode === 'string' ? mode : `${mode.events}->${mode.notes}`);
+
+// Onchain private delivery has two orthogonal axes: the delivery MODE (constrained = nullifier-chained sequence;
+// unconstrained = no nullifier, windowed scan) and the tagging-secret SOURCE, which the wallet's
+// `resolveTaggingSecretStrategy` hook selects. This harness exercises (strategy, mode) cells end to end across two
+// PXEs that share only a node: the sender PXE sends, the recipient PXE discovers purely from onchain logs plus the
+// HandshakeRegistry.
+//
+// Cross-PXE is the meaningful setup: the recipient PXE holds no sender state, so a cell only "discovers" a message if
+// the source truly reached it.
+export function buildMessageDeliveryTest(opts: {
+  // Names the tagging-secret source, e.g. 'non-interactive handshake' or 'arbitrary secret'. The describe title is
+  // derived as `${strategy} x ${mode}`.
+  strategy: string;
+  mode: DeliveryMode;
+  // Required: every cell states its source explicitly rather than leaning on the PXE default (covered by unit tests).
+  senderHook: SenderHook;
+  // Recipient-side setup the source requires (e.g. registering a raw arbitrary secret); runs once after deployment.
+  recipientRegistration?: (
+    recipient: TestWallet,
+    recipientAddress: AztecAddress,
+    sender: AztecAddress,
+  ) => Promise<void>;
+  // Extra `it()`s to register in this cell's suite, e.g. assertions against state a custom `senderHook` recorded.
+  // Called inside the same `describe`, after the two baseline assertions below, so it shares their `beforeAll`
+  // instead of depending on Jest's cross-`describe` execution order.
+  additionalTests?: () => void;
+}) {
+  const { strategy, mode, senderHook, recipientRegistration, additionalTests } = opts;
+  const description = `${strategy} x ${formatMode(mode)}`;
+
+  describe(description, () => {
+    jest.setTimeout(300_000);
+
+    const eventValues = [10n, 20n, 30n];
+    const noteValues = [40n, 50n, 60n];
+
+    let aztecNode: AztecNode & AztecNodeDebug;
+    let walletSender: TestWallet;
+    let walletRecipient: TestWallet;
+    let sender: AztecAddress;
+    let recipient: AztecAddress;
+    let contractSender: OnchainDeliveryTestContract;
+    let teardownSender: () => Promise<void>;
+    let teardownRecipient: () => Promise<void>;
+    // Discovery results captured in beforeAll, so the assertions in the actual tests below stay pure.
+    // A failure during delivery fails beforeAll loudly instead of being swallowed as an expected red.
+    let discoveredEvents: FieldLike[];
+    let readNotes: bigint[];
+
+    const { events: eventMode, notes: noteMode } = typeof mode === 'string' ? { events: mode, notes: mode } : mode;
+    const sendEvent = (value: bigint) =>
+      eventMode === 'constrained'
+        ? contractSender.methods.emit_event(recipient, value)
+        : contractSender.methods.emit_event_unconstrained(recipient, value);
+    const sendNote = (value: bigint) =>
+      noteMode === 'constrained'
+        ? contractSender.methods.emit_note(recipient, value)
+        : contractSender.methods.emit_note_unconstrained(recipient, value);
+
+    beforeAll(async () => {
+      // The sender PXE holds the sender and carries this cell's tagging-secret-strategy hook. The recipient is funded
+      // at genesis here but created and deployed on the isolated recipient PXE below, so it carries no sender state
+      // from other cells.
+      let additionallyFundedAccounts: InitialAccountData[];
+      ({
+        aztecNode,
+        additionallyFundedAccounts,
+        wallet: walletSender,
+        accounts: [sender],
+        teardown: teardownSender,
+      } = await setup(1, {
+        ...AUTOMINE_E2E_OPTS,
+        additionallyFundedAccounts: await generateSchnorrAccounts(1, 'schnorr'),
+        pxeCreationOptions: { hooks: { resolveTaggingSecretStrategy: senderHook } },
+      }));
+
+      ({ wallet: walletRecipient, teardown: teardownRecipient } = await setupPXEAndGetWallet(
+        aztecNode,
+        aztecNode,
+        {},
+        undefined,
+        'pxe-recipient',
+      ));
+      const recipientAccount = await walletRecipient.createSchnorrAccount(
+        additionallyFundedAccounts[0].secret,
+        additionallyFundedAccounts[0].salt,
+        additionallyFundedAccounts[0].signingKey,
+      );
+      await (await recipientAccount.getDeployMethod()).send({ from: NO_FROM });
+      recipient = recipientAccount.address;
+
+      await ensureHandshakeRegistryPublished(walletSender, sender);
+      const { contract: deployed, instance } = await OnchainDeliveryTestContract.deploy(walletSender).send({
+        from: sender,
+      });
+      contractSender = deployed;
+
+      await ensureHandshakeRegistryPublished(walletRecipient, recipient);
+      await walletRecipient.registerContract(instance, OnchainDeliveryTestContract.artifact);
+
+      await recipientRegistration?.(walletRecipient, recipient, sender);
+
+      // Constrained sends to one pair are strictly ordered, so deliver one tx at a time. The first send bootstraps the
+      // handshake (when the source is a handshake); the rest reuse it.
+      const blockNumbers: number[] = [];
+      for (const value of eventValues) {
+        const { receipt } = await sendEvent(value).send({ from: sender });
+        blockNumbers.push(receipt.blockNumber!);
+      }
+      for (const value of noteValues) {
+        await sendNote(value).send({ from: sender });
+      }
+
+      await walletRecipient.sync();
+
+      const events = await walletRecipient.getPrivateEvents<DeliveryEvent>(
+        OnchainDeliveryTestContract.events.DeliveryEvent,
+        {
+          contractAddress: contractSender.address,
+          fromBlock: BlockNumber(Math.min(...blockNumbers)),
+          toBlock: BlockNumber(Math.max(...blockNumbers) + 1),
+          scopes: [recipient],
+        },
+      );
+      discoveredEvents = events.map(e => e.event.value);
+
+      const contractRecipient = OnchainDeliveryTestContract.at(contractSender.address, walletRecipient);
+      const { result } = await contractRecipient.methods.get_note_values(recipient).simulate({ from: recipient });
+      readNotes = result.storage.slice(0, Number(result.len));
+    });
+
+    afterAll(async () => {
+      await teardownRecipient();
+      await teardownSender();
+    });
+
+    it('the recipient PXE discovers the events delivered by the sender PXE', () => {
+      expect(discoveredEvents.length).toBe(eventValues.length);
+      for (const value of eventValues) {
+        expect(discoveredEvents).toContainEqual(value);
+      }
+    });
+
+    it('the recipient PXE reads back the notes delivered by the sender PXE', () => {
+      expect(readNotes).toEqual(noteValues);
+    });
+
+    additionalTests?.();
+  });
+}

package/src/{e2e_blacklist_token_contract → automine/token}/blacklist_token_contract_test.ts

@@ -1,21 +1,18 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
 import { computeSecretHash } from '@aztec/aztec.js/crypto';
 import { Fr } from '@aztec/aztec.js/fields';
-import { type Logger, createLogger } from '@aztec/aztec.js/log';
-import type { AztecNode } from '@aztec/aztec.js/node';
+import { createLogger } from '@aztec/aztec.js/log';
 import type { TxHash } from '@aztec/aztec.js/tx';
-import type { CheatCodes } from '@aztec/aztec/testing';
 import type { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { TokenBlacklistContract } from '@aztec/noir-contracts.js/TokenBlacklist';
 import { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
 import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAccount';
-import type { SequencerClient } from '@aztec/sequencer-client';
 
 import { jest } from '@jest/globals';
 
-import { type EndToEndContext, deployAccounts, publicDeployAccounts, setup, teardown } from '../fixtures/setup.js';
-import { TokenSimulator } from '../simulators/token_simulator.js';
-import type { TestWallet } from '../test-wallet/test_wallet.js';
+import { ensureAuthRegistryPublished } from '../../fixtures/setup.js';
+import { TokenSimulator } from '../../simulators/token_simulator.js';
+import { AutomineTestContext, type AutomineTestOpts } from '../automine_test_context.js';
 
 export class Role {
   private isAdmin = false;
@@ -44,35 +41,33 @@ export class Role {
   }
 }
 
-export class BlacklistTokenContractTest {
+/**
+ * TokenBlacklist-domain harness over the automine topology: extends {@link AutomineTestContext} with a
+ * {@link TokenSimulator}, the {@link Role} helper, the TokenBlacklist deploy plus a bad-account and
+ * authwit proxy, and the role-change-delay warp. Base setup and mint run in {@link setup}.
+ */
+export class BlacklistTokenContractTest extends AutomineTestContext {
   // This value MUST match the same value that we have in the contract
   static CHANGE_ROLES_DELAY = 86400;
 
-  context!: EndToEndContext;
-  logger: Logger;
-  wallet!: TestWallet;
   asset!: TokenBlacklistContract;
   tokenSim!: TokenSimulator;
   badAccount!: InvalidAccountContract;
   authwitProxy!: GenericProxyContract;
-  cheatCodes!: CheatCodes;
-  sequencer!: SequencerClient;
-  aztecNode!: AztecNode;
 
   adminAddress!: AztecAddress;
   otherAddress!: AztecAddress;
   blacklistedAddress!: AztecAddress;
 
+  private testName: string;
+
   constructor(testName: string) {
-    this.logger = createLogger(`e2e:e2e_blacklist_token_contract:${testName}`);
+    super();
+    this.testName = testName;
   }
 
   async crossTimestampOfChange() {
-    await this.cheatCodes.warpL2TimeAtLeastBy(
-      this.sequencer,
-      this.aztecNode,
-      BlacklistTokenContractTest.CHANGE_ROLES_DELAY,
-    );
+    await this.markProvenAndWarp(BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
   }
 
   /**
@@ -81,30 +76,18 @@ export class BlacklistTokenContractTest {
    * 2. Publicly deploy accounts, deploy token contract and a "bad account".
    */
   async applyBaseSetup() {
-    // Adding a timeout of 2 minutes in here such that it is propagated to the underlying tests
-    jest.setTimeout(120_000);
-
-    this.logger.info('Deploying 3 accounts');
-    const { deployedAccounts } = await deployAccounts(
-      3,
-      this.logger,
-    )({
-      wallet: this.context.wallet,
-      initialFundedAccounts: this.context.initialFundedAccounts,
-    });
+    // Bumped from 2 min: pipelined cadence (~24s/dependent-tx) makes the 3-account deploy plus token/bad-account/
+    // proxy deploys exceed the original window.
+    jest.setTimeout(600_000);
 
     this.cheatCodes = this.context.cheatCodes;
     this.aztecNode = this.context.aztecNodeService;
     this.sequencer = this.context.sequencer!;
     this.wallet = this.context.wallet;
-    this.adminAddress = deployedAccounts[0].address;
-    this.otherAddress = deployedAccounts[1].address;
-    this.blacklistedAddress = deployedAccounts[2].address;
+    [this.adminAddress, this.otherAddress, this.blacklistedAddress] = this.context.accounts;
 
     this.logger.info('Setting up blacklist token contract');
-    // Create the token contract state.
-    this.logger.verbose(`Public deploy accounts...`);
-    await publicDeployAccounts(this.wallet, [this.adminAddress, this.otherAddress, this.blacklistedAddress]);
+    await ensureAuthRegistryPublished(this.wallet, this.adminAddress);
 
     this.logger.verbose(`Deploying TokenContract...`);
     ({ contract: this.asset } = await TokenBlacklistContract.deploy(this.wallet, this.adminAddress).send({
@@ -142,19 +125,13 @@ export class BlacklistTokenContractTest {
     ).toEqual(new Role().withAdmin().toNoirStruct());
   }
 
-  async setup() {
-    this.logger.info('Setting up fresh context');
-    this.context = await setup(0, {
-      fundSponsoredFPC: true,
-      skipAccountDeployment: true,
-    });
+  override async setup(opts: AutomineTestOpts = {}) {
+    await super.setup({ numberOfAccounts: 3, ...opts });
+    // hydrateFromContext repoints `this.logger` at the context logger; restore the harness-named one.
+    this.logger = createLogger(`e2e:automine:blacklist:${this.testName}`);
     await this.applyBaseSetup();
   }
 
-  async teardown() {
-    await teardown(this.context);
-  }
-
   async addPendingShieldNoteToPXE(
     contract: TokenBlacklistContract,
     recipient: AztecAddress,