@aztec/prover-client 0.0.1-commit.e558bd1c → 0.0.1-commit.e57c76e

package/src/orchestrator/proving-scheduler.ts

@@ -0,0 +1,156 @@
+import { AbortError } from '@aztec/foundation/error';
+import { type Logger, type LoggerBindings, createLogger } from '@aztec/foundation/log';
+import { SerialQueue } from '@aztec/foundation/queue';
+import { sleep } from '@aztec/foundation/sleep';
+
+/**
+ * Minimal surface a deferred-proving state must expose. Both `EpochProvingState` /
+ * `CheckpointProvingState` / `BlockProvingState` (used by `ProvingOrchestrator`) and
+ * `TopTreeProvingState` (used by `TopTreeOrchestrator`) satisfy it.
+ */
+export interface ProvingStateLike {
+  /** Returns false once the state has been cancelled or otherwise invalidated. */
+  verifyState(): boolean;
+  /** Surfaces a proving error to the state's owner. */
+  reject(reason: string): void;
+}
+
+/**
+ * Common scheduling infrastructure shared by every orchestrator that drives broker
+ * proving jobs:
+ *
+ *   - One `SerialQueue` (`deferredJobQueue`) acting as the enqueue-throttle.
+ *   - A list of `AbortController`s (`pendingProvingJobs`) so a `cancel()` can abort
+ *     in-flight broker jobs when needed.
+ *   - A `deferredProving<T>(state, request, callback, isCancelled?)` method that wraps
+ *     a broker request in the standard "submit, drop result if state invalidated, push
+ *     errors to state.reject" envelope.
+ *
+ * Subclasses own their own concrete proving state and define `cancelInternal()` for
+ * the rest of the cleanup work (closing world-state forks, marking sub-trees
+ * cancelled, etc.). `stop()` lives on the base class and follows the standard pattern
+ * of grabbing the old queue, calling `cancelInternal()` (which recreates the queue),
+ * and awaiting the old queue's drain.
+ */
+export abstract class ProvingScheduler {
+  protected pendingProvingJobs: AbortController[] = [];
+  protected logger: Logger;
+  private deferredJobQueue: SerialQueue;
+
+  constructor(
+    private readonly enqueueConcurrency: number,
+    loggerName = 'prover-client:proving-scheduler',
+    bindings?: LoggerBindings,
+  ) {
+    this.logger = createLogger(loggerName, bindings);
+    this.deferredJobQueue = new SerialQueue();
+    this.deferredJobQueue.start(this.enqueueConcurrency);
+  }
+
+  /** Number of broker jobs currently in flight. */
+  public getNumPendingProvingJobs(): number {
+    return this.pendingProvingJobs.length;
+  }
+
+  /**
+   * Drains the deferred-job queue, recreates it (so the subclass can be reused), and
+   * optionally aborts every in-flight broker job. Aborting is the right choice on
+   * reorg-driven cancel (where the in-flight inputs are no longer valid) and the
+   * wrong choice on shutdown (where leaving jobs in the broker queue lets a restart
+   * pick them up).
+   */
+  protected resetSchedulerState(abortJobs: boolean): void {
+    void this.deferredJobQueue.cancel();
+    this.deferredJobQueue = new SerialQueue();
+    this.deferredJobQueue.start(this.enqueueConcurrency);
+    if (abortJobs) {
+      for (const controller of this.pendingProvingJobs) {
+        controller.abort();
+      }
+    }
+  }
+
+  /**
+   * Subclass-defined cancellation. Implementations call `resetSchedulerState(...)`
+   * and then do their own cleanup (close world-state forks, propagate cancel into
+   * the proving state, etc.).
+   */
+  protected abstract cancelInternal(): void;
+
+  /**
+   * Standard stop: grab the old queue, cancel (which recreates the queue), then
+   * await the old queue's drain so any final job tear-down has unwound before we
+   * return.
+   */
+  public async stop(): Promise<void> {
+    const oldQueue = this.deferredJobQueue;
+    this.cancelInternal();
+    await oldQueue.cancel();
+  }
+
+  /**
+   * Submits a broker request. The returned-via-callback result is dropped if the
+   * state has become invalid (re-org, cancellation) by the time it lands. Errors
+   * are routed to `state.reject` unless they are abort-driven or the state is
+   * already invalid (in which case they're a stale echo of the cancel).
+   *
+   * @param state - Object exposing `verifyState()` and `reject()`.
+   * @param request - The broker call. Receives the controller's signal.
+   * @param callback - Runs on success, after `verifyState()` is checked.
+   * @param isCancelled - Optional extra cancellation predicate (e.g. a `cancelled`
+   *   flag the subclass maintains independently of the state). Defaults to never.
+   */
+  protected deferredProving<S extends ProvingStateLike, T>(
+    state: S,
+    request: (signal: AbortSignal) => Promise<T>,
+    callback: (result: T) => void | Promise<void>,
+    isCancelled: () => boolean = () => false,
+  ): void {
+    if (!state.verifyState()) {
+      this.logger.debug(`Not enqueuing job, state no longer valid`);
+      return;
+    }
+
+    const controller = new AbortController();
+    this.pendingProvingJobs.push(controller);
+
+    // We use a 'safeJob'. We don't want promise rejections in the proving pool — we
+    // want to capture the error here and reject the proving state while keeping the
+    // event loop free of rejections.
+    const safeJob = async () => {
+      try {
+        if (controller.signal.aborted) {
+          return;
+        }
+        const result = await request(controller.signal);
+        if (controller.signal.aborted || !state.verifyState() || isCancelled()) {
+          this.logger.debug(`State no longer valid, discarding result`);
+          return;
+        }
+        await callback(result);
+      } catch (err) {
+        if (err instanceof AbortError || isCancelled()) {
+          return;
+        }
+        if (!state.verifyState()) {
+          this.logger.debug(`State no longer valid, discarding error from proving job`, err);
+          return;
+        }
+        this.logger.error(`Error thrown when proving job`, err);
+        state.reject(`${err}`);
+      } finally {
+        const idx = this.pendingProvingJobs.indexOf(controller);
+        if (idx > -1) {
+          this.pendingProvingJobs.splice(idx, 1);
+        }
+      }
+    };
+
+    void this.deferredJobQueue.put(async () => {
+      void safeJob();
+      // Yield to the macrotask queue so Node has a chance to interleave other work
+      // between enqueues.
+      await sleep(0);
+    });
+  }
+}

