@aztec/archiver 0.0.1-commit.d431d1c → 0.0.1-commit.d939eb5aa

package/dest/errors.d.ts

@@ -2,11 +2,6 @@ import type { Fr } from '@aztec/foundation/schemas';
 export declare class NoBlobBodiesFoundError extends Error {
     constructor(l2BlockNum: number);
 }
-export declare class InitialBlockNumberNotSequentialError extends Error {
-    readonly newBlockNumber: number;
-    readonly previousBlockNumber: number | undefined;
-    constructor(newBlockNumber: number, previousBlockNumber: number | undefined);
-}
 export declare class BlockNumberNotSequentialError extends Error {
     constructor(newBlockNumber: number, previous: number | undefined);
 }
@@ -16,10 +11,7 @@ export declare class InitialCheckpointNumberNotSequentialError extends Error {
     constructor(newCheckpointNumber: number, previousCheckpointNumber: number | undefined);
 }
 export declare class CheckpointNumberNotSequentialError extends Error {
-    constructor(newCheckpointNumber: number, previous: number | undefined);
-}
-export declare class CheckpointNumberNotConsistentError extends Error {
-    constructor(newCheckpointNumber: number, previous: number | undefined);
+    constructor(newCheckpointNumber: number, previous: number | undefined, source?: 'confirmed' | 'proposed');
 }
 export declare class BlockIndexNotSequentialError extends Error {
     constructor(newBlockIndex: number, previousBlockIndex: number | undefined);
@@ -33,4 +25,41 @@ export declare class CheckpointNotFoundError extends Error {
 export declare class BlockNotFoundError extends Error {
     constructor(blockNumber: number);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXBELHFCQUFhLHNCQUF1QixTQUFRLEtBQUs7SUFDL0MsWUFBWSxVQUFVLEVBQUUsTUFBTSxFQUU3QjtDQUNGO0FBRUQscUJBQWEsb0NBQXFDLFNBQVEsS0FBSzthQUUzQyxjQUFjLEVBQUUsTUFBTTthQUN0QixtQkFBbUIsRUFBRSxNQUFNLEdBQUcsU0FBUztJQUZ6RCxZQUNrQixjQUFjLEVBQUUsTUFBTSxFQUN0QixtQkFBbUIsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQU94RDtDQUNGO0FBRUQscUJBQWEsNkJBQThCLFNBQVEsS0FBSztJQUN0RCxZQUFZLGNBQWMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBSS9EO0NBQ0Y7QUFFRCxxQkFBYSx5Q0FBMEMsU0FBUSxLQUFLO2FBRWhELG1CQUFtQixFQUFFLE1BQU07YUFDM0Isd0JBQXdCLEVBQUUsTUFBTSxHQUFHLFNBQVM7SUFGOUQsWUFDa0IsbUJBQW1CLEVBQUUsTUFBTSxFQUMzQix3QkFBd0IsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQU83RDtDQUNGO0FBRUQscUJBQWEsa0NBQW1DLFNBQVEsS0FBSztJQUMzRCxZQUFZLG1CQUFtQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFJcEU7Q0FDRjtBQUVELHFCQUFhLGtDQUFtQyxTQUFRLEtBQUs7SUFDM0QsWUFBWSxtQkFBbUIsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBSXBFO0NBQ0Y7QUFFRCxxQkFBYSw0QkFBNkIsU0FBUSxLQUFLO0lBQ3JELFlBQVksYUFBYSxFQUFFLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUl4RTtDQUNGO0FBRUQscUJBQWEsOEJBQStCLFNBQVEsS0FBSztJQUN2RCxZQUNFLGNBQWMsRUFBRSxNQUFNLEVBQ3RCLG1CQUFtQixFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ3ZDLGVBQWUsRUFBRSxFQUFFLEVBQ25CLG9CQUFvQixFQUFFLEVBQUUsRUFLekI7Q0FDRjtBQUVELHFCQUFhLHVCQUF3QixTQUFRLEtBQUs7SUFDaEQsWUFBWSxnQkFBZ0IsRUFBRSxNQUFNLEVBRW5DO0NBQ0Y7QUFFRCxxQkFBYSxrQkFBbUIsU0FBUSxLQUFLO0lBQzNDLFlBQVksV0FBVyxFQUFFLE1BQU0sRUFFOUI7Q0FDRiJ9
+/** Thrown when a proposed block matches a block that was already checkpointed. This is expected for late proposals. */
+export declare class BlockAlreadyCheckpointedError extends Error {
+    readonly blockNumber: number;
+    constructor(blockNumber: number);
+}
+/** Thrown when logs are added for a tag whose last stored log has a higher block number than the new log. */
+export declare class OutOfOrderLogInsertionError extends Error {
+    readonly logType: 'private' | 'public';
+    readonly tag: string;
+    readonly lastBlockNumber: number;
+    readonly newBlockNumber: number;
+    constructor(logType: 'private' | 'public', tag: string, lastBlockNumber: number, newBlockNumber: number);
+}
+/** Thrown when L1 to L2 messages are requested for a checkpoint whose message tree hasn't been sealed yet. */
+export declare class L1ToL2MessagesNotReadyError extends Error {
+    readonly checkpointNumber: number;
+    readonly inboxTreeInProgress: bigint;
+    constructor(checkpointNumber: number, inboxTreeInProgress: bigint);
+}
+/** Thrown when a proposed checkpoint number is stale (already processed). */
+export declare class ProposedCheckpointStaleError extends Error {
+    readonly proposedCheckpointNumber: number;
+    readonly currentProposedNumber: number;
+    constructor(proposedCheckpointNumber: number, currentProposedNumber: number);
+}
+/** Thrown when a proposed checkpoint number is not the expected confirmed + 1. */
+export declare class ProposedCheckpointNotSequentialError extends Error {
+    readonly proposedCheckpointNumber: number;
+    readonly confirmedCheckpointNumber: number;
+    constructor(proposedCheckpointNumber: number, confirmedCheckpointNumber: number);
+}
+/** Thrown when a proposed block conflicts with an already checkpointed block (different content). */
+export declare class CannotOverwriteCheckpointedBlockError extends Error {
+    readonly blockNumber: number;
+    readonly lastCheckpointedBlock: number;
+    constructor(blockNumber: number, lastCheckpointedBlock: number);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXBELHFCQUFhLHNCQUF1QixTQUFRLEtBQUs7SUFDL0MsWUFBWSxVQUFVLEVBQUUsTUFBTSxFQUU3QjtDQUNGO0FBRUQscUJBQWEsNkJBQThCLFNBQVEsS0FBSztJQUN0RCxZQUFZLGNBQWMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBRS9EO0NBQ0Y7QUFFRCxxQkFBYSx5Q0FBMEMsU0FBUSxLQUFLO2FBRWhELG1CQUFtQixFQUFFLE1BQU07YUFDM0Isd0JBQXdCLEVBQUUsTUFBTSxHQUFHLFNBQVM7SUFGOUQsWUFDa0IsbUJBQW1CLEVBQUUsTUFBTSxFQUMzQix3QkFBd0IsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQU83RDtDQUNGO0FBRUQscUJBQWEsa0NBQW1DLFNBQVEsS0FBSztJQUMzRCxZQUNFLG1CQUFtQixFQUFFLE1BQU0sRUFDM0IsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQzVCLE1BQU0sR0FBRSxXQUFXLEdBQUcsVUFBd0IsRUFLL0M7Q0FDRjtBQUVELHFCQUFhLDRCQUE2QixTQUFRLEtBQUs7SUFDckQsWUFBWSxhQUFhLEVBQUUsTUFBTSxFQUFFLGtCQUFrQixFQUFFLE1BQU0sR0FBRyxTQUFTLEVBSXhFO0NBQ0Y7QUFFRCxxQkFBYSw4QkFBK0IsU0FBUSxLQUFLO0lBQ3ZELFlBQ0UsY0FBYyxFQUFFLE1BQU0sRUFDdEIsbUJBQW1CLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDdkMsZUFBZSxFQUFFLEVBQUUsRUFDbkIsb0JBQW9CLEVBQUUsRUFBRSxFQUt6QjtDQUNGO0FBRUQscUJBQWEsdUJBQXdCLFNBQVEsS0FBSztJQUNoRCxZQUFZLGdCQUFnQixFQUFFLE1BQU0sRUFFbkM7Q0FDRjtBQUVELHFCQUFhLGtCQUFtQixTQUFRLEtBQUs7SUFDM0MsWUFBWSxXQUFXLEVBQUUsTUFBTSxFQUU5QjtDQUNGO0FBRUQsdUhBQXVIO0FBQ3ZILHFCQUFhLDZCQUE4QixTQUFRLEtBQUs7YUFDMUIsV0FBVyxFQUFFLE1BQU07SUFBL0MsWUFBNEIsV0FBVyxFQUFFLE1BQU0sRUFHOUM7Q0FDRjtBQUVELDZHQUE2RztBQUM3RyxxQkFBYSwyQkFBNEIsU0FBUSxLQUFLO2FBRWxDLE9BQU8sRUFBRSxTQUFTLEdBQUcsUUFBUTthQUM3QixHQUFHLEVBQUUsTUFBTTthQUNYLGVBQWUsRUFBRSxNQUFNO2FBQ3ZCLGNBQWMsRUFBRSxNQUFNO0lBSnhDLFlBQ2tCLE9BQU8sRUFBRSxTQUFTLEdBQUcsUUFBUSxFQUM3QixHQUFHLEVBQUUsTUFBTSxFQUNYLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLGNBQWMsRUFBRSxNQUFNLEVBT3ZDO0NBQ0Y7QUFFRCw4R0FBOEc7QUFDOUcscUJBQWEsMkJBQTRCLFNBQVEsS0FBSzthQUVsQyxnQkFBZ0IsRUFBRSxNQUFNO2FBQ3hCLG1CQUFtQixFQUFFLE1BQU07SUFGN0MsWUFDa0IsZ0JBQWdCLEVBQUUsTUFBTSxFQUN4QixtQkFBbUIsRUFBRSxNQUFNLEVBTzVDO0NBQ0Y7QUFFRCw2RUFBNkU7QUFDN0UscUJBQWEsNEJBQTZCLFNBQVEsS0FBSzthQUVuQyx3QkFBd0IsRUFBRSxNQUFNO2FBQ2hDLHFCQUFxQixFQUFFLE1BQU07SUFGL0MsWUFDa0Isd0JBQXdCLEVBQUUsTUFBTSxFQUNoQyxxQkFBcUIsRUFBRSxNQUFNLEVBSTlDO0NBQ0Y7QUFFRCxrRkFBa0Y7QUFDbEYscUJBQWEsb0NBQXFDLFNBQVEsS0FBSzthQUUzQyx3QkFBd0IsRUFBRSxNQUFNO2FBQ2hDLHlCQUF5QixFQUFFLE1BQU07SUFGbkQsWUFDa0Isd0JBQXdCLEVBQUUsTUFBTSxFQUNoQyx5QkFBeUIsRUFBRSxNQUFNLEVBTWxEO0NBQ0Y7QUFFRCxxR0FBcUc7QUFDckcscUJBQWEscUNBQXNDLFNBQVEsS0FBSzthQUU1QyxXQUFXLEVBQUUsTUFBTTthQUNuQixxQkFBcUIsRUFBRSxNQUFNO0lBRi9DLFlBQ2tCLFdBQVcsRUFBRSxNQUFNLEVBQ25CLHFCQUFxQixFQUFFLE1BQU0sRUFNOUM7Q0FDRiJ9

package/dest/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AAEpD,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,YAAY,UAAU,EAAE,MAAM,EAE7B;CACF;AAED,qBAAa,oCAAqC,SAAQ,KAAK;aAE3C,cAAc,EAAE,MAAM;aACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS;IAFzD,YACkB,cAAc,EAAE,MAAM,EACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EAOxD;CACF;AAED,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,YAAY,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAI/D;CACF;AAED,qBAAa,yCAA0C,SAAQ,KAAK;aAEhD,mBAAmB,EAAE,MAAM;aAC3B,wBAAwB,EAAE,MAAM,GAAG,SAAS;IAF9D,YACkB,mBAAmB,EAAE,MAAM,EAC3B,wBAAwB,EAAE,MAAM,GAAG,SAAS,EAO7D;CACF;AAED,qBAAa,kCAAmC,SAAQ,KAAK;IAC3D,YAAY,mBAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAIpE;CACF;AAED,qBAAa,kCAAmC,SAAQ,KAAK;IAC3D,YAAY,mBAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAIpE;CACF;AAED,qBAAa,4BAA6B,SAAQ,KAAK;IACrD,YAAY,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,SAAS,EAIxE;CACF;AAED,qBAAa,8BAA+B,SAAQ,KAAK;IACvD,YACE,cAAc,EAAE,MAAM,EACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,eAAe,EAAE,EAAE,EACnB,oBAAoB,EAAE,EAAE,EAKzB;CACF;AAED,qBAAa,uBAAwB,SAAQ,KAAK;IAChD,YAAY,gBAAgB,EAAE,MAAM,EAEnC;CACF;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,WAAW,EAAE,MAAM,EAE9B;CACF"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,2BAA2B,CAAC;AAEpD,qBAAa,sBAAuB,SAAQ,KAAK;IAC/C,YAAY,UAAU,EAAE,MAAM,EAE7B;CACF;AAED,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,YAAY,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,EAE/D;CACF;AAED,qBAAa,yCAA0C,SAAQ,KAAK;aAEhD,mBAAmB,EAAE,MAAM;aAC3B,wBAAwB,EAAE,MAAM,GAAG,SAAS;IAF9D,YACkB,mBAAmB,EAAE,MAAM,EAC3B,wBAAwB,EAAE,MAAM,GAAG,SAAS,EAO7D;CACF;AAED,qBAAa,kCAAmC,SAAQ,KAAK;IAC3D,YACE,mBAAmB,EAAE,MAAM,EAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,MAAM,GAAE,WAAW,GAAG,UAAwB,EAK/C;CACF;AAED,qBAAa,4BAA6B,SAAQ,KAAK;IACrD,YAAY,aAAa,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,SAAS,EAIxE;CACF;AAED,qBAAa,8BAA+B,SAAQ,KAAK;IACvD,YACE,cAAc,EAAE,MAAM,EACtB,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,eAAe,EAAE,EAAE,EACnB,oBAAoB,EAAE,EAAE,EAKzB;CACF;AAED,qBAAa,uBAAwB,SAAQ,KAAK;IAChD,YAAY,gBAAgB,EAAE,MAAM,EAEnC;CACF;AAED,qBAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,WAAW,EAAE,MAAM,EAE9B;CACF;AAED,uHAAuH;AACvH,qBAAa,6BAA8B,SAAQ,KAAK;aAC1B,WAAW,EAAE,MAAM;IAA/C,YAA4B,WAAW,EAAE,MAAM,EAG9C;CACF;AAED,6GAA6G;AAC7G,qBAAa,2BAA4B,SAAQ,KAAK;aAElC,OAAO,EAAE,SAAS,GAAG,QAAQ;aAC7B,GAAG,EAAE,MAAM;aACX,eAAe,EAAE,MAAM;aACvB,cAAc,EAAE,MAAM;IAJxC,YACkB,OAAO,EAAE,SAAS,GAAG,QAAQ,EAC7B,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM,EAOvC;CACF;AAED,8GAA8G;AAC9G,qBAAa,2BAA4B,SAAQ,KAAK;aAElC,gBAAgB,EAAE,MAAM;aACxB,mBAAmB,EAAE,MAAM;IAF7C,YACkB,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,MAAM,EAO5C;CACF;AAED,6EAA6E;AAC7E,qBAAa,4BAA6B,SAAQ,KAAK;aAEnC,wBAAwB,EAAE,MAAM;aAChC,qBAAqB,EAAE,MAAM;IAF/C,YACkB,wBAAwB,EAAE,MAAM,EAChC,qBAAqB,EAAE,MAAM,EAI9C;CACF;AAED,kFAAkF;AAClF,qBAAa,oCAAqC,SAAQ,KAAK;aAE3C,wBAAwB,EAAE,MAAM;aAChC,yBAAyB,EAAE,MAAM;IAFnD,YACkB,wBAAwB,EAAE,MAAM,EAChC,yBAAyB,EAAE,MAAM,EAMlD;CACF;AAED,qGAAqG;AACrG,qBAAa,qCAAsC,SAAQ,KAAK;aAE5C,WAAW,EAAE,MAAM;aACnB,qBAAqB,EAAE,MAAM;IAF/C,YACkB,WAAW,EAAE,MAAM,EACnB,qBAAqB,EAAE,MAAM,EAM9C;CACF"}

package/dest/errors.js

@@ -3,16 +3,9 @@ export class NoBlobBodiesFoundError extends Error {
         super(`No blob bodies found for block ${l2BlockNum}`);
     }
 }
-export class InitialBlockNumberNotSequentialError extends Error {
-    newBlockNumber;
-    previousBlockNumber;
-    constructor(newBlockNumber, previousBlockNumber){
-        super(`Cannot insert new block ${newBlockNumber} given previous block number in store is ${previousBlockNumber ?? 'undefined'}`), this.newBlockNumber = newBlockNumber, this.previousBlockNumber = previousBlockNumber;
-    }
-}
 export class BlockNumberNotSequentialError extends Error {
     constructor(newBlockNumber, previous){
-        super(`Cannot insert new block ${newBlockNumber} given previous block number in batch is ${previous ?? 'undefined'}`);
+        super(`Cannot insert new block ${newBlockNumber} given previous block number is ${previous ?? 'undefined'}`);
     }
 }
 export class InitialCheckpointNumberNotSequentialError extends Error {
@@ -23,13 +16,8 @@ export class InitialCheckpointNumberNotSequentialError extends Error {
     }
 }
 export class CheckpointNumberNotSequentialError extends Error {
-    constructor(newCheckpointNumber, previous){
-        super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous checkpoint number in batch is ${previous ?? 'undefined'}`);
-    }
-}
-export class CheckpointNumberNotConsistentError extends Error {
-    constructor(newCheckpointNumber, previous){
-        super(`Cannot insert block for new checkpoint ${newCheckpointNumber} given previous block was checkpoint ${previous ?? 'undefined'}`);
+    constructor(newCheckpointNumber, previous, source = 'confirmed'){
+        super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous ${source} checkpoint number is ${previous ?? 'undefined'}`);
     }
 }
 export class BlockIndexNotSequentialError extends Error {
@@ -52,3 +40,52 @@ export class BlockNotFoundError extends Error {
         super(`Failed to find expected block number ${blockNumber}`);
     }
 }
+/** Thrown when a proposed block matches a block that was already checkpointed. This is expected for late proposals. */ export class BlockAlreadyCheckpointedError extends Error {
+    blockNumber;
+    constructor(blockNumber){
+        super(`Block ${blockNumber} has already been checkpointed with the same content`), this.blockNumber = blockNumber;
+        this.name = 'BlockAlreadyCheckpointedError';
+    }
+}
+/** Thrown when logs are added for a tag whose last stored log has a higher block number than the new log. */ export class OutOfOrderLogInsertionError extends Error {
+    logType;
+    tag;
+    lastBlockNumber;
+    newBlockNumber;
+    constructor(logType, tag, lastBlockNumber, newBlockNumber){
+        super(`Out-of-order ${logType} log insertion for tag ${tag}: ` + `last existing log is from block ${lastBlockNumber} but new log is from block ${newBlockNumber}`), this.logType = logType, this.tag = tag, this.lastBlockNumber = lastBlockNumber, this.newBlockNumber = newBlockNumber;
+        this.name = 'OutOfOrderLogInsertionError';
+    }
+}
+/** Thrown when L1 to L2 messages are requested for a checkpoint whose message tree hasn't been sealed yet. */ export class L1ToL2MessagesNotReadyError extends Error {
+    checkpointNumber;
+    inboxTreeInProgress;
+    constructor(checkpointNumber, inboxTreeInProgress){
+        super(`Cannot get L1 to L2 messages for checkpoint ${checkpointNumber}: ` + `inbox tree in progress is ${inboxTreeInProgress}, messages not yet sealed`), this.checkpointNumber = checkpointNumber, this.inboxTreeInProgress = inboxTreeInProgress;
+        this.name = 'L1ToL2MessagesNotReadyError';
+    }
+}
+/** Thrown when a proposed checkpoint number is stale (already processed). */ export class ProposedCheckpointStaleError extends Error {
+    proposedCheckpointNumber;
+    currentProposedNumber;
+    constructor(proposedCheckpointNumber, currentProposedNumber){
+        super(`Stale proposed checkpoint ${proposedCheckpointNumber}: current proposed is ${currentProposedNumber}`), this.proposedCheckpointNumber = proposedCheckpointNumber, this.currentProposedNumber = currentProposedNumber;
+        this.name = 'ProposedCheckpointStaleError';
+    }
+}
+/** Thrown when a proposed checkpoint number is not the expected confirmed + 1. */ export class ProposedCheckpointNotSequentialError extends Error {
+    proposedCheckpointNumber;
+    confirmedCheckpointNumber;
+    constructor(proposedCheckpointNumber, confirmedCheckpointNumber){
+        super(`Proposed checkpoint ${proposedCheckpointNumber} is not sequential: expected ${confirmedCheckpointNumber + 1} (confirmed + 1)`), this.proposedCheckpointNumber = proposedCheckpointNumber, this.confirmedCheckpointNumber = confirmedCheckpointNumber;
+        this.name = 'ProposedCheckpointNotSequentialError';
+    }
+}
+/** Thrown when a proposed block conflicts with an already checkpointed block (different content). */ export class CannotOverwriteCheckpointedBlockError extends Error {
+    blockNumber;
+    lastCheckpointedBlock;
+    constructor(blockNumber, lastCheckpointedBlock){
+        super(`Cannot add block ${blockNumber}: would overwrite checkpointed data (checkpointed up to block ${lastCheckpointedBlock})`), this.blockNumber = blockNumber, this.lastCheckpointedBlock = lastCheckpointedBlock;
+        this.name = 'CannotOverwriteCheckpointedBlockError';
+    }
+}

package/dest/factory.d.ts

@@ -1,4 +1,4 @@
-import type { DataStoreConfig } from '@aztec/kv-store/config';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import { Archiver, type ArchiverDeps } from './archiver.js';
 import { type ArchiverConfig } from './config.js';
 import { KVArchiverDataStore } from './store/kv_archiver_store.js';
@@ -15,4 +15,6 @@ export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'ar
 export declare function createArchiver(config: ArchiverConfig & DataStoreConfig, deps: ArchiverDeps, opts?: {
     blockUntilSync: boolean;
 }): Promise<Archiver>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBVUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFZOUQsT0FBTyxFQUFFLFFBQVEsRUFBRSxLQUFLLFlBQVksRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUM1RCxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQXFCLE1BQU0sYUFBYSxDQUFDO0FBR3JFLE9BQU8sRUFBdUIsbUJBQW1CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUV4RixlQUFPLE1BQU0sbUJBQW1CLGFBQWEsQ0FBQztBQUU5QyxpQ0FBaUM7QUFDakMsd0JBQXNCLG1CQUFtQixDQUN2QyxVQUFVLEVBQUUsSUFBSSxDQUFDLGNBQWMsRUFBRSx3QkFBd0IsR0FBRyxTQUFTLENBQUMsR0FBRyxlQUFlLGdDQVF6RjtBQUVEOzs7Ozs7R0FNRztBQUNILHdCQUFzQixjQUFjLENBQ2xDLE1BQU0sRUFBRSxjQUFjLEdBQUcsZUFBZSxFQUN4QyxJQUFJLEVBQUUsWUFBWSxFQUNsQixJQUFJLEdBQUU7SUFBRSxjQUFjLEVBQUUsT0FBTyxDQUFBO0NBQTZCLEdBQzNELE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FzR25CIn0=
+/** Registers protocol contracts in the archiver store. Idempotent — skips contracts that already exist (e.g. on node restart). */
+export declare function registerProtocolContracts(store: KVArchiverDataStore): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZ0JBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBTTlELE9BQU8sRUFBRSxRQUFRLEVBQUUsS0FBSyxZQUFZLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDNUQsT0FBTyxFQUFFLEtBQUssY0FBYyxFQUFxQixNQUFNLGFBQWEsQ0FBQztBQUdyRSxPQUFPLEVBQXVCLG1CQUFtQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFHeEYsZUFBTyxNQUFNLG1CQUFtQixhQUFhLENBQUM7QUFFOUMsaUNBQWlDO0FBQ2pDLHdCQUFzQixtQkFBbUIsQ0FDdkMsVUFBVSxFQUFFLElBQUksQ0FBQyxjQUFjLEVBQUUsd0JBQXdCLEdBQUcsU0FBUyxDQUFDLEdBQUcsZUFBZSxnQ0FRekY7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBc0IsY0FBYyxDQUNsQyxNQUFNLEVBQUUsY0FBYyxHQUFHLGVBQWUsRUFDeEMsSUFBSSxFQUFFLFlBQVksRUFDbEIsSUFBSSxHQUFFO0lBQUUsY0FBYyxFQUFFLE9BQU8sQ0FBQTtDQUE2QixHQUMzRCxPQUFPLENBQUMsUUFBUSxDQUFDLENBdUhuQjtBQUVELG9JQUFrSTtBQUNsSSx3QkFBc0IseUJBQXlCLENBQUMsS0FBSyxFQUFFLG1CQUFtQixpQkF5QnpFIn0=

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAY9D,OAAO,EAAE,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,KAAK,cAAc,EAAqB,MAAM,aAAa,CAAC;AAGrE,OAAO,EAAuB,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExF,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAE9C,iCAAiC;AACjC,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAAG,eAAe,gCAQzF;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE,YAAY,EAClB,IAAI,GAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAA6B,GAC3D,OAAO,CAAC,QAAQ,CAAC,CAsGnB"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D,OAAO,EAAE,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAC5D,OAAO,EAAE,KAAK,cAAc,EAAqB,MAAM,aAAa,CAAC;AAGrE,OAAO,EAAuB,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGxF,eAAO,MAAM,mBAAmB,aAAa,CAAC;AAE9C,iCAAiC;AACjC,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,IAAI,CAAC,cAAc,EAAE,wBAAwB,GAAG,SAAS,CAAC,GAAG,eAAe,gCAQzF;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,cAAc,GAAG,eAAe,EACxC,IAAI,EAAE,YAAY,EAClB,IAAI,GAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAA6B,GAC3D,OAAO,CAAC,QAAQ,CAAC,CAuHnB;AAED,oIAAkI;AAClI,wBAAsB,yBAAyB,CAAC,KAAK,EAAE,mBAAmB,iBAyBzE"}

