@aztec/archiver 1.2.0 → 2.0.0-nightly.20250813

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 } from '@aztec/stdlib/block';
+import { L2Block, L2BlockHash, type L2BlockSource, type L2Tips, 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';
@@ -101,5 +101,7 @@ export declare class MockL2BlockSource implements L2BlockSource, ContractDataSou
     getDebugFunctionName(_address: AztecAddress, _selector: FunctionSelector): Promise<string | undefined>;
     registerContractFunctionSignatures(_signatures: string[]): Promise<void>;
     syncImmediate(): Promise<void>;
+    isPendingChainInvalid(): Promise<boolean>;
+    getPendingChainValidationStatus(): Promise<ValidateBlockResult>;
 }
 //# sourceMappingURL=mock_l2_block_source.d.ts.map

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":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,aAAa,EAAE,KAAK,MAAM,EAAE,KAAK,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACtH,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AACnH,OAAO,EAA0B,KAAK,iBAAiB,EAAwB,MAAM,6BAA6B,CAAC;AACnH,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,EAAE,SAAS,EAAY,MAAM,kBAAkB,CAAC;AACjF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAElD;;GAEG;AACH,qBAAa,iBAAkB,YAAW,aAAa,EAAE,kBAAkB;IACzE,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAM;IAEnC,OAAO,CAAC,iBAAiB,CAAa;IACtC,OAAO,CAAC,oBAAoB,CAAa;IAEzC,OAAO,CAAC,GAAG,CAAiD;IAE/C,YAAY,CAAC,SAAS,EAAE,MAAM;IAUpC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE;IAK3B,YAAY,CAAC,SAAS,EAAE,MAAM;IAK9B,oBAAoB,CAAC,iBAAiB,EAAE,MAAM;IAI9C,uBAAuB,CAAC,oBAAoB,EAAE,MAAM;IAO3D;;;OAGG;IACH,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC;IAIvC;;;OAGG;IACH,kBAAkB,IAAI,OAAO,CAAC,UAAU,CAAC;IAIzC;;;OAGG;IACI,cAAc;IAId,oBAAoB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI9C;;;;OAIG;IACI,QAAQ,CAAC,MAAM,EAAE,MAAM;IAI9B;;;;;OAKG;IACI,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;IAQjD,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO;;;;;;;;;IAa7E,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAI3E,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAU1D,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAIpE;;;;OAIG;IACU,WAAW,CAAC,MAAM,EAAE,MAAM;;;;;;IAgBvC;;;;OAIG;IACU,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAkB1E,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC;IA2BlC,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAInC,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAIlC,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvD,cAAc,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAI5C,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIjC;;;OAGG;IACI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;;OAGG;IACI,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B,gBAAgB,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAInE,qBAAqB,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC;IAIvD,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC;IAI1G,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIpC,oBAAoB,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAItG,kCAAkC,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxE,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAI9B,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC;IAIzC,+BAA+B,IAAI,OAAO,CAAC,mBAAmB,CAAC;CAGhE"}

package/dest/test/mock_l2_block_source.js

