@aztec/archiver 0.0.0-test.0 → 0.0.1-commit.21caa21

package/dest/archiver/archiver.js

@@ -4,27 +4,40 @@ 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 { createEthereumChain } from '@aztec/ethereum';
+import { EpochCache } from '@aztec/epoch-cache';
+import { BlockTagTooOldError, InboxContract, RollupContract, createEthereumChain } from '@aztec/ethereum';
+import { maxBigint } from '@aztec/foundation/bigint';
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { merge, pick } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
+import { promiseWithResolvers } from '@aztec/foundation/promise';
 import { RunningPromise, makeLoggingErrorHandler } from '@aztec/foundation/running-promise';
 import { count } from '@aztec/foundation/string';
-import { elapsed } from '@aztec/foundation/timer';
-import { InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
-import { ContractClassRegisteredEvent, PrivateFunctionBroadcastedEvent, UnconstrainedFunctionBroadcastedEvent } from '@aztec/protocol-contracts/class-registerer';
-import { ContractInstanceDeployedEvent, ContractInstanceUpdatedEvent } from '@aztec/protocol-contracts/instance-deployer';
-import { L2BlockSourceEvents } from '@aztec/stdlib/block';
-import { computePublicBytecodeCommitment, isValidPrivateFunctionMembershipProof, isValidUnconstrainedFunctionMembershipProof } from '@aztec/stdlib/contract';
+import { DateProvider, Timer, elapsed } from '@aztec/foundation/timer';
+import { ContractClassPublishedEvent, PrivateFunctionBroadcastedEvent, UtilityFunctionBroadcastedEvent } from '@aztec/protocol-contracts/class-registry';
+import { ContractInstancePublishedEvent, ContractInstanceUpdatedEvent } from '@aztec/protocol-contracts/instance-registry';
+import { L2Block, L2BlockSourceEvents, PublishedL2Block } from '@aztec/stdlib/block';
+import { computePublicBytecodeCommitment, isValidPrivateFunctionMembershipProof, isValidUtilityFunctionMembershipProof } from '@aztec/stdlib/contract';
 import { getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getSlotRangeForEpoch, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
-import { Attributes, trackSpan } from '@aztec/telemetry-client';
+import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { EventEmitter } from 'events';
 import groupBy from 'lodash.groupby';
-import { createPublicClient, fallback, getContract, http } from 'viem';
-import { retrieveBlocksFromRollup, retrieveL1ToL2Messages } from './data_retrieval.js';
-import { NoBlobBodiesFoundError } from './errors.js';
+import { createPublicClient, fallback, http } from 'viem';
+import { retrieveCheckpointsFromRollup, retrieveL1ToL2Message, retrieveL1ToL2Messages, retrievedToPublishedCheckpoint } from './data_retrieval.js';
+import { InitialBlockNumberNotSequentialError, NoBlobBodiesFoundError } from './errors.js';
 import { ArchiverInstrumentation } from './instrumentation.js';
+import { validateCheckpointAttestations } from './validation.js';
+function mapArchiverConfig(config) {
+    return {
+        pollingIntervalMs: config.archiverPollingIntervalMS,
+        batchSize: config.archiverBatchSize,
+        skipValidateBlockAttestations: config.skipValidateBlockAttestations,
+        maxAllowedEthClientDriftSeconds: config.maxAllowedEthClientDriftSeconds
+    };
+}
 /**
- * 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 {
@@ -33,17 +46,19 @@ import { ArchiverInstrumentation } from './instrumentation.js';
     dataStore;
     config;
     blobSinkClient;
+    epochCache;
+    dateProvider;
     instrumentation;
     l1constants;
     log;
-    /**
-   * A promise 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;
     l1BlockNumber;
     l1Timestamp;
+    initialSyncComplete;
+    initialSyncPromise;
     tracer;
     /**
    * Creates a new instance of the Archiver.
@@ -54,20 +69,16 @@ import { ArchiverInstrumentation } from './instrumentation.js';
    * @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, instrumentation, l1constants, log = createLogger('archiver')){
-        super(), this.publicClient = publicClient, this.l1Addresses = l1Addresses, this.dataStore = dataStore, this.config = config, this.blobSinkClient = blobSinkClient, this.instrumentation = instrumentation, this.l1constants = l1constants, this.log = log;
+   */ constructor(publicClient, l1Addresses, dataStore, config, blobSinkClient, epochCache, dateProvider, 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.dateProvider = dateProvider, this.instrumentation = instrumentation, this.l1constants = l1constants, this.log = log, this.initialSyncComplete = false;
         this.tracer = instrumentation.tracer;
         this.store = new ArchiverStoreHelper(dataStore);
-        this.rollup = getContract({
-            address: l1Addresses.rollupAddress.toString(),
-            abi: RollupAbi,
-            client: publicClient
-        });
-        this.inbox = getContract({
-            address: l1Addresses.inboxAddress.toString(),
-            abi: InboxAbi,
-            client: publicClient
-        });
+        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.
@@ -82,56 +93,88 @@ import { ArchiverInstrumentation } from './instrumentation.js';
             transport: fallback(config.l1RpcUrls.map((url)=>http(url))),
             pollingInterval: config.viemPollingIntervalMS
         });
-        const rollup = getContract({
-            address: config.l1Contracts.rollupAddress.toString(),
-            abi: RollupAbi,
-            client: publicClient
-        });
-        const [l1StartBlock, l1GenesisTime] = await Promise.all([
-            rollup.read.L1_BLOCK_AT_GENESIS(),
-            rollup.read.getGenesisTime()
+        const rollup = new RollupContract(publicClient, config.l1Contracts.rollupAddress);
+        const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot] = await Promise.all([
+            rollup.getL1StartBlock(),
+            rollup.getL1GenesisTime(),
+            rollup.getProofSubmissionEpochs(),
+            rollup.getGenesisArchiveTreeRoot()
         ]);
+        const l1StartBlockHash = await publicClient.getBlock({
+            blockNumber: l1StartBlock,
+            includeTransactions: false
+        }).then((block)=>Buffer32.fromString(block.hash));
         const { aztecEpochDuration: epochDuration, aztecSlotDuration: slotDuration, ethereumSlotDuration } = config;
-        const archiver = new Archiver(publicClient, config.l1Contracts, archiverStore, {
-            pollingIntervalMs: config.archiverPollingIntervalMS ?? 10_000,
-            batchSize: config.archiverBatchSize ?? 100
-        }, deps.blobSinkClient, await ArchiverInstrumentation.new(deps.telemetry, ()=>archiverStore.estimateSize()), {
+        const l1Constants = {
+            l1StartBlockHash,
             l1StartBlock,
             l1GenesisTime,
             epochDuration,
             slotDuration,
-            ethereumSlotDuration
-        });
+            ethereumSlotDuration,
+            proofSubmissionEpochs: Number(proofSubmissionEpochs),
+            genesisArchiveRoot: Fr.fromHexString(genesisArchiveRoot)
+        };
+        const opts = merge({
+            pollingIntervalMs: 10_000,
+            batchSize: 100,
+            maxAllowedEthClientDriftSeconds: 300
+        }, 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, deps.dateProvider ?? new DateProvider(), await ArchiverInstrumentation.new(telemetry, ()=>archiverStore.estimateSize()), l1Constants);
         await archiver.start(blockUntilSynced);
         return archiver;
     }
+    /** Updates archiver config */ updateConfig(newConfig) {
+        this.config = merge(this.config, mapArchiverConfig(newConfig));
+    }
     /**
    * 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.testEthereumNodeSynced();
+        // Log initial state for the archiver
+        const { l1StartBlock } = this.l1constants;
+        const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = l1StartBlock } = await this.store.getSynchPoint();
+        const currentL2Block = await this.getBlockNumber();
+        this.log.info(`Starting archiver sync to rollup contract ${this.l1Addresses.rollupAddress.toString()} from L1 block ${blocksSynchedTo} and L2 block ${currentL2Block}`, {
+            blocksSynchedTo,
+            messagesSynchedTo,
+            currentL2Block
+        });
+        // Start sync loop, and return the wait for initial sync if we are asked to block until synced
+        this.runningPromise.start();
         if (blockUntilSynced) {
-            await this.syncSafe(blockUntilSynced);
+            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();
     }
-    async syncSafe(initialRun) {
-        try {
-            await this.sync(initialRun);
-        } catch (error) {
-            this.log.error('Error during sync', {
-                error
-            });
+    syncImmediate() {
+        return this.runningPromise.trigger();
+    }
+    waitForInitialSync() {
+        return this.initialSyncPromise.promise;
+    }
+    /** 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 sync() {
         /**
      * We keep track of three "pointers" to L1 blocks:
      * 1. the last L1 block that published an L2 block
@@ -141,14 +184,22 @@ import { ArchiverInstrumentation } from './instrumentation.js';
      * 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 } = this.l1constants;
-        const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = l1StartBlock } = await this.store.getSynchPoint();
-        const currentL1BlockNumber = await this.publicClient.getBlockNumber();
-        if (initialRun) {
-            this.log.info(`Starting archiver sync to rollup contract ${this.l1Addresses.rollupAddress.toString()} from L1 block ${Math.min(Number(blocksSynchedTo), Number(messagesSynchedTo))} to current L1 block ${currentL1BlockNumber}`);
-        }
+     */ const { l1StartBlock, l1StartBlockHash } = this.l1constants;
+        const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = {
+            l1BlockNumber: l1StartBlock,
+            l1BlockHash: l1StartBlockHash
+        } } = await this.store.getSynchPoint();
+        const currentL1Block = await this.publicClient.getBlock({
+            includeTransactions: false
+        });
+        const currentL1BlockNumber = currentL1Block.number;
+        const currentL1BlockHash = Buffer32.fromString(currentL1Block.hash);
+        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
@@ -166,64 +217,112 @@ import { ArchiverInstrumentation } from './instrumentation.js';
      * data up to the currentBlockNumber captured at the top of this function. We might want to improve on this
      * in future but for the time being it should give us the guarantees that we need
      */ // ********** Events that are processed per L1 block **********
