Revert "fix(archiver): move L2 tips cache refresh out of write transactions"

This reverts commit 4735e42.

Author: spalladino

yarn-project/archiver/src/modules/data_store_updater.test.ts

@@ -7,15 +7,12 @@ import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { L2Block } from '@aztec/stdlib/block';
 import { ContractClassLog, PrivateLog } from '@aztec/stdlib/logs';
 import '@aztec/stdlib/testing/jest';
-import { BlockHeader } from '@aztec/stdlib/tx';
 
-import { jest } from '@jest/globals';
 import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
 
 import { type ArchiverDataStores, createArchiverDataStores } from '../store/data_stores.js';
-import { L2TipsCache } from '../store/l2_tips_cache.js';
 import { makeCheckpoint, makePublishedCheckpoint } from '../test/mock_structs.js';
 import { ArchiverDataStoreUpdater } from './data_store_updater.js';
 
@@ -218,29 +215,4 @@ describe('ArchiverDataStoreUpdater', () => {
       expect(publicLogsAfter.logs.length).toBe(0);
     });
   });
-
-  describe('l2 tips cache refresh', () => {
-    it('does not refresh the cache when the writer transaction aborts', async () => {
-      const initialBlockHash = await BlockHeader.empty().hash();
-      const tipsCache = new L2TipsCache(store.blocks, initialBlockHash);
-      const updaterWithCache = new ArchiverDataStoreUpdater(store, tipsCache);
-
-      const tipsBefore = await tipsCache.getL2Tips();
-
-      const block = await L2Block.random(BlockNumber(1), {
-        checkpointNumber: CheckpointNumber(1),
-        indexWithinCheckpoint: IndexWithinCheckpoint(0),
-      });
-
-      const failure = new Error('forced failure inside writer transaction');
-      const addProposedBlockSpy = jest.spyOn(store.blocks, 'addProposedBlock').mockRejectedValueOnce(failure);
-
-      await expect(updaterWithCache.addProposedBlock(block)).rejects.toBe(failure);
-
-      const tipsAfter = await tipsCache.getL2Tips();
-      expect(tipsAfter).toEqual(tipsBefore);
-
-      addProposedBlockSpy.mockRestore();
-    });
-  });
 });

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

@@ -74,9 +74,9 @@ export class ArchiverDataStoreUpdater {
         this.addContractDataToDb(block),
       ]);
 
+      await this.l2TipsCache?.refresh();
       return opResults.every(Boolean);
     });
-    await this.l2TipsCache?.refresh();
     return result;
   }
 
@@ -144,17 +144,18 @@ export class ArchiverDataStoreUpdater {
           : undefined,
       ]);
 
+      await this.l2TipsCache?.refresh();
       return { prunedBlocks, lastAlreadyInsertedBlockNumber };
     });
-    await this.l2TipsCache?.refresh();
     return result;
   }
 
   public async addProposedCheckpoint(proposedCheckpoint: ProposedCheckpointInput) {
     const result = await this.stores.db.transactionAsync(async () => {
       await this.stores.blocks.addProposedCheckpoint(proposedCheckpoint);
+      await this.l2TipsCache?.refresh();
     });
-    await this.l2TipsCache?.refresh();
+
     return result;
   }
 
@@ -255,9 +256,9 @@ export class ArchiverDataStoreUpdater {
       // Clear all pending proposed checkpoints since their blocks have been pruned
       await this.stores.blocks.deleteProposedCheckpoints();
 
+      await this.l2TipsCache?.refresh();
       return result;
     });
-    await this.l2TipsCache?.refresh();
     return result;
   }
 
@@ -288,7 +289,7 @@ export class ArchiverDataStoreUpdater {
    * @returns True if the operation is successful.
    */
   public async removeCheckpointsAfter(checkpointNumber: CheckpointNumber): Promise<boolean> {
-    const result = await this.stores.db.transactionAsync(async () => {
+    return await this.stores.db.transactionAsync(async () => {
       const { blocksRemoved = [] } = await this.stores.blocks.removeCheckpointsAfter(checkpointNumber);
 
       const opResults = await Promise.all([
@@ -299,10 +300,9 @@ export class ArchiverDataStoreUpdater {
         this.stores.logs.deleteLogs(blocksRemoved),
       ]);
 
+      await this.l2TipsCache?.refresh();
       return opResults.every(Boolean);
     });
-    await this.l2TipsCache?.refresh();
-    return result;
   }
 
   /**
@@ -312,8 +312,8 @@ export class ArchiverDataStoreUpdater {
   public async setProvenCheckpointNumber(checkpointNumber: CheckpointNumber): Promise<void> {
     await this.stores.db.transactionAsync(async () => {
       await this.stores.blocks.setProvenCheckpointNumber(checkpointNumber);
+      await this.l2TipsCache?.refresh();
     });
-    await this.l2TipsCache?.refresh();
   }
 
   /**
@@ -323,8 +323,8 @@ export class ArchiverDataStoreUpdater {
   public async setFinalizedCheckpointNumber(checkpointNumber: CheckpointNumber): Promise<void> {
     await this.stores.db.transactionAsync(async () => {
       await this.stores.blocks.setFinalizedCheckpointNumber(checkpointNumber);
+      await this.l2TipsCache?.refresh();
     });
-    await this.l2TipsCache?.refresh();
   }
 
   /** Extracts and stores contract data from a single block. */

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

@@ -13,8 +13,7 @@ import type { BlockStore } from './block_store.js';
 /**
  * In-memory cache for L2 chain tips (proposed, checkpointed, proven, finalized).
  * Populated from the BlockStore on first access, then kept up-to-date by the ArchiverDataStoreUpdater.
- * Refresh calls should happen *after* the store transaction that mutates block data has committed,
- * so the cache loads from committed state and is never replaced if the writer aborts.
+ * Refresh calls should happen within the store transaction that mutates block data to ensure consistency.
  */
 export class L2TipsCache {
   #tipsPromise: Promise<L2Tips> | undefined;
@@ -35,7 +34,7 @@ export class L2TipsCache {
     return (this.#tipsPromise ??= this.loadFromStore());
   }
 
-  /** Reloads the L2 tips from the block store. Should be called after the writer transaction has committed. */
+  /** Reloads the L2 tips from the block store. Should be called within the store transaction that mutates data. */
   public async refresh(): Promise<void> {
     this.#tipsPromise = this.loadFromStore();
     await this.#tipsPromise;