wip

Author: benesjan

yarn-project/archiver/src/archiver/archiver.ts

@@ -1415,10 +1415,8 @@ export class Archiver
   }
 
   /**
-   * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-   * @param tags - The tags to filter the logs by.
-   * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
-   * that tag.
+   * Gets all logs that match any of the `tags`. For each tag, an array of matching logs is returned. An empty array
+   * implies no logs match that tag.
    */
   getLogsByTags(tags: SiloedTag[]): Promise<TxScopedL2Log[][]> {
     return this.store.getLogsByTags(tags);

yarn-project/archiver/src/archiver/archiver_store.ts

@@ -206,11 +206,8 @@ export interface ArchiverDataStore {
   getTotalL1ToL2MessageCount(): Promise<bigint>;
 
   /**
-   * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-   * @param tags - The tags to filter the logs by.
-   * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
-   * that tag.
-   * @throws MaxLogsPerTagExceededError if any tag has more than MAX_LOGS_PER_TAG logs.
+   * Gets all logs that match any of the `tags`. For each tag, an array of matching logs is returned. An empty array
+   * implies no logs match that tag.
    */
   getLogsByTags(tags: SiloedTag[]): Promise<TxScopedL2Log[][]>;
 

yarn-project/archiver/src/archiver/archiver_store_test_suite.ts

@@ -30,7 +30,6 @@ import {
   SerializableContractInstance,
   computePublicBytecodeCommitment,
 } from '@aztec/stdlib/contract';
-import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/server';
 import { ContractClassLog, LogId, PrivateLog, PublicLog, SiloedTag } from '@aztec/stdlib/logs';
 import { InboxLeaf } from '@aztec/stdlib/messaging';
 import { CheckpointHeader } from '@aztec/stdlib/rollup';
@@ -53,7 +52,6 @@ import {
   CheckpointNumberNotSequentialError,
   InitialBlockNumberNotSequentialError,
   InitialCheckpointNumberNotSequentialError,
-  MaxLogsPerTagExceededError,
 } from './errors.js';
 import { MessageStoreError } from './kv_archiver_store/message_store.js';
 import type { InboxMessage } from './structs/inbox_message.js';
@@ -2386,68 +2384,6 @@ export function describeArchiverDataStore(
           ],
         ]);
       });
