@aztec/archiver 0.0.1-commit.6d3c34e → 0.0.1-commit.7035c9bd6

package/dest/config.d.ts

@@ -0,0 +1,30 @@
+import { type BlobClientConfig } from '@aztec/blob-client/client/config';
+import { type L1ContractsConfig } from '@aztec/ethereum/config';
+import { type L1ReaderConfig } from '@aztec/ethereum/l1-reader';
+import { type ConfigMappingsType } from '@aztec/foundation/config';
+import { type ChainConfig, type PipelineConfig } from '@aztec/stdlib/config';
+import type { ArchiverSpecificConfig } from '@aztec/stdlib/interfaces/server';
+/**
+ * The archiver configuration.
+ * There are 2 polling intervals used in this configuration. The first is the archiver polling interval, archiverPollingIntervalMS.
+ * This is the interval between successive calls to eth_blockNumber via viem.
+ * Results of calls to eth_blockNumber are cached by viem with this cache being updated periodically at the interval specified by viemPollingIntervalMS.
+ * As a result the maximum observed polling time for new blocks will be viemPollingIntervalMS + archiverPollingIntervalMS.
+ */
+export type ArchiverConfig = ArchiverSpecificConfig & L1ReaderConfig & L1ContractsConfig & PipelineConfig & BlobClientConfig & ChainConfig;
+export declare const archiverConfigMappings: ConfigMappingsType<ArchiverConfig>;
+/**
+ * Returns the archiver configuration from the environment variables.
+ * Note: If an environment variable is not set, the default value is used.
+ * @returns The archiver configuration.
+ */
+export declare function getArchiverConfigFromEnv(): ArchiverConfig;
+/** Extracts the archiver-specific configuration from the full ArchiverConfig */
+export declare function mapArchiverConfig(config: Partial<ArchiverConfig>): {
+    pollingIntervalMs: number | undefined;
+    batchSize: number | undefined;
+    skipValidateCheckpointAttestations: boolean | undefined;
+    maxAllowedEthClientDriftSeconds: number | undefined;
+    ethereumAllowNoDebugHosts: boolean | undefined;
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGdCQUFnQixFQUEyQixNQUFNLGtDQUFrQyxDQUFDO0FBQ2xHLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUE2QixNQUFNLHdCQUF3QixDQUFDO0FBRTNGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBMEIsTUFBTSwyQkFBMkIsQ0FBQztBQUN4RixPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFJeEIsTUFBTSwwQkFBMEIsQ0FBQztBQUNsQyxPQUFPLEVBQ0wsS0FBSyxXQUFXLEVBQ2hCLEtBQUssY0FBYyxFQUdwQixNQUFNLHNCQUFzQixDQUFDO0FBQzlCLE9BQU8sS0FBSyxFQUFFLHNCQUFzQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFOUU7Ozs7OztHQU1HO0FBQ0gsTUFBTSxNQUFNLGNBQWMsR0FBRyxzQkFBc0IsR0FDakQsY0FBYyxHQUNkLGlCQUFpQixHQUNqQixjQUFjLEdBQ2QsZ0JBQWdCLEdBQ2hCLFdBQVcsQ0FBQztBQUVkLGVBQU8sTUFBTSxzQkFBc0IsRUFBRSxrQkFBa0IsQ0FBQyxjQUFjLENBaURyRSxDQUFDO0FBRUY7Ozs7R0FJRztBQUNILHdCQUFnQix3QkFBd0IsSUFBSSxjQUFjLENBRXpEO0FBRUQsZ0ZBQWdGO0FBQ2hGLHdCQUFnQixpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLGNBQWMsQ0FBQzs7Ozs7O0VBUWhFIn0=

package/dest/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAA2B,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAE,KAAK,iBAAiB,EAA6B,MAAM,wBAAwB,CAAC;AAE3F,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,2BAA2B,CAAC;AACxF,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,cAAc,EAGpB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAE9E;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG,sBAAsB,GACjD,cAAc,GACd,iBAAiB,GACjB,cAAc,GACd,gBAAgB,GAChB,WAAW,CAAC;AAEd,eAAO,MAAM,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAiDrE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CAEzD;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC;;;;;;EAQhE"}

package/dest/{archiver/config.js → config.js}

@@ -3,9 +3,10 @@ import { l1ContractsConfigMappings } from '@aztec/ethereum/config';
 import { l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
 import { l1ReaderConfigMappings } from '@aztec/ethereum/l1-reader';
 import { booleanConfigHelper, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
-import { chainConfigMappings } from '@aztec/stdlib/config';
+import { chainConfigMappings, pipelineConfigMappings } from '@aztec/stdlib/config';
 export const archiverConfigMappings = {
     ...blobClientConfigMapping,
+    ...pipelineConfigMappings,
     archiverPollingIntervalMS: {
         env: 'ARCHIVER_POLLING_INTERVAL_MS',
         description: 'The polling interval in ms for retrieving new L2 blocks and encrypted logs.',
@@ -60,3 +61,12 @@ export const archiverConfigMappings = {
  */ export function getArchiverConfigFromEnv() {
     return getConfigFromMappings(archiverConfigMappings);
 }
+/** Extracts the archiver-specific configuration from the full ArchiverConfig */ export function mapArchiverConfig(config) {
+    return {
+        pollingIntervalMs: config.archiverPollingIntervalMS,
+        batchSize: config.archiverBatchSize,
+        skipValidateCheckpointAttestations: config.skipValidateCheckpointAttestations,
+        maxAllowedEthClientDriftSeconds: config.maxAllowedEthClientDriftSeconds,
+        ethereumAllowNoDebugHosts: config.ethereumAllowNoDebugHosts
+    };
+}

package/dest/errors.d.ts

@@ -0,0 +1,53 @@
+import type { Fr } from '@aztec/foundation/schemas';
+export declare class NoBlobBodiesFoundError extends Error {
+    constructor(l2BlockNum: number);
+}
+export declare class BlockNumberNotSequentialError extends Error {
+    constructor(newBlockNumber: number, previous: number | undefined);
+}
+export declare class InitialCheckpointNumberNotSequentialError extends Error {
+    readonly newCheckpointNumber: number;
+    readonly previousCheckpointNumber: number | undefined;
+    constructor(newCheckpointNumber: number, previousCheckpointNumber: number | undefined);
+}
+export declare class CheckpointNumberNotSequentialError extends Error {
+    constructor(newCheckpointNumber: number, previous: number | undefined);
+}
+export declare class BlockIndexNotSequentialError extends Error {
+    constructor(newBlockIndex: number, previousBlockIndex: number | undefined);
+}
+export declare class BlockArchiveNotConsistentError extends Error {
+    constructor(newBlockNumber: number, previousBlockNumber: number | undefined, newBlockArchive: Fr, previousBlockArchive: Fr);
+}
+export declare class CheckpointNotFoundError extends Error {
+    constructor(checkpointNumber: number);
+}
+export declare class BlockNotFoundError extends Error {
+    constructor(blockNumber: number);
+}
+/** 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 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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXJyb3JzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZXJyb3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRXBELHFCQUFhLHNCQUF1QixTQUFRLEtBQUs7SUFDL0MsWUFBWSxVQUFVLEVBQUUsTUFBTSxFQUU3QjtDQUNGO0FBRUQscUJBQWEsNkJBQThCLFNBQVEsS0FBSztJQUN0RCxZQUFZLGNBQWMsRUFBRSxNQUFNLEVBQUUsUUFBUSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBRS9EO0NBQ0Y7QUFFRCxxQkFBYSx5Q0FBMEMsU0FBUSxLQUFLO2FBRWhELG1CQUFtQixFQUFFLE1BQU07YUFDM0Isd0JBQXdCLEVBQUUsTUFBTSxHQUFHLFNBQVM7SUFGOUQsWUFDa0IsbUJBQW1CLEVBQUUsTUFBTSxFQUMzQix3QkFBd0IsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQU83RDtDQUNGO0FBRUQscUJBQWEsa0NBQW1DLFNBQVEsS0FBSztJQUMzRCxZQUFZLG1CQUFtQixFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFJcEU7Q0FDRjtBQUVELHFCQUFhLDRCQUE2QixTQUFRLEtBQUs7SUFDckQsWUFBWSxhQUFhLEVBQUUsTUFBTSxFQUFFLGtCQUFrQixFQUFFLE1BQU0sR0FBRyxTQUFTLEVBSXhFO0NBQ0Y7QUFFRCxxQkFBYSw4QkFBK0IsU0FBUSxLQUFLO0lBQ3ZELFlBQ0UsY0FBYyxFQUFFLE1BQU0sRUFDdEIsbUJBQW1CLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDdkMsZUFBZSxFQUFFLEVBQUUsRUFDbkIsb0JBQW9CLEVBQUUsRUFBRSxFQUt6QjtDQUNGO0FBRUQscUJBQWEsdUJBQXdCLFNBQVEsS0FBSztJQUNoRCxZQUFZLGdCQUFnQixFQUFFLE1BQU0sRUFFbkM7Q0FDRjtBQUVELHFCQUFhLGtCQUFtQixTQUFRLEtBQUs7SUFDM0MsWUFBWSxXQUFXLEVBQUUsTUFBTSxFQUU5QjtDQUNGO0FBRUQsdUhBQXVIO0FBQ3ZILHFCQUFhLDZCQUE4QixTQUFRLEtBQUs7YUFDMUIsV0FBVyxFQUFFLE1BQU07SUFBL0MsWUFBNEIsV0FBVyxFQUFFLE1BQU0sRUFHOUM7Q0FDRjtBQUVELDZHQUE2RztBQUM3RyxxQkFBYSwyQkFBNEIsU0FBUSxLQUFLO2FBRWxDLE9BQU8sRUFBRSxTQUFTLEdBQUcsUUFBUTthQUM3QixHQUFHLEVBQUUsTUFBTTthQUNYLGVBQWUsRUFBRSxNQUFNO2FBQ3ZCLGNBQWMsRUFBRSxNQUFNO0lBSnhDLFlBQ2tCLE9BQU8sRUFBRSxTQUFTLEdBQUcsUUFBUSxFQUM3QixHQUFHLEVBQUUsTUFBTSxFQUNYLGVBQWUsRUFBRSxNQUFNLEVBQ3ZCLGNBQWMsRUFBRSxNQUFNLEVBT3ZDO0NBQ0Y7QUFFRCw4R0FBOEc7QUFDOUcscUJBQWEsMkJBQTRCLFNBQVEsS0FBSzthQUVsQyxnQkFBZ0IsRUFBRSxNQUFNO2FBQ3hCLG1CQUFtQixFQUFFLE1BQU07SUFGN0MsWUFDa0IsZ0JBQWdCLEVBQUUsTUFBTSxFQUN4QixtQkFBbUIsRUFBRSxNQUFNLEVBTzVDO0NBQ0Y7QUFFRCxxR0FBcUc7QUFDckcscUJBQWEscUNBQXNDLFNBQVEsS0FBSzthQUU1QyxXQUFXLEVBQUUsTUFBTTthQUNuQixxQkFBcUIsRUFBRSxNQUFNO0lBRi9DLFlBQ2tCLFdBQVcsRUFBRSxNQUFNLEVBQ25CLHFCQUFxQixFQUFFLE1BQU0sRUFNOUM7Q0FDRiJ9

package/dest/errors.d.ts.map

@@ -0,0 +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,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,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;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,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

@@ -0,0 +1,75 @@
+export class NoBlobBodiesFoundError extends Error {
+    constructor(l2BlockNum){
+        super(`No blob bodies found for block ${l2BlockNum}`);
+    }
+}
+export class BlockNumberNotSequentialError extends Error {
+    constructor(newBlockNumber, previous){
+        super(`Cannot insert new block ${newBlockNumber} given previous block number is ${previous ?? 'undefined'}`);
+    }
+}
+export class InitialCheckpointNumberNotSequentialError extends Error {
+    newCheckpointNumber;
+    previousCheckpointNumber;
+    constructor(newCheckpointNumber, previousCheckpointNumber){
+        super(`Cannot insert new checkpoint ${newCheckpointNumber} given previous checkpoint number in store is ${previousCheckpointNumber ?? 'undefined'}`), this.newCheckpointNumber = newCheckpointNumber, this.previousCheckpointNumber = previousCheckpointNumber;
+    }
+}
+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 BlockIndexNotSequentialError extends Error {
+    constructor(newBlockIndex, previousBlockIndex){
+        super(`Cannot insert new block at checkpoint index ${newBlockIndex} given previous block index is ${previousBlockIndex ?? 'undefined'}`);
+    }
+}
+export class BlockArchiveNotConsistentError extends Error {
+    constructor(newBlockNumber, previousBlockNumber, newBlockArchive, previousBlockArchive){
+        super(`Cannot insert new block number ${newBlockNumber} with archive ${newBlockArchive.toString()} previous block number is ${previousBlockNumber ?? 'undefined'}, previous archive is ${previousBlockArchive?.toString() ?? 'undefined'}`);
+    }
+}
+export class CheckpointNotFoundError extends Error {
+    constructor(checkpointNumber){
+        super(`Failed to find expected checkpoint number ${checkpointNumber}`);
+    }
+}
+export class BlockNotFoundError extends Error {
+    constructor(blockNumber){
+        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 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,19 +1,20 @@
-import type { DataStoreConfig } from '@aztec/kv-store/config';
-import { Archiver, type ArchiverDeps } from './archiver/archiver.js';
-import type { ArchiverConfig } from './archiver/config.js';
-import { KVArchiverDataStore } from './archiver/kv_archiver_store/kv_archiver_store.js';
+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';
 export declare const ARCHIVER_STORE_NAME = "archiver";
 /** Creates an archiver store. */
 export declare function createArchiverStore(userConfig: Pick<ArchiverConfig, 'archiverStoreMapSizeKb' | 'maxLogs'> & DataStoreConfig): Promise<KVArchiverDataStore>;
 /**
  * Creates a local archiver.
  * @param config - The archiver configuration.
- * @param blobClient - The blob client client.
+ * @param deps - The archiver dependencies (blobClient, epochCache, dateProvider, telemetry).
  * @param opts - The options.
- * @param telemetry - The telemetry client.
  * @returns The local archiver.
  */
 export declare function createArchiver(config: ArchiverConfig & DataStoreConfig, deps: ArchiverDeps, opts?: {
     blockUntilSync: boolean;
 }): Promise<Archiver>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFPOUQsT0FBTyxFQUFFLFFBQVEsRUFBRSxLQUFLLFlBQVksRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQzNELE9BQU8sRUFBdUIsbUJBQW1CLEVBQUUsTUFBTSxtREFBbUQsQ0FBQztBQUU3RyxlQUFPLE1BQU0sbUJBQW1CLGFBQWEsQ0FBQztBQUU5QyxpQ0FBaUM7QUFDakMsd0JBQXNCLG1CQUFtQixDQUN2QyxVQUFVLEVBQUUsSUFBSSxDQUFDLGNBQWMsRUFBRSx3QkFBd0IsR0FBRyxTQUFTLENBQUMsR0FBRyxlQUFlLGdDQVF6RjtBQUVEOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0IsY0FBYyxDQUNsQyxNQUFNLEVBQUUsY0FBYyxHQUFHLGVBQWUsRUFDeEMsSUFBSSxFQUFFLFlBQVksRUFDbEIsSUFBSSxHQUFFO0lBQUUsY0FBYyxFQUFFLE9BQU8sQ0FBQTtDQUE2QixHQUMzRCxPQUFPLENBQUMsUUFBUSxDQUFDLENBSW5CIn0=
+/** Registers protocol contracts in the archiver store. */
+export declare function registerProtocolContracts(store: KVArchiverDataStore): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZ0JBLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBTTlELE9BQU8sRUFBRSxRQUFRLEVBQUUsS0FBSyxZQUFZLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDNUQsT0FBTyxFQUFFLEtBQUssY0FBYyxFQUFxQixNQUFNLGFBQWEsQ0FBQztBQUdyRSxPQUFPLEVBQXVCLG1CQUFtQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFHeEYsZUFBTyxNQUFNLG1CQUFtQixhQUFhLENBQUM7QUFFOUMsaUNBQWlDO0FBQ2pDLHdCQUFzQixtQkFBbUIsQ0FDdkMsVUFBVSxFQUFFLElBQUksQ0FBQyxjQUFjLEVBQUUsd0JBQXdCLEdBQUcsU0FBUyxDQUFDLEdBQUcsZUFBZSxnQ0FRekY7QUFFRDs7Ozs7O0dBTUc7QUFDSCx3QkFBc0IsY0FBYyxDQUNsQyxNQUFNLEVBQUUsY0FBYyxHQUFHLGVBQWUsRUFDeEMsSUFBSSxFQUFFLFlBQVksRUFDbEIsSUFBSSxHQUFFO0lBQUUsY0FBYyxFQUFFLE9BQU8sQ0FBQTtDQUE2QixHQUMzRCxPQUFPLENBQUMsUUFBUSxDQUFDLENBdUhuQjtBQUVELDBEQUEwRDtBQUMxRCx3QkFBc0IseUJBQXlCLENBQUMsS0FBSyxFQUFFLG1CQUFtQixpQkFvQnpFIn0=

package/dest/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAO9D,OAAO,EAAE,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAuB,mBAAmB,EAAE,MAAM,mDAAmD,CAAC;AAE7G,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;;;;;;;GAOG;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,CAInB"}
+{"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,0DAA0D;AAC1D,wBAAsB,yBAAyB,CAAC,KAAK,EAAE,mBAAmB,iBAoBzE"}

package/dest/factory.js

@@ -1,36 +1,118 @@
+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 { createLogger } from '@aztec/foundation/log';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { merge } from '@aztec/foundation/collection';
+import { Fr } from '@aztec/foundation/curves/bn254';
+import { DateProvider } from '@aztec/foundation/timer';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
 import { protocolContractNames } from '@aztec/protocol-contracts';
 import { BundledProtocolContractsProvider } from '@aztec/protocol-contracts/providers/bundle';
 import { FunctionType, decodeFunctionSignature } from '@aztec/stdlib/abi';
 import { computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
-import { Archiver } from './archiver/archiver.js';
-import { ARCHIVER_DB_VERSION, KVArchiverDataStore } from './archiver/kv_archiver_store/kv_archiver_store.js';
+import { getTelemetryClient } from '@aztec/telemetry-client';
+import { EventEmitter } from 'events';
+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);
 }
 /**
  * Creates a local archiver.
  * @param config - The archiver configuration.
- * @param blobClient - The blob client client.
+ * @param deps - The archiver dependencies (blobClient, epochCache, dateProvider, telemetry).
  * @param opts - The options.
- * @param telemetry - The telemetry client.
  * @returns The local archiver.
  */ export async function createArchiver(config, deps, opts = {
     blockUntilSync: true
 }) {
     const archiverStore = await createArchiverStore(config);
     await registerProtocolContracts(archiverStore);
-    return Archiver.createAndSync(config, archiverStore, deps, opts.blockUntilSync);
+    // Create Ethereum clients
+    const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
+    const httpTimeout = config.l1HttpTimeoutMS;
+    const publicClient = createPublicClient({
+        chain: chain.chainInfo,
+        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: 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, targetCommitteeSize, rollupManaLimit] = await Promise.all([
+        rollup.getL1StartBlock(),
+        rollup.getL1GenesisTime(),
+        rollup.getProofSubmissionEpochs(),
+        rollup.getGenesisArchiveTreeRoot(),
+        rollup.getSlashingProposerAddress(),
+        rollup.getTargetCommitteeSize(),
+        rollup.getManaLimit()
+    ]);
+    const l1StartBlockHash = await publicClient.getBlock({
+        blockNumber: l1StartBlock,
+        includeTransactions: false
+    }).then((block)=>Buffer32.fromString(block.hash));
+    const { aztecEpochDuration: epochDuration, aztecSlotDuration: slotDuration, ethereumSlotDuration } = config;
+    const l1Constants = {
+        l1StartBlockHash,
+        l1StartBlock,
+        l1GenesisTime,
+        epochDuration,
+        slotDuration,
+        ethereumSlotDuration,
+        proofSubmissionEpochs: Number(proofSubmissionEpochs),
+        targetCommitteeSize,
+        genesisArchiveRoot: Fr.fromString(genesisArchiveRoot.toString()),
+        rollupManaLimit: Number(rollupManaLimit)
+    };
+    const archiverConfig = merge({
+        pollingIntervalMs: 10_000,
+        batchSize: 100,
+        maxAllowedEthClientDriftSeconds: 300,
+        ethereumAllowNoDebugHosts: false
+    }, mapArchiverConfig(config));
+    const epochCache = deps.epochCache ?? await EpochCache.create(config.l1Contracts.rollupAddress, config, deps);
+    const telemetry = deps.telemetry ?? getTelemetryClient();
+    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, 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, l2TipsCache);
+    await archiver.start(opts.blockUntilSync);
+    return archiver;
 }
-async function registerProtocolContracts(store) {
+/** Registers protocol contracts in the archiver store. */ export async function registerProtocolContracts(store) {
     const blockNumber = 0;
     for (const name of protocolContractNames){
         const provider = new BundledProtocolContractsProvider();

package/dest/index.d.ts

@@ -1,5 +1,12 @@
-export * from './archiver/index.js';
 export * from './factory.js';
-export * from './rpc/index.js';
-export { retrieveCheckpointsFromRollup, retrieveL2ProofVerifiedEvents } from './archiver/l1/data_retrieval.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsY0FBYyxDQUFDO0FBQzdCLGNBQWMsZ0JBQWdCLENBQUM7QUFFL0IsT0FBTyxFQUFFLDZCQUE2QixFQUFFLDZCQUE2QixFQUFFLE1BQU0saUNBQWlDLENBQUMifQ==
+export * from './interfaces.js';
+export * from './archiver.js';
+export * from './modules/data_source_base.js';
+export * from './modules/data_store_updater.js';
+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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxpQ0FBaUMsQ0FBQztBQUNoRCxjQUFjLGFBQWEsQ0FBQztBQUU1QixPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUN4RixPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUMzRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFdkQsT0FBTyxFQUFFLDZCQUE2QixFQUFFLDZCQUE2QixFQUFFLE1BQU0sd0JBQXdCLENBQUMifQ==

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAE/B,OAAO,EAAE,6BAA6B,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,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

@@ -1,4 +1,10 @@
-export * from './archiver/index.js';
 export * from './factory.js';
-export * from './rpc/index.js';
-export { retrieveCheckpointsFromRollup, retrieveL2ProofVerifiedEvents } from './archiver/l1/data_retrieval.js';
+export * from './interfaces.js';
+export * from './archiver.js';
+export * from './modules/data_source_base.js';
+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/interfaces.d.ts

@@ -0,0 +1,9 @@
+import type { L2BlockSource } from '@aztec/stdlib/block';
+import type { ContractDataSource } from '@aztec/stdlib/contract';
+import type { L2LogsSource } from '@aztec/stdlib/interfaces/server';
+import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
+/**
+ * Helper interface to combine all sources this archiver implementation provides.
+ */
+export type ArchiverDataSource = L2BlockSource & L2LogsSource & ContractDataSource & L1ToL2MessageSource;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2ludGVyZmFjZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDekQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUNqRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNwRSxPQUFPLEtBQUssRUFBRSxtQkFBbUIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRW5FOztHQUVHO0FBQ0gsTUFBTSxNQUFNLGtCQUFrQixHQUFHLGFBQWEsR0FBRyxZQUFZLEdBQUcsa0JBQWtCLEdBQUcsbUJBQW1CLENBQUMifQ==

package/dest/interfaces.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAEnE;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,CAAC"}

package/dest/interfaces.js

@@ -0,0 +1,3 @@
+/**
+ * Helper interface to combine all sources this archiver implementation provides.
+ */ export { };

package/dest/{archiver/l1 → l1}/bin/retrieve-calldata.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 export {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmV0cmlldmUtY2FsbGRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcmNoaXZlci9sMS9iaW4vcmV0cmlldmUtY2FsbGRhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmV0cmlldmUtY2FsbGRhdGEuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9sMS9iaW4vcmV0cmlldmUtY2FsbGRhdGEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiJ9

package/dest/l1/bin/retrieve-calldata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"retrieve-calldata.d.ts","sourceRoot":"","sources":["../../../src/l1/bin/retrieve-calldata.ts"],"names":[],"mappings":""}

package/dest/{archiver/l1 → 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('====================');