fix: resolve backport conflicts for #22154

v4 has no setInboxTreeInProgress/treeInProgress persistence concept, so:
- simplify setMessageSyncState to take only l1Block (drop treeInProgress param)
- drop the tree-in-progress guard tests that don't apply to v4
- keep the improved fake_l1_state getState that computes treeInProgress
  from checkpoint/message visibility (InboxContractState.treeInProgress
  is still returned by the real inbox contract in v4)
- drop getInboxTreeInProgress from message_store

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: spalladino

yarn-project/archiver/src/archiver.ts

@@ -487,10 +487,7 @@ export class Archiver extends ArchiverDataSourceBase implements L2BlockSink, Tra
     await this.store.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
     this.log.info(`Setting L1 syncpoints to ${targetL1BlockNumber}`);
     await this.store.setCheckpointSynchedL1BlockNumber(targetL1BlockNumber);
-    await this.store.setMessageSyncState(
-      { l1BlockNumber: targetL1BlockNumber, l1BlockHash: targetL1BlockHash },
-      undefined,
-    );
+    await this.store.setMessageSyncState({ l1BlockNumber: targetL1BlockNumber, l1BlockHash: targetL1BlockHash });
     if (targetL2BlockNumber < currentProvenBlock) {
       this.log.info(`Rolling back proven L2 checkpoint to ${targetCheckpointNumber}`);
       await this.updater.setProvenCheckpointNumber(targetCheckpointNumber);

yarn-project/archiver/src/modules/l1_synchronizer.ts

@@ -5,7 +5,7 @@ import type { L1BlockId } from '@aztec/ethereum/l1-types';
 import type { ViemPublicClient, ViemPublicDebugClient } from '@aztec/ethereum/types';
 import { maxBigint } from '@aztec/foundation/bigint';
 import { BlockNumber, CheckpointNumber, EpochNumber } from '@aztec/foundation/branded-types';
-import { Buffer32 } from '@aztec/foundation/buffer';
+import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import { pick } from '@aztec/foundation/collection';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { type Logger, createLogger } from '@aztec/foundation/log';
@@ -384,30 +384,11 @@ export class ArchiverL1Synchronizer implements Traceable {
 
     // Compare local message store state with the remote. If they match, we just advance the match pointer.
     const remoteMessagesState = await this.inbox.getState({ blockNumber: currentL1BlockNumber });
-<<<<<<< HEAD
-
-    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 ?? Buffer32.ZERO)
-    ) {
-      this.log.trace(
-        `No L1 to L2 messages to query between L1 blocks ${messagesSyncPoint.l1BlockNumber} and ${currentL1BlockNumber}.`,
-      );
-      return;
-=======
     const localLastMessage = await this.store.getLastL1ToL2Message();
     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.store.setMessageSyncState(currentL1Block);
       return true;
->>>>>>> 77c78761552 (fix(archiver): always advance L1-to-L2 messages syncpoint to current L1 block)
     }
 
     // If not, then we are out of sync. Most likely there are new messages on the inbox, so we try retrieving them.
@@ -422,7 +403,7 @@ export class ArchiverL1Synchronizer implements Traceable {
           `Failed to store L1 to L2 messages retrieved from L1: ${error.message}. Rolling back syncpoint to retry.`,
           { inboxMessage: error.inboxMessage },
         );
-        await this.rollbackL1ToL2Messages(remoteMessagesState.treeInProgress);
+        await this.rollbackL1ToL2Messages();
         return false;
       }
       throw error;
@@ -437,12 +418,12 @@ export class ArchiverL1Synchronizer implements Traceable {
         `Local L1 to L2 messages state does not match remote after sync attempt. Rolling back syncpoint to retry.`,
         { localLastMessageAfterSync, remoteMessagesState },
       );
-      await this.rollbackL1ToL2Messages(remoteMessagesState.treeInProgress);
+      await this.rollbackL1ToL2Messages();
       return false;
     }
 
     // Advance the syncpoint after a successful sync
-    await this.store.setMessageSyncState(currentL1Block, remoteMessagesState.treeInProgress);
+    await this.store.setMessageSyncState(currentL1Block);
     return true;
   }
 
