@aztec/archiver 0.0.1-commit.9593d84 → 0.0.1-commit.96bb3f7

package/dest/archiver/archiver.js

@@ -1,56 +1,462 @@
-function _ts_decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.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;
+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, _dec4, _initProto;
+import { GENESIS_BLOCK_HEADER_HASH, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { EpochCache } from '@aztec/epoch-cache';
-import { BlockTagTooOldError, InboxContract, RollupContract, createEthereumChain } from '@aztec/ethereum';
+import { createEthereumChain } from '@aztec/ethereum/chain';
+import { BlockTagTooOldError, InboxContract, RollupContract } from '@aztec/ethereum/contracts';
 import { maxBigint } from '@aztec/foundation/bigint';
+import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import { merge, pick } from '@aztec/foundation/collection';
-import { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/curves/bn254';
 import { createLogger } from '@aztec/foundation/log';
 import { promiseWithResolvers } from '@aztec/foundation/promise';
 import { RunningPromise, makeLoggingErrorHandler } from '@aztec/foundation/running-promise';
 import { count } from '@aztec/foundation/string';
 import { DateProvider, Timer, elapsed } from '@aztec/foundation/timer';
+import { isDefined } from '@aztec/foundation/types';
 import { ContractClassPublishedEvent, PrivateFunctionBroadcastedEvent, UtilityFunctionBroadcastedEvent } from '@aztec/protocol-contracts/class-registry';
 import { ContractInstancePublishedEvent, ContractInstanceUpdatedEvent } from '@aztec/protocol-contracts/instance-registry';
-import { L2Block, L2BlockSourceEvents, PublishedL2Block } from '@aztec/stdlib/block';
+import { CommitteeAttestation, GENESIS_CHECKPOINT_HEADER_HASH, L2Block, L2BlockSourceEvents, PublishedL2Block } from '@aztec/stdlib/block';
+import { Checkpoint, PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import { computePublicBytecodeCommitment, isValidPrivateFunctionMembershipProof, isValidUtilityFunctionMembershipProof } from '@aztec/stdlib/contract';
 import { getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getSlotRangeForEpoch, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
-import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
+import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
+import { execInSpan, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { EventEmitter } from 'events';
 import groupBy from 'lodash.groupby';
 import { createPublicClient, fallback, http } from 'viem';
-import { retrieveCheckpointsFromRollup, retrieveL1ToL2Message, retrieveL1ToL2Messages, retrievedToPublishedCheckpoint } from './data_retrieval.js';
-import { InitialBlockNumberNotSequentialError, NoBlobBodiesFoundError } from './errors.js';
+import { InitialCheckpointNumberNotSequentialError, NoBlobBodiesFoundError } from './errors.js';
 import { ArchiverInstrumentation } from './instrumentation.js';
+import { retrieveCheckpointsFromRollup, retrieveL1ToL2Message, retrieveL1ToL2Messages, retrievedToPublishedCheckpoint } from './l1/data_retrieval.js';
+import { validateAndLogTraceAvailability } from './l1/validate_trace.js';
 import { validateCheckpointAttestations } from './validation.js';
 function mapArchiverConfig(config) {
     return {
         pollingIntervalMs: config.archiverPollingIntervalMS,
         batchSize: config.archiverBatchSize,
-        skipValidateBlockAttestations: config.skipValidateBlockAttestations,
-        maxAllowedEthClientDriftSeconds: config.maxAllowedEthClientDriftSeconds
+        skipValidateCheckpointAttestations: config.skipValidateCheckpointAttestations,
+        maxAllowedEthClientDriftSeconds: config.maxAllowedEthClientDriftSeconds,
+        ethereumAllowNoDebugHosts: config.ethereumAllowNoDebugHosts
     };
 }
+_dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.sync'), _dec2 = trackSpan('Archiver.handleEpochPrune'), _dec3 = trackSpan('Archiver.handleL1ToL2Messages'), _dec4 = trackSpan('Archiver.handleCheckpoints');
 /**
  * Pulls checkpoints in a non-blocking manner and provides interface for their retrieval.
  * Responsible for handling robust L1 polling so that other components do not need to
  * concern themselves with it.
  */ export class Archiver extends EventEmitter {
     publicClient;
+    debugClient;
     l1Addresses;
     dataStore;
     config;
-    blobSinkClient;
+    blobClient;
     epochCache;
     dateProvider;
     instrumentation;
     l1constants;
     log;
+    static{
+        ({ e: [_initProto] } = _apply_decs_2203_r(this, [
+            [
+                _dec,
+                2,
+                "syncFromL1"
+            ],
+            [
+                _dec1,
+                2,
+                "sync"
+            ],
+            [
+                _dec2,
+                2,
+                "handleEpochPrune"
+            ],
+            [
+                _dec3,
+                2,
+                "handleL1ToL2Messages"
+            ],
+            [
+                _dec4,
+                2,
+                "handleCheckpoints"
+            ]
+        ], []));
+    }
     /** A loop in which we will be continually fetching new checkpoints. */ runningPromise;
     rollup;
     inbox;
@@ -59,18 +465,20 @@ function mapArchiverConfig(config) {
     l1Timestamp;
     initialSyncComplete;
     initialSyncPromise;
+    /** Queue of blocks to be added to the store, processed by the sync loop. */ blockQueue;
     tracer;
     /**
    * Creates a new instance of the Archiver.
    * @param publicClient - A client for interacting with the Ethereum node.
+   * @param debugClient - A client for interacting with the Ethereum node for debug/trace methods.
    * @param rollupAddress - Ethereum address of the rollup contract.
    * @param inboxAddress - Ethereum address of the inbox contract.
    * @param registryAddress - Ethereum address of the registry contract.
    * @param pollingIntervalMs - The interval for polling for L1 logs (in milliseconds).
    * @param store - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
    * @param log - A logger.
-   */ constructor(publicClient, l1Addresses, dataStore, config, blobSinkClient, epochCache, 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;
+   */ constructor(publicClient, debugClient, l1Addresses, dataStore, config, blobClient, epochCache, dateProvider, instrumentation, l1constants, log = createLogger('archiver')){
+        super(), this.publicClient = publicClient, this.debugClient = debugClient, this.l1Addresses = l1Addresses, this.dataStore = dataStore, this.config = config, this.blobClient = blobClient, this.epochCache = epochCache, this.dateProvider = dateProvider, this.instrumentation = instrumentation, this.l1constants = l1constants, this.log = log, this.initialSyncComplete = (_initProto(this), false), this.blockQueue = [];
         this.tracer = instrumentation.tracer;
         this.store = new ArchiverStoreHelper(dataStore);
         this.rollup = new RollupContract(publicClient, l1Addresses.rollupAddress);
@@ -90,15 +498,27 @@ function mapArchiverConfig(config) {
         const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
         const publicClient = createPublicClient({
             chain: chain.chainInfo,
-            transport: fallback(config.l1RpcUrls.map((url)=>http(url))),
+            transport: fallback(config.l1RpcUrls.map((url)=>http(url, {
+                    batch: false
+                }))),
+            pollingInterval: config.viemPollingIntervalMS
+        });
+        // Create debug client using debug RPC URLs if available, otherwise fall back to regular RPC URLs
+        const debugRpcUrls = config.l1DebugRpcUrls.length > 0 ? config.l1DebugRpcUrls : config.l1RpcUrls;
+        const debugClient = createPublicClient({
+            chain: chain.chainInfo,
+            transport: fallback(debugRpcUrls.map((url)=>http(url, {
+                    batch: false
+                }))),
             pollingInterval: config.viemPollingIntervalMS
         });
         const rollup = new RollupContract(publicClient, config.l1Contracts.rollupAddress);
-        const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot] = await Promise.all([
+        const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, genesisArchiveRoot, slashingProposerAddress] = await Promise.all([
             rollup.getL1StartBlock(),
             rollup.getL1GenesisTime(),
             rollup.getProofSubmissionEpochs(),
-            rollup.getGenesisArchiveTreeRoot()
+            rollup.getGenesisArchiveTreeRoot(),
+            rollup.getSlashingProposerAddress()
         ]);
         const l1StartBlockHash = await publicClient.getBlock({
             blockNumber: l1StartBlock,
@@ -113,16 +533,20 @@ function mapArchiverConfig(config) {
             slotDuration,
             ethereumSlotDuration,
             proofSubmissionEpochs: Number(proofSubmissionEpochs),
-            genesisArchiveRoot: Fr.fromHexString(genesisArchiveRoot)
+            genesisArchiveRoot: Fr.fromString(genesisArchiveRoot.toString())
         };
         const opts = merge({
             pollingIntervalMs: 10_000,
             batchSize: 100,
-            maxAllowedEthClientDriftSeconds: 300
+            maxAllowedEthClientDriftSeconds: 300,
+            ethereumAllowNoDebugHosts: false
         }, mapArchiverConfig(config));
         const epochCache = deps.epochCache ?? await EpochCache.create(config.l1Contracts.rollupAddress, config, deps);
         const telemetry = deps.telemetry ?? getTelemetryClient();
-        const archiver = new Archiver(publicClient, config.l1Contracts, archiverStore, opts, deps.blobSinkClient, epochCache, deps.dateProvider ?? new DateProvider(), await ArchiverInstrumentation.new(telemetry, ()=>archiverStore.estimateSize()), l1Constants);
+        const archiver = new Archiver(publicClient, debugClient, {
+            ...config.l1Contracts,
+            slashingProposerAddress
+        }, archiverStore, opts, deps.blobClient, epochCache, deps.dateProvider ?? new DateProvider(), await ArchiverInstrumentation.new(telemetry, ()=>archiverStore.estimateSize()), l1Constants);
         await archiver.start(blockUntilSynced);
         return archiver;
     }
@@ -136,16 +560,17 @@ function mapArchiverConfig(config) {
         if (this.runningPromise.isRunning()) {
             throw new Error('Archiver is already running');
         }
-        await this.blobSinkClient.testSources();
+        await this.blobClient.testSources();
         await this.testEthereumNodeSynced();
+        await validateAndLogTraceAvailability(this.debugClient, this.config.ethereumAllowNoDebugHosts ?? false);
         // Log initial state for the archiver
         const { l1StartBlock } = this.l1constants;
         const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = l1StartBlock } = await this.store.getSynchPoint();
-        const 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}`, {
+        const currentL2Checkpoint = await this.getSynchedCheckpointNumber();
+        this.log.info(`Starting archiver sync to rollup contract ${this.l1Addresses.rollupAddress.toString()} from L1 block ${blocksSynchedTo} and L2 checkpoint ${currentL2Checkpoint}`, {
             blocksSynchedTo,
             messagesSynchedTo,
-            currentL2Block
+            currentL2Checkpoint
         });
         // Start sync loop, and return the wait for initial sync if we are asked to block until synced
         this.runningPromise.start();
@@ -156,6 +581,51 @@ function mapArchiverConfig(config) {
     syncImmediate() {
         return this.runningPromise.trigger();
     }
+    /**
+   * Queues a block to be added to the archiver store and triggers processing.
+   * The block will be processed by the sync loop.
+   * Implements the L2BlockSink interface.
+   * @param block - The L2 block to add.
+   * @returns A promise that resolves when the block has been added to the store, or rejects on error.
+   */ addBlock(block) {
+        return new Promise((resolve, reject)=>{
+            this.blockQueue.push({
+                block,
+                resolve,
+                reject
+            });
+            this.log.debug(`Queued block ${block.number} for processing`);
+            // Trigger an immediate sync, but don't wait for it - the promise resolves when the block is processed
+            this.syncImmediate().catch((err)=>{
+                this.log.error(`Sync immediate call failed: ${err}`);
+            });
+        });
+    }
+    /**
+   * Processes all queued blocks, adding them to the store.
+   * Called at the beginning of each sync iteration.
+   * Blocks are processed in the order they were queued.
+   */ async processQueuedBlocks() {
+        if (this.blockQueue.length === 0) {
+            return;
+        }
+        // Take all blocks from the queue
+        const queuedItems = this.blockQueue.splice(0, this.blockQueue.length);
+        this.log.debug(`Processing ${queuedItems.length} queued block(s)`);
+        // Process each block individually to properly resolve/reject each promise
+        for (const { block, resolve, reject } of queuedItems){
+            try {
+                await this.store.addBlocks([
+                    block
+                ]);
+                this.log.debug(`Added block ${block.number} to store`);
+                resolve();
+            } catch (err) {
+                this.log.error(`Failed to add block ${block.number} to store: ${err.message}`);
+                reject(err);
+            }
+        }
+    }
     waitForInitialSync() {
         return this.initialSyncPromise.promise;
     }
@@ -172,9 +642,7 @@ function mapArchiverConfig(config) {
             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() {
+    async syncFromL1() {
         /**
      * We keep track of three "pointers" to L1 blocks:
      * 1. the last L1 block that published an L2 block
@@ -248,7 +716,7 @@ function mapArchiverConfig(config) {
             // 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);
+                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
@@ -277,6 +745,14 @@ function mapArchiverConfig(config) {
             this.initialSyncPromise.resolve();
         }
     }
+    /**
+   * Fetches logs from L1 contracts and processes them.
+   */ async sync() {
+        // Process any queued blocks first, before doing L1 sync
+        await this.processQueuedBlocks();
+        // Now perform L1 sync
+        await this.syncFromL1();
+    }
     /** Queries the rollup contract on whether a prune can be executed on the immediate next L1 block. */ async canPrune(currentL1BlockNumber, currentL1Timestamp) {
         const time = (currentL1Timestamp ?? 0n) + BigInt(this.l1constants.ethereumSlotDuration);
         const result = await this.rollup.canPruneAtTime(time, {
@@ -297,20 +773,25 @@ function mapArchiverConfig(config) {
         const canPrune = localPendingCheckpointNumber > provenCheckpointNumber && rollupCanPrune;
         if (canPrune) {
             const timer = new Timer();
-            const pruneFrom = provenCheckpointNumber + 1;
-            const header = await this.getCheckpointHeader(Number(pruneFrom));
+            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 checkpoints = await this.getCheckpoints(Number(provenCheckpointNumber) + 1, Number(checkpointsToUnwind));
+            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.emit(L2BlockSourceEvents.L2PruneDetected, {
                 type: L2BlockSourceEvents.L2PruneDetected,
                 epochNumber: pruneFromEpochNumber,
-                blocks: checkpoints.flatMap((c)=>L2Block.fromCheckpoint(c))
+                blocks: newBlocks
             });
             this.log.debug(`L2 prune from ${provenCheckpointNumber + 1} to ${localPendingCheckpointNumber} will occur on next checkpoint submission.`);
             await this.unwindCheckpoints(localPendingCheckpointNumber, checkpointsToUnwind);
@@ -406,7 +887,7 @@ function mapArchiverConfig(config) {
         }while (searchEndBlock < currentL1BlockNumber)
         // Log stats for messages retrieved (if any).
         if (messageCount > 0) {
-            this.log.info(`Retrieved ${messageCount} new L1 to L2 messages up to message with index ${lastMessage?.index} for L2 block ${lastMessage?.l2BlockNumber}`, {
+            this.log.info(`Retrieved ${messageCount} new L1 to L2 messages up to message with index ${lastMessage?.index} for checkpoint ${lastMessage?.checkpointNumber}`, {
                 lastMessage,
                 messageCount
             });
@@ -486,16 +967,14 @@ function mapArchiverConfig(config) {
     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 provenCheckpointNumber = Number(rollupProvenCheckpointNumber);
-        const pendingCheckpointNumber = Number(rollupPendingCheckpointNumber);
+        const { provenCheckpointNumber, provenArchive, pendingCheckpointNumber, pendingArchive, archiveOfMyCheckpoint: archiveForLocalPendingCheckpointNumber } = await execInSpan(this.tracer, 'Archiver.getRollupStatus', ()=>this.rollup.status(localPendingCheckpointNumber, {
+                blockNumber: currentL1BlockNumber
+            }));
         const rollupStatus = {
             provenCheckpointNumber,
-            provenArchive,
+            provenArchive: provenArchive.toString(),
             pendingCheckpointNumber,
-            pendingArchive,
+            pendingArchive: pendingArchive.toString(),
             validationResult: initialValidationResult
         };
         this.log.trace(`Retrieved rollup status at current L1 block ${currentL1BlockNumber}.`, {
@@ -518,16 +997,15 @@ function mapArchiverConfig(config) {
                     });
                 }
             }
-            const localCheckpointForDestinationProvenCheckpointNumber = await this.getCheckpoint(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.getSynchedCheckpointNumber();
-            if (localCheckpointForDestinationProvenCheckpointNumber && synched < localCheckpointForDestinationProvenCheckpointNumber.number) {
-                this.log.error(`Hit local checkpoint greater than last synched checkpoint: ${localCheckpointForDestinationProvenCheckpointNumber.number} > ${synched}`);
+            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'}`);
-            const lastProvenBlockNumber = await this.getLastBlockNumberInCheckpoint(provenCheckpointNumber);
-            if (localCheckpointForDestinationProvenCheckpointNumber && provenArchive === localCheckpointForDestinationProvenCheckpointNumber.archive.root.toString()) {
+            if (localCheckpointForDestinationProvenCheckpointNumber && provenArchive.equals(localCheckpointForDestinationProvenCheckpointNumber.archive.root)) {
                 const localProvenCheckpointNumber = await this.getProvenCheckpointNumber();
                 if (localProvenCheckpointNumber !== provenCheckpointNumber) {
                     await this.setProvenCheckpointNumber(provenCheckpointNumber);
@@ -536,23 +1014,24 @@ function mapArchiverConfig(config) {
                     });
                     const provenSlotNumber = localCheckpointForDestinationProvenCheckpointNumber.header.slotNumber;
                     const provenEpochNumber = getEpochAtSlot(provenSlotNumber, this.l1constants);
+                    const lastBlockNumberInCheckpoint = localCheckpointForDestinationProvenCheckpointNumber.startBlock + localCheckpointForDestinationProvenCheckpointNumber.numBlocks - 1;
                     this.emit(L2BlockSourceEvents.L2BlockProven, {
                         type: L2BlockSourceEvents.L2BlockProven,
-                        blockNumber: BigInt(lastProvenBlockNumber),
+                        blockNumber: BlockNumber(lastBlockNumberInCheckpoint),
                         slotNumber: provenSlotNumber,
                         epochNumber: provenEpochNumber
                     });
+                    this.instrumentation.updateLastProvenBlock(lastBlockNumberInCheckpoint);
                 } else {
                     this.log.trace(`Proven checkpoint ${provenCheckpointNumber} already stored.`);
                 }
             }
-            this.instrumentation.updateLastProvenBlock(lastProvenBlockNumber);
         };
         // 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);
+            await this.store.setCheckpointSynchedL1BlockNumber(currentL1BlockNumber);
             this.log.debug(`No checkpoints to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}, no checkpoints on chain`);
             return rollupStatus;
         }
@@ -560,12 +1039,12 @@ function mapArchiverConfig(config) {
         // 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.getCheckpoint(localPendingCheckpointNumber);
+            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 === localPendingArchiveRoot;
+            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
@@ -578,7 +1057,7 @@ function mapArchiverConfig(config) {
                 this.log.debug(`No checkpoints to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
                 return rollupStatus;
             }
-            const localPendingCheckpointInChain = archiveForLocalPendingCheckpointNumber === localPendingArchiveRoot;
+            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.
@@ -591,16 +1070,16 @@ function mapArchiverConfig(config) {
                 });
                 let tipAfterUnwind = localPendingCheckpointNumber;
                 while(true){
-                    const candidateCheckpoint = await this.getCheckpoint(tipAfterUnwind);
+                    const candidateCheckpoint = await this.store.getCheckpointData(tipAfterUnwind);
                     if (candidateCheckpoint === undefined) {
                         break;
                     }
-                    const archiveAtContract = await this.rollup.archiveAt(BigInt(candidateCheckpoint.number));
-                    this.log.trace(`Checking local checkpoint ${candidateCheckpoint.number} with archive ${candidateCheckpoint.archive.root}`, {
+                    const archiveAtContract = await this.rollup.archiveAt(candidateCheckpoint.checkpointNumber);
+                    this.log.trace(`Checking local checkpoint ${candidateCheckpoint.checkpointNumber} with archive ${candidateCheckpoint.archive.root}`, {
                         archiveAtContract,
                         archiveLocal: candidateCheckpoint.archive.root.toString()
                     });
-                    if (archiveAtContract === candidateCheckpoint.archive.root.toString()) {
+                    if (archiveAtContract.equals(candidateCheckpoint.archive.root)) {
                         break;
                     }
                     tipAfterUnwind--;
@@ -619,8 +1098,8 @@ function mapArchiverConfig(config) {
         do {
             [searchStartBlock, searchEndBlock] = this.nextRange(searchEndBlock, currentL1BlockNumber);
             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);
+            // TODO(md): Retrieve from blob client then from consensus client, then from peers
+            const retrievedCheckpoints = await execInSpan(this.tracer, 'Archiver.retrieveCheckpointsFromRollup', ()=>retrieveCheckpointsFromRollup(this.rollup.getContract(), this.publicClient, this.debugClient, this.blobClient, searchStartBlock, searchEndBlock, this.l1Addresses, this.instrumentation, this.log, !this.initialSyncComplete));
             if (retrievedCheckpoints.length === 0) {
                 // We are not calling `setBlockSynchedL1BlockNumber` because it may cause sync issues if based off infura.
                 // See further details in earlier comments.
@@ -635,7 +1114,7 @@ function mapArchiverConfig(config) {
             const publishedCheckpoints = await Promise.all(retrievedCheckpoints.map((b)=>retrievedToPublishedCheckpoint(b)));
             const validCheckpoints = [];
             for (const published of publishedCheckpoints){
-                const validationResult = this.config.skipValidateBlockAttestations ? {
+                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
@@ -643,7 +1122,7 @@ function mapArchiverConfig(config) {
                 // 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) {
+                if (rollupStatus.validationResult?.valid !== validationResult.valid || !rollupStatus.validationResult.valid && !validationResult.valid && rollupStatus.validationResult.checkpoint.checkpointNumber === validationResult.checkpoint.checkpointNumber) {
                     rollupStatus.validationResult = validationResult;
                 }
                 if (!validationResult.valid) {
@@ -652,13 +1131,29 @@ function mapArchiverConfig(config) {
                         l1BlockNumber: published.l1.blockNumber,
                         ...pick(validationResult, 'reason')
                     });
-                    // Emit event for invalid block detection
-                    this.emit(L2BlockSourceEvents.InvalidAttestationsBlockDetected, {
-                        type: L2BlockSourceEvents.InvalidAttestationsBlockDetected,
+                    // Emit event for invalid checkpoint detection
+                    this.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.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(),
@@ -669,18 +1164,17 @@ function mapArchiverConfig(config) {
             }
             try {
                 const updatedValidationResult = rollupStatus.validationResult === initialValidationResult ? undefined : rollupStatus.validationResult;
-                const [processDuration] = await elapsed(()=>this.addCheckpoints(validCheckpoints, updatedValidationResult));
+                const [processDuration] = await elapsed(()=>execInSpan(this.tracer, 'Archiver.addCheckpoints', ()=>this.addCheckpoints(validCheckpoints, updatedValidationResult)));
                 this.instrumentation.processNewBlocks(processDuration / validCheckpoints.length, validCheckpoints.flatMap((c)=>c.checkpoint.blocks));
             } catch (err) {
-                if (err instanceof InitialBlockNumberNotSequentialError) {
-                    const { previousBlockNumber, newBlockNumber } = err;
-                    const previousBlock = previousBlockNumber ? await this.store.getPublishedBlock(previousBlockNumber) : undefined;
-                    const updatedL1SyncPoint = previousBlock?.l1.blockNumber ?? this.l1constants.l1StartBlock;
+                if (err instanceof InitialCheckpointNumberNotSequentialError) {
+                    const { previousCheckpointNumber, newCheckpointNumber } = err;
+                    const previousCheckpoint = previousCheckpointNumber ? await this.store.getCheckpointData(CheckpointNumber(previousCheckpointNumber)) : undefined;
+                    const updatedL1SyncPoint = previousCheckpoint?.l1.blockNumber ?? this.l1constants.l1StartBlock;
                     await this.store.setBlockSynchedL1BlockNumber(updatedL1SyncPoint);
-                    this.log.warn(`Attempting to insert block ${newBlockNumber} with previous block ${previousBlockNumber}. Rolling back L1 sync point to ${updatedL1SyncPoint} to try and fetch the missing blocks.`, {
-                        previousBlockNumber,
-                        previousBlockHash: await previousBlock?.block.hash(),
-                        newBlockNumber,
+                    this.log.warn(`Attempting to insert checkpoint ${newCheckpointNumber} with previous block ${previousCheckpointNumber}. Rolling back L1 sync point to ${updatedL1SyncPoint} to try and fetch the missing blocks.`, {
+                        previousCheckpointNumber,
+                        newCheckpointNumber,
                         updatedL1SyncPoint
                     });
                 }
@@ -698,7 +1192,7 @@ function mapArchiverConfig(config) {
                 });
             }
             lastRetrievedCheckpoint = validCheckpoints.at(-1) ?? lastRetrievedCheckpoint;
-            lastL1BlockWithCheckpoint = publishedCheckpoints.at(-1)?.l1.blockNumber ?? lastL1BlockWithCheckpoint;
+            lastL1BlockWithCheckpoint = retrievedCheckpoints.at(-1)?.l1.blockNumber ?? lastL1BlockWithCheckpoint;
         }while (searchEndBlock < currentL1BlockNumber)
         // Important that we update AFTER inserting the blocks.
         await updateProvenCheckpoint();
@@ -719,9 +1213,16 @@ function mapArchiverConfig(config) {
             // 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();
+            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,
@@ -785,31 +1286,44 @@ function mapArchiverConfig(config) {
     async getBlocksForEpoch(epochNumber) {
         const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1constants);
         const blocks = [];
-        // Walk the list of blocks backwards and filter by slots matching the requested epoch.
-        // We'll typically ask for blocks for a very recent epoch, so we shouldn't need an index here.
-        let block = await this.getBlock(await this.store.getSynchedL2BlockNumber());
-        const slot = (b)=>b.header.globalVariables.slotNumber;
-        while(block && slot(block) >= start){
-            if (slot(block) <= end) {
-                blocks.push(block);
+        // Walk the list of checkpoints backwards and filter by slots matching the requested epoch.
+        // We'll typically ask for checkpoints for a very recent epoch, so we shouldn't need an index here.
+        let checkpoint = await this.store.getCheckpointData(await this.store.getSynchedCheckpointNumber());
+        const slot = (b)=>b.header.slotNumber;
+        while(checkpoint && slot(checkpoint) >= start){
+            if (slot(checkpoint) <= end) {
+                // push the blocks on backwards
+                const endBlock = checkpoint.startBlock + checkpoint.numBlocks - 1;
+                for(let i = endBlock; i >= checkpoint.startBlock; i--){
+                    const block = await this.getBlock(BlockNumber(i));
+                    if (block) {
+                        blocks.push(block);
+                    }
+                }
             }
-            block = await this.getBlock(block.number - 1);
+            checkpoint = await this.store.getCheckpointData(CheckpointNumber(checkpoint.checkpointNumber - 1));
         }
         return blocks.reverse();
     }
     async getBlockHeadersForEpoch(epochNumber) {
         const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1constants);
         const blocks = [];
-        // Walk the list of blocks backwards and filter by slots matching the requested epoch.
-        // We'll typically ask for blocks for a very recent epoch, so we shouldn't need an index here.
-        let number = await this.store.getSynchedL2BlockNumber();
-        let header = await this.getBlockHeader(number);
-        const slot = (b)=>b.globalVariables.slotNumber;
-        while(header && slot(header) >= start){
-            if (slot(header) <= end) {
-                blocks.push(header);
+        // Walk the list of checkpoints backwards and filter by slots matching the requested epoch.
+        // We'll typically ask for checkpoints for a very recent epoch, so we shouldn't need an index here.
+        let checkpoint = await this.store.getCheckpointData(await this.store.getSynchedCheckpointNumber());
+        const slot = (b)=>b.header.slotNumber;
+        while(checkpoint && slot(checkpoint) >= start){
+            if (slot(checkpoint) <= end) {
+                // push the blocks on backwards
+                const endBlock = checkpoint.startBlock + checkpoint.numBlocks - 1;
+                for(let i = endBlock; i >= checkpoint.startBlock; i--){
+                    const block = await this.getBlockHeader(BlockNumber(i));
+                    if (block) {
+                        blocks.push(block);
+                    }
+                }
             }
-            header = await this.getBlockHeader(--number);
+            checkpoint = await this.store.getCheckpointData(CheckpointNumber(checkpoint.checkpointNumber - 1));
         }
         return blocks.reverse();
     }
@@ -840,24 +1354,6 @@ function mapArchiverConfig(config) {
     /** 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();
@@ -865,53 +1361,36 @@ function mapArchiverConfig(config) {
         if (number === 0) {
             return undefined;
         }
-        const checkpoint = await this.getCheckpoint(number);
-        return checkpoint?.header;
+        const checkpoint = await this.store.getCheckpointData(number);
+        if (!checkpoint) {
+            return undefined;
+        }
+        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();
+        return this.store.getSynchedCheckpointNumber();
     }
     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();
+        return this.store.getProvenCheckpointNumber();
     }
     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);
+        return this.store.setProvenCheckpointNumber(checkpointNumber);
     }
     unwindCheckpoints(from, checkpointsToUnwind) {
-        // TODO: This only works if we have one block per checkpoint.
-        return this.store.unwindBlocks(from, checkpointsToUnwind);
+        return this.store.unwindCheckpoints(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);
+    async getLastBlockNumberInCheckpoint(checkpointNumber) {
+        const checkpointData = await this.store.getCheckpointData(checkpointNumber);
+        if (!checkpointData) {
+            return undefined;
+        }
+        return BlockNumber(checkpointData.startBlock + checkpointData.numBlocks - 1);
     }
     addCheckpoints(checkpoints, pendingChainValidationStatus) {
-        return this.store.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.
-   */ 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.getPublishedBlocks(from, limitWithProven);
-    }
-    getPublishedBlockByHash(blockHash) {
-        return this.store.getPublishedBlockByHash(blockHash);
-    }
-    getPublishedBlockByArchive(archive) {
-        return this.store.getPublishedBlockByArchive(archive);
+        return this.store.addCheckpoints(checkpoints, pendingChainValidationStatus);
     }
     getBlockHeaderByHash(blockHash) {
         return this.store.getBlockHeaderByHash(blockHash);
@@ -923,7 +1402,7 @@ function mapArchiverConfig(config) {
    * Gets an l2 block.
    * @param number - The block number to return.
    * @returns The requested L2 block.
-   */ async getBlock(number) {
+   */ async getL2BlockNew(number) {
         // If the number provided is -ve, then return the latest block.
         if (number < 0) {
             number = await this.store.getSynchedL2BlockNumber();
@@ -931,8 +1410,16 @@ function mapArchiverConfig(config) {
         if (number === 0) {
             return undefined;
         }
-        const publishedBlock = await this.store.getPublishedBlock(number);
-        return publishedBlock?.block;
+        const publishedBlock = await this.store.store.getBlock(number);
+        return publishedBlock;
+    }
+    async getL2BlocksNew(from, limit, proven) {
+        const blocks = await this.store.store.getBlocks(from, limit);
+        if (proven === true) {
+            const provenBlockNumber = await this.store.getProvenBlockNumber();
+            return blocks.filter((b)=>b.number <= provenBlockNumber);
+        }
+        return blocks;
     }
     async getBlockHeader(number) {
         if (number === 'latest') {
@@ -944,27 +1431,40 @@ function mapArchiverConfig(config) {
         const headers = await this.store.getBlockHeaders(number, 1);
         return headers.length === 0 ? undefined : headers[0];
     }
+    getCheckpointedBlock(number) {
+        return this.store.getCheckpointedBlock(number);
+    }
+    async getCheckpointedBlocks(from, limit, proven) {
+        const blocks = await this.store.store.getCheckpointedBlocks(from, limit);
+        if (proven === true) {
+            const provenBlockNumber = await this.store.getProvenBlockNumber();
+            return blocks.filter((b)=>b.block.number <= provenBlockNumber);
+        }
+        return blocks;
+    }
+    getCheckpointedBlockByHash(blockHash) {
+        return this.store.getCheckpointedBlockByHash(blockHash);
+    }
+    getProvenBlockNumber() {
+        return this.store.getProvenBlockNumber();
+    }
+    getCheckpointedBlockNumber() {
+        return this.store.getCheckpointedL2BlockNumber();
+    }
+    getCheckpointedBlockByArchive(archive) {
+        return this.store.getCheckpointedBlockByArchive(archive);
+    }
     getTxEffect(txHash) {
         return this.store.getTxEffect(txHash);
     }
     getSettledTxReceipt(txHash) {
         return this.store.getSettledTxReceipt(txHash);
     }
-    /**
-   * Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
-   * @param from - The block number from which to begin retrieving logs.
-   * @param limit - The maximum number of blocks to retrieve logs from.
-   * @returns An array of private logs from the specified range of blocks.
-   */ getPrivateLogs(from, limit) {
-        return this.store.getPrivateLogs(from, limit);
+    getPrivateLogsByTags(tags) {
+        return this.store.getPrivateLogsByTags(tags);
     }
-    /**
-   * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-   * @param tags - The tags to filter the logs by.
-   * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
-   * that tag.
-   */ getLogsByTags(tags) {
-        return this.store.getLogsByTags(tags);
+    getPublicLogsByTagsFromContract(contractAddress, tags) {
+        return this.store.getPublicLogsByTagsFromContract(contractAddress, tags);
     }
     /**
    * Gets public logs based on the provided filter.
@@ -982,15 +1482,10 @@ function mapArchiverConfig(config) {
     }
     /**
    * Gets the number of the latest L2 block processed by the block source implementation.
+   * This includes both checkpointed and uncheckpointed blocks.
    * @returns The number of the latest L2 block processed by the block source implementation.
    */ getBlockNumber() {
-        return this.store.getSynchedL2BlockNumber();
-    }
-    getProvenBlockNumber() {
-        return this.store.getProvenL2BlockNumber();
-    }
-    /** Forcefully updates the last proven block number. Use for testing. */ setProvenBlockNumber(blockNumber) {
-        return this.store.setProvenL2BlockNumber(blockNumber);
+        return this.store.getLatestBlockNumber();
     }
     getContractClass(id) {
         return this.store.getContractClass(id);
@@ -1010,11 +1505,11 @@ function mapArchiverConfig(config) {
         return this.store.getContractInstance(address, timestamp);
     }
     /**
-   * Gets L1 to L2 message (to be) included in a given block.
-   * @param blockNumber - L2 block number to get messages for.
+   * Gets L1 to L2 message (to be) included in a given checkpoint.
+   * @param checkpointNumber - Checkpoint number to get messages for.
    * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
-   */ getL1ToL2Messages(blockNumber) {
-        return this.store.getL1ToL2Messages(blockNumber);
+   */ getL1ToL2Messages(checkpointNumber) {
+        return this.store.getL1ToL2Messages(checkpointNumber);
     }
     /**
    * Gets the L1 to L2 message index in the L1 to L2 message tree.
@@ -1041,65 +1536,114 @@ function mapArchiverConfig(config) {
         return this.getPendingChainValidationStatus().then((status)=>!status.valid);
     }
     async getL2Tips() {
-        const [latestBlockNumber, provenBlockNumber] = await Promise.all([
+        const [latestBlockNumber, provenBlockNumber, checkpointedBlockNumber] = await Promise.all([
             this.getBlockNumber(),
-            this.getProvenBlockNumber()
+            this.getProvenBlockNumber(),
+            this.getCheckpointedBlockNumber()
         ]);
         // 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,
-            finalizedBlockNumber > 0 ? this.getBlockHeader(finalizedBlockNumber) : undefined
+        const finalizedBlockNumber = BlockNumber(Math.max(provenBlockNumber - this.l1constants.epochDuration * 2, 0));
+        const beforeInitialblockNumber = BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
+        // Get the latest block header and checkpointed blocks for proven, finalised and checkpointed blocks
+        const [latestBlockHeader, provenCheckpointedBlock, finalizedCheckpointedBlock, checkpointedBlock] = await Promise.all([
+            latestBlockNumber > beforeInitialblockNumber ? this.getBlockHeader(latestBlockNumber) : undefined,
+            provenBlockNumber > beforeInitialblockNumber ? this.getCheckpointedBlock(provenBlockNumber) : undefined,
+            finalizedBlockNumber > beforeInitialblockNumber ? this.getCheckpointedBlock(finalizedBlockNumber) : undefined,
+            checkpointedBlockNumber > beforeInitialblockNumber ? this.getCheckpointedBlock(checkpointedBlockNumber) : undefined
         ]);
-        if (latestBlockNumber > 0 && !latestBlockHeader) {
+        if (latestBlockNumber > beforeInitialblockNumber && !latestBlockHeader) {
             throw new Error(`Failed to retrieve latest block header for block ${latestBlockNumber}`);
         }
-        if (provenBlockNumber > 0 && !provenBlockHeader) {
-            throw new Error(`Failed to retrieve proven block header for block ${provenBlockNumber} (latest block is ${latestBlockNumber})`);
+        // Checkpointed blocks must exist for proven, finalized and checkpointed tips if they are beyond the initial block number.
+        if (checkpointedBlockNumber > beforeInitialblockNumber && !checkpointedBlock?.block.header) {
+            throw new Error(`Failed to retrieve checkpointed block header for block ${checkpointedBlockNumber} (latest block is ${latestBlockNumber})`);
         }
-        if (finalizedBlockNumber > 0 && !finalizedBlockHeader) {
+        if (provenBlockNumber > beforeInitialblockNumber && !provenCheckpointedBlock?.block.header) {
+            throw new Error(`Failed to retrieve proven checkpointed for block ${provenBlockNumber} (latest block is ${latestBlockNumber})`);
+        }
+        if (finalizedBlockNumber > beforeInitialblockNumber && !finalizedCheckpointedBlock?.block.header) {
             throw new Error(`Failed to retrieve finalized block header for block ${finalizedBlockNumber} (latest block is ${latestBlockNumber})`);
         }
-        const latestBlockHeaderHash = await latestBlockHeader?.hash();
-        const provenBlockHeaderHash = await provenBlockHeader?.hash();
-        const finalizedBlockHeaderHash = await finalizedBlockHeader?.hash();
-        return {
-            latest: {
+        const latestBlockHeaderHash = await latestBlockHeader?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
+        const provenBlockHeaderHash = await provenCheckpointedBlock?.block.header?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
+        const finalizedBlockHeaderHash = await finalizedCheckpointedBlock?.block.header?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
+        const checkpointedBlockHeaderHash = await checkpointedBlock?.block.header?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
+        // Now attempt to retrieve checkpoints for proven, finalised and checkpointed blocks
+        const [[provenBlockCheckpoint], [finalizedBlockCheckpoint], [checkpointedBlockCheckpoint]] = await Promise.all([
+            provenCheckpointedBlock !== undefined ? await this.getPublishedCheckpoints(provenCheckpointedBlock?.checkpointNumber, 1) : [
+                undefined
+            ],
+            finalizedCheckpointedBlock !== undefined ? await this.getPublishedCheckpoints(finalizedCheckpointedBlock?.checkpointNumber, 1) : [
+                undefined
+            ],
+            checkpointedBlock !== undefined ? await this.getPublishedCheckpoints(checkpointedBlock?.checkpointNumber, 1) : [
+                undefined
+            ]
+        ]);
+        const initialcheckpointId = {
+            number: CheckpointNumber.ZERO,
+            hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
+        };
+        const makeCheckpointId = (checkpoint)=>{
+            if (checkpoint === undefined) {
+                return initialcheckpointId;
+            }
+            return {
+                number: checkpoint.checkpoint.number,
+                hash: checkpoint.checkpoint.hash().toString()
+            };
+        };
+        const l2Tips = {
+            proposed: {
                 number: latestBlockNumber,
-                hash: latestBlockHeaderHash?.toString()
+                hash: latestBlockHeaderHash.toString()
             },
             proven: {
-                number: provenBlockNumber,
-                hash: provenBlockHeaderHash?.toString()
+                block: {
+                    number: provenBlockNumber,
+                    hash: provenBlockHeaderHash.toString()
+                },
+                checkpoint: makeCheckpointId(provenBlockCheckpoint)
             },
             finalized: {
-                number: finalizedBlockNumber,
-                hash: finalizedBlockHeaderHash?.toString()
+                block: {
+                    number: finalizedBlockNumber,
+                    hash: finalizedBlockHeaderHash.toString()
+                },
+                checkpoint: makeCheckpointId(finalizedBlockCheckpoint)
+            },
+            checkpointed: {
+                block: {
+                    number: checkpointedBlockNumber,
+                    hash: checkpointedBlockHeaderHash.toString()
+                },
+                checkpoint: makeCheckpointId(checkpointedBlockCheckpoint)
             }
         };
+        return l2Tips;
     }
     async rollbackTo(targetL2BlockNumber) {
+        // TODO(pw/mbps): This still assumes 1 block per checkpoint
         const currentBlocks = await this.getL2Tips();
-        const currentL2Block = currentBlocks.latest.number;
-        const currentProvenBlock = currentBlocks.proven.number;
-        // const currentFinalizedBlock = currentBlocks.finalized.number;
+        const currentL2Block = currentBlocks.proposed.number;
+        const currentProvenBlock = currentBlocks.proven.block.number;
         if (targetL2BlockNumber >= currentL2Block) {
             throw new Error(`Target L2 block ${targetL2BlockNumber} must be less than current L2 block ${currentL2Block}`);
         }
         const blocksToUnwind = currentL2Block - targetL2BlockNumber;
-        const targetL2Block = await this.store.getPublishedBlock(targetL2BlockNumber);
+        const targetL2Block = await this.store.getCheckpointedBlock(targetL2BlockNumber);
         if (!targetL2Block) {
             throw new Error(`Target L2 block ${targetL2BlockNumber} not found`);
         }
         const targetL1BlockNumber = targetL2Block.l1.blockNumber;
+        const targetCheckpointNumber = CheckpointNumber.fromBlockNumber(targetL2BlockNumber);
         const targetL1BlockHash = await this.getL1BlockHash(targetL1BlockNumber);
-        this.log.info(`Unwinding ${blocksToUnwind} blocks from L2 block ${currentL2Block}`);
-        await this.store.unwindBlocks(currentL2Block, blocksToUnwind);
-        this.log.info(`Unwinding L1 to L2 messages to ${targetL2BlockNumber}`);
-        await this.store.rollbackL1ToL2MessagesToL2Block(targetL2BlockNumber);
+        this.log.info(`Unwinding ${blocksToUnwind} checkpoints from L2 block ${currentL2Block}`);
+        await this.store.unwindCheckpoints(CheckpointNumber(currentL2Block), blocksToUnwind);
+        this.log.info(`Unwinding L1 to L2 messages to checkpoint ${targetCheckpointNumber}`);
+        await this.store.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
         this.log.info(`Setting L1 syncpoints to ${targetL1BlockNumber}`);
         await this.store.setBlockSynchedL1BlockNumber(targetL1BlockNumber);
         await this.store.setMessageSynchedL1Block({
@@ -1108,7 +1652,7 @@ function mapArchiverConfig(config) {
         });
         if (targetL2BlockNumber < currentProvenBlock) {
             this.log.info(`Clearing proven L2 block number`);
-            await this.store.setProvenL2BlockNumber(0);
+            await this.store.setProvenCheckpointNumber(CheckpointNumber.ZERO);
         }
     // TODO(palla/reorg): Set the finalized block when we add support for it.
     // if (targetL2BlockNumber < currentFinalizedBlock) {
@@ -1116,10 +1660,104 @@ function mapArchiverConfig(config) {
     //   await this.store.setFinalizedL2BlockNumber(0);
     // }
     }
+    async getPublishedCheckpoints(checkpointNumber, limit) {
+        const checkpoints = await this.store.getRangeOfCheckpoints(checkpointNumber, limit);
+        const blocks = (await Promise.all(checkpoints.map((ch)=>this.store.getBlocksForCheckpoint(ch.checkpointNumber)))).filter(isDefined);
+        const fullCheckpoints = [];
+        for(let i = 0; i < checkpoints.length; i++){
+            const blocksForCheckpoint = blocks[i];
+            const checkpoint = checkpoints[i];
+            const fullCheckpoint = new Checkpoint(checkpoint.archive, checkpoint.header, blocksForCheckpoint, checkpoint.checkpointNumber);
+            const publishedCheckpoint = new PublishedCheckpoint(fullCheckpoint, checkpoint.l1, checkpoint.attestations.map((x)=>CommitteeAttestation.fromBuffer(x)));
+            fullCheckpoints.push(publishedCheckpoint);
+        }
+        return fullCheckpoints;
+    }
+    async getCheckpointsForEpoch(epochNumber) {
+        const [start, end] = getSlotRangeForEpoch(epochNumber, this.l1constants);
+        const checkpoints = [];
+        // Walk the list of checkpoints backwards and filter by slots matching the requested epoch.
+        // We'll typically ask for checkpoints for a very recent epoch, so we shouldn't need an index here.
+        let checkpointData = await this.store.getCheckpointData(await this.store.getSynchedCheckpointNumber());
+        const slot = (b)=>b.header.slotNumber;
+        while(checkpointData && slot(checkpointData) >= start){
+            if (slot(checkpointData) <= end) {
+                // push the checkpoints on backwards
+                const [checkpoint] = await this.getPublishedCheckpoints(checkpointData.checkpointNumber, 1);
+                checkpoints.push(checkpoint.checkpoint);
+            }
+            checkpointData = await this.store.getCheckpointData(CheckpointNumber(checkpointData.checkpointNumber - 1));
+        }
+        return checkpoints.reverse();
+    }
+    /* Legacy APIs */ async getPublishedBlockByHash(blockHash) {
+        const checkpointedBlock = await this.store.getCheckpointedBlockByHash(blockHash);
+        return this.buildOldBlockFromCheckpointedBlock(checkpointedBlock);
+    }
+    async getPublishedBlockByArchive(archive) {
+        const checkpointedBlock = await this.store.getCheckpointedBlockByArchive(archive);
+        return this.buildOldBlockFromCheckpointedBlock(checkpointedBlock);
+    }
+    /**
+   * Gets up to `limit` amount of L2 blocks starting from `from`.
+   * @param from - Number of the first block to return (inclusive).
+   * @param limit - The number of blocks to return.
+   * @param proven - If true, only return blocks that have been proven.
+   * @returns The requested L2 blocks.
+   */ async getBlocks(from, limit, proven) {
+        const publishedBlocks = await this.getPublishedBlocks(from, limit, proven);
+        return publishedBlocks.map((x)=>x.block);
+    }
+    async getPublishedBlocks(from, limit, proven) {
+        const checkpoints = await this.store.getRangeOfCheckpoints(CheckpointNumber(from), limit);
+        const provenCheckpointNumber = await this.getProvenCheckpointNumber();
+        const blocks = (await Promise.all(checkpoints.map((ch)=>this.store.getBlocksForCheckpoint(ch.checkpointNumber)))).filter(isDefined);
+        const olbBlocks = [];
+        for(let i = 0; i < checkpoints.length; i++){
+            const blockForCheckpoint = blocks[i][0];
+            const checkpoint = checkpoints[i];
+            if (checkpoint.checkpointNumber > provenCheckpointNumber && proven === true) {
+                continue;
+            }
+            const oldCheckpoint = new Checkpoint(blockForCheckpoint.archive, checkpoint.header, [
+                blockForCheckpoint
+            ], checkpoint.checkpointNumber);
+            const oldBlock = L2Block.fromCheckpoint(oldCheckpoint);
+            const publishedBlock = new PublishedL2Block(oldBlock, checkpoint.l1, checkpoint.attestations.map((x)=>CommitteeAttestation.fromBuffer(x)));
+            olbBlocks.push(publishedBlock);
+        }
+        return olbBlocks;
+    }
+    async buildOldBlockFromCheckpointedBlock(checkpointedBlock) {
+        if (!checkpointedBlock) {
+            return undefined;
+        }
+        const checkpoint = await this.store.getCheckpointData(checkpointedBlock.checkpointNumber);
+        if (!checkpoint) {
+            return checkpoint;
+        }
+        const fullCheckpoint = new Checkpoint(checkpointedBlock?.block.archive, checkpoint?.header, [
+            checkpointedBlock.block
+        ], checkpoint.checkpointNumber);
+        const oldBlock = L2Block.fromCheckpoint(fullCheckpoint);
+        const published = new PublishedL2Block(oldBlock, checkpoint.l1, checkpoint.attestations.map((x)=>CommitteeAttestation.fromBuffer(x)));
+        return published;
+    }
+    async getBlock(number) {
+        // If the number provided is -ve, then return the latest block.
+        if (number < 0) {
+            number = await this.store.getSynchedL2BlockNumber();
+        }
+        if (number === 0) {
+            return undefined;
+        }
+        const publishedBlocks = await this.getPublishedBlocks(number, 1);
+        if (publishedBlocks.length === 0) {
+            return undefined;
+        }
+        return publishedBlocks[0].block;
+    }
 }
-_ts_decorate([
-    trackSpan('Archiver.sync')
-], Archiver.prototype, "sync", null);
 var Operation = /*#__PURE__*/ function(Operation) {
     Operation[Operation["Store"] = 0] = "Store";
     Operation[Operation["Delete"] = 1] = "Delete";
@@ -1237,6 +1875,18 @@ var Operation = /*#__PURE__*/ function(Operation) {
         }
         return true;
     }
+    async addBlockDataToDB(block) {
+        const contractClassLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
+        // ContractInstancePublished event logs are broadcast in privateLogs.
+        const privateLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
+        const publicLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
+        return (await Promise.all([
+            this.#updatePublishedContractClasses(contractClassLogs, block.number, 0),
+            this.#updateDeployedContractInstances(privateLogs, block.number, 0),
+            this.#updateUpdatedContractInstances(publicLogs, block.header.globalVariables.timestamp, 0),
+            this.#storeBroadcastedIndividualFunctions(contractClassLogs, block.number)
+        ])).every(Boolean);
+    }
     addBlocks(blocks, pendingChainValidationStatus) {
         // Add the blocks to the store. Store will throw if the blocks are not in order, there are gaps,
         // or if the previous block is not in the store.
@@ -1246,34 +1896,51 @@ var Operation = /*#__PURE__*/ function(Operation) {
                 // Update the pending chain validation status if provided
                 pendingChainValidationStatus && this.store.setPendingChainValidationStatus(pendingChainValidationStatus),
                 // Add any logs emitted during the retrieved blocks
-                this.store.addLogs(blocks.map((block)=>block.block)),
+                this.store.addLogs(blocks),
                 // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
-                ...blocks.map(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);
+                ...blocks.map((block)=>{
+                    return this.addBlockDataToDB(block);
                 })
             ]);
             return opResults.every(Boolean);
         });
     }
-    async unwindBlocks(from, blocksToUnwind) {
-        const last = await this.getSynchedL2BlockNumber();
+    addCheckpoints(checkpoints, pendingChainValidationStatus) {
+        // Add the blocks to the store. Store will throw if the blocks are not in order, there are gaps,
+        // or if the previous block is not in the store.
+        return this.store.transactionAsync(async ()=>{
+            await this.store.addCheckpoints(checkpoints);
+            const allBlocks = checkpoints.flatMap((ch)=>ch.checkpoint.blocks);
+            const opResults = await Promise.all([
+                // Update the pending chain validation status if provided
+                pendingChainValidationStatus && this.store.setPendingChainValidationStatus(pendingChainValidationStatus),
+                // Add any logs emitted during the retrieved blocks
+                this.store.addLogs(allBlocks),
+                // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
+                ...allBlocks.map((block)=>{
+                    return this.addBlockDataToDB(block);
+                })
+            ]);
+            return opResults.every(Boolean);
+        });
+    }
+    async unwindCheckpoints(from, checkpointsToUnwind) {
+        if (checkpointsToUnwind <= 0) {
+            throw new Error(`Cannot unwind ${checkpointsToUnwind} blocks`);
+        }
+        const last = await this.getSynchedCheckpointNumber();
         if (from != last) {
-            throw new Error(`Cannot unwind blocks from block ${from} when the last block is ${last}`);
+            throw new Error(`Cannot unwind checkpoints from checkpoint ${from} when the last checkpoint is ${last}`);
         }
-        if (blocksToUnwind <= 0) {
-            throw new Error(`Cannot unwind ${blocksToUnwind} blocks`);
+        const blocks = [];
+        const lastCheckpointNumber = from + checkpointsToUnwind - 1;
+        for(let checkpointNumber = from; checkpointNumber <= lastCheckpointNumber; checkpointNumber++){
+            const blocksForCheckpoint = await this.store.getBlocksForCheckpoint(checkpointNumber);
+            if (!blocksForCheckpoint) {
+                continue;
+            }
+            blocks.push(...blocksForCheckpoint);
         }
-        // from - blocksToUnwind = the new head, so + 1 for what we need to remove
-        const blocks = await this.getPublishedBlocks(from - blocksToUnwind + 1, blocksToUnwind);
         const opResults = await Promise.all([
             // Prune rolls back to the last proven block, which is by definition valid
             this.store.setPendingChainValidationStatus({
@@ -1281,32 +1948,44 @@ var Operation = /*#__PURE__*/ function(Operation) {
             }),
             // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
             ...blocks.map(async (block)=>{
-                const contractClassLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
+                const contractClassLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
                 // ContractInstancePublished event logs are broadcast in privateLogs.
-                const privateLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
-                const publicLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
+                const privateLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
+                const publicLogs = block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
                 return (await Promise.all([
-                    this.#updatePublishedContractClasses(contractClassLogs, block.block.number, 1),
-                    this.#updateDeployedContractInstances(privateLogs, block.block.number, 1),
-                    this.#updateUpdatedContractInstances(publicLogs, block.block.header.globalVariables.timestamp, 1)
+                    this.#updatePublishedContractClasses(contractClassLogs, block.number, 1),
+                    this.#updateDeployedContractInstances(privateLogs, block.number, 1),
+                    this.#updateUpdatedContractInstances(publicLogs, block.header.globalVariables.timestamp, 1)
                 ])).every(Boolean);
             }),
-            this.store.deleteLogs(blocks.map((b)=>b.block)),
-            this.store.unwindBlocks(from, blocksToUnwind)
+            this.store.deleteLogs(blocks),
+            this.store.unwindCheckpoints(from, checkpointsToUnwind)
         ]);
         return opResults.every(Boolean);
     }
-    getPublishedBlocks(from, limit) {
-        return this.store.getPublishedBlocks(from, limit);
+    getCheckpointData(checkpointNumber) {
+        return this.store.getCheckpointData(checkpointNumber);
+    }
+    getRangeOfCheckpoints(from, limit) {
+        return this.store.getRangeOfCheckpoints(from, limit);
     }
-    getPublishedBlock(number) {
-        return this.store.getPublishedBlock(number);
+    getCheckpointedL2BlockNumber() {
+        return this.store.getCheckpointedL2BlockNumber();
+    }
+    getSynchedCheckpointNumber() {
+        return this.store.getSynchedCheckpointNumber();
     }
-    getPublishedBlockByHash(blockHash) {
-        return this.store.getPublishedBlockByHash(blockHash);
+    setCheckpointSynchedL1BlockNumber(l1BlockNumber) {
+        return this.store.setCheckpointSynchedL1BlockNumber(l1BlockNumber);
     }
-    getPublishedBlockByArchive(archive) {
-        return this.store.getPublishedBlockByArchive(archive);
+    getCheckpointedBlock(number) {
+        return this.store.getCheckpointedBlock(number);
+    }
+    getCheckpointedBlockByHash(blockHash) {
+        return this.store.getCheckpointedBlockByHash(blockHash);
+    }
+    getCheckpointedBlockByArchive(archive) {
+        return this.store.getCheckpointedBlockByArchive(archive);
     }
     getBlockHeaders(from, limit) {
         return this.store.getBlockHeaders(from, limit);
@@ -1317,6 +1996,18 @@ var Operation = /*#__PURE__*/ function(Operation) {
     getBlockHeaderByArchive(archive) {
         return this.store.getBlockHeaderByArchive(archive);
     }
+    getBlockByHash(blockHash) {
+        return this.store.getBlockByHash(blockHash);
+    }
+    getBlockByArchive(archive) {
+        return this.store.getBlockByArchive(archive);
+    }
+    getLatestBlockNumber() {
+        return this.store.getLatestBlockNumber();
+    }
+    getBlocksForCheckpoint(checkpointNumber) {
+        return this.store.getBlocksForCheckpoint(checkpointNumber);
+    }
     getTxEffect(txHash) {
         return this.store.getTxEffect(txHash);
     }
@@ -1326,17 +2017,17 @@ var Operation = /*#__PURE__*/ function(Operation) {
     addL1ToL2Messages(messages) {
         return this.store.addL1ToL2Messages(messages);
     }
-    getL1ToL2Messages(blockNumber) {
-        return this.store.getL1ToL2Messages(blockNumber);
+    getL1ToL2Messages(checkpointNumber) {
+        return this.store.getL1ToL2Messages(checkpointNumber);
     }
     getL1ToL2MessageIndex(l1ToL2Message) {
         return this.store.getL1ToL2MessageIndex(l1ToL2Message);
     }
-    getPrivateLogs(from, limit) {
-        return this.store.getPrivateLogs(from, limit);
+    getPrivateLogsByTags(tags) {
+        return this.store.getPrivateLogsByTags(tags);
     }
-    getLogsByTags(tags, logsPerTag) {
-        return this.store.getLogsByTags(tags, logsPerTag);
+    getPublicLogsByTagsFromContract(contractAddress, tags) {
+        return this.store.getPublicLogsByTagsFromContract(contractAddress, tags);
     }
     getPublicLogs(filter) {
         return this.store.getPublicLogs(filter);
@@ -1345,16 +2036,19 @@ var Operation = /*#__PURE__*/ function(Operation) {
         return this.store.getContractClassLogs(filter);
     }
     getSynchedL2BlockNumber() {
-        return this.store.getSynchedL2BlockNumber();
+        return this.store.getLatestBlockNumber();
     }
-    getProvenL2BlockNumber() {
-        return this.store.getProvenL2BlockNumber();
+    getProvenCheckpointNumber() {
+        return this.store.getProvenCheckpointNumber();
     }
-    setProvenL2BlockNumber(l2BlockNumber) {
-        return this.store.setProvenL2BlockNumber(l2BlockNumber);
+    getProvenBlockNumber() {
+        return this.store.getProvenBlockNumber();
+    }
+    setProvenCheckpointNumber(checkpointNumber) {
+        return this.store.setProvenCheckpointNumber(checkpointNumber);
     }
     setBlockSynchedL1BlockNumber(l1BlockNumber) {
-        return this.store.setBlockSynchedL1BlockNumber(l1BlockNumber);
+        return this.store.setCheckpointSynchedL1BlockNumber(l1BlockNumber);
     }
     setMessageSynchedL1Block(l1Block) {
         return this.store.setMessageSynchedL1Block(l1Block);
@@ -1386,8 +2080,8 @@ var Operation = /*#__PURE__*/ function(Operation) {
     estimateSize() {
         return this.store.estimateSize();
     }
-    rollbackL1ToL2MessagesToL2Block(targetBlockNumber) {
-        return this.store.rollbackL1ToL2MessagesToL2Block(targetBlockNumber);
+    rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber) {
+        return this.store.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
     }
     iterateL1ToL2Messages(range = {}) {
         return this.store.iterateL1ToL2Messages(range);