@aztec/archiver 0.40.1 → 0.42.0

package/src/archiver/kv_archiver_store/log_store.ts

@@ -1,5 +1,6 @@
 import {
   EncryptedL2BlockL2Logs,
+  EncryptedNoteL2BlockL2Logs,
   ExtendedUnencryptedL2Log,
   type FromLogType,
   type GetUnencryptedLogsResponse,
@@ -20,12 +21,14 @@ import { type BlockStore } from './block_store.js';
  * A store for logs
  */
 export class LogStore {
+  #noteEncryptedLogs: AztecMap<number, Buffer>;
   #encryptedLogs: AztecMap<number, Buffer>;
   #unencryptedLogs: AztecMap<number, Buffer>;
   #logsMaxPageSize: number;
   #log = createDebugLogger('aztec:archiver:log_store');
 
   constructor(private db: AztecKVStore, private blockStore: BlockStore, logsMaxPageSize: number = 1000) {
+    this.#noteEncryptedLogs = db.openMap('archiver_note_encrypted_logs');
     this.#encryptedLogs = db.openMap('archiver_encrypted_logs');
     this.#unencryptedLogs = db.openMap('archiver_unencrypted_logs');
 
@@ -40,11 +43,16 @@ export class LogStore {
    * @returns True if the operation is successful.
    */
   addLogs(
+    noteEncryptedLogs: EncryptedNoteL2BlockL2Logs | undefined,
     encryptedLogs: EncryptedL2BlockL2Logs | undefined,
     unencryptedLogs: UnencryptedL2BlockL2Logs | undefined,
     blockNumber: number,
   ): Promise<boolean> {
     return this.db.transaction(() => {
+      if (noteEncryptedLogs) {
+        void this.#noteEncryptedLogs.set(blockNumber, noteEncryptedLogs.toBuffer());
+      }
+
       if (encryptedLogs) {
         void this.#encryptedLogs.set(blockNumber, encryptedLogs.toBuffer());
       }
@@ -69,8 +77,29 @@ export class LogStore {
     limit: number,
     logType: TLogType,
   ): IterableIterator<L2BlockL2Logs<FromLogType<TLogType>>> {
-    const logMap = logType === LogType.ENCRYPTED ? this.#encryptedLogs : this.#unencryptedLogs;
-    const L2BlockL2Logs = logType === LogType.ENCRYPTED ? EncryptedL2BlockL2Logs : UnencryptedL2BlockL2Logs;
+    const logMap = (() => {
+      switch (logType) {
+        case LogType.ENCRYPTED:
+          return this.#encryptedLogs;
+        case LogType.NOTEENCRYPTED:
+          return this.#noteEncryptedLogs;
+        case LogType.UNENCRYPTED:
+        default:
+          return this.#unencryptedLogs;
+      }
+    })();
+    const logTypeMap = (() => {
+      switch (logType) {
+        case LogType.ENCRYPTED:
+          return EncryptedL2BlockL2Logs;
+        case LogType.NOTEENCRYPTED:
+          return EncryptedNoteL2BlockL2Logs;
+        case LogType.UNENCRYPTED:
+        default:
+          return UnencryptedL2BlockL2Logs;
+      }
+    })();
+    const L2BlockL2Logs = logTypeMap;
     for (const buffer of logMap.values({ start, limit })) {
       yield L2BlockL2Logs.fromBuffer(buffer) as L2BlockL2Logs<FromLogType<TLogType>>;
     }
@@ -173,9 +202,29 @@ export class LogStore {
     blockNumber: number,
     logType: TLogType,
   ): L2BlockL2Logs<FromLogType<TLogType>> {
-    const logMap = logType === LogType.ENCRYPTED ? this.#encryptedLogs : this.#unencryptedLogs;
-    const L2BlockL2Logs: typeof EncryptedL2BlockL2Logs | typeof UnencryptedL2BlockL2Logs =
-      logType === LogType.ENCRYPTED ? EncryptedL2BlockL2Logs : UnencryptedL2BlockL2Logs;
+    const logMap = (() => {
+      switch (logType) {
+        case LogType.ENCRYPTED:
+          return this.#encryptedLogs;
+        case LogType.NOTEENCRYPTED:
+          return this.#noteEncryptedLogs;
+        case LogType.UNENCRYPTED:
+        default:
+          return this.#unencryptedLogs;
+      }
+    })();
+    const logTypeMap = (() => {
+      switch (logType) {
+        case LogType.ENCRYPTED:
+          return EncryptedL2BlockL2Logs;
+        case LogType.NOTEENCRYPTED:
+          return EncryptedNoteL2BlockL2Logs;
+        case LogType.UNENCRYPTED:
+        default:
+          return UnencryptedL2BlockL2Logs;
+      }
+    })();
+    const L2BlockL2Logs = logTypeMap;
     const buffer = logMap.get(blockNumber);
 
     if (!buffer) {

package/src/archiver/memory_archiver_store/memory_archiver_store.ts

@@ -1,6 +1,7 @@
 import {
   type Body,
   type EncryptedL2BlockL2Logs,
+  type EncryptedNoteL2BlockL2Logs,
   ExtendedUnencryptedL2Log,
   type FromLogType,
   type GetUnencryptedLogsResponse,
@@ -13,7 +14,6 @@ import {
   type TxEffect,
   type TxHash,
   TxReceipt,
-  TxStatus,
   type UnencryptedL2BlockL2Logs,
 } from '@aztec/circuit-types';
 import { Fr, INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js';
@@ -48,6 +48,12 @@ export class MemoryArchiverStore implements ArchiverDataStore {
    */
   private txEffects: TxEffect[] = [];
 
+  /**
+   * An array containing all the encrypted logs that have been fetched so far.
+   * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
+   */
+  private noteEncryptedLogsPerBlock: EncryptedNoteL2BlockL2Logs[] = [];
+
   /**
    * An array containing all the encrypted logs that have been fetched so far.
    * Note: Index in the "outer" array equals to (corresponding L2 block's number - INITIAL_L2_BLOCK_NUM).
@@ -185,10 +191,15 @@ export class MemoryArchiverStore implements ArchiverDataStore {
    * @returns True if the operation is successful.
    */
   addLogs(
+    noteEncryptedLogs: EncryptedNoteL2BlockL2Logs,
     encryptedLogs: EncryptedL2BlockL2Logs,
     unencryptedLogs: UnencryptedL2BlockL2Logs,
     blockNumber: number,
   ): Promise<boolean> {
+    if (noteEncryptedLogs) {
+      this.noteEncryptedLogsPerBlock[blockNumber - INITIAL_L2_BLOCK_NUM] = noteEncryptedLogs;
+    }
+
     if (encryptedLogs) {
       this.encryptedLogsPerBlock[blockNumber - INITIAL_L2_BLOCK_NUM] = encryptedLogs;
     }
@@ -271,7 +282,7 @@ export class MemoryArchiverStore implements ArchiverDataStore {
           return Promise.resolve(
             new TxReceipt(
               txHash,
-              TxStatus.MINED,
+              TxReceipt.statusFromRevertCode(txEffect.revertCode),
               '',
               txEffect.transactionFee.toBigInt(),
               block.hash().toBuffer(),
@@ -308,9 +319,18 @@ export class MemoryArchiverStore implements ArchiverDataStore {
     if (from < INITIAL_L2_BLOCK_NUM || limit < 1) {
       throw new Error(`Invalid limit: ${limit}`);
     }
-    const logs = (
-      logType === LogType.ENCRYPTED ? this.encryptedLogsPerBlock : this.unencryptedLogsPerBlock
-    ) as L2BlockL2Logs<FromLogType<TLogType>>[];
+    const logs = (() => {
+      switch (logType) {
+        case LogType.ENCRYPTED:
+          return this.encryptedLogsPerBlock;
+        case LogType.NOTEENCRYPTED:
+          return this.noteEncryptedLogsPerBlock;
+        case LogType.UNENCRYPTED:
+        default:
+          return this.unencryptedLogsPerBlock;
+      }
+    })() as L2BlockL2Logs<FromLogType<TLogType>>[];
+
     if (from > logs.length) {
       return Promise.resolve([]);
     }

package/src/rpc/archiver_client.ts

@@ -1,5 +1,5 @@
 import {
-  EncryptedL2BlockL2Logs,
+  EncryptedNoteL2BlockL2Logs,
   ExtendedUnencryptedL2Log,
   L2Block,
   NullifierMembershipWitness,
@@ -19,7 +19,7 @@ export const createArchiverClient = (url: string, fetch = makeFetch([1, 2, 3], t
       ExtendedUnencryptedL2Log,
       Fr,
       L2Block,
-      EncryptedL2BlockL2Logs,
+      EncryptedNoteL2BlockL2Logs,
       UnencryptedL2BlockL2Logs,
     },
     { TxReceipt, NullifierMembershipWitness },

package/src/rpc/archiver_server.ts

@@ -1,5 +1,5 @@
 import {
-  EncryptedL2BlockL2Logs,
+  EncryptedNoteL2BlockL2Logs,
   ExtendedUnencryptedL2Log,
   L2Block,
   NullifierMembershipWitness,
@@ -25,7 +25,7 @@ export function createArchiverRpcServer(archiverService: Archiver): JsonRpcServe
       ExtendedUnencryptedL2Log,
       Fr,
       L2Block,
-      EncryptedL2BlockL2Logs,
+      EncryptedNoteL2BlockL2Logs,
       UnencryptedL2BlockL2Logs,
       TxEffect,
     },