@aztec/archiver 0.0.1-commit.0dc957cde → 0.0.1-commit.0ec55a70b

package/dest/modules/l1_synchronizer.js

@@ -377,6 +377,7 @@ import { maxBigint } from '@aztec/foundation/bigint';
 import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import { partition, pick } from '@aztec/foundation/collection';
+import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { retryTimes } from '@aztec/foundation/retry';
 import { count } from '@aztec/foundation/string';
@@ -389,6 +390,7 @@ import { computeInHashFromL1ToL2Messages } from '@aztec/stdlib/messaging';
 import { execInSpan, trackSpan } from '@aztec/telemetry-client';
 import { InitialCheckpointNumberNotSequentialError } from '../errors.js';
 import { getCheckpointBlobDataFromBlobs, retrieveCheckpointCalldataFromRollup, retrieveL1ToL2Message, retrieveL1ToL2Messages, retrievedToPublishedCheckpoint } from '../l1/data_retrieval.js';
+import { getArchiverSynchPoint } from '../store/data_stores.js';
 import { MessageStoreError } from '../store/message_store.js';
 import { ArchiverDataStoreUpdater } from './data_store_updater.js';
 import { validateCheckpointAttestations } from './validation.js';
@@ -401,7 +403,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
     debugClient;
     rollup;
     inbox;
-    store;
+    stores;
     config;
     blobClient;
     epochCache;
@@ -439,12 +441,12 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
     l1Timestamp;
     updater;
     tracer;
