@aztec/archiver 0.86.0 → 0.87.0

package/dest/archiver/archiver.js

@@ -4,14 +4,15 @@ function _ts_decorate(decorators, target, key, desc) {
     else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-import { RollupContract, createEthereumChain } from '@aztec/ethereum';
+import { BlockTagTooOldError, InboxContract, RollupContract, createEthereumChain } from '@aztec/ethereum';
+import { maxBigint } from '@aztec/foundation/bigint';
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise, makeLoggingErrorHandler } from '@aztec/foundation/running-promise';
 import { sleep } from '@aztec/foundation/sleep';
 import { count } from '@aztec/foundation/string';
 import { elapsed } from '@aztec/foundation/timer';
-import { InboxAbi } from '@aztec/l1-artifacts';
 import { ContractClassRegisteredEvent, PrivateFunctionBroadcastedEvent, UtilityFunctionBroadcastedEvent } from '@aztec/protocol-contracts/class-registerer';
 import { ContractInstanceDeployedEvent, ContractInstanceUpdatedEvent } from '@aztec/protocol-contracts/instance-deployer';
 import { L2BlockSourceEvents } from '@aztec/stdlib/block';
@@ -20,9 +21,9 @@ import { getEpochAtSlot, getEpochNumberAtTimestamp, getSlotAtTimestamp, getSlotR
 import { Attributes, trackSpan } from '@aztec/telemetry-client';
 import { EventEmitter } from 'events';
 import groupBy from 'lodash.groupby';
-import { createPublicClient, fallback, getContract, http } from 'viem';
-import { retrieveBlocksFromRollup, retrieveL1ToL2Messages } from './data_retrieval.js';
-import { NoBlobBodiesFoundError } from './errors.js';
+import { createPublicClient, fallback, http } from 'viem';
+import { retrieveBlocksFromRollup, retrieveL1ToL2Message, retrieveL1ToL2Messages, retrievedBlockToPublishedL2Block } from './data_retrieval.js';
+import { InitialBlockNumberNotSequentialError, NoBlobBodiesFoundError } from './errors.js';
 import { ArchiverInstrumentation } from './instrumentation.js';
 /**
  * Pulls L2 blocks in a non-blocking manner and provides interface for their retrieval.
@@ -61,11 +62,7 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         this.tracer = instrumentation.tracer;
         this.store = new ArchiverStoreHelper(dataStore);
         this.rollup = new RollupContract(publicClient, l1Addresses.rollupAddress);
-        this.inbox = getContract({
-            address: l1Addresses.inboxAddress.toString(),
-            abi: InboxAbi,
-            client: publicClient
-        });
+        this.inbox = new InboxContract(publicClient, l1Addresses.inboxAddress);
     }
     /**
    * Creates a new instance of the Archiver and blocks until it syncs from chain.
@@ -85,18 +82,25 @@ import { ArchiverInstrumentation } from './instrumentation.js';
             rollup.getL1StartBlock(),
             rollup.getL1GenesisTime()
         ]);
+        const l1StartBlockHash = await publicClient.getBlock({
+            blockNumber: l1StartBlock,
+            includeTransactions: false
+        }).then((block)=>Buffer32.fromString(block.hash));
         const { aztecEpochDuration: epochDuration, aztecSlotDuration: slotDuration, ethereumSlotDuration, aztecProofSubmissionWindow: proofSubmissionWindow } = config;
-        const archiver = new Archiver(publicClient, config.l1Contracts, archiverStore, {
-            pollingIntervalMs: config.archiverPollingIntervalMS ?? 10_000,
-            batchSize: config.archiverBatchSize ?? 100
-        }, deps.blobSinkClient, await ArchiverInstrumentation.new(deps.telemetry, ()=>archiverStore.estimateSize()), {
+        const l1Constants = {
+            l1StartBlockHash,
             l1StartBlock,
             l1GenesisTime,
             epochDuration,
             slotDuration,
             ethereumSlotDuration,
             proofSubmissionWindow
-        });
+        };
+        const opts = {
+            pollingIntervalMs: config.archiverPollingIntervalMS ?? 10_000,
+            batchSize: config.archiverBatchSize ?? 100
+        };
+        const archiver = new Archiver(publicClient, config.l1Contracts, archiverStore, opts, deps.blobSinkClient, await ArchiverInstrumentation.new(deps.telemetry, ()=>archiverStore.estimateSize()), l1Constants);
         await archiver.start(blockUntilSynced);
         return archiver;
     }
@@ -132,6 +136,8 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         } catch (error) {
             if (error instanceof NoBlobBodiesFoundError) {
                 this.log.error(`Error syncing archiver: ${error.message}`);
+            } else if (error instanceof BlockTagTooOldError) {
+                this.log.warn(`Re-running archiver sync: ${error.message}`);
             } else {
                 this.log.error('Error during archiver sync', error);
             }
@@ -152,11 +158,21 @@ import { ArchiverInstrumentation } from './instrumentation.js';
      * The archiver will stay back, until there's data on L1 that will move the pointers forward.
      *
      * This code does not handle reorgs.
-     */ const { l1StartBlock } = this.l1constants;
-        const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = l1StartBlock } = await this.store.getSynchPoint();
-        const currentL1BlockNumber = await this.publicClient.getBlockNumber();
+     */ const { l1StartBlock, l1StartBlockHash } = this.l1constants;
+        const { blocksSynchedTo = l1StartBlock, messagesSynchedTo = {
+            l1BlockNumber: l1StartBlock,
+            l1BlockHash: l1StartBlockHash
+        } } = await this.store.getSynchPoint();
+        const currentL1Block = await this.publicClient.getBlock({
+            includeTransactions: false
+        });
+        const currentL1BlockNumber = currentL1Block.number;
+        const currentL1BlockHash = Buffer32.fromString(currentL1Block.hash);
         if (initialRun) {
-            this.log.info(`Starting archiver sync to rollup contract ${this.l1Addresses.rollupAddress.toString()} from L1 block ${Math.min(Number(blocksSynchedTo), Number(messagesSynchedTo))} to current L1 block ${currentL1BlockNumber}`);
+            this.log.info(`Starting archiver sync to rollup contract ${this.l1Addresses.rollupAddress.toString()} from L1 block ${blocksSynchedTo}` + ` to current L1 block ${currentL1BlockNumber} with hash ${currentL1BlockHash.toString()}`, {
+                blocksSynchedTo,
+                messagesSynchedTo
+            });
         }
         // ********** Ensuring Consistency of data pulled from L1 **********
         /**
@@ -175,7 +191,7 @@ import { ArchiverInstrumentation } from './instrumentation.js';
      * data up to the currentBlockNumber captured at the top of this function. We might want to improve on this
      * in future but for the time being it should give us the guarantees that we need
      */ // ********** Events that are processed per L1 block **********
