@aztec/archiver 0.86.0-starknet.1 → 0.87.0

package/dest/archiver/archiver.d.ts

@@ -1,9 +1,10 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
-import { type ViemPublicClient } from '@aztec/ethereum';
+import { type L1BlockId, type ViemPublicClient } from '@aztec/ethereum';
+import { Buffer32 } from '@aztec/foundation/buffer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger } from '@aztec/foundation/log';
+import type { CustomRange } from '@aztec/kv-store';
 import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type L2Block, type L2BlockSource, type L2Tips } from '@aztec/stdlib/block';
@@ -12,14 +13,14 @@ import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import type { GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client';
 import type { L2LogsSource } from '@aztec/stdlib/interfaces/server';
 import { type LogFilter, type PrivateLog, TxScopedL2Log } from '@aztec/stdlib/logs';
-import type { InboxLeaf, L1ToL2MessageSource } from '@aztec/stdlib/messaging';
+import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import { type BlockHeader, type IndexedTxEffect, TxHash, TxReceipt } from '@aztec/stdlib/tx';
 import { type TelemetryClient, type Traceable, type Tracer } from '@aztec/telemetry-client';
 import { EventEmitter } from 'events';
 import type { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.js';
 import type { ArchiverConfig } from './config.js';
 import { ArchiverInstrumentation } from './instrumentation.js';
-import type { DataRetrieval } from './structs/data_retrieval.js';
+import type { InboxMessage } from './structs/inbox_message.js';
 import type { PublishedL2Block } from './structs/published.js';
 /**
  * Helper interface to combine all sources this archiver implementation provides.
@@ -67,7 +68,9 @@ export declare class Archiver extends EventEmitter implements ArchiveSource, Tra
     }, dataStore: ArchiverDataStore, config: {
         pollingIntervalMs: number;
         batchSize: number;
-    }, blobSinkClient: BlobSinkClientInterface, instrumentation: ArchiverInstrumentation, l1constants: L1RollupConstants, log?: Logger);
+    }, blobSinkClient: BlobSinkClientInterface, instrumentation: ArchiverInstrumentation, l1constants: L1RollupConstants & {
+        l1StartBlockHash: Buffer32;
+    }, log?: Logger);
     /**
      * Creates a new instance of the Archiver and blocks until it syncs from chain.
      * @param config - The archiver's desired configuration.
@@ -96,6 +99,9 @@ export declare class Archiver extends EventEmitter implements ArchiveSource, Tra
     private handleEpochPrune;
     private nextRange;
     private handleL1ToL2Messages;
+    private retrieveL1ToL2Message;
+    private rollbackL1ToL2Messages;
+    private getL1BlockHash;
     private handleL2blocks;
     private checkForNewBlocksBeforeL1SyncPoint;
     /** Resumes the archiver after a stop. */
@@ -190,6 +196,7 @@ export declare class Archiver extends EventEmitter implements ArchiveSource, Tra
     registerContractFunctionSignatures(address: AztecAddress, signatures: string[]): Promise<void>;
     getDebugFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
     getL2Tips(): Promise<L2Tips>;
+    rollbackTo(targetL2BlockNumber: number): Promise<void>;
 }
 /**
  * A helper class that we use to deal with some of the logic needed when adding blocks.
@@ -197,17 +204,18 @@ export declare class Archiver extends EventEmitter implements ArchiveSource, Tra
  * 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.
  */
-export declare class ArchiverStoreHelper implements Omit<ArchiverDataStore, 'addLogs' | 'deleteLogs' | 'addContractClasses' | 'deleteContractClasses' | 'addContractInstances' | 'deleteContractInstances' | 'addContractInstanceUpdates' | 'deleteContractInstanceUpdates' | 'addFunctions' | 'backupTo' | 'close'> {
+export declare class ArchiverStoreHelper implements Omit<ArchiverDataStore, 'addLogs' | 'deleteLogs' | 'addContractClasses' | 'deleteContractClasses' | 'addContractInstances' | 'deleteContractInstances' | 'addContractInstanceUpdates' | 'deleteContractInstanceUpdates' | 'addFunctions' | 'backupTo' | 'close' | 'transactionAsync'> {
     #private;
     protected readonly store: ArchiverDataStore;
     constructor(store: ArchiverDataStore);
     addBlocks(blocks: PublishedL2Block[]): Promise<boolean>;
     unwindBlocks(from: number, blocksToUnwind: number): Promise<boolean>;
     getPublishedBlocks(from: number, limit: number): Promise<PublishedL2Block[]>;
+    getPublishedBlock(number: number): Promise<PublishedL2Block | undefined>;
     getBlockHeaders(from: number, limit: number): Promise<BlockHeader[]>;
     getTxEffect(txHash: TxHash): Promise<IndexedTxEffect | undefined>;
     getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined>;
-    addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean>;
+    addL1ToL2Messages(messages: InboxMessage[]): Promise<void>;
     getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]>;
     getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined>;
     getPrivateLogs(from: number, limit: number): Promise<PrivateLog[]>;
@@ -218,7 +226,7 @@ export declare class ArchiverStoreHelper implements Omit<ArchiverDataStore, 'add
     getProvenL2BlockNumber(): Promise<number>;
     setProvenL2BlockNumber(l2BlockNumber: number): Promise<void>;
     setBlockSynchedL1BlockNumber(l1BlockNumber: bigint): Promise<void>;
-    setMessageSynchedL1BlockNumber(l1BlockNumber: bigint): Promise<void>;
+    setMessageSynchedL1Block(l1Block: L1BlockId): Promise<void>;
     getSynchPoint(): Promise<ArchiverL1SynchPoint>;
     getContractClass(id: Fr): Promise<ContractClassPublic | undefined>;
     getBytecodeCommitment(contractClassId: Fr): Promise<Fr | undefined>;
@@ -233,5 +241,9 @@ export declare class ArchiverStoreHelper implements Omit<ArchiverDataStore, 'add
         actualSize: number;
         numItems: number;
     }>;
+    rollbackL1ToL2MessagesToL2Block(targetBlockNumber: number | bigint): Promise<void>;
+    iterateL1ToL2Messages(range?: CustomRange<bigint>): AsyncIterableIterator<InboxMessage>;
+    removeL1ToL2Messages(startIndex: bigint): Promise<void>;
+    getLastL1ToL2Message(): Promise<InboxMessage | undefined>;
 }
 //# sourceMappingURL=archiver.d.ts.map