package/dest/factory.js

@@ -1,11 +1,11 @@
 import { EpochCache } from '@aztec/epoch-cache';
 import { createEthereumChain } from '@aztec/ethereum/chain';
+import { makeL1HttpTransport } from '@aztec/ethereum/client';
 import { InboxContract, RollupContract } from '@aztec/ethereum/contracts';
 import { BlockNumber } from '@aztec/foundation/branded-types';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { merge } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { createLogger } from '@aztec/foundation/log';
 import { DateProvider } from '@aztec/foundation/timer';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
 import { protocolContractNames } from '@aztec/protocol-contracts';
@@ -14,19 +14,20 @@ import { FunctionType, decodeFunctionSignature } from '@aztec/stdlib/abi';
 import { computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import { EventEmitter } from 'events';
-import { createPublicClient, fallback, http } from 'viem';
+import { createPublicClient } from 'viem';
 import { Archiver } from './archiver.js';
 import { mapArchiverConfig } from './config.js';
 import { ArchiverInstrumentation } from './modules/instrumentation.js';
 import { ArchiverL1Synchronizer } from './modules/l1_synchronizer.js';
 import { ARCHIVER_DB_VERSION, KVArchiverDataStore } from './store/kv_archiver_store.js';
+import { L2TipsCache } from './store/l2_tips_cache.js';
 export const ARCHIVER_STORE_NAME = 'archiver';
 /** Creates an archiver store. */ export async function createArchiverStore(userConfig) {
     const config = {
         ...userConfig,
         dataStoreMapSizeKb: userConfig.archiverStoreMapSizeKb ?? userConfig.dataStoreMapSizeKb
     };
-    const store = await createStore(ARCHIVER_STORE_NAME, ARCHIVER_DB_VERSION, config, createLogger('archiver:lmdb'));
+    const store = await createStore(ARCHIVER_STORE_NAME, ARCHIVER_DB_VERSION, config);
     return new KVArchiverDataStore(store, config.maxLogs);
 }
 /**
@@ -42,32 +43,35 @@ export const ARCHIVER_STORE_NAME = 'archiver';
     await registerProtocolContracts(archiverStore);
     // Create Ethereum clients
     const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
+    const httpTimeout = config.l1HttpTimeoutMS;
     const publicClient = createPublicClient({
         chain: chain.chainInfo,
-        transport: fallback(config.l1RpcUrls.map((url)=>http(url, {
-                batch: false
-            }))),
+        transport: makeL1HttpTransport(config.l1RpcUrls, {
+            timeout: httpTimeout
+        }),
         pollingInterval: config.viemPollingIntervalMS
     });
     // Create debug client using debug RPC URLs if available, otherwise fall back to regular RPC URLs
     const debugRpcUrls = config.l1DebugRpcUrls.length > 0 ? config.l1DebugRpcUrls : config.l1RpcUrls;
     const debugClient = createPublicClient({
         chain: chain.chainInfo,
-        transport: fallback(debugRpcUrls.map((url)=>http(url, {
-                batch: false
-            }))),
+        transport: makeL1HttpTransport(debugRpcUrls, {
+            timeout: httpTimeout
+        }),
         pollingInterval: config.viemPollingIntervalMS
     });
     // Create L1 contract instances
     const rollup = new RollupContract(publicClient, config.l1Contracts.rollupAddress);
     const inbox = new InboxContract(publicClient, config.l1Contracts.inboxAddress);
     // Fetch L1 constants from rollup contract
-    const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot, slashingProposerAddress] = await Promise.all([
+    const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot, slashingProposerAddress, targetCommitteeSize, rollupManaLimit] = await Promise.all([
         rollup.getL1StartBlock(),
         rollup.getL1GenesisTime(),
         rollup.getProofSubmissionEpochs(),
         rollup.getGenesisArchiveTreeRoot(),
-        rollup.getSlashingProposerAddress()
+        rollup.getSlashingProposerAddress(),
+        rollup.getTargetCommitteeSize(),
+        rollup.getManaLimit()
     ]);
     const l1StartBlockHash = await publicClient.getBlock({
         blockNumber: l1StartBlock,
@@ -82,7 +86,9 @@ export const ARCHIVER_STORE_NAME = 'archiver';
         slotDuration,
         ethereumSlotDuration,
         proofSubmissionEpochs: Number(proofSubmissionEpochs),
-        genesisArchiveRoot: Fr.fromString(genesisArchiveRoot.toString())
+        targetCommitteeSize,
+        genesisArchiveRoot: Fr.fromString(genesisArchiveRoot.toString()),
+        rollupManaLimit: Number(rollupManaLimit)
     };
     const archiverConfig = merge({
         pollingIntervalMs: 10_000,
@@ -95,35 +101,35 @@ export const ARCHIVER_STORE_NAME = 'archiver';
     const instrumentation = await ArchiverInstrumentation.new(telemetry, ()=>archiverStore.estimateSize());
     // Create the event emitter that will be shared by archiver and synchronizer
     const events = new EventEmitter();
+    // Create L2 tips cache shared by archiver and synchronizer
+    const l2TipsCache = new L2TipsCache(archiverStore.blockStore);
     // Create the L1 synchronizer
-    const synchronizer = new ArchiverL1Synchronizer(publicClient, debugClient, rollup, inbox, {
-        ...config.l1Contracts,
-        slashingProposerAddress
-    }, archiverStore, archiverConfig, deps.blobClient, epochCache, deps.dateProvider ?? new DateProvider(), instrumentation, l1Constants, events, instrumentation.tracer);
+    const synchronizer = new ArchiverL1Synchronizer(publicClient, debugClient, rollup, inbox, archiverStore, archiverConfig, deps.blobClient, epochCache, deps.dateProvider ?? new DateProvider(), instrumentation, l1Constants, events, instrumentation.tracer, l2TipsCache, undefined);
     const archiver = new Archiver(publicClient, debugClient, rollup, {
         ...config.l1Contracts,
         slashingProposerAddress
-    }, archiverStore, archiverConfig, deps.blobClient, instrumentation, l1Constants, synchronizer, events);
+    }, archiverStore, archiverConfig, deps.blobClient, instrumentation, l1Constants, synchronizer, events, l2TipsCache);
     await archiver.start(opts.blockUntilSync);
     return archiver;
 }
-async function registerProtocolContracts(store) {
+/** Registers protocol contracts in the archiver store. Idempotent — skips contracts that already exist (e.g. on node restart). */ export async function registerProtocolContracts(store) {
     const blockNumber = 0;
     for (const name of protocolContractNames){
         const provider = new BundledProtocolContractsProvider();
         const contract = await provider.getProtocolContractArtifact(name);
+        // Skip if already registered (happens on node restart with a persisted store).
+        if (await store.getContractClass(contract.contractClass.id)) {
+            continue;
+        }
+        const publicBytecodeCommitment = await computePublicBytecodeCommitment(contract.contractClass.packedBytecode);
         const contractClassPublic = {
             ...contract.contractClass,
-            privateFunctions: [],
-            utilityFunctions: []
+            publicBytecodeCommitment
         };
         const publicFunctionSignatures = contract.artifact.functions.filter((fn)=>fn.functionType === FunctionType.PUBLIC).map((fn)=>decodeFunctionSignature(fn.name, fn.parameters));
         await store.registerContractFunctionSignatures(publicFunctionSignatures);
-        const bytecodeCommitment = await computePublicBytecodeCommitment(contractClassPublic.packedBytecode);
         await store.addContractClasses([
             contractClassPublic
-        ], [
-            bytecodeCommitment
         ], BlockNumber(blockNumber));
         await store.addContractInstances([
             contract.instance

package/dest/index.d.ts

@@ -7,5 +7,6 @@ export * from './config.js';
 export { type L1PublishedData } from './structs/published.js';
 export { KVArchiverDataStore, ARCHIVER_DB_VERSION } from './store/kv_archiver_store.js';
 export { ContractInstanceStore } from './store/contract_instance_store.js';
+export { L2TipsCache } from './store/l2_tips_cache.js';
 export { retrieveCheckpointsFromRollup, retrieveL2ProofVerifiedEvents } from './l1/data_retrieval.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxpQ0FBaUMsQ0FBQztBQUNoRCxjQUFjLGFBQWEsQ0FBQztBQUU1QixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUN4RixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUUzRSxPQUFPLEVBQUUsNkJBQTZCLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxpQ0FBaUMsQ0FBQztBQUNoRCxjQUFjLGFBQWEsQ0FBQztBQUU1QixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUN4RixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUMzRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFdkQsT0FBTyxFQUFFLDZCQUE2QixFQUFFLDZCQUE2QixFQUFFLE1BQU0sd0JBQXdCLENBQUMifQ==

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,aAAa,CAAC;AAE5B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAE3E,OAAO,EAAE,6BAA6B,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,aAAa,CAAC;AAE5B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAAE,6BAA6B,EAAE,6BAA6B,EAAE,MAAM,wBAAwB,CAAC"}

package/dest/index.js

@@ -6,4 +6,5 @@ export * from './modules/data_store_updater.js';
 export * from './config.js';
 export { KVArchiverDataStore, ARCHIVER_DB_VERSION } from './store/kv_archiver_store.js';
 export { ContractInstanceStore } from './store/contract_instance_store.js';
+export { L2TipsCache } from './store/l2_tips_cache.js';
 export { retrieveCheckpointsFromRollup, retrieveL2ProofVerifiedEvents } from './l1/data_retrieval.js';

package/dest/l1/bin/retrieve-calldata.js

@@ -2,7 +2,8 @@
 import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
-import { createPublicClient, http } from 'viem';
+import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
+import { createPublicClient, decodeEventLog, getAbiItem, http, toEventSelector } from 'viem';
 import { mainnet } from 'viem/chains';
 import { CalldataRetriever } from '../calldata_retriever.js';
 const logger = createLogger('archiver:calldata-test');
@@ -73,49 +74,51 @@ async function main() {
             throw new Error(`Transaction ${txHash} not found`);
         }
         logger.info(`Transaction found in block ${tx.blockNumber}`);
-        // For simplicity, use zero addresses for optional contract addresses
-        // In production, these would be fetched from the rollup contract or configuration
-        const slashingProposerAddress = EthAddress.ZERO;
-        const governanceProposerAddress = EthAddress.ZERO;
-        const slashFactoryAddress = undefined;
-        logger.info('Using zero addresses for governance/slashing (can be configured if needed)');
         // Create CalldataRetriever
-        const retriever = new CalldataRetriever(publicClient, publicClient, targetCommitteeSize, undefined, logger, {
-            rollupAddress,
-            governanceProposerAddress,
-            slashingProposerAddress,
-            slashFactoryAddress
-        });
-        // Extract L2 block number from transaction logs
-        logger.info('Decoding transaction to extract L2 block number...');
+        const retriever = new CalldataRetriever(publicClient, publicClient, targetCommitteeSize, undefined, logger, rollupAddress);
+        // Extract checkpoint number and hashes from transaction logs
+        logger.info('Decoding transaction to extract checkpoint number and hashes...');
         const receipt = await publicClient.getTransactionReceipt({
             hash: txHash
         });
-        const l2BlockProposedEvent = receipt.logs.find((log)=>{
+        // Look for CheckpointProposed event
+        const checkpointProposedEventAbi = getAbiItem({
+            abi: RollupAbi,
+            name: 'CheckpointProposed'
+        });
+        const checkpointProposedLog = receipt.logs.find((log)=>{
             try {
-                // Try to match the L2BlockProposed event
-                return log.address.toLowerCase() === rollupAddress.toString().toLowerCase() && log.topics[0] === '0x2f1d0e696fa5186494a2f2f89a0e0bcbb15d607f6c5eac4637e07e1e5e7d3c00' // L2BlockProposed event signature
-                ;
+                return log.address.toLowerCase() === rollupAddress.toString().toLowerCase() && log.topics[0] === toEventSelector(checkpointProposedEventAbi);
             } catch  {
                 return false;
             }
         });
-        let l2BlockNumber;
-        if (l2BlockProposedEvent && l2BlockProposedEvent.topics[1]) {
-            // L2 block number is typically the first indexed parameter
-            l2BlockNumber = Number(BigInt(l2BlockProposedEvent.topics[1]));
-            logger.info(`L2 Block Number (from event): ${l2BlockNumber}`);
-        } else {
-            // Fallback: try to extract from transaction data or use a default
-            logger.warn('Could not extract L2 block number from event, using block number as fallback');
-            l2BlockNumber = Number(tx.blockNumber);
+        if (!checkpointProposedLog || checkpointProposedLog.topics[1] === undefined) {
+            throw new Error(`Checkpoint proposed event not found`);
+        }
+        const checkpointNumber = CheckpointNumber.fromBigInt(BigInt(checkpointProposedLog.topics[1]));
+        // Decode the full event to extract attestationsHash and payloadDigest
+        const decodedEvent = decodeEventLog({
+            abi: RollupAbi,
+            data: checkpointProposedLog.data,
+            topics: checkpointProposedLog.topics
+        });
+        const eventArgs = decodedEvent.args;
+        if (!eventArgs.attestationsHash || !eventArgs.payloadDigest) {
+            throw new Error(`CheckpointProposed event missing attestationsHash or payloadDigest`);
         }
+        const expectedHashes = {
+            attestationsHash: eventArgs.attestationsHash,
+            payloadDigest: eventArgs.payloadDigest
+        };
+        logger.info(`Checkpoint Number: ${checkpointNumber}`);
+        logger.info(`Attestations Hash: ${expectedHashes.attestationsHash}`);
+        logger.info(`Payload Digest: ${expectedHashes.payloadDigest}`);
         logger.info('');
-        logger.info('Retrieving block header from rollup transaction...');
+        logger.info('Retrieving checkpoint from rollup transaction...');
         logger.info('');
-        // For this script, we don't have blob hashes or expected hashes, so pass empty arrays/objects
-        const result = await retriever.getCheckpointFromRollupTx(txHash, [], CheckpointNumber(l2BlockNumber), {});
-        logger.info(' Successfully retrieved block header!');
+        const result = await retriever.getCheckpointFromRollupTx(txHash, [], checkpointNumber, expectedHashes);
+        logger.info(' Successfully retrieved block header!');
         logger.info('');
         logger.info('Block Header Details:');
         logger.info('====================');