-        await this.handleL1ToL2Messages(messagesSynchedTo, currentL1BlockNumber);
+        await this.handleL1ToL2Messages(messagesSynchedTo, currentL1BlockNumber, currentL1BlockHash);
         // Get L1 timestamp for the current block
         const currentL1Timestamp = !this.l1Timestamp || !this.l1BlockNumber || this.l1BlockNumber !== currentL1BlockNumber ? (await this.publicClient.getBlock({
             blockNumber: currentL1BlockNumber
@@ -183,13 +199,19 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         // ********** Events that are processed per L2 block **********
         if (currentL1BlockNumber > blocksSynchedTo) {
             // First we retrieve new L2 blocks
-            const { provenBlockNumber } = await this.handleL2blocks(blocksSynchedTo, currentL1BlockNumber);
-            // And then we prune the current epoch if it'd reorg on next submission.
+            const rollupStatus = await this.handleL2blocks(blocksSynchedTo, currentL1BlockNumber);
+            // Then we prune the current epoch if it'd reorg on next submission.
             // Note that we don't do this before retrieving L2 blocks because we may need to retrieve
             // blocks from more than 2 epochs ago, so we want to make sure we have the latest view of
             // the chain locally before we start unwinding stuff. This can be optimized by figuring out
             // up to which point we're pruning, and then requesting L2 blocks up to that point only.
-            await this.handleEpochPrune(provenBlockNumber, currentL1BlockNumber, currentL1Timestamp);
+            const { rollupCanPrune } = await this.handleEpochPrune(rollupStatus.provenBlockNumber, currentL1BlockNumber, currentL1Timestamp);
+            // And lastly we check if we are missing any L2 blocks behind us due to a possible L1 reorg.
+            // We only do this if rollup cant prune on the next submission. Otherwise we will end up
+            // re-syncing the blocks we have just unwound above.
+            if (!rollupCanPrune) {
+                await this.checkForNewBlocksBeforeL1SyncPoint(rollupStatus, blocksSynchedTo, currentL1BlockNumber);
+            }
             this.instrumentation.updateL1BlockHeight(currentL1BlockNumber);
         }
         // After syncing has completed, update the current l1 block number and timestamp,
@@ -206,7 +228,7 @@ import { ArchiverInstrumentation } from './instrumentation.js';
             });
         }
     }