package/dest/archiver/archiver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/archiver/archiver.ts"],"names":[],"mappings":"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"}

package/dest/archiver/archiver.js

@@ -4,15 +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 { BlockTagTooOldError, 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';
@@ -21,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, retrievedBlockToPublishedL2Block } 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.
@@ -62,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.
@@ -86,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;
     }
@@ -155,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 **********
         /**
@@ -178,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
@@ -276,34 +289,140 @@ 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());
@@ -437,14 +556,32 @@ import { ArchiverInstrumentation } from './instrumentation.js';
                     ...block.block.getStats()
                 });
             }
-            const [processDuration] = await elapsed(()=>this.store.addBlocks(publishedBlocks));
-            this.instrumentation.processNewBlocks(processDuration / publishedBlocks.length, publishedBlocks.map((b)=>b.block));
+            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: 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;
@@ -616,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.getPublishedBlocks(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') {
@@ -752,6 +889,41 @@ import { ArchiverInstrumentation } from './instrumentation.js';
             }
         };
     }
+    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)=>({
@@ -873,30 +1045,37 @@ 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.getPublishedBlocks(from - blocksToUnwind + 1, blocksToUnwind);
@@ -921,6 +1100,9 @@ var Operation = /*#__PURE__*/ function(Operation) {
     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);
     }
@@ -963,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();
@@ -993,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();
+    }
 }