package/src/orchestrator/top-tree-orchestrator.ts

@@ -0,0 +1,314 @@
+import { BatchedBlobAccumulator, type FinalBlobBatchingChallenges } from '@aztec/blob-lib';
+import type { BatchedBlob } from '@aztec/blob-lib/types';
+import {
+  type ARCHIVE_HEIGHT,
+  BLOBS_PER_CHECKPOINT,
+  FIELDS_PER_BLOB,
+  type NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH,
+  OUT_HASH_TREE_HEIGHT,
+} from '@aztec/constants';
+import type { EpochNumber } from '@aztec/foundation/branded-types';
+import { padArrayEnd } from '@aztec/foundation/collection';
+import { BLS12Point } from '@aztec/foundation/curves/bls12';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import type { LoggerBindings } from '@aztec/foundation/log';
+import { promiseWithResolvers } from '@aztec/foundation/promise';
+import type { Tuple } from '@aztec/foundation/serialize';
+import { MerkleTreeCalculator, shaMerkleHash } from '@aztec/foundation/trees';
+import type { EthAddress } from '@aztec/stdlib/block';
+import type { PublicInputsAndRecursiveProof, ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
+import { computeCheckpointOutHash } from '@aztec/stdlib/messaging';
+import type { Proof } from '@aztec/stdlib/proofs';
+import {
+  type BlockRollupPublicInputs,
+  CheckpointRootRollupHints,
+  CheckpointRootRollupPrivateInputs,
+  CheckpointRootSingleBlockRollupPrivateInputs,
+  type RootRollupPublicInputs,
+} from '@aztec/stdlib/rollup';
+import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
+import type { BlockHeader } from '@aztec/stdlib/tx';
+import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
+
+import { buildBlobHints, toProofData } from './block-building-helpers.js';
+import { TopTreeProvingScheduler } from './top-tree-proving-scheduler.js';
+import { TopTreeProvingState } from './top-tree-proving-state.js';
+
+/** Per-checkpoint data fed into the top tree. */
+export type CheckpointTopTreeData = {
+  /**
+   * Block-rollup proof outputs from the checkpoint's sub-tree. Passed as a Promise so the
+   * top tree can start (compute hints, pipeline merges) while sub-trees are still proving.
+   * The promise resolves to 1 entry for a single-block checkpoint, 2 for multi-block.
+   */
+  blockProofs: Promise<
+    PublicInputsAndRecursiveProof<BlockRollupPublicInputs, typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH>[]
+  >;
+  /** L2-to-L1 messages per block in the checkpoint, used to compute the out hash. */
+  l2ToL1MsgsPerBlock: Fr[][][];
+  /** Blob fields encoding the checkpoint's tx effects, used to compute the blob accumulator. */
+  blobFields: Fr[];
+  /** Header of the last block in the previous checkpoint (or the epoch's predecessor for index 0). */
+  previousBlockHeader: BlockHeader;
+  /** Sibling path of the archive tree before any block in this checkpoint landed. */
+  previousArchiveSiblingPath: Tuple<Fr, typeof ARCHIVE_HEIGHT>;
+};
+
+/** Result of proving the top tree. */
+export type TopTreeResult = {
+  publicInputs: RootRollupPublicInputs;
+  proof: Proof;
+  batchedBlobInputs: BatchedBlob;
+};
+
+/**
+ * Sentinel thrown by `cancel` so callers can distinguish reorg-driven cancellation from
+ * a genuine proving failure (and choose to rebuild + retry instead of failing the epoch).
+ */
+export class TopTreeCancelledError extends Error {
+  constructor(reason = 'Top-tree proving cancelled') {
+    super(reason);
+    this.name = 'TopTreeCancelledError';
+  }
+}
+
+type OutHashHint = {
+  treeSnapshot: AppendOnlyTreeSnapshot;
+  siblingPath: Tuple<Fr, typeof OUT_HASH_TREE_HEIGHT>;
+};
+
+/**
+ * Drives proving from checkpoint root rollups through the epoch root rollup. Owns no
+ * world-state forks or tx processing — every input is supplied by the caller.
+ *
+ * Pipelined start: `prove()` does not wait for block-level proving. It pre-computes the
+ * out-hash and blob-accumulator hint chains immediately from archiver-derivable data,
+ * and each checkpoint's root rollup fires the moment its sub-tree's `blockProofs`
+ * promise resolves. Later checkpoints can still be block-level proving in parallel.
+ */
+export class TopTreeOrchestrator extends TopTreeProvingScheduler {
+  private state: TopTreeProvingState | undefined;
+  private cancelled = false;
+
+  constructor(
+    prover: ServerCircuitProver,
+    private readonly proverId: EthAddress,
+    enqueueConcurrency: number,
+    _telemetryClient: TelemetryClient = getTelemetryClient(),
+    bindings?: LoggerBindings,
+  ) {
+    super(prover, enqueueConcurrency, 'prover-client:top-tree-orchestrator', bindings);
+  }
+
+  public getProverId(): EthAddress {
+    return this.proverId;
+  }
+
+  /**
+   * Proves the top tree from per-checkpoint data and pending block-proofs promises.
+   * Resolves with the final epoch proof, or rejects with `TopTreeCancelledError` if
+   * `cancel()` is invoked, or any other error if a circuit fails.
+   */
+  public async prove(
+    epochNumber: EpochNumber,
+    totalNumCheckpoints: number,
+    finalBlobBatchingChallenges: FinalBlobBatchingChallenges,
+    checkpointData: CheckpointTopTreeData[],
+  ): Promise<TopTreeResult> {
+    if (checkpointData.length !== totalNumCheckpoints) {
+      throw new Error(
+        `checkpointData length (${checkpointData.length}) does not match totalNumCheckpoints (${totalNumCheckpoints}).`,
+      );
+    }
+    if (this.state) {
+      throw new Error('TopTreeOrchestrator.prove called twice; construct a new orchestrator per epoch.');
+    }
+    // If cancel() was already called before prove() ran (e.g. a removeCheckpoint that
+    // landed while the caller was still preparing inputs), short-circuit the whole
+    // proving path. Without this, prove() would build its state, the per-checkpoint
+    // .then handlers would all bail on `this.cancelled`, and the completion promise
+    // would never resolve — prove() would hang forever.
+    if (this.cancelled) {
+      throw new TopTreeCancelledError();
+    }
+
+    const { promise: completionPromise, resolve, reject } = promiseWithResolvers<void>();
+    // The completion promise is awaited inside the try/catch below. Attach a no-op catch
+    // here as well so any spurious unhandled-rejection detection during cancellation
+    // (where reject() can fire synchronously before the await microtask installs a handler)
+    // is silenced.
+    completionPromise.catch(() => {});
+    const startBlobAccumulator = BatchedBlobAccumulator.newWithChallenges(finalBlobBatchingChallenges);
+
+    this.state = new TopTreeProvingState(
+      epochNumber,
+      totalNumCheckpoints,
+      finalBlobBatchingChallenges,
+      startBlobAccumulator,
+      resolve,
+      reason => reject(this.cancelled ? new TopTreeCancelledError(reason) : new Error(reason)),
+    );
+
+    // Compute the full out-hash hint chain and per-checkpoint start blob accumulators
+    // synchronously from archiver data. No proving required.
+    const outHashHints = await this.computeOutHashHints(checkpointData);
+    const checkpointStartBlobs: BatchedBlobAccumulator[] = [];
+    let runningBlobAccumulator = startBlobAccumulator;
+    for (const cd of checkpointData) {
+      checkpointStartBlobs.push(runningBlobAccumulator);
+      runningBlobAccumulator = await runningBlobAccumulator.accumulateFields(cd.blobFields);
+    }
+    this.state.setEndBlobAccumulator(runningBlobAccumulator);
+
+    // For each checkpoint, await its block proofs promise then enqueue the checkpoint root.
+    // Each await runs independently — checkpoints whose sub-trees finish first start their
+    // root proofs first, in parallel with later checkpoints' block-level proving.
+    for (let i = 0; i < checkpointData.length; i++) {
+      const cd = checkpointData[i];
+      const checkpointIndex = i;
+      void cd.blockProofs.then(
+        blockProofs => {
+          if (this.cancelled || !this.state?.verifyState()) {
+            return;
+          }
+          this.enqueueCheckpointRoot(
+            this.state,
+            checkpointIndex,
+            blockProofs,
+            cd,
+            outHashHints[i],
+            checkpointStartBlobs[i],
+          );
+        },
+        err => {
+          if (this.cancelled) {
+            return;
+          }
+          this.state?.reject(`Sub-tree for checkpoint ${i} failed: ${err}`);
+        },
+      );
+    }
+
+    try {
+      await completionPromise;
+      await this.state.finalizeBatchedBlob();
+      return this.state.getEpochProofResult();
+    } catch (err: any) {
+      if (this.cancelled) {
+        throw new TopTreeCancelledError();
+      }
+      throw err;
+    }
+  }
+
+  /**
+   * Cancels in-flight proving. If `abortJobs` is true, each pending broker job is aborted
+   * (used on reorg, when the surviving checkpoint set differs and the in-flight jobs'
+   * inputs are no longer valid). On shutdown the caller passes `false` so jobs remain in
+   * the broker queue for reuse on restart.
+   */
+  public cancel({ abortJobs }: { abortJobs: boolean }) {
+    this.cancelled = true;
+    this.resetSchedulerState(abortJobs);
+    this.state?.cancel();
+  }
+
+  /** Standard shutdown — preserve the broker queue (`abortJobs: false`). */
+  protected override cancelInternal(): void {
+    this.cancel({ abortJobs: false });
+  }
+
+  // --- internal: per-checkpoint enqueue path ---
+
+  protected override onRootRollupComplete(state: TopTreeProvingState) {
+    state.resolve();
+  }
+
+  private enqueueCheckpointRoot(
+    state: TopTreeProvingState,
+    checkpointIndex: number,
+    blockProofs: PublicInputsAndRecursiveProof<
+      BlockRollupPublicInputs,
+      typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
+    >[],
+    cd: CheckpointTopTreeData,
+    outHashHint: OutHashHint,
+    startBlobAccumulator: BatchedBlobAccumulator,
+  ) {
+    void this.buildCheckpointRootInputs(blockProofs, cd, outHashHint, startBlobAccumulator).then(inputs => {
+      this.deferredProving(
+        state,
+        signal => {
+          if (inputs instanceof CheckpointRootSingleBlockRollupPrivateInputs) {
+            return this.prover.getCheckpointRootSingleBlockRollupProof(inputs, signal, state.epochNumber);
+          }
+          return this.prover.getCheckpointRootRollupProof(inputs, signal, state.epochNumber);
+        },
+        result => {
+          this.logger.debug(`Completed checkpoint root proof for checkpoint ${checkpointIndex}`);
+          const leafLocation = state.setCheckpointRootRollupProof(checkpointIndex, result);
+          if (state.totalNumCheckpoints === 1) {
+            this.enqueueEpochPadding(state);
+          } else {
+            this.checkAndEnqueueNextCheckpointMergeRollup(state, leafLocation);
+          }
+        },
+      );
+    });
+  }
+
+  private async buildCheckpointRootInputs(
+    blockProofs: PublicInputsAndRecursiveProof<
+      BlockRollupPublicInputs,
+      typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
+    >[],
+    cd: CheckpointTopTreeData,
+    outHashHint: OutHashHint,
+    startBlobAccumulator: BatchedBlobAccumulator,
+  ) {
+    const { blobCommitments, blobsHash } = await buildBlobHints(cd.blobFields);
+
+    const hints = CheckpointRootRollupHints.from({
+      previousBlockHeader: cd.previousBlockHeader,
+      previousArchiveSiblingPath: cd.previousArchiveSiblingPath,
+      previousOutHash: outHashHint.treeSnapshot,
+      newOutHashSiblingPath: outHashHint.siblingPath,
+      startBlobAccumulator: startBlobAccumulator.toBlobAccumulator(),
+      finalBlobChallenges: this.state!.finalBlobBatchingChallenges,
+      blobFields: padArrayEnd(cd.blobFields, Fr.ZERO, FIELDS_PER_BLOB * BLOBS_PER_CHECKPOINT),
+      blobCommitments: padArrayEnd(blobCommitments, BLS12Point.ZERO, BLOBS_PER_CHECKPOINT),
+      blobsHash,
+    });
+
+    const proofDatas = blockProofs.map(p => toProofData(p));
+    return proofDatas.length === 1
+      ? new CheckpointRootSingleBlockRollupPrivateInputs(proofDatas[0], hints)
+      : new CheckpointRootRollupPrivateInputs([proofDatas[0], proofDatas[1]], hints);
+  }
+
+  private async computeOutHashHints(checkpointData: CheckpointTopTreeData[]): Promise<OutHashHint[]> {
+    const treeCalculator = await MerkleTreeCalculator.create(OUT_HASH_TREE_HEIGHT, undefined, (left, right) =>
+      Promise.resolve(shaMerkleHash(left, right)),
+    );
+
+    const computeHint = async (leaves: Fr[]): Promise<OutHashHint> => {
+      const tree = await treeCalculator.computeTree(leaves.map(l => l.toBuffer()));
+      const nextAvailableLeafIndex = leaves.length;
+      return {
+        treeSnapshot: new AppendOnlyTreeSnapshot(Fr.fromBuffer(tree.root), nextAvailableLeafIndex),
+        siblingPath: tree.getSiblingPath(nextAvailableLeafIndex).map(Fr.fromBuffer) as Tuple<
+          Fr,
+          typeof OUT_HASH_TREE_HEIGHT
+        >,
+      };
+    };
+
+    const hints: OutHashHint[] = [];
+    const outHashes: Fr[] = [];
+    for (const cd of checkpointData) {
+      hints.push(await computeHint(outHashes));
+      outHashes.push(computeCheckpointOutHash(cd.l2ToL1MsgsPerBlock));
+    }
+    return hints;
+  }
+}

package/src/orchestrator/top-tree-proving-scheduler.ts

@@ -0,0 +1,154 @@
+import type { NESTED_RECURSIVE_PROOF_LENGTH, NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH } from '@aztec/constants';
+import type { EpochNumber } from '@aztec/foundation/branded-types';
+import type { LoggerBindings } from '@aztec/foundation/log';
+import type { TreeNodeLocation } from '@aztec/foundation/trees';
+import type { PublicInputsAndRecursiveProof, ServerCircuitProver } from '@aztec/stdlib/interfaces/server';
+import type {
+  CheckpointMergeRollupPrivateInputs,
+  CheckpointPaddingRollupPrivateInputs,
+  CheckpointRollupPublicInputs,
+  RootRollupPrivateInputs,
+  RootRollupPublicInputs,
+} from '@aztec/stdlib/rollup';
+
+import { ProvingScheduler, type ProvingStateLike } from './proving-scheduler.js';
+
+type CheckpointRollupProof = PublicInputsAndRecursiveProof<
+  CheckpointRollupPublicInputs,
+  typeof NESTED_RECURSIVE_ROLLUP_HONK_PROOF_LENGTH
+>;
+
+type RootRollupProof = PublicInputsAndRecursiveProof<RootRollupPublicInputs, typeof NESTED_RECURSIVE_PROOF_LENGTH>;
+
+/**
+ * State interface required by the top-tree proving drivers (checkpoint-merge → padding →
+ * root-rollup). Both `EpochProvingState` and `TopTreeProvingState` satisfy it structurally;
+ * the per-checkpoint state in `EpochProvingState` (block/tx proving, world-state forks)
+ * is owned outside this surface.
+ */
+export interface TopTreeStateLike extends ProvingStateLike {
+  readonly epochNumber: EpochNumber;
+  readonly totalNumCheckpoints: number;
+
+  tryStartProvingCheckpointMerge(location: TreeNodeLocation): boolean;
+  setCheckpointMergeRollupProof(location: TreeNodeLocation, provingOutput: CheckpointRollupProof): void;
+  isReadyForCheckpointMerge(location: TreeNodeLocation): boolean;
+  getParentLocation(location: TreeNodeLocation): TreeNodeLocation;
+  getCheckpointMergeRollupInputs(location: TreeNodeLocation): CheckpointMergeRollupPrivateInputs;
+
+  tryStartProvingPaddingCheckpoint(): boolean;
+  setCheckpointPaddingProof(provingOutput: CheckpointRollupProof): void;
+  getPaddingCheckpointInputs(): CheckpointPaddingRollupPrivateInputs;
+
+  tryStartProvingRootRollup(): boolean;
+  setRootRollupProof(provingOutput: RootRollupProof): void;
+  isReadyForRootRollup(): boolean;
+  getRootRollupInputs(): RootRollupPrivateInputs;
+}
+
+/**
+ * Shared scheduling for the top-tree section of epoch proving — checkpoint-merge,
+ * padding (single-checkpoint case), and root rollup. Both `ProvingOrchestrator` and
+ * `TopTreeOrchestrator` extend this; their per-checkpoint-root drivers diverge (one
+ * drains state-derived inputs once block-merge is done, the other builds inputs from
+ * caller-supplied checkpoint data), but the rest of the tree is identical.
+ *
+ * Subclasses provide a `wrapCircuitCall` hook for telemetry (the orchestrator wraps
+ * each call in a span; the top-tree leaves it as identity), and an
+ * `onRootRollupComplete` hook to invoke the right shape of `state.resolve()` —
+ * `EpochProvingState.resolve` takes a `ProvingResult`, `TopTreeProvingState.resolve`
+ * is no-arg.
+ */
+export abstract class TopTreeProvingScheduler extends ProvingScheduler {
+  constructor(
+    protected readonly prover: ServerCircuitProver,
+    enqueueConcurrency: number,
+    loggerName?: string,
+    bindings?: LoggerBindings,
+  ) {
+    super(enqueueConcurrency, loggerName, bindings);
+  }
+
+  /**
+   * Wraps a circuit call for telemetry. Default is identity; the orchestrator overrides
+   * to wrap with `wrapCallbackInSpan`.
+   */
+  protected wrapCircuitCall<T>(
+    _circuitName: string,
+    fn: (signal: AbortSignal) => Promise<T>,
+  ): (signal: AbortSignal) => Promise<T> {
+    return fn;
+  }
+
+  /** Called once the root rollup proof has been set; subclasses call `state.resolve(...)` with the right shape. */
+  protected abstract onRootRollupComplete(state: TopTreeStateLike): void;
+
+  protected enqueueCheckpointMergeRollup(state: TopTreeStateLike, location: TreeNodeLocation) {
+    if (!state.verifyState() || !state.tryStartProvingCheckpointMerge(location)) {
+      return;
+    }
+    const inputs = state.getCheckpointMergeRollupInputs(location);
+    this.deferredProving(
+      state,
+      this.wrapCircuitCall('rollup-checkpoint-merge', signal =>
+        this.prover.getCheckpointMergeRollupProof(inputs, signal, state.epochNumber),
+      ),
+      result => {
+        state.setCheckpointMergeRollupProof(location, result);
+        this.checkAndEnqueueNextCheckpointMergeRollup(state, location);
+      },
+    );
+  }
+
+  protected enqueueEpochPadding(state: TopTreeStateLike) {
+    if (!state.verifyState() || !state.tryStartProvingPaddingCheckpoint()) {
+      return;
+    }
+    const inputs = state.getPaddingCheckpointInputs();
+    this.deferredProving(
+      state,
+      this.wrapCircuitCall('rollup-checkpoint-padding', signal =>
+        this.prover.getCheckpointPaddingRollupProof(inputs, signal, state.epochNumber),
+      ),
+      result => {
+        state.setCheckpointPaddingProof(result);
+        this.checkAndEnqueueRootRollup(state);
+      },
+    );
+  }
+
+  protected enqueueRootRollup(state: TopTreeStateLike) {
+    if (!state.verifyState() || !state.tryStartProvingRootRollup()) {
+      return;
+    }
+    const inputs = state.getRootRollupInputs();
+    this.deferredProving(
+      state,
+      this.wrapCircuitCall('rollup-root', signal => this.prover.getRootRollupProof(inputs, signal, state.epochNumber)),
+      result => {
+        this.logger.verbose(`Completed root rollup for epoch ${state.epochNumber}`);
+        state.setRootRollupProof(result);
+        this.onRootRollupComplete(state);
+      },
+    );
+  }
+
+  protected checkAndEnqueueNextCheckpointMergeRollup(state: TopTreeStateLike, currentLocation: TreeNodeLocation) {
+    if (!state.isReadyForCheckpointMerge(currentLocation)) {
+      return;
+    }
+    const parentLocation = state.getParentLocation(currentLocation);
+    if (parentLocation.level === 0) {
+      this.checkAndEnqueueRootRollup(state);
+    } else {
+      this.enqueueCheckpointMergeRollup(state, parentLocation);
+    }
+  }
+
+  protected checkAndEnqueueRootRollup(state: TopTreeStateLike) {
+    if (!state.isReadyForRootRollup()) {
+      return;
+    }
+    this.enqueueRootRollup(state);
+  }
+}