@aztec/archiver 0.0.1-commit.6c91f13 → 0.0.1-commit.96bb3f7

package/dest/archiver/archiver.js

@@ -1,10 +1,377 @@
-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);
 }
-import { GENESIS_BLOCK_HEADER_HASH } from '@aztec/constants';
+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 { createEthereumChain } from '@aztec/ethereum/chain';
 import { BlockTagTooOldError, InboxContract, RollupContract } from '@aztec/ethereum/contracts';
@@ -21,12 +388,12 @@ 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 { CommitteeAttestation, 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 { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
-import { getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
+import { execInSpan, getTelemetryClient, trackSpan } from '@aztec/telemetry-client';
 import { EventEmitter } from 'events';
 import groupBy from 'lodash.groupby';
 import { createPublicClient, fallback, http } from 'viem';
@@ -39,11 +406,12 @@ function mapArchiverConfig(config) {
     return {
         pollingIntervalMs: config.archiverPollingIntervalMS,
         batchSize: config.archiverBatchSize,
-        skipValidateBlockAttestations: config.skipValidateBlockAttestations,
+        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
@@ -60,6 +428,35 @@ function mapArchiverConfig(config) {
     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;
@@ -81,7 +478,7 @@ function mapArchiverConfig(config) {
    * @param store - An archiver data store for storage & retrieval of blocks, encrypted logs & contract data.
    * @param log - A logger.
    */ constructor(publicClient, debugClient, l1Addresses, dataStore, config, blobClient, epochCache, dateProvider, instrumentation, l1constants, log = createLogger('archiver')){
-        super(), this.publicClient = publicClient, this.debugClient = debugClient, this.l1Addresses = l1Addresses, this.dataStore = dataStore, this.config = config, this.blobClient = blobClient, this.epochCache = epochCache, this.dateProvider = dateProvider, this.instrumentation = instrumentation, this.l1constants = l1constants, this.log = log, this.initialSyncComplete = false, this.blockQueue = [];
+        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);
@@ -136,7 +533,7 @@ function mapArchiverConfig(config) {
             slotDuration,
             ethereumSlotDuration,
             proofSubmissionEpochs: Number(proofSubmissionEpochs),
-            genesisArchiveRoot: Fr.fromHexString(genesisArchiveRoot)
+            genesisArchiveRoot: Fr.fromString(genesisArchiveRoot.toString())
         };
         const opts = merge({
             pollingIntervalMs: 10_000,
@@ -390,13 +787,11 @@ function mapArchiverConfig(config) {
             const checkpoints = await Promise.all(checkpointPromises);
             const blockPromises = await Promise.all(checkpoints.filter(isDefined).map((cp)=>this.store.getBlocksForCheckpoint(CheckpointNumber(cp.checkpointNumber))));
             const newBlocks = blockPromises.filter(isDefined).flat();
-            // TODO(pw/mbps): Don't convert to legacy blocks here
-            const blocks = (await Promise.all(newBlocks.map((x)=>this.getBlock(x.number)))).filter(isDefined);
             // Emit an event for listening services to react to the chain prune
             this.emit(L2BlockSourceEvents.L2PruneDetected, {
                 type: L2BlockSourceEvents.L2PruneDetected,
                 epochNumber: pruneFromEpochNumber,
-                blocks
+                blocks: newBlocks
             });
             this.log.debug(`L2 prune from ${provenCheckpointNumber + 1} to ${localPendingCheckpointNumber} will occur on next checkpoint submission.`);
             await this.unwindCheckpoints(localPendingCheckpointNumber, checkpointsToUnwind);
@@ -572,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(localPendingCheckpointNumber, {
-            blockNumber: currentL1BlockNumber
-        });
-        const provenCheckpointNumber = CheckpointNumber.fromBigInt(rollupProvenCheckpointNumber);
-        const pendingCheckpointNumber = CheckpointNumber.fromBigInt(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}.`, {
@@ -612,7 +1005,7 @@ function mapArchiverConfig(config) {
                 this.log.error(`Hit local checkpoint greater than last synched checkpoint: ${localCheckpointForDestinationProvenCheckpointNumber.checkpointNumber} > ${synched}`);
             }
             this.log.trace(`Local checkpoint for remote proven checkpoint ${provenCheckpointNumber} is ${localCheckpointForDestinationProvenCheckpointNumber?.archive.root.toString() ?? 'undefined'}`);
-            if (localCheckpointForDestinationProvenCheckpointNumber && provenArchive === localCheckpointForDestinationProvenCheckpointNumber.archive.root.toString()) {
+            if (localCheckpointForDestinationProvenCheckpointNumber && provenArchive.equals(localCheckpointForDestinationProvenCheckpointNumber.archive.root)) {
                 const localProvenCheckpointNumber = await this.getProvenCheckpointNumber();
                 if (localProvenCheckpointNumber !== provenCheckpointNumber) {
                     await this.setProvenCheckpointNumber(provenCheckpointNumber);
@@ -651,7 +1044,7 @@ function mapArchiverConfig(config) {
                 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
@@ -664,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.
@@ -686,7 +1079,7 @@ function mapArchiverConfig(config) {
                         archiveAtContract,
                         archiveLocal: candidateCheckpoint.archive.root.toString()
                     });
-                    if (archiveAtContract === candidateCheckpoint.archive.root.toString()) {
+                    if (archiveAtContract.equals(candidateCheckpoint.archive.root)) {
                         break;
                     }
                     tipAfterUnwind--;
@@ -706,7 +1099,7 @@ function mapArchiverConfig(config) {
             [searchStartBlock, searchEndBlock] = this.nextRange(searchEndBlock, currentL1BlockNumber);
             this.log.trace(`Retrieving checkpoints from L1 block ${searchStartBlock} to ${searchEndBlock}`);
             // TODO(md): Retrieve from blob client then from consensus client, then from peers
-            const retrievedCheckpoints = await retrieveCheckpointsFromRollup(this.rollup.getContract(), this.publicClient, this.debugClient, this.blobClient, searchStartBlock, searchEndBlock, this.l1Addresses, this.instrumentation, this.log, !this.initialSyncComplete);
+            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.
@@ -721,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
@@ -729,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) {
@@ -738,9 +1131,9 @@ 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;
@@ -750,7 +1143,7 @@ function mapArchiverConfig(config) {
                 // checkpoints we just retrieved.
                 const l1ToL2Messages = await this.getL1ToL2Messages(published.checkpoint.number);
                 const computedInHash = computeInHashFromL1ToL2Messages(l1ToL2Messages);
-                const publishedInHash = published.checkpoint.header.contentCommitment.inHash;
+                const publishedInHash = published.checkpoint.header.inHash;
                 if (!computedInHash.equals(publishedInHash)) {
                     this.log.fatal(`Mismatch inHash for checkpoint ${published.checkpoint.number}`, {
                         checkpointHash: published.checkpoint.hash(),
@@ -771,7 +1164,7 @@ 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 InitialCheckpointNumberNotSequentialError) {
@@ -1020,6 +1413,14 @@ function mapArchiverConfig(config) {
         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') {
             number = await this.store.getSynchedL2BlockNumber();
@@ -1033,12 +1434,23 @@ function mapArchiverConfig(config) {
     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);
     }
@@ -1124,51 +1536,99 @@ 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 = BlockNumber(Math.max(provenBlockNumber - this.l1constants.epochDuration * 2, 0));
-        const [latestBlockHeader, provenBlockHeader, finalizedBlockHeader] = await Promise.all([
-            latestBlockNumber > 0 ? this.getBlockHeader(latestBlockNumber) : undefined,
-            provenBlockNumber > 0 ? this.getBlockHeader(provenBlockNumber) : undefined,
-            finalizedBlockNumber > 0 ? this.getBlockHeader(finalizedBlockNumber) : undefined
+        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 (provenBlockNumber > beforeInitialblockNumber && !provenCheckpointedBlock?.block.header) {
+            throw new Error(`Failed to retrieve proven checkpointed for block ${provenBlockNumber} (latest block is ${latestBlockNumber})`);
         }
-        if (finalizedBlockNumber > 0 && !finalizedBlockHeader) {
+        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() ?? GENESIS_BLOCK_HEADER_HASH;
-        const provenBlockHeaderHash = await provenBlockHeader?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
-        const finalizedBlockHeaderHash = await finalizedBlockHeader?.hash() ?? GENESIS_BLOCK_HEADER_HASH;
-        return {
-            latest: {
+        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()
             },
             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 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}`);
         }
@@ -1298,9 +1758,6 @@ function mapArchiverConfig(config) {
         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";
@@ -1579,7 +2036,7 @@ var Operation = /*#__PURE__*/ function(Operation) {
         return this.store.getContractClassLogs(filter);
     }
     getSynchedL2BlockNumber() {
-        return this.store.getCheckpointedL2BlockNumber();
+        return this.store.getLatestBlockNumber();
     }
     getProvenCheckpointNumber() {
         return this.store.getProvenCheckpointNumber();