-    constructor(publicClient, debugClient, rollup, inbox, store, config, blobClient, epochCache, dateProvider, instrumentation, l1Constants, events, tracer, l2TipsCache, log = createLogger('archiver:l1-sync')){
+    constructor(publicClient, debugClient, rollup, inbox, stores, config, blobClient, epochCache, dateProvider, instrumentation, l1Constants, events, tracer, l2TipsCache, log = createLogger('archiver:l1-sync')){
         this.publicClient = publicClient;
         this.debugClient = debugClient;
         this.rollup = rollup;
         this.inbox = inbox;
-        this.store = store;
+        this.stores = stores;
         this.config = config;
         this.blobClient = blobClient;
         this.epochCache = epochCache;
@@ -454,7 +456,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         this.events = events;
         this.log = log;
         _initProto(this);
-        this.updater = new ArchiverDataStoreUpdater(this.store, l2TipsCache, {
+        this.updater = new ArchiverDataStoreUpdater(this.stores, l2TipsCache, {
             rollupManaLimit: l1Constants.rollupManaLimit
         });
         this.tracer = tracer;
@@ -468,6 +470,12 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
     /** Returns the last L1 timestamp that was synced. */ getL1Timestamp() {
         return this.l1Timestamp;
     }
+    getSignatureContext() {
+        return {
+            chainId: this.publicClient.chain.id,
+            rollupAddress: EthAddress.fromString(this.rollup.address)
+        };
+    }
     /** Checks that the ethereum node we are connected to has a latest timestamp no more than the allowed drift. Throw if not. */ async testEthereumNodeSynced() {
         const maxAllowedDelay = this.config.maxAllowedEthClientDriftSeconds;
         if (maxAllowedDelay === 0) {
@@ -512,7 +520,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             });
         }
         // Load sync point for blocks defaulting to start block
-        const { blocksSynchedTo = this.l1Constants.l1StartBlock } = await this.store.getSynchPoint();
+        const { blocksSynchedTo = this.l1Constants.l1StartBlock } = await getArchiverSynchPoint(this.stores);
         this.log.debug(`Starting new archiver sync iteration`, {
             blocksSynchedTo,
             currentL1BlockData
@@ -537,7 +545,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             // past it, since otherwise we'll keep downloading it and reprocessing it on every iteration until
             // we get a valid checkpoint to advance the syncpoint.
             if (!rollupStatus.validationResult?.valid && rollupStatus.lastL1BlockWithCheckpoint !== undefined) {
-                await this.store.setCheckpointSynchedL1BlockNumber(rollupStatus.lastL1BlockWithCheckpoint);
+                await this.stores.blocks.setSynchedL1BlockNumber(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
@@ -574,7 +582,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             const finalizedCheckpointNumber = await this.rollup.getProvenCheckpointNumber({
                 blockNumber: finalizedL1BlockNumber
             });
-            const localFinalizedCheckpointNumber = await this.store.getFinalizedCheckpointNumber();
+            const localFinalizedCheckpointNumber = await this.stores.blocks.getFinalizedCheckpointNumber();
             if (localFinalizedCheckpointNumber !== finalizedCheckpointNumber) {
                 await this.updater.setFinalizedCheckpointNumber(finalizedCheckpointNumber);
                 this.log.info(`Updated finalized chain to checkpoint ${finalizedCheckpointNumber}`, {
@@ -591,8 +599,8 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
     }
     /** Prune all proposed local blocks that should have been checkpointed by now. */ async pruneUncheckpointedBlocks(currentL1Timestamp) {
         const [lastCheckpointedBlockNumber, lastProposedBlockNumber] = await Promise.all([
-            this.store.getCheckpointedL2BlockNumber(),
-            this.store.getLatestBlockNumber()
+            this.stores.blocks.getCheckpointedL2BlockNumber(),
+            this.stores.blocks.getLatestL2BlockNumber()
         ]);
         // If there are no uncheckpointed blocks, we got nothing to do
         if (lastProposedBlockNumber === lastCheckpointedBlockNumber) {
@@ -603,7 +611,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         const slotAtNextL1Block = getSlotAtNextL1Block(currentL1Timestamp, this.l1Constants);
         const firstUncheckpointedBlockNumber = BlockNumber(lastCheckpointedBlockNumber + 1);
         // What's the slot of the first uncheckpointed block?
-        const [firstUncheckpointedBlockHeader] = await this.store.getBlockHeaders(firstUncheckpointedBlockNumber, 1);
+        const [firstUncheckpointedBlockHeader] = await this.stores.blocks.getBlockHeaders(firstUncheckpointedBlockNumber, 1);
         const firstUncheckpointedBlockSlot = firstUncheckpointedBlockHeader?.getSlot();
         if (firstUncheckpointedBlockSlot === undefined || firstUncheckpointedBlockSlot >= slotAtNextL1Block) {
             return;
@@ -639,7 +647,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
     }
     /** Checks if there'd be a reorg for the next checkpoint submission and start pruning now. */ async handleEpochPrune(provenCheckpointNumber, currentL1BlockNumber, currentL1Timestamp) {
         const rollupCanPrune = await this.canPrune(currentL1BlockNumber, currentL1Timestamp);
-        const localPendingCheckpointNumber = await this.store.getSynchedCheckpointNumber();
+        const localPendingCheckpointNumber = await this.stores.blocks.getLatestCheckpointNumber();
         const canPrune = localPendingCheckpointNumber > provenCheckpointNumber && rollupCanPrune;
         if (canPrune) {
             const timer = new Timer();
@@ -657,8 +665,8 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             const indices = Array.from({
                 length: checkpointsToUnwind
             }, (_, i)=>CheckpointNumber(i + pruneFrom));
-            const checkpoints = (await asyncPool(BATCH_SIZE, indices, (idx)=>this.store.getCheckpointData(idx))).filter(isDefined);
-            const newBlocks = (await asyncPool(BATCH_SIZE, checkpoints, (cp)=>this.store.getBlocksForCheckpoint(CheckpointNumber(cp.checkpointNumber)))).filter(isDefined).flat();
+            const checkpoints = (await asyncPool(BATCH_SIZE, indices, (idx)=>this.stores.blocks.getCheckpointData(idx))).filter(isDefined);
+            const newBlocks = (await asyncPool(BATCH_SIZE, checkpoints, (cp)=>this.stores.blocks.getBlocksForCheckpoint(CheckpointNumber(cp.checkpointNumber)))).filter(isDefined).flat();
             // Emit an event for listening services to react to the chain prune
             this.events.emit(L2BlockSourceEvents.L2PruneUnproven, {
                 type: L2BlockSourceEvents.L2PruneUnproven,
@@ -667,11 +675,11 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             });
             this.log.debug(`L2 prune from ${provenCheckpointNumber + 1} to ${localPendingCheckpointNumber} will occur on next checkpoint submission.`);
             await this.updater.removeCheckpointsAfter(provenCheckpointNumber);
-            this.log.warn(`Removed ${count(checkpointsToUnwind, 'checkpoint')} after checkpoint ${provenCheckpointNumber} ` + `due to predicted reorg at L1 block ${currentL1BlockNumber}. ` + `Updated latest checkpoint is ${await this.store.getSynchedCheckpointNumber()}.`);
+            this.log.warn(`Removed ${count(checkpointsToUnwind, 'checkpoint')} after checkpoint ${provenCheckpointNumber} ` + `due to predicted reorg at L1 block ${currentL1BlockNumber}. ` + `Updated latest checkpoint is ${await this.stores.blocks.getLatestCheckpointNumber()}.`);
             this.instrumentation.processPrune(timer.ms());
         // TODO(palla/reorg): Do we need to set the block synched L1 block number here?
         // Seems like the next iteration should handle this.
-        // await this.store.setCheckpointSynchedL1BlockNumber(currentL1BlockNumber);
+        // await this.stores.blocks.setSynchedL1BlockNumber(currentL1BlockNumber);
         }
         return {
             rollupCanPrune
@@ -697,7 +705,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         const { messagesSynchedTo = {
             l1BlockNumber: this.l1Constants.l1StartBlock,
             l1BlockHash: this.l1Constants.l1StartBlockHash
-        } } = await this.store.getSynchPoint();
+        } } = await getArchiverSynchPoint(this.stores);
         // Nothing to do if L1 block number has not moved forward
         const currentL1BlockNumber = currentL1Block.l1BlockNumber;
         if (currentL1BlockNumber <= messagesSynchedTo.l1BlockNumber) {
@@ -707,10 +715,10 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         const remoteMessagesState = await this.inbox.getState({
             blockNumber: currentL1BlockNumber
         });
-        const localLastMessage = await this.store.getLastL1ToL2Message();
+        const localLastMessage = await this.stores.messages.getLastMessage();
         if (await this.localStateMatches(localLastMessage, remoteMessagesState)) {
             this.log.trace(`Local L1 to L2 messages are already in sync with remote at L1 block ${currentL1BlockNumber}`);
-            await this.store.setMessageSyncState(currentL1Block, remoteMessagesState.treeInProgress);
+            await this.stores.messages.setMessageSyncState(currentL1Block, remoteMessagesState.treeInProgress);
             return true;
         }
         // If not, then we are out of sync. Most likely there are new messages on the inbox, so we try retrieving them.
@@ -732,7 +740,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         // Note that, if there are no new messages to insert, but there was an L1 reorg that pruned out last messages,
         // we'd notice by comparing our local state with the remote one again, and seeing they don't match even after
         // our sync attempt. In this case, we also rollback our syncpoint, and trigger a retry.
-        const localLastMessageAfterSync = await this.store.getLastL1ToL2Message();
+        const localLastMessageAfterSync = await this.stores.messages.getLastMessage();
         if (!await this.localStateMatches(localLastMessageAfterSync, remoteMessagesState)) {
             this.log.warn(`Local L1 to L2 messages state does not match remote after sync attempt. Rolling back syncpoint to retry.`, {
                 localLastMessageAfterSync,
@@ -742,11 +750,11 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             return false;
         }
         // Advance the syncpoint after a successful sync
-        await this.store.setMessageSyncState(currentL1Block, remoteMessagesState.treeInProgress);
+        await this.stores.messages.setMessageSyncState(currentL1Block, remoteMessagesState.treeInProgress);
         return true;
     }
     /** Checks if the local rolling hash and message count matches the remote state */ async localStateMatches(localLastMessage, remoteState) {
-        const localMessageCount = await this.store.getTotalL1ToL2MessageCount();
+        const localMessageCount = await this.stores.messages.getTotalL1ToL2MessageCount();
         this.log.trace(`Comparing local and remote inbox state`, {
             localMessageCount,
             localLastMessage,
@@ -764,7 +772,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             this.log.trace(`Retrieving L1 to L2 messages in L1 blocks ${searchStartBlock}-${searchEndBlock}`);
             const messages = await retrieveL1ToL2Messages(this.inbox, searchStartBlock, searchEndBlock);
             const timer = new Timer();
-            await this.store.addL1ToL2Messages(messages);
+            await this.stores.messages.addL1ToL2Messages(messages);
             const perMsg = timer.ms() / messages.length;
             this.instrumentation.processNewMessages(messages.length, perMsg);
             for (const msg of messages){
@@ -794,7 +802,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         let commonMsg;
         let messagesToDelete = 0;
         this.log.verbose(`Searching most recent common L1 to L2 message`);
-        for await (const localMsg of this.store.iterateL1ToL2Messages({
+        for await (const localMsg of this.stores.messages.iterateL1ToL2Messages({
             reverse: true
         })){
             const logCtx = {
@@ -834,7 +842,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         if (messagesToDelete > 0) {
             const lastGoodIndex = commonMsg?.index;
             this.log.warn(`Rolling back all local L1 to L2 messages after index ${lastGoodIndex ?? 'initial'}`);
-            await this.store.removeL1ToL2Messages(lastGoodIndex !== undefined ? lastGoodIndex + 1n : 0n);
+            await this.stores.messages.removeL1ToL2Messages(lastGoodIndex !== undefined ? lastGoodIndex + 1n : 0n);
         }
         // Update the syncpoint so the loop below reprocesses the changed messages. We go to the block before
         // the last common one, so we force reprocessing it, in case new messages were added on that same L1 block
@@ -845,7 +853,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             l1BlockNumber: syncPointL1BlockNumber,
             l1BlockHash: syncPointL1BlockHash
         };
-        await this.store.setMessageSyncState(messagesSyncPoint, remoteTreeInProgress);
+        await this.stores.messages.setMessageSyncState(messagesSyncPoint, remoteTreeInProgress);
         this.log.verbose(`Updated messages syncpoint to L1 block ${syncPointL1BlockNumber}`, {
             ...messagesSyncPoint,
             remoteTreeInProgress
@@ -863,8 +871,8 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         return Buffer32.fromString(block.hash);
     }
     async handleCheckpoints(blocksSynchedTo, currentL1BlockNumber, initialSyncComplete) {
-        const localPendingCheckpointNumber = await this.store.getSynchedCheckpointNumber();
-        const initialValidationResult = await this.store.getPendingChainValidationStatus();
+        const localPendingCheckpointNumber = await this.stores.blocks.getLatestCheckpointNumber();
+        const initialValidationResult = await this.stores.blocks.getPendingChainValidationStatus();
         const { provenCheckpointNumber, provenArchive, pendingCheckpointNumber, pendingArchive, archiveOfMyCheckpoint: archiveForLocalPendingCheckpointNumber } = await execInSpan(this.tracer, 'Archiver.getRollupStatus', ()=>this.rollup.status(localPendingCheckpointNumber, {
                 blockNumber: currentL1BlockNumber
             }));
@@ -887,7 +895,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             // we need to set it to zero. This is an edge case because we dont have a checkpoint zero (initial checkpoint is one),
             // so localCheckpointForDestinationProvenCheckpointNumber would not be found below.
             if (provenCheckpointNumber === 0) {
-                const localProvenCheckpointNumber = await this.store.getProvenCheckpointNumber();
+                const localProvenCheckpointNumber = await this.stores.blocks.getProvenCheckpointNumber();
                 if (localProvenCheckpointNumber !== provenCheckpointNumber) {
                     await this.updater.setProvenCheckpointNumber(provenCheckpointNumber);
                     this.log.info(`Rolled back proven chain to checkpoint ${provenCheckpointNumber}`, {
@@ -895,16 +903,16 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
                     });
                 }
             }
-            const localCheckpointForDestinationProvenCheckpointNumber = await this.store.getCheckpointData(provenCheckpointNumber);
+            const localCheckpointForDestinationProvenCheckpointNumber = await this.stores.blocks.getCheckpointData(provenCheckpointNumber);
             // Sanity check. I've hit what seems to be a state where the proven checkpoint is set to a value greater than the latest
             // synched checkpoint when requesting L2Tips from the archiver. This is the only place where the proven checkpoint is set.
-            const synched = await this.store.getSynchedCheckpointNumber();
+            const synched = await this.stores.blocks.getLatestCheckpointNumber();
             if (localCheckpointForDestinationProvenCheckpointNumber && synched < localCheckpointForDestinationProvenCheckpointNumber.checkpointNumber) {
                 this.log.error(`Hit local checkpoint greater than last synched checkpoint: ${localCheckpointForDestinationProvenCheckpointNumber.checkpointNumber} > ${synched}`);
             }
             this.log.trace(`Local checkpoint for remote proven checkpoint ${provenCheckpointNumber} is ${localCheckpointForDestinationProvenCheckpointNumber?.archive.root.toString() ?? 'undefined'}`);
             if (localCheckpointForDestinationProvenCheckpointNumber && provenArchive.equals(localCheckpointForDestinationProvenCheckpointNumber.archive.root)) {
-                const localProvenCheckpointNumber = await this.store.getProvenCheckpointNumber();
+                const localProvenCheckpointNumber = await this.stores.blocks.getProvenCheckpointNumber();
                 if (localProvenCheckpointNumber !== provenCheckpointNumber) {
                     await this.updater.setProvenCheckpointNumber(provenCheckpointNumber);
                     this.log.info(`Updated proven chain to checkpoint ${provenCheckpointNumber}`, {
@@ -929,7 +937,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         // If we have 0 checkpoints locally and there are no checkpoints onchain there is nothing to do.
         const noCheckpoints = localPendingCheckpointNumber === 0 && pendingCheckpointNumber === 0;
         if (noCheckpoints) {
-            await this.store.setCheckpointSynchedL1BlockNumber(currentL1BlockNumber);
+            await this.stores.blocks.setSynchedL1BlockNumber(currentL1BlockNumber);
             this.log.debug(`No checkpoints to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}, no checkpoints on chain`);
             return rollupStatus;
         }
@@ -937,7 +945,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         // Related to the L2 reorgs of the pending chain. We are only interested in actually addressing a reorg if there
         // are any state that could be impacted by it. If we have no checkpoints, there is no impact.
         if (localPendingCheckpointNumber > 0) {
-            const localPendingCheckpoint = await this.store.getCheckpointData(localPendingCheckpointNumber);
+            const localPendingCheckpoint = await this.stores.blocks.getCheckpointData(localPendingCheckpointNumber);
             if (localPendingCheckpoint === undefined) {
                 throw new Error(`Missing checkpoint ${localPendingCheckpointNumber}`);
             }
@@ -951,7 +959,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
                 // However, in the re-org scenario, our L1 node is temporarily lying to us and we end up potentially missing checkpoints.
                 // We must only set this block number based on actually retrieved logs.
                 // TODO(#8621): Tackle this properly when we handle L1 Re-orgs.
-                // await this.store.setCheckpointSynchedL1BlockNumber(currentL1BlockNumber);
+                // await this.stores.blocks.setSynchedL1BlockNumber(currentL1BlockNumber);
                 this.log.debug(`No checkpoints to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
                 return rollupStatus;
             }
@@ -968,7 +976,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
                 });
                 let tipAfterUnwind = localPendingCheckpointNumber;
                 while(true){
-                    const candidateCheckpoint = await this.store.getCheckpointData(tipAfterUnwind);
+                    const candidateCheckpoint = await this.stores.blocks.getCheckpointData(tipAfterUnwind);
                     if (candidateCheckpoint === undefined) {
                         break;
                     }
@@ -984,7 +992,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
                 }
                 const checkpointsToRemove = localPendingCheckpointNumber - tipAfterUnwind;
                 await this.updater.removeCheckpointsAfter(CheckpointNumber(tipAfterUnwind));
-                this.log.warn(`Removed ${count(checkpointsToRemove, 'checkpoint')} after checkpoint ${tipAfterUnwind} ` + `due to mismatched checkpoint hashes at L1 block ${currentL1BlockNumber}. ` + `Updated L2 latest checkpoint is ${await this.store.getSynchedCheckpointNumber()}.`);
+                this.log.warn(`Removed ${count(checkpointsToRemove, 'checkpoint')} after checkpoint ${tipAfterUnwind} ` + `due to mismatched checkpoint hashes at L1 block ${currentL1BlockNumber}. ` + `Updated L2 latest checkpoint is ${await this.stores.blocks.getLatestCheckpointNumber()}.`);
             }
         }
         // Retrieve checkpoints in batches. Each batch is estimated to accommodate up to 'blockBatchSize' L1 blocks,
@@ -1009,11 +1017,13 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
                 searchStartBlock,
                 searchEndBlock
             });
-            // Check if the last checkpoint matches the proposed one (so we can skip blob fetch).
-            // We only check the last one because the proposed checkpoint is always the most recent one,
-            // and if it's in a multi-checkpoint batch it will always be last (sorted by L1 block number).
+            // Check if the last checkpoint matches a local pending entry (so we can skip blob fetch).
+            // We only check the last one; if it matches, the blob fetch is skipped for that entry.
+            // TODO(palla/pipelining): We may have more than a single checkpoint to promote
             const lastCalldataCheckpoint = calldataCheckpoints[calldataCheckpoints.length - 1];
-            const checkpointToPromote = await this.tryBuildPublishedCheckpointFromProposed(lastCalldataCheckpoint);
+            const promoteResult = await this.tryBuildPublishedCheckpointFromProposed(lastCalldataCheckpoint);
+            const checkpointToPromote = promoteResult && !('diverged' in promoteResult) ? promoteResult : undefined;
+            const evictProposedFrom = promoteResult && 'diverged' in promoteResult ? promoteResult.fromCheckpointNumber : undefined;
             // Then fetch blobs in parallel and build the full published checkpoints
             const toFetchBlobs = checkpointToPromote ? calldataCheckpoints.slice(0, -1) : calldataCheckpoints;
             const blobFetched = await asyncPool(10, toFetchBlobs, async (checkpoint)=>retrievedToPublishedCheckpoint({
@@ -1030,7 +1040,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             for (const published of publishedCheckpoints){
                 const validationResult = this.config.skipValidateCheckpointAttestations ? {
                     valid: true
-                } : await validateCheckpointAttestations(published, this.epochCache, this.l1Constants, this.log);
+                } : await validateCheckpointAttestations(published, this.epochCache, this.l1Constants, this.getSignatureContext(), this.log);
                 // Only update the validation result if it has changed, so we can keep track of the first invalid checkpoint
                 // in case there is a sequence of more than one invalid checkpoint, as we need to invalidate the first one.
                 // There is an exception though: if a checkpoint is invalidated and replaced with another invalid checkpoint,
@@ -1055,7 +1065,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
                 // Check the inHash of the checkpoint against the l1->l2 messages.
                 // The messages should've been synced up to the currentL1BlockNumber and must be available for the published
                 // checkpoints we just retrieved.
-                const l1ToL2Messages = await this.store.getL1ToL2Messages(published.checkpoint.number);
+                const l1ToL2Messages = await this.stores.messages.getL1ToL2Messages(published.checkpoint.number);
                 const computedInHash = computeInHashFromL1ToL2Messages(l1ToL2Messages);
                 const publishedInHash = published.checkpoint.header.inHash;
                 if (!computedInHash.equals(publishedInHash)) {
@@ -1092,7 +1102,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
                             l1: lastCalldataCheckpoint.l1,
                             attestations: lastCalldataCheckpoint.attestations,
                             checkpoint: maybeValidCheckpointToPromote
-                        })));
+                        }, evictProposedFrom)));
                 if (checkpointsToAdd.length > 0) {
                     this.instrumentation.processNewCheckpointedBlocks(processDuration / checkpointsToAdd.length, checkpointsToAdd.flatMap((c)=>c.checkpoint.blocks));
                 }
@@ -1117,9 +1127,9 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             } catch (err) {
                 if (err instanceof InitialCheckpointNumberNotSequentialError) {
                     const { previousCheckpointNumber, newCheckpointNumber } = err;
-                    const previousCheckpoint = previousCheckpointNumber ? await this.store.getCheckpointData(CheckpointNumber(previousCheckpointNumber)) : undefined;
+                    const previousCheckpoint = previousCheckpointNumber ? await this.stores.blocks.getCheckpointData(CheckpointNumber(previousCheckpointNumber)) : undefined;
                     const updatedL1SyncPoint = previousCheckpoint?.l1.blockNumber ?? this.l1Constants.l1StartBlock;
-                    await this.store.setCheckpointSynchedL1BlockNumber(updatedL1SyncPoint);
+                    await this.stores.blocks.setSynchedL1BlockNumber(updatedL1SyncPoint);
                     this.log.warn(`Attempting to insert checkpoint ${newCheckpointNumber} with previous block ${previousCheckpointNumber}. Rolling back L1 sync point to ${updatedL1SyncPoint} to try and fetch the missing blocks.`, {
                         previousCheckpointNumber,
                         newCheckpointNumber,
@@ -1150,9 +1160,20 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
             lastL1BlockWithCheckpoint
         };
     }
-    /** Checks if this checkpoint matches the local proposed one, and if so, loads local data to build a synthetic published checkpoint. */ async tryBuildPublishedCheckpointFromProposed(calldataCheckpoint) {
-        const proposed = await this.store.getProposedCheckpointOnly();
-        if (this.config.skipPromoteProposedCheckpointDuringL1Sync || !proposed || !calldataCheckpoint || proposed.checkpointNumber !== calldataCheckpoint.checkpointNumber) {
+    /**
+   * Checks if a specific checkpoint matches a local pending entry, and if so, loads local data to build
+   * a synthetic published checkpoint (skipping blob fetch).
+   *
+   * Returns { diverged: true, fromCheckpointNumber } when the L1 checkpoint does NOT match local pending
+   * data for that number, so the caller can evict the entire pending suffix >= fromCheckpointNumber
+   * (those entries chain off the now-invalid local state) within the same addCheckpoints transaction.
+   */ async tryBuildPublishedCheckpointFromProposed(calldataCheckpoint) {
+        if (this.config.skipPromoteProposedCheckpointDuringL1Sync || !calldataCheckpoint) {
+            return undefined;
+        }
+        // Look up the specific pending entry for the checkpoint being mined, not just the tip
+        const proposed = await this.stores.blocks.getProposedCheckpointByNumber(calldataCheckpoint.checkpointNumber);
+        if (!proposed) {
             return undefined;
         }
         if (!proposed.header.equals(calldataCheckpoint.header) || !proposed.archive.root.equals(calldataCheckpoint.archiveRoot)) {
@@ -1164,13 +1185,17 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
                 calldataHeader: calldataCheckpoint.header.toInspect(),
                 calldataArchiveRoot: calldataCheckpoint.archiveRoot.toString()
             });
-            return undefined;
+            // Return a divergence signal so the caller can evict pending >= this number
+            return {
+                diverged: true,
+                fromCheckpointNumber: proposed.checkpointNumber
+            };
         }
         this.log.debug(`Building published checkpoint from proposed ${calldataCheckpoint.checkpointNumber} (skipping blob fetch)`, {
             proposedHeader: proposed.header.toInspect(),
             proposedArchiveRoot: proposed.archive.root.toString()
         });
-        const blocks = await this.store.getBlocks(BlockNumber(proposed.startBlock), proposed.blockCount);
+        const blocks = await this.stores.blocks.getBlocks(BlockNumber(proposed.startBlock), proposed.blockCount);
         if (blocks.length !== proposed.blockCount) {
             this.log.warn(`Local proposed checkpoint ${proposed.checkpointNumber} has wrong block count (expected ${proposed.blockCount} blocks starting at ${proposed.startBlock} but got ${blocks.length})`, {
                 proposedCheckpointNumber: proposed.checkpointNumber,
@@ -1199,7 +1224,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         const { lastRetrievedCheckpoint, pendingCheckpointNumber } = status;
         // Compare the last checkpoint we have (either retrieved in this round or loaded from store) with what the
         // rollup contract told us was the latest one (pinned at the currentL1BlockNumber).
-        const latestLocalCheckpointNumber = lastRetrievedCheckpoint?.checkpoint.number ?? await this.store.getSynchedCheckpointNumber();
+        const latestLocalCheckpointNumber = lastRetrievedCheckpoint?.checkpoint.number ?? await this.stores.blocks.getLatestCheckpointNumber();
         if (latestLocalCheckpointNumber < pendingCheckpointNumber) {
             // Here we have consumed all logs until the `currentL1Block` we pinned at the beginning of the archiver loop,
             // but still haven't reached the pending checkpoint according to the call to the rollup contract.
@@ -1212,7 +1237,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
                 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);
+                const checkpoint = await this.stores.blocks.getRangeOfCheckpoints(latestLocalCheckpointNumber, 1).then(([c])=>c);
                 latestLocalCheckpointArchive = checkpoint.archive.root.toString();
                 targetL1BlockNumber = checkpoint.l1.blockNumber;
             }
@@ -1223,7 +1248,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
                 currentL1BlockNumber,
                 ...status
             });
-            await this.store.setCheckpointSynchedL1BlockNumber(targetL1BlockNumber);
+            await this.stores.blocks.setSynchedL1BlockNumber(targetL1BlockNumber);
         } else {
             this.log.trace(`No new checkpoints behind L1 sync point to retrieve.`, {
                 latestLocalCheckpointNumber,
@@ -1232,7 +1257,7 @@ _dec = trackSpan('Archiver.syncFromL1'), _dec1 = trackSpan('Archiver.handleEpoch
         }
     }
     async getCheckpointHeader(number) {
-        const checkpoint = await this.store.getCheckpointData(number);
+        const checkpoint = await this.stores.blocks.getCheckpointData(number);
         if (!checkpoint) {
             return undefined;
         }

package/dest/modules/validation.d.ts

@@ -3,15 +3,16 @@ import type { Logger } from '@aztec/foundation/log';
 import { type AttestationInfo, type ValidateCheckpointResult } from '@aztec/stdlib/block';
 import type { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
+import { type CoordinationSignatureContext } from '@aztec/stdlib/p2p';
 export type { ValidateCheckpointResult };
 /**
  * Extracts attestation information from a published checkpoint.
  * Returns info for each attestation, preserving array indices.
  */
-export declare function getAttestationInfoFromPublishedCheckpoint({ checkpoint, attestations }: PublishedCheckpoint): AttestationInfo[];
+export declare function getAttestationInfoFromPublishedCheckpoint({ checkpoint, attestations }: PublishedCheckpoint, signatureContext: CoordinationSignatureContext): AttestationInfo[];
 /**
  * Validates the attestations submitted for the given checkpoint.
  * Returns true if the attestations are valid and sufficient, false otherwise.
  */
-export declare function validateCheckpointAttestations(publishedCheckpoint: PublishedCheckpoint, epochCache: EpochCache, constants: Pick<L1RollupConstants, 'epochDuration'>, logger?: Logger): Promise<ValidateCheckpointResult>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vZHVsZXMvdmFsaWRhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUdyRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBRXBCLEtBQUssd0JBQXdCLEVBRTlCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBaUMsTUFBTSw2QkFBNkIsQ0FBQztBQUdwRyxZQUFZLEVBQUUsd0JBQXdCLEVBQUUsQ0FBQztBQUV6Qzs7O0dBR0c7QUFDSCx3QkFBZ0IseUNBQXlDLENBQUMsRUFDeEQsVUFBVSxFQUNWLFlBQVksRUFDYixFQUFFLG1CQUFtQixHQUFHLGVBQWUsRUFBRSxDQUd6QztBQUVEOzs7R0FHRztBQUNILHdCQUFzQiw4QkFBOEIsQ0FDbEQsbUJBQW1CLEVBQUUsbUJBQW1CLEVBQ3hDLFVBQVUsRUFBRSxVQUFVLEVBQ3RCLFNBQVMsRUFBRSxJQUFJLENBQUMsaUJBQWlCLEVBQUUsZUFBZSxDQUFDLEVBQ25ELE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FDZCxPQUFPLENBQUMsd0JBQXdCLENBQUMsQ0EyRm5DIn0=
+export declare function validateCheckpointAttestations(publishedCheckpoint: PublishedCheckpoint, epochCache: EpochCache, constants: Pick<L1RollupConstants, 'epochDuration'>, signatureContext: CoordinationSignatureContext, logger?: Logger): Promise<ValidateCheckpointResult>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsaWRhdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21vZHVsZXMvdmFsaWRhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUdyRCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEVBQ0wsS0FBSyxlQUFlLEVBRXBCLEtBQUssd0JBQXdCLEVBRTlCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxLQUFLLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsS0FBSyxpQkFBaUIsRUFBaUMsTUFBTSw2QkFBNkIsQ0FBQztBQUNwRyxPQUFPLEVBQW9CLEtBQUssNEJBQTRCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUV4RixZQUFZLEVBQUUsd0JBQXdCLEVBQUUsQ0FBQztBQUV6Qzs7O0dBR0c7QUFDSCx3QkFBZ0IseUNBQXlDLENBQ3ZELEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxFQUFFLG1CQUFtQixFQUNqRCxnQkFBZ0IsRUFBRSw0QkFBNEIsR0FDN0MsZUFBZSxFQUFFLENBR25CO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLDhCQUE4QixDQUNsRCxtQkFBbUIsRUFBRSxtQkFBbUIsRUFDeEMsVUFBVSxFQUFFLFVBQVUsRUFDdEIsU0FBUyxFQUFFLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxlQUFlLENBQUMsRUFDbkQsZ0JBQWdCLEVBQUUsNEJBQTRCLEVBQzlDLE1BQU0sQ0FBQyxFQUFFLE1BQU0sR0FDZCxPQUFPLENBQUMsd0JBQXdCLENBQUMsQ0EyRm5DIn0=

package/dest/modules/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/modules/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,KAAK,eAAe,EAEpB,KAAK,wBAAwB,EAE9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,KAAK,iBAAiB,EAAiC,MAAM,6BAA6B,CAAC;AAGpG,YAAY,EAAE,wBAAwB,EAAE,CAAC;AAEzC;;;GAGG;AACH,wBAAgB,yCAAyC,CAAC,EACxD,UAAU,EACV,YAAY,EACb,EAAE,mBAAmB,GAAG,eAAe,EAAE,CAGzC;AAED;;;GAGG;AACH,wBAAsB,8BAA8B,CAClD,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EACnD,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,wBAAwB,CAAC,CA2FnC"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/modules/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,KAAK,eAAe,EAEpB,KAAK,wBAAwB,EAE9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,KAAK,iBAAiB,EAAiC,MAAM,6BAA6B,CAAC;AACpG,OAAO,EAAoB,KAAK,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AAExF,YAAY,EAAE,wBAAwB,EAAE,CAAC;AAEzC;;;GAGG;AACH,wBAAgB,yCAAyC,CACvD,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,mBAAmB,EACjD,gBAAgB,EAAE,4BAA4B,GAC7C,eAAe,EAAE,CAGnB;AAED;;;GAGG;AACH,wBAAsB,8BAA8B,CAClD,mBAAmB,EAAE,mBAAmB,EACxC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EACnD,gBAAgB,EAAE,4BAA4B,EAC9C,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,wBAAwB,CAAC,CA2FnC"}

package/dest/modules/validation.js

@@ -5,15 +5,15 @@ import { ConsensusPayload } from '@aztec/stdlib/p2p';
 /**
  * Extracts attestation information from a published checkpoint.
  * Returns info for each attestation, preserving array indices.
- */ export function getAttestationInfoFromPublishedCheckpoint({ checkpoint, attestations }) {
-    const payload = ConsensusPayload.fromCheckpoint(checkpoint);
+ */ export function getAttestationInfoFromPublishedCheckpoint({ checkpoint, attestations }, signatureContext) {
+    const payload = ConsensusPayload.fromCheckpoint(checkpoint, signatureContext);
     return getAttestationInfoFromPayload(payload, attestations);
 }
 /**
  * Validates the attestations submitted for the given checkpoint.
  * Returns true if the attestations are valid and sufficient, false otherwise.
- */ export async function validateCheckpointAttestations(publishedCheckpoint, epochCache, constants, logger) {
-    const attestorInfos = getAttestationInfoFromPublishedCheckpoint(publishedCheckpoint);
+ */ export async function validateCheckpointAttestations(publishedCheckpoint, epochCache, constants, signatureContext, logger) {
+    const attestorInfos = getAttestationInfoFromPublishedCheckpoint(publishedCheckpoint, signatureContext);
     const attestors = compactArray(attestorInfos.map((info)=>'address' in info ? info.address : undefined));
     const { checkpoint, attestations } = publishedCheckpoint;
     const headerHash = checkpoint.header.hash();