@aztec/prover-client 0.55.1 → 0.57.0

package/dest/tx-prover/tx-prover.d.ts

@@ -1,4 +1,4 @@
-import { type BlockProver, type ProverClient, type ProvingJobSource } from '@aztec/circuit-types/interfaces';
+import { type EpochProver, type EpochProverManager, type ProvingJobSource } from '@aztec/circuit-types/interfaces';
 import { Fr } from '@aztec/circuits.js';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { type MerkleTreeOperations } from '@aztec/world-state';
@@ -7,14 +7,14 @@ import { type ProverClientConfig } from '../config.js';
  * A prover factory.
  * TODO(palla/prover-node): Rename this class
  */
-export declare class TxProver implements ProverClient {
+export declare class TxProver implements EpochProverManager {
     private config;
     private telemetry;
     private agent?;
     private queue;
     private running;
     private constructor();
-    createBlockProver(db: MerkleTreeOperations): BlockProver;
+    createEpochProver(db: MerkleTreeOperations): EpochProver;
     getProverId(): Fr;
     updateProverConfig(config: Partial<ProverClientConfig>): Promise<void>;
     /**

package/dest/tx-prover/tx-prover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx-prover.d.ts","sourceRoot":"","sources":["../../src/tx-prover/tx-prover.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAEtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAKvD;;;GAGG;AACH,qBAAa,QAAS,YAAW,YAAY;IAKzC,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK,CAAC;IANhB,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO;IAUA,iBAAiB,CAAC,EAAE,EAAE,oBAAoB,GAAG,WAAW;IAIxD,WAAW,IAAI,EAAE;IAIlB,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5E;;OAEG;IACI,KAAK;IAWZ;;OAEG;IACU,IAAI;IAWjB;;;;;;OAMG;WACiB,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,eAAe;mBAczD,kBAAkB;IAehC,mBAAmB,IAAI,gBAAgB;CAG/C"}
+{"version":3,"file":"tx-prover.d.ts","sourceRoot":"","sources":["../../src/tx-prover/tx-prover.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EAEtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAExC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAKvD;;;GAGG;AACH,qBAAa,QAAS,YAAW,kBAAkB;IAK/C,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,KAAK,CAAC;IANhB,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO;IAUA,iBAAiB,CAAC,EAAE,EAAE,oBAAoB,GAAG,WAAW;IAIxD,WAAW,IAAI,EAAE;IAIlB,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB5E;;OAEG;IACI,KAAK;IAWZ;;OAEG;IACU,IAAI;IAWjB;;;;;;OAMG;WACiB,GAAG,CAAC,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,eAAe;mBAczD,kBAAkB;IAehC,mBAAmB,IAAI,gBAAgB;CAG/C"}

package/dest/tx-prover/tx-prover.js

@@ -18,7 +18,7 @@ export class TxProver {
         // so it can be reused across multiple ones and not recomputed every time.
         this.queue = new MemoryProvingQueue(telemetry, config.proverJobTimeoutMs, config.proverJobPollIntervalMs);
     }
-    createBlockProver(db) {
+    createEpochProver(db) {
         return new ProvingOrchestrator(db, this.queue, this.telemetry, this.config.proverId);
     }
     getProverId() {

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@aztec/prover-client",
-  "version": "0.55.1",
+  "version": "0.57.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
     "./prover-agent": "./dest/prover-agent/index.js",
-    "./orchestrator": "./dest/orchestrator/index.js"
+    "./orchestrator": "./dest/orchestrator/index.js",
+    "./helpers": "./dest/orchestrator/block-building-helpers.js"
   },
   "typedocOptions": {
     "entryPoints": [
@@ -41,6 +42,9 @@
             "parser": {
               "syntax": "typescript",
               "decorators": true
+            },
+            "transform": {
+              "decoratorVersion": "2022-03"
             }
           }
         }
@@ -59,15 +63,15 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.55.1",
-    "@aztec/circuit-types": "0.55.1",
-    "@aztec/circuits.js": "0.55.1",
-    "@aztec/foundation": "0.55.1",
-    "@aztec/kv-store": "0.55.1",
-    "@aztec/noir-protocol-circuits-types": "0.55.1",
-    "@aztec/simulator": "0.55.1",
-    "@aztec/telemetry-client": "0.55.1",
-    "@aztec/world-state": "0.55.1",
+    "@aztec/bb-prover": "0.57.0",
+    "@aztec/circuit-types": "0.57.0",
+    "@aztec/circuits.js": "0.57.0",
+    "@aztec/foundation": "0.57.0",
+    "@aztec/kv-store": "0.57.0",
+    "@aztec/noir-protocol-circuits-types": "0.57.0",
+    "@aztec/simulator": "0.57.0",
+    "@aztec/telemetry-client": "0.57.0",
+    "@aztec/world-state": "0.57.0",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "commander": "^12.1.0",
     "lodash.chunk": "^4.2.0",

package/src/index.ts

@@ -1,4 +1,4 @@
-export { ProverClient } from '@aztec/circuit-types';
+export { EpochProverManager } from '@aztec/circuit-types';
 
 export * from './tx-prover/tx-prover.js';
 export * from './config.js';

package/src/mocks/fixtures.ts

@@ -2,29 +2,20 @@ import {
   MerkleTreeId,
   type ProcessedTx,
   makeEmptyProcessedTx as makeEmptyProcessedTxFromHistoricalTreeRoots,
-  makeProcessedTx,
-  mockTx,
 } from '@aztec/circuit-types';
+import { makeBloatedProcessedTx as makeBloatedProcessedTxWithVKRoot } from '@aztec/circuit-types/test';
 import {
   AztecAddress,
   EthAddress,
   Fr,
   GasFees,
   GlobalVariables,
-  KernelCircuitPublicInputs,
-  LogHash,
-  MAX_L2_TO_L1_MSGS_PER_TX,
   MAX_NOTE_HASHES_PER_TX,
   MAX_NULLIFIERS_PER_TX,
-  MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   NULLIFIER_TREE_HEIGHT,
   PUBLIC_DATA_SUBTREE_HEIGHT,
   PublicDataTreeLeaf,
-  PublicDataUpdateRequest,
-  ScopedLogHash,
 } from '@aztec/circuits.js';
-import { fr, makeScopedL2ToL1Message } from '@aztec/circuits.js/testing';
-import { makeTuple } from '@aztec/foundation/array';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { type DebugLogger } from '@aztec/foundation/log';
@@ -98,43 +89,8 @@ export async function getSimulationProvider(
   return new WASMSimulator();
 }
 
-export const makeBloatedProcessedTx = (builderDb: MerkleTreeOperations, seed = 0x1) => {
-  seed *= MAX_NULLIFIERS_PER_TX; // Ensure no clashing given incremental seeds
-  const tx = mockTx(seed);
-  const kernelOutput = KernelCircuitPublicInputs.empty();
-  kernelOutput.constants.vkTreeRoot = getVKTreeRoot();
-  kernelOutput.constants.historicalHeader = builderDb.getInitialHeader();
-  kernelOutput.end.publicDataUpdateRequests = makeTuple(
-    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    i => new PublicDataUpdateRequest(fr(i), fr(i + 10), i + 20),
-    seed + 0x500,
-  );
-  kernelOutput.end.publicDataUpdateRequests = makeTuple(
-    MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
-    i => new PublicDataUpdateRequest(fr(i), fr(i + 10), i + 20),
-    seed + 0x600,
-  );
-
-  const processedTx = makeProcessedTx(tx, kernelOutput, []);
-
-  processedTx.data.end.noteHashes = makeTuple(MAX_NOTE_HASHES_PER_TX, fr, seed + 0x100);
-  processedTx.data.end.nullifiers = makeTuple(MAX_NULLIFIERS_PER_TX, fr, seed + 0x100000);
-
-  processedTx.data.end.nullifiers[tx.data.forPublic!.end.nullifiers.length - 1] = Fr.zero();
-
-  processedTx.data.end.l2ToL1Msgs = makeTuple(MAX_L2_TO_L1_MSGS_PER_TX, makeScopedL2ToL1Message, seed + 0x300);
-  processedTx.noteEncryptedLogs.unrollLogs().forEach((log, i) => {
-    processedTx.data.end.noteEncryptedLogsHashes[i] = new LogHash(Fr.fromBuffer(log.hash()), 0, new Fr(log.length));
-  });
-  processedTx.encryptedLogs.unrollLogs().forEach((log, i) => {
-    processedTx.data.end.encryptedLogsHashes[i] = new ScopedLogHash(
-      new LogHash(Fr.fromBuffer(log.hash()), 0, new Fr(log.length)),
-      log.maskedContractAddress,
-    );
-  });
-
-  return processedTx;
-};
+export const makeBloatedProcessedTx = (builderDb: MerkleTreeOperations, seed = 0x1) =>
+  makeBloatedProcessedTxWithVKRoot(builderDb, getVKTreeRoot(), seed);
 
 export const makeEmptyProcessedTx = (builderDb: MerkleTreeOperations, chainId: Fr, version: Fr) => {
   const header = builderDb.getInitialHeader();
@@ -179,9 +135,9 @@ export const makeGlobals = (blockNumber: number) => {
   return new GlobalVariables(
     Fr.ZERO,
     Fr.ZERO,
-    new Fr(blockNumber),
+    new Fr(blockNumber) /** block number */,
     new Fr(blockNumber) /** slot number */,
-    Fr.ZERO,
+    new Fr(blockNumber) /** timestamp */,
     EthAddress.ZERO,
     AztecAddress.ZERO,
     GasFees.empty(),

package/src/mocks/test_context.ts

@@ -1,19 +1,18 @@
 import { type BBProverConfig } from '@aztec/bb-prover';
 import {
-  type BlockProver,
   type MerkleTreeAdminOperations,
   type ProcessedTx,
+  type ProcessedTxHandler,
   type PublicExecutionRequest,
   type ServerCircuitProver,
   type Tx,
   type TxValidator,
 } from '@aztec/circuit-types';
-import { type Gas, GlobalVariables, Header, type Nullifier, type TxContext } from '@aztec/circuits.js';
+import { type Gas, type GlobalVariables, Header, type Nullifier, type TxContext } from '@aztec/circuits.js';
 import { type Fr } from '@aztec/foundation/fields';
 import { type DebugLogger } from '@aztec/foundation/log';
 import { openTmpStore } from '@aztec/kv-store/utils';
 import {
-  type ContractsDataSourcePublicDB,
   type PublicExecutionResult,
   PublicExecutionResultBuilder,
   type PublicExecutor,
@@ -21,7 +20,7 @@ import {
   RealPublicKernelCircuitSimulator,
   type SimulationProvider,
   WASMSimulator,
-  type WorldStatePublicDB,
+  type WorldStateDB,
 } from '@aztec/simulator';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 import { MerkleTrees } from '@aztec/world-state';
@@ -33,7 +32,7 @@ import { tmpdir } from 'os';
 import { join } from 'path';
 
 import { TestCircuitProver } from '../../../bb-prover/src/test/test_circuit_prover.js';
-import { ProvingOrchestrator } from '../orchestrator/orchestrator.js';
+import { ProvingOrchestrator } from '../orchestrator/index.js';
 import { MemoryProvingQueue } from '../prover-agent/memory-proving-queue.js';
 import { ProverAgent } from '../prover-agent/prover-agent.js';
 import { getEnvironmentConfig, getSimulationProvider, makeGlobals } from './fixtures.js';
@@ -41,8 +40,7 @@ import { getEnvironmentConfig, getSimulationProvider, makeGlobals } from './fixt
 export class TestContext {
   constructor(
     public publicExecutor: MockProxy<PublicExecutor>,
-    public publicContractsDB: MockProxy<ContractsDataSourcePublicDB>,
-    public publicWorldStateDB: MockProxy<WorldStatePublicDB>,
+    public worldStateDB: MockProxy<WorldStateDB>,
     public publicProcessor: PublicProcessor,
     public simulationProvider: SimulationProvider,
     public globalVariables: GlobalVariables,
@@ -55,7 +53,7 @@ export class TestContext {
     public logger: DebugLogger,
   ) {}
 
-  public get blockProver() {
+  public get epochProver() {
     return this.orchestrator;
   }
 
@@ -71,8 +69,7 @@ export class TestContext {
     const globalVariables = makeGlobals(blockNumber);
 
     const publicExecutor = mock<PublicExecutor>();
-    const publicContractsDB = mock<ContractsDataSourcePublicDB>();
-    const publicWorldStateDB = mock<WorldStatePublicDB>();
+    const worldStateDB = mock<WorldStateDB>();
     const publicKernel = new RealPublicKernelCircuitSimulator(new WASMSimulator());
     const telemetry = new NoopTelemetryClient();
 
@@ -88,14 +85,13 @@ export class TestContext {
       actualDb = ws.asLatest();
     }
 
-    const processor = new PublicProcessor(
+    const processor = PublicProcessor.create(
       actualDb,
       publicExecutor,
       publicKernel,
-      GlobalVariables.empty(),
+      globalVariables,
       Header.empty(),
-      publicContractsDB,
-      publicWorldStateDB,
+      worldStateDB,
       telemetry,
     );
 
@@ -130,8 +126,7 @@ export class TestContext {
 
     return new this(
       publicExecutor,
-      publicContractsDB,
-      publicWorldStateDB,
+      worldStateDB,
       processor,
       simulationProvider,
       globalVariables,
@@ -155,7 +150,7 @@ export class TestContext {
   public async processPublicFunctions(
     txs: Tx[],
     maxTransactions: number,
-    blockProver?: BlockProver,
+    txHandler?: ProcessedTxHandler,
     txValidator?: TxValidator<ProcessedTx>,
   ) {
     const defaultExecutorImplementation = (
@@ -187,7 +182,7 @@ export class TestContext {
     return await this.processPublicFunctionsWithMockExecutorImplementation(
       txs,
       maxTransactions,
-      blockProver,
+      txHandler,
       txValidator,
       defaultExecutorImplementation,
     );
@@ -196,7 +191,7 @@ export class TestContext {
   public async processPublicFunctionsWithMockExecutorImplementation(
     txs: Tx[],
     maxTransactions: number,
-    blockProver?: BlockProver,
+    txHandler?: ProcessedTxHandler,
     txValidator?: TxValidator<ProcessedTx>,
     executorMock?: (
       execution: PublicExecutionRequest,
@@ -211,6 +206,6 @@ export class TestContext {
     if (executorMock) {
       this.publicExecutor.simulate.mockImplementation(executorMock);
     }
-    return await this.publicProcessor.process(txs, maxTransactions, blockProver, txValidator);
+    return await this.publicProcessor.process(txs, maxTransactions, txHandler, txValidator);
   }
 }

package/src/orchestrator/block-building-helpers.ts

@@ -1,4 +1,4 @@
-import { MerkleTreeId, type ProcessedTx } from '@aztec/circuit-types';
+import { type Body, MerkleTreeId, type ProcessedTx, TxEffect, getTreeHeight } from '@aztec/circuit-types';
 import {
   ARCHIVE_HEIGHT,
   AppendOnlyTreeSnapshot,
@@ -6,28 +6,29 @@ import {
   BaseRollupInputs,
   BlockMergeRollupInputs,
   type BlockRootOrBlockMergePublicInputs,
-  BlockRootRollupInputs,
   ConstantRollupData,
+  ContentCommitment,
   Fr,
   type GlobalVariables,
-  type Header,
+  Header,
   KernelData,
-  type L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH,
   MAX_NULLIFIERS_PER_TX,
   MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
   MembershipWitness,
   MergeRollupInputs,
+  MerkleTreeCalculator,
   type NESTED_RECURSIVE_PROOF_LENGTH,
   NOTE_HASH_SUBTREE_HEIGHT,
   NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH,
   NULLIFIER_SUBTREE_HEIGHT,
   NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH,
   NULLIFIER_TREE_HEIGHT,
-  type NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
+  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
   NullifierLeafPreimage,
   PUBLIC_DATA_SUBTREE_HEIGHT,
   PUBLIC_DATA_SUBTREE_SIBLING_PATH_LENGTH,
   PUBLIC_DATA_TREE_HEIGHT,
+  type ParityPublicInputs,
   PartialStateReference,
   PreviousRollupBlockData,
   PreviousRollupData,
@@ -37,21 +38,25 @@ import {
   PublicDataUpdateRequest,
   type RECURSIVE_PROOF_LENGTH,
   type RecursiveProof,
-  type RootParityInput,
   RootRollupInputs,
   StateDiffHints,
-  type StateReference,
+  StateReference,
   VK_TREE_HEIGHT,
   type VerificationKeyAsFields,
   type VerificationKeyData,
 } from '@aztec/circuits.js';
 import { assertPermutation, makeTuple } from '@aztec/foundation/array';
 import { padArrayEnd } from '@aztec/foundation/collection';
+import { sha256Trunc } from '@aztec/foundation/crypto';
+import { type DebugLogger } from '@aztec/foundation/log';
 import { type Tuple, assertLength, toFriendlyJSON } from '@aztec/foundation/serialize';
+import { computeUnbalancedMerkleRoot } from '@aztec/foundation/trees';
 import { getVKIndex, getVKSiblingPath, getVKTreeRoot } from '@aztec/noir-protocol-circuits-types';
 import { HintsBuilder, computeFeePayerBalanceLeafSlot } from '@aztec/simulator';
 import { type MerkleTreeOperations } from '@aztec/world-state';
 
+import { inspect } from 'util';
+
 /**
  * Type representing the names of the trees for the base rollup.
  */
@@ -189,7 +194,6 @@ export function createMergeRollupInputs(
   return mergeInputs;
 }
 
-// TODO(#7346): Integrate batch rollup circuits and test below
 export function createBlockMergeRollupInputs(
   left: [
     BlockRootOrBlockMergePublicInputs,
@@ -209,6 +213,80 @@ export function createBlockMergeRollupInputs(
   return mergeInputs;
 }
 
+export function buildHeaderFromCircuitOutputs(
+  previousMergeData: [BaseOrMergeRollupPublicInputs, BaseOrMergeRollupPublicInputs],
+  parityPublicInputs: ParityPublicInputs,
+  rootRollupOutputs: BlockRootOrBlockMergePublicInputs,
+  updatedL1ToL2TreeSnapshot: AppendOnlyTreeSnapshot,
+  logger?: DebugLogger,
+) {
+  const contentCommitment = new ContentCommitment(
+    new Fr(previousMergeData[0].numTxs + previousMergeData[1].numTxs),
+    sha256Trunc(
+      Buffer.concat([previousMergeData[0].txsEffectsHash.toBuffer(), previousMergeData[1].txsEffectsHash.toBuffer()]),
+    ),
+    parityPublicInputs.shaRoot.toBuffer(),
+    sha256Trunc(Buffer.concat([previousMergeData[0].outHash.toBuffer(), previousMergeData[1].outHash.toBuffer()])),
+  );
+  const state = new StateReference(updatedL1ToL2TreeSnapshot, previousMergeData[1].end);
+  const header = new Header(
+    rootRollupOutputs.previousArchive,
+    contentCommitment,
+    state,
+    previousMergeData[0].constants.globalVariables,
+    previousMergeData[0].accumulatedFees.add(previousMergeData[1].accumulatedFees),
+  );
+  if (!header.hash().equals(rootRollupOutputs.endBlockHash)) {
+    logger?.error(
+      `Block header mismatch when building header from circuit outputs.` +
+        `\n\nHeader: ${inspect(header)}` +
+        `\n\nCircuit: ${toFriendlyJSON(rootRollupOutputs)}`,
+    );
+    throw new Error(`Block header mismatch when building from circuit outputs`);
+  }
+  return header;
+}
+
+export async function buildHeaderFromTxEffects(
+  body: Body,
+  globalVariables: GlobalVariables,
+  l1ToL2Messages: Fr[],
+  db: MerkleTreeOperations,
+) {
+  const stateReference = new StateReference(
+    await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db),
+    new PartialStateReference(
+      await getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE, db),
+      await getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE, db),
+      await getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE, db),
+    ),
+  );
+
+  const previousArchive = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
+
+  const outHash = computeUnbalancedMerkleRoot(
+    body.txEffects.map(tx => tx.txOutHash()),
+    TxEffect.empty().txOutHash(),
+  );
+
+  l1ToL2Messages = padArrayEnd(l1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+  const hasher = (left: Buffer, right: Buffer) => sha256Trunc(Buffer.concat([left, right]));
+  const parityHeight = Math.ceil(Math.log2(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
+  const parityShaRoot = new MerkleTreeCalculator(parityHeight, Fr.ZERO.toBuffer(), hasher).computeTreeRoot(
+    l1ToL2Messages.map(msg => msg.toBuffer()),
+  );
+
+  const contentCommitment = new ContentCommitment(
+    new Fr(body.numberOfTxsIncludingPadded),
+    body.getTxsEffectsHash(),
+    parityShaRoot,
+    outHash,
+  );
+
+  const fees = body.txEffects.reduce((acc, tx) => acc.add(tx.transactionFee), Fr.ZERO);
+  return new Header(previousArchive, contentCommitment, stateReference, globalVariables, fees);
+}
+
 // Validate that the roots of all local trees match the output of the root circuit simulation
 export async function validateBlockRootOutput(
   blockRootOutput: BlockRootOrBlockMergePublicInputs,
@@ -238,58 +316,13 @@ export async function validateState(state: StateReference, db: MerkleTreeOperati
   );
 }
 
-// Builds the inputs for the block root rollup circuit, without making any changes to trees
-export async function getBlockRootRollupInput(
-  rollupOutputLeft: BaseOrMergeRollupPublicInputs,
-  rollupProofLeft: RecursiveProof<typeof NESTED_RECURSIVE_PROOF_LENGTH>,
-  verificationKeyLeft: VerificationKeyAsFields,
-  rollupOutputRight: BaseOrMergeRollupPublicInputs,
-  rollupProofRight: RecursiveProof<typeof NESTED_RECURSIVE_PROOF_LENGTH>,
-  verificationKeyRight: VerificationKeyAsFields,
-  l1ToL2Roots: RootParityInput<typeof NESTED_RECURSIVE_PROOF_LENGTH>,
-  newL1ToL2Messages: Tuple<Fr, typeof NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP>,
-  messageTreeSnapshot: AppendOnlyTreeSnapshot,
-  messageTreeRootSiblingPath: Tuple<Fr, typeof L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH>,
-  db: MerkleTreeOperations,
-  proverId: Fr,
-) {
-  const previousRollupData: BlockRootRollupInputs['previousRollupData'] = [
-    getPreviousRollupDataFromPublicInputs(rollupOutputLeft, rollupProofLeft, verificationKeyLeft),
-    getPreviousRollupDataFromPublicInputs(rollupOutputRight, rollupProofRight, verificationKeyRight),
-  ];
-
-  const getRootTreeSiblingPath = async (treeId: MerkleTreeId) => {
-    const { size } = await db.getTreeInfo(treeId);
-    const path = await db.getSiblingPath(treeId, size);
-    return path.toFields();
-  };
-
-  // Get blocks tree
-  const startArchiveSnapshot = await getTreeSnapshot(MerkleTreeId.ARCHIVE, db);
-  const newArchiveSiblingPathArray = await getRootTreeSiblingPath(MerkleTreeId.ARCHIVE);
-
-  const newArchiveSiblingPath = makeTuple(
-    ARCHIVE_HEIGHT,
-    i => (i < newArchiveSiblingPathArray.length ? newArchiveSiblingPathArray[i] : Fr.ZERO),
-    0,
-  );
-
-  return BlockRootRollupInputs.from({
-    previousRollupData,
-    l1ToL2Roots,
-    newL1ToL2Messages,
-    newL1ToL2MessageTreeRootSiblingPath: messageTreeRootSiblingPath,
-    startL1ToL2MessageTreeSnapshot: messageTreeSnapshot,
-    startArchiveSnapshot,
-    newArchiveSiblingPath,
-    // TODO(#7346): Inject previous block hash (required when integrating batch rollup circuits)
-    previousBlockHash: Fr.ZERO,
-    proverId,
-  });
+export async function getRootTreeSiblingPath<TID extends MerkleTreeId>(treeId: TID, db: MerkleTreeOperations) {
+  const { size } = await db.getTreeInfo(treeId);
+  const path = await db.getSiblingPath(treeId, size);
+  return padArrayEnd(path.toFields(), Fr.ZERO, getTreeHeight(treeId));
 }
 
 // Builds the inputs for the final root rollup circuit, without making any changes to trees
-// TODO(#7346): Integrate batch rollup circuits and test below
 export function getRootRollupInput(
   rollupOutputLeft: BlockRootOrBlockMergePublicInputs,
   rollupProofLeft: RecursiveProof<typeof NESTED_RECURSIVE_PROOF_LENGTH>,