@aztec/archiver 3.0.0-nightly.20250910 → 3.0.0-nightly.20250912

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/config.ts

@@ -1,47 +1,28 @@
 import { type BlobSinkConfig, blobSinkConfigMapping } from '@aztec/blob-sink/client';
 import {
-  type L1ContractAddresses,
   type L1ContractsConfig,
   type L1ReaderConfig,
   l1ContractAddressesMapping,
   l1ContractsConfigMappings,
   l1ReaderConfigMappings,
 } from '@aztec/ethereum';
-import { type ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
+import {
+  type ConfigMappingsType,
+  booleanConfigHelper,
+  getConfigFromMappings,
+  numberConfigHelper,
+} from '@aztec/foundation/config';
 import { type ChainConfig, chainConfigMappings } from '@aztec/stdlib/config';
+import type { ArchiverSpecificConfig } from '@aztec/stdlib/interfaces/server';
 
 /**
+ * The archiver configuration.
  * There are 2 polling intervals used in this configuration. The first is the archiver polling interval, archiverPollingIntervalMS.
  * This is the interval between successive calls to eth_blockNumber via viem.
  * Results of calls to eth_blockNumber are cached by viem with this cache being updated periodically at the interval specified by viemPollingIntervalMS.
  * As a result the maximum observed polling time for new blocks will be viemPollingIntervalMS + archiverPollingIntervalMS.
  */
-
-/**
- * The archiver configuration.
- */
-export type ArchiverConfig = {
-  /** The polling interval in ms for retrieving new L2 blocks and encrypted logs. */
-  archiverPollingIntervalMS?: number;
-
-  /** The number of L2 blocks the archiver will attempt to download at a time. */
-  archiverBatchSize?: number;
-
-  /** The polling interval viem uses in ms */
-  viemPollingIntervalMS?: number;
-
-  /** The deployed L1 contract addresses */
-  l1Contracts: L1ContractAddresses;
-
-  /** The max number of logs that can be obtained in 1 "getPublicLogs" call. */
-  maxLogs?: number;
-
-  /** The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKB. */
-  archiverStoreMapSizeKb?: number;
-} & L1ReaderConfig &
-  L1ContractsConfig &
-  BlobSinkConfig &
-  ChainConfig;
+export type ArchiverConfig = ArchiverSpecificConfig & L1ReaderConfig & L1ContractsConfig & BlobSinkConfig & ChainConfig;
 
 export const archiverConfigMappings: ConfigMappingsType<ArchiverConfig> = {
   ...blobSinkConfigMapping,
@@ -65,6 +46,10 @@ export const archiverConfigMappings: ConfigMappingsType<ArchiverConfig> = {
     parseEnv: (val: string | undefined) => (val ? +val : undefined),
     description: 'The maximum possible size of the archiver DB in KB. Overwrites the general dataStoreMapSizeKB.',
   },
+  skipValidateBlockAttestations: {
+    description: 'Whether to skip validating block attestations (use only for testing).',
+    ...booleanConfigHelper(false),
+  },
   ...chainConfigMappings,
   ...l1ReaderConfigMappings,
   viemPollingIntervalMS: {

package/src/archiver/data_retrieval.ts

@@ -15,7 +15,7 @@ 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';
@@ -33,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;
@@ -87,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 });
 }
 
 /**

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);
+  }
 }

package/src/archiver/validation.ts

@@ -20,6 +20,7 @@ export async function validateBlockAttestations(
   logger?: Logger,
 ): Promise<ValidateBlockResult> {
   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();
@@ -51,7 +52,17 @@ export async function validateBlockAttestations(
     if (!committeeSet.has(signer)) {
       logger?.warn(`Attestation from non-committee member ${signer} at slot ${slot}`, { committee });
       const reason = 'invalid-attestation';
-      return { valid: false, reason, invalidIndex: i, block: publishedBlock, committee, seed, epoch, attestations };
+      return {
+        valid: false,
+        reason,
+        invalidIndex: i,
+        block: publishedBlock.block.toBlockInfo(),
+        committee,
+        seed,
+        epoch,
+        attestors,
+        attestations: publishedBlock.attestations,
+      };
     }
   }
 
@@ -62,7 +73,16 @@ export async function validateBlockAttestations(
       ...logData,
     });
     const reason = 'insufficient-attestations';
-    return { valid: false, reason, block: publishedBlock, committee, seed, epoch, attestations };
+    return {
+      valid: false,
+      reason,
+      block: publishedBlock.block.toBlockInfo(),
+      committee,
+      seed,
+      epoch,
+      attestors,
+      attestations: publishedBlock.attestations,
+    };
   }
 
   logger?.debug(`Block attestations validated successfully for block ${block.number} at slot ${slot}`, logData);

package/src/test/mock_l2_block_source.ts

@@ -5,7 +5,14 @@ import type { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 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 { EmptyL1RollupConstants, type L1RollupConstants, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { type BlockHeader, TxHash, TxReceipt, TxStatus } from '@aztec/stdlib/tx';
@@ -106,15 +113,17 @@ export class MockL2BlockSource implements L2BlockSource, ContractDataSource {
 
   public async getPublishedBlocks(from: number, limit: number, proven?: boolean) {
     const blocks = await this.getBlocks(from, limit, proven);
-    return blocks.map(block => ({
-      block,
-      l1: {
-        blockNumber: BigInt(block.number),
-        blockHash: Buffer32.random().toString(),
-        timestamp: BigInt(block.number),
-      },
-      attestations: [],
-    }));
+    return blocks.map(block =>
+      PublishedL2Block.fromFields({
+        block,
+        l1: {
+          blockNumber: BigInt(block.number),
+          blockHash: Buffer32.random().toString(),
+          timestamp: BigInt(block.number),
+        },
+        attestations: [],
+      }),
+    );
   }
 
   getBlockHeader(number: number | 'latest'): Promise<BlockHeader | undefined> {