chore(fast-inbox): single canonical path for rollup sample-input regeneration (A-1435)

Make the prover-client regenerate_rollup_sample_inputs suite the sole owner of
every block-root, block-merge, checkpoint, tx-merge, and root rollup Prover.toml,
and stop the e2e full.test dump from writing the block-root and checkpoint samples
it overlapped on. The two paths previously both wrote rollup-block-root-first,
rollup-block-root-first-single-tx, rollup-checkpoint-root-single-block,
rollup-checkpoint-merge, and rollup-root, so the committed fixtures drifted
depending on which ran last.

The e2e dump now regenerates only what needs real client-proved transactions the
simulated orchestrator cannot produce: the private-kernel circuits and the
transaction-base rollups. A dedicated three-tx scenario restores rollup-tx-merge
coverage (dropped when orchestrator_single_checkpoint.test.ts was replaced), so
the suite covers every rollup circuit at or above the transaction merge.

Update the regen docs (barretenberg cpp CLAUDE.md, update-prover-toml and
gate-counts skills) to the two-command split and drop the dead
orchestrator_single_checkpoint references.

Author: spalladino

barretenberg/.claude/skills/gate-counts/SKILL.md

@@ -209,41 +209,42 @@ Then retry `bb gates`.
 The committed `Prover.toml` files carry fake recursive proofs whose length is
 frozen at the value present when they were last generated. After a proof-length
 change they must be regenerated (or hacked — see below). Two commands cover all
-protocol circuits:
+protocol circuits, split by whether the sample needs a real client-proved
+transaction.
 
-**Kernel circuits + most rollup circuits** (spins up an L1/anvil sandbox):
+**Block-root and above rollup circuits — prover-client suite** (simulated
+orchestrator, no L1 sandbox):
 
 ```bash
-AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 \
-  yarn workspace @aztec/end-to-end test:e2e e2e_prover/full.test
+AZTEC_GENERATE_TEST_DATA=1 \
+  yarn workspace @aztec/prover-client test regenerate_rollup_sample_inputs
 ```
 
-Regenerates `Prover.toml` for: `private-kernel-init` and its `private-kernel-init-N`
-variants, `private-kernel-inner` and its `private-kernel-inner-N` variants,
-`private-kernel-reset`, `private-kernel-reset-tail`,
-`private-kernel-reset-tail-to-public`, `rollup-tx-base-private`,
-`rollup-tx-base-public`, `rollup-block-root-first`,
-`rollup-block-root-first-single-tx`, `rollup-checkpoint-root-single-block`,
-`rollup-checkpoint-merge`, `rollup-root`.
+Regenerates `Prover.toml` for `rollup-block-root-first-empty-tx`,
+`rollup-block-root-first`, `rollup-block-root-first-single-tx`,
+`rollup-block-root`, `rollup-block-root-single-tx`, `rollup-block-merge`,
+`rollup-checkpoint-root`, `rollup-checkpoint-root-single-block`,
+`rollup-checkpoint-merge`, `rollup-tx-merge`, `rollup-root`.
 
-**Rollup circuits NOT covered by `full.test`** (incl. `rollup-tx-merge`):
+**Private-kernel + transaction-base circuits — e2e prover full test** (spins up
+an L1/anvil sandbox):
 
 ```bash
 AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 \
-  yarn workspace @aztec/prover-client test src/orchestrator/orchestrator_single_checkpoint.test.ts
+  yarn workspace @aztec/end-to-end test:e2e e2e_prover/full.test
 ```
 
