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

package/src/automine/delivery/onchain_delivery_harness.ts

@@ -0,0 +1,213 @@
+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, CompleteAddress } from '@aztec/aztec.js/addresses';
+import type { AztecNode } from '@aztec/aztec.js/node';
+import type { AccountManager } from '@aztec/aztec.js/wallet';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { type DeliveryEvent, OnchainDeliveryTestContract } from '@aztec/noir-test-contracts.js/OnchainDeliveryTest';
+import type { CustomRequest, ResolveCustomRequest, ResolveTaggingSecretStrategy } from '@aztec/pxe/config';
+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';
+
+// Builds the hook serving custom requests issued during the sender's simulations. Installed on the sender PXE at
+// creation but built only once the recipient exists, since serving typically needs the recipient's wallet and keys.
+export type CustomRequestResponder = (
+  recipient: TestWallet,
+  recipientAccount: InitialAccountData,
+  recipientCompleteAddress: CompleteAddress,
+) => ResolveCustomRequest;
+
+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: ResolveTaggingSecretStrategy;
+  // 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>;
+  // Serves the custom requests issued during the sender's simulations (e.g. the registry's interactive-handshake
+  // signature request).
+  customRequestResponder?: CustomRequestResponder;
+  // 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, customRequestResponder, 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);
+
+    let additionallyFundedAccounts: InitialAccountData[];
+    let recipientAccount: AccountManager | undefined;
+    let customRequestCount = 0;
+
+    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.
+      ({
+        aztecNode,
+        additionallyFundedAccounts,
+        wallet: walletSender,
+        accounts: [sender],
+        teardown: teardownSender,
+      } = await setup(1, {
+        ...AUTOMINE_E2E_OPTS,
+        additionallyFundedAccounts: await generateSchnorrAccounts(1, 'schnorr'),
+        pxeCreationOptions: {
+          hooks: {
+            resolveTaggingSecretStrategy: senderHook,
+            resolveCustomRequest: async (request: CustomRequest) => {
+              if (!customRequestResponder) {
+                throw new Error('A custom request arrived but this test cell has no customRequestResponder configured');
+              }
+              if (!recipientAccount) {
+                throw new Error('A custom request arrived before the recipient wallet was created');
+              }
+              customRequestCount++;
+              const respond = customRequestResponder(
+                walletRecipient,
+                additionallyFundedAccounts[0],
+                await recipientAccount.getCompleteAddress(),
+              );
+              return respond(request);
+            },
+          },
+        },
+      }));
+
+      ({ wallet: walletRecipient, teardown: teardownRecipient } = await setupPXEAndGetWallet(
+        aztecNode,
+        aztecNode,
+        {},
+        undefined,
+        'pxe-recipient',
+      ));
+      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);
+    });
+
+    if (customRequestResponder) {
+      it('the custom request hook fires exactly once, on the send that bootstraps the tagging secret', () => {
+        expect(customRequestCount).toBe(1);
+      });
+    }
+
+    additionalTests?.();
+  });
+}

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

@@ -1,28 +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 type { AztecNodeDebug } from '@aztec/stdlib/interfaces/client';
 
 import { jest } from '@jest/globals';
 
