@aztec/archiver 0.0.1-commit.b655e406 → 0.0.1-commit.c7c42ec

package/dest/archiver/archiver.js

@@ -4,53 +4,63 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
+import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/constants';
 import { EpochCache } from '@aztec/epoch-cache';
-import { BlockTagTooOldError, InboxContract, RollupContract, createEthereumChain } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { BlockTagTooOldError, InboxContract, RollupContract } from '@aztec/ethereum/contracts';
 import { maxBigint } from '@aztec/foundation/bigint';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import { merge, pick } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { promiseWithResolvers } from '@aztec/foundation/promise';
 import { RunningPromise, makeLoggingErrorHandler } from '@aztec/foundation/running-promise';
-import { sleep } from '@aztec/foundation/sleep';
 import { count } from '@aztec/foundation/string';
-import { Timer, elapsed } from '@aztec/foundation/timer';
+import { DateProvider, Timer, elapsed } from '@aztec/foundation/timer';
+import { isDefined } from '@aztec/foundation/types';
 import { ContractClassPublishedEvent, PrivateFunctionBroadcastedEvent, UtilityFunctionBroadcastedEvent } from '@aztec/protocol-contracts/class-registry';
 import { ContractInstancePublishedEvent, ContractInstanceUpdatedEvent } from '@aztec/protocol-contracts/instance-registry';