-        await this.handleL1ToL2Messages(messagesSynchedTo, currentL1BlockNumber);
-        // Store latest l1 block number and timestamp seen. Used for epoch and slots calculations.
-        if (!this.l1BlockNumber || this.l1BlockNumber < currentL1BlockNumber) {
-            this.l1Timestamp = (await this.publicClient.getBlock({
-                blockNumber: currentL1BlockNumber
-            })).timestamp;
-            this.l1BlockNumber = currentL1BlockNumber;
-        }
-        // ********** Events that are processed per L2 block **********
+        await this.handleL1ToL2Messages(messagesSynchedTo, currentL1BlockNumber, currentL1BlockHash);
+        // Get L1 timestamp for the current block
+        const currentL1Timestamp = !this.l1Timestamp || !this.l1BlockNumber || this.l1BlockNumber !== currentL1BlockNumber ? (await this.publicClient.getBlock({
+            blockNumber: currentL1BlockNumber
+        })).timestamp : this.l1Timestamp;
+        // 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
-            const { provenBlockNumber } = await this.handleL2blocks(blocksSynchedTo, currentL1BlockNumber);
-            // And 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
+            // 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 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.
-            await this.handleEpochPrune(provenBlockNumber, currentL1BlockNumber);
+            // 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.setBlockSynchedL1BlockNumber(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 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.checkForNewCheckpointsBeforeL1SyncPoint(rollupStatus, blocksSynchedTo, currentL1BlockNumber);
+            }
             this.instrumentation.updateL1BlockHeight(currentL1BlockNumber);
         }