-Regenerates `Prover.toml` for `rollup-tx-merge`, `rollup-block-root-first-empty-tx`,
-`rollup-block-root` (single-tx checkpoint test) and `rollup-block-root-single-tx`,
-`rollup-block-merge`, `rollup-checkpoint-root` (multi-block checkpoint test).
-
-> **`rollup-tx-merge`'s `Prover.toml` is regenerated by the prover-client
-> command, NOT `full.test`** — it is commented out in `full.test`'s circuit
-> list. Use the prover-client command for the tx-merge circuit.
+Regenerates `Prover.toml` for: `private-kernel-init` and its `private-kernel-init-N`
+variants, `private-kernel-inner` and its `private-kernel-inner-N` variants,
+`private-kernel-reset-tail`, `private-kernel-reset-tail-to-public`,
+`rollup-tx-base-private`, `rollup-tx-base-public`. These need real client-proved
+transactions the simulated orchestrator cannot produce. (`private-kernel-reset`,
+the inner reset, is commented out and hand-maintained — not regenerated.)
 
 The circuit lists live in the `updateProtocolCircuitSampleInputs(...)` loops in
-`yarn-project/end-to-end/src/e2e_prover/full.test.ts` and
-`yarn-project/prover-client/src/orchestrator/orchestrator_single_checkpoint.test.ts`;
+`yarn-project/end-to-end/src/single-node/prover/server/full.test.ts` and the
+`scenarios` array in
+`yarn-project/prover-client/src/test/regenerate_rollup_sample_inputs.test.ts`;
 re-read them if a circuit seems missing (entries get commented in/out).
 
 ### Build prerequisites for regeneration

barretenberg/.claude/skills/update-prover-toml/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: update-prover-toml
-description: Regenerate the protocol-circuit sample Prover.toml files (the witnesses CI feeds to `nargo execute`). Covers which e2e test/commands regenerate which tomls, and the one exception — private-kernel-reset/Prover.toml (the inner reset) — which is NOT generated by the test at all and is maintained entirely by hand. Use when a `nargo execute` CI check fails on a crates/*/Prover.toml, after changing protocol-circuit inputs/constants, or when asked to refresh/regenerate Prover.toml sample inputs.
+description: Regenerate the protocol-circuit sample Prover.toml files (the witnesses CI feeds to `nargo execute`). Covers which of the two commands regenerates which tomls — the prover-client `regenerate_rollup_sample_inputs` suite for the block-root and above rollup circuits, and the e2e prover full test for the private-kernel and transaction-base circuits — and the one exception, private-kernel-reset/Prover.toml (the inner reset), which is NOT generated by the test at all and is maintained entirely by hand. Use when a `nargo execute` CI check fails on a crates/*/Prover.toml, after changing protocol-circuit inputs/constants, or when asked to refresh/regenerate Prover.toml sample inputs.
 ---
 
 # Updating protocol-circuit Prover.toml files