@@ -492,7 +473,7 @@ export class ArchiverL1Synchronizer implements Traceable {
    * Rolls back local L1 to L2 messages to the last common message with L1, and updates the syncpoint to the L1 block of that message.
    * If no common message is found, rolls back all messages and sets the syncpoint to the start block.
    */
-  private async rollbackL1ToL2Messages(remoteTreeInProgress: bigint): Promise<L1BlockId> {
+  private async rollbackL1ToL2Messages(): Promise<L1BlockId> {
     // 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.
@@ -532,11 +513,8 @@ export class ArchiverL1Synchronizer implements Traceable {
     const syncPointL1BlockNumber = commonMsg ? commonMsg.l1BlockNumber - 1n : this.l1Constants.l1StartBlock;
     const syncPointL1BlockHash = await this.getL1BlockHash(syncPointL1BlockNumber);
     const messagesSyncPoint = { l1BlockNumber: syncPointL1BlockNumber, l1BlockHash: syncPointL1BlockHash };
-    await this.store.setMessageSyncState(messagesSyncPoint, remoteTreeInProgress);
-    this.log.verbose(`Updated messages syncpoint to L1 block ${syncPointL1BlockNumber}`, {
-      ...messagesSyncPoint,
-      remoteTreeInProgress,
-    });
+    await this.store.setMessageSyncState(messagesSyncPoint);
+    this.log.verbose(`Updated messages syncpoint to L1 block ${syncPointL1BlockNumber}`, messagesSyncPoint);
     return messagesSyncPoint;
   }
 

yarn-project/archiver/src/store/kv_archiver_store.test.ts

@@ -1811,7 +1811,7 @@ describe('KVArchiverDataStore', () => {
     it('returns the L1 block set via setMessageSyncState', async () => {
       const l1BlockHash = Buffer32.random();
       const l1BlockNumber = 10n;
-      await store.setMessageSyncState({ l1BlockNumber, l1BlockHash }, 1n);
+      await store.setMessageSyncState({ l1BlockNumber, l1BlockHash });
       await store.addL1ToL2Messages([
         makeInboxMessage(Buffer16.ZERO, { l1BlockNumber: 5n, l1BlockHash: Buffer32.random() }),
       ]);
@@ -2225,46 +2225,6 @@ describe('KVArchiverDataStore', () => {
       await store.removeL1ToL2Messages(msgs[13].index);
       await checkMessages(msgs.slice(0, 13));
     });
-<<<<<<< HEAD
-=======
-
-    describe('inbox tree in progress guard', () => {
-      it('throws when checkpointNumber >= treeInProgress', async () => {
-        const msgs = makeInboxMessages(3, { initialCheckpointNumber: CheckpointNumber(5) });
-        await store.addL1ToL2Messages(msgs);
-
-        // Set treeInProgress to 7, meaning checkpoints 5 and 6 are sealed, 7+ are not
-        await store.setMessageSyncState({ l1BlockNumber: 1n, l1BlockHash: Buffer32.random() }, 7n);
-
-        // Sealed checkpoint should succeed
-        await expect(store.getL1ToL2Messages(CheckpointNumber(5))).resolves.toEqual([msgs[0].leaf]);
-
-        // Unsealed checkpoint (== treeInProgress) should throw
-        await expect(store.getL1ToL2Messages(CheckpointNumber(7))).rejects.toThrow(L1ToL2MessagesNotReadyError);
-
-        // Future checkpoint should also throw
-        await expect(store.getL1ToL2Messages(CheckpointNumber(8))).rejects.toThrow(L1ToL2MessagesNotReadyError);
-      });
-
-      it('returns messages when checkpointNumber < treeInProgress', async () => {
-        const msgs = makeInboxMessages(3, { initialCheckpointNumber: CheckpointNumber(10) });
-        await store.addL1ToL2Messages(msgs);
-
-        await store.setMessageSyncState({ l1BlockNumber: 1n, l1BlockHash: Buffer32.random() }, 13n);
-
-        await expect(store.getL1ToL2Messages(CheckpointNumber(10))).resolves.toEqual([msgs[0].leaf]);
-        await expect(store.getL1ToL2Messages(CheckpointNumber(11))).resolves.toEqual([msgs[1].leaf]);
-      });
-
-      it('skips guard when treeInProgress is not set', async () => {
-        const msgs = makeInboxMessages(2, { initialCheckpointNumber: CheckpointNumber(1) });
-        await store.addL1ToL2Messages(msgs);
-
-        // No setMessageSyncState call — guard should be permissive
-        await expect(store.getL1ToL2Messages(CheckpointNumber(1))).resolves.toEqual([msgs[0].leaf]);
-      });
-    });
->>>>>>> 77c78761552 (fix(archiver): always advance L1-to-L2 messages syncpoint to current L1 block)
   });
 
   describe('contractInstances', () => {

yarn-project/archiver/src/store/kv_archiver_store.ts

@@ -592,14 +592,11 @@ export class KVArchiverDataStore implements ContractDataSource {
     return this.#messageStore.rollbackL1ToL2MessagesToCheckpoint(targetCheckpointNumber);
   }
 
-<<<<<<< HEAD
-=======
-  /** Atomically updates the message sync state: the L1 sync point and the inbox tree-in-progress marker. */
-  public setMessageSyncState(l1Block: L1BlockId, treeInProgress: bigint | undefined): Promise<void> {
-    return this.#messageStore.setMessageSyncState(l1Block, treeInProgress);
+  /** Updates the message sync state: the L1 sync point. */
+  public setMessageSyncState(l1Block: L1BlockId): Promise<void> {
+    return this.#messageStore.setMessageSyncState(l1Block);
   }
 
->>>>>>> 77c78761552 (fix(archiver): always advance L1-to-L2 messages syncpoint to current L1 block)
   /** Returns an async iterator to all L1 to L2 messages on the range. */
   public iterateL1ToL2Messages(range: CustomRange<bigint> = {}): AsyncIterableIterator<InboxMessage> {
     return this.#messageStore.iterateL1ToL2Messages(range);

yarn-project/archiver/src/store/message_store.ts

@@ -176,26 +176,11 @@ export class MessageStore {
     return msg ? deserializeInboxMessage(msg) : undefined;
   }
 
-<<<<<<< HEAD
-=======
-  /** Returns the inbox tree-in-progress checkpoint number from L1, or undefined if not yet set. */
-  public getInboxTreeInProgress(): Promise<bigint | undefined> {
-    return this.#inboxTreeInProgress.getAsync();
+  /** Updates the message sync state: the L1 sync point. */
+  public setMessageSyncState(l1Block: L1BlockId): Promise<void> {
+    return this.setSynchedL1Block(l1Block);
   }
 
-  /** Atomically updates the message sync state: the L1 sync point and the inbox tree-in-progress marker. */
-  public setMessageSyncState(l1Block: L1BlockId, treeInProgress: bigint | undefined): Promise<void> {
-    return this.db.transactionAsync(async () => {
-      await this.setSynchedL1Block(l1Block);
-      if (treeInProgress !== undefined) {
-        await this.#inboxTreeInProgress.set(treeInProgress);
-      } else {
-        await this.#inboxTreeInProgress.delete();
-      }
-    });
-  }
-
->>>>>>> 77c78761552 (fix(archiver): always advance L1-to-L2 messages syncpoint to current L1 block)
   public async getL1ToL2Messages(checkpointNumber: CheckpointNumber): Promise<Fr[]> {
     const messages: Fr[] = [];
 

yarn-project/archiver/src/test/fake_l1_state.ts

@@ -1,5 +1,6 @@
 import type { BlobClientInterface } from '@aztec/blob-client/client';
 import { type Blob, getBlobsPerL1Block, getPrefixedEthBlobCommitments } from '@aztec/blob-lib';
+import { INITIAL_CHECKPOINT_NUMBER } from '@aztec/constants';
 import type { CheckpointProposedLog, InboxContract, MessageSentLog, RollupContract } from '@aztec/ethereum/contracts';
 import { MULTI_CALL_3_ADDRESS } from '@aztec/ethereum/contracts';
 import type { ViemPublicClient } from '@aztec/ethereum/types';
@@ -465,15 +466,6 @@ export class FakeL1State {
   createMockInboxContract(_publicClient: MockProxy<ViemPublicClient>): MockProxy<InboxContract> {
     const mockInbox = mock<InboxContract>();
 
-<<<<<<< HEAD
-    mockInbox.getState.mockImplementation(() =>
-      Promise.resolve({
-        messagesRollingHash: this.messagesRollingHash,
-        totalMessagesInserted: BigInt(this.messages.length),
-        treeInProgress: 0n,
-      }),
-    );
-=======
     mockInbox.getState.mockImplementation((opts: { blockTag?: string; blockNumber?: bigint } = {}) => {
       // Filter messages visible at the given block number (or all if not specified)
       const blockNumber = opts.blockNumber ?? this.l1BlockNumber;
@@ -504,7 +496,6 @@ export class FakeL1State {
         treeInProgress: BigInt(treeInProgress),
       });
     });
->>>>>>> 77c78761552 (fix(archiver): always advance L1-to-L2 messages syncpoint to current L1 block)
 
     // Mock the wrapper methods for fetching message events
     mockInbox.getMessageSentEvents.mockImplementation((fromBlock: bigint, toBlock: bigint) =>