@@ -3,7 +3,7 @@ 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 { getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
+import { EmptyL1RollupConstants, getSlotRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
 import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
 /**
  * A mocked implementation of L2BlockSource to be used in tests.
@@ -170,7 +170,7 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
         throw new Error('Method not implemented.');
     }
     getL1Constants() {
-        throw new Error('Method not implemented.');
+        return Promise.resolve(EmptyL1RollupConstants);
     }
     getL1Timestamp() {
         throw new Error('Method not implemented.');
@@ -210,4 +210,12 @@ import { TxReceipt, TxStatus } from '@aztec/stdlib/tx';
     syncImmediate() {
         return Promise.resolve();
     }
+    isPendingChainInvalid() {
+        return Promise.resolve(false);
+    }
+    getPendingChainValidationStatus() {
+        return Promise.resolve({
+            valid: true
+        });
+    }
 }

package/package.json

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

package/src/archiver/archiver.ts

@@ -1,4 +1,5 @@
 import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
+import { EpochCache } from '@aztec/epoch-cache';
 import {
   BlockTagTooOldError,
   InboxContract,
@@ -9,24 +10,25 @@ import {
 } from '@aztec/ethereum';
 import { maxBigint } from '@aztec/foundation/bigint';
 import { Buffer16, Buffer32 } from '@aztec/foundation/buffer';
+import { pick } from '@aztec/foundation/collection';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { RunningPromise, makeLoggingErrorHandler } from '@aztec/foundation/running-promise';
 import { sleep } from '@aztec/foundation/sleep';
 import { count } from '@aztec/foundation/string';
-import { Timer, elapsed } from '@aztec/foundation/timer';
+import { DateProvider, Timer, elapsed } from '@aztec/foundation/timer';
 import type { CustomRange } from '@aztec/kv-store';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import {
-  ContractClassRegisteredEvent,
+  ContractClassPublishedEvent,
   PrivateFunctionBroadcastedEvent,
   UtilityFunctionBroadcastedEvent,
-} from '@aztec/protocol-contracts/class-registerer';
+} from '@aztec/protocol-contracts/class-registry';
 import {
-  ContractInstanceDeployedEvent,
+  ContractInstancePublishedEvent,
   ContractInstanceUpdatedEvent,
-} from '@aztec/protocol-contracts/instance-deployer';
+} from '@aztec/protocol-contracts/instance-registry';
 import type { FunctionSelector } from '@aztec/stdlib/abi';
 import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import {
@@ -61,7 +63,14 @@ import { ContractClassLog, type LogFilter, type PrivateLog, type PublicLog, TxSc
 import type { L1ToL2MessageSource } from '@aztec/stdlib/messaging';
 import { type BlockHeader, type IndexedTxEffect, TxHash, TxReceipt } from '@aztec/stdlib/tx';
 import type { UInt64 } from '@aztec/stdlib/types';
-import { Attributes, type TelemetryClient, type Traceable, type Tracer, trackSpan } from '@aztec/telemetry-client';
+import {
+  Attributes,
+  type TelemetryClient,
+  type Traceable,
+  type Tracer,
+  getTelemetryClient,
+  trackSpan,
+} from '@aztec/telemetry-client';
 
 import { EventEmitter } from 'events';
 import groupBy from 'lodash.groupby';
@@ -79,12 +88,20 @@ import { InitialBlockNumberNotSequentialError, NoBlobBodiesFoundError } from './
 import { ArchiverInstrumentation } from './instrumentation.js';
 import type { InboxMessage } from './structs/inbox_message.js';
 import type { PublishedL2Block } from './structs/published.js';
+import { type ValidateBlockResult, validateBlockAttestations } from './validation.js';
 
 /**
  * Helper interface to combine all sources this archiver implementation provides.
  */
 export type ArchiveSource = L2BlockSource & L2LogsSource & ContractDataSource & L1ToL2MessageSource;
 
+export type ArchiverDeps = {
+  telemetry?: TelemetryClient;
+  blobSinkClient: BlobSinkClientInterface;
+  epochCache?: EpochCache;
+  dateProvider?: DateProvider;
+};
+
 /**
  * Pulls L2 blocks in a non-blocking manner and provides interface for their retrieval.
  * Responsible for handling robust L1 polling so that other components do not need to
@@ -103,6 +120,7 @@ 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;
@@ -123,6 +141,7 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
     readonly dataStore: ArchiverDataStore,
     private readonly config: { pollingIntervalMs: number; batchSize: number },
     private readonly blobSinkClient: BlobSinkClientInterface,
+    private readonly epochCache: EpochCache,
     private readonly instrumentation: ArchiverInstrumentation,
     private readonly l1constants: L1RollupConstants & { l1StartBlockHash: Buffer32 },
     private readonly log: Logger = createLogger('archiver'),
@@ -146,7 +165,7 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
   public static async createAndSync(
     config: ArchiverConfig,
     archiverStore: ArchiverDataStore,
-    deps: { telemetry: TelemetryClient; blobSinkClient: BlobSinkClientInterface },
+    deps: ArchiverDeps,
     blockUntilSynced = true,
   ): Promise<Archiver> {
     const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
@@ -185,13 +204,17 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
       batchSize: config.archiverBatchSize ?? 100,
     };
 
+    const epochCache = deps.epochCache ?? (await EpochCache.create(config.l1Contracts.rollupAddress, config, deps));
+    const telemetry = deps.telemetry ?? getTelemetryClient();
+
     const archiver = new Archiver(
       publicClient,
       config.l1Contracts,
       archiverStore,
       opts,
       deps.blobSinkClient,
-      await ArchiverInstrumentation.new(deps.telemetry, () => archiverStore.estimateSize()),
+      epochCache,
+      await ArchiverInstrumentation.new(telemetry, () => archiverStore.estimateSize()),
       l1Constants,
     );
     await archiver.start(blockUntilSynced);
@@ -331,10 +354,22 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
         currentL1BlockNumber,
         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.
-      if (!rollupCanPrune) {
+      // 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) {
         await this.checkForNewBlocksBeforeL1SyncPoint(rollupStatus, blocksSynchedTo, currentL1BlockNumber);
       }
 
@@ -595,6 +630,7 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
       provenArchive,
       pendingBlockNumber: Number(pendingBlockNumber),
       pendingArchive,
+      validationResult: undefined as ValidateBlockResult | undefined,
     };
     this.log.trace(`Retrieved rollup status at current L1 block ${currentL1BlockNumber}.`, {
       localPendingBlockNumber,
@@ -680,7 +716,8 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
         throw new Error(`Missing block ${localPendingBlockNumber}`);
       }
 
-      const noBlockSinceLast = localPendingBlock && pendingArchive === localPendingBlock.archive.root.toString();
+      const localPendingArchiveRoot = localPendingBlock.archive.root.toString();
+      const noBlockSinceLast = localPendingBlock && pendingArchive === localPendingArchiveRoot;
       if (noBlockSinceLast) {
         // We believe the following line causes a problem when we encounter L1 re-orgs.
         // Basically, by setting the synched L1 block number here, we are saying that we have
@@ -694,13 +731,16 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
         return rollupStatus;
       }
 
-      const localPendingBlockInChain = archiveForLocalPendingBlockNumber === localPendingBlock.archive.root.toString();
+      const localPendingBlockInChain = archiveForLocalPendingBlockNumber === localPendingArchiveRoot;
       if (!localPendingBlockInChain) {
         // If our local pending block tip is not in the chain on L1 a "prune" must have happened
         // or the L1 have reorged.
         // In any case, we have to figure out how far into the past the action will take us.
         // For simplicity here, we will simply rewind until we end in a block that is also on the chain on L1.
-        this.log.debug(`L2 prune has been detected.`);
+        this.log.debug(
+          `L2 prune has been detected due to local pending block ${localPendingBlockNumber} not in chain`,
+          { localPendingBlockNumber, localPendingArchiveRoot, archiveForLocalPendingBlockNumber },
+        );
 
         let tipAfterUnwind = localPendingBlockNumber;
         while (true) {
@@ -762,8 +802,36 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
       );
 
       const publishedBlocks = retrievedBlocks.map(b => retrievedBlockToPublishedL2Block(b));
+      const validBlocks: PublishedL2Block[] = [];
 
       for (const block of publishedBlocks) {
+        const validationResult = await validateBlockAttestations(block, this.epochCache, this.l1constants, this.log);
+
+        // 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) {
+          rollupStatus.validationResult = validationResult;
+        }
+
+        if (!validationResult.valid) {
+          this.log.warn(`Skipping block ${block.block.number} due to invalid attestations`, {
+            blockHash: block.block.hash(),
+            l1BlockNumber: block.l1.blockNumber,
+            ...pick(validationResult, 'reason'),
+          });
+
+          // Emit event for invalid block detection
+          this.emit(L2BlockSourceEvents.InvalidAttestationsBlockDetected, {
+            type: L2BlockSourceEvents.InvalidAttestationsBlockDetected,
+            validationResult,
+          });
+
+          // 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
+          continue;
+        }
+
+        validBlocks.push(block);
         this.log.debug(`Ingesting new L2 block ${block.block.number} with ${block.block.body.txEffects.length} txs`, {
           blockHash: block.block.hash(),
           l1BlockNumber: block.l1.blockNumber,
@@ -773,10 +841,10 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
       }
 
       try {
-        const [processDuration] = await elapsed(() => this.store.addBlocks(publishedBlocks));
+        const [processDuration] = await elapsed(() => this.store.addBlocks(validBlocks));
         this.instrumentation.processNewBlocks(
-          processDuration / publishedBlocks.length,
-          publishedBlocks.map(b => b.block),
+          processDuration / validBlocks.length,
+          validBlocks.map(b => b.block),
         );
       } catch (err) {
         if (err instanceof InitialBlockNumberNotSequentialError) {
@@ -799,7 +867,7 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
         throw err;
       }
 
-      for (const block of publishedBlocks) {
+      for (const block of validBlocks) {
         this.log.info(`Downloaded L2 block ${block.block.number}`, {
           blockHash: await block.block.hash(),
           blockNumber: block.block.number,
@@ -809,7 +877,7 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
           archiveNextLeafIndex: block.block.archive.nextAvailableLeafIndex,
         });
       }
-      lastRetrievedBlock = publishedBlocks.at(-1) ?? lastRetrievedBlock;
+      lastRetrievedBlock = validBlocks.at(-1) ?? lastRetrievedBlock;
     } while (searchEndBlock < currentL1BlockNumber);
 
     // Important that we update AFTER inserting the blocks.
@@ -1160,6 +1228,14 @@ export class Archiver extends (EventEmitter as new () => ArchiverEmitter) implem
     return this.store.getDebugFunctionName(address, selector);
   }
 
+  getPendingChainValidationStatus(): Promise<ValidateBlockResult> {
+    return Promise.resolve(this.pendingChainValidationStatus);
+  }
+
+  isPendingChainInvalid(): Promise<boolean> {
+    return Promise.resolve(this.pendingChainValidationStatus.valid === false);
+  }
+
   async getL2Tips(): Promise<L2Tips> {
     const [latestBlockNumber, provenBlockNumber] = await Promise.all([
       this.getBlockNumber(),
@@ -1282,15 +1358,15 @@ export class ArchiverStoreHelper
   constructor(protected readonly store: ArchiverDataStore) {}
 
   /**
-   * Extracts and stores contract classes out of ContractClassRegistered events emitted by the class registerer contract.
+   * Extracts and stores contract classes out of ContractClassPublished events emitted by the class registry contract.
    * @param allLogs - All logs emitted in a bunch of blocks.
    */
-  async #updateRegisteredContractClasses(allLogs: ContractClassLog[], blockNum: number, operation: Operation) {
-    const contractClassRegisteredEvents = allLogs
-      .filter(log => ContractClassRegisteredEvent.isContractClassRegisteredEvent(log))
-      .map(log => ContractClassRegisteredEvent.fromLog(log));
+  async #updatePublishedContractClasses(allLogs: ContractClassLog[], blockNum: number, operation: Operation) {
+    const contractClassPublishedEvents = allLogs
+      .filter(log => ContractClassPublishedEvent.isContractClassPublishedEvent(log))
+      .map(log => ContractClassPublishedEvent.fromLog(log));
 
-    const contractClasses = await Promise.all(contractClassRegisteredEvents.map(e => e.toContractClassPublic()));
+    const contractClasses = await Promise.all(contractClassPublishedEvents.map(e => e.toContractClassPublic()));
     if (contractClasses.length > 0) {
       contractClasses.forEach(c => this.#log.verbose(`${Operation[operation]} contract class ${c.id.toString()}`));
       if (operation == Operation.Store) {
@@ -1307,13 +1383,13 @@ export class ArchiverStoreHelper
   }
 
   /**
-   * Extracts and stores contract instances out of ContractInstanceDeployed events emitted by the canonical deployer contract.
+   * Extracts and stores contract instances out of ContractInstancePublished events emitted by the canonical deployer contract.
    * @param allLogs - All logs emitted in a bunch of blocks.
    */
   async #updateDeployedContractInstances(allLogs: PrivateLog[], blockNum: number, operation: Operation) {
     const contractInstances = allLogs
-      .filter(log => ContractInstanceDeployedEvent.isContractInstanceDeployedEvent(log))
-      .map(log => ContractInstanceDeployedEvent.fromLog(log))
+      .filter(log => ContractInstancePublishedEvent.isContractInstancePublishedEvent(log))
+      .map(log => ContractInstancePublishedEvent.fromLog(log))
       .map(e => e.toContractInstance());
     if (contractInstances.length > 0) {
       contractInstances.forEach(c =>
@@ -1329,7 +1405,7 @@ export class ArchiverStoreHelper
   }
 
   /**
-   * Extracts and stores contract instances out of ContractInstanceDeployed events emitted by the canonical deployer contract.
+   * Extracts and stores contract instances out of ContractInstancePublished events emitted by the canonical deployer contract.
    * @param allLogs - All logs emitted in a bunch of blocks.
    * @param timestamp - Timestamp at which the updates were scheduled.
    * @param operation - The operation to perform on the contract instance updates (Store or Delete).
@@ -1428,12 +1504,12 @@ export class ArchiverStoreHelper
         // 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);
-          // ContractInstanceDeployed event logs are broadcast in privateLogs.
+          // ContractInstancePublished event logs are broadcast in privateLogs.
           const privateLogs = block.block.body.txEffects.flatMap(txEffect => txEffect.privateLogs);
           const publicLogs = block.block.body.txEffects.flatMap(txEffect => txEffect.publicLogs);
           return (
             await Promise.all([
-              this.#updateRegisteredContractClasses(contractClassLogs, block.block.number, Operation.Store),
+              this.#updatePublishedContractClasses(contractClassLogs, block.block.number, Operation.Store),
               this.#updateDeployedContractInstances(privateLogs, block.block.number, Operation.Store),
               this.#updateUpdatedContractInstances(
                 publicLogs,
@@ -1466,13 +1542,13 @@ export class ArchiverStoreHelper
       // 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);
-        // ContractInstanceDeployed event logs are broadcast in privateLogs.
+        // ContractInstancePublished event logs are broadcast in privateLogs.
         const privateLogs = block.block.body.txEffects.flatMap(txEffect => txEffect.privateLogs);
         const publicLogs = block.block.body.txEffects.flatMap(txEffect => txEffect.publicLogs);
 
         return (
           await Promise.all([
-            this.#updateRegisteredContractClasses(contractClassLogs, block.block.number, Operation.Delete),
+            this.#updatePublishedContractClasses(contractClassLogs, block.block.number, Operation.Delete),
             this.#updateDeployedContractInstances(privateLogs, block.block.number, Operation.Delete),
             this.#updateUpdatedContractInstances(
               publicLogs,

package/src/archiver/data_retrieval.ts

@@ -311,7 +311,7 @@ async function getBlockFromRollupTx(
     throw new Error(`Unexpected rollup method called ${rollupFunctionName}`);
   }
 
-  const [decodedArgs, attestations, _blobInput] = rollupArgs! as readonly [
+  const [decodedArgs, packedAttestations, _signers, _blobInput] = rollupArgs! as readonly [
     {
       archive: Hex;
       stateReference: ViemStateReference;
@@ -322,9 +322,23 @@ async function getBlockFromRollupTx(
       txHashes: readonly Hex[];
     },
     ViemCommitteeAttestations,
+    Hex[],
     Hex,
   ];
 
+  const attestations = CommitteeAttestation.fromPacked(packedAttestations, targetCommitteeSize);
+
+  logger.trace(`Recovered propose calldata from tx ${txHash}`, {
+    l2BlockNumber,
+    archive: decodedArgs.archive,
+    stateReference: decodedArgs.stateReference,
+    header: decodedArgs.header,
+    blobHashes,
+    attestations,
+    packedAttestations,
+    targetCommitteeSize,
+  });
+
   // TODO(md): why is the proposed block header different to the actual block header?
   // This is likely going to be a footgun
   const header = ProposedBlockHeader.fromViem(decodedArgs.header);
@@ -358,7 +372,7 @@ async function getBlockFromRollupTx(
     stateReference,
     header,
     body,
-    attestations: CommitteeAttestation.fromPacked(attestations, targetCommitteeSize),
+    attestations,
   };
 }
 

package/src/archiver/kv_archiver_store/contract_instance_store.ts

@@ -16,12 +16,12 @@ type ContractInstanceUpdateKey = [string, string] | [string, string, number];
  */
 export class ContractInstanceStore {
   #contractInstances: AztecAsyncMap<string, Buffer>;
-  #contractInstanceDeployedAt: AztecAsyncMap<string, number>;
+  #contractInstancePublishedAt: AztecAsyncMap<string, number>;
   #contractInstanceUpdates: AztecAsyncMap<ContractInstanceUpdateKey, Buffer>;
 
   constructor(private db: AztecAsyncKVStore) {
     this.#contractInstances = db.openMap('archiver_contract_instances');
-    this.#contractInstanceDeployedAt = db.openMap('archiver_contract_instances_deployment_block_number');
+    this.#contractInstancePublishedAt = db.openMap('archiver_contract_instances_publication_block_number');
     this.#contractInstanceUpdates = db.openMap('archiver_contract_instance_updates');
   }
 
@@ -31,14 +31,14 @@ export class ContractInstanceStore {
         contractInstance.address.toString(),
         new SerializableContractInstance(contractInstance).toBuffer(),
       );
-      await this.#contractInstanceDeployedAt.set(contractInstance.address.toString(), blockNumber);
+      await this.#contractInstancePublishedAt.set(contractInstance.address.toString(), blockNumber);
     });
   }
 
   deleteContractInstance(contractInstance: ContractInstanceWithAddress): Promise<void> {
     return this.db.transactionAsync(async () => {
       await this.#contractInstances.delete(contractInstance.address.toString());
-      await this.#contractInstanceDeployedAt.delete(contractInstance.address.toString());
+      await this.#contractInstancePublishedAt.delete(contractInstance.address.toString());
     });
   }
 
@@ -110,6 +110,6 @@ export class ContractInstanceStore {
   }
 
   getContractInstanceDeploymentBlockNumber(address: AztecAddress): Promise<number | undefined> {
-    return this.#contractInstanceDeployedAt.getAsync(address.toString());
+    return this.#contractInstancePublishedAt.getAsync(address.toString());
   }
 }

package/src/archiver/kv_archiver_store/log_store.ts

@@ -88,7 +88,7 @@ export class LogStore {
           acc.set(tag, currentLogs.concat(logs));
         }
         return acc;
-      });
+      }, new Map());
     const tagsToUpdate = Array.from(taggedLogsToAdd.keys());
 
     return this.db.transactionAsync(async () => {

package/src/archiver/validation.ts

@@ -0,0 +1,70 @@
+import type { EpochCache } from '@aztec/epoch-cache';
+import type { Logger } from '@aztec/foundation/log';
+import {
+  type PublishedL2Block,
+  type ValidateBlockResult,
+  getAttestationsFromPublishedL2Block,
+} from '@aztec/stdlib/block';
+import { type L1RollupConstants, getEpochAtSlot } from '@aztec/stdlib/epoch-helpers';
+
+export type { ValidateBlockResult };
+
+/**
+ * Validates the attestations submitted for the given block.
+ * Returns true if the attestations are valid and sufficient, false otherwise.
+ */
+export async function validateBlockAttestations(
+  publishedBlock: PublishedL2Block,
+  epochCache: EpochCache,
+  constants: Pick<L1RollupConstants, 'epochDuration'>,
+  logger?: Logger,
+): Promise<ValidateBlockResult> {
+  const attestations = getAttestationsFromPublishedL2Block(publishedBlock);
+  const { block } = publishedBlock;
+  const blockHash = await block.hash().then(hash => hash.toString());
+  const archiveRoot = block.archive.root.toString();
+  const slot = block.header.getSlot();
+  const epoch = getEpochAtSlot(slot, constants);
+  const { committee, seed } = await epochCache.getCommitteeForEpoch(epoch);
+  const logData = { blockNumber: block.number, slot, epoch, blockHash, archiveRoot };
+
+  logger?.debug(`Validating attestations for block ${block.number} at slot ${slot} in epoch ${epoch}`, {
+    committee: (committee ?? []).map(member => member.toString()),
+    recoveredAttestors: attestations.map(a => a.getSender().toString()),
+    postedAttestations: publishedBlock.attestations.map(a =>
+      a.address.isZero() ? a.signature.toString() : a.address.toString(),
+    ),
+    ...logData,
+  });
+
+  if (!committee || committee.length === 0) {
+    logger?.warn(`No committee found for epoch ${epoch} at slot ${slot}. Accepting block without validation.`, logData);
+    return { valid: true };
+  }
+
+  const committeeSet = new Set(committee.map(member => member.toString()));
+  const requiredAttestationCount = Math.floor((committee.length * 2) / 3) + 1;
+
+  for (let i = 0; i < attestations.length; i++) {
+    const attestation = attestations[i];
+    const signer = attestation.getSender().toString();
+    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 };
+    }
+  }
+
+  if (attestations.length < requiredAttestationCount) {
+    logger?.warn(`Insufficient attestations for block at slot ${slot}`, {
+      requiredAttestations: requiredAttestationCount,
+      actualAttestations: attestations.length,
+      ...logData,
+    });
+    const reason = 'insufficient-attestations';
+    return { valid: false, reason, block: publishedBlock, committee, seed, epoch, attestations };
+  }
+
+  logger?.debug(`Block attestations validated successfully for block ${block.number} at slot ${slot}`, logData);
+  return { valid: true };
+}

