@aztec/archiver 4.0.0-nightly.20260113 → 4.0.0-nightly.20260115

package/dest/modules/l1_synchronizer.js

@@ -0,0 +1,1064 @@
+function applyDecs2203RFactory() {
+    function createAddInitializerMethod(initializers, decoratorFinishedRef) {
+        return function addInitializer(initializer) {
+            assertNotFinished(decoratorFinishedRef, "addInitializer");
+            assertCallable(initializer, "An initializer");
+            initializers.push(initializer);
+        };
+    }
+    function memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value) {
+        var kindStr;
+        switch(kind){
+            case 1:
+                kindStr = "accessor";
+                break;
+            case 2:
+                kindStr = "method";
+                break;
+            case 3:
+                kindStr = "getter";
+                break;
+            case 4:
+                kindStr = "setter";
+                break;
+            default:
+                kindStr = "field";
+        }
+        var ctx = {
+            kind: kindStr,
+            name: isPrivate ? "#" + name : name,
+            static: isStatic,
+            private: isPrivate,
+            metadata: metadata
+        };
+        var decoratorFinishedRef = {
+            v: false
+        };
+        ctx.addInitializer = createAddInitializerMethod(initializers, decoratorFinishedRef);
+        var get, set;
+        if (kind === 0) {
+            if (isPrivate) {
+                get = desc.get;
+                set = desc.set;
+            } else {
+                get = function() {
+                    return this[name];
+                };
+                set = function(v) {
+                    this[name] = v;
+                };
+            }
+        } else if (kind === 2) {
+            get = function() {
+                return desc.value;
+            };
+        } else {
+            if (kind === 1 || kind === 3) {
+                get = function() {
+                    return desc.get.call(this);
+                };
+            }
+            if (kind === 1 || kind === 4) {
+                set = function(v) {
+                    desc.set.call(this, v);
+                };
+            }
+        }
+        ctx.access = get && set ? {
+            get: get,
+            set: set
+        } : get ? {
+            get: get
+        } : {
+            set: set
+        };
+        try {
+            return dec(value, ctx);
+        } finally{
+            decoratorFinishedRef.v = true;
+        }
+    }
+    function assertNotFinished(decoratorFinishedRef, fnName) {
+        if (decoratorFinishedRef.v) {
+            throw new Error("attempted to call " + fnName + " after decoration was finished");
+        }
+    }
+    function assertCallable(fn, hint) {
+        if (typeof fn !== "function") {
+            throw new TypeError(hint + " must be a function");
+        }
+    }
+    function assertValidReturnValue(kind, value) {
+        var type = typeof value;
+        if (kind === 1) {
+            if (type !== "object" || value === null) {
+                throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0");
+            }
+            if (value.get !== undefined) {
+                assertCallable(value.get, "accessor.get");
+            }
+            if (value.set !== undefined) {
+                assertCallable(value.set, "accessor.set");
+            }
+            if (value.init !== undefined) {
+                assertCallable(value.init, "accessor.init");
+            }
+        } else if (type !== "function") {
+            var hint;
+            if (kind === 0) {
+                hint = "field";
+            } else if (kind === 10) {
+                hint = "class";
+            } else {
+                hint = "method";
+            }
+            throw new TypeError(hint + " decorators must return a function or void 0");
+        }
+    }
+    function applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata) {
+        var decs = decInfo[0];
+        var desc, init, value;
+        if (isPrivate) {
+            if (kind === 0 || kind === 1) {
+                desc = {
+                    get: decInfo[3],
+                    set: decInfo[4]
+                };
+            } else if (kind === 3) {
+                desc = {
+                    get: decInfo[3]
+                };
+            } else if (kind === 4) {
+                desc = {
+                    set: decInfo[3]
+                };
+            } else {
+                desc = {
+                    value: decInfo[3]
+                };
+            }
+        } else if (kind !== 0) {
+            desc = Object.getOwnPropertyDescriptor(base, name);
+        }
+        if (kind === 1) {
+            value = {
+                get: desc.get,
+                set: desc.set
+            };
+        } else if (kind === 2) {
+            value = desc.value;
+        } else if (kind === 3) {
+            value = desc.get;
+        } else if (kind === 4) {
+            value = desc.set;
+        }
+        var newValue, get, set;
+        if (typeof decs === "function") {
+            newValue = memberDec(decs, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+            if (newValue !== void 0) {
+                assertValidReturnValue(kind, newValue);
+                if (kind === 0) {
+                    init = newValue;
+                } else if (kind === 1) {
+                    init = newValue.init;
+                    get = newValue.get || value.get;
+                    set = newValue.set || value.set;
+                    value = {
+                        get: get,
+                        set: set
+                    };
+                } else {
+                    value = newValue;
+                }
+            }
+        } else {
+            for(var i = decs.length - 1; i >= 0; i--){
+                var dec = decs[i];
+                newValue = memberDec(dec, name, desc, initializers, kind, isStatic, isPrivate, metadata, value);
+                if (newValue !== void 0) {
+                    assertValidReturnValue(kind, newValue);
+                    var newInit;
+                    if (kind === 0) {
+                        newInit = newValue;
+                    } else if (kind === 1) {
+                        newInit = newValue.init;
+                        get = newValue.get || value.get;
+                        set = newValue.set || value.set;
+                        value = {
+                            get: get,
+                            set: set
+                        };
+                    } else {
+                        value = newValue;
+                    }
+                    if (newInit !== void 0) {
+                        if (init === void 0) {
+                            init = newInit;
+                        } else if (typeof init === "function") {
+                            init = [
+                                init,
+                                newInit
+                            ];
+                        } else {
+                            init.push(newInit);
+                        }
+                    }
+                }
+            }
+        }
+        if (kind === 0 || kind === 1) {
+            if (init === void 0) {
+                init = function(instance, init) {
+                    return init;
+                };
+            } else if (typeof init !== "function") {
+                var ownInitializers = init;
+                init = function(instance, init) {
+                    var value = init;
+                    for(var i = 0; i < ownInitializers.length; i++){
+                        value = ownInitializers[i].call(instance, value);
+                    }
+                    return value;
+                };
+            } else {
+                var originalInitializer = init;
+                init = function(instance, init) {
+                    return originalInitializer.call(instance, init);
+                };
+            }
+            ret.push(init);
+        }
+        if (kind !== 0) {
+            if (kind === 1) {
+                desc.get = value.get;
+                desc.set = value.set;
+            } else if (kind === 2) {
+                desc.value = value;
+            } else if (kind === 3) {
+                desc.get = value;
+            } else if (kind === 4) {
+                desc.set = value;
+            }
+            if (isPrivate) {
+                if (kind === 1) {
+                    ret.push(function(instance, args) {
+                        return value.get.call(instance, args);
+                    });
+                    ret.push(function(instance, args) {
+                        return value.set.call(instance, args);
+                    });
+                } else if (kind === 2) {
+                    ret.push(value);
+                } else {
+                    ret.push(function(instance, args) {
+                        return value.call(instance, args);
+                    });
+                }
+            } else {
+                Object.defineProperty(base, name, desc);
+            }
+        }
+    }
+    function applyMemberDecs(Class, decInfos, metadata) {
+        var ret = [];
+        var protoInitializers;
+        var staticInitializers;
+        var existingProtoNonFields = new Map();
+        var existingStaticNonFields = new Map();
+        for(var i = 0; i < decInfos.length; i++){
+            var decInfo = decInfos[i];
+            if (!Array.isArray(decInfo)) continue;
+            var kind = decInfo[1];
+            var name = decInfo[2];
+            var isPrivate = decInfo.length > 3;
+            var isStatic = kind >= 5;
+            var base;
+            var initializers;
+            if (isStatic) {
+                base = Class;
+                kind = kind - 5;
+                staticInitializers = staticInitializers || [];
+                initializers = staticInitializers;
+            } else {
+                base = Class.prototype;
+                protoInitializers = protoInitializers || [];
+                initializers = protoInitializers;
+            }
+            if (kind !== 0 && !isPrivate) {
+                var existingNonFields = isStatic ? existingStaticNonFields : existingProtoNonFields;
+                var existingKind = existingNonFields.get(name) || 0;
+                if (existingKind === true || existingKind === 3 && kind !== 4 || existingKind === 4 && kind !== 3) {
+                    throw new Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + name);
+                } else if (!existingKind && kind > 2) {
+                    existingNonFields.set(name, kind);
+                } else {
+                    existingNonFields.set(name, true);
+                }
+            }
+            applyMemberDec(ret, base, decInfo, name, kind, isStatic, isPrivate, initializers, metadata);
+        }
+        pushInitializers(ret, protoInitializers);
+        pushInitializers(ret, staticInitializers);
+        return ret;
+    }
+    function pushInitializers(ret, initializers) {
+        if (initializers) {
+            ret.push(function(instance) {
+                for(var i = 0; i < initializers.length; i++){
+                    initializers[i].call(instance);
+                }
+                return instance;
+            });
+        }
+    }
+    function applyClassDecs(targetClass, classDecs, metadata) {
+        if (classDecs.length > 0) {
+            var initializers = [];
+            var newClass = targetClass;
+            var name = targetClass.name;
+            for(var i = classDecs.length - 1; i >= 0; i--){
+                var decoratorFinishedRef = {
+                    v: false
+                };
+                try {
+                    var nextNewClass = classDecs[i](newClass, {
+                        kind: "class",
+                        name: name,
+                        addInitializer: createAddInitializerMethod(initializers, decoratorFinishedRef),
+                        metadata
+                    });
+                } finally{
+                    decoratorFinishedRef.v = true;
+                }
+                if (nextNewClass !== undefined) {
+                    assertValidReturnValue(10, nextNewClass);
+                    newClass = nextNewClass;
+                }
+            }
+            return [
+                defineMetadata(newClass, metadata),
+                function() {
+                    for(var i = 0; i < initializers.length; i++){
+                        initializers[i].call(newClass);
+                    }
+                }
+            ];
+        }
+    }
+    function defineMetadata(Class, metadata) {
+        return Object.defineProperty(Class, Symbol.metadata || Symbol.for("Symbol.metadata"), {
+            configurable: true,
+            enumerable: true,
+            value: metadata
+        });
+    }
+    return function applyDecs2203R(targetClass, memberDecs, classDecs, parentClass) {
+        if (parentClass !== void 0) {
+            var parentMetadata = parentClass[Symbol.metadata || Symbol.for("Symbol.metadata")];
+        }
+        var metadata = Object.create(parentMetadata === void 0 ? null : parentMetadata);
+        var e = applyMemberDecs(targetClass, memberDecs, metadata);
+        if (!classDecs.length) defineMetadata(targetClass, metadata);
+        return {
+            e: e,
+            get c () {
+                return applyClassDecs(targetClass, classDecs, metadata);
+            }
+        };
+    };
+}
+function _apply_decs_2203_r(targetClass, memberDecs, classDecs, parentClass) {
+    return (_apply_decs_2203_r = applyDecs2203RFactory())(targetClass, memberDecs, classDecs, parentClass);
+}
+var _dec, _dec1, _dec2, _dec3, _initProto;
+import { maxBigint } from '@aztec/foundation/bigint';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { pick } from '@aztec/foundation/collection';
+import { createLogger } from '@aztec/foundation/log';
+import { count } from '@aztec/foundation/string';
+import { Timer, elapsed } from '@aztec/foundation/timer';
+import { isDefined } from '@aztec/foundation/types';
+import { L2BlockSourceEvents } from '@aztec/stdlib/block';
+import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
+import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import { execInSpan, trackSpan } from '@aztec/telemetry-client';
+import { InitialCheckpointNumberNotSequentialError } from '../errors.js';
+import { retrieveCheckpointsFromRollup, retrieveL1ToL2Message, retrieveL1ToL2Messages, retrievedToPublishedCheckpoint } from '../l1/data_retrieval.js';
+import { ArchiverDataStoreUpdater } from './data_store_updater.js';
+import { validateCheckpointAttestations } from './validation.js';
+_dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpochPrune'), _dec2 = trackSpan('Archiver.handleL1ToL2Messages'), _dec3 = trackSpan('Archiver.handleCheckpoints');
+/**
+ * Handles L1 synchronization for the archiver.
+ * Responsible for fetching checkpoints, L1→L2 messages, and handling L1 reorgs.
+ */ export class ArchiverL1Synchronizer {
+    publicClient;
+    debugClient;
+    rollup;
+    inbox;
+    l1Addresses;
+    store;
+    config;
+    blobClient;
+    epochCache;
+    dateProvider;
+    instrumentation;
+    l1constants;
+    events;
+    log;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "syncFromL1"
+            ],
+            [
+                _dec1,
+                2,
+                "handleEpochPrune"
+            ],
+            [
+                _dec2,
+                2,
+                "handleL1ToL2Messages"
+            ],
+            [
+                _dec3,
+                2,
+                "handleCheckpoints"
+            ]
+        ], []));
+    }
+    l1BlockNumber;
+    l1Timestamp;
+    updater;
+    tracer;
+    constructor(publicClient, debugClient, rollup, inbox, l1Addresses, store, config, blobClient, epochCache, dateProvider, instrumentation, l1constants, events, tracer, log = createLogger('archiver:l1-sync')){
+        this.publicClient = publicClient;
+        this.debugClient = debugClient;
+        this.rollup = rollup;
+        this.inbox = inbox;
+        this.l1Addresses = l1Addresses;
+        this.store = store;
+        this.config = config;
+        this.blobClient = blobClient;
+        this.epochCache = epochCache;
+        this.dateProvider = dateProvider;
+        this.instrumentation = instrumentation;
+        this.l1constants = l1constants;
+        this.events = events;
+        this.log = log;
+        _initProto(this);
+        this.updater = new ArchiverDataStoreUpdater(this.store);
+        this.tracer = tracer;
+    }
+    /** Returns the last L1 block number that was synced. */ getL1BlockNumber() {
+        return this.l1BlockNumber;
+    }
+    /** Returns the last L1 timestamp that was synced. */ getL1Timestamp() {
+        return this.l1Timestamp;
+    }
+    /** 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})`);
+        }
+    }
+    async syncFromL1(initialSyncComplete) {
+        /**
+     * We keep track of three "pointers" to L1 blocks:
+     * 1. the last L1 block that published an L2 block
+     * 2. the last L1 block that added L1 to L2 messages
+     * 3. the last L1 block that cancelled L1 to L2 messages
+     *
+     * 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.
+     */ 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
+     * events and transaction data. There are a couple of things we need to bear in mind
+     * to ensure that data is read exactly once.
+     *
+     * The first is the problem of eventually consistent ETH service providers like Infura.
+     * Each L1 read operation will query data from the last L1 block that it saw emit its kind of data.
+     * (so pending L1 to L2 messages will read from the last L1 block that emitted a message and so  on)
+     * This will mean the archiver will lag behind L1 and will only advance when there's L2-relevant activity on the chain.
+     *
+     * The second is that in between the various calls to L1, the block number can move meaning some
+     * of the following calls will return data for blocks that were not present during earlier calls.
+     * To combat this for the time being we simply ensure that all data retrieval methods only retrieve
+     * 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, 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 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, initialSyncComplete);
+            // 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 checkpoints up to that point only.
+            const { rollupCanPrune } = await this.handleEpochPrune(rollupStatus.provenCheckpointNumber, currentL1BlockNumber, currentL1Timestamp);
+            // If the last checkpoint we processed had an invalid attestation, we manually advance the L1 syncpoint
+            // past it, since otherwise we'll keep downloading it and reprocessing it on every iteration until
+            // we get a valid checkpoint to advance the syncpoint.
+            if (!rollupStatus.validationResult?.valid && rollupStatus.lastL1BlockWithCheckpoint !== undefined) {
+                await this.store.setCheckpointSynchedL1BlockNumber(rollupStatus.lastL1BlockWithCheckpoint);
+            }
+            // And lastly we check if we are missing any checkpoints behind us due to a possible L1 reorg.
+            // We only do this if rollup cant prune on the next submission. Otherwise we will end up
+            // re-syncing the 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);
+        }
+        // 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;
+        const l1BlockNumberAtEnd = await this.publicClient.getBlockNumber();
+        this.log.trace(`Archiver sync iteration complete`, {
+            l1BlockNumberAtStart: currentL1BlockNumber,
+            l1TimestampAtStart: currentL1Timestamp,
+            l1BlockNumberAtEnd
+        });
+    }
+    /** 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 checkpoint submission and start pruning now. */ async handleEpochPrune(provenCheckpointNumber, currentL1BlockNumber, currentL1Timestamp) {
+        const rollupCanPrune = await this.canPrune(currentL1BlockNumber, currentL1Timestamp);
+        const localPendingCheckpointNumber = await this.store.getSynchedCheckpointNumber();
+        const canPrune = localPendingCheckpointNumber > provenCheckpointNumber && rollupCanPrune;
+        if (canPrune) {
+            const timer = new Timer();
+            const pruneFrom = CheckpointNumber(provenCheckpointNumber + 1);
+            const header = await this.getCheckpointHeader(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 checkpointPromises = Array.from({
+                length: checkpointsToUnwind
+            }).fill(0).map((_, i)=>this.store.getCheckpointData(CheckpointNumber(i + pruneFrom)));
+            const checkpoints = await Promise.all(checkpointPromises);
+            const blockPromises = await Promise.all(checkpoints.filter(isDefined).map((cp)=>this.store.getBlocksForCheckpoint(CheckpointNumber(cp.checkpointNumber))));
+            const newBlocks = blockPromises.filter(isDefined).flat();
+            // Emit an event for listening services to react to the chain prune
+            this.events.emit(L2BlockSourceEvents.L2PruneDetected, {
+                type: L2BlockSourceEvents.L2PruneDetected,
+                epochNumber: pruneFromEpochNumber,
+                blocks: newBlocks
+            });
+            this.log.debug(`L2 prune from ${provenCheckpointNumber + 1} to ${localPendingCheckpointNumber} will occur on next checkpoint submission.`);
+            await this.updater.unwindCheckpointsWithContractData(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.store.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.setCheckpointSynchedL1BlockNumber(currentL1BlockNumber);
+        }
+        return {
+            rollupCanPrune
+        };
+    }
+    nextRange(end, limit) {
+        const batchSize = this.config.batchSize * this.l1constants.slotDuration / this.l1constants.ethereumSlotDuration;
+        const nextStart = end + 1n;
+        const nextEnd = nextStart + BigInt(batchSize);
+        if (nextEnd > limit) {
+            return [
+                nextStart,
+                limit
+            ];
+        }
+        return [
+            nextStart,
+            nextEnd
+        ];
+    }
+    async handleL1ToL2Messages(messagesSyncPoint, currentL1BlockNumber, _currentL1BlockHash) {
+        this.log.trace(`Handling L1 to L2 messages from ${messagesSyncPoint.l1BlockNumber} to ${currentL1BlockNumber}.`);
+        if (currentL1BlockNumber <= messagesSyncPoint.l1BlockNumber) {
+            return;
+        }
+        // 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 ?? Buffer32.ZERO)) {
+            this.log.trace(`No L1 to L2 messages to query between L1 blocks ${messagesSyncPoint.l1BlockNumber} and ${currentL1BlockNumber}.`);
+            return;
+        }
+        // Check if our syncpoint is still valid. If not, there was an L1 reorg and we need to re-retrieve messages.
+        // 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 messages = await retrieveL1ToL2Messages(this.inbox, 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`, {
+                    ...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 checkpoint ${lastMessage?.checkpointNumber}`, {
+                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 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, 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, initialSyncComplete) {
+        const localPendingCheckpointNumber = await this.store.getSynchedCheckpointNumber();
+        const initialValidationResult = await this.store.getPendingChainValidationStatus();
+        const { provenCheckpointNumber, provenArchive, pendingCheckpointNumber, pendingArchive, archiveOfMyCheckpoint: archiveForLocalPendingCheckpointNumber } = await execInSpan(this.tracer, 'Archiver.getRollupStatus', ()=>this.rollup.status(localPendingCheckpointNumber, {
+                blockNumber: currentL1BlockNumber
+            }));
+        const rollupStatus = {
+            provenCheckpointNumber,
+            provenArchive: provenArchive.toString(),
+            pendingCheckpointNumber,
+            pendingArchive: pendingArchive.toString(),
+            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.store.getProvenCheckpointNumber();
+                if (localProvenCheckpointNumber !== provenCheckpointNumber) {
+                    await this.store.setProvenCheckpointNumber(provenCheckpointNumber);
+                    this.log.info(`Rolled back proven chain to checkpoint ${provenCheckpointNumber}`, {
+                        provenCheckpointNumber
+                    });
+                }
+            }
+            const localCheckpointForDestinationProvenCheckpointNumber = await this.store.getCheckpointData(provenCheckpointNumber);
+            // Sanity check. I've hit what seems to be a state where the proven checkpoint is set to a value greater than the latest
+            // synched checkpoint when requesting L2Tips from the archiver. This is the only place where the proven checkpoint is set.
+            const synched = await this.store.getSynchedCheckpointNumber();
+            if (localCheckpointForDestinationProvenCheckpointNumber && synched < localCheckpointForDestinationProvenCheckpointNumber.checkpointNumber) {
+                this.log.error(`Hit local checkpoint greater than last synched checkpoint: ${localCheckpointForDestinationProvenCheckpointNumber.checkpointNumber} > ${synched}`);
+            }
+            this.log.trace(`Local checkpoint for remote proven checkpoint ${provenCheckpointNumber} is ${localCheckpointForDestinationProvenCheckpointNumber?.archive.root.toString() ?? 'undefined'}`);
+            if (localCheckpointForDestinationProvenCheckpointNumber && provenArchive.equals(localCheckpointForDestinationProvenCheckpointNumber.archive.root)) {
+                const localProvenCheckpointNumber = await this.store.getProvenCheckpointNumber();
+                if (localProvenCheckpointNumber !== provenCheckpointNumber) {
+                    await this.store.setProvenCheckpointNumber(provenCheckpointNumber);
+                    this.log.info(`Updated proven chain to checkpoint ${provenCheckpointNumber}`, {
+                        provenCheckpointNumber
+                    });
+                    const provenSlotNumber = localCheckpointForDestinationProvenCheckpointNumber.header.slotNumber;
+                    const provenEpochNumber = getEpochAtSlot(provenSlotNumber, this.l1constants);
+                    const lastBlockNumberInCheckpoint = localCheckpointForDestinationProvenCheckpointNumber.startBlock + localCheckpointForDestinationProvenCheckpointNumber.numBlocks - 1;
+                    this.events.emit(L2BlockSourceEvents.L2BlockProven, {
+                        type: L2BlockSourceEvents.L2BlockProven,
+                        blockNumber: BlockNumber(lastBlockNumberInCheckpoint),
+                        slotNumber: provenSlotNumber,
+                        epochNumber: provenEpochNumber
+                    });
+                    this.instrumentation.updateLastProvenBlock(lastBlockNumberInCheckpoint);
+                } else {
+                    this.log.trace(`Proven checkpoint ${provenCheckpointNumber} already stored.`);
+                }
+            }
+        };
+        // This is an edge case that we only hit if there are no proposed checkpoints.
+        // If we have 0 checkpoints locally and there are no checkpoints onchain there is nothing to do.
+        const noCheckpoints = localPendingCheckpointNumber === 0 && pendingCheckpointNumber === 0;
+        if (noCheckpoints) {
+            await this.store.setCheckpointSynchedL1BlockNumber(currentL1BlockNumber);
+            this.log.debug(`No checkpoints to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}, no checkpoints on chain`);
+            return rollupStatus;
+        }
+        await 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 checkpoints, there is no impact.
+        if (localPendingCheckpointNumber > 0) {
+            const localPendingCheckpoint = await this.store.getCheckpointData(localPendingCheckpointNumber);
+            if (localPendingCheckpoint === undefined) {
+                throw new Error(`Missing checkpoint ${localPendingCheckpointNumber}`);
+            }
+            const localPendingArchiveRoot = localPendingCheckpoint.archive.root.toString();
+            const noCheckpointSinceLast = localPendingCheckpoint && pendingArchive.toString() === 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.setCheckpointSynchedL1BlockNumber(currentL1BlockNumber);
+                this.log.debug(`No checkpoints to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
+                return rollupStatus;
+            }
+            const localPendingCheckpointInChain = archiveForLocalPendingCheckpointNumber.equals(localPendingCheckpoint.archive.root);
+            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 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 candidateCheckpoint = await this.store.getCheckpointData(tipAfterUnwind);
+                    if (candidateCheckpoint === undefined) {
+                        break;
+                    }
+                    const archiveAtContract = await this.rollup.archiveAt(candidateCheckpoint.checkpointNumber);
+                    this.log.trace(`Checking local checkpoint ${candidateCheckpoint.checkpointNumber} with archive ${candidateCheckpoint.archive.root}`, {
+                        archiveAtContract,
+                        archiveLocal: candidateCheckpoint.archive.root.toString()
+                    });
+                    if (archiveAtContract.equals(candidateCheckpoint.archive.root)) {
+                        break;
+                    }
+                    tipAfterUnwind--;
+                }
+                const checkpointsToUnwind = localPendingCheckpointNumber - tipAfterUnwind;
+                await this.updater.unwindCheckpointsWithContractData(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.store.getSynchedCheckpointNumber()}.`);
+            }
+        }
+        // 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 checkpoints from L1 block ${searchStartBlock} to ${searchEndBlock}`);
+            // TODO(md): Retrieve from blob client then from consensus client, then from peers
+            const retrievedCheckpoints = await execInSpan(this.tracer, 'Archiver.retrieveCheckpointsFromRollup', ()=>retrieveCheckpointsFromRollup(this.rollup, this.publicClient, this.debugClient, this.blobClient, searchStartBlock, searchEndBlock, this.l1Addresses, this.instrumentation, this.log, !initialSyncComplete));
+            if (retrievedCheckpoints.length === 0) {
+                // We are not calling `setBlockSynchedL1BlockNumber` because it may cause sync issues if based off infura.
+                // See further details in earlier comments.
+                this.log.trace(`Retrieved no new checkpoints from L1 block ${searchStartBlock} to ${searchEndBlock}`);
+                continue;
+            }
+            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.skipValidateCheckpointAttestations ? {
+                    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.checkpoint.checkpointNumber === validationResult.checkpoint.checkpointNumber) {
+                    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 checkpoint detection
+                    this.events.emit(L2BlockSourceEvents.InvalidAttestationsCheckpointDetected, {
+                        type: L2BlockSourceEvents.InvalidAttestationsCheckpointDetected,
+                        validationResult
+                    });
+                    continue;
+                }
+                // Check the inHash of the checkpoint against the l1->l2 messages.
+                // The messages should've been synced up to the currentL1BlockNumber and must be available for the published
+                // checkpoints we just retrieved.
+                const l1ToL2Messages = await this.store.getL1ToL2Messages(published.checkpoint.number);
+                const computedInHash = computeInHashFromL1ToL2Messages(l1ToL2Messages);
+                const publishedInHash = published.checkpoint.header.inHash;
+                if (!computedInHash.equals(publishedInHash)) {
+                    this.log.fatal(`Mismatch inHash for checkpoint ${published.checkpoint.number}`, {
+                        checkpointHash: published.checkpoint.hash(),
+                        l1BlockNumber: published.l1.blockNumber,
+                        computedInHash,
+                        publishedInHash
+                    });
+                    // Throwing an error since this is most likely caused by a bug.
+                    throw new Error(`Mismatch inHash for checkpoint ${published.checkpoint.number}. Expected ${computedInHash} but got ${publishedInHash}`);
+                }
+                validCheckpoints.push(published);
+                this.log.debug(`Ingesting new checkpoint ${published.checkpoint.number} with ${published.checkpoint.blocks.length} blocks`, {
+                    checkpointHash: published.checkpoint.hash(),
+                    l1BlockNumber: published.l1.blockNumber,
+                    ...published.checkpoint.header.toInspect(),
+                    blocks: published.checkpoint.blocks.map((b)=>b.getStats())
+                });
+            }
+            try {
+                const updatedValidationResult = rollupStatus.validationResult === initialValidationResult ? undefined : rollupStatus.validationResult;
+                const [processDuration] = await elapsed(()=>execInSpan(this.tracer, 'Archiver.addCheckpoints', ()=>this.updater.addCheckpointsWithContractData(validCheckpoints, updatedValidationResult)));
+                this.instrumentation.processNewBlocks(processDuration / validCheckpoints.length, validCheckpoints.flatMap((c)=>c.checkpoint.blocks));
+            } catch (err) {
+                if (err instanceof InitialCheckpointNumberNotSequentialError) {
+                    const { previousCheckpointNumber, newCheckpointNumber } = err;
+                    const previousCheckpoint = previousCheckpointNumber ? await this.store.getCheckpointData(CheckpointNumber(previousCheckpointNumber)) : undefined;
+                    const updatedL1SyncPoint = previousCheckpoint?.l1.blockNumber ?? this.l1constants.l1StartBlock;
+                    await this.store.setCheckpointSynchedL1BlockNumber(updatedL1SyncPoint);
+                    this.log.warn(`Attempting to insert checkpoint ${newCheckpointNumber} with previous block ${previousCheckpointNumber}. Rolling back L1 sync point to ${updatedL1SyncPoint} to try and fetch the missing blocks.`, {
+                        previousCheckpointNumber,
+                        newCheckpointNumber,
+                        updatedL1SyncPoint
+                    });
+                }
+                throw err;
+            }
+            for (const 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 = retrievedCheckpoints.at(-1)?.l1.blockNumber ?? lastL1BlockWithCheckpoint;
+        }while (searchEndBlock < currentL1BlockNumber)
+        // Important that we update AFTER inserting the blocks.
+        await updateProvenCheckpoint();
+        return {
+            ...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.store.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).
+            let latestLocalCheckpointArchive = undefined;
+            let targetL1BlockNumber = maxBigint(currentL1BlockNumber - 64n, 0n);
+            if (lastRetrievedCheckpoint) {
+                latestLocalCheckpointArchive = lastRetrievedCheckpoint.checkpoint.archive.root.toString();
+                targetL1BlockNumber = lastRetrievedCheckpoint.l1.blockNumber;
+            } else if (latestLocalCheckpointNumber > 0) {
+                const checkpoint = await this.store.getRangeOfCheckpoints(latestLocalCheckpointNumber, 1).then(([c])=>c);
+                latestLocalCheckpointArchive = checkpoint.archive.root.toString();
+                targetL1BlockNumber = checkpoint.l1.blockNumber;
+            }
+            this.log.warn(`Failed to reach checkpoint ${pendingCheckpointNumber} at ${currentL1BlockNumber} (latest is ${latestLocalCheckpointNumber}). ` + `Rolling back last synched L1 block number to ${targetL1BlockNumber}.`, {
+                latestLocalCheckpointNumber,
+                latestLocalCheckpointArchive,
+                blocksSynchedTo,
+                currentL1BlockNumber,
+                ...status
+            });
+            await this.store.setCheckpointSynchedL1BlockNumber(targetL1BlockNumber);
+        } else {
+            this.log.trace(`No new checkpoints behind L1 sync point to retrieve.`, {
+                latestLocalCheckpointNumber,
+                pendingCheckpointNumber
+            });
+        }
+    }
+    async getCheckpointHeader(number) {
+        const checkpoint = await this.store.getCheckpointData(number);
+        if (!checkpoint) {
+            return undefined;
+        }
+        return checkpoint.header;
+    }
+}