@aztec/prover-client 0.0.0-test.1 → 0.0.1-commit.b655e406

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

@@ -1,13 +1,21 @@
-import { Blob, type SpongeBlob } from '@aztec/blob-lib';
+import {
+  BatchedBlob,
+  BatchedBlobAccumulator,
+  SpongeBlob,
+  computeBlobsHashFromBlobs,
+  getBlobCommitmentsFromBlobs,
+  getBlobsPerL1Block,
+} from '@aztec/blob-lib';
 import {
   ARCHIVE_HEIGHT,
+  CHONK_PROOF_LENGTH,
   MAX_CONTRACT_CLASS_LOGS_PER_TX,
   MAX_NOTE_HASHES_PER_TX,
   MAX_NULLIFIERS_PER_TX,
   NOTE_HASH_SUBTREE_HEIGHT,
-  NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH,
+  NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
   NULLIFIER_SUBTREE_HEIGHT,
-  NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH,
+  NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
   NULLIFIER_TREE_HEIGHT,
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
   PUBLIC_DATA_TREE_HEIGHT,
@@ -16,24 +24,27 @@ import { makeTuple } from '@aztec/foundation/array';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { sha256Trunc } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
-import type { Logger } from '@aztec/foundation/log';
-import { type Tuple, assertLength, serializeToBuffer, toFriendlyJSON } from '@aztec/foundation/serialize';
-import { MembershipWitness, MerkleTreeCalculator, computeUnbalancedMerkleRoot } from '@aztec/foundation/trees';
-import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { type Bufferable, type Tuple, assertLength, toFriendlyJSON } from '@aztec/foundation/serialize';
+import {
+  MembershipWitness,
+  MerkleTreeCalculator,
+  computeCompressedUnbalancedMerkleTreeRoot,
+} from '@aztec/foundation/trees';
+import { getVkData } from '@aztec/noir-protocol-circuits-types/server/vks';
+import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/vk-tree';
 import { computeFeePayerBalanceLeafSlot } from '@aztec/protocol-contracts/fee-juice';
-import { PublicDataHint } from '@aztec/stdlib/avm';
-import { Body } from '@aztec/stdlib/block';
-import type { MerkleTreeWriteOperations } from '@aztec/stdlib/interfaces/server';
-import { ContractClassLog } from '@aztec/stdlib/logs';
-import type { ParityPublicInputs } from '@aztec/stdlib/parity';
+import { Body, L2BlockHeader, getBlockBlobFields } from '@aztec/stdlib/block';
+import { getCheckpointBlobFields } from '@aztec/stdlib/checkpoint';
+import type { MerkleTreeWriteOperations, PublicInputsAndRecursiveProof } from '@aztec/stdlib/interfaces/server';
+import { ContractClassLogFields } from '@aztec/stdlib/logs';
+import { Proof, ProofData, RecursiveProof } from '@aztec/stdlib/proofs';
 import {
-  type BaseOrMergeRollupPublicInputs,
-  type BlockRootOrBlockMergePublicInputs,
-  ConstantRollupData,
+  BlockConstantData,
+  BlockRollupPublicInputs,
   PrivateBaseRollupHints,
-  PrivateBaseStateDiffHints,
   PublicBaseRollupHints,
+  PublicChonkVerifierPrivateInputs,
+  TreeSnapshotDiffHints,
 } from '@aztec/stdlib/rollup';
 import {
   AppendOnlyTreeSnapshot,
@@ -46,17 +57,16 @@ import {
 import {
   BlockHeader,
   ContentCommitment,
-  type GlobalVariables,
+  GlobalVariables,
   PartialStateReference,
   type ProcessedTx,
   StateReference,
-  TxEffect,
+  Tx,
 } from '@aztec/stdlib/tx';
+import { VkData } from '@aztec/stdlib/vks';
 import { Attributes, type Span, runInSpan } from '@aztec/telemetry-client';
 import type { MerkleTreeReadOperations } from '@aztec/world-state';
 
-import { inspect } from 'util';
-
 /**
  * Type representing the names of the trees for the base rollup.
  */
@@ -67,33 +77,30 @@ type BaseTreeNames = 'NoteHashTree' | 'ContractTree' | 'NullifierTree' | 'Public
 export type TreeNames = BaseTreeNames | 'L1ToL2MessageTree' | 'Archive';
 
 // Builds the hints for base rollup. Updating the contract, nullifier, and data trees in the process.
-export const buildBaseRollupHints = runInSpan(
+export const insertSideEffectsAndBuildBaseRollupHints = runInSpan(
   'BlockBuilderHelpers',
   'buildBaseRollupHints',
   async (
     span: Span,
     tx: ProcessedTx,
-    globalVariables: GlobalVariables,
-    db: MerkleTreeWriteOperations,
+    lastArchive: AppendOnlyTreeSnapshot,
+    newL1ToL2MessageTreeSnapshot: AppendOnlyTreeSnapshot,
     startSpongeBlob: SpongeBlob,
+    proverId: Fr,
+    db: MerkleTreeWriteOperations,
   ) => {
     span.setAttribute(Attributes.TX_HASH, tx.hash.toString());
     // Get trees info before any changes hit
-    const constants = await getConstantRollupData(globalVariables, db);
     const start = new PartialStateReference(
       await getTreeSnapshot(MerkleTreeId.NOTE_HASH_TREE, db),
       await getTreeSnapshot(MerkleTreeId.NULLIFIER_TREE, db),
       await getTreeSnapshot(MerkleTreeId.PUBLIC_DATA_TREE, db),
     );
-    // Get the subtree sibling paths for the circuit
-    const noteHashSubtreeSiblingPathArray = await getSubtreeSiblingPath(
-      MerkleTreeId.NOTE_HASH_TREE,
-      NOTE_HASH_SUBTREE_HEIGHT,
-      db,
-    );
 
-    const noteHashSubtreeSiblingPath = makeTuple(NOTE_HASH_SUBTREE_SIBLING_PATH_LENGTH, i =>
-      i < noteHashSubtreeSiblingPathArray.length ? noteHashSubtreeSiblingPathArray[i] : Fr.ZERO,
+    // Get the note hash subtree root sibling path for insertion.
+    const noteHashSubtreeRootSiblingPath = assertLength(
+      await getSubtreeSiblingPath(MerkleTreeId.NOTE_HASH_TREE, NOTE_HASH_SUBTREE_HEIGHT, db),
+      NOTE_HASH_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
     );
 
     // Update the note hash trees with the new items being inserted to get the new roots
@@ -101,10 +108,6 @@ export const buildBaseRollupHints = runInSpan(
     const noteHashes = padArrayEnd(tx.txEffect.noteHashes, Fr.ZERO, MAX_NOTE_HASHES_PER_TX);
     await db.appendLeaves(MerkleTreeId.NOTE_HASH_TREE, noteHashes);
 
-    // Create data hint for reading fee payer initial balance in Fee Juice
-    const leafSlot = await computeFeePayerBalanceLeafSlot(tx.data.feePayer);
-    const feePayerFeeJuiceBalanceReadHint = await getPublicDataHint(db, leafSlot.toBigInt());
-
     // The read witnesses for a given TX should be generated before the writes of the same TX are applied.
     // All reads that refer to writes in the same tx are transient and can be simplified out.
     const txPublicDataUpdateRequestInfo = await processPublicDataUpdateRequests(tx, db);
@@ -112,8 +115,8 @@ export const buildBaseRollupHints = runInSpan(
     // Update the nullifier tree, capturing the low nullifier info for each individual operation
     const {
       lowLeavesWitnessData: nullifierWitnessLeaves,
-      newSubtreeSiblingPath: nullifiersSubtreeSiblingPath,
-      sortedNewLeaves: sortednullifiers,
+      newSubtreeSiblingPath: nullifiersSubtreeRootSiblingPath,
+      sortedNewLeaves: sortedNullifiers,
       sortedNewLeavesIndexes,
     } = await db.batchInsert(
       MerkleTreeId.NULLIFIER_TREE,
@@ -125,41 +128,22 @@ export const buildBaseRollupHints = runInSpan(
       throw new Error(`Could not craft nullifier batch insertion proofs`);
     }
 
-    // Extract witness objects from returned data
-    const nullifierPredecessorMembershipWitnessesWithoutPadding: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>[] =
-      nullifierWitnessLeaves.map(l =>
-        MembershipWitness.fromBufferArray(l.index, assertLength(l.siblingPath.toBufferArray(), NULLIFIER_TREE_HEIGHT)),
-      );
-
-    const nullifierSubtreeSiblingPathArray = nullifiersSubtreeSiblingPath.toFields();
-
-    const nullifierSubtreeSiblingPath = makeTuple(NULLIFIER_SUBTREE_SIBLING_PATH_LENGTH, i =>
-      i < nullifierSubtreeSiblingPathArray.length ? nullifierSubtreeSiblingPathArray[i] : Fr.ZERO,
-    );
-
-    // Append new data to startSpongeBlob
-    const inputSpongeBlob = startSpongeBlob.clone();
-    await startSpongeBlob.absorb(tx.txEffect.toBlobFields());
+    const blockHash = await tx.data.constants.anchorBlockHeader.hash();
+    const anchorBlockArchiveSiblingPath = (
+      await getMembershipWitnessFor(blockHash, MerkleTreeId.ARCHIVE, ARCHIVE_HEIGHT, db)
+    ).siblingPath;
 
-    const contractClassLogsPreimages = makeTuple(
+    const contractClassLogsFields = makeTuple(
       MAX_CONTRACT_CLASS_LOGS_PER_TX,
-      i => tx.txEffect.contractClassLogs[i]?.toUnsiloed() || ContractClassLog.empty(),
+      i => tx.txEffect.contractClassLogs[i]?.fields || ContractClassLogFields.empty(),
     );
 
     if (tx.avmProvingRequest) {
-      const blockHash = await tx.constants.historicalHeader.hash();
-      const archiveRootMembershipWitness = await getMembershipWitnessFor(
-        blockHash,
-        MerkleTreeId.ARCHIVE,
-        ARCHIVE_HEIGHT,
-        db,
-      );
-
       return PublicBaseRollupHints.from({
-        startSpongeBlob: inputSpongeBlob,
-        archiveRootMembershipWitness,
-        contractClassLogsPreimages,
-        constants,
+        startSpongeBlob,
+        lastArchive,
+        anchorBlockArchiveSiblingPath,
+        contractClassLogsFields,
       });
     } else {
       if (
@@ -170,139 +154,146 @@ export const buildBaseRollupHints = runInSpan(
         throw new Error(`More than one public data write in a private only tx`);
       }
 
-      const feeWriteLowLeafPreimage =
-        txPublicDataUpdateRequestInfo.lowPublicDataWritesPreimages[0] || PublicDataTreeLeafPreimage.empty();
-      const feeWriteLowLeafMembershipWitness =
-        txPublicDataUpdateRequestInfo.lowPublicDataWritesMembershipWitnesses[0] ||
-        MembershipWitness.empty<typeof PUBLIC_DATA_TREE_HEIGHT>(PUBLIC_DATA_TREE_HEIGHT);
-      const feeWriteSiblingPath =
-        txPublicDataUpdateRequestInfo.publicDataWritesSiblingPaths[0] ||
-        makeTuple(PUBLIC_DATA_TREE_HEIGHT, () => Fr.ZERO);
-
-      const stateDiffHints = PrivateBaseStateDiffHints.from({
-        nullifierPredecessorPreimages: makeTuple(MAX_NULLIFIERS_PER_TX, i =>
-          i < nullifierWitnessLeaves.length
-            ? (nullifierWitnessLeaves[i].leafPreimage as NullifierLeafPreimage)
-            : NullifierLeafPreimage.empty(),
+      // Get hints for reading fee payer's balance in the public data tree.
+      const feePayerBalanceMembershipWitness = txPublicDataUpdateRequestInfo.lowPublicDataWritesMembershipWitnesses[0];
+      const feePayerBalanceLeafPreimage = txPublicDataUpdateRequestInfo.lowPublicDataWritesPreimages[0];
+      const leafSlot = await computeFeePayerBalanceLeafSlot(tx.data.feePayer);
+      if (!feePayerBalanceMembershipWitness || !leafSlot.equals(feePayerBalanceLeafPreimage?.leaf.slot)) {
+        throw new Error(`Cannot find the public data tree leaf for the fee payer's balance`);
+      }
+
+      // Extract witness objects from returned data
+      const nullifierPredecessorMembershipWitnessesWithoutPadding: MembershipWitness<typeof NULLIFIER_TREE_HEIGHT>[] =
+        nullifierWitnessLeaves.map(l =>
+          MembershipWitness.fromBufferArray(
+            l.index,
+            assertLength(l.siblingPath.toBufferArray(), NULLIFIER_TREE_HEIGHT),
+          ),
+        );
+
+      const treeSnapshotDiffHints = TreeSnapshotDiffHints.from({
+        noteHashSubtreeRootSiblingPath,
+        nullifierPredecessorPreimages: padArrayEnd(
+          nullifierWitnessLeaves.map(l => l.leafPreimage as NullifierLeafPreimage),
+          NullifierLeafPreimage.empty(),
+          MAX_NULLIFIERS_PER_TX,
         ),
         nullifierPredecessorMembershipWitnesses: makeTuple(MAX_NULLIFIERS_PER_TX, i =>
           i < nullifierPredecessorMembershipWitnessesWithoutPadding.length
             ? nullifierPredecessorMembershipWitnessesWithoutPadding[i]
             : makeEmptyMembershipWitness(NULLIFIER_TREE_HEIGHT),
         ),
-        sortedNullifiers: makeTuple(MAX_NULLIFIERS_PER_TX, i => Fr.fromBuffer(sortednullifiers[i])),
-        sortedNullifierIndexes: makeTuple(MAX_NULLIFIERS_PER_TX, i => sortedNewLeavesIndexes[i]),
-        noteHashSubtreeSiblingPath,
-        nullifierSubtreeSiblingPath,
-        feeWriteLowLeafPreimage,
-        feeWriteLowLeafMembershipWitness,
-        feeWriteSiblingPath,
+        sortedNullifiers: assertLength(
+          sortedNullifiers.map(n => Fr.fromBuffer(n)),
+          MAX_NULLIFIERS_PER_TX,
+        ),
+        sortedNullifierIndexes: assertLength(sortedNewLeavesIndexes, MAX_NULLIFIERS_PER_TX),
+        nullifierSubtreeRootSiblingPath: assertLength(
+          nullifiersSubtreeRootSiblingPath.toFields(),
+          NULLIFIER_SUBTREE_ROOT_SIBLING_PATH_LENGTH,
+        ),
+        feePayerBalanceMembershipWitness,
       });
 
-      const blockHash = await tx.constants.historicalHeader.hash();
-      const archiveRootMembershipWitness = await getMembershipWitnessFor(
-        blockHash,
-        MerkleTreeId.ARCHIVE,
-        ARCHIVE_HEIGHT,
-        db,
-      );
+      const constants = BlockConstantData.from({
+        lastArchive,
+        l1ToL2TreeSnapshot: newL1ToL2MessageTreeSnapshot,
+        vkTreeRoot: tx.data.constants.vkTreeRoot,
+        protocolContractsHash: tx.data.constants.protocolContractsHash,
+        globalVariables: tx.globalVariables,
+        proverId,
+      });
 
       return PrivateBaseRollupHints.from({
         start,
-        startSpongeBlob: inputSpongeBlob,
-        stateDiffHints,
-        feePayerFeeJuiceBalanceReadHint,
-        archiveRootMembershipWitness,
-        contractClassLogsPreimages,
+        startSpongeBlob,
+        treeSnapshotDiffHints,
+        feePayerBalanceLeafPreimage,
+        anchorBlockArchiveSiblingPath,
+        contractClassLogsFields,
         constants,
       });
     }
   },
 );
 
-export async function getPublicDataHint(db: MerkleTreeWriteOperations, leafSlot: bigint) {
-  const { index } = (await db.getPreviousValueIndex(MerkleTreeId.PUBLIC_DATA_TREE, leafSlot)) ?? {};
-  if (index === undefined) {
-    throw new Error(`Cannot find the previous value index for public data ${leafSlot}.`);
-  }
-
-  const siblingPath = await db.getSiblingPath<typeof PUBLIC_DATA_TREE_HEIGHT>(MerkleTreeId.PUBLIC_DATA_TREE, index);
-  const membershipWitness = new MembershipWitness(PUBLIC_DATA_TREE_HEIGHT, index, siblingPath.toTuple());
+export function getChonkProofFromTx(tx: Tx | ProcessedTx) {
+  const publicInputs = tx.data.publicInputs().toFields();
 
-  const leafPreimage = (await db.getLeafPreimage(MerkleTreeId.PUBLIC_DATA_TREE, index)) as PublicDataTreeLeafPreimage;
-  if (!leafPreimage) {
-    throw new Error(`Cannot find the leaf preimage for public data tree at index ${index}.`);
-  }
-
-  const exists = leafPreimage.slot.toBigInt() === leafSlot;
-  const value = exists ? leafPreimage.value : Fr.ZERO;
+  const binaryProof = new Proof(
+    Buffer.concat(tx.chonkProof.attachPublicInputs(publicInputs).fieldsWithPublicInputs.map(field => field.toBuffer())),
+    publicInputs.length,
+  );
+  return new RecursiveProof(tx.chonkProof.fields, binaryProof, true, CHONK_PROOF_LENGTH);
+}
 
-  return new PublicDataHint(new Fr(leafSlot), value, membershipWitness, leafPreimage);
+export function getPublicChonkVerifierPrivateInputsFromTx(tx: Tx | ProcessedTx, proverId: Fr) {
+  const proofData = new ProofData(
+    tx.data.toPrivateToPublicKernelCircuitPublicInputs(),
+    getChonkProofFromTx(tx),
+    getVkData('HidingKernelToPublic'),
+  );
+  return new PublicChonkVerifierPrivateInputs(proofData, proverId);
 }
 
-export const buildBlobHints = runInSpan(
+// Build "hints" as the private inputs for the checkpoint root rollup circuit.
+// The `blobCommitments` will be accumulated and checked in the root rollup against the `finalBlobChallenges`.
+// The `blobsHash` will be validated on L1 against the submitted blob data.
+export const buildBlobHints = (blobFields: Fr[]) => {
+  const blobs = getBlobsPerL1Block(blobFields);
+  const blobCommitments = getBlobCommitmentsFromBlobs(blobs);
+  const blobsHash = computeBlobsHashFromBlobs(blobs);
+  return { blobCommitments, blobs, blobsHash };
+};
+
+// Build the data required to prove the txs in an epoch. Currently only used in tests. It assumes 1 block per checkpoint.
+export const buildBlobDataFromTxs = async (txsPerCheckpoint: ProcessedTx[][]) => {
+  const blobFields = txsPerCheckpoint.map(txs => getCheckpointBlobFields([txs.map(tx => tx.txEffect)]));
+  const finalBlobChallenges = await buildFinalBlobChallenges(blobFields);
+  return { blobFieldsLengths: blobFields.map(fields => fields.length), finalBlobChallenges };
+};
+
+export const buildFinalBlobChallenges = async (blobFieldsPerCheckpoint: Fr[][]) => {
+  const blobs = blobFieldsPerCheckpoint.map(blobFields => getBlobsPerL1Block(blobFields));
+  return await BatchedBlob.precomputeBatchedBlobChallenges(blobs);
+};
+
+export const accumulateBlobs = runInSpan(
   'BlockBuilderHelpers',
-  'buildBlobHints',
-  async (_span: Span, txEffects: TxEffect[]) => {
-    const blobFields = txEffects.flatMap(tx => tx.toBlobFields());
-    const blobs = await Blob.getBlobs(blobFields);
-    const blobCommitments = blobs.map(b => b.commitmentToFields());
-    const blobsHash = new Fr(getBlobsHashFromBlobs(blobs));
-    return { blobFields, blobCommitments, blobs, blobsHash };
+  'accumulateBlobs',
+  async (_span: Span, blobFields: Fr[], startBlobAccumulator: BatchedBlobAccumulator) => {
+    const blobs = getBlobsPerL1Block(blobFields);
+    const endBlobAccumulator = await startBlobAccumulator.accumulateBlobs(blobs);
+    return endBlobAccumulator;
   },
 );
 
 export const buildHeaderFromCircuitOutputs = runInSpan(
   'BlockBuilderHelpers',
   'buildHeaderFromCircuitOutputs',
-  async (
-    _span,
-    previousRollupData: BaseOrMergeRollupPublicInputs[],
-    parityPublicInputs: ParityPublicInputs,
-    rootRollupOutputs: BlockRootOrBlockMergePublicInputs,
-    endState: StateReference,
-    logger?: Logger,
-  ) => {
-    if (previousRollupData.length > 2) {
-      throw new Error(`There can't be more than 2 previous rollups. Received ${previousRollupData.length}.`);
-    }
+  async (_span, blockRootRollupOutput: BlockRollupPublicInputs) => {
+    const constants = blockRootRollupOutput.constants;
+    const globalVariables = GlobalVariables.from({
+      chainId: constants.chainId,
+      version: constants.version,
+      blockNumber: blockRootRollupOutput.previousArchive.nextAvailableLeafIndex,
+      timestamp: blockRootRollupOutput.endTimestamp,
+      slotNumber: constants.slotNumber,
+      coinbase: constants.coinbase,
+      feeRecipient: constants.feeRecipient,
+      gasFees: constants.gasFees,
+    });
 
-    const blobsHash = rootRollupOutputs.blobPublicInputs[0].getBlobsHash();
-    const numTxs = previousRollupData.reduce((sum, d) => sum + d.numTxs, 0);
-    const outHash =
-      previousRollupData.length === 0
-        ? Fr.ZERO.toBuffer()
-        : previousRollupData.length === 1
-        ? previousRollupData[0].outHash.toBuffer()
-        : sha256Trunc(
-            Buffer.concat([previousRollupData[0].outHash.toBuffer(), previousRollupData[1].outHash.toBuffer()]),
-          );
-    const contentCommitment = new ContentCommitment(
-      new Fr(numTxs),
-      blobsHash,
-      parityPublicInputs.shaRoot.toBuffer(),
-      outHash,
-    );
+    const spongeBlobHash = await blockRootRollupOutput.endSpongeBlob.clone().squeeze();
 
-    const accumulatedFees = previousRollupData.reduce((sum, d) => sum.add(d.accumulatedFees), Fr.ZERO);
-    const accumulatedManaUsed = previousRollupData.reduce((sum, d) => sum.add(d.accumulatedManaUsed), Fr.ZERO);
-    const header = new BlockHeader(
-      rootRollupOutputs.previousArchive,
-      contentCommitment,
-      endState,
-      rootRollupOutputs.endGlobalVariables,
-      accumulatedFees,
-      accumulatedManaUsed,
+    return new BlockHeader(
+      blockRootRollupOutput.previousArchive,
+      blockRootRollupOutput.endState,
+      spongeBlobHash,
+      globalVariables,
+      blockRootRollupOutput.accumulatedFees,
+      blockRootRollupOutput.accumulatedManaUsed,
     );
-    if (!(await 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;
   },
 );
 
@@ -315,8 +306,9 @@ export const buildHeaderAndBodyFromTxs = runInSpan(
     globalVariables: GlobalVariables,
     l1ToL2Messages: Fr[],
     db: MerkleTreeReadOperations,
+    startSpongeBlob?: SpongeBlob,
   ) => {
-    span.setAttribute(Attributes.BLOCK_NUMBER, globalVariables.blockNumber.toNumber());
+    span.setAttribute(Attributes.BLOCK_NUMBER, globalVariables.blockNumber);
     const stateReference = new StateReference(
       await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db),
       new PartialStateReference(
@@ -331,92 +323,95 @@ export const buildHeaderAndBodyFromTxs = runInSpan(
     const txEffects = txs.map(tx => tx.txEffect);
     const body = new Body(txEffects);
 
-    const numTxs = body.txEffects.length;
-    const outHash =
-      numTxs === 0
-        ? Fr.ZERO.toBuffer()
-        : numTxs === 1
-        ? body.txEffects[0].txOutHash()
-        : 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) => Promise.resolve(sha256Trunc(Buffer.concat([left, right])));
-    const parityHeight = Math.ceil(Math.log2(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
-    const parityCalculator = await MerkleTreeCalculator.create(parityHeight, Fr.ZERO.toBuffer(), hasher);
-    const parityShaRoot = await parityCalculator.computeTreeRoot(l1ToL2Messages.map(msg => msg.toBuffer()));
-    const blobsHash = getBlobsHashFromBlobs(await Blob.getBlobs(body.toBlobFields()));
-
-    const contentCommitment = new ContentCommitment(new Fr(numTxs), blobsHash, parityShaRoot, outHash);
-
-    const fees = body.txEffects.reduce((acc, tx) => acc.add(tx.transactionFee), Fr.ZERO);
+    const txOutHashes = txEffects.map(tx => tx.txOutHash());
+    const outHash = txOutHashes.length === 0 ? Fr.ZERO : new Fr(computeCompressedUnbalancedMerkleTreeRoot(txOutHashes));
+
+    const parityShaRoot = await computeInHashFromL1ToL2Messages(l1ToL2Messages);
+    const blockBlobFields = body.toBlobFields();
+    // TODO(#17027): This only works when there's one block per checkpoint.
+    const blobFields = [new Fr(blockBlobFields.length + 1)].concat(blockBlobFields);
+    const blobsHash = computeBlobsHashFromBlobs(getBlobsPerL1Block(blobFields));
+
+    const contentCommitment = new ContentCommitment(blobsHash, parityShaRoot, outHash);
+
+    const fees = txEffects.reduce((acc, tx) => acc.add(tx.transactionFee), Fr.ZERO);
     const manaUsed = txs.reduce((acc, tx) => acc.add(new Fr(tx.gasUsed.billedGas.l2Gas)), Fr.ZERO);
 
-    const header = new BlockHeader(previousArchive, contentCommitment, stateReference, globalVariables, fees, manaUsed);
+    const endSpongeBlob = startSpongeBlob?.clone() ?? (await SpongeBlob.init(blobFields.length));
+    await endSpongeBlob.absorb(blockBlobFields);
+    const spongeBlobHash = await endSpongeBlob.squeeze();
+
+    const header = new L2BlockHeader(
+      previousArchive,
+      contentCommitment,
+      stateReference,
+      globalVariables,
+      fees,
+      manaUsed,
+      spongeBlobHash,
+    );
 
     return { header, body };
   },
 );
 
-export function getBlobsHashFromBlobs(inputs: Blob[]): Buffer {
-  const blobHashes = serializeToBuffer(inputs.map(b => b.getEthVersionedBlobHash()));
-  return sha256Trunc(serializeToBuffer(blobHashes));
-}
-
-// Validate that the roots of all local trees match the output of the root circuit simulation
-export async function validateBlockRootOutput(
-  blockRootOutput: BlockRootOrBlockMergePublicInputs,
-  blockHeader: BlockHeader,
-  db: MerkleTreeReadOperations,
-) {
-  await Promise.all([
-    validateState(blockHeader.state, db),
-    validateSimulatedTree(await getTreeSnapshot(MerkleTreeId.ARCHIVE, db), blockRootOutput.newArchive, 'Archive'),
-  ]);
-}
-
-export const validateState = runInSpan(
+export const buildBlockHeaderFromTxs = runInSpan(
   'BlockBuilderHelpers',
-  'validateState',
-  async (_span, state: StateReference, db: MerkleTreeReadOperations) => {
-    const promises = [MerkleTreeId.NOTE_HASH_TREE, MerkleTreeId.NULLIFIER_TREE, MerkleTreeId.PUBLIC_DATA_TREE].map(
-      async (id: MerkleTreeId) => {
-        return { key: id, value: await getTreeSnapshot(id, db) };
-      },
-    );
-    const snapshots: Map<MerkleTreeId, AppendOnlyTreeSnapshot> = new Map(
-      (await Promise.all(promises)).map(obj => [obj.key, obj.value]),
-    );
-    validatePartialState(state.partial, snapshots);
-    validateSimulatedTree(
+  'buildBlockHeaderFromTxs',
+  async (
+    span,
+    txs: ProcessedTx[],
+    globalVariables: GlobalVariables,
+    startSpongeBlob: SpongeBlob,
+    db: MerkleTreeReadOperations,
+  ) => {
+    span.setAttribute(Attributes.BLOCK_NUMBER, globalVariables.blockNumber);
+    const stateReference = new StateReference(
       await getTreeSnapshot(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, db),
-      state.l1ToL2MessageTree,
-      'L1ToL2MessageTree',
+      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 blobFields = getBlockBlobFields(txs.map(tx => tx.txEffect));
+    const endSpongeBlob = startSpongeBlob.clone();
+    await endSpongeBlob.absorb(blobFields);
+    const spongeBlobHash = await endSpongeBlob.squeeze();
+
+    const txEffects = txs.map(tx => tx.txEffect);
+    const fees = txEffects.reduce((acc, tx) => acc.add(tx.transactionFee), Fr.ZERO);
+    const manaUsed = txs.reduce((acc, tx) => acc.add(new Fr(tx.gasUsed.billedGas.l2Gas)), Fr.ZERO);
+
+    return new BlockHeader(previousArchive, stateReference, spongeBlobHash, globalVariables, fees, manaUsed);
   },
 );
 
+/** Computes the inHash for a block's ContentCommitment given its l1 to l2 messages. */
+export async function computeInHashFromL1ToL2Messages(unpaddedL1ToL2Messages: Fr[]): Promise<Fr> {
+  const l1ToL2Messages = padArrayEnd<Fr, number>(unpaddedL1ToL2Messages, Fr.ZERO, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+  const hasher = (left: Buffer, right: Buffer) =>
+    Promise.resolve(sha256Trunc(Buffer.concat([left, right])) as Buffer<ArrayBuffer>);
+  const parityHeight = Math.ceil(Math.log2(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP));
+  const parityCalculator = await MerkleTreeCalculator.create(parityHeight, Fr.ZERO.toBuffer(), hasher);
+  return new Fr(await parityCalculator.computeTreeRoot(l1ToL2Messages.map(msg => msg.toBuffer())));
+}
+
+export async function getLastSiblingPath<TID extends MerkleTreeId>(treeId: TID, db: MerkleTreeReadOperations) {
+  const { size } = await db.getTreeInfo(treeId);
+  const path = await db.getSiblingPath(treeId, size - 1n);
+  return padArrayEnd(path.toFields(), Fr.ZERO, getTreeHeight(treeId));
+}
+
 export async function getRootTreeSiblingPath<TID extends MerkleTreeId>(treeId: TID, db: MerkleTreeReadOperations) {
   const { size } = await db.getTreeInfo(treeId);
   const path = await db.getSiblingPath(treeId, size);
   return padArrayEnd(path.toFields(), Fr.ZERO, getTreeHeight(treeId));
 }
 
-export const getConstantRollupData = runInSpan(
-  'BlockBuilderHelpers',
-  'getConstantRollupData',
-  async (_span, globalVariables: GlobalVariables, db: MerkleTreeReadOperations): Promise<ConstantRollupData> => {
-    return ConstantRollupData.from({
-      vkTreeRoot: getVKTreeRoot(),
-      protocolContractTreeRoot,
-      lastArchive: await getTreeSnapshot(MerkleTreeId.ARCHIVE, db),
-      globalVariables,
-    });
-  },
-);
-
 export async function getTreeSnapshot(id: MerkleTreeId, db: MerkleTreeReadOperations): Promise<AppendOnlyTreeSnapshot> {
   const treeInfo = await db.getTreeInfo(id);
   return new AppendOnlyTreeSnapshot(Fr.fromBuffer(treeInfo.root), Number(treeInfo.size));
@@ -537,17 +532,26 @@ function validateSimulatedTree(
 }
 
 export function validateTx(tx: ProcessedTx) {
-  const txHeader = tx.constants.historicalHeader;
-  if (txHeader.state.l1ToL2MessageTree.isZero()) {
+  const txHeader = tx.data.constants.anchorBlockHeader;
+  if (txHeader.state.l1ToL2MessageTree.isEmpty()) {
     throw new Error(`Empty L1 to L2 messages tree in tx: ${toFriendlyJSON(tx)}`);
   }
-  if (txHeader.state.partial.noteHashTree.isZero()) {
+  if (txHeader.state.partial.noteHashTree.isEmpty()) {
     throw new Error(`Empty note hash tree in tx: ${toFriendlyJSON(tx)}`);
   }
-  if (txHeader.state.partial.nullifierTree.isZero()) {
+  if (txHeader.state.partial.nullifierTree.isEmpty()) {
     throw new Error(`Empty nullifier tree in tx: ${toFriendlyJSON(tx)}`);
   }
-  if (txHeader.state.partial.publicDataTree.isZero()) {
+  if (txHeader.state.partial.publicDataTree.isEmpty()) {
     throw new Error(`Empty public data tree in tx: ${toFriendlyJSON(tx)}`);
   }
 }
+
+export function toProofData<T extends Bufferable, PROOF_LENGTH extends number>(
+  { inputs, proof, verificationKey }: PublicInputsAndRecursiveProof<T, PROOF_LENGTH>,
+  vkIndex?: number,
+) {
+  const leafIndex = vkIndex || getVKIndex(verificationKey.keyAsFields);
+  const vkData = new VkData(verificationKey, leafIndex, getVKSiblingPath(leafIndex));
+  return new ProofData(inputs, proof, vkData);
+}