@aztec/archiver 3.0.0-nightly.20251124 → 3.0.0-nightly.20251125

package/dest/archiver/data_retrieval.js

@@ -92,7 +92,7 @@ export async function retrievedBlockToPublishedL2Block({ archiveRoot, stateRefer
         if (searchStartBlock > searchEndBlock) {
             break;
         }
-        const l2BlockProposedLogs = (await rollup.getEvents.L2BlockProposed({}, {
+        const l2BlockProposedLogs = (await rollup.getEvents.CheckpointProposed({}, {
             fromBlock: searchStartBlock,
             toBlock: searchEndBlock
         })).filter((log)=>log.blockNumber >= searchStartBlock && log.blockNumber <= searchEndBlock);
@@ -100,7 +100,7 @@ export async function retrievedBlockToPublishedL2Block({ archiveRoot, stateRefer
             break;
         }
         const lastLog = l2BlockProposedLogs[l2BlockProposedLogs.length - 1];
-        logger.debug(`Got ${l2BlockProposedLogs.length} L2 block processed logs for L2 blocks ${l2BlockProposedLogs[0].args.blockNumber}-${lastLog.args.blockNumber} between L1 blocks ${searchStartBlock}-${searchEndBlock}`);
+        logger.debug(`Got ${l2BlockProposedLogs.length} L2 block processed logs for L2 blocks ${l2BlockProposedLogs[0].args.checkpointNumber}-${lastLog.args.checkpointNumber} between L1 blocks ${searchStartBlock}-${searchEndBlock}`);
         if (rollupConstants === undefined) {
             const [chainId, version, targetCommitteeSize] = await Promise.all([
                 publicClient.getChainId(),
@@ -129,7 +129,7 @@ export async function retrievedBlockToPublishedL2Block({ archiveRoot, stateRefer
  */ async function processL2BlockProposedLogs(rollup, publicClient, blobSinkClient, logs, { chainId, version, targetCommitteeSize }, logger) {
     const retrievedBlocks = [];
     await asyncPool(10, logs, async (log)=>{
-        const l2BlockNumber = Number(log.args.blockNumber);
+        const l2BlockNumber = Number(log.args.checkpointNumber);
         const archive = log.args.archive;
         const archiveFromChain = await rollup.read.archiveAt([
             BigInt(l2BlockNumber)
@@ -306,13 +306,13 @@ export async function getL1BlockTime(publicClient, blockNumber) {
 }
 function mapLogsInboxMessage(logs) {
     return logs.map((log)=>{
-        const { index, hash, l2BlockNumber, rollingHash } = log.args;
+        const { index, hash, checkpointNumber, rollingHash } = log.args;
         return {
             index: index,
             leaf: Fr.fromHexString(hash),
             l1BlockNumber: log.blockNumber,
             l1BlockHash: Buffer32.fromString(log.blockHash),
-            l2BlockNumber: Number(l2BlockNumber),
+            l2BlockNumber: Number(checkpointNumber),
             rollingHash: Buffer16.fromString(rollingHash)
         };
     });
@@ -330,7 +330,7 @@ function mapLogsInboxMessage(logs) {
     });
     return logs.map((log)=>({
             l1BlockNumber: log.blockNumber,
-            l2BlockNumber: Number(log.args.blockNumber),
+            l2BlockNumber: Number(log.args.checkpointNumber),
             proverId: Fr.fromHexString(log.args.proverId),
             txHash: log.transactionHash
         }));

package/package.json

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

package/src/archiver/archiver.ts

@@ -885,7 +885,7 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
             validationResult,
           });
 
-          // We keep consuming blocks if we find an invalid one, since we do not listen for BlockInvalidated events
+          // We keep consuming blocks if we find an invalid one, since we do not listen for CheckpointInvalidated events
           // We just pretend the invalid ones are not there and keep consuming the next blocks
           // Note that this breaks if the committee ever attests to a descendant of an invalid block
           continue;

package/src/archiver/data_retrieval.ts

@@ -173,7 +173,7 @@ export async function retrieveBlocksFromRollup(
       break;
     }
     const l2BlockProposedLogs = (
-      await rollup.getEvents.L2BlockProposed(
+      await rollup.getEvents.CheckpointProposed(
         {},
         {
           fromBlock: searchStartBlock,
@@ -188,7 +188,7 @@ export async function retrieveBlocksFromRollup(
 
     const lastLog = l2BlockProposedLogs[l2BlockProposedLogs.length - 1];
     logger.debug(
-      `Got ${l2BlockProposedLogs.length} L2 block processed logs for L2 blocks ${l2BlockProposedLogs[0].args.blockNumber}-${lastLog.args.blockNumber} between L1 blocks ${searchStartBlock}-${searchEndBlock}`,
+      `Got ${l2BlockProposedLogs.length} L2 block processed logs for L2 blocks ${l2BlockProposedLogs[0].args.checkpointNumber}-${lastLog.args.checkpointNumber} between L1 blocks ${searchStartBlock}-${searchEndBlock}`,
     );
 
     if (rollupConstants === undefined) {
@@ -231,13 +231,13 @@ async function processL2BlockProposedLogs(
   rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>,
   publicClient: ViemPublicClient,
   blobSinkClient: BlobSinkClientInterface,
-  logs: GetContractEventsReturnType<typeof RollupAbi, 'L2BlockProposed'>,
+  logs: GetContractEventsReturnType<typeof RollupAbi, 'CheckpointProposed'>,
   { chainId, version, targetCommitteeSize }: { chainId: Fr; version: Fr; targetCommitteeSize: number },
   logger: Logger,
 ): Promise<RetrievedL2Block[]> {
   const retrievedBlocks: RetrievedL2Block[] = [];
   await asyncPool(10, logs, async log => {
-    const l2BlockNumber = Number(log.args.blockNumber!);
+    const l2BlockNumber = Number(log.args.checkpointNumber!);
     const archive = log.args.archive!;
     const archiveFromChain = await rollup.read.archiveAt([BigInt(l2BlockNumber)]);
     const blobHashes = log.args.versionedBlobHashes!.map(blobHash => Buffer.from(blobHash.slice(2), 'hex'));
@@ -474,13 +474,13 @@ export async function retrieveL1ToL2Messages(
 
 function mapLogsInboxMessage(logs: GetContractEventsReturnType<typeof InboxAbi, 'MessageSent'>): InboxMessage[] {
   return logs.map(log => {
-    const { index, hash, l2BlockNumber, rollingHash } = log.args;
+    const { index, hash, checkpointNumber, rollingHash } = log.args;
     return {
       index: index!,
       leaf: Fr.fromHexString(hash!),
       l1BlockNumber: log.blockNumber,
       l1BlockHash: Buffer32.fromString(log.blockHash),
-      l2BlockNumber: Number(l2BlockNumber!),
+      l2BlockNumber: Number(checkpointNumber!),
       rollingHash: Buffer16.fromString(rollingHash!),
     };
   });
@@ -503,7 +503,7 @@ export async function retrieveL2ProofVerifiedEvents(
 
   return logs.map(log => ({
     l1BlockNumber: log.blockNumber,
-    l2BlockNumber: Number(log.args.blockNumber),
+    l2BlockNumber: Number(log.args.checkpointNumber),
     proverId: Fr.fromHexString(log.args.proverId),
     txHash: log.transactionHash,
   }));