-import {
-  type EndToEndContext,
-  type SetupOptions,
-  ensureAuthRegistryPublished,
-  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;
@@ -51,37 +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 & AztecNodeDebug;
 
   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() {
-    // Under AUTOMINE_E2E_OPTS, the 86400s warp crosses many epochs without any proofs being
-    // submitted. Mark current pending checkpoints as proven first so the rollup contract's
-    // pruning window doesn't reset the chain tip to genesis (which would make the warp's
-    // own empty-checkpoint propose fail with Rollup__InvalidArchive). See the AutomineSequencer
-    // README "Epoch proving caveat" and the equivalent pattern in lending_simulator.progressSlots.
-    await this.cheatCodes.rollup.markAsProven();
-    await this.cheatCodes.warpL2TimeAtLeastBy(this.aztecNode, BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
+    await this.markProvenAndWarp(BlacklistTokenContractTest.CHANGE_ROLES_DELAY);
   }
 
   /**
@@ -139,19 +125,13 @@ export class BlacklistTokenContractTest {
     ).toEqual(new Role().withAdmin().toNoirStruct());
   }
 
-  async setup(opts: Partial<SetupOptions> = {}) {
-    this.logger.info('Setting up fresh context');
-    this.context = await setup(3, {
-      ...opts,
-      fundSponsoredFPC: 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,

package/src/{e2e_token_contract → automine/token}/token_contract_test.ts

@@ -1,5 +1,5 @@
 import { AztecAddress } from '@aztec/aztec.js/addresses';
-import { type Logger, createLogger } from '@aztec/aztec.js/log';
+import { createLogger } from '@aztec/aztec.js/log';
 import type { AztecNode } from '@aztec/aztec.js/node';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
@@ -7,25 +7,23 @@ import { InvalidAccountContract } from '@aztec/noir-test-contracts.js/InvalidAcc
 
 import { jest } from '@jest/globals';
 
-import {
-  type EndToEndContext,
-  type SetupOptions,
-  ensureAuthRegistryPublished,
-  setup,
-  teardown,
-} from '../fixtures/setup.js';
-import { mintTokensToPrivate } from '../fixtures/token_utils.js';
-import { TokenSimulator } from '../simulators/token_simulator.js';
-import type { TestWallet } from '../test-wallet/test_wallet.js';
+import { ensureAuthRegistryPublished } from '../../fixtures/setup.js';
+import { mintTokensToPrivate } from '../../fixtures/token_utils.js';
+import { TokenSimulator } from '../../simulators/token_simulator.js';
+import { AutomineTestContext, type AutomineTestOpts } from '../automine_test_context.js';
 
 const { METRICS_PORT: metricsPort } = process.env;
 
-export class TokenContractTest {
+/**
+ * Token-domain harness over the automine topology: extends {@link AutomineTestContext} with a
+ * {@link TokenSimulator}, the USDC Token deploy plus a bad-account and authwit proxy, and an optional
+ * mint. Base setup is opt-in via {@link applyBaseSnapshots} (run during `setup()`); {@link applyMint}
+ * is called explicitly after `setup()`.
+ */
+export class TokenContractTest extends AutomineTestContext {
   static TOKEN_NAME = 'USDC';
   static TOKEN_SYMBOL = 'USD';
   static TOKEN_DECIMALS = 18n;
-  context!: EndToEndContext;
-  logger: Logger;
   metricsPort?: number;
   asset!: TokenContract;
   tokenSim!: TokenSimulator;
@@ -33,16 +31,16 @@ export class TokenContractTest {
 
   badAccount!: InvalidAccountContract;
   authwitProxy!: GenericProxyContract;
-  wallet!: TestWallet;
   adminAddress!: AztecAddress;
-  account1Address!: AztecAddress;
+  otherAddress!: AztecAddress;
   account2Address!: AztecAddress;
 
   private shouldApplyBaseSetup = false;
-  private shouldApplyMint = false;
+  private testName: string;
 
   constructor(testName: string) {
-    this.logger = createLogger(`e2e:e2e_token_contract:${testName}`);
+    super();
+    this.testName = testName;
     this.metricsPort = metricsPort ? parseInt(metricsPort) : undefined;
   }
 
@@ -54,14 +52,6 @@ export class TokenContractTest {
     this.shouldApplyBaseSetup = true;
   }
 
-  /**
-   * Registers that mint should be applied during setup().
-   * Call this before setup() to mint tokens to the admin account.
-   */
-  applyMintSnapshot() {
-    this.shouldApplyMint = true;
-  }
-
   /**
    * Applies base setup: deploys 3 accounts, publicly deploys accounts, token contract and a "bad account".
    */
@@ -71,7 +61,7 @@ export class TokenContractTest {
 
     this.node = this.context.aztecNodeService;
     this.wallet = this.context.wallet;
-    [this.adminAddress, this.account1Address, this.account2Address] = this.context.accounts;
+    [this.adminAddress, this.otherAddress, this.account2Address] = this.context.accounts;
 
     this.logger.info('Applying base setup - deploying token contract');
     await ensureAuthRegistryPublished(this.wallet, this.adminAddress);
@@ -103,7 +93,7 @@ export class TokenContractTest {
 
     this.tokenSim = new TokenSimulator(this.asset, this.wallet, this.adminAddress, this.logger, [
       this.adminAddress,
-      this.account1Address,
+      this.otherAddress,
     ]);
 
     expect((await this.asset.methods.get_admin().simulate({ from: this.adminAddress })).result).toBe(
@@ -111,27 +101,18 @@ export class TokenContractTest {
     );
   }
 
-  async setup(opts: Partial<SetupOptions> = {}) {
-    this.context = await setup(3, {
-      ...opts,
-      metricsPort: this.metricsPort,
-      fundSponsoredFPC: true,
-    });
+  override async setup(opts: AutomineTestOpts = {}) {
+    await super.setup({ numberOfAccounts: 3, metricsPort: this.metricsPort, ...opts });
+    // hydrateFromContext repoints `this.logger` at the context logger; restore the harness-named one.
+    this.logger = createLogger(`e2e:automine:token:${this.testName}`);
 
     if (this.shouldApplyBaseSetup) {
       await this.applyBaseSetup();
     }
-
-    if (this.shouldApplyMint) {
-      await this.applyMint();
-    }
-  }
-
-  async teardown() {
-    await teardown(this.context);
   }
 
-  private async applyMint() {
+  /** Mints an initial public and private balance to the admin account. Call after {@link setup}. */
+  async applyMint() {
     this.logger.info('Applying mint setup');
     const { asset, adminAddress, tokenSim } = this;
     const amount = 10000n;

package/src/automine/token/token_test_helpers.ts

@@ -0,0 +1,138 @@
+import type { AztecAddress } from '@aztec/aztec.js/addresses';
+import type { ContractFunctionInteraction } from '@aztec/aztec.js/contracts';
+import type { Logger } from '@aztec/aztec.js/log';
+import type { Wallet } from '@aztec/aztec.js/wallet';
+import { AMMContract } from '@aztec/noir-contracts.js/AMM';
+import type { GenericProxyContract } from '@aztec/noir-test-contracts.js/GenericProxy';
+
+import { sendThroughAuthwitProxy } from '../../fixtures/authwit_proxy.js';
+import { DUPLICATE_NULLIFIER_ERROR } from '../../fixtures/fixtures.js';
+import { type AnyTokenContract, mintTokensToPrivate } from '../../fixtures/token_utils.js';
+import type { TestWallet } from '../../test-wallet/test_wallet.js';
+
+/** Whether an amount / balance is read from the private or public balance of the token. */
+export type BalanceKind = 'private' | 'public';
+
+/** The invalid-authwit-nonce assertion the contract raises when `from == msg_sender` but nonce != 0. */
+export const INVALID_AUTHWIT_NONCE_ERROR =
+  "Assertion failed: Invalid authwit nonce. When 'from' and 'msg_sender' are the same, 'authwit_nonce' must be zero";
+
+/** Minimal token shape needed to read balances — satisfied structurally by Token/TestToken/TokenBlacklist. */
+export interface BalanceReadable {
+  methods: {
+    balance_of_private(owner: AztecAddress): { simulate(opts: { from: AztecAddress }): Promise<{ result: bigint }> };
+    balance_of_public(owner: AztecAddress): { simulate(opts: { from: AztecAddress }): Promise<{ result: bigint }> };
+  };
+}
+
+/** Reads the private or public balance of an account, simulating from that account's own scope. */
+export async function balanceOf(asset: BalanceReadable, kind: BalanceKind, account: AztecAddress): Promise<bigint> {
+  const interaction =
+    kind === 'private' ? asset.methods.balance_of_private(account) : asset.methods.balance_of_public(account);
+  return (await interaction.simulate({ from: account })).result;
+}
+
+/** Returns half of an account's balance, asserting it is non-zero so the operation under test is meaningful. */
+export async function halfBalanceOf(asset: BalanceReadable, kind: BalanceKind, owner: AztecAddress): Promise<bigint> {
+  const amount = (await balanceOf(asset, kind, owner)) / 2n;
+  expect(amount).toBeGreaterThan(0n);
+  return amount;
+}
+
+/** Returns an amount just above an account's balance (balance + delta), asserting it is non-zero. */
+export async function amountAboveBalance(
+  asset: BalanceReadable,
+  kind: BalanceKind,
+  owner: AztecAddress,
+  delta = 1n,
+): Promise<bigint> {
+  const amount = (await balanceOf(asset, kind, owner)) + delta;
+  expect(amount).toBeGreaterThan(0n);
+  return amount;
+}
+
+/**
+ * Grants a public authwit for `caller` to run `action` on behalf of `owner`, executes it from `caller`,
+ * then asserts a replay of the same call reverts as unauthorized (the authwit is single-use).
+ *
+ * `onExecuted` runs after the successful execution (before the replay attempt) so callers can update
+ * their {@link TokenSimulator} to match the state change the executed action produced.
+ */
+export async function assertPublicAuthwitReplayRejected(
+  wallet: TestWallet,
+  owner: AztecAddress,
+  action: ContractFunctionInteraction,
+  caller: AztecAddress,
+  onExecuted?: () => void,
+): Promise<void> {
+  const grant = await wallet.setPublicAuthWit(owner, { caller, action }, true);
+  await grant.send();
+
+  await action.send({ from: caller });
+  onExecuted?.();
+
+  await expect(action.simulate({ from: caller })).rejects.toThrow(/unauthorized/);
+}
+
+/**
+ * Creates a private authwit for `owner`, executes `action` through the authwit proxy (so `msg_sender`
+ * differs from the note owner), then asserts a replay reverts with a duplicate-nullifier error.
+ *
+ * `onExecuted` runs after the successful execution (before the replay attempt) so callers can update
+ * their {@link TokenSimulator} to match the state change the executed action produced.
+ */
+export async function assertAuthwitProxyReplayRejected(
+  proxy: GenericProxyContract,
+  wallet: TestWallet,
+  owner: AztecAddress,
+  action: ContractFunctionInteraction,
+  onExecuted?: () => void,
+): Promise<void> {
+  const witness = await wallet.createAuthWit(owner, { caller: proxy.address, action });
+
+  await sendThroughAuthwitProxy(proxy, action, { from: owner, authWitnesses: [witness] });
+  onExecuted?.();
+
+  await expect(sendThroughAuthwitProxy(proxy, action, { from: owner, authWitnesses: [witness] })).rejects.toThrow(
+    DUPLICATE_NULLIFIER_ERROR,
+  );
+}
+
+/**
+ * Deploys an {@link AMMContract} over three freshly deployed tokens (token0, token1, and the liquidity
+ * token), makes the AMM the liquidity token's minter, and mints `initialBalance` of token0 and token1 to
+ * each liquidity provider plus token0 to the swapper. `deploy` selects the token flavour (Token vs
+ * TestToken), so the concrete token type flows through to the caller.
+ */
+export async function deployAmmWithTokens<T extends AnyTokenContract>(
+  wallet: Wallet,
+  admin: AztecAddress,
+  deploy: (wallet: Wallet, admin: AztecAddress, initialBalance: bigint, logger: Logger) => Promise<{ contract: T }>,
+  opts: { liquidityProviders: AztecAddress[]; swapper: AztecAddress; initialBalance: bigint; logger: Logger },
+): Promise<{ token0: T; token1: T; liquidityToken: T; amm: AMMContract }> {
+  const { liquidityProviders, swapper, initialBalance, logger } = opts;
+
+  const { contract: token0 } = await deploy(wallet, admin, 0n, logger);
+  const { contract: token1 } = await deploy(wallet, admin, 0n, logger);
+  const { contract: liquidityToken } = await deploy(wallet, admin, 0n, logger);
+
+  const { contract: amm } = await AMMContract.deploy(
+    wallet,
+    token0.address,
+    token1.address,
+    liquidityToken.address,
+  ).send({ from: admin });
+
+  // TODO(#9480): consider deploying the token by some factory when the AMM is deployed, and making the AMM be the
+  // minter there.
+  await liquidityToken.methods.set_minter(amm.address, true).send({ from: admin });
+
+  for (const lp of liquidityProviders) {
+    await mintTokensToPrivate(token0, admin, lp, initialBalance);
+    await mintTokensToPrivate(token1, admin, lp, initialBalance);
+  }
+  // Note that the swapper only holds token0, not token1.
+  await mintTokensToPrivate(token0, admin, swapper, initialBalance);
+
+  return { token0, token1, liquidityToken, amm };
+}

package/src/bench/client_flows/benchmark.ts

@@ -336,7 +336,9 @@ export function convertProfileToGHBenchmark(benchmark: ClientFlowBenchmark): Git
  */
 export function expectedExecutionSteps(apps: number): number {
   const kernels = Math.ceil(apps / MAX_APPS_PER_KERNEL);
-  return apps + kernels + 1 /* final reset */ + 1 /* tail */ + 1 /* hiding */;
+  // The final reset and tail are proved as a single circuit (reset_tail or reset_tail_to_public),
+  // so they share one execution step.
+  return apps + kernels + 1 /* reset+tail */ + 1 /* hiding */;
 }
 
 export async function captureProfile(

package/src/bench/client_flows/client_flows_benchmark.ts

@@ -13,6 +13,7 @@ import { deployL1Contract } from '@aztec/ethereum/deploy-l1-contract';
 import { ChainMonitor } from '@aztec/ethereum/test';
 import { randomBytes } from '@aztec/foundation/crypto/random';
 import { Fr } from '@aztec/foundation/curves/bn254';
+import { GrumpkinScalar } from '@aztec/foundation/curves/grumpkin';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { TestERC20Abi } from '@aztec/l1-artifacts/TestERC20Abi';
 import { TestERC20Bytecode } from '@aztec/l1-artifacts/TestERC20Bytecode';
@@ -26,7 +27,7 @@ import { getCanonicalFeeJuice } from '@aztec/protocol-contracts/fee-juice';
 import { type PXEConfig, getPXEConfig } from '@aztec/pxe/server';
 import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import { Gas, GasSettings } from '@aztec/stdlib/gas';
-import { deriveSigningKey } from '@aztec/stdlib/keys';
+import { AppTaggingSecretKind } from '@aztec/stdlib/logs';
 
 import {
   AUTOMINE_E2E_OPTS,
@@ -191,7 +192,7 @@ export class ClientFlowsBenchmark {
 
     let benchysPrivateSigningKey;
     if (type === 'schnorr') {
-      benchysPrivateSigningKey = deriveSigningKey(benchysSecret);
+      benchysPrivateSigningKey = GrumpkinScalar.random();
       return wallet.createSchnorrAccount(benchysSecret, salt, benchysPrivateSigningKey);
     } else if (type === 'ecdsar1') {
       benchysPrivateSigningKey = randomBytes(32);
@@ -231,6 +232,19 @@ export class ClientFlowsBenchmark {
       loggers: {
         prover: this.proxyLogger.createLogger('pxe:bb:wasm:bundle:proxied'),
       },
+      // The benchmark measures steady-state app cost, not first-send discovery cost. Reproduce the pre-handshake-default
+      // behavior of unconstrained delivery: derive the tagging secret from the (sender, recipient) key pair via ECDH
+      // instead of taking the current default (a non-interactive handshake, which injects two extra private app
+      // executions and a nullifier per cold chain). Constrained delivery is unaffected: the Noir circuit rejects
+      // address-derived for constrained, so the hook falls through to a handshake there.
+      hooks: {
+        resolveTaggingSecretStrategy: ({ deliveryMode }) =>
+          Promise.resolve(
+            deliveryMode === AppTaggingSecretKind.UNCONSTRAINED
+              ? { type: 'address-derived' }
+              : { type: 'non-interactive-handshake' },
+          ),
+      },
     });
   }
 
@@ -343,7 +357,6 @@ export class ClientFlowsBenchmark {
 
   public async createAndFundBenchmarkingAccountOnUserWallet(accountType: AccountType) {
     const benchysAccountManager = await this.createBenchmarkingAccountManager(this.adminWallet, accountType);
-    const benchysAccount = await benchysAccountManager.getAccount();
     const benchysAddress = benchysAccountManager.address;
     const claim = await this.feeJuiceBridgeTestHarness.prepareTokensOnL1(benchysAddress);
     const behchysDeployMethod = await benchysAccountManager.getDeployMethod();
@@ -353,7 +366,7 @@ export class ClientFlowsBenchmark {
     });
     // Register benchy on the user's Wallet, where we're going to be interacting from
     const accountManager = await this.userWallet.createAccount({
-      secret: benchysAccount.getSecretKey(),
+      secret: benchysAccountManager.getSecretKey(),
       salt: new Fr(benchysAccountManager.getInstance().salt),
       contract: benchysAccountManager.getAccountContract(),
     });