-
-      it('throws error when tag has more than MAX_LOGS_PER_TAG logs', async () => {
-        const tag = new SiloedTag(Fr.random());
-        const numLogsToCreate = MAX_LOGS_PER_TAG + 1;
-
-        // Create checkpoints with logs that all share the same tag
-        const newLogsCheckpoints: PublishedCheckpoint[] = [];
-        let previousArchive: AppendOnlyTreeSnapshot | undefined;
-        let logCount = 0;
-
-        // We need to create multiple blocks/checkpoints to get enough logs with the same tag
-        // Since each block has numTxsPerBlock (4) txs, and each tx has numPrivateLogsPerTx (3) logs,
-        // we need enough blocks to create MAX_LOGS_PER_TAG + 1 logs
-        const blocksNeeded = Math.ceil(numLogsToCreate / (numTxsPerBlock * numPrivateLogsPerTx)) + 1;
-        const startBlockNumber = numBlocksForLogs + 1;
-
-        for (
-          let blockNum = startBlockNumber;
-          blockNum < startBlockNumber + blocksNeeded && logCount < numLogsToCreate;
-          blockNum++
-        ) {
-          const block = await L2BlockNew.random(BlockNumber(blockNum), {
-            checkpointNumber: CheckpointNumber(blockNum),
-            indexWithinCheckpoint: 0,
-            state: makeStateForBlock(blockNum, numTxsPerBlock),
-            ...(previousArchive ? { lastArchive: previousArchive } : {}),
-          });
-          block.header.globalVariables.blockNumber = BlockNumber(blockNum);
-
-          block.body.txEffects = await timesParallel(numTxsPerBlock, async (txIndex: number) => {
-            const txEffect = await TxEffect.random();
-            const privateLogs: PrivateLog[] = [];
-
-            // Add logs with the same tag until we reach the target count
-            for (let logIndex = 0; logIndex < numPrivateLogsPerTx && logCount < numLogsToCreate; logIndex++) {
-              const log = makePrivateLog(tag);
-              privateLogs.push(log);
-              logCount++;
-            }
-
-            txEffect.privateLogs = privateLogs;
-            txEffect.publicLogs = mockPublicLogs(blockNum, txIndex);
-            return txEffect;
-          });
-
-          const checkpoint = new Checkpoint(
-            AppendOnlyTreeSnapshot.random(),
-            CheckpointHeader.random(),
-            [block],
-            CheckpointNumber(blockNum),
-          );
-          const publishedCheckpoint = makePublishedCheckpoint(checkpoint, blockNum);
-          newLogsCheckpoints.push(publishedCheckpoint);
-          previousArchive = block.archive;
-        }
-
-        await store.addCheckpoints(newLogsCheckpoints);
-        await store.addLogs(newLogsCheckpoints.flatMap(p => p.checkpoint.blocks));
-
-        // Now try to get logs by tag - should throw error
-        await expect(store.getLogsByTags([tag])).rejects.toThrow(MaxLogsPerTagExceededError);
-      });
     });
 
     describe('getPublicLogs', () => {

yarn-project/archiver/src/archiver/errors.ts

@@ -88,10 +88,3 @@ export class BlockNotFoundError extends Error {
     super(`Failed to find expected block number ${blockNumber}`);
   }
 }
-
-export class MaxLogsPerTagExceededError extends Error {
-  constructor(tag: string, count: number, limit: number) {
-    super(`Tag ${tag} has ${count} logs, which exceeds the maximum allowed (${limit})`);
-    this.name = 'MaxLogsPerTagExceededError';
-  }
-}

yarn-project/archiver/src/archiver/kv_archiver_store/kv_archiver_store.ts

@@ -319,11 +319,8 @@ export class KVArchiverDataStore implements ArchiverDataStore, ContractDataSourc
   }
 
   /**
-   * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-   * @param tags - The tags to filter the logs by.
-   * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
-   * that tag.
-   * @throws MaxLogsPerTagExceededError if any tag has more than MAX_LOGS_PER_TAG logs.
+   * Gets all logs that match any of the `tags`. For each tag, an array of matching logs is returned. An empty array
+   * implies no logs match that tag.
    */
   getLogsByTags(tags: SiloedTag[]): Promise<TxScopedL2Log[][]> {
     try {

yarn-project/archiver/src/archiver/kv_archiver_store/log_store.ts

@@ -6,7 +6,6 @@ import { BufferReader, numToUInt32BE } from '@aztec/foundation/serialize';
 import type { AztecAsyncKVStore, AztecAsyncMap } from '@aztec/kv-store';
 import { L2BlockHash, L2BlockNew } from '@aztec/stdlib/block';
 import type { GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client';
-import { MAX_LOGS_PER_TAG } from '@aztec/stdlib/interfaces/server';
 import {
   ContractClassLog,
   ExtendedContractClassLog,
@@ -18,7 +17,6 @@ import {
   TxScopedL2Log,
 } from '@aztec/stdlib/logs';
 
-import { MaxLogsPerTagExceededError } from '../errors.js';
 import type { BlockStore } from './block_store.js';
 
 /**
@@ -206,24 +204,12 @@ export class LogStore {
   }
 
   /**
-   * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-   * @param tags - The tags to filter the logs by.
-   * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
-   * that tag.
-   * @throws MaxLogsPerTagExceededError if any tag has more than MAX_LOGS_PER_TAG logs.
+   * Gets all logs that match any of the `tags`. For each tag, an array of matching logs is returned. An empty array
+   * implies no logs match that tag.
    */
   async getLogsByTags(tags: SiloedTag[]): Promise<TxScopedL2Log[][]> {
     const logs = await Promise.all(tags.map(tag => this.#logsByTag.getAsync(tag.toString())));
 
-    // Check each tag's log count against the limit
-    for (let i = 0; i < tags.length; i++) {
-      const tag = tags[i];
-      const logBuffers = logs[i];
-      if (logBuffers && logBuffers.length > MAX_LOGS_PER_TAG) {
-        throw new MaxLogsPerTagExceededError(tag.toString(), logBuffers.length, MAX_LOGS_PER_TAG);
-      }
-    }
-
     return logs.map(logBuffers => logBuffers?.map(logBuffer => TxScopedL2Log.fromBuffer(logBuffer)) ?? []);
   }
 

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -681,11 +681,8 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
   }
 
   /**
-   * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-   * @param tags - The tags to filter the logs by.
-   * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
-   * that tag.
-   * @throws MaxLogsPerTagExceededError if any tag has more than MAX_LOGS_PER_TAG logs.
+   * Gets all logs that match any of the `tags`. For each tag, an array of matching logs is returned. An empty array
+   * implies no logs match that tag.
    */
   public getLogsByTags(tags: SiloedTag[]): Promise<TxScopedL2Log[][]> {
     return this.logsSource.getLogsByTags(tags);

yarn-project/stdlib/src/interfaces/aztec-node.ts

@@ -338,12 +338,8 @@ export interface AztecNode
   getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse>;
 
   /**
-   * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-   * @param tags - The tags to filter the logs by.
-   * @returns For each received tag, an array of matching logs and metadata (e.g. tx hash) is returned. An empty
-   * array implies no logs match that tag. There can be multiple logs for 1 tag because tag reuse can happen
-   * --> e.g. when sending a note from multiple unsynched devices.
-   * @throws MaxLogsPerTagExceededError if any tag has more than MAX_LOGS_PER_TAG logs.
+   * Gets all logs that match any of the `tags`. For each tag, an array of matching logs is returned. An empty array
+   * implies no logs match that tag.
    */
   getLogsByTags(tags: SiloedTag[]): Promise<TxScopedL2Log[][]>;
 
@@ -481,7 +477,6 @@ export interface AztecNode
   getAllowedPublicSetup(): Promise<AllowedElement[]>;
 }
 
-export const MAX_LOGS_PER_TAG = 10;
 const MAX_SIGNATURES_PER_REGISTER_CALL = 100;
 const MAX_SIGNATURE_LEN = 10000;
 

yarn-project/stdlib/src/interfaces/l2_logs_source.ts

@@ -10,11 +10,8 @@ import type { GetContractClassLogsResponse, GetPublicLogsResponse } from './get_
  */
 export interface L2LogsSource {
   /**
-   * Gets all logs that match any of the received tags (i.e. logs with their first field equal to a tag).
-   * @param tags - The tags to filter the logs by.
-   * @returns For each received tag, an array of matching logs is returned. An empty array implies no logs match
-   * that tag.
-   * @throws MaxLogsPerTagExceededError if any tag has more than MAX_LOGS_PER_TAG logs.
+   * Gets all logs that match any of the `tags`. For each tag, an array of matching logs is returned. An empty array
+   * implies no logs match that tag.
    */
   getLogsByTags(tags: SiloedTag[]): Promise<TxScopedL2Log[][]>;