-        if (initialRun) {
-            this.log.info(`Initial archiver sync to L1 block ${currentL1BlockNumber} complete.`, {
+        // After syncing has completed, update the current l1 block number and timestamp,
+        // otherwise we risk announcing to the world that we've synced to a given point,
+        // but the corresponding blocks have not been processed (see #12631).
+        this.l1Timestamp = currentL1Timestamp;
+        this.l1BlockNumber = currentL1BlockNumber;
+        // 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();
         }
     }
-    /** Queries the rollup contract on whether a prune can be executed on the immediatenext L1 block. */ async canPrune(currentL1BlockNumber) {
-        const time = (this.l1Timestamp ?? 0n) + BigInt(this.l1constants.ethereumSlotDuration);
-        return await this.rollup.read.canPruneAtTime([
-            time
-        ], {
+    /** 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, {
             blockNumber: currentL1BlockNumber
         });
+        if (result) {
+            this.log.debug(`Rollup contract allows pruning at L1 block ${currentL1BlockNumber} time ${time}`, {
+                currentL1Timestamp,
+                pruneTime: time,
+                currentL1BlockNumber
+            });
+        }
+        return result;
     }
-    /** Checks if there'd be a reorg for the next block submission and start pruning now. */ async handleEpochPrune(provenBlockNumber, currentL1BlockNumber) {
-        const localPendingBlockNumber = BigInt(await this.getBlockNumber());
-        const canPrune = localPendingBlockNumber > provenBlockNumber && await this.canPrune(currentL1BlockNumber);
+    /** 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 localPendingCheckpointNumber = await this.getSynchedCheckpointNumber();
+        const canPrune = localPendingCheckpointNumber > provenCheckpointNumber && rollupCanPrune;
         if (canPrune) {
-            const localPendingSlotNumber = await this.getL2SlotNumber();
-            const localPendingEpochNumber = getEpochAtSlot(localPendingSlotNumber, this.l1constants);
+            const timer = new Timer();
+            const pruneFrom = provenCheckpointNumber + 1;
+            const header = await this.getCheckpointHeader(Number(pruneFrom));
+            if (header === undefined) {
+                throw new Error(`Missing checkpoint header ${pruneFrom}`);
+            }
+            const pruneFromSlotNumber = header.slotNumber;
+            const pruneFromEpochNumber = getEpochAtSlot(pruneFromSlotNumber, this.l1constants);
+            const checkpointsToUnwind = localPendingCheckpointNumber - provenCheckpointNumber;
+            const checkpoints = await this.getCheckpoints(Number(provenCheckpointNumber) + 1, Number(checkpointsToUnwind));
             // Emit an event for listening services to react to the chain prune
             this.emit(L2BlockSourceEvents.L2PruneDetected, {
                 type: L2BlockSourceEvents.L2PruneDetected,
-                blockNumber: localPendingBlockNumber,
-                slotNumber: localPendingSlotNumber,
-                epochNumber: localPendingEpochNumber
+                epochNumber: pruneFromEpochNumber,
+                blocks: checkpoints.flatMap((c)=>L2Block.fromCheckpoint(c))
             });
-            const blocksToUnwind = localPendingBlockNumber - provenBlockNumber;
-            this.log.debug(`L2 prune from ${provenBlockNumber + 1n} 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.instrumentation.processPrune();
+            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.
         // await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
         }
+        return {
+            rollupCanPrune
+        };
     }
     nextRange(end, limit) {
         const batchSize = this.config.batchSize * this.l1constants.slotDuration / this.l1constants.ethereumSlotDuration;
@@ -240,167 +339,431 @@ import { ArchiverInstrumentation } from './instrumentation.js';
             nextEnd
         ];
     }
-    async handleL1ToL2Messages(messagesSynchedTo, currentL1BlockNumber) {
-        this.log.trace(`Handling L1 to L2 messages from ${messagesSynchedTo} to ${currentL1BlockNumber}.`);
-        if (currentL1BlockNumber <= messagesSynchedTo) {
+    async handleL1ToL2Messages(messagesSyncPoint, currentL1BlockNumber, _currentL1BlockHash) {
+        this.log.trace(`Handling L1 to L2 messages from ${messagesSyncPoint.l1BlockNumber} to ${currentL1BlockNumber}.`);
+        if (currentL1BlockNumber <= messagesSyncPoint.l1BlockNumber) {
             return;
         }
-        const localTotalMessageCount = await this.store.getTotalL1ToL2MessageCount();
-        const destinationTotalMessageCount = await this.inbox.read.totalMessagesInserted();
-        if (localTotalMessageCount === destinationTotalMessageCount) {
-            await this.store.setMessageSynchedL1BlockNumber(currentL1BlockNumber);
-            this.log.trace(`Retrieved no new L1 to L2 messages between L1 blocks ${messagesSynchedTo + 1n} and ${currentL1BlockNumber}.`);
+        // Load remote and local inbox states.
+        const localMessagesInserted = await this.store.getTotalL1ToL2MessageCount();
+        const localLastMessage = await this.store.getLastL1ToL2Message();
+        const remoteMessagesState = await this.inbox.getState({
+            blockNumber: currentL1BlockNumber
+        });
+        this.log.trace(`Retrieved remote inbox state at L1 block ${currentL1BlockNumber}.`, {
+            localMessagesInserted,
+            localLastMessage,
+            remoteMessagesState
+        });
+        // 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.trace(`No L1 to L2 messages to query between L1 blocks ${messagesSyncPoint.l1BlockNumber} and ${currentL1BlockNumber}.`);
             return;
         }
-        // Retrieve messages in batches. Each batch is estimated to acommodate up to L2 'blockBatchSize' blocks,
-        let searchStartBlock = messagesSynchedTo;
-        let searchEndBlock = messagesSynchedTo;
+        // Check if our syncpoint is still valid. If not, there was an L1 reorg and we need to re-retrieve messages.
+        // Note that we need to fetch it from logs and not from inbox state at the syncpoint l1 block number, since it
+        // could be older than 128 blocks and non-archive nodes cannot resolve it.
+        if (localLastMessage) {
+            const remoteLastMessage = await this.retrieveL1ToL2Message(localLastMessage.leaf);
+            this.log.trace(`Retrieved remote message for local last`, {
+                remoteLastMessage,
+                localLastMessage
+            });
+            if (!remoteLastMessage || !remoteLastMessage.rollingHash.equals(localLastMessage.rollingHash)) {
+                this.log.warn(`Rolling back L1 to L2 messages due to hash mismatch or msg not found.`, {
+                    remoteLastMessage,
+                    messagesSyncPoint,
+                    localLastMessage
+                });
+                messagesSyncPoint = await this.rollbackL1ToL2Messages(localLastMessage, messagesSyncPoint);
+                this.log.debug(`Rolled back L1 to L2 messages to L1 block ${messagesSyncPoint.l1BlockNumber}.`, {
+                    messagesSyncPoint
+                });
+            }
+        }
+        // Retrieve and save messages in batches. Each batch is estimated to acommodate up to L2 'blockBatchSize' blocks,
+        let searchStartBlock = 0n;
+        let searchEndBlock = messagesSyncPoint.l1BlockNumber;
+        let lastMessage;
+        let messageCount = 0;
         do {
             [searchStartBlock, searchEndBlock] = this.nextRange(searchEndBlock, currentL1BlockNumber);
             this.log.trace(`Retrieving L1 to L2 messages between L1 blocks ${searchStartBlock} and ${searchEndBlock}.`);
-            const retrievedL1ToL2Messages = await retrieveL1ToL2Messages(this.inbox, searchStartBlock, searchEndBlock);
-            this.log.verbose(`Retrieved ${retrievedL1ToL2Messages.retrievedData.length} new L1 to L2 messages between L1 blocks ${searchStartBlock} and ${searchEndBlock}.`);
-            await this.store.addL1ToL2Messages(retrievedL1ToL2Messages);
-            for (const msg of retrievedL1ToL2Messages.retrievedData){
+            const messages = await retrieveL1ToL2Messages(this.inbox.getContract(), searchStartBlock, searchEndBlock);
+            this.log.verbose(`Retrieved ${messages.length} new L1 to L2 messages between L1 blocks ${searchStartBlock} and ${searchEndBlock}.`);
+            const timer = new Timer();
+            await this.store.addL1ToL2Messages(messages);
+            const perMsg = timer.ms() / messages.length;
+            this.instrumentation.processNewMessages(messages.length, perMsg);
+            for (const msg of messages){
                 this.log.debug(`Downloaded L1 to L2 message`, {
-                    leaf: msg.leaf.toString(),
-                    index: msg.index
+                    ...msg,
+                    leaf: msg.leaf.toString()
                 });
+                lastMessage = msg;
+                messageCount++;
             }
         }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}`, {
+                lastMessage,
+                messageCount
+            });
+        }
+        // Warn if the resulting rolling hash does not match the remote state we had retrieved.
+        if (lastMessage && !lastMessage.rollingHash.equals(remoteMessagesState.messagesRollingHash)) {
+            this.log.warn(`Last message retrieved rolling hash does not match remote state.`, {
+                lastMessage,
+                remoteMessagesState
+            });
+        }
     }
-    async handleL2blocks(blocksSynchedTo, currentL1BlockNumber) {
-        const localPendingBlockNumber = BigInt(await this.getBlockNumber());
-        const [provenBlockNumber, provenArchive, pendingBlockNumber, pendingArchive, archiveForLocalPendingBlockNumber] = await this.rollup.read.status([
-            localPendingBlockNumber
-        ], {
+    async retrieveL1ToL2Message(leaf) {
+        const currentL1BlockNumber = await this.publicClient.getBlockNumber();
+        let searchStartBlock = 0n;
+        let searchEndBlock = this.l1constants.l1StartBlock - 1n;
+        do {
+            [searchStartBlock, searchEndBlock] = this.nextRange(searchEndBlock, currentL1BlockNumber);
+            const message = await retrieveL1ToL2Message(this.inbox.getContract(), leaf, searchStartBlock, searchEndBlock);
+            if (message) {
+                return message;
+            }
+        }while (searchEndBlock < currentL1BlockNumber)
+        return undefined;
+    }
+    async rollbackL1ToL2Messages(localLastMessage, messagesSyncPoint) {
+        // Slowly go back through our messages until we find the last common message.
+        // We could query the logs in batch as an optimization, but the depth of the reorg should not be deep, and this
+        // is a very rare case, so it's fine to query one log at a time.
+        let commonMsg;
+        this.log.verbose(`Searching most recent common L1 to L2 message at or before index ${localLastMessage.index}`);
+        for await (const msg of this.store.iterateL1ToL2Messages({
+            reverse: true,
+            end: localLastMessage.index
+        })){
+            const remoteMsg = await this.retrieveL1ToL2Message(msg.leaf);
+            const logCtx = {
+                remoteMsg,
+                localMsg: msg
+            };
+            if (remoteMsg && remoteMsg.rollingHash.equals(msg.rollingHash)) {
+                this.log.verbose(`Found most recent common L1 to L2 message at index ${msg.index} on L1 block ${msg.l1BlockNumber}`, logCtx);
+                commonMsg = remoteMsg;
+                break;
+            } else if (remoteMsg) {
+                this.log.debug(`Local L1 to L2 message with index ${msg.index} has different rolling hash`, logCtx);
+            } else {
+                this.log.debug(`Local L1 to L2 message with index ${msg.index} not found on L1`, logCtx);
+            }
+        }
+        // Delete everything after the common message we found.
+        const lastGoodIndex = commonMsg?.index;
+        this.log.warn(`Deleting all local L1 to L2 messages after index ${lastGoodIndex ?? 'undefined'}`);
+        await this.store.removeL1ToL2Messages(lastGoodIndex !== undefined ? lastGoodIndex + 1n : 0n);
+        // Update the syncpoint so the loop below reprocesses the changed messages. We go to the block before
+        // the last common one, so we force reprocessing it, in case new messages were added on that same L1 block
+        // after the last common message.
+        const syncPointL1BlockNumber = commonMsg ? commonMsg.l1BlockNumber - 1n : this.l1constants.l1StartBlock;
+        const syncPointL1BlockHash = await this.getL1BlockHash(syncPointL1BlockNumber);
+        messagesSyncPoint = {
+            l1BlockNumber: syncPointL1BlockNumber,
+            l1BlockHash: syncPointL1BlockHash
+        };
+        await this.store.setMessageSynchedL1Block(messagesSyncPoint);
+        return messagesSyncPoint;
+    }
+    async getL1BlockHash(l1BlockNumber) {
+        const block = await this.publicClient.getBlock({
+            blockNumber: l1BlockNumber,
+            includeTransactions: false
+        });
+        if (!block) {
+            throw new Error(`Missing L1 block ${l1BlockNumber}`);
+        }
+        return Buffer32.fromString(block.hash);
+    }
+    async handleCheckpoints(blocksSynchedTo, currentL1BlockNumber) {
+        const localPendingCheckpointNumber = await this.getSynchedCheckpointNumber();
+        const initialValidationResult = await this.store.getPendingChainValidationStatus();
+        const [rollupProvenCheckpointNumber, provenArchive, rollupPendingCheckpointNumber, pendingArchive, archiveForLocalPendingCheckpointNumber] = await this.rollup.status(BigInt(localPendingCheckpointNumber), {
             blockNumber: currentL1BlockNumber
         });
-        const updateProvenBlock = async ()=>{
-            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 provenCheckpointNumber = Number(rollupProvenCheckpointNumber);
+        const pendingCheckpointNumber = Number(rollupPendingCheckpointNumber);
+        const rollupStatus = {
+            provenCheckpointNumber,
+            provenArchive,
+            pendingCheckpointNumber,
+            pendingArchive,
+            validationResult: initialValidationResult
+        };
+        this.log.trace(`Retrieved rollup status at current L1 block ${currentL1BlockNumber}.`, {
+            localPendingCheckpointNumber,
+            blocksSynchedTo,
+            currentL1BlockNumber,
+            archiveForLocalPendingCheckpointNumber,
+            ...rollupStatus
+        });
+        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
+                    });
+                }
             }
-            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
+            const localCheckpointForDestinationProvenCheckpointNumber = await this.getCheckpoint(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.number) {
+                this.log.error(`Hit local checkpoint greater than last synched checkpoint: ${localCheckpointForDestinationProvenCheckpointNumber.number} > ${synched}`);
+            }
+            this.log.trace(`Local checkpoint for remote proven checkpoint ${provenCheckpointNumber} is ${localCheckpointForDestinationProvenCheckpointNumber?.archive.root.toString() ?? 'undefined'}`);
+            const lastProvenBlockNumber = await this.getLastBlockNumberInCheckpoint(provenCheckpointNumber);
+            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 = localCheckpointForDestinationProvenCheckpointNumber.header.slotNumber;
+                    const provenEpochNumber = getEpochAtSlot(provenSlotNumber, this.l1constants);
+                    this.emit(L2BlockSourceEvents.L2BlockProven, {
+                        type: L2BlockSourceEvents.L2BlockProven,
+                        blockNumber: BigInt(lastProvenBlockNumber),
+                        slotNumber: provenSlotNumber,
+                        epochNumber: provenEpochNumber
                     });
+                } else {
+                    this.log.trace(`Proven checkpoint ${provenCheckpointNumber} already stored.`);
                 }
             }
-            this.instrumentation.updateLastProvenBlock(Number(provenBlockNumber));
+            this.instrumentation.updateLastProvenBlock(lastProvenBlockNumber);
         };
-        // 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 === 0n && pendingBlockNumber === 0n;
-        if (noBlocks) {
+        // 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.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
-            this.log.debug(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
-            return {
-                provenBlockNumber
-            };
+            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(Number(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.getCheckpoint(localPendingCheckpointNumber);
+            if (localPendingCheckpoint === undefined) {
+                throw new Error(`Missing checkpoint ${localPendingCheckpointNumber}`);
             }
-            const noBlockSinceLast = localPendingBlock && pendingArchive === localPendingBlock.archive.root.toString();
-            if (noBlockSinceLast) {
-                await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
-                this.log.debug(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
-                return {
-                    provenBlockNumber
-                };
+            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 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 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 checkpoints to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
+                return rollupStatus;
             }
-            const localPendingBlockInChain = archiveForLocalPendingBlockNumber === localPendingBlock.archive.root.toString();
-            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.`);
-                let tipAfterUnwind = 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,
+                    archiveForLocalPendingCheckpointNumber
+                });
+                let tipAfterUnwind = localPendingCheckpointNumber;
                 while(true){
-                    const candidateBlock = await this.getBlock(Number(tipAfterUnwind));
-                    if (candidateBlock === undefined) {
+                    const candidateCheckpoint = await this.getCheckpoint(tipAfterUnwind);
+                    if (candidateCheckpoint === undefined) {
                         break;
                     }
-                    const archiveAtContract = await this.rollup.read.archiveAt([
-                        BigInt(candidateBlock.number)
-                    ]);
-                    if (archiveAtContract === candidateBlock.archive.root.toString()) {
+                    const archiveAtContract = await this.rollup.archiveAt(BigInt(candidateCheckpoint.number));
+                    this.log.trace(`Checking local checkpoint ${candidateCheckpoint.number} 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 acommodate 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 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): Retreive from blob sink then from consensus client, then from peers
-            const retrievedBlocks = await retrieveBlocksFromRollup(this.rollup, 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 sink then from consensus client, then from peers
+            const retrievedCheckpoints = await retrieveCheckpointsFromRollup(this.rollup.getContract(), this.publicClient, this.blobSinkClient, searchStartBlock, searchEndBlock, this.log);
+            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}.`);
-            for (const block of retrievedBlocks){
-                this.log.debug(`Ingesting new L2 block ${block.data.number} with ${block.data.body.txEffects.length} txs`, {
-                    blockHash: block.data.hash(),
-                    l1BlockNumber: block.l1.blockNumber,
-                    ...block.data.header.globalVariables.toInspect(),
-                    ...block.data.getStats()
+            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 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 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 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
+                    this.emit(L2BlockSourceEvents.InvalidAttestationsBlockDetected, {
+                        type: L2BlockSourceEvents.InvalidAttestationsBlockDetected,
+                        validationResult
+                    });
+                    continue;
+                }
+                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())
                 });
             }
-            const [processDuration] = await elapsed(()=>this.store.addBlocks(retrievedBlocks));
-            this.instrumentation.processNewBlocks(processDuration / retrievedBlocks.length, retrievedBlocks.map((b)=>b.data));
-            for (const block of retrievedBlocks){
-                this.log.info(`Downloaded L2 block ${block.data.number}`, {
-                    blockHash: block.data.hash(),
-                    blockNumber: block.data.number,
-                    txCount: block.data.body.txEffects.length,
-                    globalVariables: block.data.header.globalVariables.toInspect()
+            try {
+                const updatedValidationResult = rollupStatus.validationResult === initialValidationResult ? undefined : rollupStatus.validationResult;
+                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;
+                    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,
+                        updatedL1SyncPoint
+                    });
+                }
+                throw err;
+            }
+            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
                 });
             }
+            lastRetrievedCheckpoint = validCheckpoints.at(-1) ?? lastRetrievedCheckpoint;
+            lastL1BlockWithCheckpoint = publishedCheckpoints.at(-1)?.l1.blockNumber ?? lastL1BlockWithCheckpoint;
         }while (searchEndBlock < currentL1BlockNumber)
         // Important that we update AFTER inserting the blocks.
-        await updateProvenBlock();
+        await updateProvenCheckpoint();
         return {
-            provenBlockNumber
+            ...rollupStatus,
+            lastRetrievedCheckpoint,
+            lastL1BlockWithCheckpoint
         };
     }
+    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 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 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).
+            const latestLocalCheckpoint = lastRetrievedCheckpoint ?? (latestLocalCheckpointNumber > 0 ? await this.getPublishedCheckpoints(latestLocalCheckpointNumber, 1).then(([c])=>c) : undefined);
+            const targetL1BlockNumber = latestLocalCheckpoint?.l1.blockNumber ?? maxBigint(currentL1BlockNumber - 64n, 0n);
+            const latestLocalCheckpointArchive = latestLocalCheckpoint?.checkpoint.archive.root.toString();
+            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 checkpoints behind L1 sync point to retrieve.`, {
+                latestLocalCheckpointNumber,
+                pendingCheckpointNumber
+            });
+        }
+    }
+    /** Resumes the archiver after a stop. */ resume() {
+        if (this.runningPromise.isRunning()) {
+            this.log.warn(`Archiver already running`);
+        }
+        this.log.info(`Restarting archiver`);
+        this.runningPromise.start();
+    }
     /**
    * Stops the archiver.
    * @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();
     }
+    backupTo(destPath) {
+        return this.dataStore.backupTo(destPath);
+    }
     getL1Constants() {
         return Promise.resolve(this.l1constants);
     }
+    getGenesisValues() {
+        return Promise.resolve({
+            genesisArchiveRoot: this.l1constants.genesisArchiveRoot
+        });
+    }
     getRollupAddress() {
         return Promise.resolve(this.l1Addresses.rollupAddress);
     }
@@ -408,24 +771,16 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         return Promise.resolve(this.l1Addresses.registryAddress);
     }
     getL1BlockNumber() {
-        const l1BlockNumber = this.l1BlockNumber;
-        if (!l1BlockNumber) {
-            throw new Error('L1 block number not yet available. Complete an initial sync first.');
-        }
-        return l1BlockNumber;
+        return this.l1BlockNumber;
     }
     getL1Timestamp() {
-        const l1Timestamp = this.l1Timestamp;
-        if (!l1Timestamp) {
-            throw new Error('L1 timestamp not yet available. Complete an initial sync first.');
-        }
-        return l1Timestamp;
+        return Promise.resolve(this.l1Timestamp);
     }
     getL2SlotNumber() {
-        return Promise.resolve(getSlotAtTimestamp(this.getL1Timestamp(), this.l1constants));
+        return Promise.resolve(this.l1Timestamp === undefined ? undefined : getSlotAtTimestamp(this.l1Timestamp, this.l1constants));
     }
     getL2EpochNumber() {
-        return Promise.resolve(getEpochNumberAtTimestamp(this.getL1Timestamp(), this.l1constants));
+        return Promise.resolve(this.l1Timestamp === undefined ? undefined : getEpochNumberAtTimestamp(this.l1Timestamp, this.l1constants));
     }
     async getBlocksForEpoch(epochNumber) {
         const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1constants);
@@ -433,7 +788,7 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         // 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();
+        const slot = (b)=>b.header.globalVariables.slotNumber;
         while(block && slot(block) >= start){
             if (slot(block) <= end) {
                 blocks.push(block);
@@ -442,10 +797,26 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         }
         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;
+        while(header && slot(header) >= start){
+            if (slot(header) <= end) {
+                blocks.push(header);
+            }
+            header = await this.getBlockHeader(--number);
+        }
+        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;
@@ -466,15 +837,87 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         const leeway = 1n;
         return l1Timestamp + leeway >= endTimestamp;
     }
+    /** Returns whether the archiver has completed an initial sync run successfully. */ isInitialSyncComplete() {
+        return this.initialSyncComplete;
+    }
+    async getPublishedCheckpoints(from, limit, proven) {
+        const blocks = await this.getPublishedBlocks(from, limit, proven);
+        return blocks.map((b)=>b.toPublishedCheckpoint());
+    }
+    async getCheckpoints(from, limit, proven) {
+        const published = await this.getPublishedCheckpoints(from, limit, proven);
+        return published.map((p)=>p.checkpoint);
+    }
+    async getCheckpoint(number) {
+        if (number < 0) {
+            number = await this.getSynchedCheckpointNumber();
+        }
+        if (number === 0) {
+            return undefined;
+        }
+        const published = await this.getPublishedCheckpoints(number, 1);
+        return published[0]?.checkpoint;
+    }
+    async getCheckpointHeader(number) {
+        if (number === 'latest') {
+            number = await this.getSynchedCheckpointNumber();
+        }
+        if (number === 0) {
+            return undefined;
+        }
+        const checkpoint = await this.getCheckpoint(number);
+        return checkpoint?.header;
+    }
+    getCheckpointNumber() {
+        return this.getSynchedCheckpointNumber();
+    }
+    getSynchedCheckpointNumber() {
+        // TODO: Checkpoint number will no longer be the same as the block number once we support multiple blocks per checkpoint.
+        return this.store.getSynchedL2BlockNumber();
+    }
+    getProvenCheckpointNumber() {
+        // TODO: Proven checkpoint number will no longer be the same as the proven block number once we support multiple blocks per checkpoint.
+        return this.store.getProvenL2BlockNumber();
+    }
+    setProvenCheckpointNumber(checkpointNumber) {
+        // TODO: Proven checkpoint number will no longer be the same as the proven block number once we support multiple blocks per checkpoint.
+        return this.store.setProvenL2BlockNumber(checkpointNumber);
+    }
+    unwindCheckpoints(from, checkpointsToUnwind) {
+        // TODO: This only works if we have one block per checkpoint.
+        return this.store.unwindBlocks(from, checkpointsToUnwind);
+    }
+    getLastBlockNumberInCheckpoint(checkpointNumber) {
+        // TODO: Checkpoint number will no longer be the same as the block number once we support multiple blocks per checkpoint.
+        return Promise.resolve(checkpointNumber);
+    }
+    addCheckpoints(checkpoints, pendingChainValidationStatus) {
+        return this.store.addBlocks(checkpoints.map((p)=>PublishedL2Block.fromPublishedCheckpoint(p)), pendingChainValidationStatus);
+    }
     /**
    * 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) {
+   */ getBlocks(from, limit, proven) {
+        return this.getPublishedBlocks(from, limit, proven).then((blocks)=>blocks.map((b)=>b.block));
+    }
+    /** 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.getBlocks(from, limitWithProven)).map((b)=>b.data);
+        return limitWithProven === 0 ? [] : await this.store.getPublishedBlocks(from, limitWithProven);
+    }
+    getPublishedBlockByHash(blockHash) {
+        return this.store.getPublishedBlockByHash(blockHash);
+    }
+    getPublishedBlockByArchive(archive) {
+        return this.store.getPublishedBlockByArchive(archive);
+    }
+    getBlockHeaderByHash(blockHash) {
+        return this.store.getBlockHeaderByHash(blockHash);
+    }
+    getBlockHeaderByArchive(archive) {
+        return this.store.getBlockHeaderByArchive(archive);
     }
     /**
    * Gets an l2 block.
@@ -485,11 +928,11 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         if (number < 0) {
             number = await this.store.getSynchedL2BlockNumber();
         }
-        if (number == 0) {
+        if (number === 0) {
             return undefined;
         }
-        const blocks = await this.store.getBlocks(number, 1);
-        return blocks.length === 0 ? undefined : blocks[0].data;
+        const publishedBlock = await this.store.getPublishedBlock(number);
+        return publishedBlock?.block;
     }
     async getBlockHeader(number) {
         if (number === 'latest') {
@@ -508,22 +951,6 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         return this.store.getSettledTxReceipt(txHash);
     }
     /**
-   * Gets the public function data for a contract.
-   * @param address - The contract address containing the function to fetch.
-   * @param selector - The function selector of the function to fetch.
-   * @returns The public function data (if found).
-   */ async getPublicFunction(address, selector) {
-        const instance = await this.getContract(address);
-        if (!instance) {
-            throw new Error(`Contract ${address.toString()} not found`);
-        }
-        const contractClass = await this.getContractClass(instance.currentContractClassId);
-        if (!contractClass) {
-            throw new Error(`Contract class ${instance.currentContractClassId.toString()} for ${address.toString()} not found`);
-        }
-        return contractClass.publicFunctions.find((f)=>f.selector.equals(selector));
-    }
-    /**
    * 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.
@@ -540,15 +967,6 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         return this.store.getLogsByTags(tags);
     }
     /**
-   * Returns the provided nullifier indexes scoped to the block
-   * they were first included in, or undefined if they're not present in the tree
-   * @param blockNumber Max block number to search for the nullifiers
-   * @param nullifiers Nullifiers to get
-   * @returns The block scoped indexes of the provided nullifiers, or undefined if the nullifier doesn't exist in the tree
-   */ findNullifiersIndexesWithBlock(blockNumber, nullifiers) {
-        return this.store.findNullifiersIndexesWithBlock(blockNumber, nullifiers);
-    }
-    /**
    * Gets public logs based on the provided filter.
    * @param filter - The filter to apply to the logs.
    * @returns The requested logs.
@@ -580,8 +998,16 @@ import { ArchiverInstrumentation } from './instrumentation.js';
     getBytecodeCommitment(id) {
         return this.store.getBytecodeCommitment(id);
     }
-    getContract(address) {
-        return this.store.getContractInstance(address);
+    async getContract(address, maybeTimestamp) {
+        let timestamp;
+        if (maybeTimestamp === undefined) {
+            const latestBlockHeader = await this.getBlockHeader('latest');
+            // If we get undefined block header, it means that the archiver has not yet synced any block so we default to 0.
+            timestamp = latestBlockHeader ? latestBlockHeader.globalVariables.timestamp : 0n;
+        } else {
+            timestamp = maybeTimestamp;
+        }
+        return this.store.getContractInstance(address, timestamp);
     }
     /**
    * Gets L1 to L2 message (to be) included in a given block.
@@ -600,29 +1026,33 @@ import { ArchiverInstrumentation } from './instrumentation.js';
     getContractClassIds() {
         return this.store.getContractClassIds();
     }
-    // TODO(#10007): Remove this method
-    async addContractClass(contractClass) {
-        await this.store.addContractClasses([
-            contractClass
-        ], [
-            await computePublicBytecodeCommitment(contractClass.packedBytecode)
-        ], 0);
-        return;
+    registerContractFunctionSignatures(signatures) {
+        return this.store.registerContractFunctionSignatures(signatures);
     }
-    registerContractFunctionSignatures(address, signatures) {
-        return this.store.registerContractFunctionSignatures(address, signatures);
+    getDebugFunctionName(address, selector) {
+        return this.store.getDebugFunctionName(address, selector);
     }
-    getContractFunctionName(address, selector) {
-        return this.store.getContractFunctionName(address, selector);
+    async getPendingChainValidationStatus() {
+        return await this.store.getPendingChainValidationStatus() ?? {
+            valid: true
+        };
+    }
+    isPendingChainInvalid() {
+        return this.getPendingChainValidationStatus().then((status)=>!status.valid);
     }
     async getL2Tips() {
         const [latestBlockNumber, provenBlockNumber] = await Promise.all([
             this.getBlockNumber(),
             this.getProvenBlockNumber()
         ]);
-        const [latestBlockHeader, provenBlockHeader] = await Promise.all([
+        // 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 [latestBlockHeader, provenBlockHeader, finalizedBlockHeader] = await Promise.all([
             latestBlockNumber > 0 ? this.getBlockHeader(latestBlockNumber) : undefined,
-            provenBlockNumber > 0 ? this.getBlockHeader(provenBlockNumber) : undefined
+            provenBlockNumber > 0 ? this.getBlockHeader(provenBlockNumber) : undefined,
+            finalizedBlockNumber > 0 ? this.getBlockHeader(finalizedBlockNumber) : undefined
         ]);
         if (latestBlockNumber > 0 && !latestBlockHeader) {
             throw new Error(`Failed to retrieve latest block header for block ${latestBlockNumber}`);
@@ -630,9 +1060,12 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         if (provenBlockNumber > 0 && !provenBlockHeader) {
             throw new Error(`Failed to retrieve proven block header for block ${provenBlockNumber} (latest block is ${latestBlockNumber})`);
         }
+        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 provenBlockHeader?.hash();
+        const finalizedBlockHeaderHash = await finalizedBlockHeader?.hash();
         return {
             latest: {
                 number: latestBlockNumber,
@@ -643,16 +1076,49 @@ import { ArchiverInstrumentation } from './instrumentation.js';
                 hash: provenBlockHeaderHash?.toString()
             },
             finalized: {
-                number: provenBlockNumber,
+                number: finalizedBlockNumber,
                 hash: finalizedBlockHeaderHash?.toString()
             }
         };
     }
+    async rollbackTo(targetL2BlockNumber) {
+        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);
+        if (!targetL2Block) {
+            throw new Error(`Target L2 block ${targetL2BlockNumber} not found`);
+        }
+        const targetL1BlockNumber = targetL2Block.l1.blockNumber;
+        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(`Setting L1 syncpoints to ${targetL1BlockNumber}`);
+        await this.store.setBlockSynchedL1BlockNumber(targetL1BlockNumber);
+        await this.store.setMessageSynchedL1Block({
+            l1BlockNumber: targetL1BlockNumber,
+            l1BlockHash: targetL1BlockHash
+        });
+        if (targetL2BlockNumber < currentProvenBlock) {
+            this.log.info(`Clearing proven L2 block number`);
+            await this.store.setProvenL2BlockNumber(0);
+        }
+    // TODO(palla/reorg): Set the finalized block when we add support for it.
+    // if (targetL2BlockNumber < currentFinalizedBlock) {
+    //   this.log.info(`Clearing finalized L2 block number`);
+    //   await this.store.setFinalizedL2BlockNumber(0);
+    // }
+    }
 }
 _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";
@@ -664,23 +1130,19 @@ var Operation = /*#__PURE__*/ function(Operation) {
  *
  * I would have preferred to not have this type. But it is useful for handling the logic that any
  * store would need to include otherwise while exposing fewer functions and logic directly to the archiver.
- */ class ArchiverStoreHelper {
+ */ export class ArchiverStoreHelper {
     store;
     #log;
     constructor(store){
         this.store = store;
         this.#log = createLogger('archiver:block-helper');
     }
-    // TODO(#10007): Remove this method
-    addContractClasses(contractClasses, bytecodeCommitments, blockNum) {
-        return this.store.addContractClasses(contractClasses, bytecodeCommitments, blockNum);
-    }
     /**
-   * Extracts and stores contract classes out of ContractClassRegistered events emitted by the class registerer contract.
+   * Extracts and stores contract classes out of ContractClassPublished events emitted by the class registry contract.
    * @param allLogs - All logs emitted in a bunch of blocks.
-   */ async #updateRegisteredContractClasses(allLogs, blockNum, operation) {
-        const contractClassRegisteredEvents = allLogs.filter((log)=>ContractClassRegisteredEvent.isContractClassRegisteredEvent(log)).map((log)=>ContractClassRegisteredEvent.fromLog(log));
-        const contractClasses = await Promise.all(contractClassRegisteredEvents.map((e)=>e.toContractClassPublic()));
+   */ async #updatePublishedContractClasses(allLogs, blockNum, operation) {
+        const contractClassPublishedEvents = allLogs.filter((log)=>ContractClassPublishedEvent.isContractClassPublishedEvent(log)).map((log)=>ContractClassPublishedEvent.fromLog(log));
+        const contractClasses = await Promise.all(contractClassPublishedEvents.map((e)=>e.toContractClassPublic()));
         if (contractClasses.length > 0) {
             contractClasses.forEach((c)=>this.#log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
             if (operation == 0) {
@@ -694,10 +1156,10 @@ var Operation = /*#__PURE__*/ function(Operation) {
         return true;
     }
     /**
-   * Extracts and stores contract instances out of ContractInstanceDeployed events emitted by the canonical deployer contract.
+   * Extracts and stores contract instances out of ContractInstancePublished events emitted by the canonical deployer contract.
    * @param allLogs - All logs emitted in a bunch of blocks.
    */ async #updateDeployedContractInstances(allLogs, blockNum, operation) {
-        const contractInstances = allLogs.filter((log)=>ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log)).map((log)=>ContractInstanceDeployedEvent.fromLog(log)).map((e)=>e.toContractInstance());
+        const contractInstances = allLogs.filter((log)=>ContractInstancePublishedEvent.isContractInstancePublishedEvent(log)).map((log)=>ContractInstancePublishedEvent.fromLog(log)).map((e)=>e.toContractInstance());
         if (contractInstances.length > 0) {
             contractInstances.forEach((c)=>this.#log.verbose(`${Operation[operation]} contract instance at ${c.address.toString()}`));
             if (operation == 0) {
@@ -709,22 +1171,24 @@ var Operation = /*#__PURE__*/ function(Operation) {
         return true;
     }
     /**
-   * Extracts and stores contract instances out of ContractInstanceDeployed events emitted by the canonical deployer contract.
+   * Extracts and stores contract instances out of ContractInstancePublished events emitted by the canonical deployer contract.
    * @param allLogs - All logs emitted in a bunch of blocks.
-   */ async #updateUpdatedContractInstances(allLogs, blockNum, operation) {
+   * @param timestamp - Timestamp at which the updates were scheduled.
+   * @param operation - The operation to perform on the contract instance updates (Store or Delete).
+   */ async #updateUpdatedContractInstances(allLogs, timestamp, operation) {
         const contractUpdates = allLogs.filter((log)=>ContractInstanceUpdatedEvent.isContractInstanceUpdatedEvent(log)).map((log)=>ContractInstanceUpdatedEvent.fromLog(log)).map((e)=>e.toContractInstanceUpdate());
         if (contractUpdates.length > 0) {
             contractUpdates.forEach((c)=>this.#log.verbose(`${Operation[operation]} contract instance update at ${c.address.toString()}`));
             if (operation == 0) {
-                return await this.store.addContractInstanceUpdates(contractUpdates, blockNum);
+                return await this.store.addContractInstanceUpdates(contractUpdates, timestamp);
             } else if (operation == 1) {
-                return await this.store.deleteContractInstanceUpdates(contractUpdates, blockNum);
+                return await this.store.deleteContractInstanceUpdates(contractUpdates, timestamp);
             }
         }
         return true;
     }
     /**
-   * Stores the functions that was broadcasted individually
+   * Stores the functions that were broadcasted individually
    *
    * @dev   Beware that there is not a delete variant of this, since they are added to contract classes
    *        and will be deleted as part of the class if needed.
@@ -733,13 +1197,13 @@ var Operation = /*#__PURE__*/ function(Operation) {
    * @param _blockNum - The block number
    * @returns
    */ async #storeBroadcastedIndividualFunctions(allLogs, _blockNum) {
-        // Filter out private and unconstrained function broadcast events
+        // Filter out private and utility function broadcast events
         const privateFnEvents = allLogs.filter((log)=>PrivateFunctionBroadcastedEvent.isPrivateFunctionBroadcastedEvent(log)).map((log)=>PrivateFunctionBroadcastedEvent.fromLog(log));
-        const unconstrainedFnEvents = allLogs.filter((log)=>UnconstrainedFunctionBroadcastedEvent.isUnconstrainedFunctionBroadcastedEvent(log)).map((log)=>UnconstrainedFunctionBroadcastedEvent.fromLog(log));
+        const utilityFnEvents = allLogs.filter((log)=>UtilityFunctionBroadcastedEvent.isUtilityFunctionBroadcastedEvent(log)).map((log)=>UtilityFunctionBroadcastedEvent.fromLog(log));
         // Group all events by contract class id
         for (const [classIdString, classEvents] of Object.entries(groupBy([
             ...privateFnEvents,
-            ...unconstrainedFnEvents
+            ...utilityFnEvents
         ], (e)=>e.contractClassId.toString()))){
             const contractClassId = Fr.fromHexString(classIdString);
             const contractClass = await this.getContractClass(contractClassId);
@@ -747,21 +1211,21 @@ var Operation = /*#__PURE__*/ function(Operation) {
                 this.#log.warn(`Skipping broadcasted functions as contract class ${contractClassId.toString()} was not found`);
                 continue;
             }
-            // Split private and unconstrained functions, and filter out invalid ones
+            // Split private and utility functions, and filter out invalid ones
             const allFns = classEvents.map((e)=>e.toFunctionWithMembershipProof());
-            const privateFns = allFns.filter((fn)=>'unconstrainedFunctionsArtifactTreeRoot' in fn);
-            const unconstrainedFns = allFns.filter((fn)=>'privateFunctionsArtifactTreeRoot' in fn);
+            const privateFns = allFns.filter((fn)=>'utilityFunctionsTreeRoot' in fn);
+            const utilityFns = allFns.filter((fn)=>'privateFunctionsArtifactTreeRoot' in fn);
             const privateFunctionsWithValidity = await Promise.all(privateFns.map(async (fn)=>({
                     fn,
                     valid: await isValidPrivateFunctionMembershipProof(fn, contractClass)
                 })));
             const validPrivateFns = privateFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
-            const unconstrainedFunctionsWithValidity = await Promise.all(unconstrainedFns.map(async (fn)=>({
+            const utilityFunctionsWithValidity = await Promise.all(utilityFns.map(async (fn)=>({
                     fn,
-                    valid: await isValidUnconstrainedFunctionMembershipProof(fn, contractClass)
+                    valid: await isValidUtilityFunctionMembershipProof(fn, contractClass)
                 })));
-            const validUnconstrainedFns = unconstrainedFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
-            const validFnCount = validPrivateFns.length + validUnconstrainedFns.length;
+            const validUtilityFns = utilityFunctionsWithValidity.filter(({ valid })=>valid).map(({ fn })=>fn);
+            const validFnCount = validPrivateFns.length + validUtilityFns.length;
             if (validFnCount !== allFns.length) {
                 this.#log.warn(`Skipping ${allFns.length - validFnCount} invalid functions`);
             }
@@ -769,62 +1233,90 @@ var Operation = /*#__PURE__*/ function(Operation) {
             if (validFnCount > 0) {
                 this.#log.verbose(`Storing ${validFnCount} functions for contract class ${contractClassId.toString()}`);
             }
-            return await this.store.addFunctions(contractClassId, validPrivateFns, validUnconstrainedFns);
+            return await this.store.addFunctions(contractClassId, validPrivateFns, validUtilityFns);
         }
         return true;
     }
-    async addBlocks(blocks) {
-        const opResults = await Promise.all([
-            this.store.addLogs(blocks.map((block)=>block.data)),
-            // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
-            ...blocks.map(async (block)=>{
-                const contractClassLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
-                // ContractInstanceDeployed event logs are broadcast in privateLogs.
-                const privateLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
-                const publicLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
-                return (await Promise.all([
-                    this.#updateRegisteredContractClasses(contractClassLogs, block.data.number, 0),
-                    this.#updateDeployedContractInstances(privateLogs, block.data.number, 0),
-                    this.#updateUpdatedContractInstances(publicLogs, block.data.number, 0),
-                    this.#storeBroadcastedIndividualFunctions(contractClassLogs, block.data.number)
-                ])).every(Boolean);
-            }),
-            this.store.addNullifiers(blocks.map((block)=>block.data)),
-            this.store.addBlocks(blocks)
-        ]);
-        return opResults.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.
+        return this.store.transactionAsync(async ()=>{
+            await this.store.addBlocks(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(blocks.map((block)=>block.block)),
+                // 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);
+                })
+            ]);
+            return opResults.every(Boolean);
+        });
     }
     async unwindBlocks(from, blocksToUnwind) {
         const last = await this.getSynchedL2BlockNumber();
         if (from != last) {
-            throw new Error(`Can only remove from the tip`);
+            throw new Error(`Cannot unwind blocks from block ${from} when the last block is ${last}`);
+        }
+        if (blocksToUnwind <= 0) {
+            throw new Error(`Cannot unwind ${blocksToUnwind} blocks`);
         }
         // from - blocksToUnwind = the new head, so + 1 for what we need to remove
-        const blocks = await this.getBlocks(from - blocksToUnwind + 1, blocksToUnwind);
+        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({
+                valid: true
+            }),
             // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
             ...blocks.map(async (block)=>{
-                const contractClassLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
-                // ContractInstanceDeployed event logs are broadcast in privateLogs.
-                const privateLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
-                const publicLogs = block.data.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
+                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.#updateRegisteredContractClasses(contractClassLogs, block.data.number, 1),
-                    this.#updateDeployedContractInstances(privateLogs, block.data.number, 1),
-                    this.#updateUpdatedContractInstances(publicLogs, block.data.number, 1)
+                    this.#updatePublishedContractClasses(contractClassLogs, block.block.number, 1),
+                    this.#updateDeployedContractInstances(privateLogs, block.block.number, 1),
+                    this.#updateUpdatedContractInstances(publicLogs, block.block.header.globalVariables.timestamp, 1)
                 ])).every(Boolean);
             }),
-            this.store.deleteLogs(blocks.map((b)=>b.data)),
+            this.store.deleteLogs(blocks.map((b)=>b.block)),
             this.store.unwindBlocks(from, blocksToUnwind)
         ]);
         return opResults.every(Boolean);
     }
-    getBlocks(from, limit) {
-        return this.store.getBlocks(from, limit);
+    getPublishedBlocks(from, limit) {
+        return this.store.getPublishedBlocks(from, limit);
+    }
+    getPublishedBlock(number) {
+        return this.store.getPublishedBlock(number);
+    }
+    getPublishedBlockByHash(blockHash) {
+        return this.store.getPublishedBlockByHash(blockHash);
+    }
+    getPublishedBlockByArchive(archive) {
+        return this.store.getPublishedBlockByArchive(archive);
     }
     getBlockHeaders(from, limit) {
         return this.store.getBlockHeaders(from, limit);
     }
+    getBlockHeaderByHash(blockHash) {
+        return this.store.getBlockHeaderByHash(blockHash);
+    }
+    getBlockHeaderByArchive(archive) {
+        return this.store.getBlockHeaderByArchive(archive);
+    }
     getTxEffect(txHash) {
         return this.store.getTxEffect(txHash);
     }
@@ -843,11 +1335,8 @@ var Operation = /*#__PURE__*/ function(Operation) {
     getPrivateLogs(from, limit) {
         return this.store.getPrivateLogs(from, limit);
     }
-    getLogsByTags(tags) {
-        return this.store.getLogsByTags(tags);
-    }
-    findNullifiersIndexesWithBlock(blockNumber, nullifiers) {
-        return this.store.findNullifiersIndexesWithBlock(blockNumber, nullifiers);
+    getLogsByTags(tags, logsPerTag) {
+        return this.store.getLogsByTags(tags, logsPerTag);
     }
     getPublicLogs(filter) {
         return this.store.getPublicLogs(filter);
@@ -867,8 +1356,8 @@ var Operation = /*#__PURE__*/ function(Operation) {
     setBlockSynchedL1BlockNumber(l1BlockNumber) {
         return this.store.setBlockSynchedL1BlockNumber(l1BlockNumber);
     }
-    setMessageSynchedL1BlockNumber(l1BlockNumber) {
-        return this.store.setMessageSynchedL1BlockNumber(l1BlockNumber);
+    setMessageSynchedL1Block(l1Block) {
+        return this.store.setMessageSynchedL1Block(l1Block);
     }
     getSynchPoint() {
         return this.store.getSynchPoint();
@@ -879,17 +1368,17 @@ var Operation = /*#__PURE__*/ function(Operation) {
     getBytecodeCommitment(contractClassId) {
         return this.store.getBytecodeCommitment(contractClassId);
     }
-    getContractInstance(address) {
-        return this.store.getContractInstance(address);
+    getContractInstance(address, timestamp) {
+        return this.store.getContractInstance(address, timestamp);
     }
     getContractClassIds() {
         return this.store.getContractClassIds();
     }
-    registerContractFunctionSignatures(address, signatures) {
-        return this.store.registerContractFunctionSignatures(address, signatures);
+    registerContractFunctionSignatures(signatures) {
+        return this.store.registerContractFunctionSignatures(signatures);
     }
-    getContractFunctionName(address, selector) {
-        return this.store.getContractFunctionName(address, selector);
+    getDebugFunctionName(address, selector) {
+        return this.store.getDebugFunctionName(address, selector);
     }
     getTotalL1ToL2MessageCount() {
         return this.store.getTotalL1ToL2MessageCount();
@@ -897,4 +1386,23 @@ var Operation = /*#__PURE__*/ function(Operation) {
     estimateSize() {
         return this.store.estimateSize();
     }
+    rollbackL1ToL2MessagesToL2Block(targetBlockNumber) {
+        return this.store.rollbackL1ToL2MessagesToL2Block(targetBlockNumber);
+    }
+    iterateL1ToL2Messages(range = {}) {
+        return this.store.iterateL1ToL2Messages(range);
+    }
+    removeL1ToL2Messages(startIndex) {
+        return this.store.removeL1ToL2Messages(startIndex);
+    }
+    getLastL1ToL2Message() {
+        return this.store.getLastL1ToL2Message();
+    }
+    getPendingChainValidationStatus() {
+        return this.store.getPendingChainValidationStatus();
+    }
+    setPendingChainValidationStatus(status) {
+        this.#log.debug(`Setting pending chain validation status to valid ${status?.valid}`, status);
+        return this.store.setPendingChainValidationStatus(status);
+    }
 }