@aztec/kv-store 0.0.0-test.0 → 0.0.1-commit.0208eb9

package/src/lmdb-v2/factory.ts

@@ -1,6 +1,6 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { type Logger, createLogger } from '@aztec/foundation/log';
-import { DatabaseVersionManager } from '@aztec/stdlib/database-version';
+import { type LoggerBindings, createLogger } from '@aztec/foundation/log';
+import { DatabaseVersionManager } from '@aztec/stdlib/database-version/manager';
 
 import { mkdir, mkdtemp, rm } from 'fs/promises';
 import { tmpdir } from 'os';
@@ -15,8 +15,9 @@ export async function createStore(
   name: string,
   schemaVersion: number,
   config: DataStoreConfig,
-  log: Logger = createLogger('kv-store:lmdb-v2:' + name),
+  bindings?: LoggerBindings,
 ): Promise<AztecLMDBStoreV2> {
+  const log = createLogger('kv-store:lmdb-v2:' + name, bindings);
   const { dataDirectory, l1Contracts } = config;
 
   let store: AztecLMDBStoreV2;
@@ -28,16 +29,20 @@ export async function createStore(
     const rollupAddress = l1Contracts ? l1Contracts.rollupAddress : EthAddress.ZERO;
 
     // Create a version manager
-    const versionManager = new DatabaseVersionManager(schemaVersion, rollupAddress, subDir, dbDirectory =>
-      AztecLMDBStoreV2.new(dbDirectory, config.dataStoreMapSizeKB, MAX_READERS, () => Promise.resolve(), log),
-    );
+    const versionManager = new DatabaseVersionManager({
+      schemaVersion,
+      rollupAddress,
+      dataDirectory: subDir,
+      onOpen: dbDirectory =>
+        AztecLMDBStoreV2.new(dbDirectory, config.dataStoreMapSizeKb, MAX_READERS, () => Promise.resolve(), bindings),
+    });
 
     log.info(
-      `Creating ${name} data store at directory ${subDir} with map size ${config.dataStoreMapSizeKB} KB (LMDB v2)`,
+      `Creating ${name} data store at directory ${subDir} with map size ${config.dataStoreMapSizeKb} KB (LMDB v2)`,
     );
     [store] = await versionManager.open();
   } else {
-    store = await openTmpStore(name, true, config.dataStoreMapSizeKB, MAX_READERS, log);
+    store = await openTmpStore(name, true, config.dataStoreMapSizeKb, MAX_READERS, bindings);
   }
 
   return store;
@@ -48,8 +53,9 @@ export async function openTmpStore(
   ephemeral: boolean = true,
   dbMapSizeKb = 10 * 1_024 * 1_024, // 10GB
   maxReaders = MAX_READERS,
-  log: Logger = createLogger('kv-store:lmdb-v2:' + name),
+  bindings?: LoggerBindings,
 ): Promise<AztecLMDBStoreV2> {
+  const log = createLogger('kv-store:lmdb-v2:' + name, bindings);
   const dataDir = await mkdtemp(join(tmpdir(), name + '-'));
   log.debug(`Created temporary data store at: ${dataDir} with size: ${dbMapSizeKb} KB (LMDB v2)`);
 
@@ -69,30 +75,35 @@ export async function openTmpStore(
 
   // For temporary stores, we don't need to worry about versioning
   // as they are ephemeral and get cleaned up after use
-  return AztecLMDBStoreV2.new(dataDir, dbMapSizeKb, maxReaders, cleanup, log);
+  return AztecLMDBStoreV2.new(dataDir, dbMapSizeKb, maxReaders, cleanup, bindings);
 }
 
 export async function openStoreAt(
   dataDir: string,
   dbMapSizeKb = 10 * 1_024 * 1_024, // 10GB
   maxReaders = MAX_READERS,
-  log: Logger = createLogger('kv-store:lmdb-v2'),
+  bindings?: LoggerBindings,
 ): Promise<AztecLMDBStoreV2> {
+  const log = createLogger('kv-store:lmdb-v2', bindings);
   log.debug(`Opening data store at: ${dataDir} with size: ${dbMapSizeKb} KB (LMDB v2)`);
-  return await AztecLMDBStoreV2.new(dataDir, dbMapSizeKb, maxReaders, undefined, log);
+  return await AztecLMDBStoreV2.new(dataDir, dbMapSizeKb, maxReaders, undefined, bindings);
 }
 
 export async function openVersionedStoreAt(
-  dataDir: string,
+  dataDirectory: string,
   schemaVersion: number,
   rollupAddress: EthAddress,
   dbMapSizeKb = 10 * 1_024 * 1_024, // 10GB
   maxReaders = MAX_READERS,
-  log: Logger = createLogger('kv-store:lmdb-v2'),
+  bindings?: LoggerBindings,
 ): Promise<AztecLMDBStoreV2> {
-  log.debug(`Opening data store at: ${dataDir} with size: ${dbMapSizeKb} KB (LMDB v2)`);
-  const [store] = await new DatabaseVersionManager(schemaVersion, rollupAddress, dataDir, dataDir =>
-    AztecLMDBStoreV2.new(dataDir, dbMapSizeKb, maxReaders, undefined, log),
-  ).open();
+  const log = createLogger('kv-store:lmdb-v2', bindings);
+  log.debug(`Opening data store at: ${dataDirectory} with size: ${dbMapSizeKb} KB (LMDB v2)`);
+  const [store] = await new DatabaseVersionManager({
+    schemaVersion,
+    rollupAddress,
+    dataDirectory,
+    onOpen: dataDir => AztecLMDBStoreV2.new(dataDir, dbMapSizeKb, maxReaders, undefined, bindings),
+  }).open();
   return store;
 }

package/src/lmdb-v2/map.ts

@@ -1,16 +1,20 @@
 import { Encoder } from 'msgpackr';
 
-import type { Key, Range } from '../interfaces/common.js';
-import type { AztecAsyncMap, AztecAsyncMultiMap } from '../interfaces/map.js';
+import type { Key, Range, Value } from '../interfaces/common.js';
+import type { AztecAsyncMap } from '../interfaces/map.js';
 import type { ReadTransaction } from './read_transaction.js';
-import { type AztecLMDBStoreV2, execInReadTx, execInWriteTx } from './store.js';
+import type { AztecLMDBStoreV2 } from './store.js';
+import { execInReadTx, execInWriteTx } from './tx-helpers.js';
 import { deserializeKey, maxKey, minKey, serializeKey } from './utils.js';
 
-export class LMDBMap<K extends Key, V> implements AztecAsyncMap<K, V> {
+export class LMDBMap<K extends Key, V extends Value> implements AztecAsyncMap<K, V> {
   private prefix: string;
   private encoder = new Encoder();
 
-  constructor(private store: AztecLMDBStoreV2, name: string) {
+  constructor(
+    private store: AztecLMDBStoreV2,
+    name: string,
+  ) {
     this.prefix = `map:${name}`;
   }
   /**
@@ -22,6 +26,18 @@ export class LMDBMap<K extends Key, V> implements AztecAsyncMap<K, V> {
     return execInWriteTx(this.store, tx => tx.set(serializeKey(this.prefix, key), this.encoder.pack(val)));
   }
 
+  /**
+   * Sets the values at the given keys.
+   * @param entries - The entries to set
+   */
+  async setMany(entries: { key: K; value: V }[]): Promise<void> {
+    await execInWriteTx(this.store, async tx => {
+      for (const { key, value } of entries) {
+        await tx.set(serializeKey(this.prefix, key), this.encoder.pack(value));
+      }
+    });
+  }
+
   /**
    * Sets the value at the given key if it does not already exist.
    * @param key - The key to set the value at
@@ -58,15 +74,21 @@ export class LMDBMap<K extends Key, V> implements AztecAsyncMap<K, V> {
     return execInReadTx(this.store, async tx => !!(await tx.get(serializeKey(this.prefix, key))));
   }
 
+  sizeAsync(): Promise<number> {
+    return execInReadTx(this.store, tx => tx.countEntries(minKey(this.prefix), maxKey(this.prefix), false));
+  }
+
   /**
    * Iterates over the map's key-value entries in the key's natural order
    * @param range - The range of keys to iterate over
    */
   async *entriesAsync(range?: Range<K>): AsyncIterableIterator<[K, V]> {
     const reverse = range?.reverse ?? false;
-    const startKey = range?.start ? serializeKey(this.prefix, range.start) : minKey(this.prefix);
 
-    const endKey = range?.end ? serializeKey(this.prefix, range.end) : reverse ? maxKey(this.prefix) : undefined;
+    const startKey = range?.start !== undefined ? serializeKey(this.prefix, range.start) : minKey(this.prefix);
+
+    const endKey =
+      range?.end !== undefined ? serializeKey(this.prefix, range.end) : reverse ? maxKey(this.prefix) : undefined;
 
     let tx: ReadTransaction | undefined = this.store.getCurrentWriteTx();
     const shouldClose = !tx;
@@ -80,7 +102,7 @@ export class LMDBMap<K extends Key, V> implements AztecAsyncMap<K, V> {
         range?.limit,
       )) {
         const deserializedKey = deserializeKey<K>(this.prefix, key);
-        if (!deserializedKey) {
+        if (deserializedKey === false) {
           break;
         }
         yield [deserializedKey, this.encoder.unpack(val)];
@@ -112,122 +134,3 @@ export class LMDBMap<K extends Key, V> implements AztecAsyncMap<K, V> {
     }
   }
 }
-
-export class LMDBMultiMap<K extends Key, V> implements AztecAsyncMultiMap<K, V> {
-  private prefix: string;
-  private encoder = new Encoder();
-  constructor(private store: AztecLMDBStoreV2, name: string) {
-    this.prefix = `multimap:${name}`;
-  }
-
-  /**
-   * Sets the value at the given key.
-   * @param key - The key to set the value at
-   * @param val - The value to set
-   */
-  set(key: K, val: V): Promise<void> {
-    return execInWriteTx(this.store, tx => tx.setIndex(serializeKey(this.prefix, key), this.encoder.pack(val)));
-  }
-
-  /**
-   * Sets the value at the given key if it does not already exist.
-   * @param key - The key to set the value at
-   * @param val - The value to set
-   */
-  setIfNotExists(key: K, val: V): Promise<boolean> {
-    return execInWriteTx(this.store, async tx => {
-      const exists = !!(await this.getAsync(key));
-      if (!exists) {
-        await tx.setIndex(serializeKey(this.prefix, key), this.encoder.pack(val));
-        return true;
-      }
-      return false;
-    });
-  }
-
-  /**
-   * Deletes the value at the given key.
-   * @param key - The key to delete the value at
-   */
-  delete(key: K): Promise<void> {
-    return execInWriteTx(this.store, tx => tx.removeIndex(serializeKey(this.prefix, key)));
-  }
-
-  getAsync(key: K): Promise<V | undefined> {
-    return execInReadTx(this.store, async tx => {
-      const val = await tx.getIndex(serializeKey(this.prefix, key));
-      return val.length > 0 ? this.encoder.unpack(val[0]) : undefined;
-    });
-  }
-
-  hasAsync(key: K): Promise<boolean> {
-    return execInReadTx(this.store, async tx => (await tx.getIndex(serializeKey(this.prefix, key))).length > 0);
-  }
-
-  /**
-   * Iterates over the map's key-value entries in the key's natural order
-   * @param range - The range of keys to iterate over
-   */
-  async *entriesAsync(range?: Range<K>): AsyncIterableIterator<[K, V]> {
-    const reverse = range?.reverse ?? false;
-    const startKey = range?.start ? serializeKey(this.prefix, range.start) : minKey(this.prefix);
-    const endKey = range?.end ? serializeKey(this.prefix, range.end) : reverse ? maxKey(this.prefix) : undefined;
-
-    let tx: ReadTransaction | undefined = this.store.getCurrentWriteTx();
-    const shouldClose = !tx;
-    tx ??= this.store.getReadTx();
-
-    try {
-      for await (const [key, vals] of tx.iterateIndex(
-        reverse ? endKey! : startKey,
-        reverse ? startKey : endKey,
-        reverse,
-        range?.limit,
-      )) {
-        const deserializedKey = deserializeKey<K>(this.prefix, key);
-        if (!deserializedKey) {
-          break;
-        }
-
-        for (const val of vals) {
-          yield [deserializedKey, this.encoder.unpack(val)];
-        }
-      }
-    } finally {
-      if (shouldClose) {
-        tx.close();
-      }
-    }
-  }
-
-  /**
-   * Iterates over the map's values in the key's natural order
-   * @param range - The range of keys to iterate over
-   */
-  async *valuesAsync(range?: Range<K>): AsyncIterableIterator<V> {
-    for await (const [_, value] of this.entriesAsync(range)) {
-      yield value;
-    }
-  }
-
-  /**
-   * Iterates over the map's keys in the key's natural order
-   * @param range - The range of keys to iterate over
-   */
-  async *keysAsync(range?: Range<K>): AsyncIterableIterator<K> {
-    for await (const [key, _] of this.entriesAsync(range)) {
-      yield key;
-    }
-  }
-
-  deleteValue(key: K, val: V | undefined): Promise<void> {
-    return execInWriteTx(this.store, tx => tx.removeIndex(serializeKey(this.prefix, key), this.encoder.pack(val)));
-  }
-
-  async *getValuesAsync(key: K): AsyncIterableIterator<V> {
-    const values = await execInReadTx(this.store, tx => tx.getIndex(serializeKey(this.prefix, key)));
-    for (const value of values) {
-      yield this.encoder.unpack(value);
-    }
-  }
-}

package/src/lmdb-v2/message.ts

@@ -12,6 +12,7 @@ export enum LMDBMessageType {
 
   START_CURSOR,
   ADVANCE_CURSOR,
+  ADVANCE_CURSOR_COUNT,
   CLOSE_CURSOR,
 
   BATCH,
@@ -19,6 +20,7 @@ export enum LMDBMessageType {
   STATS,
 
   CLOSE,
+  COPY_STORE,
 }
 
 type Key = Uint8Array;
@@ -59,10 +61,20 @@ interface AdvanceCursorRequest {
   count: number | null;
 }
 
+interface AdvanceCursorCountRequest {
+  cursor: number;
+  endKey: Key;
+}
+
 interface CloseCursorRequest {
   cursor: number;
 }
 
+interface CopyStoreRequest {
+  dstPath: string;
+  compact: boolean;
+}
+
 export interface Batch {
   addEntries: Array<KeyValues>;
   removeEntries: Array<KeyOptionalValues>;
@@ -80,6 +92,7 @@ export type LMDBRequestBody = {
 
   [LMDBMessageType.START_CURSOR]: StartCursorRequest;
   [LMDBMessageType.ADVANCE_CURSOR]: AdvanceCursorRequest;
+  [LMDBMessageType.ADVANCE_CURSOR_COUNT]: AdvanceCursorCountRequest;
   [LMDBMessageType.CLOSE_CURSOR]: CloseCursorRequest;
 
   [LMDBMessageType.BATCH]: BatchRequest;
@@ -87,6 +100,7 @@ export type LMDBRequestBody = {
   [LMDBMessageType.STATS]: void;
 
   [LMDBMessageType.CLOSE]: void;
+  [LMDBMessageType.COPY_STORE]: CopyStoreRequest;
 };
 
 interface GetResponse {
@@ -107,6 +121,11 @@ interface AdvanceCursorResponse {
   done: boolean;
 }
 
+interface AdvanceCursorCountResponse {
+  count: number;
+  done: boolean;
+}
+
 interface BatchResponse {
   durationNs: number;
 }
@@ -122,6 +141,7 @@ interface StatsResponse {
     totalUsedSize: bigint | number;
   }>;
   dbMapSizeBytes: bigint | number;
+  dbPhysicalFileSizeBytes: bigint | number;
 }
 
 export type LMDBResponseBody = {
@@ -132,6 +152,7 @@ export type LMDBResponseBody = {
 
   [LMDBMessageType.START_CURSOR]: StartCursorResponse;
   [LMDBMessageType.ADVANCE_CURSOR]: AdvanceCursorResponse;
+  [LMDBMessageType.ADVANCE_CURSOR_COUNT]: AdvanceCursorCountResponse;
   [LMDBMessageType.CLOSE_CURSOR]: BoolResponse;
 
   [LMDBMessageType.BATCH]: BatchResponse;
@@ -139,6 +160,8 @@ export type LMDBResponseBody = {
   [LMDBMessageType.STATS]: StatsResponse;
 
   [LMDBMessageType.CLOSE]: BoolResponse;
+
+  [LMDBMessageType.COPY_STORE]: BoolResponse;
 };
 
 export interface LMDBMessageChannel {

package/src/lmdb-v2/multi_map.ts

@@ -0,0 +1,150 @@
+import { Encoder } from 'msgpackr/pack';
+import { MAXIMUM_KEY, toBufferKey } from 'ordered-binary';
+
+import type { Key, Range, Value } from '../interfaces/common.js';
+import type { AztecAsyncMultiMap } from '../interfaces/multi_map.js';
+import type { ReadTransaction } from './read_transaction.js';
+import type { AztecLMDBStoreV2 } from './store.js';
+import { execInReadTx, execInWriteTx } from './tx-helpers.js';
+import { deserializeKey, maxKey, minKey, serializeKey } from './utils.js';
+
+export class LMDBMultiMap<K extends Key, V extends Value> implements AztecAsyncMultiMap<K, V> {
+  private prefix: string;
+  private encoder = new Encoder();
+  constructor(
+    private store: AztecLMDBStoreV2,
+    name: string,
+  ) {
+    this.prefix = `multimap:${name}`;
+  }
+
+  /**
+   * Sets the value at the given key.
+   * @param key - The key to set the value at
+   * @param val - The value to set
+   */
+  set(key: K, val: V): Promise<void> {
+    return execInWriteTx(this.store, tx => tx.setIndex(serializeKey(this.prefix, key), this.encoder.pack(val)));
+  }
+
+  async setMany(entries: { key: K; value: V }[]): Promise<void> {
+    await execInWriteTx(this.store, async tx => {
+      for (const { key, value } of entries) {
+        await tx.setIndex(serializeKey(this.prefix, key), this.encoder.pack(value));
+      }
+    });
+  }
+
+  /**
+   * Sets the value at the given key if it does not already exist.
+   * @param key - The key to set the value at
+   * @param val - The value to set
+   */
+  setIfNotExists(key: K, val: V): Promise<boolean> {
+    return execInWriteTx(this.store, async tx => {
+      const exists = !!(await this.getAsync(key));
+      if (!exists) {
+        await tx.setIndex(serializeKey(this.prefix, key), this.encoder.pack(val));
+        return true;
+      }
+      return false;
+    });
+  }
+
+  /**
+   * Deletes the value at the given key.
+   * @param key - The key to delete the value at
+   */
+  delete(key: K): Promise<void> {
+    return execInWriteTx(this.store, tx => tx.removeIndex(serializeKey(this.prefix, key)));
+  }
+
+  getAsync(key: K): Promise<V | undefined> {
+    return execInReadTx(this.store, async tx => {
+      const val = await tx.getIndex(serializeKey(this.prefix, key));
+      return val.length > 0 ? this.encoder.unpack(val[0]) : undefined;
+    });
+  }
+
+  hasAsync(key: K): Promise<boolean> {
+    return execInReadTx(this.store, async tx => (await tx.getIndex(serializeKey(this.prefix, key))).length > 0);
+  }
+
+  sizeAsync(): Promise<number> {
+    return execInReadTx(this.store, tx => tx.countEntriesIndex(minKey(this.prefix), maxKey(this.prefix), false));
+  }
+
+  /**
+   * Iterates over the map's key-value entries in the key's natural order
+   * @param range - The range of keys to iterate over
+   */
+  async *entriesAsync(range?: Range<K>): AsyncIterableIterator<[K, V]> {
+    const reverse = range?.reverse ?? false;
+    const startKey = range?.start ? serializeKey(this.prefix, range.start) : minKey(this.prefix);
+    const endKey = range?.end ? serializeKey(this.prefix, range.end) : reverse ? maxKey(this.prefix) : undefined;
+
+    let tx: ReadTransaction | undefined = this.store.getCurrentWriteTx();
+    const shouldClose = !tx;
+    tx ??= this.store.getReadTx();
+
+    try {
+      for await (const [key, vals] of tx.iterateIndex(
+        reverse ? endKey! : startKey,
+        reverse ? startKey : endKey,
+        reverse,
+        range?.limit,
+      )) {
+        const deserializedKey = deserializeKey<K>(this.prefix, key);
+        if (!deserializedKey) {
+          break;
+        }
+
+        for (const val of vals) {
+          yield [deserializedKey, this.encoder.unpack(val)];
+        }
+      }
+    } finally {
+      if (shouldClose) {
+        tx.close();
+      }
+    }
+  }
+
+  /**
+   * Iterates over the map's values in the key's natural order
+   * @param range - The range of keys to iterate over
+   */
+  async *valuesAsync(range?: Range<K>): AsyncIterableIterator<V> {
+    for await (const [_, value] of this.entriesAsync(range)) {
+      yield value;
+    }
+  }
+
+  /**
+   * Iterates over the map's keys in the key's natural order
+   * @param range - The range of keys to iterate over
+   */
+  async *keysAsync(range?: Range<K>): AsyncIterableIterator<K> {
+    for await (const [key, _] of this.entriesAsync(range)) {
+      yield key;
+    }
+  }
+
+  deleteValue(key: K, val: V | undefined): Promise<void> {
+    return execInWriteTx(this.store, tx => tx.removeIndex(serializeKey(this.prefix, key), this.encoder.pack(val)));
+  }
+
+  async *getValuesAsync(key: K): AsyncIterableIterator<V> {
+    const values = await execInReadTx(this.store, tx => tx.getIndex(serializeKey(this.prefix, key)));
+    for (const value of values) {
+      yield this.encoder.unpack(value);
+    }
+  }
+
+  getValueCountAsync(key: K): Promise<number> {
+    const startKey = serializeKey(this.prefix, key);
+    const endKey = toBufferKey([this.prefix, key, MAXIMUM_KEY]);
+
+    return execInReadTx(this.store, tx => tx.countEntriesIndex(startKey, endKey, false));
+  }
+}

package/src/lmdb-v2/read_transaction.ts

@@ -48,6 +48,14 @@ export class ReadTransaction {
     yield* this.#iterate(Database.INDEX, startKey, endKey, reverse, limit, vals => vals);
   }
 
+  public countEntries(startKey: Uint8Array, endKey: Uint8Array, reverse: boolean): Promise<number> {
+    return this.#countEntries(Database.DATA, startKey, endKey, reverse);
+  }
+
+  public countEntriesIndex(startKey: Uint8Array, endKey: Uint8Array, reverse: boolean): Promise<number> {
+    return this.#countEntries(Database.INDEX, startKey, endKey, reverse);
+  }
+
   async *#iterate<T>(
     db: string,
     startKey: Uint8Array,
@@ -113,4 +121,36 @@ export class ReadTransaction {
       }
     }
   }
+
+  async #countEntries(db: string, startKey: Uint8Array, endKey: Uint8Array, reverse: boolean): Promise<number> {
+    this.assertIsOpen();
+
+    const response = await this.channel.sendMessage(LMDBMessageType.START_CURSOR, {
+      key: startKey,
+      reverse,
+      count: 0,
+      onePage: false,
+      db,
+    });
+
+    const cursor = response.cursor;
+
+    try {
+      if (!cursor) {
+        return 0;
+      }
+
+      const advanceResponse = await this.channel.sendMessage(LMDBMessageType.ADVANCE_CURSOR_COUNT, {
+        cursor,
+        endKey: endKey,
+      });
+
+      return advanceResponse.count;
+    } finally {
+      // we might not have anything to close
+      if (typeof cursor === 'number') {
+        await this.channel.sendMessage(LMDBMessageType.CLOSE_CURSOR, { cursor });
+      }
+    }
+  }
 }

package/src/lmdb-v2/set.ts

@@ -0,0 +1,33 @@
+import type { Key, Range } from '../interfaces/common.js';
+import type { AztecAsyncSet } from '../interfaces/set.js';
+import { LMDBMap } from './map.js';
+import type { AztecLMDBStoreV2 } from './store.js';
+
+/**
+ * A set backed by LMDB.
+ */
+export class LMDBSet<K extends Key> implements AztecAsyncSet<K> {
+  private map: LMDBMap<K, boolean>;
+
+  constructor(store: AztecLMDBStoreV2, mapName: string) {
+    this.map = new LMDBMap(store, mapName);
+  }
+
+  hasAsync(key: K): Promise<boolean> {
+    return this.map.hasAsync(key);
+  }
+
+  add(key: K): Promise<void> {
+    return this.map.set(key, true);
+  }
+
+  delete(key: K): Promise<void> {
+    return this.map.delete(key);
+  }
+
+  async *entriesAsync(range: Range<K> = {}): AsyncIterableIterator<K> {
+    for await (const key of this.map.keysAsync(range)) {
+      yield key;
+    }
+  }
+}

package/src/lmdb-v2/singleton.ts

@@ -1,13 +1,17 @@
 import { Encoder } from 'msgpackr';
 
 import type { AztecAsyncSingleton } from '../interfaces/singleton.js';
-import { type AztecLMDBStoreV2, execInReadTx, execInWriteTx } from './store.js';
+import type { AztecLMDBStoreV2 } from './store.js';
+import { execInReadTx, execInWriteTx } from './tx-helpers.js';
 import { serializeKey } from './utils.js';
 
 export class LMDBSingleValue<T> implements AztecAsyncSingleton<T> {
   private key: Uint8Array;
   private encoder = new Encoder();
-  constructor(private store: AztecLMDBStoreV2, name: string) {
+  constructor(
+    private store: AztecLMDBStoreV2,
+    name: string,
+  ) {
     this.key = serializeKey(`singleton:${name}`, 'value');
   }