@aztec/archiver 0.32.0 → 0.33.0

package/src/archiver/eth_log_handlers.ts

@@ -1,11 +1,11 @@
 import { Body, InboxLeaf } from '@aztec/circuit-types';
 import { AppendOnlyTreeSnapshot, Header } from '@aztec/circuits.js';
-import { EthAddress } from '@aztec/foundation/eth-address';
+import { type EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { numToUInt32BE } from '@aztec/foundation/serialize';
 import { AvailabilityOracleAbi, InboxAbi, RollupAbi } from '@aztec/l1-artifacts';
 
-import { Hex, Log, PublicClient, decodeFunctionData, getAbiItem, getAddress, hexToBytes } from 'viem';
+import { type Hex, type Log, type PublicClient, decodeFunctionData, getAbiItem, getAddress, hexToBytes } from 'viem';
 
 /**
  * Processes newly received MessageSent (L1 to L2) logs.

package/src/archiver/kv_archiver_store/block_body_store.ts

@@ -1,5 +1,5 @@
 import { Body } from '@aztec/circuit-types';
-import { AztecKVStore, AztecMap } from '@aztec/kv-store';
+import { type AztecKVStore, type AztecMap } from '@aztec/kv-store';
 
 export class BlockBodyStore {
   /** Map block body hash to block body */

package/src/archiver/kv_archiver_store/block_store.ts

@@ -1,10 +1,10 @@
-import { L2Block, TxEffect, TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types';
-import { AppendOnlyTreeSnapshot, AztecAddress, Header, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
+import { L2Block, type TxEffect, type TxHash, TxReceipt, TxStatus } from '@aztec/circuit-types';
+import { AppendOnlyTreeSnapshot, type AztecAddress, Header, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AztecKVStore, AztecMap, AztecSingleton, Range } from '@aztec/kv-store';
+import { type AztecKVStore, type AztecMap, type AztecSingleton, type Range } from '@aztec/kv-store';
 
-import { DataRetrieval } from '../data_retrieval.js';
-import { BlockBodyStore } from './block_body_store.js';
+import { type DataRetrieval } from '../data_retrieval.js';
+import { type BlockBodyStore } from './block_body_store.js';
 
 type BlockIndexValue = [blockNumber: number, index: number];
 
@@ -54,7 +54,7 @@ export class BlockStore {
           archive: block.archive.toBuffer(),
         });
 
-        block.getTxs().forEach((tx, i) => {
+        block.body.txEffects.forEach((tx, i) => {
           void this.#txIndex.set(tx.txHash.toString(), [block.number, i]);
         });
       }
@@ -119,7 +119,7 @@ export class BlockStore {
     }
 
     const block = this.getBlock(blockNumber);
-    return block?.getTx(txIndex);
+    return block?.body.txEffects[txIndex];
   }
 
   /**
@@ -134,7 +134,7 @@ export class BlockStore {
     }
 
     const block = this.getBlock(blockNumber)!;
-    const tx = block.getTx(txIndex);
+    const tx = block.body.txEffects[txIndex];
 
     return new TxReceipt(
       txHash,

package/src/archiver/kv_archiver_store/contract_class_store.ts

@@ -1,10 +1,10 @@
 import { Fr, FunctionSelector, Vector } from '@aztec/circuits.js';
 import { BufferReader, numToUInt8, serializeToBuffer } from '@aztec/foundation/serialize';
-import { AztecKVStore, AztecMap } from '@aztec/kv-store';
+import { type AztecKVStore, type AztecMap } from '@aztec/kv-store';
 import {
-  ContractClassPublic,
-  ExecutablePrivateFunctionWithMembershipProof,
-  UnconstrainedFunctionWithMembershipProof,
+  type ContractClassPublic,
+  type ExecutablePrivateFunctionWithMembershipProof,
+  type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/types/contracts';
 
 /**
@@ -17,7 +17,7 @@ export class ContractClassStore {
     this.#contractClasses = db.openMap('archiver_contract_classes');
   }
 
-  addContractClass(contractClass: ContractClassPublic): Promise<boolean> {
+  addContractClass(contractClass: ContractClassPublic): Promise<void> {
     return this.#contractClasses.set(contractClass.id.toString(), serializeContractClassPublic(contractClass));
   }
 

package/src/archiver/kv_archiver_store/contract_instance_store.ts

@@ -1,6 +1,6 @@
-import { AztecAddress } from '@aztec/circuits.js';
-import { AztecKVStore, AztecMap } from '@aztec/kv-store';
-import { ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts';
+import { type AztecAddress } from '@aztec/circuits.js';
+import { type AztecKVStore, type AztecMap } from '@aztec/kv-store';
+import { type ContractInstanceWithAddress, SerializableContractInstance } from '@aztec/types/contracts';
 
 /**
  * LMDB implementation of the ArchiverDataStore interface.
@@ -12,7 +12,7 @@ export class ContractInstanceStore {
     this.#contractInstances = db.openMap('archiver_contract_instances');
   }
 
-  addContractInstance(contractInstance: ContractInstanceWithAddress): Promise<boolean> {
+  addContractInstance(contractInstance: ContractInstanceWithAddress): Promise<void> {
     return this.#contractInstances.set(
       contractInstance.address.toString(),
       new SerializableContractInstance(contractInstance).toBuffer(),

package/src/archiver/kv_archiver_store/kv_archiver_store.ts

@@ -1,31 +1,31 @@
 import {
-  Body,
-  EncryptedL2BlockL2Logs,
-  FromLogType,
-  GetUnencryptedLogsResponse,
-  InboxLeaf,
-  L2Block,
-  L2BlockL2Logs,
-  LogFilter,
-  LogType,
-  TxEffect,
-  TxHash,
-  TxReceipt,
-  UnencryptedL2BlockL2Logs,
+  type Body,
+  type EncryptedL2BlockL2Logs,
+  type FromLogType,
+  type GetUnencryptedLogsResponse,
+  type InboxLeaf,
+  type L2Block,
+  type L2BlockL2Logs,
+  type LogFilter,
+  type LogType,
+  type TxEffect,
+  type TxHash,
+  type TxReceipt,
+  type UnencryptedL2BlockL2Logs,
 } from '@aztec/circuit-types';
-import { Fr } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type Fr } from '@aztec/circuits.js';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AztecKVStore } from '@aztec/kv-store';
+import { type AztecKVStore } from '@aztec/kv-store';
 import {
-  ContractClassPublic,
-  ContractInstanceWithAddress,
-  ExecutablePrivateFunctionWithMembershipProof,
-  UnconstrainedFunctionWithMembershipProof,
+  type ContractClassPublic,
+  type ContractInstanceWithAddress,
+  type ExecutablePrivateFunctionWithMembershipProof,
+  type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/types/contracts';
 
-import { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js';
-import { DataRetrieval } from '../data_retrieval.js';
+import { type ArchiverDataStore, type ArchiverL1SynchPoint } from '../archiver_store.js';
+import { type DataRetrieval } from '../data_retrieval.js';
 import { BlockBodyStore } from './block_body_store.js';
 import { BlockStore } from './block_store.js';
 import { ContractClassStore } from './contract_class_store.js';

package/src/archiver/kv_archiver_store/log_store.ts

@@ -1,20 +1,20 @@
 import {
   EncryptedL2BlockL2Logs,
   ExtendedUnencryptedL2Log,
-  FromLogType,
-  GetUnencryptedLogsResponse,
-  L2BlockL2Logs,
-  LogFilter,
+  type FromLogType,
+  type GetUnencryptedLogsResponse,
+  type L2BlockL2Logs,
+  type LogFilter,
   LogId,
   LogType,
   UnencryptedL2BlockL2Logs,
-  UnencryptedL2Log,
+  type UnencryptedL2Log,
 } from '@aztec/circuit-types';
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AztecKVStore, AztecMap } from '@aztec/kv-store';
+import { type AztecKVStore, type AztecMap } from '@aztec/kv-store';
 
-import { BlockStore } from './block_store.js';
+import { type BlockStore } from './block_store.js';
 
 /**
  * A store for logs

package/src/archiver/kv_archiver_store/message_store.ts

@@ -1,4 +1,4 @@
-import { InboxLeaf } from '@aztec/circuit-types';
+import { type InboxLeaf } from '@aztec/circuit-types';
 import {
   Fr,
   INITIAL_L2_BLOCK_NUM,
@@ -6,9 +6,9 @@ import {
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
 } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
-import { AztecKVStore, AztecMap, AztecSingleton } from '@aztec/kv-store';
+import { type AztecKVStore, type AztecMap, type AztecSingleton } from '@aztec/kv-store';
 
-import { DataRetrieval } from '../data_retrieval.js';
+import { type DataRetrieval } from '../data_retrieval.js';
 
 /**
  * LMDB implementation of the ArchiverDataStore interface.

package/src/archiver/memory_archiver_store/l1_to_l2_message_store.ts

@@ -1,10 +1,10 @@
-import { InboxLeaf } from '@aztec/circuit-types';
+import { type InboxLeaf } from '@aztec/circuit-types';
 import {
   INITIAL_L2_BLOCK_NUM,
   L1_TO_L2_MSG_SUBTREE_HEIGHT,
   NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
 } from '@aztec/circuits.js/constants';
-import { Fr } from '@aztec/foundation/fields';
+import { type Fr } from '@aztec/foundation/fields';
 
 /**
  * A simple in-memory implementation of an L1 to L2 message store.

package/src/archiver/memory_archiver_store/memory_archiver_store.ts

@@ -1,33 +1,32 @@
 import {
-  Body,
-  EncryptedL2BlockL2Logs,
+  type Body,
+  type EncryptedL2BlockL2Logs,
   ExtendedUnencryptedL2Log,
-  FromLogType,
-  GetUnencryptedLogsResponse,
-  InboxLeaf,
-  L2Block,
-  L2BlockContext,
-  L2BlockL2Logs,
-  LogFilter,
+  type FromLogType,
+  type GetUnencryptedLogsResponse,
+  type InboxLeaf,
+  type L2Block,
+  type L2BlockL2Logs,
+  type LogFilter,
   LogId,
   LogType,
-  TxEffect,
-  TxHash,
+  type TxEffect,
+  type TxHash,
   TxReceipt,
   TxStatus,
-  UnencryptedL2BlockL2Logs,
+  type UnencryptedL2BlockL2Logs,
 } from '@aztec/circuit-types';
 import { Fr, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
-import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import {
-  ContractClassPublic,
-  ContractInstanceWithAddress,
-  ExecutablePrivateFunctionWithMembershipProof,
-  UnconstrainedFunctionWithMembershipProof,
+  type ContractClassPublic,
+  type ContractInstanceWithAddress,
+  type ExecutablePrivateFunctionWithMembershipProof,
+  type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/types/contracts';
 
-import { ArchiverDataStore, ArchiverL1SynchPoint } from '../archiver_store.js';
-import { DataRetrieval } from '../data_retrieval.js';
+import { type ArchiverDataStore, type ArchiverL1SynchPoint } from '../archiver_store.js';
+import { type DataRetrieval } from '../data_retrieval.js';
 import { L1ToL2MessageStore } from './l1_to_l2_message_store.js';
 
 /**
@@ -37,7 +36,7 @@ export class MemoryArchiverStore implements ArchiverDataStore {
   /**
    * An array containing all the L2 blocks that have been fetched so far.
    */
-  private l2BlockContexts: L2BlockContext[] = [];
+  private l2Blocks: L2Block[] = [];
 
   /**
    * A mapping of body hash to body
@@ -144,8 +143,8 @@ export class MemoryArchiverStore implements ArchiverDataStore {
    */
   public addBlocks(blocks: DataRetrieval<L2Block>): Promise<boolean> {
     this.lastL1BlockNewBlocks = blocks.lastProcessedL1BlockNumber;
-    this.l2BlockContexts.push(...blocks.retrievedData.map(block => new L2BlockContext(block)));
-    this.txEffects.push(...blocks.retrievedData.flatMap(b => b.getTxs()));
+    this.l2Blocks.push(...blocks.retrievedData);
+    this.txEffects.push(...blocks.retrievedData.flatMap(b => b.body.txEffects));
     return Promise.resolve(true);
   }
 
@@ -242,12 +241,12 @@ export class MemoryArchiverStore implements ArchiverDataStore {
     }
 
     const fromIndex = Math.max(from - INITIAL_L2_BLOCK_NUM, 0);
-    if (fromIndex >= this.l2BlockContexts.length) {
+    if (fromIndex >= this.l2Blocks.length) {
       return Promise.resolve([]);
     }
 
     const toIndex = fromIndex + limit;
-    return Promise.resolve(this.l2BlockContexts.slice(fromIndex, toIndex).map(blockContext => blockContext.block));
+    return Promise.resolve(this.l2Blocks.slice(fromIndex, toIndex));
   }
 
   /**
@@ -266,12 +265,11 @@ export class MemoryArchiverStore implements ArchiverDataStore {
    * @returns The requested tx receipt (or undefined if not found).
    */
   public getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined> {
-    for (const blockContext of this.l2BlockContexts) {
-      for (const currentTxHash of blockContext.getTxHashes()) {
+    for (const block of this.l2Blocks) {
+      const txHashes = block.body.txEffects.map(txEffect => txEffect.txHash);
+      for (const currentTxHash of txHashes) {
         if (currentTxHash.equals(txHash)) {
-          return Promise.resolve(
-            new TxReceipt(txHash, TxStatus.MINED, '', blockContext.block.hash().toBuffer(), blockContext.block.number),
-          );
+          return Promise.resolve(new TxReceipt(txHash, TxStatus.MINED, '', block.hash().toBuffer(), block.number));
         }
       }
     }
@@ -364,20 +362,18 @@ export class MemoryArchiverStore implements ArchiverDataStore {
     const logs: ExtendedUnencryptedL2Log[] = [];
 
     for (; fromBlockIndex < toBlockIndex; fromBlockIndex++) {
-      const blockContext = this.l2BlockContexts[fromBlockIndex];
+      const block = this.l2Blocks[fromBlockIndex];
       const blockLogs = this.unencryptedLogsPerBlock[fromBlockIndex];
       for (; txIndexInBlock < blockLogs.txLogs.length; txIndexInBlock++) {
         const txLogs = blockLogs.txLogs[txIndexInBlock].unrollLogs();
         for (; logIndexInTx < txLogs.length; logIndexInTx++) {
           const log = txLogs[logIndexInTx];
           if (
-            (!txHash || blockContext.getTxHash(txIndexInBlock).equals(txHash)) &&
+            (!txHash || block.body.txEffects[txIndexInBlock].txHash.equals(txHash)) &&
             (!contractAddress || log.contractAddress.equals(contractAddress)) &&
             (!selector || log.selector.equals(selector))
           ) {
-            logs.push(
-              new ExtendedUnencryptedL2Log(new LogId(blockContext.block.number, txIndexInBlock, logIndexInTx), log),
-            );
+            logs.push(new ExtendedUnencryptedL2Log(new LogId(block.number, txIndexInBlock, logIndexInTx), log));
             if (logs.length === this.maxLogs) {
               return Promise.resolve({
                 logs,
@@ -402,10 +398,10 @@ export class MemoryArchiverStore implements ArchiverDataStore {
    * @returns The number of the latest L2 block processed.
    */
   public getSynchedL2BlockNumber(): Promise<number> {
-    if (this.l2BlockContexts.length === 0) {
+    if (this.l2Blocks.length === 0) {
       return Promise.resolve(INITIAL_L2_BLOCK_NUM - 1);
     }
-    return Promise.resolve(this.l2BlockContexts[this.l2BlockContexts.length - 1].block.number);
+    return Promise.resolve(this.l2Blocks[this.l2Blocks.length - 1].number);
   }
 
   public getSynchPoint(): Promise<ArchiverL1SynchPoint> {

package/src/rpc/archiver_client.ts

@@ -9,7 +9,7 @@ import {
 import { EthAddress, Fr } from '@aztec/circuits.js';
 import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
 
-import { ArchiveSource } from '../archiver/archiver.js';
+import { type ArchiveSource } from '../archiver/archiver.js';
 
 export const createArchiverClient = (url: string, fetch = makeFetch([1, 2, 3], true)): ArchiveSource =>
   createJsonRpcClient<ArchiveSource>(

package/src/rpc/archiver_server.ts

@@ -10,7 +10,7 @@ import {
 import { EthAddress, Fr } from '@aztec/circuits.js';
 import { JsonRpcServer } from '@aztec/foundation/json-rpc/server';
 
-import { Archiver } from '../archiver/archiver.js';
+import { type Archiver } from '../archiver/archiver.js';
 
 /**
  * Wrap an Archiver instance with a JSON RPC HTTP server.