@@ -21,11 +21,21 @@ The tomls are captured from a real end-to-end run, not written by hand (except t
 
 ## How regeneration works
 
-`yarn-project/end-to-end/src/e2e_prover/full.test.ts` has a test "generates sample Prover.toml files if generate test data is on". During proving, circuit inputs are captured via `pushTestData`/`getTestData`; the test then calls `updateProtocolCircuitSampleInputs(circuitName, TOML.stringify(...))` (`yarn-project/foundation/src/testing/files/index.ts`), which writes `noir-projects/noir-protocol-circuits/crates/<circuitName>/Prover.toml`.
+Two commands cover the protocol-circuit tomls, split by whether the sample needs a real client-proved transaction. Both capture circuit inputs during proving via `pushTestData`/`getTestData` and write them with `updateProtocolCircuitSampleInputs(circuitName, TOML.stringify(...))` (`yarn-project/foundation/src/testing/files/index.ts`), which writes `noir-projects/noir-protocol-circuits/crates/<circuitName>/Prover.toml`.
 
-The test early-returns unless **both** are true: `AZTEC_GENERATE_TEST_DATA=1` (enables `isGenerateTestDataEnabled()`) and fake proofs (`FAKE_PROOFS=1`, i.e. `REAL_PROOFS` is false).
+### Block-root and above rollup circuits — prover-client suite
 
-### Command
+`yarn-project/prover-client/src/test/regenerate_rollup_sample_inputs.test.ts` drives representative epochs through the simulated orchestrator and dumps each rollup circuit's captured input. The whole suite is `describe.skip`ped unless `AZTEC_GENERATE_TEST_DATA=1`, and it needs no L1 sandbox.
+
+```bash
+AZTEC_GENERATE_TEST_DATA=1 yarn workspace @aztec/prover-client test regenerate_rollup_sample_inputs
+```
+
+Regenerates: `rollup-block-root-first-empty-tx`, `rollup-block-root-first`, `rollup-block-root-first-single-tx`, `rollup-block-root`, `rollup-block-root-single-tx`, `rollup-block-merge`, `rollup-checkpoint-root`, `rollup-checkpoint-root-single-block`, `rollup-checkpoint-merge`, `rollup-tx-merge`, `rollup-root`. The scenario list lives in the `scenarios` array in that test; each scenario's `dump` field names the tomls it owns.
+
+### Private-kernel and transaction-base circuits — e2e prover full test
+
+`full.test.ts` has a test "generates sample Prover.toml files if generate test data is on". It early-returns unless **both** `AZTEC_GENERATE_TEST_DATA=1` (enables `isGenerateTestDataEnabled()`) and fake proofs (`FAKE_PROOFS=1`, i.e. `REAL_PROOFS` is false) are set. These circuits need real client-proved transactions, which the simulated orchestrator suite above cannot produce.
 
 From the repo root:
 
@@ -35,25 +45,16 @@ AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 yarn-project/end-to-end/scripts/run_tes
 
 (Equivalently, from `yarn-project/end-to-end`: `AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 yarn test:e2e e2e_prover/full.test`.) This is a full-stack run (L1 anvil + node + prover), ~15 min with fake proofs.
 
-After it finishes, review and stage the changed tomls with `git diff noir-projects/noir-protocol-circuits/crates/*/Prover.toml`.
-
-### Which tomls this regenerates
-
-The circuit list lives in the `forEach(circuitName => ...)` loop in `full.test.ts`. Currently active (regenerated by the run above):
+Regenerates:
 
 - `private-kernel-init`, `private-kernel-init-2` … `private-kernel-init-5`
 - `private-kernel-inner`, `private-kernel-inner-2` … `private-kernel-inner-5`
 - `private-kernel-reset-tail`, `private-kernel-reset-tail-to-public` (the terminal resets — these run as part of every tx's tail)
 - `rollup-tx-base-private`, `rollup-tx-base-public`
-- `rollup-block-root-first`, `rollup-block-root-first-single-tx`
-- `rollup-checkpoint-root-single-block`, `rollup-checkpoint-merge`
-- `rollup-root`
-
-`private-kernel-reset` (the **inner** reset) is deliberately **commented out** of this list and is **not** generated by the test — see the exception below.
 
-Other entries commented out (e.g. `rollup-tx-merge`, `rollup-block-root`, `rollup-block-merge`, `rollup-checkpoint-root`) are also not produced by this flow; the inline comment points to the orchestrator single-checkpoint test for those.
+The circuit list lives in the `forEach(circuitName => ...)` loop in `full.test.ts`. `private-kernel-reset` (the **inner** reset) is deliberately **commented out** of this list and is **not** generated by the test — see the exception below.
 
-If you add a new circuit crate, add its name to that list so its toml gets generated.
+After either run, review and stage the changed tomls with `git diff noir-projects/noir-protocol-circuits/crates/*/Prover.toml`. If you add a new circuit crate, add its name to the appropriate list so its toml gets generated.
 
 ## ⚠️ Exception: `private-kernel-reset/Prover.toml` (inner reset) is NOT generated — hand-maintain it
 

barretenberg/cpp/CLAUDE.md

@@ -136,21 +136,21 @@ If C++ static_asserts fail after your changes, update both the assert values AND
 
 Proof-length-affecting changes (e.g. `CHONK_PROOF_LENGTH` bumps from MegaFlavor entity additions) make the committed `Prover.toml` fixtures stale. `nargo execute --program-dir <crate>` then fails with `Type Array { length: N, typ: Field } is expected to have length N but value Vec(...)`.
 
-Regenerate via the e2e prover full test with fake proofs:
+Regeneration is split across two commands. The block-root, block-merge, checkpoint, tx-merge, and root rollup samples come from the prover-client suite, which drives the simulated orchestrator and needs no L1 sandbox:
 
 ```bash
-cd yarn-project
-AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 yarn workspace @aztec/end-to-end test e2e_prover/full.test
+AZTEC_GENERATE_TEST_DATA=1 yarn workspace @aztec/prover-client test regenerate_rollup_sample_inputs
 ```
 
-`FAKE_PROOFS=1` skips real proving — runs in ~2 min (orchestrator + witness generation only). Writes 12 `Prover.toml` files under `noir-projects/noir-protocol-circuits/crates/<circuit>/Prover.toml`.
-
-For circuits not exercised by `full.test.ts` (`rollup-tx-merge`, `rollup-block-root`, `rollup-block-root-single-tx`, `rollup-block-merge`, `rollup-checkpoint-root`, `rollup-block-root-first-empty-tx`), additionally run:
+The private-kernel samples and the transaction-base rollup samples (`rollup-tx-base-private`, `rollup-tx-base-public`) need real client-proved transactions, so they come from the e2e prover full test with fake proofs:
 
 ```bash
-AZTEC_GENERATE_TEST_DATA=1 yarn workspace @aztec/prover-client test orchestrator_single_checkpoint
+cd yarn-project
+AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 yarn workspace @aztec/end-to-end test e2e_prover/full.test
 ```
 
+`FAKE_PROOFS=1` skips real proving. Both write into `noir-projects/noir-protocol-circuits/crates/<circuit>/Prover.toml`.
+
 Verify with `nargo execute --program-dir noir-projects/noir-protocol-circuits/crates/<crate>` for any previously-failing crate; should print `Circuit witness successfully solved`.
 
 ## Verification Keys

yarn-project/end-to-end/src/single-node/prover/server/full.test.ts

@@ -321,7 +321,10 @@ describe('single-node/prover/full', () => {
       }),
     );
 
-    // For the commented out circuits, run the tests in orchestrator_single_checkpoint.test.ts to generate the sample inputs.
+    // Regenerates the private-kernel Prover.toml sample inputs plus the transaction-base rollup
+    // samples, which all need real client-proved transactions. The block-root, block-merge,
+    // checkpoint, tx-merge, and root rollup Prover.tomls are regenerated instead by the prover-client
+    // suite `regenerate_rollup_sample_inputs.test.ts`, so they are intentionally not written here.
     (
       [
         'private-kernel-init',
@@ -339,17 +342,6 @@ describe('single-node/prover/full', () => {
         'private-kernel-reset-tail-to-public',
         'rollup-tx-base-private',
         'rollup-tx-base-public',
-        // 'rollup-tx-merge',
-        'rollup-block-root-first',
-        'rollup-block-root-first-single-tx',
-        // 'rollup-block-root-first-empty-tx',
-        // 'rollup-block-root',
-        // 'rollup-block-root-single-tx',
-        // 'rollup-block-merge',
-        // 'rollup-checkpoint-root',
-        'rollup-checkpoint-root-single-block',
-        'rollup-checkpoint-merge',
-        'rollup-root',
       ] satisfies CircuitName[]
     ).forEach(circuitName => {
       const data = getTestData(circuitName);

yarn-project/foundation/src/testing/files/index.ts

@@ -51,8 +51,10 @@ export function updateInlineTestData(targetFileFromRepoRoot: string, itemName: s
 
 /**
  * Updates the sample Prover.toml files in noir-projects/noir-protocol-circuits/crates/.
- * @remarks Requires AZTEC_GENERATE_TEST_DATA=1 to be set
- * To re-gen, run 'AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 yarn test:e2e e2e_prover/full.test'
+ * @remarks Requires AZTEC_GENERATE_TEST_DATA=1 to be set. The block-root, block-merge, checkpoint,
+ * tx-merge, and root rollup samples are regenerated by the prover-client
+ * `regenerate_rollup_sample_inputs.test.ts` suite; the private-kernel and transaction-base rollup
+ * samples by the e2e 'AZTEC_GENERATE_TEST_DATA=1 FAKE_PROOFS=1 yarn test:e2e e2e_prover/full.test' dump.
  */
 export function updateProtocolCircuitSampleInputs(circuitName: string, value: string) {
   const logger = createConsoleLogger('aztec:testing:test_data');

yarn-project/prover-client/src/test/regenerate_rollup_sample_inputs.test.ts

@@ -16,11 +16,16 @@ import { ChonkCache } from '../orchestrator/chonk-cache.js';
 import { type CheckpointTopTreeData, TopTreeOrchestrator } from '../orchestrator/top-tree-orchestrator.js';
 
 // Regenerates the committed `crates/rollup-*/Prover.toml` sample inputs that CI runs `nargo execute`
-// against. The rollup circuits push their serialized inputs via `pushTestData` whenever they run
-// through the prover, so driving representative epochs through the (simulated) orchestrator and then
-// dumping `getTestData(circuitName)` produces fresh, ABI-current fixtures. Run with:
+// against, for every rollup circuit at or above the transaction merge: the block-root variants, the
+// block-merge, both checkpoint roots, the checkpoint-merge, the tx-merge, and the root rollup. The
+// rollup circuits push their serialized inputs via `pushTestData` whenever they run through the
+// prover, so driving representative epochs through the (simulated) orchestrator and then dumping
+// `getTestData(circuitName)` produces fresh, ABI-current fixtures. Run with:
 //   AZTEC_GENERATE_TEST_DATA=1 yarn workspace @aztec/prover-client test regenerate_rollup_sample_inputs
-// Without that flag the whole suite is skipped, so it is a no-op (no prover setup) in normal CI.
+// Without that flag the whole suite is skipped, so it is a no-op (no prover setup) in normal CI. The
+// `rollup-tx-base-private`/`rollup-tx-base-public` fixtures and the private-kernel fixtures depend on
+// real client-proved transactions the simulated orchestrator cannot produce, so those are regenerated
+// separately by the e2e `e2e_prover/full.test` dump instead.
 //
 // The scenarios are chosen to exercise each block-root variant the orchestrator selects (see
 // BlockProvingState#getBlockRootRollupTypeAndInputs): a first block with 0 txs, with >=2 txs, and
@@ -29,7 +34,10 @@ import { type CheckpointTopTreeData, TopTreeOrchestrator } from '../orchestrator
 // checkpoint epoch a checkpoint-merge; a merge node only exists above the tree root, so both merges
 // need three leaves — two would pair directly at the root. Single-block checkpoints feed the
 // checkpoint-root-single-block circuit and multi-block checkpoints the (two-input) checkpoint-root
-// circuit. Every scenario also produces the root rollup.
+// circuit. A block with three txs merges its transaction base proofs through the tx-merge circuit
+// before the (two-input) block root, whereas one- or two-tx blocks feed the block root directly, so a
+// dedicated three-tx scenario is what regenerates the tx-merge sample. Every scenario also produces
+// the root rollup.
 const describeOrSkip = isGenerateTestDataEnabled() ? describe : describe.skip;
 
 describeOrSkip('prover/regenerate-rollup-sample-inputs', () => {
@@ -81,6 +89,15 @@ describeOrSkip('prover/regenerate-rollup-sample-inputs', () => {
       numL1ToL2Messages: withMessages,
       dump: ['rollup-block-root'],
     },
+    // Three txs in a block force a tx-merge to pair the base proofs down to the two the block root
+    // takes; one- or two-tx blocks feed the block root directly and never exercise tx-merge.
+    {
+      numCheckpoints: 1,
+      numBlocksPerCheckpoint: 1,
+      numTxsPerBlock: 3,
+      numL1ToL2Messages: withMessages,
+      dump: ['rollup-tx-merge'],
+    },
     // The checkpoint-merge only appears with three checkpoints. Independently-built checkpoints do
     // not carry the inbox message state forward, so this scenario runs with no L1-to-L2 messages and
     // a zero previous rolling hash, matching the multi-checkpoint case in top-tree-orchestrator.test.