@aztec/archiver 3.0.0-nightly.20251113 → 3.0.0-nightly.20251115

package/dest/archiver/data_retrieval.d.ts

@@ -1,3 +1,4 @@
+import { type CheckpointBlobData } from '@aztec/blob-lib';
 import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import type { ViemClient, ViemPublicClient } from '@aztec/ethereum';
 import type { EthAddress } from '@aztec/foundation/eth-address';
@@ -13,17 +14,16 @@ import type { DataRetrieval } from './structs/data_retrieval.js';
 import type { InboxMessage } from './structs/inbox_message.js';
 import type { L1PublishedData } from './structs/published.js';
 export type RetrievedL2Block = {
-    l2BlockNumber: number;
     archiveRoot: Fr;
     stateReference: StateReference;
     header: CheckpointHeader;
-    blobFields: Fr[];
+    checkpointBlobData: CheckpointBlobData;
     l1: L1PublishedData;
     chainId: Fr;
     version: Fr;
     attestations: CommitteeAttestation[];
 };
-export declare function retrievedBlockToPublishedL2Block(retrievedBlock: RetrievedL2Block): Promise<PublishedL2Block>;
+export declare function retrievedBlockToPublishedL2Block({ archiveRoot, stateReference, header: checkpointHeader, checkpointBlobData, l1, chainId, version, attestations, }: RetrievedL2Block): Promise<PublishedL2Block>;
 /**
  * Fetches new L2 blocks.
  * @param publicClient - The viem public client to use for transaction retrieval.

package/dest/archiver/data_retrieval.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data_retrieval.d.ts","sourceRoot":"","sources":["../../src/archiver/data_retrieval.ts"],"names":[],"mappings":"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"}

package/dest/archiver/data_retrieval.js

@@ -1,4 +1,4 @@
-import { BlobDeserializationError, SpongeBlob, getBlobFieldsInCheckpoint } from '@aztec/blob-lib';
+import { BlobDeserializationError, SpongeBlob, decodeCheckpointBlobDataFromBlobs, encodeBlockBlobData } from '@aztec/blob-lib';
 import { asyncPool } from '@aztec/foundation/async-pool';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/fields';
@@ -8,43 +8,67 @@ import { Body, CommitteeAttestation, L2Block, L2BlockHeader, PublishedL2Block }
 import { Proof } from '@aztec/stdlib/proofs';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
-import { GlobalVariables, StateReference } from '@aztec/stdlib/tx';
+import { GlobalVariables, PartialStateReference, StateReference } from '@aztec/stdlib/tx';
 import { decodeFunctionData, getAbiItem, hexToBytes, multicall3Abi } from 'viem';
 import { NoBlobBodiesFoundError } from './errors.js';
-export async function retrievedBlockToPublishedL2Block(retrievedBlock) {
-    const { l2BlockNumber, archiveRoot, stateReference, header: checkpointHeader, blobFields, l1, chainId, version, attestations } = retrievedBlock;
-    const archive = new AppendOnlyTreeSnapshot(archiveRoot, l2BlockNumber + 1);
-    const globalVariables = GlobalVariables.from({
-        chainId,
-        version,
-        blockNumber: l2BlockNumber,
-        slotNumber: checkpointHeader.slotNumber,
-        timestamp: checkpointHeader.timestamp,
-        coinbase: checkpointHeader.coinbase,
-        feeRecipient: checkpointHeader.feeRecipient,
-        gasFees: checkpointHeader.gasFees
-    });
+export async function retrievedBlockToPublishedL2Block({ archiveRoot, stateReference, header: checkpointHeader, checkpointBlobData, l1, chainId, version, attestations }) {
+    const { totalNumBlobFields, blocks: blocksBlobData } = checkpointBlobData;
+    // The lastArchiveRoot of a block is the new archive for the previous block.
+    const newArchiveRoots = blocksBlobData.map((b)=>b.lastArchiveRoot).slice(1).concat([
+        archiveRoot
+    ]);
+    // `blocksBlobData` is created from `decodeCheckpointBlobDataFromBlobs`. An error will be thrown if it can't read a
+    // field for the `l1ToL2MessageRoot` of the first block. So below we can safely assume it exists:
+    const l1toL2MessageTreeRoot = blocksBlobData[0].l1ToL2MessageRoot;
+    const spongeBlob = await SpongeBlob.init(totalNumBlobFields);
+    const l2Blocks = [];
+    for(let i = 0; i < blocksBlobData.length; i++){
+        const blockBlobData = blocksBlobData[i];
+        const { blockEndMarker, blockEndStateField, lastArchiveRoot, noteHashRoot, nullifierRoot, publicDataRoot } = blockBlobData;
+        const l2BlockNumber = blockEndMarker.blockNumber;
+        const globalVariables = GlobalVariables.from({
+            chainId,
+            version,
+            blockNumber: l2BlockNumber,
+            slotNumber: checkpointHeader.slotNumber,
+            timestamp: blockEndMarker.timestamp,
+            coinbase: checkpointHeader.coinbase,
+            feeRecipient: checkpointHeader.feeRecipient,
+            gasFees: checkpointHeader.gasFees
+        });
+        const state = StateReference.from({
+            l1ToL2MessageTree: new AppendOnlyTreeSnapshot(l1toL2MessageTreeRoot, blockEndStateField.l1ToL2MessageNextAvailableLeafIndex),
+            partial: PartialStateReference.from({
+                noteHashTree: new AppendOnlyTreeSnapshot(noteHashRoot, blockEndStateField.noteHashNextAvailableLeafIndex),
+                nullifierTree: new AppendOnlyTreeSnapshot(nullifierRoot, blockEndStateField.nullifierNextAvailableLeafIndex),
+                publicDataTree: new AppendOnlyTreeSnapshot(publicDataRoot, blockEndStateField.publicDataNextAvailableLeafIndex)
+            })
+        });
+        const body = Body.fromTxBlobData(checkpointBlobData.blocks[0].txs);
+        const blobFields = encodeBlockBlobData(blockBlobData);
+        await spongeBlob.absorb(blobFields);
+        const clonedSpongeBlob = spongeBlob.clone();
+        const spongeBlobHash = await clonedSpongeBlob.squeeze();
+        const header = L2BlockHeader.from({
+            lastArchive: new AppendOnlyTreeSnapshot(lastArchiveRoot, l2BlockNumber),
+            contentCommitment: checkpointHeader.contentCommitment,
+            state,
+            globalVariables,
+            totalFees: body.txEffects.reduce((accum, txEffect)=>accum.add(txEffect.transactionFee), Fr.ZERO),
+            totalManaUsed: new Fr(blockEndStateField.totalManaUsed),
+            spongeBlobHash
+        });
+        const newArchive = new AppendOnlyTreeSnapshot(newArchiveRoots[i], l2BlockNumber + 1);
+        l2Blocks.push(new L2Block(newArchive, header, body));
+    }
+    const lastBlock = l2Blocks[l2Blocks.length - 1];
+    if (!lastBlock.header.state.equals(stateReference)) {
+        throw new Error('The claimed state reference submitted to L1 does not match the state reference of the last block.');
+    }
     // TODO(#17027)
-    // This works when there's only one block in the checkpoint.
-    // If there's more than one block, we need to build the spongeBlob from the endSpongeBlob of the previous block.
-    const spongeBlob = await SpongeBlob.init(blobFields.length);
-    // Skip the first field which is the checkpoint prefix indicating the number of total blob fields in a checkpoint.
-    const blockBlobFields = blobFields.slice(1);
-    await spongeBlob.absorb(blockBlobFields);
-    const spongeBlobHash = await spongeBlob.squeeze();
-    const body = Body.fromBlobFields(blockBlobFields);
-    const header = L2BlockHeader.from({
-        lastArchive: new AppendOnlyTreeSnapshot(checkpointHeader.lastArchiveRoot, l2BlockNumber),
-        contentCommitment: checkpointHeader.contentCommitment,
-        state: stateReference,
-        globalVariables,
-        totalFees: body.txEffects.reduce((accum, txEffect)=>accum.add(txEffect.transactionFee), Fr.ZERO),
-        totalManaUsed: checkpointHeader.totalManaUsed,
-        spongeBlobHash
-    });
-    const block = new L2Block(archive, header, body);
+    // There's only one block per checkpoint at the moment.
     return PublishedL2Block.fromFields({
-        block,
+        block: l2Blocks[0],
         l1,
         attestations
     });
@@ -221,10 +245,10 @@ export async function getL1BlockTime(publicClient, blockNumber) {
     if (blobBodies.length === 0) {
         throw new NoBlobBodiesFoundError(l2BlockNumber);
     }
-    let blobFields;
+    let checkpointBlobData;
     try {
-        // Get the fields that were actually added in the checkpoint. And check the encoding of the fields.
-        blobFields = getBlobFieldsInCheckpoint(blobBodies.map((b)=>b.blob), true);
+        // Attempt to decode the checkpoint blob data.
+        checkpointBlobData = decodeCheckpointBlobDataFromBlobs(blobBodies.map((b)=>b.blob));
     } catch (err) {
         if (err instanceof BlobDeserializationError) {
             logger.fatal(err.message);
@@ -236,11 +260,10 @@ export async function getL1BlockTime(publicClient, blockNumber) {
     const archiveRoot = new Fr(Buffer.from(hexToBytes(decodedArgs.archive)));
     const stateReference = StateReference.fromViem(decodedArgs.stateReference);
     return {
-        l2BlockNumber,
         archiveRoot,
         stateReference,
         header,
-        blobFields,
+        checkpointBlobData,
         attestations
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/archiver",
-  "version": "3.0.0-nightly.20251113",
+  "version": "3.0.0-nightly.20251115",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -66,18 +66,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/blob-lib": "3.0.0-nightly.20251113",
-    "@aztec/blob-sink": "3.0.0-nightly.20251113",
-    "@aztec/constants": "3.0.0-nightly.20251113",
-    "@aztec/epoch-cache": "3.0.0-nightly.20251113",
-    "@aztec/ethereum": "3.0.0-nightly.20251113",
-    "@aztec/foundation": "3.0.0-nightly.20251113",
-    "@aztec/kv-store": "3.0.0-nightly.20251113",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20251113",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251113",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20251113",
-    "@aztec/stdlib": "3.0.0-nightly.20251113",
-    "@aztec/telemetry-client": "3.0.0-nightly.20251113",
+    "@aztec/blob-lib": "3.0.0-nightly.20251115",
+    "@aztec/blob-sink": "3.0.0-nightly.20251115",
+    "@aztec/constants": "3.0.0-nightly.20251115",
+    "@aztec/epoch-cache": "3.0.0-nightly.20251115",
+    "@aztec/ethereum": "3.0.0-nightly.20251115",
+    "@aztec/foundation": "3.0.0-nightly.20251115",
+    "@aztec/kv-store": "3.0.0-nightly.20251115",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20251115",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251115",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20251115",
+    "@aztec/stdlib": "3.0.0-nightly.20251115",
+    "@aztec/telemetry-client": "3.0.0-nightly.20251115",
     "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",
     "tsc-watch": "^6.0.0",

package/src/archiver/data_retrieval.ts

@@ -1,4 +1,10 @@
-import { BlobDeserializationError, SpongeBlob, getBlobFieldsInCheckpoint } from '@aztec/blob-lib';
+import {
+  BlobDeserializationError,
+  type CheckpointBlobData,
+  SpongeBlob,
+  decodeCheckpointBlobDataFromBlobs,
+  encodeBlockBlobData,
+} from '@aztec/blob-lib';
 import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import type {
   EpochProofPublicInputArgs,
@@ -19,7 +25,7 @@ import { Body, CommitteeAttestation, L2Block, L2BlockHeader, PublishedL2Block }
 import { Proof } from '@aztec/stdlib/proofs';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
-import { GlobalVariables, StateReference } from '@aztec/stdlib/tx';
+import { GlobalVariables, PartialStateReference, StateReference } from '@aztec/stdlib/tx';
 
 import {
   type GetContractEventsReturnType,
@@ -37,70 +43,103 @@ import type { InboxMessage } from './structs/inbox_message.js';
 import type { L1PublishedData } from './structs/published.js';
 
 export type RetrievedL2Block = {
-  l2BlockNumber: number;
   archiveRoot: Fr;
   stateReference: StateReference;
   header: CheckpointHeader;
-  blobFields: Fr[];
+  checkpointBlobData: CheckpointBlobData;
   l1: L1PublishedData;
   chainId: Fr;
   version: Fr;
   attestations: CommitteeAttestation[];
 };
 
-export async function retrievedBlockToPublishedL2Block(retrievedBlock: RetrievedL2Block): Promise<PublishedL2Block> {
-  const {
-    l2BlockNumber,
-    archiveRoot,
-    stateReference,
-    header: checkpointHeader,
-    blobFields,
-    l1,
-    chainId,
-    version,
-    attestations,
-  } = retrievedBlock;
+export async function retrievedBlockToPublishedL2Block({
+  archiveRoot,
+  stateReference,
+  header: checkpointHeader,
+  checkpointBlobData,
+  l1,
+  chainId,
+  version,
+  attestations,
+}: RetrievedL2Block): Promise<PublishedL2Block> {
+  const { totalNumBlobFields, blocks: blocksBlobData } = checkpointBlobData;
+
+  // The lastArchiveRoot of a block is the new archive for the previous block.
+  const newArchiveRoots = blocksBlobData
+    .map(b => b.lastArchiveRoot)
+    .slice(1)
+    .concat([archiveRoot]);
+
+  // `blocksBlobData` is created from `decodeCheckpointBlobDataFromBlobs`. An error will be thrown if it can't read a
+  // field for the `l1ToL2MessageRoot` of the first block. So below we can safely assume it exists:
+  const l1toL2MessageTreeRoot = blocksBlobData[0].l1ToL2MessageRoot!;
+
+  const spongeBlob = await SpongeBlob.init(totalNumBlobFields);
+  const l2Blocks: L2Block[] = [];
+  for (let i = 0; i < blocksBlobData.length; i++) {
+    const blockBlobData = blocksBlobData[i];
+    const { blockEndMarker, blockEndStateField, lastArchiveRoot, noteHashRoot, nullifierRoot, publicDataRoot } =
+      blockBlobData;
+
+    const l2BlockNumber = blockEndMarker.blockNumber;
+
+    const globalVariables = GlobalVariables.from({
+      chainId,
+      version,
+      blockNumber: l2BlockNumber,
+      slotNumber: checkpointHeader.slotNumber,
+      timestamp: blockEndMarker.timestamp,
+      coinbase: checkpointHeader.coinbase,
+      feeRecipient: checkpointHeader.feeRecipient,
+      gasFees: checkpointHeader.gasFees,
+    });
+
+    const state = StateReference.from({
+      l1ToL2MessageTree: new AppendOnlyTreeSnapshot(
+        l1toL2MessageTreeRoot,
+        blockEndStateField.l1ToL2MessageNextAvailableLeafIndex,
+      ),
+      partial: PartialStateReference.from({
+        noteHashTree: new AppendOnlyTreeSnapshot(noteHashRoot, blockEndStateField.noteHashNextAvailableLeafIndex),
+        nullifierTree: new AppendOnlyTreeSnapshot(nullifierRoot, blockEndStateField.nullifierNextAvailableLeafIndex),
+        publicDataTree: new AppendOnlyTreeSnapshot(publicDataRoot, blockEndStateField.publicDataNextAvailableLeafIndex),
+      }),
+    });
+
+    const body = Body.fromTxBlobData(checkpointBlobData.blocks[0].txs);
+
+    const blobFields = encodeBlockBlobData(blockBlobData);
+    await spongeBlob.absorb(blobFields);
+
+    const clonedSpongeBlob = spongeBlob.clone();
+    const spongeBlobHash = await clonedSpongeBlob.squeeze();
+
+    const header = L2BlockHeader.from({
+      lastArchive: new AppendOnlyTreeSnapshot(lastArchiveRoot, l2BlockNumber),
+      contentCommitment: checkpointHeader.contentCommitment,
+      state,
+      globalVariables,
+      totalFees: body.txEffects.reduce((accum, txEffect) => accum.add(txEffect.transactionFee), Fr.ZERO),
+      totalManaUsed: new Fr(blockEndStateField.totalManaUsed),
+      spongeBlobHash,
+    });
+
+    const newArchive = new AppendOnlyTreeSnapshot(newArchiveRoots[i], l2BlockNumber + 1);
+
+    l2Blocks.push(new L2Block(newArchive, header, body));
+  }
 
-  const archive = new AppendOnlyTreeSnapshot(
-    archiveRoot,
-    l2BlockNumber + 1, // nextAvailableLeafIndex
-  );
-
-  const globalVariables = GlobalVariables.from({
-    chainId,
-    version,
-    blockNumber: l2BlockNumber,
-    slotNumber: checkpointHeader.slotNumber,
-    timestamp: checkpointHeader.timestamp,
-    coinbase: checkpointHeader.coinbase,
-    feeRecipient: checkpointHeader.feeRecipient,
-    gasFees: checkpointHeader.gasFees,
-  });
+  const lastBlock = l2Blocks[l2Blocks.length - 1];
+  if (!lastBlock.header.state.equals(stateReference)) {
+    throw new Error(
+      'The claimed state reference submitted to L1 does not match the state reference of the last block.',
+    );
+  }
 
   // TODO(#17027)
-  // This works when there's only one block in the checkpoint.
-  // If there's more than one block, we need to build the spongeBlob from the endSpongeBlob of the previous block.
-  const spongeBlob = await SpongeBlob.init(blobFields.length);
-  // Skip the first field which is the checkpoint prefix indicating the number of total blob fields in a checkpoint.
-  const blockBlobFields = blobFields.slice(1);
-  await spongeBlob.absorb(blockBlobFields);
-  const spongeBlobHash = await spongeBlob.squeeze();
-
-  const body = Body.fromBlobFields(blockBlobFields);
-
-  const header = L2BlockHeader.from({
-    lastArchive: new AppendOnlyTreeSnapshot(checkpointHeader.lastArchiveRoot, l2BlockNumber),
-    contentCommitment: checkpointHeader.contentCommitment,
-    state: stateReference,
-    globalVariables,
-    totalFees: body.txEffects.reduce((accum, txEffect) => accum.add(txEffect.transactionFee), Fr.ZERO),
-    totalManaUsed: checkpointHeader.totalManaUsed,
-    spongeBlobHash,
-  });
-
-  const block = new L2Block(archive, header, body);
-
-  return PublishedL2Block.fromFields({ block, l1, attestations });
+  // There's only one block per checkpoint at the moment.
+  return PublishedL2Block.fromFields({ block: l2Blocks[0], l1, attestations });
 }
 
 /**
@@ -358,13 +397,10 @@ async function getBlockFromRollupTx(
     throw new NoBlobBodiesFoundError(l2BlockNumber);
   }
 
-  let blobFields: Fr[];
+  let checkpointBlobData: CheckpointBlobData;
   try {
-    // Get the fields that were actually added in the checkpoint. And check the encoding of the fields.
-    blobFields = getBlobFieldsInCheckpoint(
-      blobBodies.map(b => b.blob),
-      true /* checkEncoding */,
-    );
+    // Attempt to decode the checkpoint blob data.
+    checkpointBlobData = decodeCheckpointBlobDataFromBlobs(blobBodies.map(b => b.blob));
   } catch (err: any) {
     if (err instanceof BlobDeserializationError) {
       logger.fatal(err.message);
@@ -379,11 +415,10 @@ async function getBlockFromRollupTx(
   const stateReference = StateReference.fromViem(decodedArgs.stateReference);
 
   return {
-    l2BlockNumber,
     archiveRoot,
     stateReference,
     header,
-    blobFields,
+    checkpointBlobData,
     attestations,
   };
 }