@aztec/archiver 3.0.0-nightly.20250908 → 3.0.0-nightly.20250911

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

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/archiver/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,6BAA6B,CAAC;AAErF,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,cAAc,EAAE,gBAAgB,EAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EACnD,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CAiD9B"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/archiver/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,mBAAmB,EAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,6BAA6B,CAAC;AAErF,YAAY,EAAE,mBAAmB,EAAE,CAAC;AAEpC;;;GAGG;AACH,wBAAsB,yBAAyB,CAC7C,cAAc,EAAE,gBAAgB,EAChC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,IAAI,CAAC,iBAAiB,EAAE,eAAe,CAAC,EACnD,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,CAAC,CAqE9B"}

package/dest/archiver/validation.js

@@ -5,6 +5,7 @@ import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
  * Returns true if the attestations are valid and sufficient, false otherwise.
  */ export async function validateBlockAttestations(publishedBlock, epochCache, constants, logger) {
     const attestations = getAttestationsFromPublishedL2Block(publishedBlock);
+    const attestors = attestations.map((a)=>a.getSender());
     const { block } = publishedBlock;
     const blockHash = await block.hash().then((hash)=>hash.toString());
     const archiveRoot = block.archive.root.toString();
@@ -44,11 +45,12 @@ import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
                 valid: false,
                 reason,
                 invalidIndex: i,
-                block: publishedBlock,
+                block: publishedBlock.block.toBlockInfo(),
                 committee,
                 seed,
                 epoch,
-                attestations
+                attestors,
+                attestations: publishedBlock.attestations
             };
         }
     }
@@ -62,11 +64,12 @@ import { getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
         return {
             valid: false,
             reason,
-            block: publishedBlock,
+            block: publishedBlock.block.toBlockInfo(),
             committee,
             seed,
             epoch,
-            attestations
+            attestors,
+            attestations: publishedBlock.attestations
         };
     }
     logger?.debug(`Block attestations validated successfully for block ${block.number} at slot ${slot}`, logData);

package/dest/test/mock_l2_block_source.d.ts

@@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Fr } from '@aztec/foundation/fields';
 import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { L2Block, L2BlockHash, type L2BlockSource, type L2Tips, type ValidateBlockResult } from '@aztec/stdlib/block';
