@aztec-labs/archiver 6.0.0-rc.1 → 6.0.0-rc.2

package/src/errors.ts

@@ -1,5 +1,6 @@
 import type { BlockNumber, CheckpointNumber } from '@aztec-labs/foundation/branded-types';
 import type { Fr } from '@aztec-labs/foundation/curves/bn254';
+import type { TxHash } from '@aztec-labs/stdlib/tx';
 
 export class NoBlobBodiesFoundError extends Error {
   constructor(l2BlockNum: number) {
@@ -80,6 +81,21 @@ export class BlockArchiveNotConsistentError extends Error {
   }
 }
 
+/**
+ * Thrown when a block lists a tx hash already included in a lower stored block. Blocks below the one being inserted
+ * are its ancestors, so the tx would be included twice (and its nullifiers repeated), which no valid chain allows.
+ */
+export class DuplicateTxHashError extends Error {
+  constructor(
+    public readonly txHash: TxHash,
+    public readonly blockNumber: BlockNumber,
+    public readonly existingBlockNumber: BlockNumber,
+  ) {
+    super(`Cannot insert block ${blockNumber}: tx ${txHash} is already included in block ${existingBlockNumber}`);
+    this.name = 'DuplicateTxHashError';
+  }
+}
+
 export class CheckpointNotFoundError extends Error {
   constructor(checkpointNumber: number) {
     super(`Failed to find expected checkpoint number ${checkpointNumber}`);
@@ -302,3 +318,19 @@ export class UndecodableCheckpointAttestationsError extends Error {
     this.name = 'UndecodableCheckpointAttestationsError';
   }
 }
+
+/** Thrown when a checkpoint's attestations tuple does not decode for its epoch committee. */
+export class CheckpointAttestationsDecodeError extends Error {
+  constructor(
+    public readonly checkpointNumber: number,
+    public readonly epoch: number,
+    public readonly committeeSize: number,
+    public override readonly cause: unknown,
+  ) {
+    super(
+      `Attestations tuple of checkpoint ${checkpointNumber} does not decode for the committee of ${committeeSize} ` +
+        `recorded for epoch ${epoch} (${cause instanceof Error ? cause.message : String(cause)})`,
+    );
+    this.name = 'CheckpointAttestationsDecodeError';
+  }
+}

package/src/l1/bin/retrieve-calldata.ts

@@ -5,6 +5,7 @@ import type { ViemPublicClient, ViemPublicDebugClient } from '@aztec-labs/ethere
 import { CheckpointNumber } from '@aztec-labs/foundation/branded-types';
 import { EthAddress } from '@aztec-labs/foundation/eth-address';
 import { createLogger } from '@aztec-labs/foundation/log';
+import { CommitteeAttestation } from '@aztec-labs/stdlib/block';
 import { type Hex, createPublicClient, decodeEventLog, getAbiItem, http, toEventSelector } from 'viem';
 import { mainnet } from 'viem/chains';
 
@@ -93,7 +94,6 @@ async function main() {
     const retriever = new CalldataRetriever(
       publicClient as unknown as ViemPublicClient,
       publicClient as unknown as ViemPublicDebugClient,
-      targetCommitteeSize,
       undefined,
       logger,
       rollupAddress,
@@ -171,9 +171,20 @@ async function main() {
     logger.info(`  Fee Recipient: ${result.header.feeRecipient.toString()}`);
     logger.info(`  Total Mana Used: ${result.header.totalManaUsed.toString()}`);
     logger.info('');
-    logger.info('Attestations:');
-    logger.info(`  Count: ${result.attestations.length}`);
-    logger.info(`  Non-empty attestations: ${result.attestations.filter((a: any) => !a.signature.isEmpty()).length}`);
+    // The target committee size is only a guess at the epoch committee size, and escape-hatch tuples may not decode.
+    logger.info('Attestations (packed):');
+    logger.info(`  Signature bitmap: ${result.verbatimAttestations.signatureIndices}`);
+    logger.info(`  Signatures or addresses: ${result.verbatimAttestations.signaturesOrAddresses}`);
+    try {
+      const attestations = CommitteeAttestation.fromPacked(result.verbatimAttestations, targetCommitteeSize);
+      logger.info(`  Decoded for a committee of ${targetCommitteeSize}:`);
+      logger.info(`    Count: ${attestations.length}`);
+      logger.info(`    Non-empty attestations: ${attestations.filter(a => !a.signature.isEmpty()).length}`);
+    } catch (err) {
+      logger.info(
+        `  Does not decode for a committee of ${targetCommitteeSize}: ${err instanceof Error ? err.message : err}`,
+      );
+    }
 
     process.exit(0);
   } catch (error) {

package/src/l1/calldata_retriever.ts

@@ -12,7 +12,6 @@ import { LruSet } from '@aztec-labs/foundation/collection';
 import { Fr } from '@aztec-labs/foundation/curves/bn254';
 import { EthAddress } from '@aztec-labs/foundation/eth-address';
 import type { Logger } from '@aztec-labs/foundation/log';
-import { CommitteeAttestation } from '@aztec-labs/stdlib/block';
 import { computeCheckpointPayloadDigest } from '@aztec-labs/stdlib/checkpoint';
 import { CheckpointHeader } from '@aztec-labs/stdlib/rollup';
 import { type Hex, type Transaction, decodeFunctionData, hexToBytes, multicall3Abi, toFunctionSelector } from 'viem';
@@ -23,16 +22,17 @@ import { getCallsFromSpireProposer } from './spire_proposer.js';
 import { getSuccessfulCallsFromTrace } from './trace_tx.js';
 import type { CallInfo } from './types.js';
 
-/** Decoded checkpoint data from a propose calldata. */
-type CheckpointData = {
+/**
+ * Checkpoint data extracted from a propose calldata. The attestations tuple is left packed, since decoding it
+ * depends on the checkpoint's epoch (escape-hatch proposers may post an arbitrary tuple).
+ */
+export type RawCheckpointFromCalldata = {
   checkpointNumber: CheckpointNumber;
   archiveRoot: Fr;
   header: CheckpointHeader;
-  attestations: CommitteeAttestation[];
   /**
-   * The exact packed `CommitteeAttestations` tuple as it appears in the propose calldata, preserved
-   * verbatim (never re-derived from {@link attestations}) so invalidation evidence stays byte-faithful to
-   * the on-chain `attestationsHash`.
+   * The exact packed `CommitteeAttestations` tuple as it appears in the propose calldata. It is what the
+   * rollup hashed into `attestationsHash`, and repacking decoded attestations does not reproduce it.
    */
   verbatimAttestations: ViemCommitteeAttestations;
   blockHash: string;
@@ -56,7 +56,6 @@ export class CalldataRetriever {
   constructor(
     private readonly publicClient: ViemPublicClient,
     private readonly debugClient: ViemPublicDebugClient,
-    private readonly targetCommitteeSize: number,
     private readonly instrumentation: ArchiverInstrumentation | undefined,
     private readonly logger: Logger,
     private readonly rollupAddress: EthAddress,
@@ -86,7 +85,7 @@ export class CalldataRetriever {
       attestationsHash: Hex;
       payloadDigest: Hex;
     },
-  ): Promise<CheckpointData> {
+  ): Promise<RawCheckpointFromCalldata> {
     this.logger.trace(`Fetching checkpoint ${checkpointNumber} from rollup tx ${txHash}`);
     const tx = await this.publicClient.getTransaction({ hash: txHash });
     return this.getCheckpointFromTx(tx, checkpointNumber, expectedHashes);
@@ -97,7 +96,7 @@ export class CalldataRetriever {
     tx: Transaction,
     checkpointNumber: CheckpointNumber,
     expectedHashes: { attestationsHash: Hex; payloadDigest: Hex },
-  ): Promise<CheckpointData> {
+  ): Promise<RawCheckpointFromCalldata> {
     // Try to decode as multicall3 with hash-verified matching
     const multicall3Result = this.tryDecodeMulticall3(tx, expectedHashes, checkpointNumber, tx.blockHash!);
     if (multicall3Result) {
@@ -155,7 +154,7 @@ export class CalldataRetriever {
     expectedHashes: { attestationsHash: Hex; payloadDigest: Hex },
     checkpointNumber: CheckpointNumber,
     blockHash: Hex,
-  ): Promise<CheckpointData | undefined> {
+  ): Promise<RawCheckpointFromCalldata | undefined> {
     // Try to decode as Spire Proposer multicall (extracts all wrapped calls)
     const spireWrappedCalls = await getCallsFromSpireProposer(tx, this.publicClient, this.logger);
     if (!spireWrappedCalls) {
@@ -202,7 +201,7 @@ export class CalldataRetriever {
     expectedHashes: { attestationsHash: Hex; payloadDigest: Hex },
     checkpointNumber: CheckpointNumber,
     blockHash: Hex,
-  ): CheckpointData | undefined {
+  ): RawCheckpointFromCalldata | undefined {
     const txHash = tx.hash;
 
     try {
@@ -256,7 +255,7 @@ export class CalldataRetriever {
       }
 
       // Decode, verify, and build for each candidate
-      const verified: CheckpointData[] = [];
+      const verified: RawCheckpointFromCalldata[] = [];
       for (const candidate of candidates) {
         const result = this.tryDecodeAndVerifyPropose(candidate, expectedHashes, checkpointNumber, blockHash);
         if (result) {
@@ -300,7 +299,7 @@ export class CalldataRetriever {
     expectedHashes: { attestationsHash: Hex; payloadDigest: Hex },
     checkpointNumber: CheckpointNumber,
     blockHash: Hex,
-  ): CheckpointData | undefined {
+  ): RawCheckpointFromCalldata | undefined {
     const txHash = tx.hash;
     try {
       // Check if transaction is to the rollup address
@@ -400,7 +399,7 @@ export class CalldataRetriever {
     expectedHashes: { attestationsHash: Hex; payloadDigest: Hex },
     checkpointNumber: CheckpointNumber,
     blockHash: Hex,
-  ): CheckpointData | undefined {
+  ): RawCheckpointFromCalldata | undefined {
     try {
       const { functionName, args } = decodeFunctionData({ abi: RollupAbi, data: proposeCalldata });
       if (functionName !== 'propose') {
@@ -442,23 +441,18 @@ export class CalldataRetriever {
         return undefined;
       }
 
-      const attestations = CommitteeAttestation.fromPacked(verbatimAttestations, this.targetCommitteeSize);
-
       this.logger.trace(`Validated and decoded propose calldata for checkpoint ${checkpointNumber}`, {
         checkpointNumber,
         archive: decodedArgs.archive,
         header: decodedArgs.header,
         l1BlockHash: blockHash,
-        attestations,
         verbatimAttestations,
-        targetCommitteeSize: this.targetCommitteeSize,
       });
 
       return {
         checkpointNumber,
         archiveRoot,
         header,
-        attestations,
         verbatimAttestations,
         blockHash,
         feeAssetPriceModifier,

package/src/l1/data_retrieval.ts

@@ -46,7 +46,6 @@ type RetrievedCheckpointBase = {
   l1: L1PublishedData;
   chainId: Fr;
   version: Fr;
-  attestations: CommitteeAttestation[];
   /**
    * The exact packed `CommitteeAttestations` tuple from the propose calldata, carried verbatim: it is what
    * the rollup hashed into `attestationsHash`, and repacking the decoded attestations does not reproduce it.
@@ -55,9 +54,12 @@ type RetrievedCheckpointBase = {
 };
 
 /** Checkpoint data as retrieved from L1 calldata and blob data. */
-export type RetrievedCheckpoint = RetrievedCheckpointBase & { checkpointBlobData: CheckpointBlobData };
+export type RetrievedCheckpoint = RetrievedCheckpointBase & {
+  attestations: CommitteeAttestation[];
+  checkpointBlobData: CheckpointBlobData;
+};
 
-/** Checkpoint data retrieved from L1 calldata only, without blob data. */
+/** Checkpoint data retrieved from L1 calldata only, without blob data or decoded attestations. */
 export type RetrievedCheckpointFromCalldata = RetrievedCheckpointBase & {
   /** Versioned blob hashes from the checkpoint proposed event. */
   blobHashes: Buffer[];
@@ -65,6 +67,11 @@ export type RetrievedCheckpointFromCalldata = RetrievedCheckpointBase & {
   parentBeaconBlockRoot: string | undefined;
 };
 
+/** A calldata-only checkpoint with its attestations decoded for its epoch committee. */
+export type ResolvedCheckpointFromCalldata = RetrievedCheckpointFromCalldata & {
+  attestations: CommitteeAttestation[];
+};
+
 export async function retrievedToPublishedCheckpoint({
   checkpointNumber,
   archiveRoot,
@@ -187,7 +194,7 @@ export async function retrieveCheckpointCalldataFromRollup(
 ): Promise<RetrievedCheckpointFromCalldata[]> {
   const retrievedCheckpoints: RetrievedCheckpointFromCalldata[] = [];
 
-  let rollupConstants: { chainId: Fr; version: Fr; targetCommitteeSize: number } | undefined;
+  let rollupConstants: { chainId: Fr; version: Fr } | undefined;
 
   do {
     if (searchStartBlock > searchEndBlock) {
@@ -205,15 +212,10 @@ export async function retrieveCheckpointCalldataFromRollup(
     );
 
     if (rollupConstants === undefined) {
-      const [chainId, version, targetCommitteeSize] = await Promise.all([
-        publicClient.getChainId(),
-        rollup.getVersion(),
-        rollup.getTargetCommitteeSize(),
-      ]);
+      const [chainId, version] = await Promise.all([publicClient.getChainId(), rollup.getVersion()]);
       rollupConstants = {
         chainId: new Fr(chainId),
         version: new Fr(version),
-        targetCommitteeSize,
       };
     }
 
@@ -239,7 +241,7 @@ export async function retrieveCheckpointCalldataFromRollup(
  * @param publicClient - The viem public client to use for transaction retrieval.
  * @param debugClient - The viem debug client to use for trace/debug RPC methods (optional).
  * @param logs - CheckpointProposed logs.
- * @param rollupConstants - The rollup constants (chainId, version, targetCommitteeSize).
+ * @param rollupConstants - The rollup constants (chainId, version).
  * @param instrumentation - The archiver instrumentation instance.
  * @param logger - The logger instance.
  * @returns An array of calldata-only checkpoints.
@@ -249,7 +251,7 @@ async function processCheckpointProposedLogs(
   publicClient: ViemPublicClient,
   debugClient: ViemPublicDebugClient,
   logs: CheckpointProposedLog[],
-  { chainId, version, targetCommitteeSize }: { chainId: Fr; version: Fr; targetCommitteeSize: number },
+  { chainId, version }: { chainId: Fr; version: Fr },
   instrumentation: ArchiverInstrumentation,
   logger: Logger,
 ): Promise<RetrievedCheckpointFromCalldata[]> {
@@ -257,7 +259,6 @@ async function processCheckpointProposedLogs(
   const calldataRetriever = new CalldataRetriever(
     publicClient,
     debugClient,
-    targetCommitteeSize,
     instrumentation,
     logger,
     EthAddress.fromString(rollup.address),
@@ -266,6 +267,13 @@ async function processCheckpointProposedLogs(
   await asyncPool(10, logs, async log => {
     const checkpointNumber = log.args.checkpointNumber;
     const archive = log.args.archive;
+    // CheckpointProposed logs stay on L1 after their checkpoint is pruned or replaced, so every re-read of a range
+    // (a sync point rewind, a fresh sync from genesis) sees them. Rollup.archiveAt only answers up to the current
+    // pending tip, so a pruned or replaced checkpoint mismatches here and is dropped before its blobs are fetched or
+    // it is validated. A checkpoint the archiver refuses to ingest therefore blocks sync only while it is still
+    // canonical: the L1 prune is lazy (it runs on the next propose or an explicit prune() call), and until then
+    // archiveAt keeps returning the refused checkpoint's archive. Proposers send prune() from their cannot-build
+    // fallback even when their own sync is stuck, so the refused checkpoint is eventually dropped here.
     const archiveFromChain = await rollup.archiveAt(checkpointNumber);
     const blobHashes = log.args.versionedBlobHashes;
 
@@ -297,7 +305,7 @@ async function processCheckpointProposedLogs(
         l1BlockNumber: log.l1BlockNumber,
         checkpointNumber,
         archive: archive.toString(),
-        attestations: checkpoint.attestations,
+        verbatimAttestations: checkpoint.verbatimAttestations,
       });
     } else {
       logger.warn(`Ignoring checkpoint ${checkpointNumber} due to archive root mismatch`, {

package/src/modules/data_store_updater.ts

@@ -521,15 +521,15 @@ export class ArchiverDataStoreUpdater {
     const result = await this.stores.db.transactionAsync(async () => {
       const { blocksRemoved = [] } = await this.stores.blocks.removeCheckpointsAfter(checkpointNumber);
 
-      const opResults = await Promise.all([
+      const [, logsDeleted, ...contractDataRemoved] = await Promise.all([
         // Prune rolls back to the last proven block, which is by definition valid
         this.stores.blocks.setPendingChainValidationStatus({ valid: true }),
+        this.stores.logs.deleteLogs(blocksRemoved),
         // Remove contract data for all blocks being removed
         ...blocksRemoved.map(block => this.removeContractDataFromDb(block)),
-        this.stores.logs.deleteLogs(blocksRemoved),
       ]);
 
-      return opResults.every(Boolean);
+      return logsDeleted && contractDataRemoved.every(Boolean);
     });
     await this.l2FrontierCache?.refresh();
     return result;
@@ -694,7 +694,7 @@ export class ArchiverDataStoreUpdater {
       if (operation == Operation.Store) {
         return await this.stores.contractInstances.addContractInstances(contractInstances, blockNum);
       } else if (operation == Operation.Delete) {
-        return await this.stores.contractInstances.deleteContractInstances(contractInstances);
+        return await this.stores.contractInstances.deleteContractInstances(contractInstances, blockNum);
       }
     }
     return true;