-    /** Queries the rollup contract on whether a prune can be executed on the immediatenext L1 block. */ async canPrune(currentL1BlockNumber, currentL1Timestamp) {
+    /** Queries the rollup contract on whether a prune can be executed on the immediate next L1 block. */ async canPrune(currentL1BlockNumber, currentL1Timestamp) {
         const time = (currentL1Timestamp ?? 0n) + BigInt(this.l1constants.ethereumSlotDuration);
         const result = await this.rollup.canPruneAtTime(time, {
             blockNumber: currentL1BlockNumber
@@ -221,8 +243,9 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         return result;
     }
     /** Checks if there'd be a reorg for the next block submission and start pruning now. */ async handleEpochPrune(provenBlockNumber, currentL1BlockNumber, currentL1Timestamp) {
+        const rollupCanPrune = await this.canPrune(currentL1BlockNumber, currentL1Timestamp);
         const localPendingBlockNumber = BigInt(await this.getBlockNumber());
-        const canPrune = localPendingBlockNumber > provenBlockNumber && await this.canPrune(currentL1BlockNumber, currentL1Timestamp);
+        const canPrune = localPendingBlockNumber > provenBlockNumber && rollupCanPrune;
         if (canPrune) {
             const pruneFrom = provenBlockNumber + 1n;
             const header = await this.getBlockHeader(Number(pruneFrom));
@@ -247,6 +270,9 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         // Seems like the next iteration should handle this.
         // await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
         }
+        return {
+            rollupCanPrune
+        };
     }
     nextRange(end, limit) {
         const batchSize = this.config.batchSize * this.l1constants.slotDuration / this.l1constants.ethereumSlotDuration;
@@ -263,41 +289,172 @@ import { ArchiverInstrumentation } from './instrumentation.js';
             nextEnd
         ];
     }
-    async handleL1ToL2Messages(messagesSynchedTo, currentL1BlockNumber) {
-        this.log.trace(`Handling L1 to L2 messages from ${messagesSynchedTo} to ${currentL1BlockNumber}.`);
-        if (currentL1BlockNumber <= messagesSynchedTo) {
+    async handleL1ToL2Messages(messagesSyncPoint, currentL1BlockNumber, currentL1BlockHash) {
+        this.log.trace(`Handling L1 to L2 messages from ${messagesSyncPoint.l1BlockNumber} to ${currentL1BlockNumber}.`);
+        if (currentL1BlockNumber <= messagesSyncPoint.l1BlockNumber) {
             return;
         }
-        const localTotalMessageCount = await this.store.getTotalL1ToL2MessageCount();
-        const destinationTotalMessageCount = await this.inbox.read.totalMessagesInserted();
-        if (localTotalMessageCount === destinationTotalMessageCount) {
-            await this.store.setMessageSynchedL1BlockNumber(currentL1BlockNumber);
-            this.log.trace(`Retrieved no new L1 to L2 messages between L1 blocks ${messagesSynchedTo + 1n} and ${currentL1BlockNumber}.`);
+        // Load remote and local inbox states.
+        const localMessagesInserted = await this.store.getTotalL1ToL2MessageCount();
+        const localLastMessage = await this.store.getLastL1ToL2Message();
+        const remoteMessagesState = await this.inbox.getState({
+            blockNumber: currentL1BlockNumber
+        });
+        this.log.trace(`Retrieved remote inbox state at L1 block ${currentL1BlockNumber}.`, {
+            localMessagesInserted,
+            localLastMessage,
+            remoteMessagesState
+        });
+        // Compare message count and rolling hash. If they match, no need to retrieve anything.
+        if (remoteMessagesState.totalMessagesInserted === localMessagesInserted && remoteMessagesState.messagesRollingHash.equals(localLastMessage?.rollingHash ?? Buffer16.ZERO)) {
+            this.log.debug(`No L1 to L2 messages to query between L1 blocks ${messagesSyncPoint.l1BlockNumber} and ${currentL1BlockNumber}.`);
+            await this.store.setMessageSynchedL1Block({
+                l1BlockHash: currentL1BlockHash,
+                l1BlockNumber: currentL1BlockNumber
+            });
             return;
         }
-        // Retrieve messages in batches. Each batch is estimated to acommodate up to L2 'blockBatchSize' blocks,
-        let searchStartBlock = messagesSynchedTo;
-        let searchEndBlock = messagesSynchedTo;
+        // Check if our syncpoint is still valid. If not, there was an L1 reorg and we need to re-retrieve messages.
+        // Note that we need to fetch it from logs and not from inbox state at the syncpoint l1 block number, since it
+        // could be older than 128 blocks and non-archive nodes cannot resolve it.
+        if (localLastMessage) {
+            const remoteLastMessage = await this.retrieveL1ToL2Message(localLastMessage.leaf);
+            this.log.trace(`Retrieved remote message for local last`, {
+                remoteLastMessage,
+                localLastMessage
+            });
+            if (!remoteLastMessage || !remoteLastMessage.rollingHash.equals(localLastMessage.rollingHash)) {
+                this.log.warn(`Rolling back L1 to L2 messages due to hash mismatch or msg not found.`, {
+                    remoteLastMessage,
+                    messagesSyncPoint,
+                    localLastMessage
+                });
+                messagesSyncPoint = await this.rollbackL1ToL2Messages(localLastMessage, messagesSyncPoint);
+                this.log.debug(`Rolled back L1 to L2 messages to L1 block ${messagesSyncPoint.l1BlockNumber}.`, {
+                    messagesSyncPoint
+                });
+            }
+        }
+        // Retrieve and save messages in batches. Each batch is estimated to acommodate up to L2 'blockBatchSize' blocks,
+        let searchStartBlock = 0n;
+        let searchEndBlock = messagesSyncPoint.l1BlockNumber;
+        let lastMessage;
+        let messageCount = 0;
         do {
             [searchStartBlock, searchEndBlock] = this.nextRange(searchEndBlock, currentL1BlockNumber);
             this.log.trace(`Retrieving L1 to L2 messages between L1 blocks ${searchStartBlock} and ${searchEndBlock}.`);
-            const retrievedL1ToL2Messages = await retrieveL1ToL2Messages(this.inbox, searchStartBlock, searchEndBlock);
-            this.log.verbose(`Retrieved ${retrievedL1ToL2Messages.retrievedData.length} new L1 to L2 messages between L1 blocks ${searchStartBlock} and ${searchEndBlock}.`);
-            await this.store.addL1ToL2Messages(retrievedL1ToL2Messages);
-            for (const msg of retrievedL1ToL2Messages.retrievedData){
+            const messages = await retrieveL1ToL2Messages(this.inbox.getContract(), searchStartBlock, searchEndBlock);
+            this.log.verbose(`Retrieved ${messages.length} new L1 to L2 messages between L1 blocks ${searchStartBlock} and ${searchEndBlock}.`);
+            await this.store.addL1ToL2Messages(messages);
+            for (const msg of messages){
                 this.log.debug(`Downloaded L1 to L2 message`, {
-                    leaf: msg.leaf.toString(),
-                    index: msg.index
+                    ...msg,
+                    leaf: msg.leaf.toString()
                 });
+                lastMessage = msg;
+                messageCount++;
             }
         }while (searchEndBlock < currentL1BlockNumber)
+        // Log stats for messages retrieved (if any).
+        if (messageCount > 0) {
+            this.log.info(`Retrieved ${messageCount} new L1 to L2 messages up to message with index ${lastMessage?.index} for L2 block ${lastMessage?.l2BlockNumber}`, {
+                lastMessage,
+                messageCount
+            });
+        }
+        // Warn if the resulting rolling hash does not match the remote state we had retrieved.
+        if (lastMessage && !lastMessage.rollingHash.equals(remoteMessagesState.messagesRollingHash)) {
+            this.log.warn(`Last message retrieved rolling hash does not match remote state.`, {
+                lastMessage,
+                remoteMessagesState
+            });
+        }
+    }
+    retrieveL1ToL2Message(leaf) {
+        return retrieveL1ToL2Message(this.inbox.getContract(), leaf, this.l1constants.l1StartBlock);
+    }
+    async rollbackL1ToL2Messages(localLastMessage, messagesSyncPoint) {
+        // Slowly go back through our messages until we find the last common message.
+        // We could query the logs in batch as an optimization, but the depth of the reorg should not be deep, and this
+        // is a very rare case, so it's fine to query one log at a time.
+        let commonMsg;
+        this.log.verbose(`Searching most recent common L1 to L2 message at or before index ${localLastMessage.index}`);
+        for await (const msg of this.store.iterateL1ToL2Messages({
+            reverse: true,
+            end: localLastMessage.index
+        })){
+            const remoteMsg = await this.retrieveL1ToL2Message(msg.leaf);
+            const logCtx = {
+                remoteMsg,
+                localMsg: msg
+            };
+            if (remoteMsg && remoteMsg.rollingHash.equals(msg.rollingHash)) {
+                this.log.verbose(`Found most recent common L1 to L2 message at index ${msg.index} on L1 block ${msg.l1BlockNumber}`, logCtx);
+                commonMsg = remoteMsg;
+                break;
+            } else if (remoteMsg) {
+                this.log.debug(`Local L1 to L2 message with index ${msg.index} has different rolling hash`, logCtx);
+            } else {
+                this.log.debug(`Local L1 to L2 message with index ${msg.index} not found on L1`, logCtx);
+            }
+        }
+        // Delete everything after the common message we found.
+        const lastGoodIndex = commonMsg?.index;
+        this.log.warn(`Deleting all local L1 to L2 messages after index ${lastGoodIndex ?? 'undefined'}`);
+        await this.store.removeL1ToL2Messages(lastGoodIndex !== undefined ? lastGoodIndex + 1n : 0n);
+        // Update the syncpoint so the loop below reprocesses the changed messages. We go to the block before
+        // the last common one, so we force reprocessing it, in case new messages were added on that same L1 block
+        // after the last common message.
+        const syncPointL1BlockNumber = commonMsg ? commonMsg.l1BlockNumber - 1n : this.l1constants.l1StartBlock;
+        const syncPointL1BlockHash = await this.getL1BlockHash(syncPointL1BlockNumber);
+        messagesSyncPoint = {
+            l1BlockNumber: syncPointL1BlockNumber,
+            l1BlockHash: syncPointL1BlockHash
+        };
+        await this.store.setMessageSynchedL1Block(messagesSyncPoint);
+        return messagesSyncPoint;
+    }
+    async getL1BlockHash(l1BlockNumber) {
+        const block = await this.publicClient.getBlock({
+            blockNumber: l1BlockNumber,
+            includeTransactions: false
+        });
+        if (!block) {
+            throw new Error(`Missing L1 block ${l1BlockNumber}`);
+        }
+        return Buffer32.fromString(block.hash);
     }
     async handleL2blocks(blocksSynchedTo, currentL1BlockNumber) {
         const localPendingBlockNumber = BigInt(await this.getBlockNumber());
         const [provenBlockNumber, provenArchive, pendingBlockNumber, pendingArchive, archiveForLocalPendingBlockNumber] = await this.rollup.status(localPendingBlockNumber, {
             blockNumber: currentL1BlockNumber
         });
+        const rollupStatus = {
+            provenBlockNumber,
+            provenArchive,
+            pendingBlockNumber,
+            pendingArchive
+        };
+        this.log.trace(`Retrieved rollup status at current L1 block ${currentL1BlockNumber}.`, {
+            localPendingBlockNumber,
+            blocksSynchedTo,
+            currentL1BlockNumber,
+            archiveForLocalPendingBlockNumber,
+            ...rollupStatus
+        });
         const updateProvenBlock = async ()=>{
+            // Annoying edge case: if proven block is moved back to 0 due to a reorg at the beginning of the chain,
+            // we need to set it to zero. This is an edge case because we dont have a block zero (initial block is one),
+            // so localBlockForDestinationProvenBlockNumber would not be found below.
+            if (provenBlockNumber === 0n) {
+                const localProvenBlockNumber = await this.store.getProvenL2BlockNumber();
+                if (localProvenBlockNumber !== Number(provenBlockNumber)) {
+                    await this.store.setProvenL2BlockNumber(Number(provenBlockNumber));
+                    this.log.info(`Rolled back proven chain to block ${provenBlockNumber}`, {
+                        provenBlockNumber
+                    });
+                }
+            }
             const localBlockForDestinationProvenBlockNumber = await this.getBlock(Number(provenBlockNumber));
             // Sanity check. I've hit what seems to be a state where the proven block is set to a value greater than the latest
             // synched block when requesting L2Tips from the archiver. This is the only place where the proven block is set.
@@ -305,6 +462,7 @@ import { ArchiverInstrumentation } from './instrumentation.js';
             if (localBlockForDestinationProvenBlockNumber && synched < localBlockForDestinationProvenBlockNumber?.number) {
                 this.log.error(`Hit local block greater than last synched block: ${localBlockForDestinationProvenBlockNumber.number} > ${synched}`);
             }
+            this.log.trace(`Local block for remote proven block ${provenBlockNumber} is ${localBlockForDestinationProvenBlockNumber?.archive.root.toString() ?? 'undefined'}`);
             if (localBlockForDestinationProvenBlockNumber && provenArchive === localBlockForDestinationProvenBlockNumber.archive.root.toString()) {
                 const localProvenBlockNumber = await this.store.getProvenL2BlockNumber();
                 if (localProvenBlockNumber !== Number(provenBlockNumber)) {
@@ -312,6 +470,8 @@ import { ArchiverInstrumentation } from './instrumentation.js';
                     this.log.info(`Updated proven chain to block ${provenBlockNumber}`, {
                         provenBlockNumber
                     });
+                } else {
+                    this.log.trace(`Proven block ${provenBlockNumber} already stored.`);
                 }
             }
             this.instrumentation.updateLastProvenBlock(Number(provenBlockNumber));
@@ -322,9 +482,7 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         if (noBlocks) {
             await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
             this.log.debug(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}, no blocks on chain`);
-            return {
-                provenBlockNumber
-            };
+            return rollupStatus;
         }
         await updateProvenBlock();
         // Related to the L2 reorgs of the pending chain. We are only interested in actually addressing a reorg if there
@@ -342,12 +500,10 @@ import { ArchiverInstrumentation } from './instrumentation.js';
                 // this block again (or any blocks before).
                 // However, in the re-org scenario, our L1 node is temporarily lying to us and we end up potentially missing blocks
                 // We must only set this block number based on actually retrieved logs.
-                // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8621): Tackle this properly when we handle L1 Re-orgs.
-                //await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
+                // TODO(#8621): Tackle this properly when we handle L1 Re-orgs.
+                // await this.store.setBlockSynchedL1BlockNumber(currentL1BlockNumber);
                 this.log.debug(`No blocks to retrieve from ${blocksSynchedTo + 1n} to ${currentL1BlockNumber}`);
-                return {
-                    provenBlockNumber
-                };
+                return rollupStatus;
             }
             const localPendingBlockInChain = archiveForLocalPendingBlockNumber === localPendingBlock.archive.root.toString();
             if (!localPendingBlockInChain) {
@@ -377,6 +533,7 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         // computed using the L2 block time vs the L1 block time.
         let searchStartBlock = blocksSynchedTo;
         let searchEndBlock = blocksSynchedTo;
+        let lastRetrievedBlock;
         do {
             [searchStartBlock, searchEndBlock] = this.nextRange(searchEndBlock, currentL1BlockNumber);
             this.log.trace(`Retrieving L2 blocks from L1 block ${searchStartBlock} to ${searchEndBlock}`);
@@ -390,7 +547,8 @@ import { ArchiverInstrumentation } from './instrumentation.js';
             }
             const lastProcessedL1BlockNumber = retrievedBlocks[retrievedBlocks.length - 1].l1.blockNumber;
             this.log.debug(`Retrieved ${retrievedBlocks.length} new L2 blocks between L1 blocks ${searchStartBlock} and ${searchEndBlock} with last processed L1 block ${lastProcessedL1BlockNumber}.`);
-            for (const block of retrievedBlocks){
+            const publishedBlocks = retrievedBlocks.map((b)=>retrievedBlockToPublishedL2Block(b));
+            for (const block of publishedBlocks){
                 this.log.debug(`Ingesting new L2 block ${block.block.number} with ${block.block.body.txEffects.length} txs`, {
                     blockHash: block.block.hash(),
                     l1BlockNumber: block.l1.blockNumber,
@@ -398,23 +556,72 @@ import { ArchiverInstrumentation } from './instrumentation.js';
                     ...block.block.getStats()
                 });
             }
-            const [processDuration] = await elapsed(()=>this.store.addBlocks(retrievedBlocks));
-            this.instrumentation.processNewBlocks(processDuration / retrievedBlocks.length, retrievedBlocks.map((b)=>b.block));
-            for (const block of retrievedBlocks){
+            try {
+                const [processDuration] = await elapsed(()=>this.store.addBlocks(publishedBlocks));
+                this.instrumentation.processNewBlocks(processDuration / publishedBlocks.length, publishedBlocks.map((b)=>b.block));
+            } catch (err) {
+                if (err instanceof InitialBlockNumberNotSequentialError) {
+                    const { previousBlockNumber, newBlockNumber } = err;
+                    const previousBlock = previousBlockNumber ? await this.store.getPublishedBlock(previousBlockNumber) : undefined;
+                    const updatedL1SyncPoint = previousBlock?.l1.blockNumber ?? this.l1constants.l1StartBlock;
+                    await this.store.setBlockSynchedL1BlockNumber(updatedL1SyncPoint);
+                    this.log.warn(`Attempting to insert block ${newBlockNumber} with previous block ${previousBlockNumber}. Rolling back L1 sync point to ${updatedL1SyncPoint} to try and fetch the missing blocks.`, {
+                        previousBlockNumber,
+                        previousBlockHash: await previousBlock?.block.hash(),
+                        newBlockNumber,
+                        updatedL1SyncPoint
+                    });
+                }
+                throw err;
+            }
+            for (const block of publishedBlocks){
                 this.log.info(`Downloaded L2 block ${block.block.number}`, {
-                    blockHash: block.block.hash(),
+                    blockHash: await block.block.hash(),
                     blockNumber: block.block.number,
                     txCount: block.block.body.txEffects.length,
-                    globalVariables: block.block.header.globalVariables.toInspect()
+                    globalVariables: block.block.header.globalVariables.toInspect(),
+                    archiveRoot: block.block.archive.root.toString(),
+                    archiveNextLeafIndex: block.block.archive.nextAvailableLeafIndex
                 });
             }
+            lastRetrievedBlock = publishedBlocks.at(-1) ?? lastRetrievedBlock;
         }while (searchEndBlock < currentL1BlockNumber)
         // Important that we update AFTER inserting the blocks.
         await updateProvenBlock();
         return {
-            provenBlockNumber
+            ...rollupStatus,
+            lastRetrievedBlock
         };
     }
+    async checkForNewBlocksBeforeL1SyncPoint(status, blocksSynchedTo, currentL1BlockNumber) {
+        const { lastRetrievedBlock, pendingBlockNumber } = status;
+        // Compare the last L2 block 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 latestLocalL2BlockNumber = lastRetrievedBlock?.block.number ?? await this.store.getSynchedL2BlockNumber();
+        if (latestLocalL2BlockNumber < pendingBlockNumber) {
+            // Here we have consumed all logs until the `currentL1Block` we pinned at the beginning of the archiver loop,
+            // but still havent reached the pending block according to the call to the rollup contract.
+            // We suspect an L1 reorg that added blocks *behind* us. If that is the case, it must have happened between the
+            // last L2 block 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 latestLocalL2Block = lastRetrievedBlock ?? (latestLocalL2BlockNumber > 0 ? await this.store.getPublishedBlocks(latestLocalL2BlockNumber, 1).then(([b])=>b) : undefined);
+            const targetL1BlockNumber = latestLocalL2Block?.l1.blockNumber ?? maxBigint(currentL1BlockNumber - 64n, 0n);
+            const latestLocalL2BlockArchive = latestLocalL2Block?.block.archive.root.toString();
+            this.log.warn(`Failed to reach L2 block ${pendingBlockNumber} at ${currentL1BlockNumber} (latest is ${latestLocalL2BlockNumber}). ` + `Rolling back last synched L1 block number to ${targetL1BlockNumber}.`, {
+                latestLocalL2BlockNumber,
+                latestLocalL2BlockArchive,
+                blocksSynchedTo,
+                currentL1BlockNumber,
+                ...status
+            });
+            await this.store.setBlockSynchedL1BlockNumber(targetL1BlockNumber);
+        } else {
+            this.log.trace(`No new blocks behind L1 sync point to retrieve.`, {
+                latestLocalL2BlockNumber,
+                pendingBlockNumber
+            });
+        }
+    }
     /** Resumes the archiver after a stop. */ resume() {
         if (!this.runningPromise) {
             throw new Error(`Archiver was never started`);
@@ -535,7 +742,7 @@ import { ArchiverInstrumentation } from './instrumentation.js';
     }
     /** Equivalent to getBlocks but includes publish data. */ async getPublishedBlocks(from, limit, proven) {
         const limitWithProven = proven ? Math.min(limit, Math.max(await this.store.getProvenL2BlockNumber() - from + 1, 0)) : limit;
-        return limitWithProven === 0 ? [] : await this.store.getBlocks(from, limitWithProven);
+        return limitWithProven === 0 ? [] : await this.store.getPublishedBlocks(from, limitWithProven);
     }
     /**
    * Gets an l2 block.
@@ -546,11 +753,11 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         if (number < 0) {
             number = await this.store.getSynchedL2BlockNumber();
         }
-        if (number == 0) {
+        if (number === 0) {
             return undefined;
         }
-        const blocks = await this.store.getBlocks(number, 1);
-        return blocks.length === 0 ? undefined : blocks[0].block;
+        const publishedBlock = await this.store.getPublishedBlock(number);
+        return publishedBlock?.block;
     }
     async getBlockHeader(number) {
         if (number === 'latest') {
@@ -647,9 +854,13 @@ import { ArchiverInstrumentation } from './instrumentation.js';
             this.getBlockNumber(),
             this.getProvenBlockNumber()
         ]);
-        const [latestBlockHeader, provenBlockHeader] = await Promise.all([
+        // TODO(#13569): Compute proper finalized block number based on L1 finalized block.
+        // We just force it 2 epochs worth of proven data for now.
+        const finalizedBlockNumber = Math.max(provenBlockNumber - this.l1constants.epochDuration * 2, 0);
+        const [latestBlockHeader, provenBlockHeader, finalizedBlockHeader] = await Promise.all([
             latestBlockNumber > 0 ? this.getBlockHeader(latestBlockNumber) : undefined,
-            provenBlockNumber > 0 ? this.getBlockHeader(provenBlockNumber) : undefined
+            provenBlockNumber > 0 ? this.getBlockHeader(provenBlockNumber) : undefined,
+            finalizedBlockNumber > 0 ? this.getBlockHeader(finalizedBlockNumber) : undefined
         ]);
         if (latestBlockNumber > 0 && !latestBlockHeader) {
             throw new Error(`Failed to retrieve latest block header for block ${latestBlockNumber}`);
@@ -657,9 +868,12 @@ import { ArchiverInstrumentation } from './instrumentation.js';
         if (provenBlockNumber > 0 && !provenBlockHeader) {
             throw new Error(`Failed to retrieve proven block header for block ${provenBlockNumber} (latest block is ${latestBlockNumber})`);
         }
+        if (finalizedBlockNumber > 0 && !finalizedBlockHeader) {
+            throw new Error(`Failed to retrieve finalized block header for block ${finalizedBlockNumber} (latest block is ${latestBlockNumber})`);
+        }
         const latestBlockHeaderHash = await latestBlockHeader?.hash();
         const provenBlockHeaderHash = await provenBlockHeader?.hash();
-        const finalizedBlockHeaderHash = await provenBlockHeader?.hash();
+        const finalizedBlockHeaderHash = await finalizedBlockHeader?.hash();
         return {
             latest: {
                 number: latestBlockNumber,
@@ -670,11 +884,46 @@ import { ArchiverInstrumentation } from './instrumentation.js';
                 hash: provenBlockHeaderHash?.toString()
             },
             finalized: {
-                number: provenBlockNumber,
+                number: finalizedBlockNumber,
                 hash: finalizedBlockHeaderHash?.toString()
             }
         };
     }
+    async rollbackTo(targetL2BlockNumber) {
+        const currentBlocks = await this.getL2Tips();
+        const currentL2Block = currentBlocks.latest.number;
+        const currentProvenBlock = currentBlocks.proven.number;
+        // const currentFinalizedBlock = currentBlocks.finalized.number;
+        if (targetL2BlockNumber >= currentL2Block) {
+            throw new Error(`Target L2 block ${targetL2BlockNumber} must be less than current L2 block ${currentL2Block}`);
+        }
+        const blocksToUnwind = currentL2Block - targetL2BlockNumber;
+        const targetL2Block = await this.store.getPublishedBlock(targetL2BlockNumber);
+        if (!targetL2Block) {
+            throw new Error(`Target L2 block ${targetL2BlockNumber} not found`);
+        }
+        const targetL1BlockNumber = targetL2Block.l1.blockNumber;
+        const targetL1BlockHash = await this.getL1BlockHash(targetL1BlockNumber);
+        this.log.info(`Unwinding ${blocksToUnwind} blocks from L2 block ${currentL2Block}`);
+        await this.store.unwindBlocks(currentL2Block, blocksToUnwind);
+        this.log.info(`Unwinding L1 to L2 messages to ${targetL2BlockNumber}`);
+        await this.store.rollbackL1ToL2MessagesToL2Block(targetL2BlockNumber);
+        this.log.info(`Setting L1 syncpoints to ${targetL1BlockNumber}`);
+        await this.store.setBlockSynchedL1BlockNumber(targetL1BlockNumber);
+        await this.store.setMessageSynchedL1Block({
+            l1BlockNumber: targetL1BlockNumber,
+            l1BlockHash: targetL1BlockHash
+        });
+        if (targetL2BlockNumber < currentProvenBlock) {
+            this.log.info(`Clearing proven L2 block number`);
+            await this.store.setProvenL2BlockNumber(0);
+        }
+    // TODO(palla/reorg): Set the finalized block when we add support for it.
+    // if (targetL2BlockNumber < currentFinalizedBlock) {
+    //   this.log.info(`Clearing finalized L2 block number`);
+    //   await this.store.setFinalizedL2BlockNumber(0);
+    // }
+    }
 }
 _ts_decorate([
     trackSpan('Archiver.sync', (initialRun)=>({
@@ -691,7 +940,7 @@ var Operation = /*#__PURE__*/ function(Operation) {
  *
  * I would have preferred to not have this type. But it is useful for handling the logic that any
  * store would need to include otherwise while exposing fewer functions and logic directly to the archiver.
- */ class ArchiverStoreHelper {
+ */ export class ArchiverStoreHelper {
     store;
     #log;
     constructor(store){
@@ -796,33 +1045,40 @@ var Operation = /*#__PURE__*/ function(Operation) {
         }
         return true;
     }
-    async addBlocks(blocks) {
-        const opResults = await Promise.all([
-            this.store.addLogs(blocks.map((block)=>block.block)),
-            // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
-            ...blocks.map(async (block)=>{
-                const contractClassLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
-                // ContractInstanceDeployed event logs are broadcast in privateLogs.
-                const privateLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
-                const publicLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
-                return (await Promise.all([
-                    this.#updateRegisteredContractClasses(contractClassLogs, block.block.number, 0),
-                    this.#updateDeployedContractInstances(privateLogs, block.block.number, 0),
-                    this.#updateUpdatedContractInstances(publicLogs, block.block.number, 0),
-                    this.#storeBroadcastedIndividualFunctions(contractClassLogs, block.block.number)
-                ])).every(Boolean);
-            }),
-            this.store.addBlocks(blocks)
-        ]);
-        return opResults.every(Boolean);
+    addBlocks(blocks) {
+        // Add the blocks to the store. Store will throw if the blocks are not in order, there are gaps,
+        // or if the previous block is not in the store.
+        return this.store.transactionAsync(async ()=>{
+            await this.store.addBlocks(blocks);
+            const opResults = await Promise.all([
+                this.store.addLogs(blocks.map((block)=>block.block)),
+                // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
+                ...blocks.map(async (block)=>{
+                    const contractClassLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.contractClassLogs);
+                    // ContractInstanceDeployed event logs are broadcast in privateLogs.
+                    const privateLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.privateLogs);
+                    const publicLogs = block.block.body.txEffects.flatMap((txEffect)=>txEffect.publicLogs);
+                    return (await Promise.all([
+                        this.#updateRegisteredContractClasses(contractClassLogs, block.block.number, 0),
+                        this.#updateDeployedContractInstances(privateLogs, block.block.number, 0),
+                        this.#updateUpdatedContractInstances(publicLogs, block.block.number, 0),
+                        this.#storeBroadcastedIndividualFunctions(contractClassLogs, block.block.number)
+                    ])).every(Boolean);
+                })
+            ]);
+            return opResults.every(Boolean);
+        });
     }
     async unwindBlocks(from, blocksToUnwind) {
         const last = await this.getSynchedL2BlockNumber();
         if (from != last) {
-            throw new Error(`Can only remove from the tip`);
+            throw new Error(`Cannot unwind blocks from block ${from} when the last block is ${last}`);
+        }
+        if (blocksToUnwind <= 0) {
+            throw new Error(`Cannot unwind ${blocksToUnwind} blocks`);
         }
         // from - blocksToUnwind = the new head, so + 1 for what we need to remove
-        const blocks = await this.getBlocks(from - blocksToUnwind + 1, blocksToUnwind);
+        const blocks = await this.getPublishedBlocks(from - blocksToUnwind + 1, blocksToUnwind);
         const opResults = await Promise.all([
             // Unroll all logs emitted during the retrieved blocks and extract any contract classes and instances from them
             ...blocks.map(async (block)=>{
@@ -841,8 +1097,11 @@ var Operation = /*#__PURE__*/ function(Operation) {
         ]);
         return opResults.every(Boolean);
     }
-    getBlocks(from, limit) {
-        return this.store.getBlocks(from, limit);
+    getPublishedBlocks(from, limit) {
+        return this.store.getPublishedBlocks(from, limit);
+    }
+    getPublishedBlock(number) {
+        return this.store.getPublishedBlock(number);
     }
     getBlockHeaders(from, limit) {
         return this.store.getBlockHeaders(from, limit);
@@ -886,8 +1145,8 @@ var Operation = /*#__PURE__*/ function(Operation) {
     setBlockSynchedL1BlockNumber(l1BlockNumber) {
         return this.store.setBlockSynchedL1BlockNumber(l1BlockNumber);
     }
-    setMessageSynchedL1BlockNumber(l1BlockNumber) {
-        return this.store.setMessageSynchedL1BlockNumber(l1BlockNumber);
+    setMessageSynchedL1Block(l1Block) {
+        return this.store.setMessageSynchedL1Block(l1Block);
     }
     getSynchPoint() {
         return this.store.getSynchPoint();
@@ -916,4 +1175,16 @@ var Operation = /*#__PURE__*/ function(Operation) {
     estimateSize() {
         return this.store.estimateSize();
     }
+    rollbackL1ToL2MessagesToL2Block(targetBlockNumber) {
+        return this.store.rollbackL1ToL2MessagesToL2Block(targetBlockNumber);
+    }
+    iterateL1ToL2Messages(range = {}) {
+        return this.store.iterateL1ToL2Messages(range);
+    }
+    removeL1ToL2Messages(startIndex) {
+        return this.store.removeL1ToL2Messages(startIndex);
+    }
+    getLastL1ToL2Message() {
+        return this.store.getLastL1ToL2Message();
+    }
 }