@aztec/archiver 0.76.4 → 0.77.0-testnet-ignition.21

package/src/archiver/data_retrieval.ts

@@ -1,29 +1,31 @@
 import { Blob, BlobDeserializationError } from '@aztec/blob-lib';
-import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
-import { Body, InboxLeaf, L2Block } from '@aztec/circuit-types';
-import { AppendOnlyTreeSnapshot, BlockHeader, Fr, Proof } from '@aztec/circuits.js';
+import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
+import type { EpochProofPublicInputArgs, ViemPublicClient } from '@aztec/ethereum';
 import { asyncPool } from '@aztec/foundation/async-pool';
-import { type EthAddress } from '@aztec/foundation/eth-address';
-import { type ViemSignature } from '@aztec/foundation/eth-signature';
+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 { numToUInt32BE } from '@aztec/foundation/serialize';
 import { ForwarderAbi, type InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { Body, L2Block } from '@aztec/stdlib/block';
+import { InboxLeaf } from '@aztec/stdlib/messaging';
+import { Proof } from '@aztec/stdlib/proofs';
+import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
+import { BlockHeader } from '@aztec/stdlib/tx';
 
 import {
-  type Chain,
   type GetContractEventsReturnType,
   type GetContractReturnType,
   type Hex,
-  type HttpTransport,
-  type PublicClient,
   decodeFunctionData,
   getAbiItem,
   hexToBytes,
 } from 'viem';
 
 import { NoBlobBodiesFoundError } from './errors.js';
-import { type DataRetrieval } from './structs/data_retrieval.js';
-import { type L1Published, type L1PublishedData } from './structs/published.js';
+import type { DataRetrieval } from './structs/data_retrieval.js';
+import type { L1Published, L1PublishedData } from './structs/published.js';
 
 /**
  * Fetches new L2 blocks.
@@ -35,8 +37,8 @@ import { type L1Published, type L1PublishedData } from './structs/published.js';
  * @returns An array of block; as well as the next eth block to search from.
  */
 export async function retrieveBlocksFromRollup(
-  rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>,
-  publicClient: PublicClient,
+  rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>,
+  publicClient: ViemPublicClient,
   blobSinkClient: BlobSinkClientInterface,
   searchStartBlock: bigint,
   searchEndBlock: bigint,
@@ -76,7 +78,9 @@ export async function retrieveBlocksFromRollup(
     retrievedBlocks.push(...newBlocks);
     searchStartBlock = lastLog.blockNumber! + 1n;
   } while (searchStartBlock <= searchEndBlock);
-  return retrievedBlocks;
+
+  // The asyncpool from processL2BlockProposedLogs will not necessarily return the blocks in order, so we sort them before returning.
+  return retrievedBlocks.sort((a, b) => Number(a.l1.blockNumber - b.l1.blockNumber));
 }
 
 /**
@@ -87,8 +91,8 @@ export async function retrieveBlocksFromRollup(
  * @returns - An array blocks.
  */
 export async function processL2BlockProposedLogs(
-  rollup: GetContractReturnType<typeof RollupAbi, PublicClient<HttpTransport, Chain>>,
-  publicClient: PublicClient,
+  rollup: GetContractReturnType<typeof RollupAbi, ViemPublicClient>,
+  publicClient: ViemPublicClient,
   blobSinkClient: BlobSinkClientInterface,
   logs: GetContractEventsReturnType<typeof RollupAbi, 'L2BlockProposed'>,
   logger: Logger,
@@ -130,7 +134,7 @@ export async function processL2BlockProposedLogs(
   return retrievedBlocks;
 }
 
-export async function getL1BlockTime(publicClient: PublicClient, blockNumber: bigint): Promise<bigint> {
+export async function getL1BlockTime(publicClient: ViemPublicClient, blockNumber: bigint): Promise<bigint> {
   const block = await publicClient.getBlock({ blockNumber, includeTransactions: false });
   return block.timestamp;
 }
@@ -196,7 +200,7 @@ function extractRollupProposeCalldata(forwarderData: Hex, rollupAddress: Hex): H
  * @returns L2 block from the calldata, deserialized
  */
 async function getBlockFromRollupTx(
-  publicClient: PublicClient,
+  publicClient: ViemPublicClient,
   blobSinkClient: BlobSinkClientInterface,
   txHash: `0x${string}`,
   blobHashes: Buffer[], // WORKTODO(md): buffer32?
@@ -216,8 +220,7 @@ async function getBlockFromRollupTx(
     throw new Error(`Unexpected rollup method called ${rollupFunctionName}`);
   }
 
-  // TODO(#9101): 'bodyHex' will be removed from below
-  const [decodedArgs, , bodyHex, blobInputs] = rollupArgs! as readonly [
+  const [decodedArgs, , blobInputs] = rollupArgs! as readonly [
     {
       header: Hex;
       archive: Hex;
@@ -229,7 +232,6 @@ async function getBlockFromRollupTx(
     },
     ViemSignature[],
     Hex,
-    Hex,
   ];
 
   const header = BlockHeader.fromBuffer(Buffer.from(hexToBytes(decodedArgs.header)));
@@ -238,8 +240,6 @@ async function getBlockFromRollupTx(
     throw new NoBlobBodiesFoundError(Number(l2BlockNum));
   }
 
-  // TODO(#9101): Once calldata is removed, we can remove this field encoding and update
-  // Body.fromBlobFields to accept blob buffers directly
   let blockFields: Fr[];
   try {
     blockFields = Blob.toEncodedFields(blobBodies);
@@ -252,22 +252,10 @@ async function getBlockFromRollupTx(
     throw err;
   }
 
-  // TODO(#9101): Retreiving the block body from calldata is a temporary soln before we have
-  // either a beacon chain client or link to some blob store. Web2 is ok because we will
-  // verify the block body vs the blob as below.
-  const blockBody = Body.fromBuffer(Buffer.from(hexToBytes(bodyHex)));
-
-  // TODO(#9101): The below reconstruction is currently redundant, but once we extract blobs will be the way to construct blocks.
-  // The blob source will give us blockFields, and we must construct the body from them:
-  // TODO(#8954): When logs are refactored into fields, we won't need to inject them here.
-  const reconstructedBlock = Body.fromBlobFields(blockFields, blockBody.contractClassLogs);
-
-  if (!reconstructedBlock.toBuffer().equals(blockBody.toBuffer())) {
-    // TODO(#9101): Remove below check (without calldata there will be nothing to check against)
-    throw new Error(`Block reconstructed from blob fields does not match`);
-  }
+  // The blob source gives us blockFields, and we must construct the body from them:
+  const blockBody = Body.fromBlobFields(blockFields);
 
-  // TODO(#9101): Once we stop publishing calldata, we will still need the blobCheck below to ensure that the block we are building does correspond to the blob fields
+  // TODO: Will this ever throw now that we do not get blocks from calldata at all?
   const blobCheck = await Blob.getBlobs(blockFields);
   if (Blob.getEthBlobEvaluationInputs(blobCheck) !== blobInputs) {
     // NB: We can just check the blobhash here, which is the first 32 bytes of blobInputs
@@ -305,7 +293,7 @@ async function getBlockFromRollupTx(
  * @returns An array of InboxLeaf and next eth block to search from.
  */
 export async function retrieveL1ToL2Messages(
-  inbox: GetContractReturnType<typeof InboxAbi, PublicClient<HttpTransport, Chain>>,
+  inbox: GetContractReturnType<typeof InboxAbi, ViemPublicClient>,
   searchStartBlock: bigint,
   searchEndBlock: bigint,
 ): Promise<DataRetrieval<InboxLeaf>> {
@@ -342,7 +330,7 @@ export async function retrieveL1ToL2Messages(
 
 /** Retrieves L2ProofVerified events from the rollup contract. */
 export async function retrieveL2ProofVerifiedEvents(
-  publicClient: PublicClient,
+  publicClient: ViemPublicClient,
   rollupAddress: EthAddress,
   searchStartBlock: bigint,
   searchEndBlock?: bigint,
@@ -365,7 +353,7 @@ export async function retrieveL2ProofVerifiedEvents(
 
 /** Retrieve submitted proofs from the rollup contract */
 export async function retrieveL2ProofsFromRollup(
-  publicClient: PublicClient,
+  publicClient: ViemPublicClient,
   rollupAddress: EthAddress,
   searchStartBlock: bigint,
   searchEndBlock?: bigint,
@@ -401,7 +389,7 @@ export type SubmitBlockProof = {
  * @returns L2 block metadata (header and archive) from the calldata, deserialized
  */
 export async function getProofFromSubmitProofTx(
-  publicClient: PublicClient,
+  publicClient: ViemPublicClient,
   txHash: `0x${string}`,
   expectedProverId: Fr,
 ): Promise<SubmitBlockProof> {
@@ -418,7 +406,7 @@ export async function getProofFromSubmitProofTx(
       {
         start: bigint;
         end: bigint;
-        args: readonly [Hex, Hex, Hex, Hex, Hex, Hex, Hex];
+        args: EpochProofPublicInputArgs;
         fees: readonly Hex[];
         aggregationObject: Hex;
         proof: Hex;
@@ -426,8 +414,8 @@ export async function getProofFromSubmitProofTx(
     ];
 
     aggregationObject = Buffer.from(hexToBytes(decodedArgs.aggregationObject));
-    proverId = Fr.fromHexString(decodedArgs.args[6]);
-    archiveRoot = Fr.fromHexString(decodedArgs.args[1]);
+    proverId = Fr.fromHexString(decodedArgs.args.proverId);
+    archiveRoot = Fr.fromHexString(decodedArgs.args.endArchive);
     proof = Proof.fromBuffer(Buffer.from(hexToBytes(decodedArgs.proof)));
   } else {
     throw new Error(`Unexpected proof method called ${functionName}`);

package/src/archiver/index.ts

@@ -2,6 +2,6 @@ export * from './archiver.js';
 export * from './config.js';
 export { type L1Published, type L1PublishedData } from './structs/published.js';
 export { MemoryArchiverStore } from './memory_archiver_store/memory_archiver_store.js';
-export { ArchiverDataStore } from './archiver_store.js';
+export type { ArchiverDataStore } from './archiver_store.js';
 export { KVArchiverDataStore } from './kv_archiver_store/kv_archiver_store.js';
 export { ContractInstanceStore } from './kv_archiver_store/contract_instance_store.js';

package/src/archiver/instrumentation.ts

@@ -1,5 +1,5 @@
-import { type L2Block } from '@aztec/circuit-types';
 import { createLogger } from '@aztec/foundation/log';
+import type { L2Block } from '@aztec/stdlib/block';
 import {
   Attributes,
   type Gauge,
@@ -20,6 +20,7 @@ export class ArchiverInstrumentation {
   private txCount: UpDownCounter;
   private syncDuration: Histogram;
   private l1BlocksSynced: UpDownCounter;
+  private l1BlockHeight: Gauge;
   private proofsSubmittedDelay: Histogram;
   private proofsSubmittedCount: UpDownCounter;
   private dbMetrics: LmdbMetrics;
@@ -62,6 +63,11 @@ export class ArchiverInstrumentation {
       valueType: ValueType.INT,
     });
 
+    this.l1BlockHeight = meter.createGauge(Metrics.ARCHIVER_L1_BLOCK_HEIGHT, {
+      description: 'The height of the latest L1 block processed by the archiver',
+      valueType: ValueType.INT,
+    });
+
     this.dbMetrics = new LmdbMetrics(
       meter,
       {
@@ -119,4 +125,8 @@ export class ArchiverInstrumentation {
       });
     }
   }
+
+  public updateL1BlockHeight(blockNumber: bigint) {
+    this.l1BlockHeight.record(Number(blockNumber));
+  }
 }

package/src/archiver/kv_archiver_store/block_store.ts

@@ -1,10 +1,15 @@
-import { Body, type InBlock, L2Block, L2BlockHash, type TxEffect, type TxHash, TxReceipt } from '@aztec/circuit-types';
-import { AppendOnlyTreeSnapshot, type AztecAddress, BlockHeader, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
+import { INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton, Range } from '@aztec/kv-store';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { Body, type InBlock, L2Block, L2BlockHash } from '@aztec/stdlib/block';
+import { AppendOnlyTreeSnapshot } from '@aztec/stdlib/trees';
+import { BlockHeader, TxEffect, TxHash, TxReceipt } from '@aztec/stdlib/tx';
 
-import { type L1Published, type L1PublishedData } from '../structs/published.js';
+import type { L1Published, L1PublishedData } from '../structs/published.js';
+
+export { type TxEffect, type TxHash, TxReceipt } from '@aztec/stdlib/tx';
 
 type BlockIndexValue = [blockNumber: number, index: number];
 
@@ -101,7 +106,8 @@ export class BlockStore {
         const block = await this.getBlock(blockNumber);
 
         if (block === undefined) {
-          throw new Error(`Cannot remove block ${blockNumber} from the store, we don't have it`);
+          this.#log.warn(`Cannot remove block ${blockNumber} from the store since we don't have it`);
+          continue;
         }
         await this.#blocks.delete(block.data.number);
         await Promise.all(block.data.body.txEffects.map(tx => this.#txIndex.delete(tx.txHash.toString())));

package/src/archiver/kv_archiver_store/contract_class_store.ts

@@ -1,15 +1,15 @@
-import {
-  type ContractClassPublic,
-  type ContractClassPublicWithBlockNumber,
-  type ExecutablePrivateFunctionWithMembershipProof,
-  Fr,
-  FunctionSelector,
-  type UnconstrainedFunctionWithMembershipProof,
-  Vector,
-} from '@aztec/circuits.js';
+import { Fr } from '@aztec/foundation/fields';
 import { toArray } from '@aztec/foundation/iterable';
 import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
+import { FunctionSelector } from '@aztec/stdlib/abi';
+import type {
+  ContractClassPublic,
+  ContractClassPublicWithBlockNumber,
+  ExecutablePrivateFunctionWithMembershipProof,
+  UnconstrainedFunctionWithMembershipProof,
+} from '@aztec/stdlib/contract';
+import { Vector } from '@aztec/stdlib/types';
 
 /**
  * LMDB implementation of the ArchiverDataStore interface.

package/src/archiver/kv_archiver_store/contract_instance_store.ts

@@ -1,14 +1,25 @@
-import { type AztecAddress, type ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/circuits.js';
+import type { Fr } from '@aztec/foundation/fields';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import {
+  type ContractInstanceUpdateWithAddress,
+  type ContractInstanceWithAddress,
+  SerializableContractInstance,
+  SerializableContractInstanceUpdate,
+} from '@aztec/stdlib/contract';
+
+type ContractInstanceUpdateKey = [string, number] | [string, number, number];
 
 /**
  * LMDB implementation of the ArchiverDataStore interface.
  */
 export class ContractInstanceStore {
   #contractInstances: AztecAsyncMap<string, Buffer>;
+  #contractInstanceUpdates: AztecAsyncMap<ContractInstanceUpdateKey, Buffer>;
 
   constructor(db: AztecAsyncKVStore) {
     this.#contractInstances = db.openMap('archiver_contract_instances');
+    this.#contractInstanceUpdates = db.openMap('archiver_contract_instance_updates');
   }
 
   addContractInstance(contractInstance: ContractInstanceWithAddress): Promise<void> {
@@ -22,8 +33,75 @@ export class ContractInstanceStore {
     return this.#contractInstances.delete(contractInstance.address.toString());
   }
 
-  async getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
+  getUpdateKey(contractAddress: AztecAddress, blockNumber: number, logIndex?: number): ContractInstanceUpdateKey {
+    if (logIndex === undefined) {
+      return [contractAddress.toString(), blockNumber];
+    } else {
+      return [contractAddress.toString(), blockNumber, logIndex];
+    }
+  }
+
+  addContractInstanceUpdate(
+    contractInstanceUpdate: ContractInstanceUpdateWithAddress,
+    blockNumber: number,
+    logIndex: number,
+  ): Promise<void> {
+    return this.#contractInstanceUpdates.set(
+      this.getUpdateKey(contractInstanceUpdate.address, blockNumber, logIndex),
+      new SerializableContractInstanceUpdate(contractInstanceUpdate).toBuffer(),
+    );
+  }
+
+  deleteContractInstanceUpdate(
+    contractInstanceUpdate: ContractInstanceUpdateWithAddress,
+    blockNumber: number,
+    logIndex: number,
+  ): Promise<void> {
+    return this.#contractInstanceUpdates.delete(
+      this.getUpdateKey(contractInstanceUpdate.address, blockNumber, logIndex),
+    );
+  }
+
+  async getCurrentContractInstanceClassId(
+    address: AztecAddress,
+    blockNumber: number,
+    originalClassId: Fr,
+  ): Promise<Fr> {
+    // We need to find the last update before the given block number
+    const queryResult = await this.#contractInstanceUpdates
+      .valuesAsync({
+        reverse: true,
+        end: this.getUpdateKey(address, blockNumber + 1), // No update can match this key since it doesn't have a log index. We want the highest key <= blockNumber
+        limit: 1,
+      })
+      .next();
+    if (queryResult.done) {
+      return originalClassId;
+    }
+
+    const serializedUpdate = queryResult.value;
+    const update = SerializableContractInstanceUpdate.fromBuffer(serializedUpdate);
+    if (blockNumber < update.blockOfChange) {
+      return update.prevContractClassId.isZero() ? originalClassId : update.prevContractClassId;
+    }
+    return update.newContractClassId;
+  }
+
+  async getContractInstance(
+    address: AztecAddress,
+    blockNumber: number,
+  ): Promise<ContractInstanceWithAddress | undefined> {
     const contractInstance = await this.#contractInstances.getAsync(address.toString());
-    return contractInstance && SerializableContractInstance.fromBuffer(contractInstance).withAddress(address);
+    if (!contractInstance) {
+      return undefined;
+    }
+
+    const instance = SerializableContractInstance.fromBuffer(contractInstance).withAddress(address);
+    instance.currentContractClassId = await this.getCurrentContractInstanceClassId(
+      address,
+      blockNumber,
+      instance.originalContractClassId,
+    );
+    return instance;
   }
 }

package/src/archiver/kv_archiver_store/kv_archiver_store.ts

@@ -1,32 +1,25 @@
-import {
-  type GetContractClassLogsResponse,
-  type GetPublicLogsResponse,
-  type InBlock,
-  type InboxLeaf,
-  type L2Block,
-  type LogFilter,
-  type TxHash,
-  type TxReceipt,
-  type TxScopedL2Log,
-} from '@aztec/circuit-types';
-import {
-  type BlockHeader,
-  type ContractClassPublic,
-  type ContractInstanceWithAddress,
-  type ExecutablePrivateFunctionWithMembershipProof,
-  type Fr,
-  type PrivateLog,
-  type UnconstrainedFunctionWithMembershipProof,
-} from '@aztec/circuits.js';
-import { FunctionSelector } from '@aztec/foundation/abi';
-import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import type { Fr } from '@aztec/foundation/fields';
 import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
-import { type AztecAsyncKVStore, type StoreSize } from '@aztec/kv-store';
-
-import { type ArchiverDataStore, type ArchiverL1SynchPoint } from '../archiver_store.js';
-import { type DataRetrieval } from '../structs/data_retrieval.js';
-import { type L1Published } from '../structs/published.js';
+import type { AztecAsyncKVStore, StoreSize } from '@aztec/kv-store';
+import { FunctionSelector } from '@aztec/stdlib/abi';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+import type { InBlock, L2Block } from '@aztec/stdlib/block';
+import type {
+  ContractClassPublic,
+  ContractInstanceUpdateWithAddress,
+  ContractInstanceWithAddress,
+  ExecutablePrivateFunctionWithMembershipProof,
+  UnconstrainedFunctionWithMembershipProof,
+} from '@aztec/stdlib/contract';
+import type { GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client';
+import { type LogFilter, PrivateLog, type TxScopedL2Log } from '@aztec/stdlib/logs';
+import type { InboxLeaf } from '@aztec/stdlib/messaging';
+import type { BlockHeader, TxHash, TxReceipt } from '@aztec/stdlib/tx';
+
+import type { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js';
+import type { DataRetrieval } from '../structs/data_retrieval.js';
+import type { L1Published } from '../structs/published.js';
 import { BlockStore } from './block_store.js';
 import { ContractClassStore } from './contract_class_store.js';
 import { ContractInstanceStore } from './contract_instance_store.js';
@@ -83,8 +76,8 @@ export class KVArchiverDataStore implements ArchiverDataStore {
     return this.#contractClassStore.getContractClassIds();
   }
 
-  getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
-    const contract = this.#contractInstanceStore.getContractInstance(address);
+  async getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
+    const contract = this.#contractInstanceStore.getContractInstance(address, await this.getSynchedL2BlockNumber());
     return contract;
   }
 
@@ -126,6 +119,28 @@ export class KVArchiverDataStore implements ArchiverDataStore {
     return (await Promise.all(data.map(c => this.#contractInstanceStore.deleteContractInstance(c)))).every(Boolean);
   }
 
+  async addContractInstanceUpdates(data: ContractInstanceUpdateWithAddress[], blockNumber: number): Promise<boolean> {
+    return (
+      await Promise.all(
+        data.map((update, logIndex) =>
+          this.#contractInstanceStore.addContractInstanceUpdate(update, blockNumber, logIndex),
+        ),
+      )
+    ).every(Boolean);
+  }
+  async deleteContractInstanceUpdates(
+    data: ContractInstanceUpdateWithAddress[],
+    blockNumber: number,
+  ): Promise<boolean> {
+    return (
+      await Promise.all(
+        data.map((update, logIndex) =>
+          this.#contractInstanceStore.deleteContractInstanceUpdate(update, blockNumber, logIndex),
+        ),
+      )
+    ).every(Boolean);
+  }
+
   /**
    * Append new blocks to the store's list.
    * @param blocks - The L2 blocks to be added to the store and the last processed L1 block.

package/src/archiver/kv_archiver_store/log_store.ts

@@ -1,26 +1,22 @@
+import { INITIAL_L2_BLOCK_NUM, MAX_NOTE_HASHES_PER_TX, PUBLIC_LOG_DATA_SIZE_IN_FIELDS } from '@aztec/constants';
+import type { Fr } from '@aztec/foundation/fields';
+import { createLogger } from '@aztec/foundation/log';
+import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
+import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
+import type { L2Block } from '@aztec/stdlib/block';
+import type { GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client';
 import {
-  ContractClass2BlockL2Logs,
+  ContractClassLog,
+  ExtendedContractClassLog,
   ExtendedPublicLog,
-  ExtendedUnencryptedL2Log,
-  type GetContractClassLogsResponse,
-  type GetPublicLogsResponse,
-  type L2Block,
   type LogFilter,
   LogId,
+  PrivateLog,
+  PublicLog,
   TxScopedL2Log,
-  UnencryptedL2Log,
-} from '@aztec/circuit-types';
-import { type Fr, PrivateLog, PublicLog } from '@aztec/circuits.js';
-import {
-  INITIAL_L2_BLOCK_NUM,
-  MAX_NOTE_HASHES_PER_TX,
-  PUBLIC_LOG_DATA_SIZE_IN_FIELDS,
-} from '@aztec/circuits.js/constants';
-import { createLogger } from '@aztec/foundation/log';
-import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
-import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
+} from '@aztec/stdlib/logs';
 
-import { type BlockStore } from './block_store.js';
+import type { BlockStore } from './block_store.js';
 
 /**
  * A store for logs
@@ -173,8 +169,18 @@ export class LogStore {
           )
           .flat();
 
+        const contractClassLogsInBlock = block.body.txEffects
+          .map((txEffect, txIndex) =>
+            [
+              numToUInt32BE(txIndex),
+              numToUInt32BE(txEffect.contractClassLogs.length),
+              txEffect.contractClassLogs.map(log => log.toBuffer()),
+            ].flat(),
+          )
+          .flat();
+
         await this.#publicLogsByBlock.set(block.number, Buffer.concat(publicLogsInBlock));
-        await this.#contractClassLogsByBlock.set(block.number, block.body.contractClassLogs.toBuffer());
+        await this.#contractClassLogsByBlock.set(block.number, Buffer.concat(contractClassLogsInBlock));
       }
 
       return true;
@@ -345,13 +351,22 @@ export class LogStore {
     if (typeof blockNumber !== 'number' || typeof txIndex !== 'number') {
       return { logs: [], maxLogsHit: false };
     }
-    const contractClassLogsBuffer = await this.#contractClassLogsByBlock.getAsync(blockNumber);
-    const contractClassLogsInBlock = contractClassLogsBuffer
-      ? ContractClass2BlockL2Logs.fromBuffer(contractClassLogsBuffer)
-      : new ContractClass2BlockL2Logs([]);
-    const txLogs = contractClassLogsInBlock.txLogs[txIndex].unrollLogs();
+    const contractClassLogsBuffer = (await this.#contractClassLogsByBlock.getAsync(blockNumber)) ?? Buffer.alloc(0);
+    const contractClassLogsInBlock: [ContractClassLog[]] = [[]];
 
-    const logs: ExtendedUnencryptedL2Log[] = [];
+    const reader = new BufferReader(contractClassLogsBuffer);
+    while (reader.remainingBytes() > 0) {
+      const indexOfTx = reader.readNumber();
+      const numLogsInTx = reader.readNumber();
+      contractClassLogsInBlock[indexOfTx] = [];
+      for (let i = 0; i < numLogsInTx; i++) {
+        contractClassLogsInBlock[indexOfTx].push(reader.readObject(ContractClassLog));
+      }
+    }
+
+    const txLogs = contractClassLogsInBlock[txIndex];
+
+    const logs: ExtendedContractClassLog[] = [];
     const maxLogsHit = this.#accumulateLogs(logs, blockNumber, txIndex, txLogs, filter);
 
     return { logs, maxLogsHit };
@@ -369,16 +384,25 @@ export class LogStore {
       };
     }
 
-    const logs: ExtendedUnencryptedL2Log[] = [];
+    const logs: ExtendedContractClassLog[] = [];
 
     let maxLogsHit = false;
     loopOverBlocks: for await (const [blockNumber, logBuffer] of this.#contractClassLogsByBlock.entriesAsync({
       start,
       end,
     })) {
-      const contractClassLogsInBlock = ContractClass2BlockL2Logs.fromBuffer(logBuffer);
-      for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < contractClassLogsInBlock.txLogs.length; txIndex++) {
-        const txLogs = contractClassLogsInBlock.txLogs[txIndex].unrollLogs();
+      const contractClassLogsInBlock: [ContractClassLog[]] = [[]];
+      const reader = new BufferReader(logBuffer);
+      while (reader.remainingBytes() > 0) {
+        const indexOfTx = reader.readNumber();
+        const numLogsInTx = reader.readNumber();
+        contractClassLogsInBlock[indexOfTx] = [];
+        for (let i = 0; i < numLogsInTx; i++) {
+          contractClassLogsInBlock[indexOfTx].push(reader.readObject(ContractClassLog));
+        }
+      }
+      for (let txIndex = filter.afterLog?.txIndex ?? 0; txIndex < contractClassLogsInBlock.length; txIndex++) {
+        const txLogs = contractClassLogsInBlock[txIndex];
         maxLogsHit = this.#accumulateLogs(logs, blockNumber, txIndex, txLogs, filter);
         if (maxLogsHit) {
           this.#log.debug(`Max logs hit at block ${blockNumber}`);
@@ -391,10 +415,10 @@ export class LogStore {
   }
 
   #accumulateLogs(
-    results: (ExtendedUnencryptedL2Log | ExtendedPublicLog)[],
+    results: (ExtendedContractClassLog | ExtendedPublicLog)[],
     blockNumber: number,
     txIndex: number,
-    txLogs: (UnencryptedL2Log | PublicLog)[],
+    txLogs: (ContractClassLog | PublicLog)[],
     filter: LogFilter,
   ): boolean {
     let maxLogsHit = false;
@@ -402,8 +426,8 @@ export class LogStore {
     for (; logIndex < txLogs.length; logIndex++) {
       const log = txLogs[logIndex];
       if (!filter.contractAddress || log.contractAddress.equals(filter.contractAddress)) {
-        if (log instanceof UnencryptedL2Log) {
-          results.push(new ExtendedUnencryptedL2Log(new LogId(blockNumber, txIndex, logIndex), log));
+        if (log instanceof ContractClassLog) {
+          results.push(new ExtendedContractClassLog(new LogId(blockNumber, txIndex, logIndex), log));
         } else {
           results.push(new ExtendedPublicLog(new LogId(blockNumber, txIndex, logIndex), log));
         }

package/src/archiver/kv_archiver_store/message_store.ts

@@ -1,9 +1,10 @@
-import { InboxLeaf } from '@aztec/circuit-types';
-import { Fr, L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/circuits.js';
+import { L1_TO_L2_MSG_SUBTREE_HEIGHT } from '@aztec/constants';
+import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton } from '@aztec/kv-store';
+import { InboxLeaf } from '@aztec/stdlib/messaging';
 
-import { type DataRetrieval } from '../structs/data_retrieval.js';
+import type { DataRetrieval } from '../structs/data_retrieval.js';
 
 /**
  * LMDB implementation of the ArchiverDataStore interface.

package/src/archiver/kv_archiver_store/nullifier_store.ts

@@ -1,7 +1,8 @@
-import { type InBlock, type L2Block } from '@aztec/circuit-types';
-import { type Fr, MAX_NULLIFIERS_PER_TX } from '@aztec/circuits.js';
+import { MAX_NULLIFIERS_PER_TX } from '@aztec/constants';
+import type { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
+import type { InBlock, L2Block } from '@aztec/stdlib/block';
 
 export class NullifierStore {
   #nullifiersToBlockNumber: AztecAsyncMap<string, number>;