@aztec/archiver 0.0.1-commit.f504929 → 0.0.1-commit.f5a9928

package/dest/store/l2_tips_cache.js

@@ -1,89 +1,26 @@
-import { GENESIS_BLOCK_HEADER_HASH, INITIAL_L2_BLOCK_NUM } from '@aztec/constants';
-import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
-import { GENESIS_CHECKPOINT_HEADER_HASH } from '@aztec/stdlib/block';
 /**
  * In-memory cache for L2 chain tips (proposed, checkpointed, proven, finalized).
  * Populated from the BlockStore on first access, then kept up-to-date by the ArchiverDataStoreUpdater.
- * Refresh calls should happen within the store transaction that mutates block data to ensure consistency.
+ * Refresh calls should happen *after* the store transaction that mutates block data has committed,
+ * so the cache loads from committed state and is never replaced if the writer aborts.
  */ export class L2TipsCache {
     blockStore;
+    initialBlockHash;
     #tipsPromise;
-    constructor(blockStore){
+    /**
+   * The genesis block hash is dynamic — derived from the injected initial header, which depends on
+   * `genesisTimestamp` and any prefilled state — so it is supplied here rather than read from store.
+   * The genesis checkpoint hash, by contrast, is the static protocol constant and is resolved
+   * inside the block store.
+   */ constructor(blockStore, initialBlockHash){
         this.blockStore = blockStore;
+        this.initialBlockHash = initialBlockHash;
     }
     /** Returns the cached L2 tips. Loads from the block store on first call. */ getL2Tips() {
-        return this.#tipsPromise ??= this.loadFromStore();
+        return this.#tipsPromise ??= this.blockStore.getL2TipsData(this.initialBlockHash);
     }
-    /** Reloads the L2 tips from the block store. Should be called within the store transaction that mutates data. */ async refresh() {
-        this.#tipsPromise = this.loadFromStore();
+    /** Reloads the L2 tips from the block store. Should be called after the writer transaction has committed. */ async refresh() {
+        this.#tipsPromise = this.blockStore.getL2TipsData(this.initialBlockHash);
         await this.#tipsPromise;
     }
-    async loadFromStore() {
-        const [latestBlockNumber, provenBlockNumber, checkpointedBlockNumber, finalizedBlockNumber] = await Promise.all([
-            this.blockStore.getLatestBlockNumber(),
-            this.blockStore.getProvenBlockNumber(),
-            this.blockStore.getCheckpointedL2BlockNumber(),
-            this.blockStore.getFinalizedL2BlockNumber()
-        ]);
-        const genesisBlockHeader = {
-            blockHash: GENESIS_BLOCK_HEADER_HASH,
-            checkpointNumber: CheckpointNumber.ZERO
-        };
-        const beforeInitialBlockNumber = BlockNumber(INITIAL_L2_BLOCK_NUM - 1);
-        const getBlockData = (blockNumber)=>blockNumber > beforeInitialBlockNumber ? this.blockStore.getBlockData(blockNumber) : genesisBlockHeader;
-        const [latestBlockData, provenBlockData, checkpointedBlockData, finalizedBlockData] = await Promise.all([
-            latestBlockNumber,
-            provenBlockNumber,
-            checkpointedBlockNumber,
-            finalizedBlockNumber
-        ].map(getBlockData));
-        if (!latestBlockData || !provenBlockData || !finalizedBlockData || !checkpointedBlockData) {
-            throw new Error('Failed to load block data for L2 tips');
-        }
-        const [provenCheckpointId, finalizedCheckpointId, checkpointedCheckpointId] = await Promise.all([
-            this.getCheckpointIdForBlock(provenBlockData),
-            this.getCheckpointIdForBlock(finalizedBlockData),
-            this.getCheckpointIdForBlock(checkpointedBlockData)
-        ]);
-        return {
-            proposed: {
-                number: latestBlockNumber,
-                hash: latestBlockData.blockHash.toString()
-            },
-            proven: {
-                block: {
-                    number: provenBlockNumber,
-                    hash: provenBlockData.blockHash.toString()
-                },
-                checkpoint: provenCheckpointId
-            },
-            finalized: {
-                block: {
-                    number: finalizedBlockNumber,
-                    hash: finalizedBlockData.blockHash.toString()
-                },
-                checkpoint: finalizedCheckpointId
-            },
-            checkpointed: {
-                block: {
-                    number: checkpointedBlockNumber,
-                    hash: checkpointedBlockData.blockHash.toString()
-                },
-                checkpoint: checkpointedCheckpointId
-            }
-        };
-    }
-    async getCheckpointIdForBlock(blockData) {
-        const checkpointData = await this.blockStore.getCheckpointData(blockData.checkpointNumber);
-        if (!checkpointData) {
-            return {
-                number: CheckpointNumber.ZERO,
-                hash: GENESIS_CHECKPOINT_HEADER_HASH.toString()
-            };
-        }
-        return {
-            number: checkpointData.checkpointNumber,
-            hash: checkpointData.header.hash().toString()
-        };
-    }
 }

package/dest/store/log_store.d.ts

@@ -1,54 +1,59 @@
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
-import type { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { L2Block } from '@aztec/stdlib/block';
-import type { GetContractClassLogsResponse, GetPublicLogsResponse } from '@aztec/stdlib/interfaces/client';
-import { type LogFilter, type SiloedTag, Tag, TxScopedL2Log } from '@aztec/stdlib/logs';
+import type { BlockHash, L2Block } from '@aztec/stdlib/block';
+import type { LogResult, PrivateLogsQuery, PublicLogsQuery } from '@aztec/stdlib/logs';
 import type { BlockStore } from './block_store.js';
 /**
- * A store for logs
+ * Indexes every emitted private and public log under a composite hex-string key
+ * `[contractAddress (public only)]-tag-blockNumber-txIndexWithinBlock-logIndexWithinTx`,
+ * where each numeric segment is zero-padded to 8 lowercase hex digits (4 bytes BE) and
+ * `contractAddress` / `tag` are the bare 64-hex-char field representations (no `0x` prefix). The
+ * fixed-width zero-padded hex segments sort lexicographically in the same order as the canonical
+ * `(contract, tag, blockNumber, txIndexWithinBlock, logIndexWithinTx)` tuple, so a single ordered
+ * range scan answers every {@link PrivateLogsQuery} / {@link PublicLogsQuery}.
+ *
+ * Per-block secondary indices (`#privateKeysByBlock`, `#publicKeysByBlock`) record the exact primary
+ * keys written for each block so {@link deleteLogs} can drop them on reorg without having to range
+ * scan by block (block isn't the leading key segment).
+ *
+ * Contract-class logs are no longer stored or served by the log store.
  */
 export declare class LogStore {
     #private;
     private db;
     private blockStore;
-    constructor(db: AztecAsyncKVStore, blockStore: BlockStore, logsMaxPageSize?: number);
+    private readonly genesisBlockHash;
     /**
-     * Append new logs to the store's list.
-     * @param blocks - The blocks for which to add the logs.
-     * @returns True if the operation is successful.
+     * @param genesisBlockHash - Hash of the synthetic genesis block. During early sync the PXE anchors to
+     *   genesis and passes its hash as a query `referenceBlock`; since the archiver never indexes the
+     *   genesis block, the store recognizes this hash directly and resolves it to the genesis block number
+     *   rather than mistaking it for a reorg.
      */
-    addLogs(blocks: L2Block[]): Promise<boolean>;
-    deleteLogs(blocks: L2Block[]): Promise<boolean>;
-    /**
-     * Gets private 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.
-     * @param tags - The tags to search for.
-     * @param page - The page number (0-indexed) for pagination.
-     * @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
-     * MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
-     */
-    getPrivateLogsByTags(tags: SiloedTag[], page?: number): Promise<TxScopedL2Log[][]>;
+    constructor(db: AztecAsyncKVStore, blockStore: BlockStore, genesisBlockHash: BlockHash);
     /**
-     * Gets public logs that match any of the `tags` from the specified contract. For each tag, an array of matching
-     * logs is returned. An empty array implies no logs match that tag.
-     * @param contractAddress - The contract address to search logs for.
-     * @param tags - The tags to search for.
-     * @param page - The page number (0-indexed) for pagination.
-     * @returns An array of log arrays, one per tag. Returns at most MAX_LOGS_PER_TAG logs per tag per page. If
-     * MAX_LOGS_PER_TAG logs are returned for a tag, the caller should fetch the next page to check for more logs.
+     * Indexes every emitted private and public log from the given blocks. Wraps the write in a single
+     * `db.transactionAsync` so the primary entries and the per-block secondary indices stay consistent.
+     *
+     * A block is only ever added once; on reorg the archiver calls {@link deleteLogs} first, so we write
+     * the secondary index entries with a plain `set` (overwrite) rather than read-modify-append.
      */
-    getPublicLogsByTagsFromContract(contractAddress: AztecAddress, tags: Tag[], page?: number): Promise<TxScopedL2Log[][]>;
+    addLogs(blocks: L2Block[]): Promise<boolean>;
     /**
-     * Gets public logs based on the provided filter.
-     * @param filter - The filter to apply to the logs.
-     * @returns The requested logs.
+     * Deletes every log indexed under any of the given blocks. Secondary-index driven, so it doesn't
+     * have to range-scan the primary maps.
      */
-    getPublicLogs(filter: LogFilter): Promise<GetPublicLogsResponse>;
+    deleteLogs(blocks: L2Block[]): Promise<boolean>;
+    /** Returns one inner array per element of `query.tags`, in input order. */
+    getPrivateLogsByTags(query: PrivateLogsQuery): Promise<LogResult[][]>;
+    /** Returns one inner array per element of `query.tags`, in input order. */
+    getPublicLogsByTags(query: PublicLogsQuery): Promise<LogResult[][]>;
     /**
-     * Gets contract class logs based on the provided filter.
-     * @param filter - The filter to apply to the logs.
-     * @returns The requested logs.
+     * Reads back every private log indexed for the given block via the per-block secondary index. Order
+     * matches the canonical composite-key order (`tag`, `blockNumber`, `txIndexWithinBlock`,
+     * `logIndexWithinTx`). Used by the data-store-updater test suite to verify the indexed-vs-block-body
+     * counts without depending on the removed `getPublicLogs(LogFilter)` API.
      */
-    getContractClassLogs(filter: LogFilter): Promise<GetContractClassLogsResponse>;
+    getPrivateLogsForBlock(blockNumber: number): Promise<LogResult[]>;
+    /** {@inheritDoc LogStore.getPrivateLogsForBlock} */
+    getPublicLogsForBlock(blockNumber: number): Promise<LogResult[]>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvbG9nX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGlCQUFpQixDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ2hFLE9BQU8sRUFBYSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUV6RCxPQUFPLEtBQUssRUFBRSw0QkFBNEIsRUFBRSxxQkFBcUIsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzNHLE9BQU8sRUFJTCxLQUFLLFNBQVMsRUFHZCxLQUFLLFNBQVMsRUFDZCxHQUFHLEVBQ0gsYUFBYSxFQUNkLE1BQU0sb0JBQW9CLENBQUM7QUFHNUIsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkQ7O0dBRUc7QUFDSCxxQkFBYSxRQUFROztJQWFqQixPQUFPLENBQUMsRUFBRTtJQUNWLE9BQU8sQ0FBQyxVQUFVO0lBRnBCLFlBQ1UsRUFBRSxFQUFFLGlCQUFpQixFQUNyQixVQUFVLEVBQUUsVUFBVSxFQUM5QixlQUFlLEdBQUUsTUFBYSxFQVUvQjtJQThNRDs7OztPQUlHO0lBQ0gsT0FBTyxDQUFDLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBUzNDO0lBZ0JELFVBQVUsQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQTJCOUM7SUFFRDs7Ozs7OztPQU9HO0lBQ0csb0JBQW9CLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxFQUFFLElBQUksR0FBRSxNQUFVLEdBQUcsT0FBTyxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FRMUY7SUFFRDs7Ozs7Ozs7T0FRRztJQUNHLCtCQUErQixDQUNuQyxlQUFlLEVBQUUsWUFBWSxFQUM3QixJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQ1gsSUFBSSxHQUFFLE1BQVUsR0FDZixPQUFPLENBQUMsYUFBYSxFQUFFLEVBQUUsQ0FBQyxDQWE1QjtJQUVEOzs7O09BSUc7SUFDSCxhQUFhLENBQUMsTUFBTSxFQUFFLFNBQVMsR0FBRyxPQUFPLENBQUMscUJBQXFCLENBQUMsQ0FRL0Q7SUErRkQ7Ozs7T0FJRztJQUNILG9CQUFvQixDQUFDLE1BQU0sRUFBRSxTQUFTLEdBQUcsT0FBTyxDQUFDLDRCQUE0QixDQUFDLENBUTdFO0NBc0pGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nX3N0b3JlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RvcmUvbG9nX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGlCQUFpQixDQUFDO0FBQ3hFLE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxPQUFPLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUU5RCxPQUFPLEtBQUssRUFFVixTQUFTLEVBQ1QsZ0JBQWdCLEVBQ2hCLGVBQWUsRUFJaEIsTUFBTSxvQkFBb0IsQ0FBQztBQUc1QixPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQWNuRDs7Ozs7Ozs7Ozs7Ozs7R0FjRztBQUNILHFCQUFhLFFBQVE7O0lBbUJqQixPQUFPLENBQUMsRUFBRTtJQUNWLE9BQU8sQ0FBQyxVQUFVO0lBQ2xCLE9BQU8sQ0FBQyxRQUFRLENBQUMsZ0JBQWdCO0lBVG5DOzs7OztPQUtHO0lBQ0gsWUFDVSxFQUFFLEVBQUUsaUJBQWlCLEVBQ3JCLFVBQVUsRUFBRSxVQUFVLEVBQ2IsZ0JBQWdCLEVBQUUsU0FBUyxFQU03QztJQUVEOzs7Ozs7T0FNRztJQUNILE9BQU8sQ0FBQyxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQXlFM0M7SUFFRDs7O09BR0c7SUFDSCxVQUFVLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0F5QjlDO0lBRUQsMkVBQTJFO0lBQzNFLG9CQUFvQixDQUFDLEtBQUssRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUdwRTtJQUVELDJFQUEyRTtJQUMzRSxtQkFBbUIsQ0FBQyxLQUFLLEVBQUUsZUFBZSxHQUFHLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBR2xFO0lBMEhEOzs7OztPQUtHO0lBQ0gsc0JBQXNCLENBQUMsV0FBVyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FJaEU7SUFFRCxvREFBb0Q7SUFDcEQscUJBQXFCLENBQUMsV0FBVyxFQUFFLE1BQU0sR0FBRyxPQUFPLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FFL0Q7Q0ErQkYifQ==

package/dest/store/log_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../src/store/log_store.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAa,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,4BAA4B,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC3G,OAAO,EAIL,KAAK,SAAS,EAGd,KAAK,SAAS,EACd,GAAG,EACH,aAAa,EACd,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD;;GAEG;AACH,qBAAa,QAAQ;;IAajB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;IAFpB,YACU,EAAE,EAAE,iBAAiB,EACrB,UAAU,EAAE,UAAU,EAC9B,eAAe,GAAE,MAAa,EAU/B;IA8MD;;;;OAIG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAS3C;IAgBD,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA2B9C;IAED;;;;;;;OAOG;IACG,oBAAoB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,IAAI,GAAE,MAAU,GAAG,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAQ1F;IAED;;;;;;;;OAQG;IACG,+BAA+B,CACnC,eAAe,EAAE,YAAY,EAC7B,IAAI,EAAE,GAAG,EAAE,EACX,IAAI,GAAE,MAAU,GACf,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAa5B;IAED;;;;OAIG;IACH,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAQ/D;IA+FD;;;;OAIG;IACH,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAQ7E;CAsJF"}
+{"version":3,"file":"log_store.d.ts","sourceRoot":"","sources":["../../src/store/log_store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9D,OAAO,KAAK,EAEV,SAAS,EACT,gBAAgB,EAChB,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAcnD;;;;;;;;;;;;;;GAcG;AACH,qBAAa,QAAQ;;IAmBjB,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IATnC;;;;;OAKG;IACH,YACU,EAAE,EAAE,iBAAiB,EACrB,UAAU,EAAE,UAAU,EACb,gBAAgB,EAAE,SAAS,EAM7C;IAED;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAyE3C;IAED;;;OAGG;IACH,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAyB9C;IAED,2EAA2E;IAC3E,oBAAoB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAGpE;IAED,2EAA2E;IAC3E,mBAAmB,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAGlE;IA0HD;;;;;OAKG;IACH,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAIhE;IAED,oDAAoD;IACpD,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAE/D;CA+BF"}