@aztec/archiver 0.71.0 → 0.73.0

package/src/archiver/kv_archiver_store/kv_archiver_store.ts

@@ -1,5 +1,6 @@
 import {
-  type GetUnencryptedLogsResponse,
+  type GetContractClassLogsResponse,
+  type GetPublicLogsResponse,
   type InBlock,
   type InboxLeaf,
   type L2Block,
@@ -19,8 +20,9 @@ import {
 } from '@aztec/circuits.js';
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
+import { toArray } from '@aztec/foundation/iterable';
 import { createLogger } from '@aztec/foundation/log';
-import { type AztecKVStore } from '@aztec/kv-store';
+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';
@@ -46,7 +48,7 @@ export class KVArchiverDataStore implements ArchiverDataStore {
 
   #log = createLogger('archiver:data-store');
 
-  constructor(private db: AztecKVStore, logsMaxPageSize: number = 1000) {
+  constructor(private db: AztecAsyncKVStore, logsMaxPageSize: number = 1000) {
     this.#blockStore = new BlockStore(db);
     this.#logStore = new LogStore(db, this.#blockStore, logsMaxPageSize);
     this.#messageStore = new MessageStore(db);
@@ -62,30 +64,28 @@ export class KVArchiverDataStore implements ArchiverDataStore {
     return Promise.resolve(this.functionNames.get(selector.toString()));
   }
 
-  registerContractFunctionSignatures(_address: AztecAddress, signatures: string[]): Promise<void> {
+  async registerContractFunctionSignatures(_address: AztecAddress, signatures: string[]): Promise<void> {
     for (const sig of signatures) {
       try {
-        const selector = FunctionSelector.fromSignature(sig);
+        const selector = await FunctionSelector.fromSignature(sig);
         this.functionNames.set(selector.toString(), sig.slice(0, sig.indexOf('(')));
       } catch {
         this.#log.warn(`Failed to parse signature: ${sig}. Ignoring`);
       }
     }
-
-    return Promise.resolve();
   }
 
   getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
-    return Promise.resolve(this.#contractClassStore.getContractClass(id));
+    return this.#contractClassStore.getContractClass(id);
   }
 
   getContractClassIds(): Promise<Fr[]> {
-    return Promise.resolve(this.#contractClassStore.getContractClassIds());
+    return this.#contractClassStore.getContractClassIds();
   }
 
   getContractInstance(address: AztecAddress): Promise<ContractInstanceWithAddress | undefined> {
     const contract = this.#contractInstanceStore.getContractInstance(address);
-    return Promise.resolve(contract);
+    return contract;
   }
 
   async addContractClasses(
@@ -107,7 +107,7 @@ export class KVArchiverDataStore implements ArchiverDataStore {
   }
 
   getBytecodeCommitment(contractClassId: Fr): Promise<Fr | undefined> {
-    return Promise.resolve(this.#contractClassStore.getBytecodeCommitment(contractClassId));
+    return this.#contractClassStore.getBytecodeCommitment(contractClassId);
   }
 
   addFunctions(
@@ -154,12 +154,7 @@ export class KVArchiverDataStore implements ArchiverDataStore {
    * @returns The requested L2 blocks
    */
   getBlocks(start: number, limit: number): Promise<L1Published<L2Block>[]> {
-    try {
-      return Promise.resolve(Array.from(this.#blockStore.getBlocks(start, limit)));
-    } catch (err) {
-      // this function is sync so if any errors are thrown we need to make sure they're passed on as rejected Promises
-      return Promise.reject(err);
-    }
+    return toArray(this.#blockStore.getBlocks(start, limit));
   }
 
   /**
@@ -170,12 +165,7 @@ export class KVArchiverDataStore implements ArchiverDataStore {
    * @returns The requested L2 blocks
    */
   getBlockHeaders(start: number, limit: number): Promise<BlockHeader[]> {
-    try {
-      return Promise.resolve(Array.from(this.#blockStore.getBlockHeaders(start, limit)));
-    } catch (err) {
-      // this function is sync so if any errors are thrown we need to make sure they're passed on as rejected Promises
-      return Promise.reject(err);
-    }
+    return toArray(this.#blockStore.getBlockHeaders(start, limit));
   }
 
   /**
@@ -184,7 +174,7 @@ export class KVArchiverDataStore implements ArchiverDataStore {
    * @returns The requested tx effect (or undefined if not found).
    */
   getTxEffect(txHash: TxHash) {
-    return Promise.resolve(this.#blockStore.getTxEffect(txHash));
+    return this.#blockStore.getTxEffect(txHash);
   }
 
   /**
@@ -193,7 +183,7 @@ export class KVArchiverDataStore implements ArchiverDataStore {
    * @returns The requested tx receipt (or undefined if not found).
    */
   getSettledTxReceipt(txHash: TxHash): Promise<TxReceipt | undefined> {
-    return Promise.resolve(this.#blockStore.getSettledTxReceipt(txHash));
+    return this.#blockStore.getSettledTxReceipt(txHash);
   }
 
   /**
@@ -227,7 +217,7 @@ export class KVArchiverDataStore implements ArchiverDataStore {
   }
 
   getTotalL1ToL2MessageCount(): Promise<bigint> {
-    return Promise.resolve(this.#messageStore.getTotalL1ToL2MessageCount());
+    return this.#messageStore.getTotalL1ToL2MessageCount();
   }
 
   /**
@@ -236,7 +226,7 @@ export class KVArchiverDataStore implements ArchiverDataStore {
    * @returns True if the operation is successful.
    */
   addL1ToL2Messages(messages: DataRetrieval<InboxLeaf>): Promise<boolean> {
-    return Promise.resolve(this.#messageStore.addL1ToL2Messages(messages));
+    return this.#messageStore.addL1ToL2Messages(messages);
   }
 
   /**
@@ -245,7 +235,7 @@ export class KVArchiverDataStore implements ArchiverDataStore {
    * @returns The index of the L1 to L2 message in the L1 to L2 message tree (undefined if not found).
    */
   getL1ToL2MessageIndex(l1ToL2Message: Fr): Promise<bigint | undefined> {
-    return Promise.resolve(this.#messageStore.getL1ToL2MessageIndex(l1ToL2Message));
+    return this.#messageStore.getL1ToL2MessageIndex(l1ToL2Message);
   }
 
   /**
@@ -254,11 +244,7 @@ export class KVArchiverDataStore implements ArchiverDataStore {
    * @returns The L1 to L2 messages/leaves of the messages subtree (throws if not found).
    */
   getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]> {
-    try {
-      return Promise.resolve(this.#messageStore.getL1ToL2Messages(blockNumber));
-    } catch (err) {
-      return Promise.reject(err);
-    }
+    return this.#messageStore.getL1ToL2Messages(blockNumber);
   }
 
   /**
@@ -268,11 +254,7 @@ export class KVArchiverDataStore implements ArchiverDataStore {
    * @returns An array of private logs from the specified range of blocks.
    */
   getPrivateLogs(from: number, limit: number): Promise<PrivateLog[]> {
-    try {
-      return Promise.resolve(Array.from(this.#logStore.getPrivateLogs(from, limit)));
-    } catch (err) {
-      return Promise.reject(err);
-    }
+    return this.#logStore.getPrivateLogs(from, limit);
   }
 
   /**
@@ -290,13 +272,13 @@ export class KVArchiverDataStore implements ArchiverDataStore {
   }
 
   /**
-   * Gets unencrypted logs based on the provided filter.
+   * Gets public logs based on the provided filter.
    * @param filter - The filter to apply to the logs.
    * @returns The requested logs.
    */
-  getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
+  getPublicLogs(filter: LogFilter): Promise<GetPublicLogsResponse> {
     try {
-      return Promise.resolve(this.#logStore.getUnencryptedLogs(filter));
+      return this.#logStore.getPublicLogs(filter);
     } catch (err) {
       return Promise.reject(err);
     }
@@ -307,9 +289,9 @@ export class KVArchiverDataStore implements ArchiverDataStore {
    * @param filter - The filter to apply to the logs.
    * @returns The requested logs.
    */
-  getContractClassLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
+  getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse> {
     try {
-      return Promise.resolve(this.#logStore.getContractClassLogs(filter));
+      return this.#logStore.getContractClassLogs(filter);
     } catch (err) {
       return Promise.reject(err);
     }
@@ -320,48 +302,48 @@ export class KVArchiverDataStore implements ArchiverDataStore {
    * @returns The number of the latest L2 block processed.
    */
   getSynchedL2BlockNumber(): Promise<number> {
-    return Promise.resolve(this.#blockStore.getSynchedL2BlockNumber());
+    return this.#blockStore.getSynchedL2BlockNumber();
   }
 
   getProvenL2BlockNumber(): Promise<number> {
-    return Promise.resolve(this.#blockStore.getProvenL2BlockNumber());
+    return this.#blockStore.getProvenL2BlockNumber();
   }
 
   getProvenL2EpochNumber(): Promise<number | undefined> {
-    return Promise.resolve(this.#blockStore.getProvenL2EpochNumber());
+    return this.#blockStore.getProvenL2EpochNumber();
   }
 
-  setProvenL2BlockNumber(blockNumber: number) {
-    this.#blockStore.setProvenL2BlockNumber(blockNumber);
-    return Promise.resolve();
+  async setProvenL2BlockNumber(blockNumber: number) {
+    await this.#blockStore.setProvenL2BlockNumber(blockNumber);
   }
 
-  setProvenL2EpochNumber(epochNumber: number) {
-    this.#blockStore.setProvenL2EpochNumber(epochNumber);
-    return Promise.resolve();
+  async setProvenL2EpochNumber(epochNumber: number) {
+    await this.#blockStore.setProvenL2EpochNumber(epochNumber);
   }
 
-  setBlockSynchedL1BlockNumber(l1BlockNumber: bigint) {
-    this.#blockStore.setSynchedL1BlockNumber(l1BlockNumber);
-    return Promise.resolve();
+  async setBlockSynchedL1BlockNumber(l1BlockNumber: bigint) {
+    await this.#blockStore.setSynchedL1BlockNumber(l1BlockNumber);
   }
 
-  setMessageSynchedL1BlockNumber(l1BlockNumber: bigint) {
-    this.#messageStore.setSynchedL1BlockNumber(l1BlockNumber);
-    return Promise.resolve();
+  async setMessageSynchedL1BlockNumber(l1BlockNumber: bigint) {
+    await this.#messageStore.setSynchedL1BlockNumber(l1BlockNumber);
   }
 
   /**
    * Gets the last L1 block number processed by the archiver
    */
-  getSynchPoint(): Promise<ArchiverL1SynchPoint> {
-    return Promise.resolve({
-      blocksSynchedTo: this.#blockStore.getSynchedL1BlockNumber(),
-      messagesSynchedTo: this.#messageStore.getSynchedL1BlockNumber(),
-    });
-  }
-
-  public estimateSize(): { mappingSize: number; actualSize: number; numItems: number } {
+  async getSynchPoint(): Promise<ArchiverL1SynchPoint> {
+    const [blocksSynchedTo, messagesSynchedTo] = await Promise.all([
+      this.#blockStore.getSynchedL1BlockNumber(),
+      this.#messageStore.getSynchedL1BlockNumber(),
+    ]);
+    return {
+      blocksSynchedTo,
+      messagesSynchedTo,
+    };
+  }
+
+  public estimateSize(): Promise<StoreSize> {
     return this.db.estimateSize();
   }
 }