+import { L2Block, L2BlockHash, type L2BlockSource, type L2Tips, PublishedL2Block, type ValidateBlockResult } from '@aztec/stdlib/block';
 import type { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 import { type L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
 import { type BlockHeader, TxHash, TxReceipt } from '@aztec/stdlib/tx';
@@ -49,15 +49,7 @@ export declare class MockL2BlockSource implements L2BlockSource, ContractDataSou
      * @returns The requested mocked L2 blocks.
      */
     getBlocks(from: number, limit: number, proven?: boolean): Promise<L2Block[]>;
-    getPublishedBlocks(from: number, limit: number, proven?: boolean): Promise<{
-        block: L2Block;
-        l1: {
-            blockNumber: bigint;
-            blockHash: `0x${string}`;
-            timestamp: bigint;
-        };
-        attestations: never[];
-    }[]>;
+    getPublishedBlocks(from: number, limit: number, proven?: boolean): Promise<PublishedL2Block[]>;
     getBlockHeader(number: number | 'latest'): Promise<BlockHeader | undefined>;
     getBlocksForEpoch(epochNumber: bigint): Promise<L2Block[]>;
     getBlockHeadersForEpoch(epochNumber: bigint): Promise<BlockHeader[]>;

package/dest/test/mock_l2_block_source.d.ts.map

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

package/dest/test/mock_l2_block_source.js

@@ -2,7 +2,7 @@ import { DefaultL1ContractsConfig } from '@aztec/ethereum';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
-import { L2Block, L2BlockHash } from '@aztec/stdlib/block';
+import { L2Block, L2BlockHash, PublishedL2Block } from '@aztec/stdlib/block';
 import { EmptyL1RollupConstants, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
 /**
@@ -75,7 +75,7 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
     }
     async getPublishedBlocks(from, limit, proven) {
         const blocks = await this.getBlocks(from, limit, proven);
-        return blocks.map((block)=>({
+        return blocks.map((block)=>PublishedL2Block.fromFields({
                 block,
                 l1: {
                     blockNumber: BigInt(block.number),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/archiver",
-  "version": "3.0.0-nightly.20250908",
+  "version": "3.0.0-nightly.20250911",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -66,18 +66,18 @@
     ]
   },
   "dependencies": {
-    "@aztec/blob-lib": "3.0.0-nightly.20250908",
-    "@aztec/blob-sink": "3.0.0-nightly.20250908",
-    "@aztec/constants": "3.0.0-nightly.20250908",
-    "@aztec/epoch-cache": "3.0.0-nightly.20250908",
-    "@aztec/ethereum": "3.0.0-nightly.20250908",
-    "@aztec/foundation": "3.0.0-nightly.20250908",
-    "@aztec/kv-store": "3.0.0-nightly.20250908",
-    "@aztec/l1-artifacts": "3.0.0-nightly.20250908",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250908",
-    "@aztec/protocol-contracts": "3.0.0-nightly.20250908",
-    "@aztec/stdlib": "3.0.0-nightly.20250908",
-    "@aztec/telemetry-client": "3.0.0-nightly.20250908",
+    "@aztec/blob-lib": "3.0.0-nightly.20250911",
+    "@aztec/blob-sink": "3.0.0-nightly.20250911",
+    "@aztec/constants": "3.0.0-nightly.20250911",
+    "@aztec/epoch-cache": "3.0.0-nightly.20250911",
+    "@aztec/ethereum": "3.0.0-nightly.20250911",
+    "@aztec/foundation": "3.0.0-nightly.20250911",
+    "@aztec/kv-store": "3.0.0-nightly.20250911",
+    "@aztec/l1-artifacts": "3.0.0-nightly.20250911",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20250911",
+    "@aztec/protocol-contracts": "3.0.0-nightly.20250911",
+    "@aztec/stdlib": "3.0.0-nightly.20250911",
+    "@aztec/telemetry-client": "3.0.0-nightly.20250911",
     "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",
     "tsc-watch": "^6.0.0",

package/src/archiver/archiver.ts

@@ -120,7 +120,6 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
 
   private l1BlockNumber: bigint | undefined;
   private l1Timestamp: bigint | undefined;
-  private pendingChainValidationStatus: ValidateBlockResult = { valid: true };
   private initialSyncComplete: boolean = false;
 
   public readonly tracer: Tracer;
@@ -342,7 +341,8 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
 
     // ********** Events that are processed per L2 block **********
     if (currentL1BlockNumber > blocksSynchedTo) {
-      // First we retrieve new L2 blocks
+      // First we retrieve new L2 blocks and store them in the DB. This will also update the
+      // pending chain validation status, proven block number, and synched L1 block number.
       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
@@ -355,21 +355,11 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
         currentL1Timestamp,
       );
 
-      // Update the pending chain validation status with the last block validation result.
-      // Again, we only update if validation status changed, so in a sequence of invalid blocks
-      // we keep track of the first invalid block so we can invalidate that one if needed.
-      if (
-        rollupStatus.validationResult &&
-        rollupStatus.validationResult?.valid !== this.pendingChainValidationStatus.valid
-      ) {
-        this.pendingChainValidationStatus = rollupStatus.validationResult;
-      }
-
       // 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. We also dont do this if the last block is invalid,
       // since the archiver will rightfully refuse to sync up to it.
-      if (!rollupCanPrune && this.pendingChainValidationStatus.valid) {
+      if (!rollupCanPrune && rollupStatus.validationResult?.valid) {
         await this.checkForNewBlocksBeforeL1SyncPoint(rollupStatus, blocksSynchedTo, currentL1BlockNumber);
       }
 
@@ -623,6 +613,7 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
 
   private async handleL2blocks(blocksSynchedTo: bigint, currentL1BlockNumber: bigint) {
     const localPendingBlockNumber = await this.getBlockNumber();
+    const initialValidationResult: ValidateBlockResult | undefined = await this.store.getPendingChainValidationStatus();
     const [provenBlockNumber, provenArchive, pendingBlockNumber, pendingArchive, archiveForLocalPendingBlockNumber] =
       await this.rollup.status(BigInt(localPendingBlockNumber), { blockNumber: currentL1BlockNumber });
     const rollupStatus = {
@@ -630,7 +621,7 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
       provenArchive,
       pendingBlockNumber: Number(pendingBlockNumber),
       pendingArchive,
-      validationResult: undefined as ValidateBlockResult | undefined,
+      validationResult: initialValidationResult,
     };
     this.log.trace(`Retrieved rollup status at current L1 block ${currentL1BlockNumber}.`, {
       localPendingBlockNumber,
@@ -809,7 +800,15 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
 
         // Only update the validation result if it has changed, so we can keep track of the first invalid block
         // in case there is a sequence of more than one invalid block, as we need to invalidate the first one.
-        if (rollupStatus.validationResult?.valid !== validationResult.valid) {
+        // There is an exception though: if an invalid block is invalidated and replaced with another invalid block,
+        // we need to update the validation result, since we need to be able to invalidate the new one.
+        // See test 'chain progresses if an invalid block is invalidated with an invalid one' for more info.
+        if (
+          rollupStatus.validationResult?.valid !== validationResult.valid ||
+          (!rollupStatus.validationResult.valid &&
+            !validationResult.valid &&
+            rollupStatus.validationResult.block.blockNumber === validationResult.block.blockNumber)
+        ) {
           rollupStatus.validationResult = validationResult;
         }
 
@@ -828,6 +827,7 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
 
           // We keep consuming blocks if we find an invalid one, since we do not listen for BlockInvalidated events
           // We just pretend the invalid ones are not there and keep consuming the next blocks
+          // Note that this breaks if the committee ever attests to a descendant of an invalid block
           continue;
         }
 
@@ -841,7 +841,9 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
       }
 
       try {
-        const [processDuration] = await elapsed(() => this.store.addBlocks(validBlocks));
+        const updatedValidationResult =
+          rollupStatus.validationResult === initialValidationResult ? undefined : rollupStatus.validationResult;
+        const [processDuration] = await elapsed(() => this.store.addBlocks(validBlocks, updatedValidationResult));
         this.instrumentation.processNewBlocks(
           processDuration / validBlocks.length,
           validBlocks.map(b => b.block),
@@ -1228,12 +1230,12 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
     return this.store.getDebugFunctionName(address, selector);
   }
 
-  getPendingChainValidationStatus(): Promise<ValidateBlockResult> {
-    return Promise.resolve(this.pendingChainValidationStatus);
+  async getPendingChainValidationStatus(): Promise<ValidateBlockResult> {
+    return (await this.store.getPendingChainValidationStatus()) ?? { valid: true };
   }
 
   isPendingChainInvalid(): Promise<boolean> {
-    return Promise.resolve(this.pendingChainValidationStatus.valid === false);
+    return this.getPendingChainValidationStatus().then(status => !status.valid);
   }
 
   async getL2Tips(): Promise<L2Tips> {
@@ -1351,6 +1353,7 @@ export class ArchiverStoreHelper
       | 'backupTo'
       | 'close'
       | 'transactionAsync'
+      | 'addBlocks'
     >
 {
   #log = createLogger('archiver:block-helper');
@@ -1493,13 +1496,16 @@ export class ArchiverStoreHelper
     return true;
   }
 
-  public addBlocks(blocks: PublishedL2Block[]): Promise<boolean> {
+  public addBlocks(blocks: PublishedL2Block[], pendingChainValidationStatus?: ValidateBlockResult): Promise<boolean> {
     // 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([
+        // Update the pending chain validation status if provided
+        pendingChainValidationStatus && this.store.setPendingChainValidationStatus(pendingChainValidationStatus),
+        // Add any logs emitted during the retrieved blocks
         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 => {
@@ -1539,6 +1545,8 @@ export class ArchiverStoreHelper
     const blocks = await this.getPublishedBlocks(from - blocksToUnwind + 1, blocksToUnwind);
 
     const opResults = await Promise.all([
+      // Prune rolls back to the last proven block, which is by definition valid
+      this.store.setPendingChainValidationStatus({ valid: true }),
       // 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);
@@ -1656,4 +1664,11 @@ export class ArchiverStoreHelper
   getLastL1ToL2Message(): Promise<InboxMessage | undefined> {
     return this.store.getLastL1ToL2Message();
   }
+  getPendingChainValidationStatus(): Promise<ValidateBlockResult | undefined> {
+    return this.store.getPendingChainValidationStatus();
+  }
+  setPendingChainValidationStatus(status: ValidateBlockResult | undefined): Promise<void> {
+    this.#log.debug(`Setting pending chain validation status to valid ${status?.valid}`, status);
+    return this.store.setPendingChainValidationStatus(status);
+  }
 }

package/src/archiver/archiver_store.ts

@@ -3,7 +3,7 @@ import type { Fr } from '@aztec/foundation/fields';
 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 } from '@aztec/stdlib/block';
+import type { L2Block, ValidateBlockResult } from '@aztec/stdlib/block';
 import type {
   ContractClassPublic,
   ContractInstanceUpdateWithAddress,
@@ -272,4 +272,10 @@ export interface ArchiverDataStore {
 
   /** Returns the last L1 to L2 message stored. */
   getLastL1ToL2Message(): Promise<InboxMessage | undefined>;
+
+  /** Returns the last synced validation status of the pending chain. */
+  getPendingChainValidationStatus(): Promise<ValidateBlockResult | undefined>;
+
+  /** Sets the last synced validation status of the pending chain. */
+  setPendingChainValidationStatus(status: ValidateBlockResult | undefined): Promise<void>;
 }

package/src/archiver/archiver_store_test_suite.ts

@@ -12,7 +12,16 @@ import { Fr } from '@aztec/foundation/fields';
 import { toArray } from '@aztec/foundation/iterable';
 import { sleep } from '@aztec/foundation/sleep';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { CommitteeAttestation, L2Block, L2BlockHash, wrapInBlock } from '@aztec/stdlib/block';
+import {
+  CommitteeAttestation,
+  EthAddress,
+  L2Block,
+  L2BlockHash,
+  PublishedL2Block,
+  type ValidateBlockResult,
+  randomBlockInfo,
+  wrapInBlock,
+} from '@aztec/stdlib/block';
 import {
   type ContractClassPublic,
   type ContractInstanceWithAddress,
@@ -34,7 +43,6 @@ import type { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.j
 import { BlockNumberNotSequentialError, InitialBlockNumberNotSequentialError } from './errors.js';
 import { MessageStoreError } from './kv_archiver_store/message_store.js';
 import type { InboxMessage } from './structs/inbox_message.js';
-import type { PublishedL2Block } from './structs/published.js';
 
 /**
  * @param testName - The name of the test suite.
@@ -58,15 +66,16 @@ export function describeArchiverDataStore(
 
     const makeBlockHash = (blockNumber: number) => `0x${blockNumber.toString(16).padStart(64, '0')}`;
 
-    const makePublished = (block: L2Block, l1BlockNumber: number): PublishedL2Block => ({
-      block: block,
-      l1: {
-        blockNumber: BigInt(l1BlockNumber),
-        blockHash: makeBlockHash(l1BlockNumber),
-        timestamp: BigInt(l1BlockNumber * 1000),
-      },
-      attestations: times(3, CommitteeAttestation.random),
-    });
+    const makePublished = (block: L2Block, l1BlockNumber: number): PublishedL2Block =>
+      PublishedL2Block.fromFields({
+        block: block,
+        l1: {
+          blockNumber: BigInt(l1BlockNumber),
+          blockHash: makeBlockHash(l1BlockNumber),
+          timestamp: BigInt(l1BlockNumber * 1000),
+        },
+        attestations: times(3, CommitteeAttestation.random),
+      });
 
     const expectBlocksEqual = (actual: PublishedL2Block[], expected: PublishedL2Block[]) => {
       expect(actual.length).toEqual(expected.length);
@@ -757,7 +766,7 @@ export function describeArchiverDataStore(
           return txEffect;
         });
 
-        return {
+        return PublishedL2Block.fromFields({
           block: block,
           attestations: times(3, CommitteeAttestation.random),
           l1: {
@@ -765,7 +774,7 @@ export function describeArchiverDataStore(
             blockHash: makeBlockHash(blockNumber),
             timestamp: BigInt(blockNumber),
           },
-        };
+        });
       };
 
       beforeEach(async () => {
@@ -878,11 +887,13 @@ export function describeArchiverDataStore(
       let blocks: PublishedL2Block[];
 
       beforeEach(async () => {
-        blocks = await timesParallel(numBlocks, async (index: number) => ({
-          block: await L2Block.random(index + 1, txsPerBlock, numPublicFunctionCalls, numPublicLogs),
-          l1: { blockNumber: BigInt(index), blockHash: makeBlockHash(index), timestamp: BigInt(index) },
-          attestations: times(3, CommitteeAttestation.random),
-        }));
+        blocks = await timesParallel(numBlocks, async (index: number) =>
+          PublishedL2Block.fromFields({
+            block: await L2Block.random(index + 1, txsPerBlock, numPublicFunctionCalls, numPublicLogs),
+            l1: { blockNumber: BigInt(index), blockHash: makeBlockHash(index), timestamp: BigInt(index) },
+            attestations: times(3, CommitteeAttestation.random),
+          }),
+        );
 
         await store.addBlocks(blocks);
         await store.addLogs(blocks.map(b => b.block));
@@ -1056,5 +1067,96 @@ export function describeArchiverDataStore(
         }
       });
     });
+
+    describe('pendingChainValidationStatus', () => {
+      it('should return undefined when no status is set', async () => {
+        const status = await store.getPendingChainValidationStatus();
+        expect(status).toBeUndefined();
+      });
+
+      it('should store and retrieve a valid validation status', async () => {
+        const validStatus: ValidateBlockResult = { valid: true };
+
+        await store.setPendingChainValidationStatus(validStatus);
+        const retrievedStatus = await store.getPendingChainValidationStatus();
+
+        expect(retrievedStatus).toEqual(validStatus);
+      });
+
+      it('should store and retrieve an invalid validation status with insufficient attestations', async () => {
+        const invalidStatus: ValidateBlockResult = {
+          valid: false,
+          block: randomBlockInfo(1),
+          committee: [EthAddress.random(), EthAddress.random()],
+          epoch: 123n,
+          seed: 456n,
+          attestors: [EthAddress.random()],
+          attestations: [CommitteeAttestation.random()],
+          reason: 'insufficient-attestations',
+        };
+
+        await store.setPendingChainValidationStatus(invalidStatus);
+        const retrievedStatus = await store.getPendingChainValidationStatus();
+
+        expect(retrievedStatus).toEqual(invalidStatus);
+      });
+
+      it('should store and retrieve an invalid validation status with invalid attestation', async () => {
+        const invalidStatus: ValidateBlockResult = {
+          valid: false,
+          block: randomBlockInfo(2),
+          committee: [EthAddress.random()],
+          attestors: [EthAddress.random()],
+          epoch: 789n,
+          seed: 101n,
+          attestations: [CommitteeAttestation.random()],
+          reason: 'invalid-attestation',
+          invalidIndex: 5,
+        };
+
+        await store.setPendingChainValidationStatus(invalidStatus);
+        const retrievedStatus = await store.getPendingChainValidationStatus();
+
+        expect(retrievedStatus).toEqual(invalidStatus);
+      });
+
+      it('should overwrite existing status when setting a new one', async () => {
+        const firstStatus: ValidateBlockResult = { valid: true };
+        const secondStatus: ValidateBlockResult = {
+          valid: false,
+          block: randomBlockInfo(3),
+          committee: [EthAddress.random()],
+          epoch: 999n,
+          seed: 888n,
+          attestors: [EthAddress.random()],
+          attestations: [CommitteeAttestation.random()],
+          reason: 'insufficient-attestations',
+        };
+
+        await store.setPendingChainValidationStatus(firstStatus);
+        await store.setPendingChainValidationStatus(secondStatus);
+        const retrievedStatus = await store.getPendingChainValidationStatus();
+
+        expect(retrievedStatus).toEqual(secondStatus);
+      });
+
+      it('should handle empty committee and attestations arrays', async () => {
+        const statusWithEmptyArrays: ValidateBlockResult = {
+          valid: false,
+          block: randomBlockInfo(4),
+          committee: [],
+          epoch: 0n,
+          seed: 0n,
+          attestors: [],
+          attestations: [],
+          reason: 'insufficient-attestations',
+        };
+
+        await store.setPendingChainValidationStatus(statusWithEmptyArrays);
+        const retrievedStatus = await store.getPendingChainValidationStatus();
+
+        expect(retrievedStatus).toEqual(statusWithEmptyArrays);
+      });
+    });
   });
 }

package/src/archiver/data_retrieval.ts

@@ -11,10 +11,11 @@ import type {
 import { asyncPool } from '@aztec/foundation/async-pool';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { ViemSignature } from '@aztec/foundation/eth-signature';
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { type InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
-import { Body, CommitteeAttestation, L2Block } from '@aztec/stdlib/block';
+import { Body, CommitteeAttestation, L2Block, PublishedL2Block } from '@aztec/stdlib/block';
 import { Proof } from '@aztec/stdlib/proofs';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
 import { BlockHeader, GlobalVariables, ProposedBlockHeader, StateReference } from '@aztec/stdlib/tx';
@@ -32,7 +33,7 @@ import {
 import { NoBlobBodiesFoundError } from './errors.js';
 import type { DataRetrieval } from './structs/data_retrieval.js';
 import type { InboxMessage } from './structs/inbox_message.js';
-import type { L1PublishedData, PublishedL2Block } from './structs/published.js';
+import type { L1PublishedData } from './structs/published.js';
 
 export type RetrievedL2Block = {
   l2BlockNumber: number;
@@ -86,11 +87,7 @@ export function retrievedBlockToPublishedL2Block(retrievedBlock: RetrievedL2Bloc
 
   const block = new L2Block(archive, header, body);
 
-  return {
-    block,
-    l1,
-    attestations,
-  };
+  return PublishedL2Block.fromFields({ block, l1, attestations });
 }
 
 /**
@@ -323,6 +320,7 @@ async function getBlockFromRollupTx(
     },
     ViemCommitteeAttestations,
     Hex[],
+    ViemSignature,
     Hex,
   ];
 

package/src/archiver/kv_archiver_store/block_store.ts

@@ -6,7 +6,15 @@ import { BufferReader } from '@aztec/foundation/serialize';
 import { bufferToHex } from '@aztec/foundation/string';
 import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton, Range } from '@aztec/kv-store';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { Body, CommitteeAttestation, L2Block, L2BlockHash } from '@aztec/stdlib/block';
+import {
+  Body,
+  CommitteeAttestation,
+  L2Block,
+  L2BlockHash,
+  PublishedL2Block,
+  type ValidateBlockResult,
+} from '@aztec/stdlib/block';
+import { deserializeValidateBlockResult, serializeValidateBlockResult } from '@aztec/stdlib/block';
 import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
 import {
   BlockHeader,
@@ -19,7 +27,7 @@ import {
 } from '@aztec/stdlib/tx';
 
 import { BlockNumberNotSequentialError, InitialBlockNumberNotSequentialError } from '../errors.js';
-import type { L1PublishedData, PublishedL2Block } from '../structs/published.js';
+import type { L1PublishedData } from '../structs/published.js';
 
 export { TxReceipt, type TxEffect, type TxHash } from '@aztec/stdlib/tx';
 
@@ -52,6 +60,9 @@ export class BlockStore {
   /** Stores l2 block number of the last proven block */
   #lastProvenL2Block: AztecAsyncSingleton<number>;
 
+  /** Stores the pending chain validation status */
+  #pendingChainValidationStatus: AztecAsyncSingleton<Buffer>;
+
   /** Index mapping a contract's address (as a string) to its location in a block */
   #contractIndex: AztecAsyncMap<string, BlockIndexValue>;
 
@@ -64,6 +75,7 @@ export class BlockStore {
     this.#contractIndex = db.openMap('archiver_contract_index');
     this.#lastSynchedL1Block = db.openSingleton('archiver_last_synched_l1_block');
     this.#lastProvenL2Block = db.openSingleton('archiver_last_proven_l2_block');
+    this.#pendingChainValidationStatus = db.openSingleton('archiver_pending_chain_validation_status');
   }
 
   /**
@@ -224,7 +236,10 @@ export class BlockStore {
     }
   }
 
-  private async getBlockFromBlockStorage(blockNumber: number, blockStorage: BlockStorage) {
+  private async getBlockFromBlockStorage(
+    blockNumber: number,
+    blockStorage: BlockStorage,
+  ): Promise<PublishedL2Block | undefined> {
     const header = BlockHeader.fromBuffer(blockStorage.header);
     const archive = AppendOnlyTreeSnapshot.fromBuffer(blockStorage.archive);
     const blockHash = blockStorage.blockHash;
@@ -257,7 +272,7 @@ export class BlockStore {
       );
     }
     const attestations = blockStorage.attestations.map(CommitteeAttestation.fromBuffer);
-    return { block, l1: blockStorage.l1, attestations };
+    return PublishedL2Block.fromFields({ block, l1: blockStorage.l1, attestations });
   }
 
   /**
@@ -361,4 +376,29 @@ export class BlockStore {
 
     return { start, limit };
   }
+
+  /**
+   * Gets the pending chain validation status.
+   * @returns The validation status or undefined if not set.
+   */
+  async getPendingChainValidationStatus(): Promise<ValidateBlockResult | undefined> {
+    const buffer = await this.#pendingChainValidationStatus.getAsync();
+    if (!buffer) {
+      return undefined;
+    }
+    return deserializeValidateBlockResult(buffer);
+  }
+
+  /**
+   * Sets the pending chain validation status.
+   * @param status - The validation status to store.
+   */
+  async setPendingChainValidationStatus(status: ValidateBlockResult | undefined): Promise<void> {
+    if (status) {
+      const buffer = serializeValidateBlockResult(status);
+      await this.#pendingChainValidationStatus.set(buffer);
+    } else {
+      await this.#pendingChainValidationStatus.delete();
+    }
+  }
 }

package/src/archiver/kv_archiver_store/kv_archiver_store.ts

@@ -5,7 +5,7 @@ import { createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, CustomRange, StoreSize } from '@aztec/kv-store';
 import { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import type { L2Block } from '@aztec/stdlib/block';
+import type { L2Block, ValidateBlockResult } from '@aztec/stdlib/block';
 import type {
   ContractClassPublic,
   ContractDataSource,
@@ -395,4 +395,12 @@ export class KVArchiverDataStore implements ArchiverDataStore, ContractDataSourc
   public removeL1ToL2Messages(startIndex: bigint): Promise<void> {
     return this.#messageStore.removeL1ToL2Messages(startIndex);
   }
+
+  public getPendingChainValidationStatus(): Promise<ValidateBlockResult | undefined> {
+    return this.#blockStore.getPendingChainValidationStatus();
+  }
+
+  public setPendingChainValidationStatus(status: ValidateBlockResult | undefined): Promise<void> {
+    return this.#blockStore.setPendingChainValidationStatus(status);
+  }
 }