package/src/factory.ts

@@ -1,4 +1,3 @@
-import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
 import { createLogger } from '@aztec/foundation/log';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
@@ -10,9 +9,8 @@ import type { L2BlockSourceEventEmitter } from '@aztec/stdlib/block';
 import { type ContractClassPublic, computePublicBytecodeCommitment } from '@aztec/stdlib/contract';
 import type { ArchiverApi, Service } from '@aztec/stdlib/interfaces/server';
 import { getComponentsVersionsFromConfig } from '@aztec/stdlib/versioning';
-import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
 
-import { Archiver } from './archiver/archiver.js';
+import { Archiver, type ArchiverDeps } from './archiver/archiver.js';
 import type { ArchiverConfig } from './archiver/config.js';
 import { ARCHIVER_DB_VERSION, KVArchiverDataStore } from './archiver/kv_archiver_store/kv_archiver_store.js';
 import { createArchiverClient } from './rpc/index.js';
@@ -41,13 +39,12 @@ export async function createArchiverStore(
  */
 export async function createArchiver(
   config: ArchiverConfig & DataStoreConfig,
-  blobSinkClient: BlobSinkClientInterface,
+  deps: ArchiverDeps,
   opts: { blockUntilSync: boolean } = { blockUntilSync: true },
-  telemetry: TelemetryClient = getTelemetryClient(),
 ): Promise<ArchiverApi & Service & L2BlockSourceEventEmitter> {
   const archiverStore = await createArchiverStore(config);
   await registerProtocolContracts(archiverStore);
-  return Archiver.createAndSync(config, archiverStore, { telemetry, blobSinkClient }, opts.blockUntilSync);
+  return Archiver.createAndSync(config, archiverStore, deps, opts.blockUntilSync);
 }
 
 /**