-import { L2BlockSourceEvents } from '@aztec/stdlib/block';
+import { CommitteeAttestation, L2Block, L2BlockSourceEvents, PublishedL2Block } from '@aztec/stdlib/block';
+import { Checkpoint, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import { computePublicBytecodeCommitment, isValidPrivateFunctionMembershipProof, isValidUtilityFunctionMembershipProof } from '@aztec/stdlib/contract';
 import { getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getSlotRangeForEpoch, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
-import { Attributes, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
+import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { EventEmitter } from 'events';
 import groupBy from 'lodash.groupby';
 import { createPublicClient, fallback, http } from 'viem';
-import { retrieveBlocksFromRollup, retrieveL1ToL2Message, retrieveL1ToL2Messages, retrievedBlockToPublishedL2Block } from './data_retrieval.js';
-import { InitialBlockNumberNotSequentialError, NoBlobBodiesFoundError } from './errors.js';
+import { InitialCheckpointNumberNotSequentialError, NoBlobBodiesFoundError } from './errors.js';
 import { ArchiverInstrumentation } from './instrumentation.js';
-import { validateBlockAttestations } from './validation.js';
+import { retrieveCheckpointsFromRollup, retrieveL1ToL2Message, retrieveL1ToL2Messages, retrievedToPublishedCheckpoint } from './l1/data_retrieval.js';
+import { validateAndLogTraceAvailability } from './l1/validate_trace.js';
+import { validateCheckpointAttestations } from './validation.js';
 function mapArchiverConfig(config) {
     return {
         pollingIntervalMs: config.archiverPollingIntervalMS,
         batchSize: config.archiverBatchSize,
-        skipValidateBlockAttestations: config.skipValidateBlockAttestations
+        skipValidateBlockAttestations: config.skipValidateBlockAttestations,
+        maxAllowedEthClientDriftSeconds: config.maxAllowedEthClientDriftSeconds,
+        ethereumAllowNoDebugHosts: config.ethereumAllowNoDebugHosts
     };
 }
 /**
- * Pulls L2 blocks in a non-blocking manner and provides interface for their retrieval.
+ * Pulls checkpoints in a non-blocking manner and provides interface for their retrieval.
  * Responsible for handling robust L1 polling so that other components do not need to
  * concern themselves with it.
  */ export class Archiver extends EventEmitter {
     publicClient;
+    debugClient;
     l1Addresses;
     dataStore;
     config;
-    blobSinkClient;
+    blobClient;
     epochCache;
+    dateProvider;
     instrumentation;
     l1constants;
     log;
-    /** A loop in which we will be continually fetching new L2 blocks. */ runningPromise;
+    /** A loop in which we will be continually fetching new checkpoints. */ runningPromise;
     rollup;
     inbox;
     store;
@@ -58,23 +68,28 @@ function mapArchiverConfig(config) {
     l1Timestamp;
     initialSyncComplete;
     initialSyncPromise;
+    /** Queue of blocks to be added to the store, processed by the sync loop. */ blockQueue;
     tracer;
     /**
    * Creates a new instance of the Archiver.
    * @param publicClient - A client for interacting with the Ethereum node.
+   * @param debugClient - A client for interacting with the Ethereum node for debug/trace methods.
    * @param rollupAddress - Ethereum address of the rollup contract.
    * @param inboxAddress - Ethereum address of the inbox contract.
    * @param registryAddress - Ethereum address of the registry contract.
    * @param pollingIntervalMs - The interval for polling for L1 logs (in milliseconds).
    * @param store - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
    * @param log - A logger.
-   */ constructor(publicClient, l1Addresses, dataStore, config, blobSinkClient, epochCache, instrumentation, l1constants, log = createLogger('archiver')){
-        super(), this.publicClient = publicClient, this.l1Addresses = l1Addresses, this.dataStore = dataStore, this.config = config, this.blobSinkClient = blobSinkClient, this.epochCache = epochCache, this.instrumentation = instrumentation, this.l1constants = l1constants, this.log = log, this.initialSyncComplete = false;
+   */ constructor(publicClient, debugClient, l1Addresses, dataStore, config, blobClient, epochCache, dateProvider, instrumentation, l1constants, log = createLogger('archiver')){
+        super(), this.publicClient = publicClient, this.debugClient = debugClient, this.l1Addresses = l1Addresses, this.dataStore = dataStore, this.config = config, this.blobClient = blobClient, this.epochCache = epochCache, this.dateProvider = dateProvider, this.instrumentation = instrumentation, this.l1constants = l1constants, this.log = log, this.initialSyncComplete = false, this.blockQueue = [];
         this.tracer = instrumentation.tracer;
         this.store = new ArchiverStoreHelper(dataStore);
         this.rollup = new RollupContract(publicClient, l1Addresses.rollupAddress);
         this.inbox = new InboxContract(publicClient, l1Addresses.inboxAddress);
         this.initialSyncPromise = promiseWithResolvers();
+        // Running promise starts with a small interval inbetween runs, so all iterations needed for the initial sync
+        // are done as fast as possible. This then gets updated once the initial sync completes.
+        this.runningPromise = new RunningPromise(()=>this.sync(), this.log, this.config.pollingIntervalMs / 10, makeLoggingErrorHandler(this.log, NoBlobBodiesFoundError, BlockTagTooOldError));
     }
     /**
    * Creates a new instance of the Archiver and blocks until it syncs from chain.
@@ -86,15 +101,27 @@ function mapArchiverConfig(config) {
         const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
         const publicClient = createPublicClient({
             chain: chain.chainInfo,
-            transport: fallback(config.l1RpcUrls.map((url)=>http(url))),
+            transport: fallback(config.l1RpcUrls.map((url)=>http(url, {
+                    batch: false
+                }))),
+            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
+                }))),
             pollingInterval: config.viemPollingIntervalMS
         });
         const rollup = new RollupContract(publicClient, config.l1Contracts.rollupAddress);
-        const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot] = await Promise.all([
+        const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot, slashingProposerAddress] = await Promise.all([
             rollup.getL1StartBlock(),
             rollup.getL1GenesisTime(),
             rollup.getProofSubmissionEpochs(),
-            rollup.getGenesisArchiveTreeRoot()
+            rollup.getGenesisArchiveTreeRoot(),
+            rollup.getSlashingProposerAddress()
         ]);
         const l1StartBlockHash = await publicClient.getBlock({
             blockNumber: l1StartBlock,
@@ -113,11 +140,16 @@ function mapArchiverConfig(config) {
         };
         const opts = merge({
             pollingIntervalMs: 10_000,
-            batchSize: 100
+            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 archiver = new Archiver(publicClient, config.l1Contracts, archiverStore, opts, deps.blobSinkClient, epochCache, await ArchiverInstrumentation.new(telemetry, ()=>archiverStore.estimateSize()), l1Constants);
+        const archiver = new Archiver(publicClient, debugClient, {
+            ...config.l1Contracts,
+            slashingProposerAddress
+        }, archiverStore, opts, deps.blobClient, epochCache, deps.dateProvider ?? new DateProvider(), await ArchiverInstrumentation.new(telemetry, ()=>archiverStore.estimateSize()), l1Constants);
         await archiver.start(blockUntilSynced);
         return archiver;
     }
@@ -128,48 +160,92 @@ function mapArchiverConfig(config) {
    * Starts sync process.
    * @param blockUntilSynced - If true, blocks until the archiver has fully synced.
    */ async start(blockUntilSynced) {
-        if (this.runningPromise) {
+        if (this.runningPromise.isRunning()) {
             throw new Error('Archiver is already running');
         }
-        await this.blobSinkClient.testSources();
+        await this.blobClient.testSources();
+        await this.testEthereumNodeSynced();
+        await validateAndLogTraceAvailability(this.debugClient, this.config.ethereumAllowNoDebugHosts ?? false);
+        // Log initial state for the archiver
+        const { l1StartBlock } = this.l1constants;
+        const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = l1StartBlock } = await this.store.getSynchPoint();
+        const currentL2Checkpoint = await this.getSynchedCheckpointNumber();
+        this.log.info(`Starting archiver sync to rollup contract ${this.l1Addresses.rollupAddress.toString()} from L1 block ${blocksSynchedTo} and L2 checkpoint ${currentL2Checkpoint}`, {
+            blocksSynchedTo,
+            messagesSynchedTo,
+            currentL2Checkpoint
+        });
+        // Start sync loop, and return the wait for initial sync if we are asked to block until synced
+        this.runningPromise.start();
         if (blockUntilSynced) {
-            while(!await this.syncSafe(true)){
-                this.log.info(`Retrying initial archiver sync in ${this.config.pollingIntervalMs}ms`);
-                await sleep(this.config.pollingIntervalMs);
-            }
+            return this.waitForInitialSync();
         }
-        this.runningPromise = new RunningPromise(()=>this.sync(false), this.log, this.config.pollingIntervalMs, makeLoggingErrorHandler(this.log, // Ignored errors will not log to the console
-        // We ignore NoBlobBodiesFound as the message may not have been passed to the blob sink yet
-        NoBlobBodiesFoundError));
-        this.runningPromise.start();
     }
     syncImmediate() {
-        if (!this.runningPromise) {
-            throw new Error('Archiver is not running');
-        }
         return this.runningPromise.trigger();
     }
+    /**
+   * Queues a block to be added to the archiver store and triggers processing.
+   * The block will be processed by the sync loop.
+   * Implements the L2BlockSink interface.
+   * @param block - The L2 block to add.
+   * @returns A promise that resolves when the block has been added to the store, or rejects on error.
+   */ addBlock(block) {
+        return new Promise((resolve, reject)=>{
+            this.blockQueue.push({
+                block,
+                resolve,
+                reject
+            });
+            this.log.debug(`Queued block ${block.number} for processing`);
+            // Trigger an immediate sync, but don't wait for it - the promise resolves when the block is processed
+            this.syncImmediate().catch((err)=>{
+                this.log.error(`Sync immediate call failed: ${err}`);
+            });
+        });
+    }
+    /**
+   * Processes all queued blocks, adding them to the store.
+   * Called at the beginning of each sync iteration.
+   * Blocks are processed in the order they were queued.
+   */ async processQueuedBlocks() {
+        if (this.blockQueue.length === 0) {
+            return;
+        }
+        // Take all blocks from the queue
+        const queuedItems = this.blockQueue.splice(0, this.blockQueue.length);
+        this.log.debug(`Processing ${queuedItems.length} queued block(s)`);
+        // Process each block individually to properly resolve/reject each promise
+        for (const { block, resolve, reject } of queuedItems){
+            try {
+                await this.store.addBlocks([
+                    block
+                ]);
+                this.log.debug(`Added block ${block.number} to store`);
+                resolve();
+            } catch (err) {
+                this.log.error(`Failed to add block ${block.number} to store: ${err.message}`);
+                reject(err);
+            }
+        }
+    }
     waitForInitialSync() {
         return this.initialSyncPromise.promise;
     }
-    async syncSafe(initialRun) {
-        try {
-            await this.sync(initialRun);
-            return true;
-        } catch (error) {
-            if (error instanceof NoBlobBodiesFoundError) {
-                this.log.error(`Error syncing archiver: ${error.message}`);
-            } else if (error instanceof BlockTagTooOldError) {
-                this.log.warn(`Re-running archiver sync: ${error.message}`);
-            } else {
-                this.log.error('Error during archiver sync', error);
-            }
-            return false;
+    /** Checks that the ethereum node we are connected to has a latest timestamp no more than the allowed drift. Throw if not. */ async testEthereumNodeSynced() {
+        const maxAllowedDelay = this.config.maxAllowedEthClientDriftSeconds;
+        if (maxAllowedDelay === 0) {
+            return;
+        }
+        const { number, timestamp: l1Timestamp } = await this.publicClient.getBlock({
+            includeTransactions: false
+        });
+        const currentTime = BigInt(this.dateProvider.nowInSeconds());
+        if (currentTime - l1Timestamp > BigInt(maxAllowedDelay)) {
+            throw new Error(`Ethereum node is out of sync (last block synced ${number} at ${l1Timestamp} vs current time ${currentTime})`);
         }
     }
-    /**
-   * Fetches logs from L1 contracts and processes them.
-   */ async sync(initialRun) {
+    async syncFromL1() {
         /**
      * We keep track of three "pointers" to L1 blocks:
      * 1. the last L1 block that published an L2 block
@@ -179,8 +255,6 @@ function mapArchiverConfig(config) {
      * We do this to deal with L1 data providers that are eventually consistent (e.g. Infura).
      * We guard against seeing block X with no data at one point, and later, the provider processes the block and it has data.
      * The archiver will stay back, until there's data on L1 that will move the pointers forward.
-     *
-     * This code does not handle reorgs.
      */ const { l1StartBlock, l1StartBlockHash } = this.l1constants;
         const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = {
             l1BlockNumber: l1StartBlock,
@@ -191,12 +265,12 @@ function mapArchiverConfig(config) {
         });
         const currentL1BlockNumber = currentL1Block.number;
         const currentL1BlockHash = Buffer32.fromString(currentL1Block.hash);
-        if (initialRun) {
-            this.log.info(`Starting archiver sync to rollup contract ${this.l1Addresses.rollupAddress.toString()} from L1 block ${blocksSynchedTo}` + ` to current L1 block ${currentL1BlockNumber} with hash ${currentL1BlockHash.toString()}`, {
-                blocksSynchedTo,
-                messagesSynchedTo
-            });
-        }
+        this.log.trace(`Starting new archiver sync iteration`, {
+            blocksSynchedTo,
+            messagesSynchedTo,
+            currentL1BlockNumber,
+            currentL1BlockHash
+        });
         // ********** Ensuring Consistency of data pulled from L1 **********
         /**
      * There are a number of calls in this sync operation to L1 for retrieving
@@ -219,23 +293,40 @@ function mapArchiverConfig(config) {
         const currentL1Timestamp = !this.l1Timestamp || !this.l1BlockNumber || this.l1BlockNumber !== currentL1BlockNumber ? (await this.publicClient.getBlock({
             blockNumber: currentL1BlockNumber
         })).timestamp : this.l1Timestamp;
-        // ********** Events that are processed per L2 block **********
+        // Warn if the latest L1 block timestamp is too old
+        const maxAllowedDelay = this.config.maxAllowedEthClientDriftSeconds;
+        const now = this.dateProvider.nowInSeconds();
+        if (maxAllowedDelay > 0 && Number(currentL1Timestamp) <= now - maxAllowedDelay) {
+            this.log.warn(`Latest L1 block ${currentL1BlockNumber} timestamp ${currentL1Timestamp} is too old. Make sure your Ethereum node is synced.`, {
+                currentL1BlockNumber,
+                currentL1Timestamp,
+                now,
+                maxAllowedDelay
+            });
+        }
+        // ********** Events that are processed per checkpoint **********
         if (currentL1BlockNumber > blocksSynchedTo) {
-            // First we retrieve new L2 blocks and store them in the DB. This will also update the
-            // pending chain validation status, proven block number, and synched L1 block number.
-            const rollupStatus = await this.handleL2blocks(blocksSynchedTo, currentL1BlockNumber);
+            // First we retrieve new checkpoints and L2 blocks and store them in the DB. This will also update the
+            // pending chain validation status, proven checkpoint number, and synched L1 block number.
+            const rollupStatus = await this.handleCheckpoints(blocksSynchedTo, currentL1BlockNumber);
             // Then we prune the current epoch if it'd reorg on next submission.
-            // Note that we don't do this before retrieving L2 blocks because we may need to retrieve
-            // blocks from more than 2 epochs ago, so we want to make sure we have the latest view of
+            // Note that we don't do this before retrieving checkpoints because we may need to retrieve
+            // checkpoints from more than 2 epochs ago, so we want to make sure we have the latest view of
             // the chain locally before we start unwinding stuff. This can be optimized by figuring out
-            // up to which point we're pruning, and then requesting L2 blocks up to that point only.
-            const { rollupCanPrune } = await this.handleEpochPrune(rollupStatus.provenBlockNumber, currentL1BlockNumber, currentL1Timestamp);
-            // And lastly we check if we are missing any L2 blocks behind us due to a possible L1 reorg.
+            // up to which point we're pruning, and then requesting checkpoints up to that point only.
+            const { rollupCanPrune } = await this.handleEpochPrune(rollupStatus.provenCheckpointNumber, currentL1BlockNumber, currentL1Timestamp);
+            // If the last checkpoint we processed had an invalid attestation, we manually advance the L1 syncpoint
+            // past it, since otherwise we'll keep downloading it and reprocessing it on every iteration until
+            // we get a valid checkpoint to advance the syncpoint.
+            if (!rollupStatus.validationResult?.valid && rollupStatus.lastL1BlockWithCheckpoint !== undefined) {
+                await this.store.setCheckpointSynchedL1BlockNumber(rollupStatus.lastL1BlockWithCheckpoint);
+            }
+            // And lastly we check if we are missing any checkpoints behind us due to a possible L1 reorg.
             // We only do this if rollup cant prune on the next submission. Otherwise we will end up
-            // re-syncing the blocks we have just unwound above. We also dont do this if the last block is invalid,
+            // re-syncing the checkpoints we have just unwound above. We also dont do this if the last checkpoint is invalid,
             // since the archiver will rightfully refuse to sync up to it.
             if (!rollupCanPrune && rollupStatus.validationResult?.valid) {
-                await this.checkForNewBlocksBeforeL1SyncPoint(rollupStatus, blocksSynchedTo, currentL1BlockNumber);
+                await this.checkForNewCheckpointsBeforeL1SyncPoint(rollupStatus, blocksSynchedTo, currentL1BlockNumber);
             }
             this.instrumentation.updateL1BlockHeight(currentL1BlockNumber);
         }
@@ -244,16 +335,27 @@ function mapArchiverConfig(config) {
         // but the corresponding blocks have not been processed (see #12631).
         this.l1Timestamp = currentL1Timestamp;
         this.l1BlockNumber = currentL1BlockNumber;
-        this.initialSyncComplete = true;
-        this.initialSyncPromise.resolve();
-        if (initialRun) {
-            this.log.info(`Initial archiver sync to L1 block ${currentL1BlockNumber} complete.`, {
+        // We resolve the initial sync only once we've caught up with the latest L1 block number (with 1 block grace)
+        // so if the initial sync took too long, we still go for another iteration.
+        if (!this.initialSyncComplete && currentL1BlockNumber + 1n >= await this.publicClient.getBlockNumber()) {
+            this.log.info(`Initial archiver sync to L1 block ${currentL1BlockNumber} complete`, {
                 l1BlockNumber: currentL1BlockNumber,
                 syncPoint: await this.store.getSynchPoint(),
                 ...await this.getL2Tips()
             });
+            this.runningPromise.setPollingIntervalMS(this.config.pollingIntervalMs);
+            this.initialSyncComplete = true;
+            this.initialSyncPromise.resolve();
         }
     }
+    /**
+   * Fetches logs from L1 contracts and processes them.
+   */ async sync() {
+        // Process any queued blocks first, before doing L1 sync
+        await this.processQueuedBlocks();
+        // Now perform L1 sync
+        await this.syncFromL1();
+    }
     /** Queries the rollup contract on whether a prune can be executed on the immediate next L1 block. */ async canPrune(currentL1BlockNumber, currentL1Timestamp) {
         const time = (currentL1Timestamp ?? 0n) + BigInt(this.l1constants.ethereumSlotDuration);
         const result = await this.rollup.canPruneAtTime(time, {
@@ -268,30 +370,37 @@ function mapArchiverConfig(config) {
         }
         return result;
     }
-    /** Checks if there'd be a reorg for the next block submission and start pruning now. */ async handleEpochPrune(provenBlockNumber, currentL1BlockNumber, currentL1Timestamp) {
+    /** Checks if there'd be a reorg for the next checkpoint submission and start pruning now. */ async handleEpochPrune(provenCheckpointNumber, currentL1BlockNumber, currentL1Timestamp) {
         const rollupCanPrune = await this.canPrune(currentL1BlockNumber, currentL1Timestamp);
-        const localPendingBlockNumber = await this.getBlockNumber();
-        const canPrune = localPendingBlockNumber > provenBlockNumber && rollupCanPrune;
+        const localPendingCheckpointNumber = await this.getSynchedCheckpointNumber();
+        const canPrune = localPendingCheckpointNumber > provenCheckpointNumber && rollupCanPrune;
         if (canPrune) {
             const timer = new Timer();
-            const pruneFrom = provenBlockNumber + 1;
-            const header = await this.getBlockHeader(Number(pruneFrom));
+            const pruneFrom = CheckpointNumber(provenCheckpointNumber + 1);
+            const header = await this.getCheckpointHeader(pruneFrom);
             if (header === undefined) {
-                throw new Error(`Missing block header ${pruneFrom}`);
+                throw new Error(`Missing checkpoint header ${pruneFrom}`);
             }
-            const pruneFromSlotNumber = header.globalVariables.slotNumber.toBigInt();
+            const pruneFromSlotNumber = header.slotNumber;
             const pruneFromEpochNumber = getEpochAtSlot(pruneFromSlotNumber, this.l1constants);
-            const blocksToUnwind = localPendingBlockNumber - provenBlockNumber;
-            const blocks = await this.getBlocks(Number(provenBlockNumber) + 1, Number(blocksToUnwind));
+            const checkpointsToUnwind = localPendingCheckpointNumber - provenCheckpointNumber;
+            const checkpointPromises = Array.from({
+                length: checkpointsToUnwind
+            }).fill(0).map((_, i)=>this.store.getCheckpointData(CheckpointNumber(i + pruneFrom)));
+            const checkpoints = await Promise.all(checkpointPromises);
+            const blockPromises = await Promise.all(checkpoints.filter(isDefined).map((cp)=>this.store.getBlocksForCheckpoint(CheckpointNumber(cp.checkpointNumber))));
+            const newBlocks = blockPromises.filter(isDefined).flat();
+            // TODO(pw/mbps): Don't convert to legacy blocks here
+            const blocks = (await Promise.all(newBlocks.map((x)=>this.getBlock(x.number)))).filter(isDefined);
             // Emit an event for listening services to react to the chain prune
             this.emit(L2BlockSourceEvents.L2PruneDetected, {
                 type: L2BlockSourceEvents.L2PruneDetected,
                 epochNumber: pruneFromEpochNumber,
                 blocks
             });
-            this.log.debug(`L2 prune from ${provenBlockNumber + 1} to ${localPendingBlockNumber} will occur on next block submission.`);
-            await this.store.unwindBlocks(Number(localPendingBlockNumber), Number(blocksToUnwind));
-            this.log.warn(`Unwound ${count(blocksToUnwind, 'block')} from L2 block ${localPendingBlockNumber} ` + `to ${provenBlockNumber} due to predicted reorg at L1 block ${currentL1BlockNumber}. ` + `Updated L2 latest block is ${await this.getBlockNumber()}.`);
+            this.log.debug(`L2 prune from ${provenCheckpointNumber + 1} to ${localPendingCheckpointNumber} will occur on next checkpoint submission.`);
+            await this.unwindCheckpoints(localPendingCheckpointNumber, checkpointsToUnwind);
+            this.log.warn(`Unwound ${count(checkpointsToUnwind, 'checkpoint')} from checkpoint ${localPendingCheckpointNumber} ` + `to ${provenCheckpointNumber} due to predicted reorg at L1 block ${currentL1BlockNumber}. ` + `Updated latest checkpoint is ${await this.getSynchedCheckpointNumber()}.`);
             this.instrumentation.processPrune(timer.ms());
         // TODO(palla/reorg): Do we need to set the block synched L1 block number here?
         // Seems like the next iteration should handle this.
@@ -334,7 +443,7 @@ function mapArchiverConfig(config) {
         });
         // Compare message count and rolling hash. If they match, no need to retrieve anything.
         if (remoteMessagesState.totalMessagesInserted === localMessagesInserted && remoteMessagesState.messagesRollingHash.equals(localLastMessage?.rollingHash ?? Buffer16.ZERO)) {
-            this.log.debug(`No L1 to L2 messages to query between L1 blocks ${messagesSyncPoint.l1BlockNumber} and ${currentL1BlockNumber}.`);
+            this.log.trace(`No L1 to L2 messages to query between L1 blocks ${messagesSyncPoint.l1BlockNumber} and ${currentL1BlockNumber}.`);
             return;
         }
         // Check if our syncpoint is still valid. If not, there was an L1 reorg and we need to re-retrieve messages.
@@ -383,7 +492,7 @@ function mapArchiverConfig(config) {
         }while (searchEndBlock < currentL1BlockNumber)
         // Log stats for messages retrieved (if any).
         if (messageCount > 0) {
-            this.log.info(`Retrieved ${messageCount} new L1 to L2 messages up to message with index ${lastMessage?.index} for L2 block ${lastMessage?.l2BlockNumber}`, {
+            this.log.info(`Retrieved ${messageCount} new L1 to L2 messages up to message with index ${lastMessage?.index} for checkpoint ${lastMessage?.checkpointNumber}`, {
                 lastMessage,
                 messageCount
             });
@@ -460,162 +569,173 @@ function mapArchiverConfig(config) {
         }
         return Buffer32.fromString(block.hash);
     }
-    async handleL2blocks(blocksSynchedTo, currentL1BlockNumber) {
-        const localPendingBlockNumber = await this.getBlockNumber();
+    async handleCheckpoints(blocksSynchedTo, currentL1BlockNumber) {
+        const localPendingCheckpointNumber = await this.getSynchedCheckpointNumber();
         const initialValidationResult = await this.store.getPendingChainValidationStatus();
-        const [provenBlockNumber, provenArchive, pendingBlockNumber, pendingArchive, archiveForLocalPendingBlockNumber] = await this.rollup.status(BigInt(localPendingBlockNumber), {
+        const [rollupProvenCheckpointNumber, provenArchive, rollupPendingCheckpointNumber, pendingArchive, archiveForLocalPendingCheckpointNumber] = await this.rollup.status(localPendingCheckpointNumber, {
             blockNumber: currentL1BlockNumber
         });
+        const provenCheckpointNumber = CheckpointNumber.fromBigInt(rollupProvenCheckpointNumber);
+        const pendingCheckpointNumber = CheckpointNumber.fromBigInt(rollupPendingCheckpointNumber);
         const rollupStatus = {
-            provenBlockNumber: Number(provenBlockNumber),
+            provenCheckpointNumber,
             provenArchive,
-            pendingBlockNumber: Number(pendingBlockNumber),
+            pendingCheckpointNumber,
             pendingArchive,
             validationResult: initialValidationResult
         };
         this.log.trace(`Retrieved rollup status at current L1 block ${currentL1BlockNumber}.`, {
-            localPendingBlockNumber,
+            localPendingCheckpointNumber,
             blocksSynchedTo,
             currentL1BlockNumber,
-            archiveForLocalPendingBlockNumber,
+            archiveForLocalPendingCheckpointNumber,
             ...rollupStatus
         });
-        const updateProvenBlock = async ()=>{
-            // Annoying edge case: if proven block is moved back to 0 due to a reorg at the beginning of the chain,
-            // we need to set it to zero. This is an edge case because we dont have a block zero (initial block is one),
-            // so localBlockForDestinationProvenBlockNumber would not be found below.
-            if (provenBlockNumber === 0n) {
-                const localProvenBlockNumber = await this.store.getProvenL2BlockNumber();
-                if (localProvenBlockNumber !== Number(provenBlockNumber)) {
-                    await this.store.setProvenL2BlockNumber(Number(provenBlockNumber));
-                    this.log.info(`Rolled back proven chain to block ${provenBlockNumber}`, {
-                        provenBlockNumber
+        const updateProvenCheckpoint = async ()=>{
+            // Annoying edge case: if proven checkpoint is moved back to 0 due to a reorg at the beginning of the chain,
+            // we need to set it to zero. This is an edge case because we dont have a checkpoint zero (initial checkpoint is one),
+            // so localCheckpointForDestinationProvenCheckpointNumber would not be found below.
+            if (provenCheckpointNumber === 0) {
+                const localProvenCheckpointNumber = await this.getProvenCheckpointNumber();
+                if (localProvenCheckpointNumber !== provenCheckpointNumber) {
+                    await this.setProvenCheckpointNumber(provenCheckpointNumber);
+                    this.log.info(`Rolled back proven chain to checkpoint ${provenCheckpointNumber}`, {
+                        provenCheckpointNumber
                     });
                 }
             }
-            const localBlockForDestinationProvenBlockNumber = await this.getBlock(Number(provenBlockNumber));
-            // Sanity check. I've hit what seems to be a state where the proven block is set to a value greater than the latest
-            // synched block when requesting L2Tips from the archiver. This is the only place where the proven block is set.
-            const synched = await this.store.getSynchedL2BlockNumber();
-            if (localBlockForDestinationProvenBlockNumber && synched < localBlockForDestinationProvenBlockNumber?.number) {
-                this.log.error(`Hit local block greater than last synched block: ${localBlockForDestinationProvenBlockNumber.number} > ${synched}`);
+            const localCheckpointForDestinationProvenCheckpointNumber = await this.store.getCheckpointData(provenCheckpointNumber);
+            // Sanity check. I've hit what seems to be a state where the proven checkpoint is set to a value greater than the latest
+            // synched checkpoint when requesting L2Tips from the archiver. This is the only place where the proven checkpoint is set.
+            const synched = await this.getSynchedCheckpointNumber();
+            if (localCheckpointForDestinationProvenCheckpointNumber && synched < localCheckpointForDestinationProvenCheckpointNumber.checkpointNumber) {
+                this.log.error(`Hit local checkpoint greater than last synched checkpoint: ${localCheckpointForDestinationProvenCheckpointNumber.checkpointNumber} > ${synched}`);
             }
-            this.log.trace(`Local block for remote proven block ${provenBlockNumber} is ${localBlockForDestinationProvenBlockNumber?.archive.root.toString() ?? 'undefined'}`);
-            if (localBlockForDestinationProvenBlockNumber && provenArchive === localBlockForDestinationProvenBlockNumber.archive.root.toString()) {
-                const localProvenBlockNumber = await this.store.getProvenL2BlockNumber();
-                if (localProvenBlockNumber !== Number(provenBlockNumber)) {
-                    await this.store.setProvenL2BlockNumber(Number(provenBlockNumber));
-                    this.log.info(`Updated proven chain to block ${provenBlockNumber}`, {
-                        provenBlockNumber
+            this.log.trace(`Local checkpoint for remote proven checkpoint ${provenCheckpointNumber} is ${localCheckpointForDestinationProvenCheckpointNumber?.archive.root.toString() ?? 'undefined'}`);
+            if (localCheckpointForDestinationProvenCheckpointNumber && provenArchive === localCheckpointForDestinationProvenCheckpointNumber.archive.root.toString()) {
+                const localProvenCheckpointNumber = await this.getProvenCheckpointNumber();
+                if (localProvenCheckpointNumber !== provenCheckpointNumber) {
+                    await this.setProvenCheckpointNumber(provenCheckpointNumber);
+                    this.log.info(`Updated proven chain to checkpoint ${provenCheckpointNumber}`, {
+                        provenCheckpointNumber
                     });
-                    const provenSlotNumber = localBlockForDestinationProvenBlockNumber.header.globalVariables.slotNumber.toBigInt();
+                    const provenSlotNumber = localCheckpointForDestinationProvenCheckpointNumber.header.slotNumber;
                     const provenEpochNumber = getEpochAtSlot(provenSlotNumber, this.l1constants);
+                    const lastBlockNumberInCheckpoint = localCheckpointForDestinationProvenCheckpointNumber.startBlock + localCheckpointForDestinationProvenCheckpointNumber.numBlocks - 1;
                     this.emit(L2BlockSourceEvents.L2BlockProven, {
                         type: L2BlockSourceEvents.L2BlockProven,
-                        blockNumber: provenBlockNumber,
+                        blockNumber: BlockNumber(lastBlockNumberInCheckpoint),
                         slotNumber: provenSlotNumber,
                         epochNumber: provenEpochNumber
                     });
+                    this.instrumentation.updateLastProvenBlock(lastBlockNumberInCheckpoint);
                 } else {
-                    this.log.trace(`Proven block ${provenBlockNumber} already stored.`);
+                    this.log.trace(`Proven checkpoint ${provenCheckpointNumber} already stored.`);
                 }
             }
-            this.instrumentation.updateLastProvenBlock(Number(provenBlockNumber));
         };
-        // This is an edge case that we only hit if there are no proposed blocks.
-        // If we have 0 blocks locally and there are no blocks onchain there is nothing to do.
-        const noBlocks = localPendingBlockNumber === 0 && pendingBlockNumber === 0n;
-        if (noBlocks) {
-            await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
-            this.log.debug(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}, no blocks on chain`);
+        // This is an edge case that we only hit if there are no proposed checkpoints.
+        // If we have 0 checkpoints locally and there are no checkpoints onchain there is nothing to do.
+        const noCheckpoints = localPendingCheckpointNumber === 0 && pendingCheckpointNumber === 0;
+        if (noCheckpoints) {
+            await this.store.setCheckpointSynchedL1BlockNumber(currentL1BlockNumber);
+            this.log.debug(`No checkpoints to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}, no checkpoints on chain`);
             return rollupStatus;
         }
-        await updateProvenBlock();
+        await updateProvenCheckpoint();
         // Related to the L2 reorgs of the pending chain. We are only interested in actually addressing a reorg if there
-        // are any state that could be impacted by it. If we have no blocks, there is no impact.
-        if (localPendingBlockNumber > 0) {
-            const localPendingBlock = await this.getBlock(localPendingBlockNumber);
-            if (localPendingBlock === undefined) {
-                throw new Error(`Missing block ${localPendingBlockNumber}`);
+        // are any state that could be impacted by it. If we have no checkpoints, there is no impact.
+        if (localPendingCheckpointNumber > 0) {
+            const localPendingCheckpoint = await this.store.getCheckpointData(localPendingCheckpointNumber);
+            if (localPendingCheckpoint === undefined) {
+                throw new Error(`Missing checkpoint ${localPendingCheckpointNumber}`);
             }
-            const localPendingArchiveRoot = localPendingBlock.archive.root.toString();
-            const noBlockSinceLast = localPendingBlock && pendingArchive === localPendingArchiveRoot;
-            if (noBlockSinceLast) {
+            const localPendingArchiveRoot = localPendingCheckpoint.archive.root.toString();
+            const noCheckpointSinceLast = localPendingCheckpoint && pendingArchive === localPendingArchiveRoot;
+            if (noCheckpointSinceLast) {
                 // We believe the following line causes a problem when we encounter L1 re-orgs.
                 // Basically, by setting the synched L1 block number here, we are saying that we have
-                // processed all blocks up to the current L1 block number and we will not attempt to retrieve logs from
+                // processed all checkpoints up to the current L1 block number and we will not attempt to retrieve logs from
                 // this block again (or any blocks before).
-                // However, in the re-org scenario, our L1 node is temporarily lying to us and we end up potentially missing blocks
+                // However, in the re-org scenario, our L1 node is temporarily lying to us and we end up potentially missing checkpoints.
                 // We must only set this block number based on actually retrieved logs.
                 // TODO(#8621): Tackle this properly when we handle L1 Re-orgs.
                 // await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
-                this.log.debug(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
+                this.log.debug(`No checkpoints to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
                 return rollupStatus;
             }
-            const localPendingBlockInChain = archiveForLocalPendingBlockNumber === localPendingArchiveRoot;
-            if (!localPendingBlockInChain) {
-                // If our local pending block tip is not in the chain on L1 a "prune" must have happened
+            const localPendingCheckpointInChain = archiveForLocalPendingCheckpointNumber === localPendingArchiveRoot;
+            if (!localPendingCheckpointInChain) {
+                // If our local pending checkpoint tip is not in the chain on L1 a "prune" must have happened
                 // or the L1 have reorged.
                 // In any case, we have to figure out how far into the past the action will take us.
-                // For simplicity here, we will simply rewind until we end in a block that is also on the chain on L1.
-                this.log.debug(`L2 prune has been detected due to local pending block ${localPendingBlockNumber} not in chain`, {
-                    localPendingBlockNumber,
+                // For simplicity here, we will simply rewind until we end in a checkpoint that is also on the chain on L1.
+                this.log.debug(`L2 prune has been detected due to local pending checkpoint ${localPendingCheckpointNumber} not in chain`, {
+                    localPendingCheckpointNumber,
                     localPendingArchiveRoot,
-                    archiveForLocalPendingBlockNumber
+                    archiveForLocalPendingCheckpointNumber
                 });
-                let tipAfterUnwind = localPendingBlockNumber;
+                let tipAfterUnwind = localPendingCheckpointNumber;
                 while(true){
-                    const candidateBlock = await this.getBlock(Number(tipAfterUnwind));
-                    if (candidateBlock === undefined) {
+                    const candidateCheckpoint = await this.store.getCheckpointData(tipAfterUnwind);
+                    if (candidateCheckpoint === undefined) {
                         break;
                     }
-                    const archiveAtContract = await this.rollup.archiveAt(BigInt(candidateBlock.number));
-                    if (archiveAtContract === candidateBlock.archive.root.toString()) {
+                    const archiveAtContract = await this.rollup.archiveAt(candidateCheckpoint.checkpointNumber);
+                    this.log.trace(`Checking local checkpoint ${candidateCheckpoint.checkpointNumber} with archive ${candidateCheckpoint.archive.root}`, {
+                        archiveAtContract,
+                        archiveLocal: candidateCheckpoint.archive.root.toString()
+                    });
+                    if (archiveAtContract === candidateCheckpoint.archive.root.toString()) {
                         break;
                     }
                     tipAfterUnwind--;
                 }
-                const blocksToUnwind = localPendingBlockNumber - tipAfterUnwind;
-                await this.store.unwindBlocks(Number(localPendingBlockNumber), Number(blocksToUnwind));
-                this.log.warn(`Unwound ${count(blocksToUnwind, 'block')} from L2 block ${localPendingBlockNumber} ` + `due to mismatched block hashes at L1 block ${currentL1BlockNumber}. ` + `Updated L2 latest block is ${await this.getBlockNumber()}.`);
+                const checkpointsToUnwind = localPendingCheckpointNumber - tipAfterUnwind;
+                await this.unwindCheckpoints(localPendingCheckpointNumber, checkpointsToUnwind);
+                this.log.warn(`Unwound ${count(checkpointsToUnwind, 'checkpoint')} from checkpoint ${localPendingCheckpointNumber} ` + `due to mismatched checkpoint hashes at L1 block ${currentL1BlockNumber}. ` + `Updated L2 latest checkpoint is ${await this.getSynchedCheckpointNumber()}.`);
             }
         }
-        // Retrieve L2 blocks in batches. Each batch is estimated to accommodate up to L2 'blockBatchSize' blocks,
+        // Retrieve checkpoints in batches. Each batch is estimated to accommodate up to 'blockBatchSize' L1 blocks,
         // computed using the L2 block time vs the L1 block time.
         let searchStartBlock = blocksSynchedTo;
         let searchEndBlock = blocksSynchedTo;
-        let lastRetrievedBlock;
+        let lastRetrievedCheckpoint;
+        let lastL1BlockWithCheckpoint = undefined;
         do {
             [searchStartBlock, searchEndBlock] = this.nextRange(searchEndBlock, currentL1BlockNumber);
-            this.log.trace(`Retrieving L2 blocks from L1 block ${searchStartBlock} to ${searchEndBlock}`);
-            // TODO(md): Retrieve from blob sink then from consensus client, then from peers
-            const retrievedBlocks = await retrieveBlocksFromRollup(this.rollup.getContract(), this.publicClient, this.blobSinkClient, searchStartBlock, searchEndBlock, this.log);
-            if (retrievedBlocks.length === 0) {
+            this.log.trace(`Retrieving checkpoints from L1 block ${searchStartBlock} to ${searchEndBlock}`);
+            // TODO(md): Retrieve from blob client then from consensus client, then from peers
+            const retrievedCheckpoints = await retrieveCheckpointsFromRollup(this.rollup.getContract(), this.publicClient, this.debugClient, this.blobClient, searchStartBlock, searchEndBlock, this.l1Addresses, this.instrumentation, this.log, !this.initialSyncComplete);
+            if (retrievedCheckpoints.length === 0) {
                 // We are not calling `setBlockSynchedL1BlockNumber` because it may cause sync issues if based off infura.
                 // See further details in earlier comments.
-                this.log.trace(`Retrieved no new L2 blocks from L1 block ${searchStartBlock} to ${searchEndBlock}`);
+                this.log.trace(`Retrieved no new checkpoints from L1 block ${searchStartBlock} to ${searchEndBlock}`);
                 continue;
             }
-            const lastProcessedL1BlockNumber = retrievedBlocks[retrievedBlocks.length - 1].l1.blockNumber;
-            this.log.debug(`Retrieved ${retrievedBlocks.length} new L2 blocks between L1 blocks ${searchStartBlock} and ${searchEndBlock} with last processed L1 block ${lastProcessedL1BlockNumber}.`);
-            const publishedBlocks = await Promise.all(retrievedBlocks.map((b)=>retrievedBlockToPublishedL2Block(b)));
-            const validBlocks = [];
-            for (const block of publishedBlocks){
+            this.log.debug(`Retrieved ${retrievedCheckpoints.length} new checkpoints between L1 blocks ${searchStartBlock} and ${searchEndBlock}`, {
+                lastProcessedCheckpoint: retrievedCheckpoints[retrievedCheckpoints.length - 1].l1,
+                searchStartBlock,
+                searchEndBlock
+            });
+            const publishedCheckpoints = await Promise.all(retrievedCheckpoints.map((b)=>retrievedToPublishedCheckpoint(b)));
+            const validCheckpoints = [];
+            for (const published of publishedCheckpoints){
                 const validationResult = this.config.skipValidateBlockAttestations ? {
                     valid: true
-                } : await validateBlockAttestations(block, this.epochCache, this.l1constants, this.log);
-                // Only update the validation result if it has changed, so we can keep track of the first invalid block
-                // in case there is a sequence of more than one invalid block, as we need to invalidate the first one.
-                // There is an exception though: if an invalid block is invalidated and replaced with another invalid block,
+                } : await validateCheckpointAttestations(published, this.epochCache, this.l1constants, this.log);
+                // Only update the validation result if it has changed, so we can keep track of the first invalid checkpoint
+                // in case there is a sequence of more than one invalid checkpoint, as we need to invalidate the first one.
+                // There is an exception though: if a checkpoint is invalidated and replaced with another invalid checkpoint,
                 // we need to update the validation result, since we need to be able to invalidate the new one.
-                // See test 'chain progresses if an invalid block is invalidated with an invalid one' for more info.
+                // See test 'chain progresses if an invalid checkpoint is invalidated with an invalid one' for more info.
                 if (rollupStatus.validationResult?.valid !== validationResult.valid || !rollupStatus.validationResult.valid && !validationResult.valid && rollupStatus.validationResult.block.blockNumber === validationResult.block.blockNumber) {
                     rollupStatus.validationResult = validationResult;
                 }
                 if (!validationResult.valid) {
-                    this.log.warn(`Skipping block ${block.block.number} due to invalid attestations`, {
-                        blockHash: block.block.hash(),
-                        l1BlockNumber: block.l1.blockNumber,
+                    this.log.warn(`Skipping checkpoint ${published.checkpoint.number} due to invalid attestations`, {
+                        checkpointHash: published.checkpoint.hash(),
+                        l1BlockNumber: published.l1.blockNumber,
                         ...pick(validationResult, 'reason')
                     });
                     // Emit event for invalid block detection
@@ -625,85 +745,107 @@ function mapArchiverConfig(config) {
                     });
                     continue;
                 }
-                validBlocks.push(block);
-                this.log.debug(`Ingesting new L2 block ${block.block.number} with ${block.block.body.txEffects.length} txs`, {
-                    blockHash: block.block.hash(),
-                    l1BlockNumber: block.l1.blockNumber,
-                    ...block.block.header.globalVariables.toInspect(),
-                    ...block.block.getStats()
+                // Check the inHash of the checkpoint against the l1->l2 messages.
+                // The messages should've been synced up to the currentL1BlockNumber and must be available for the published
+                // checkpoints we just retrieved.
+                const l1ToL2Messages = await this.getL1ToL2Messages(published.checkpoint.number);
+                const computedInHash = computeInHashFromL1ToL2Messages(l1ToL2Messages);
+                const publishedInHash = published.checkpoint.header.contentCommitment.inHash;
+                if (!computedInHash.equals(publishedInHash)) {
+                    this.log.fatal(`Mismatch inHash for checkpoint ${published.checkpoint.number}`, {
+                        checkpointHash: published.checkpoint.hash(),
+                        l1BlockNumber: published.l1.blockNumber,
+                        computedInHash,
+                        publishedInHash
+                    });
+                    // Throwing an error since this is most likely caused by a bug.
+                    throw new Error(`Mismatch inHash for checkpoint ${published.checkpoint.number}. Expected ${computedInHash} but got ${publishedInHash}`);
+                }
+                validCheckpoints.push(published);
+                this.log.debug(`Ingesting new checkpoint ${published.checkpoint.number} with ${published.checkpoint.blocks.length} blocks`, {
+                    checkpointHash: published.checkpoint.hash(),
+                    l1BlockNumber: published.l1.blockNumber,
+                    ...published.checkpoint.header.toInspect(),
+                    blocks: published.checkpoint.blocks.map((b)=>b.getStats())
                 });
             }
             try {
                 const updatedValidationResult = rollupStatus.validationResult === initialValidationResult ? undefined : rollupStatus.validationResult;
-                const [processDuration] = await elapsed(()=>this.store.addBlocks(validBlocks, updatedValidationResult));
-                this.instrumentation.processNewBlocks(processDuration / validBlocks.length, validBlocks.map((b)=>b.block));
+                const [processDuration] = await elapsed(()=>this.addCheckpoints(validCheckpoints, updatedValidationResult));
+                this.instrumentation.processNewBlocks(processDuration / validCheckpoints.length, validCheckpoints.flatMap((c)=>c.checkpoint.blocks));
             } catch (err) {
-                if (err instanceof InitialBlockNumberNotSequentialError) {
-                    const { previousBlockNumber, newBlockNumber } = err;
-                    const previousBlock = previousBlockNumber ? await this.store.getPublishedBlock(previousBlockNumber) : undefined;
-                    const updatedL1SyncPoint = previousBlock?.l1.blockNumber ?? this.l1constants.l1StartBlock;
+                if (err instanceof InitialCheckpointNumberNotSequentialError) {
+                    const { previousCheckpointNumber, newCheckpointNumber } = err;
+                    const previousCheckpoint = previousCheckpointNumber ? await this.store.getCheckpointData(CheckpointNumber(previousCheckpointNumber)) : undefined;
+                    const updatedL1SyncPoint = previousCheckpoint?.l1.blockNumber ?? this.l1constants.l1StartBlock;
                     await this.store.setBlockSynchedL1BlockNumber(updatedL1SyncPoint);
-                    this.log.warn(`Attempting to insert block ${newBlockNumber} with previous block ${previousBlockNumber}. Rolling back L1 sync point to ${updatedL1SyncPoint} to try and fetch the missing blocks.`, {
-                        previousBlockNumber,
-                        previousBlockHash: await previousBlock?.block.hash(),
-                        newBlockNumber,
+                    this.log.warn(`Attempting to insert checkpoint ${newCheckpointNumber} with previous block ${previousCheckpointNumber}. Rolling back L1 sync point to ${updatedL1SyncPoint} to try and fetch the missing blocks.`, {
+                        previousCheckpointNumber,
+                        newCheckpointNumber,
                         updatedL1SyncPoint
                     });
                 }
                 throw err;
             }
-            for (const block of validBlocks){
-                this.log.info(`Downloaded L2 block ${block.block.number}`, {
-                    blockHash: await block.block.hash(),
-                    blockNumber: block.block.number,
-                    txCount: block.block.body.txEffects.length,
-                    globalVariables: block.block.header.globalVariables.toInspect(),
-                    archiveRoot: block.block.archive.root.toString(),
-                    archiveNextLeafIndex: block.block.archive.nextAvailableLeafIndex
+            for (const checkpoint of validCheckpoints){
+                this.log.info(`Downloaded checkpoint ${checkpoint.checkpoint.number}`, {
+                    checkpointHash: checkpoint.checkpoint.hash(),
+                    checkpointNumber: checkpoint.checkpoint.number,
+                    blockCount: checkpoint.checkpoint.blocks.length,
+                    txCount: checkpoint.checkpoint.blocks.reduce((acc, b)=>acc + b.body.txEffects.length, 0),
+                    header: checkpoint.checkpoint.header.toInspect(),
+                    archiveRoot: checkpoint.checkpoint.archive.root.toString(),
+                    archiveNextLeafIndex: checkpoint.checkpoint.archive.nextAvailableLeafIndex
                 });
             }
-            lastRetrievedBlock = validBlocks.at(-1) ?? lastRetrievedBlock;
+            lastRetrievedCheckpoint = validCheckpoints.at(-1) ?? lastRetrievedCheckpoint;
+            lastL1BlockWithCheckpoint = retrievedCheckpoints.at(-1)?.l1.blockNumber ?? lastL1BlockWithCheckpoint;
         }while (searchEndBlock < currentL1BlockNumber)
         // Important that we update AFTER inserting the blocks.
-        await updateProvenBlock();
+        await updateProvenCheckpoint();
         return {
             ...rollupStatus,
-            lastRetrievedBlock
+            lastRetrievedCheckpoint,
+            lastL1BlockWithCheckpoint
         };
     }
-    async checkForNewBlocksBeforeL1SyncPoint(status, blocksSynchedTo, currentL1BlockNumber) {
-        const { lastRetrievedBlock, pendingBlockNumber } = status;
-        // Compare the last L2 block we have (either retrieved in this round or loaded from store) with what the
+    async checkForNewCheckpointsBeforeL1SyncPoint(status, blocksSynchedTo, currentL1BlockNumber) {
+        const { lastRetrievedCheckpoint, pendingCheckpointNumber } = status;
+        // Compare the last checkpoint we have (either retrieved in this round or loaded from store) with what the
         // rollup contract told us was the latest one (pinned at the currentL1BlockNumber).
-        const latestLocalL2BlockNumber = lastRetrievedBlock?.block.number ?? await this.store.getSynchedL2BlockNumber();
-        if (latestLocalL2BlockNumber < pendingBlockNumber) {
+        const latestLocalCheckpointNumber = lastRetrievedCheckpoint?.checkpoint.number ?? await this.getSynchedCheckpointNumber();
+        if (latestLocalCheckpointNumber < pendingCheckpointNumber) {
             // Here we have consumed all logs until the `currentL1Block` we pinned at the beginning of the archiver loop,
-            // but still havent reached the pending block according to the call to the rollup contract.
-            // We suspect an L1 reorg that added blocks *behind* us. If that is the case, it must have happened between the
-            // last L2 block we saw and the current one, so we reset the last synched L1 block number. In the edge case we
-            // don't have one, we go back 2 L1 epochs, which is the deepest possible reorg (assuming Casper is working).
-            const latestLocalL2Block = lastRetrievedBlock ?? (latestLocalL2BlockNumber > 0 ? await this.store.getPublishedBlocks(latestLocalL2BlockNumber, 1).then(([b])=>b) : undefined);
-            const targetL1BlockNumber = latestLocalL2Block?.l1.blockNumber ?? maxBigint(currentL1BlockNumber - 64n, 0n);
-            const latestLocalL2BlockArchive = latestLocalL2Block?.block.archive.root.toString();
-            this.log.warn(`Failed to reach L2 block ${pendingBlockNumber} at ${currentL1BlockNumber} (latest is ${latestLocalL2BlockNumber}). ` + `Rolling back last synched L1 block number to ${targetL1BlockNumber}.`, {
-                latestLocalL2BlockNumber,
-                latestLocalL2BlockArchive,
+            // but still haven't reached the pending checkpoint according to the call to the rollup contract.
+            // We suspect an L1 reorg that added checkpoints *behind* us. If that is the case, it must have happened between
+            // the last checkpoint we saw and the current one, so we reset the last synched L1 block number. In the edge case
+            // we don't have one, we go back 2 L1 epochs, which is the deepest possible reorg (assuming Casper is working).
+            let latestLocalCheckpointArchive = undefined;
+            let targetL1BlockNumber = maxBigint(currentL1BlockNumber - 64n, 0n);
+            if (lastRetrievedCheckpoint) {
+                latestLocalCheckpointArchive = lastRetrievedCheckpoint.checkpoint.archive.root.toString();
+                targetL1BlockNumber = lastRetrievedCheckpoint.l1.blockNumber;
+            } else if (latestLocalCheckpointNumber > 0) {
+                const checkpoint = await this.store.getRangeOfCheckpoints(latestLocalCheckpointNumber, 1).then(([c])=>c);
+                latestLocalCheckpointArchive = checkpoint.archive.root.toString();
+                targetL1BlockNumber = checkpoint.l1.blockNumber;
+            }
+            this.log.warn(`Failed to reach checkpoint ${pendingCheckpointNumber} at ${currentL1BlockNumber} (latest is ${latestLocalCheckpointNumber}). ` + `Rolling back last synched L1 block number to ${targetL1BlockNumber}.`, {
+                latestLocalCheckpointNumber,
+                latestLocalCheckpointArchive,
                 blocksSynchedTo,
                 currentL1BlockNumber,
                 ...status
             });
             await this.store.setBlockSynchedL1BlockNumber(targetL1BlockNumber);
         } else {
-            this.log.trace(`No new blocks behind L1 sync point to retrieve.`, {
-                latestLocalL2BlockNumber,
-                pendingBlockNumber
+            this.log.trace(`No new checkpoints behind L1 sync point to retrieve.`, {
+                latestLocalCheckpointNumber,
+                pendingCheckpointNumber
             });
         }
     }
     /** Resumes the archiver after a stop. */ resume() {
-        if (!this.runningPromise) {
-            throw new Error(`Archiver was never started`);
-        }
         if (this.runningPromise.isRunning()) {
             this.log.warn(`Archiver already running`);
         }
@@ -715,7 +857,7 @@ function mapArchiverConfig(config) {
    * @returns A promise signalling completion of the stop process.
    */ async stop() {
         this.log.debug('Stopping...');
-        await this.runningPromise?.stop();
+        await this.runningPromise.stop();
         this.log.info('Stopped.');
         return Promise.resolve();
     }
@@ -751,38 +893,51 @@ function mapArchiverConfig(config) {
     async getBlocksForEpoch(epochNumber) {
         const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1constants);
         const blocks = [];
-        // Walk the list of blocks backwards and filter by slots matching the requested epoch.
-        // We'll typically ask for blocks for a very recent epoch, so we shouldn't need an index here.
-        let block = await this.getBlock(await this.store.getSynchedL2BlockNumber());
-        const slot = (b)=>b.header.globalVariables.slotNumber.toBigInt();
-        while(block && slot(block) >= start){
-            if (slot(block) <= end) {
-                blocks.push(block);
+        // Walk the list of checkpoints backwards and filter by slots matching the requested epoch.
+        // We'll typically ask for checkpoints for a very recent epoch, so we shouldn't need an index here.
+        let checkpoint = await this.store.getCheckpointData(await this.store.getSynchedCheckpointNumber());
+        const slot = (b)=>b.header.slotNumber;
+        while(checkpoint && slot(checkpoint) >= start){
+            if (slot(checkpoint) <= end) {
+                // push the blocks on backwards
+                const endBlock = checkpoint.startBlock + checkpoint.numBlocks - 1;
+                for(let i = endBlock; i >= checkpoint.startBlock; i--){
+                    const block = await this.getBlock(BlockNumber(i));
+                    if (block) {
+                        blocks.push(block);
+                    }
+                }
             }
-            block = await this.getBlock(block.number - 1);
+            checkpoint = await this.store.getCheckpointData(CheckpointNumber(checkpoint.checkpointNumber - 1));
         }
         return blocks.reverse();
     }
     async getBlockHeadersForEpoch(epochNumber) {
         const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1constants);
         const blocks = [];
-        // Walk the list of blocks backwards and filter by slots matching the requested epoch.
-        // We'll typically ask for blocks for a very recent epoch, so we shouldn't need an index here.
-        let number = await this.store.getSynchedL2BlockNumber();
-        let header = await this.getBlockHeader(number);
-        const slot = (b)=>b.globalVariables.slotNumber.toBigInt();
-        while(header && slot(header) >= start){
-            if (slot(header) <= end) {
-                blocks.push(header);
+        // Walk the list of checkpoints backwards and filter by slots matching the requested epoch.
+        // We'll typically ask for checkpoints for a very recent epoch, so we shouldn't need an index here.
+        let checkpoint = await this.store.getCheckpointData(await this.store.getSynchedCheckpointNumber());
+        const slot = (b)=>b.header.slotNumber;
+        while(checkpoint && slot(checkpoint) >= start){
+            if (slot(checkpoint) <= end) {
+                // push the blocks on backwards
+                const endBlock = checkpoint.startBlock + checkpoint.numBlocks - 1;
+                for(let i = endBlock; i >= checkpoint.startBlock; i--){
+                    const block = await this.getBlockHeader(BlockNumber(i));
+                    if (block) {
+                        blocks.push(block);
+                    }
+                }
             }
-            header = await this.getBlockHeader(--number);
+            checkpoint = await this.store.getCheckpointData(CheckpointNumber(checkpoint.checkpointNumber - 1));
         }
         return blocks.reverse();
     }
     async isEpochComplete(epochNumber) {
         // The epoch is complete if the current L2 block is the last one in the epoch (or later)
         const header = await this.getBlockHeader('latest');
-        const slot = header?.globalVariables.slotNumber.toBigInt();
+        const slot = header ? header.globalVariables.slotNumber : undefined;
         const [_startSlot, endSlot] = getSlotRangeForEpoch(epochNumber, this.l1constants);
         if (slot && slot >= endSlot) {
             return true;
@@ -806,24 +961,43 @@ function mapArchiverConfig(config) {
     /** Returns whether the archiver has completed an initial sync run successfully. */ isInitialSyncComplete() {
         return this.initialSyncComplete;
     }
-    /**
-   * Gets up to `limit` amount of L2 blocks starting from `from`.
-   * @param from - Number of the first block to return (inclusive).
-   * @param limit - The number of blocks to return.
-   * @param proven - If true, only return blocks that have been proven.
-   * @returns The requested L2 blocks.
-   */ getBlocks(from, limit, proven) {
-        return this.getPublishedBlocks(from, limit, proven).then((blocks)=>blocks.map((b)=>b.block));
+    async getCheckpointHeader(number) {
+        if (number === 'latest') {
+            number = await this.getSynchedCheckpointNumber();
+        }
+        if (number === 0) {
+            return undefined;
+        }
+        const checkpoint = await this.store.getCheckpointData(number);
+        if (!checkpoint) {
+            return undefined;
+        }
+        return checkpoint.header;
+    }
+    getCheckpointNumber() {
+        return this.getSynchedCheckpointNumber();
+    }
+    getSynchedCheckpointNumber() {
+        return this.store.getSynchedCheckpointNumber();
     }
-    /** Equivalent to getBlocks but includes publish data. */ async getPublishedBlocks(from, limit, proven) {
-        const limitWithProven = proven ? Math.min(limit, Math.max(await this.store.getProvenL2BlockNumber() - from + 1, 0)) : limit;
-        return limitWithProven === 0 ? [] : await this.store.getPublishedBlocks(from, limitWithProven);
+    getProvenCheckpointNumber() {
+        return this.store.getProvenCheckpointNumber();
     }
-    getPublishedBlockByHash(blockHash) {
-        return this.store.getPublishedBlockByHash(blockHash);
+    setProvenCheckpointNumber(checkpointNumber) {
+        return this.store.setProvenCheckpointNumber(checkpointNumber);
     }
-    getPublishedBlockByArchive(archive) {
-        return this.store.getPublishedBlockByArchive(archive);
+    unwindCheckpoints(from, checkpointsToUnwind) {
+        return this.store.unwindCheckpoints(from, checkpointsToUnwind);
+    }
+    async getLastBlockNumberInCheckpoint(checkpointNumber) {
+        const checkpointData = await this.store.getCheckpointData(checkpointNumber);
+        if (!checkpointData) {
+            return undefined;
+        }
+        return BlockNumber(checkpointData.startBlock + checkpointData.numBlocks - 1);
+    }
+    addCheckpoints(checkpoints, pendingChainValidationStatus) {
+        return this.store.addCheckpoints(checkpoints, pendingChainValidationStatus);
     }
     getBlockHeaderByHash(blockHash) {
         return this.store.getBlockHeaderByHash(blockHash);
@@ -835,7 +1009,7 @@ function mapArchiverConfig(config) {
    * Gets an l2 block.
    * @param number - The block number to return.
    * @returns The requested L2 block.
-   */ async getBlock(number) {
+   */ async getL2BlockNew(number) {
         // If the number provided is -ve, then return the latest block.
         if (number < 0) {
             number = await this.store.getSynchedL2BlockNumber();
@@ -843,8 +1017,8 @@ function mapArchiverConfig(config) {
         if (number === 0) {
             return undefined;
         }
-        const publishedBlock = await this.store.getPublishedBlock(number);
-        return publishedBlock?.block;
+        const publishedBlock = await this.store.store.getBlock(number);
+        return publishedBlock;
     }
     async getBlockHeader(number) {
         if (number === 'latest') {
@@ -856,27 +1030,29 @@ function mapArchiverConfig(config) {
         const headers = await this.store.getBlockHeaders(number, 1);
         return headers.length === 0 ? undefined : headers[0];
     }
+    getCheckpointedBlock(number) {
+        return this.store.getCheckpointedBlock(number);
+    }
+    getCheckpointedBlockByHash(blockHash) {
+        return this.store.getCheckpointedBlockByHash(blockHash);
+    }
+    getProvenBlockNumber() {
+        return this.store.getProvenBlockNumber();
+    }
+    getCheckpointedBlockByArchive(archive) {
+        return this.store.getCheckpointedBlockByArchive(archive);
+    }
     getTxEffect(txHash) {
         return this.store.getTxEffect(txHash);
     }
     getSettledTxReceipt(txHash) {
         return this.store.getSettledTxReceipt(txHash);
     }
-    /**
-   * Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
-   * @param from - The block number from which to begin retrieving logs.
-   * @param limit - The maximum number of blocks to retrieve logs from.
-   * @returns An array of private logs from the specified range of blocks.
-   */ getPrivateLogs(from, limit) {
-        return this.store.getPrivateLogs(from, limit);
+    getPrivateLogsByTags(tags) {
+        return this.store.getPrivateLogsByTags(tags);
     }
-    /**
-   * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-   * @param tags - The tags to filter the logs by.
-   * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
-   * that tag.
-   */ getLogsByTags(tags) {
-        return this.store.getLogsByTags(tags);
+    getPublicLogsByTagsFromContract(contractAddress, tags) {
+        return this.store.getPublicLogsByTagsFromContract(contractAddress, tags);
     }
     /**
    * Gets public logs based on the provided filter.
@@ -894,15 +1070,10 @@ function mapArchiverConfig(config) {
     }
     /**
    * Gets the number of the latest L2 block processed by the block source implementation.
+   * This includes both checkpointed and uncheckpointed blocks.
    * @returns The number of the latest L2 block processed by the block source implementation.
    */ getBlockNumber() {
-        return this.store.getSynchedL2BlockNumber();
-    }
-    getProvenBlockNumber() {
-        return this.store.getProvenL2BlockNumber();
-    }
-    /** Forcefully updates the last proven block number. Use for testing. */ setProvenBlockNumber(blockNumber) {
-        return this.store.setProvenL2BlockNumber(blockNumber);
+        return this.store.getLatestBlockNumber();
     }
     getContractClass(id) {
         return this.store.getContractClass(id);
@@ -922,11 +1093,11 @@ function mapArchiverConfig(config) {
         return this.store.getContractInstance(address, timestamp);
     }
     /**
-   * Gets L1 to L2 message (to be) included in a given block.
-   * @param blockNumber - L2 block number to get messages for.
+   * Gets L1 to L2 message (to be) included in a given checkpoint.
+   * @param checkpointNumber - Checkpoint number to get messages for.
    * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
-   */ getL1ToL2Messages(blockNumber) {
-        return this.store.getL1ToL2Messages(blockNumber);
+   */ getL1ToL2Messages(checkpointNumber) {
+        return this.store.getL1ToL2Messages(checkpointNumber);
     }
     /**
    * Gets the L1 to L2 message index in the L1 to L2 message tree.
@@ -960,7 +1131,7 @@ function mapArchiverConfig(config) {
         // TODO(#13569): Compute proper finalized block number based on L1 finalized block.
         // We just force it 2 epochs worth of proven data for now.
         // NOTE: update end-to-end/src/e2e_epochs/epochs_empty_blocks.test.ts as that uses finalized blocks in computations
-        const finalizedBlockNumber = Math.max(provenBlockNumber - this.l1constants.epochDuration * 2, 0);
+        const finalizedBlockNumber = BlockNumber(Math.max(provenBlockNumber - this.l1constants.epochDuration * 2, 0));
         const [latestBlockHeader, provenBlockHeader, finalizedBlockHeader] = await Promise.all([
             latestBlockNumber > 0 ? this.getBlockHeader(latestBlockNumber) : undefined,
             provenBlockNumber > 0 ? this.getBlockHeader(provenBlockNumber) : undefined,
@@ -975,43 +1146,44 @@ function mapArchiverConfig(config) {
         if (finalizedBlockNumber > 0 && !finalizedBlockHeader) {
             throw new Error(`Failed to retrieve finalized block header for block ${finalizedBlockNumber} (latest block is ${latestBlockNumber})`);
         }
-        const latestBlockHeaderHash = await latestBlockHeader?.hash();
-        const provenBlockHeaderHash = await provenBlockHeader?.hash();
-        const finalizedBlockHeaderHash = await finalizedBlockHeader?.hash();
+        const latestBlockHeaderHash = await latestBlockHeader?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
+        const provenBlockHeaderHash = await provenBlockHeader?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
+        const finalizedBlockHeaderHash = await finalizedBlockHeader?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
         return {
             latest: {
                 number: latestBlockNumber,
-                hash: latestBlockHeaderHash?.toString()
+                hash: latestBlockHeaderHash.toString()
             },
             proven: {
                 number: provenBlockNumber,
-                hash: provenBlockHeaderHash?.toString()
+                hash: provenBlockHeaderHash.toString()
             },
             finalized: {
                 number: finalizedBlockNumber,
-                hash: finalizedBlockHeaderHash?.toString()
+                hash: finalizedBlockHeaderHash.toString()
             }
         };
     }
     async rollbackTo(targetL2BlockNumber) {
+        // TODO(pw/mbps): This still assumes 1 block per checkpoint
         const currentBlocks = await this.getL2Tips();
         const currentL2Block = currentBlocks.latest.number;
         const currentProvenBlock = currentBlocks.proven.number;
-        // const currentFinalizedBlock = currentBlocks.finalized.number;
         if (targetL2BlockNumber >= currentL2Block) {
             throw new Error(`Target L2 block ${targetL2BlockNumber} must be less than current L2 block ${currentL2Block}`);
         }
         const blocksToUnwind = currentL2Block - targetL2BlockNumber;
-        const targetL2Block = await this.store.getPublishedBlock(targetL2BlockNumber);
+        const targetL2Block = await this.store.getCheckpointedBlock(targetL2BlockNumber);
         if (!targetL2Block) {
             throw new Error(`Target L2 block ${targetL2BlockNumber} not found`);
         }
         const targetL1BlockNumber = targetL2Block.l1.blockNumber;
+        const targetCheckpointNumber = CheckpointNumber.fromBlockNumber(targetL2BlockNumber);
         const targetL1BlockHash = await this.getL1BlockHash(targetL1BlockNumber);
-        this.log.info(`Unwinding ${blocksToUnwind} blocks from L2 block ${currentL2Block}`);
-        await this.store.unwindBlocks(currentL2Block, blocksToUnwind);
-        this.log.info(`Unwinding L1 to L2 messages to ${targetL2BlockNumber}`);
-        await this.store.rollbackL1ToL2MessagesToL2Block(targetL2BlockNumber);
+        this.log.info(`Unwinding ${blocksToUnwind} checkpoints from L2 block ${currentL2Block}`);
+        await this.store.unwindCheckpoints(CheckpointNumber(currentL2Block), blocksToUnwind);
+        this.log.info(`Unwinding L1 to L2 messages to checkpoint ${targetCheckpointNumber}`);
+        await this.store.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
         this.log.info(`Setting L1 syncpoints to ${targetL1BlockNumber}`);
         await this.store.setBlockSynchedL1BlockNumber(targetL1BlockNumber);
         await this.store.setMessageSynchedL1Block({
@@ -1020,7 +1192,7 @@ function mapArchiverConfig(config) {
         });
         if (targetL2BlockNumber < currentProvenBlock) {
             this.log.info(`Clearing proven L2 block number`);
-            await this.store.setProvenL2BlockNumber(0);
+            await this.store.setProvenCheckpointNumber(CheckpointNumber.ZERO);
         }
     // TODO(palla/reorg): Set the finalized block when we add support for it.
     // if (targetL2BlockNumber < currentFinalizedBlock) {
@@ -1028,11 +1200,106 @@ function mapArchiverConfig(config) {
     //   await this.store.setFinalizedL2BlockNumber(0);
     // }
     }
+    async getPublishedCheckpoints(checkpointNumber, limit) {
+        const checkpoints = await this.store.getRangeOfCheckpoints(checkpointNumber, limit);
+        const blocks = (await Promise.all(checkpoints.map((ch)=>this.store.getBlocksForCheckpoint(ch.checkpointNumber)))).filter(isDefined);
+        const fullCheckpoints = [];
+        for(let i = 0; i < checkpoints.length; i++){
+            const blocksForCheckpoint = blocks[i];
+            const checkpoint = checkpoints[i];
+            const fullCheckpoint = new Checkpoint(checkpoint.archive, checkpoint.header, blocksForCheckpoint, checkpoint.checkpointNumber);
+            const publishedCheckpoint = new PublishedCheckpoint(fullCheckpoint, checkpoint.l1, checkpoint.attestations.map((x)=>CommitteeAttestation.fromBuffer(x)));
+            fullCheckpoints.push(publishedCheckpoint);
+        }
+        return fullCheckpoints;
+    }
+    async getCheckpointsForEpoch(epochNumber) {
+        const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1constants);
+        const checkpoints = [];
+        // Walk the list of checkpoints backwards and filter by slots matching the requested epoch.
+        // We'll typically ask for checkpoints for a very recent epoch, so we shouldn't need an index here.
+        let checkpointData = await this.store.getCheckpointData(await this.store.getSynchedCheckpointNumber());
+        const slot = (b)=>b.header.slotNumber;
+        while(checkpointData && slot(checkpointData) >= start){
+            if (slot(checkpointData) <= end) {
+                // push the checkpoints on backwards
+                const [checkpoint] = await this.getPublishedCheckpoints(checkpointData.checkpointNumber, 1);
+                checkpoints.push(checkpoint.checkpoint);
+            }
+            checkpointData = await this.store.getCheckpointData(CheckpointNumber(checkpointData.checkpointNumber - 1));
+        }
+        return checkpoints.reverse();
+    }
+    /* Legacy APIs */ async getPublishedBlockByHash(blockHash) {
+        const checkpointedBlock = await this.store.getCheckpointedBlockByHash(blockHash);
+        return this.buildOldBlockFromCheckpointedBlock(checkpointedBlock);
+    }
+    async getPublishedBlockByArchive(archive) {
+        const checkpointedBlock = await this.store.getCheckpointedBlockByArchive(archive);
+        return this.buildOldBlockFromCheckpointedBlock(checkpointedBlock);
+    }
+    /**
+   * Gets up to `limit` amount of L2 blocks starting from `from`.
+   * @param from - Number of the first block to return (inclusive).
+   * @param limit - The number of blocks to return.
+   * @param proven - If true, only return blocks that have been proven.
+   * @returns The requested L2 blocks.
+   */ async getBlocks(from, limit, proven) {
+        const publishedBlocks = await this.getPublishedBlocks(from, limit, proven);
+        return publishedBlocks.map((x)=>x.block);
+    }
+    async getPublishedBlocks(from, limit, proven) {
+        const checkpoints = await this.store.getRangeOfCheckpoints(CheckpointNumber(from), limit);
+        const provenCheckpointNumber = await this.getProvenCheckpointNumber();
+        const blocks = (await Promise.all(checkpoints.map((ch)=>this.store.getBlocksForCheckpoint(ch.checkpointNumber)))).filter(isDefined);
+        const olbBlocks = [];
+        for(let i = 0; i < checkpoints.length; i++){
+            const blockForCheckpoint = blocks[i][0];
+            const checkpoint = checkpoints[i];
+            if (checkpoint.checkpointNumber > provenCheckpointNumber && proven === true) {
+                continue;
+            }
+            const oldCheckpoint = new Checkpoint(blockForCheckpoint.archive, checkpoint.header, [
+                blockForCheckpoint
+            ], checkpoint.checkpointNumber);
+            const oldBlock = L2Block.fromCheckpoint(oldCheckpoint);
+            const publishedBlock = new PublishedL2Block(oldBlock, checkpoint.l1, checkpoint.attestations.map((x)=>CommitteeAttestation.fromBuffer(x)));
+            olbBlocks.push(publishedBlock);
+        }
+        return olbBlocks;
+    }
+    async buildOldBlockFromCheckpointedBlock(checkpointedBlock) {
+        if (!checkpointedBlock) {
+            return undefined;
+        }
+        const checkpoint = await this.store.getCheckpointData(checkpointedBlock.checkpointNumber);
+        if (!checkpoint) {
+            return checkpoint;
+        }
+        const fullCheckpoint = new Checkpoint(checkpointedBlock?.block.archive, checkpoint?.header, [
+            checkpointedBlock.block
+        ], checkpoint.checkpointNumber);
+        const oldBlock = L2Block.fromCheckpoint(fullCheckpoint);
+        const published = new PublishedL2Block(oldBlock, checkpoint.l1, checkpoint.attestations.map((x)=>CommitteeAttestation.fromBuffer(x)));
+        return published;
+    }
+    async getBlock(number) {
+        // If the number provided is -ve, then return the latest block.
+        if (number < 0) {
+            number = await this.store.getSynchedL2BlockNumber();
+        }
+        if (number === 0) {
+            return undefined;
+        }
+        const publishedBlocks = await this.getPublishedBlocks(number, 1);
+        if (publishedBlocks.length === 0) {
+            return undefined;
+        }
+        return publishedBlocks[0].block;
+    }
 }
 _ts_decorate([
-    trackSpan('Archiver.sync', (initialRun)=>({
-            [Attributes.INITIAL_SYNC]: initialRun
-        }))
+    trackSpan('Archiver.sync')
 ], Archiver.prototype, "sync", null);
 var Operation = /*#__PURE__*/ function(Operation) {
     Operation[Operation["Store"] = 0] = "Store";
@@ -1151,6 +1418,18 @@ var Operation = /*#__PURE__*/ function(Operation) {
         }
         return true;
     }
+    async addBlockDataToDB(block) {
+        const contractClassLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
+        // ContractInstancePublished event logs are broadcast in privateLogs.
+        const privateLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
+        const publicLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
+        return (await Promise.all([
+            this.#updatePublishedContractClasses(contractClassLogs, block.number, 0),
+            this.#updateDeployedContractInstances(privateLogs, block.number, 0),
+            this.#updateUpdatedContractInstances(publicLogs, block.header.globalVariables.timestamp, 0),
+            this.#storeBroadcastedIndividualFunctions(contractClassLogs, block.number)
+        ])).every(Boolean);
+    }
     addBlocks(blocks, pendingChainValidationStatus) {
         // Add the blocks to the store. Store will throw if the blocks are not in order, there are gaps,
         // or if the previous block is not in the store.
@@ -1160,34 +1439,51 @@ var Operation = /*#__PURE__*/ function(Operation) {
                 // Update the pending chain validation status if provided
                 pendingChainValidationStatus && this.store.setPendingChainValidationStatus(pendingChainValidationStatus),
                 // Add any logs emitted during the retrieved blocks
-                this.store.addLogs(blocks.map((block)=>block.block)),
+                this.store.addLogs(blocks),
+                // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
+                ...blocks.map((block)=>{
+                    return this.addBlockDataToDB(block);
+                })
+            ]);
+            return opResults.every(Boolean);
+        });
+    }
+    addCheckpoints(checkpoints, pendingChainValidationStatus) {
+        // Add the blocks to the store. Store will throw if the blocks are not in order, there are gaps,
+        // or if the previous block is not in the store.
+        return this.store.transactionAsync(async ()=>{
+            await this.store.addCheckpoints(checkpoints);
+            const allBlocks = checkpoints.flatMap((ch)=>ch.checkpoint.blocks);
+            const opResults = await Promise.all([
+                // Update the pending chain validation status if provided
+                pendingChainValidationStatus && this.store.setPendingChainValidationStatus(pendingChainValidationStatus),
+                // Add any logs emitted during the retrieved blocks
+                this.store.addLogs(allBlocks),
                 // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
-                ...blocks.map(async (block)=>{
-                    const contractClassLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
-                    // ContractInstancePublished event logs are broadcast in privateLogs.
-                    const privateLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
-                    const publicLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
-                    return (await Promise.all([
-                        this.#updatePublishedContractClasses(contractClassLogs, block.block.number, 0),
-                        this.#updateDeployedContractInstances(privateLogs, block.block.number, 0),
-                        this.#updateUpdatedContractInstances(publicLogs, block.block.header.globalVariables.timestamp, 0),
-                        this.#storeBroadcastedIndividualFunctions(contractClassLogs, block.block.number)
-                    ])).every(Boolean);
+                ...allBlocks.map((block)=>{
+                    return this.addBlockDataToDB(block);
                 })
             ]);
             return opResults.every(Boolean);
         });
     }
-    async unwindBlocks(from, blocksToUnwind) {
-        const last = await this.getSynchedL2BlockNumber();
+    async unwindCheckpoints(from, checkpointsToUnwind) {
+        if (checkpointsToUnwind <= 0) {
+            throw new Error(`Cannot unwind ${checkpointsToUnwind} blocks`);
+        }
+        const last = await this.getSynchedCheckpointNumber();
         if (from != last) {
-            throw new Error(`Cannot unwind blocks from block ${from} when the last block is ${last}`);
+            throw new Error(`Cannot unwind checkpoints from checkpoint ${from} when the last checkpoint is ${last}`);
         }
-        if (blocksToUnwind <= 0) {
-            throw new Error(`Cannot unwind ${blocksToUnwind} blocks`);
+        const blocks = [];
+        const lastCheckpointNumber = from + checkpointsToUnwind - 1;
+        for(let checkpointNumber = from; checkpointNumber <= lastCheckpointNumber; checkpointNumber++){
+            const blocksForCheckpoint = await this.store.getBlocksForCheckpoint(checkpointNumber);
+            if (!blocksForCheckpoint) {
+                continue;
+            }
+            blocks.push(...blocksForCheckpoint);
         }
-        // from - blocksToUnwind = the new head, so + 1 for what we need to remove
-        const blocks = await this.getPublishedBlocks(from - blocksToUnwind + 1, blocksToUnwind);
         const opResults = await Promise.all([
             // Prune rolls back to the last proven block, which is by definition valid
             this.store.setPendingChainValidationStatus({
@@ -1195,32 +1491,44 @@ var Operation = /*#__PURE__*/ function(Operation) {
             }),
             // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
             ...blocks.map(async (block)=>{
-                const contractClassLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
+                const contractClassLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
                 // ContractInstancePublished event logs are broadcast in privateLogs.
-                const privateLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
-                const publicLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
+                const privateLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
+                const publicLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
                 return (await Promise.all([
-                    this.#updatePublishedContractClasses(contractClassLogs, block.block.number, 1),
-                    this.#updateDeployedContractInstances(privateLogs, block.block.number, 1),
-                    this.#updateUpdatedContractInstances(publicLogs, block.block.header.globalVariables.timestamp, 1)
+                    this.#updatePublishedContractClasses(contractClassLogs, block.number, 1),
+                    this.#updateDeployedContractInstances(privateLogs, block.number, 1),
+                    this.#updateUpdatedContractInstances(publicLogs, block.header.globalVariables.timestamp, 1)
                 ])).every(Boolean);
             }),
-            this.store.deleteLogs(blocks.map((b)=>b.block)),
-            this.store.unwindBlocks(from, blocksToUnwind)
+            this.store.deleteLogs(blocks),
+            this.store.unwindCheckpoints(from, checkpointsToUnwind)
         ]);
         return opResults.every(Boolean);
     }
-    getPublishedBlocks(from, limit) {
-        return this.store.getPublishedBlocks(from, limit);
+    getCheckpointData(checkpointNumber) {
+        return this.store.getCheckpointData(checkpointNumber);
+    }
+    getRangeOfCheckpoints(from, limit) {
+        return this.store.getRangeOfCheckpoints(from, limit);
     }
-    getPublishedBlock(number) {
-        return this.store.getPublishedBlock(number);
+    getCheckpointedL2BlockNumber() {
+        return this.store.getCheckpointedL2BlockNumber();
     }
-    getPublishedBlockByHash(blockHash) {
-        return this.store.getPublishedBlockByHash(blockHash);
+    getSynchedCheckpointNumber() {
+        return this.store.getSynchedCheckpointNumber();
     }
-    getPublishedBlockByArchive(archive) {
-        return this.store.getPublishedBlockByArchive(archive);
+    setCheckpointSynchedL1BlockNumber(l1BlockNumber) {
+        return this.store.setCheckpointSynchedL1BlockNumber(l1BlockNumber);
+    }
+    getCheckpointedBlock(number) {
+        return this.store.getCheckpointedBlock(number);
+    }
+    getCheckpointedBlockByHash(blockHash) {
+        return this.store.getCheckpointedBlockByHash(blockHash);
+    }
+    getCheckpointedBlockByArchive(archive) {
+        return this.store.getCheckpointedBlockByArchive(archive);
     }
     getBlockHeaders(from, limit) {
         return this.store.getBlockHeaders(from, limit);
@@ -1231,6 +1539,18 @@ var Operation = /*#__PURE__*/ function(Operation) {
     getBlockHeaderByArchive(archive) {
         return this.store.getBlockHeaderByArchive(archive);
     }
+    getBlockByHash(blockHash) {
+        return this.store.getBlockByHash(blockHash);
+    }
+    getBlockByArchive(archive) {
+        return this.store.getBlockByArchive(archive);
+    }
+    getLatestBlockNumber() {
+        return this.store.getLatestBlockNumber();
+    }
+    getBlocksForCheckpoint(checkpointNumber) {
+        return this.store.getBlocksForCheckpoint(checkpointNumber);
+    }
     getTxEffect(txHash) {
         return this.store.getTxEffect(txHash);
     }
@@ -1240,17 +1560,17 @@ var Operation = /*#__PURE__*/ function(Operation) {
     addL1ToL2Messages(messages) {
         return this.store.addL1ToL2Messages(messages);
     }
-    getL1ToL2Messages(blockNumber) {
-        return this.store.getL1ToL2Messages(blockNumber);
+    getL1ToL2Messages(checkpointNumber) {
+        return this.store.getL1ToL2Messages(checkpointNumber);
     }
     getL1ToL2MessageIndex(l1ToL2Message) {
         return this.store.getL1ToL2MessageIndex(l1ToL2Message);
     }
-    getPrivateLogs(from, limit) {
-        return this.store.getPrivateLogs(from, limit);
+    getPrivateLogsByTags(tags) {
+        return this.store.getPrivateLogsByTags(tags);
     }
-    getLogsByTags(tags, logsPerTag) {
-        return this.store.getLogsByTags(tags, logsPerTag);
+    getPublicLogsByTagsFromContract(contractAddress, tags) {
+        return this.store.getPublicLogsByTagsFromContract(contractAddress, tags);
     }
     getPublicLogs(filter) {
         return this.store.getPublicLogs(filter);
@@ -1259,16 +1579,19 @@ var Operation = /*#__PURE__*/ function(Operation) {
         return this.store.getContractClassLogs(filter);
     }
     getSynchedL2BlockNumber() {
-        return this.store.getSynchedL2BlockNumber();
+        return this.store.getCheckpointedL2BlockNumber();
     }
-    getProvenL2BlockNumber() {
-        return this.store.getProvenL2BlockNumber();
+    getProvenCheckpointNumber() {
+        return this.store.getProvenCheckpointNumber();
+    }
+    getProvenBlockNumber() {
+        return this.store.getProvenBlockNumber();
     }
-    setProvenL2BlockNumber(l2BlockNumber) {
-        return this.store.setProvenL2BlockNumber(l2BlockNumber);
+    setProvenCheckpointNumber(checkpointNumber) {
+        return this.store.setProvenCheckpointNumber(checkpointNumber);
     }
     setBlockSynchedL1BlockNumber(l1BlockNumber) {
-        return this.store.setBlockSynchedL1BlockNumber(l1BlockNumber);
+        return this.store.setCheckpointSynchedL1BlockNumber(l1BlockNumber);
     }
     setMessageSynchedL1Block(l1Block) {
         return this.store.setMessageSynchedL1Block(l1Block);
@@ -1300,8 +1623,8 @@ var Operation = /*#__PURE__*/ function(Operation) {
     estimateSize() {
         return this.store.estimateSize();
     }
-    rollbackL1ToL2MessagesToL2Block(targetBlockNumber) {
-        return this.store.rollbackL1ToL2MessagesToL2Block(targetBlockNumber);
+    rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber) {
+        return this.store.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
     }
     iterateL1ToL2Messages(range = {}) {
         return this.store.iterateL1ToL2Messages(range);