@aztec/kv-store 0.0.1-commit.b9865e97 → 0.0.1-commit.be03c316

package/dest/sqlite-opfs/worker.js

@@ -1,6 +1,7 @@
 /// <reference lib="webworker" />
 import sqlite3InitModule from '@aztec/sqlite3mc-wasm';
 import { SqliteEncryptionError, isDecryptFailureMessage } from './errors.js';
+import { DEFAULT_SAH_POOL_DIRECTORY } from './pool_lock.js';
 const SCHEMA_SQL = `
   CREATE TABLE IF NOT EXISTS data (
     slot TEXT NOT NULL PRIMARY KEY,
@@ -15,7 +16,6 @@ const SCHEMA_SQL = `
   CREATE UNIQUE INDEX IF NOT EXISTS idx_container_key_count ON data(container, key, key_count);
   CREATE UNIQUE INDEX IF NOT EXISTS idx_container_key_hash ON data(container, key, hash);
 `;
-const DEFAULT_SAH_POOL_DIRECTORY = '.aztec-kv';
 const SAH_POOL_VFS_NAME = 'aztec-kv-opfs';
 const MC_SAH_POOL_VFS_NAME = `multipleciphers-${SAH_POOL_VFS_NAME}`;
 let sqlite3;
@@ -23,8 +23,7 @@ let pool;
 let db;
 let dbPath;
 async function ensurePool(directory) {
-    sqlite3 ??= await sqlite3InitModule();
-    const s = sqlite3;
+    const s = sqlite3 ??= await sqlite3InitModule();
     if (!pool) {
         pool = await s.installOpfsSAHPoolVfs({
             name: SAH_POOL_VFS_NAME,
@@ -51,33 +50,48 @@ async function ensurePool(directory) {
     key.fill(0);
 }
 async function handleInit(dbName, ephemeral, directory, encryptionKey) {
-    sqlite3 ??= await sqlite3InitModule();
-    const s = sqlite3;
+    const s = sqlite3 ??= await sqlite3InitModule();
     if (encryptionKey !== undefined && ephemeral) {
         throw new SqliteEncryptionError('encryption_not_supported_for_ephemeral', 'encryptionKey is not supported for ephemeral (:memory:) stores');
     }
     if (ephemeral) {
         db = new s.oo1.DB(':memory:', 'c');
     } else {
-        await ensurePool(directory ?? DEFAULT_SAH_POOL_DIRECTORY);
+        const activePool = await ensurePool(directory ?? DEFAULT_SAH_POOL_DIRECTORY);
         dbPath = normalizeDbPath(dbName);
         if (encryptionKey !== undefined) {
-            db = new s.oo1.DB({
+            const conn = new s.oo1.DB({
                 filename: dbPath,
                 flags: 'c',
                 vfs: MC_SAH_POOL_VFS_NAME
             });
-            applyEncryptionKey(db, encryptionKey);
+            db = conn;
+            applyEncryptionKey(conn, encryptionKey);
         } else {
-            db = new pool.OpfsSAHPoolDb(dbPath);
+            db = new activePool.OpfsSAHPoolDb(dbPath);
         }
     }
     runSql(SCHEMA_SQL);
 }
 function handleClose() {
-    db?.close();
-    db = undefined;
-    dbPath = undefined;
+    try {
+        db?.close();
+    } finally{
+        db = undefined;
+        dbPath = undefined;
+        releasePool();
+    }
+}
+/**
+ * Releases the SAH pool's OPFS sync access handles before the terminal RPC is acked. Worker
+ * termination releases them only asynchronously, so without this a caller that deletes or reopens
+ * the store directory right after close()/delete() resolves races Chromium's cleanup
+ * (NoModificationAllowedError from removeEntry, or a hang installing a new pool on the directory).
+ * pauseVfs releases the handles without touching file contents; the worker is terminated right
+ * after, so the pool is never resumed.
+ */ function releasePool() {
+    pool?.pauseVfs();
+    pool = undefined;
 }
 async function handleExport() {
     if (!db || !dbPath) {
@@ -108,6 +122,10 @@ function handleDeleteDb(dbName) {
     } catch  {
     // File may not exist; ignore.
     }
+    // Guarded because pauseVfs refuses (SQLITE_MISUSE) while any file is open through the VFS.
+    if (!db) {
+        releasePool();
+    }
 }
 function requireDb() {
     if (!db) {
@@ -217,11 +235,19 @@ self.onmessage = async (ev)=>{
         }
     } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
+        const encryptionCode = detectEncryptionCode(req, err, message);
+        if (req.type === 'init') {
+            try {
+                handleClose();
+            } catch  {
+            // The main thread terminates this worker after a failed init, which releases any remaining OPFS handles.
+            }
+        }
         respond({
             type: 'err',
             id: req.id,
             message,
-            encryptionCode: detectEncryptionCode(req, err, message)
+            encryptionCode
         });
     }
 };

package/dest/stores/l2_tips_store.d.ts

@@ -1,6 +1,5 @@
-import { BlockNumber, CheckpointNumber } from '@aztec/foundation/branded-types';
-import { type BlockHash, type L2BlockTag, L2TipsStoreBase } from '@aztec/stdlib/block';
-import { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
+import { BlockNumber } from '@aztec/foundation/branded-types';
+import { type BlockHash, type CheckpointId, type L2BlockTag, L2TipsStoreBase } from '@aztec/stdlib/block';
 import type { AztecAsyncKVStore } from '../interfaces/store.js';
 /**
  * Persistent implementation of L2 tips store backed by a KV store.
@@ -9,21 +8,16 @@ import type { AztecAsyncKVStore } from '../interfaces/store.js';
 export declare class L2TipsKVStore extends L2TipsStoreBase {
     private store;
     private readonly l2TipsStore;
+    private readonly l2TipCheckpointsStore;
     private readonly l2BlockHashesStore;
-    private readonly l2BlockNumberToCheckpointNumberStore;
-    private readonly l2CheckpointStore;
     constructor(store: AztecAsyncKVStore, namespace: string, initialBlockHash: BlockHash);
     protected getTip(tag: L2BlockTag): Promise<BlockNumber | undefined>;
     protected setTip(tag: L2BlockTag, blockNumber: BlockNumber): Promise<void>;
+    protected getTipCheckpoint(tag: L2BlockTag): Promise<CheckpointId | undefined>;
+    protected setTipCheckpoint(tag: L2BlockTag, checkpoint: CheckpointId): Promise<void>;
     protected getStoredBlockHash(blockNumber: BlockNumber): Promise<string | undefined>;
     protected setBlockHash(blockNumber: BlockNumber, hash: string): Promise<void>;
     protected deleteBlockHashesBefore(blockNumber: BlockNumber): Promise<void>;
-    protected getCheckpointNumberForBlock(blockNumber: BlockNumber): Promise<CheckpointNumber | undefined>;
-    protected setCheckpointNumberForBlock(blockNumber: BlockNumber, checkpointNumber: CheckpointNumber): Promise<void>;
-    protected deleteBlockToCheckpointBefore(blockNumber: BlockNumber): Promise<void>;
-    protected getCheckpoint(checkpointNumber: CheckpointNumber): Promise<PublishedCheckpoint | undefined>;
-    protected saveCheckpointData(checkpoint: PublishedCheckpoint): Promise<void>;
-    protected deleteCheckpointsBefore(checkpointNumber: CheckpointNumber): Promise<void>;
     protected runInTransaction<T>(fn: () => Promise<T>): Promise<T>;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3Jlcy9sMl90aXBzX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUNoRixPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQUUsS0FBSyxVQUFVLEVBQUUsZUFBZSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDdkYsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHL0QsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVoRTs7O0dBR0c7QUFDSCxxQkFBYSxhQUFjLFNBQVEsZUFBZTtJQU85QyxPQUFPLENBQUMsS0FBSztJQU5mLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUF5QztJQUNyRSxPQUFPLENBQUMsUUFBUSxDQUFDLGtCQUFrQixDQUFxQztJQUN4RSxPQUFPLENBQUMsUUFBUSxDQUFDLG9DQUFvQyxDQUErQztJQUNwRyxPQUFPLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUEwQztJQUU1RSxZQUNVLEtBQUssRUFBRSxpQkFBaUIsRUFDaEMsU0FBUyxFQUFFLE1BQU0sRUFDakIsZ0JBQWdCLEVBQUUsU0FBUyxFQVM1QjtJQUVELFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsV0FBVyxHQUFHLFNBQVMsQ0FBQyxDQUVsRTtJQUVELFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLFVBQVUsRUFBRSxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFekU7SUFFRCxTQUFTLENBQUMsa0JBQWtCLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUVsRjtJQUVELFNBQVMsQ0FBQyxZQUFZLENBQUMsV0FBVyxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsTUFBTSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FFNUU7SUFFRCxVQUFnQix1QkFBdUIsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FJL0U7SUFFRCxTQUFTLENBQUMsMkJBQTJCLENBQUMsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsZ0JBQWdCLEdBQUcsU0FBUyxDQUFDLENBRXJHO0lBRUQsU0FBUyxDQUFDLDJCQUEyQixDQUFDLFdBQVcsRUFBRSxXQUFXLEVBQUUsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUVqSDtJQUVELFVBQWdCLDZCQUE2QixDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUlyRjtJQUVELFVBQWdCLGFBQWEsQ0FBQyxnQkFBZ0IsRUFBRSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsbUJBQW1CLEdBQUcsU0FBUyxDQUFDLENBTTFHO0lBRUQsU0FBUyxDQUFDLGtCQUFrQixDQUFDLFVBQVUsRUFBRSxtQkFBbUIsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRTNFO0lBRUQsVUFBZ0IsdUJBQXVCLENBQUMsZ0JBQWdCLEVBQUUsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUl6RjtJQUVELFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLE1BQU0sT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FFOUQ7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDJfdGlwc19zdG9yZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3N0b3Jlcy9sMl90aXBzX3N0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQW9CLE1BQU0saUNBQWlDLENBQUM7QUFDaEYsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFFLEtBQUssWUFBWSxFQUFFLEtBQUssVUFBVSxFQUFFLGVBQWUsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBRzFHLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFLaEU7OztHQUdHO0FBQ0gscUJBQWEsYUFBYyxTQUFRLGVBQWU7SUFNOUMsT0FBTyxDQUFDLEtBQUs7SUFMZixPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBeUM7SUFDckUsT0FBTyxDQUFDLFFBQVEsQ0FBQyxxQkFBcUIsQ0FBZ0Q7SUFDdEYsT0FBTyxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBcUM7SUFFeEUsWUFDVSxLQUFLLEVBQUUsaUJBQWlCLEVBQ2hDLFNBQVMsRUFBRSxNQUFNLEVBQ2pCLGdCQUFnQixFQUFFLFNBQVMsRUFNNUI7SUFFRCxTQUFTLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLFdBQVcsR0FBRyxTQUFTLENBQUMsQ0FFbEU7SUFFRCxTQUFTLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxVQUFVLEVBQUUsV0FBVyxFQUFFLFdBQVcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBRXpFO0lBRUQsVUFBZ0IsZ0JBQWdCLENBQUMsR0FBRyxFQUFFLFVBQVUsR0FBRyxPQUFPLENBQUMsWUFBWSxHQUFHLFNBQVMsQ0FBQyxDQU1uRjtJQUVELFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsVUFBVSxFQUFFLFVBQVUsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUVuRjtJQUVELFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxXQUFXLEVBQUUsV0FBVyxHQUFHLE9BQU8sQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDLENBRWxGO0lBRUQsU0FBUyxDQUFDLFlBQVksQ0FBQyxXQUFXLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUU1RTtJQUVELFVBQWdCLHVCQUF1QixDQUFDLFdBQVcsRUFBRSxXQUFXLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUkvRTtJQUVELFNBQVMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLE1BQU0sT0FBTyxDQUFDLENBQUMsQ0FBQyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FFOUQ7Q0FDRiJ9

package/dest/stores/l2_tips_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2_tips_store.d.ts","sourceRoot":"","sources":["../../src/stores/l2_tips_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,UAAU,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACvF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAEhE;;;GAGG;AACH,qBAAa,aAAc,SAAQ,eAAe;IAO9C,OAAO,CAAC,KAAK;IANf,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyC;IACrE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqC;IACxE,OAAO,CAAC,QAAQ,CAAC,oCAAoC,CAA+C;IACpG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA0C;IAE5E,YACU,KAAK,EAAE,iBAAiB,EAChC,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,SAAS,EAS5B;IAED,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAElE;IAED,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzE;IAED,SAAS,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAElF;IAED,SAAS,CAAC,YAAY,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5E;IAED,UAAgB,uBAAuB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAI/E;IAED,SAAS,CAAC,2BAA2B,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAErG;IAED,SAAS,CAAC,2BAA2B,CAAC,WAAW,EAAE,WAAW,EAAE,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjH;IAED,UAAgB,6BAA6B,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAIrF;IAED,UAAgB,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAM1G;IAED,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3E;IAED,UAAgB,uBAAuB,CAAC,gBAAgB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAIzF;IAED,SAAS,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAE9D;CACF"}
+{"version":3,"file":"l2_tips_store.d.ts","sourceRoot":"","sources":["../../src/stores/l2_tips_store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAoB,MAAM,iCAAiC,CAAC;AAChF,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,YAAY,EAAE,KAAK,UAAU,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAG1G,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAKhE;;;GAGG;AACH,qBAAa,aAAc,SAAQ,eAAe;IAM9C,OAAO,CAAC,KAAK;IALf,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAyC;IACrE,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAgD;IACtF,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqC;IAExE,YACU,KAAK,EAAE,iBAAiB,EAChC,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,SAAS,EAM5B;IAED,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAElE;IAED,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzE;IAED,UAAgB,gBAAgB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnF;IAED,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnF;IAED,SAAS,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAElF;IAED,SAAS,CAAC,YAAY,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE5E;IAED,UAAgB,uBAAuB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAI/E;IAED,SAAS,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAE9D;CACF"}

package/dest/stores/l2_tips_store.js

@@ -1,31 +1,26 @@
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { L2TipsStoreBase } from '@aztec/stdlib/block';
-import { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
 /**
  * Persistent implementation of L2 tips store backed by a KV store.
  * Used by nodes that need to persist chain state across restarts.
  */ export class L2TipsKVStore extends L2TipsStoreBase {
     store;
     l2TipsStore;
+    l2TipCheckpointsStore;
     l2BlockHashesStore;
-    l2BlockNumberToCheckpointNumberStore;
-    l2CheckpointStore;
     constructor(store, namespace, initialBlockHash){
         super(initialBlockHash), this.store = store;
         this.l2TipsStore = store.openMap([
             namespace,
             'l2_tips'
         ].join('_'));
-        this.l2BlockHashesStore = store.openMap([
-            namespace,
-            'l2_block_hashes'
-        ].join('_'));
-        this.l2BlockNumberToCheckpointNumberStore = store.openMap([
+        this.l2TipCheckpointsStore = store.openMap([
             namespace,
-            'l2_block_number_to_checkpoint_number'
+            'l2_tip_checkpoints'
         ].join('_'));
-        this.l2CheckpointStore = store.openMap([
+        this.l2BlockHashesStore = store.openMap([
             namespace,
-            'l2_checkpoint_store'
+            'l2_block_hashes'
         ].join('_'));
     }
     getTip(tag) {
@@ -34,6 +29,22 @@ import { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
     setTip(tag, blockNumber) {
         return this.l2TipsStore.set(tag, blockNumber);
     }
+    async getTipCheckpoint(tag) {
+        const stored = await this.l2TipCheckpointsStore.getAsync(tag);
+        if (stored === undefined) {
+            return undefined;
+        }
+        return {
+            number: CheckpointNumber(stored.number),
+            hash: stored.hash
+        };
+    }
+    setTipCheckpoint(tag, checkpoint) {
+        return this.l2TipCheckpointsStore.set(tag, {
+            number: checkpoint.number,
+            hash: checkpoint.hash
+        });
+    }
     getStoredBlockHash(blockNumber) {
         return this.l2BlockHashesStore.getAsync(blockNumber);
     }
@@ -47,36 +58,6 @@ import { PublishedCheckpoint } from '@aztec/stdlib/checkpoint';
             await this.l2BlockHashesStore.delete(key);
         }
     }
-    getCheckpointNumberForBlock(blockNumber) {
-        return this.l2BlockNumberToCheckpointNumberStore.getAsync(blockNumber);
-    }
-    setCheckpointNumberForBlock(blockNumber, checkpointNumber) {
-        return this.l2BlockNumberToCheckpointNumberStore.set(blockNumber, checkpointNumber);
-    }
-    async deleteBlockToCheckpointBefore(blockNumber) {
-        for await (const key of this.l2BlockNumberToCheckpointNumberStore.keysAsync({
-            end: blockNumber
-        })){
-            await this.l2BlockNumberToCheckpointNumberStore.delete(key);
-        }
-    }
-    async getCheckpoint(checkpointNumber) {
-        const buffer = await this.l2CheckpointStore.getAsync(checkpointNumber);
-        if (!buffer) {
-            return undefined;
-        }
-        return PublishedCheckpoint.fromBuffer(buffer);
-    }
-    saveCheckpointData(checkpoint) {
-        return this.l2CheckpointStore.set(checkpoint.checkpoint.number, checkpoint.toBuffer());
-    }
-    async deleteCheckpointsBefore(checkpointNumber) {
-        for await (const key of this.l2CheckpointStore.keysAsync({
-            end: checkpointNumber
-        })){
-            await this.l2CheckpointStore.delete(key);
-        }
-    }
     runInTransaction(fn) {
         return this.store.transactionAsync(fn);
     }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@aztec/kv-store",
-  "version": "0.0.1-commit.b9865e97",
+  "version": "0.0.1-commit.be03c316",
   "type": "module",
   "exports": {
     ".": "./dest/interfaces/index.js",
     "./interfaces": "./dest/interfaces/index.js",
     "./lmdb": "./dest/lmdb/index.js",
     "./lmdb-v2": "./dest/lmdb-v2/index.js",
-    "./indexeddb": "./dest/indexeddb/index.js",
+    "./deprecated/indexeddb": "./dest/deprecated/indexeddb/index.js",
     "./sqlite-opfs": "./dest/sqlite-opfs/index.js",
     "./stores": "./dest/stores/index.js"
   },
@@ -36,12 +36,12 @@
     "./package.local.json"
   ],
   "dependencies": {
-    "@aztec/constants": "0.0.1-commit.b9865e97",
-    "@aztec/ethereum": "0.0.1-commit.b9865e97",
-    "@aztec/foundation": "0.0.1-commit.b9865e97",
-    "@aztec/native": "0.0.1-commit.b9865e97",
-    "@aztec/sqlite3mc-wasm": "0.0.1-commit.b9865e97",
-    "@aztec/stdlib": "0.0.1-commit.b9865e97",
+    "@aztec/constants": "0.0.1-commit.be03c316",
+    "@aztec/ethereum": "0.0.1-commit.be03c316",
+    "@aztec/foundation": "0.0.1-commit.be03c316",
+    "@aztec/native": "0.0.1-commit.be03c316",
+    "@aztec/sqlite3mc-wasm": "0.0.1-commit.be03c316",
+    "@aztec/stdlib": "0.0.1-commit.be03c316",
     "idb": "^8.0.0",
     "lmdb": "^3.2.0",
     "msgpackr": "^1.11.2",

package/src/{indexeddb → deprecated/indexeddb}/array.ts

@@ -1,8 +1,8 @@
 import type { IDBPDatabase, IDBPObjectStore } from 'idb';
 import { hash } from 'ohash';
 
-import type { AztecAsyncArray } from '../interfaces/array.js';
-import type { Value } from '../interfaces/common.js';
+import type { AztecAsyncArray } from '../../interfaces/array.js';
+import type { Value } from '../../interfaces/common.js';
 import type { AztecIDBSchema } from './store.js';
 
 /**

package/src/deprecated/indexeddb/index.ts

@@ -0,0 +1,12 @@
+import { createLogger } from '@aztec/foundation/log';
+
+import { AztecIndexedDBStore } from './store.js';
+
+export { AztecIndexedDBStore } from './store.js';
+
+/**
+ * @deprecated The IndexedDB backend is being retired. Use `@aztec/kv-store/sqlite-opfs` instead.
+ */
+export function openTmpStore(ephemeral: boolean = false): Promise<AztecIndexedDBStore> {
+  return AztecIndexedDBStore.open(createLogger('kv-store:indexeddb'), undefined, ephemeral);
+}

package/src/{indexeddb → deprecated/indexeddb}/map.ts

@@ -1,8 +1,8 @@
 import type { IDBPDatabase, IDBPObjectStore } from 'idb';
 import { hash } from 'ohash';
 
-import type { Key, Range, Value } from '../interfaces/common.js';
-import type { AztecAsyncMap } from '../interfaces/map.js';
+import type { Key, Range, Value } from '../../interfaces/common.js';
+import type { AztecAsyncMap } from '../../interfaces/map.js';
 import type { AztecIDBSchema } from './store.js';
 
 /**

package/src/{indexeddb → deprecated/indexeddb}/multi_map.ts

@@ -1,7 +1,7 @@
 import { hash } from 'ohash';
 
-import type { Key, Value } from '../interfaces/common.js';
-import type { AztecAsyncMultiMap } from '../interfaces/multi_map.js';
+import type { Key, Value } from '../../interfaces/common.js';
+import type { AztecAsyncMultiMap } from '../../interfaces/multi_map.js';
 import { IndexedDBAztecMap } from './map.js';
 
 /**

package/src/{indexeddb → deprecated/indexeddb}/set.ts

@@ -1,7 +1,7 @@
 import type { IDBPDatabase, IDBPObjectStore } from 'idb';
 
-import type { Key, Range } from '../interfaces/common.js';
-import type { AztecAsyncSet } from '../interfaces/set.js';
+import type { Key, Range } from '../../interfaces/common.js';
+import type { AztecAsyncSet } from '../../interfaces/set.js';
 import { IndexedDBAztecMap } from './map.js';
 import type { AztecIDBSchema } from './store.js';
 

package/src/{indexeddb → deprecated/indexeddb}/singleton.ts

@@ -1,8 +1,8 @@
 import type { IDBPDatabase, IDBPObjectStore } from 'idb';
 import { hash } from 'ohash';
 
-import type { Value } from '../interfaces/common.js';
-import type { AztecAsyncSingleton } from '../interfaces/singleton.js';
+import type { Value } from '../../interfaces/common.js';
+import type { AztecAsyncSingleton } from '../../interfaces/singleton.js';
 import type { AztecIDBSchema } from './store.js';
 
 /**

package/src/{indexeddb → deprecated/indexeddb}/store.ts

@@ -3,14 +3,14 @@ import { SerialQueue } from '@aztec/foundation/queue';
 
 import { type DBSchema, type IDBPDatabase, deleteDB, openDB } from 'idb';
 
-import type { AztecAsyncArray } from '../interfaces/array.js';
-import type { Key, StoreSize, Value } from '../interfaces/common.js';
-import type { AztecAsyncCounter } from '../interfaces/counter.js';
-import type { AztecAsyncMap } from '../interfaces/map.js';
-import type { AztecAsyncMultiMap } from '../interfaces/multi_map.js';
-import type { AztecAsyncSet } from '../interfaces/set.js';
-import type { AztecAsyncSingleton } from '../interfaces/singleton.js';
-import type { AztecAsyncKVStore } from '../interfaces/store.js';
+import type { AztecAsyncArray } from '../../interfaces/array.js';
+import type { Key, StoreSize, Value } from '../../interfaces/common.js';
+import type { AztecAsyncCounter } from '../../interfaces/counter.js';
+import type { AztecAsyncMap } from '../../interfaces/map.js';
+import type { AztecAsyncMultiMap } from '../../interfaces/multi_map.js';
+import type { AztecAsyncSet } from '../../interfaces/set.js';
+import type { AztecAsyncSingleton } from '../../interfaces/singleton.js';
+import type { AztecAsyncKVStore } from '../../interfaces/store.js';
 import { IndexedDBAztecArray } from './array.js';
 import { IndexedDBAztecMap } from './map.js';
 import { IndexedDBAztecMultiMap } from './multi_map.js';
@@ -41,8 +41,9 @@ export interface AztecIDBSchema extends DBSchema {
 
 /**
  * A key-value store backed by IndexedDB.
+ *
+ * @deprecated The IndexedDB backend is being retired. Use `@aztec/kv-store/sqlite-opfs` instead.
  */
-
 export class AztecIndexedDBStore implements AztecAsyncKVStore {
   #rootDB: IDBPDatabase<AztecIDBSchema>;
   #name: string;

package/src/lmdb-v2/factory.ts

@@ -1,6 +1,10 @@
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { type LoggerBindings, createLogger } from '@aztec/foundation/log';
-import { DatabaseVersionManager, type SchemaVersionMismatchPolicy } from '@aztec/stdlib/database-version/manager';
+import {
+  DatabaseVersionManager,
+  type SchemaVersionMismatchPolicy,
+  type VersionFileReadFailurePolicy,
+} from '@aztec/stdlib/database-version/manager';
 import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 
 import { copyFile, mkdir, mkdtemp, rm } from 'fs/promises';
@@ -15,6 +19,7 @@ const MAX_READERS = 16;
 export type CreateStoreOptions = {
   onUpgrade?: (dataDir: string, currentVersion: number, latestVersion: number) => Promise<void>;
   schemaVersionMismatchPolicy?: SchemaVersionMismatchPolicy;
+  versionFileReadFailurePolicy?: VersionFileReadFailurePolicy;
 };
 
 export async function createStore(
@@ -44,6 +49,7 @@ export async function createStore(
         AztecLMDBStoreV2.new(dbDirectory, config.dataStoreMapSizeKb, MAX_READERS, () => Promise.resolve(), bindings),
       onUpgrade: options.onUpgrade,
       schemaVersionMismatchPolicy: options.schemaVersionMismatchPolicy,
+      versionFileReadFailurePolicy: options.versionFileReadFailurePolicy,
     });
 
     log.info(

package/src/sqlite-opfs/errors.ts

@@ -42,3 +42,53 @@ const SQLITE3MC_DECRYPT_ERROR_PATTERNS: readonly RegExp[] = [
 export function isDecryptFailureMessage(message: string): boolean {
   return SQLITE3MC_DECRYPT_ERROR_PATTERNS.some(p => p.test(message));
 }
+
+/**
+ * Error thrown by sqlite-opfs when the on-disk database image is corrupt
+ * (`SQLITE_CORRUPT`, result code 11 — "database disk image is malformed").
+ *
+ * Distinct from {@link SqliteEncryptionError}: no key recovers a corrupt image,
+ * so there is nothing to retry. The only escape is to delete the store and start
+ * fresh, so consumers pattern-match on `instanceof SqliteCorruptionError` to wipe
+ * and reopen rather than surfacing a dead-end error.
+ **/
+export class SqliteCorruptionError extends Error {
+  constructor(message: string, opts?: { cause?: unknown }) {
+    super(message, opts?.cause !== undefined ? { cause: opts.cause } : undefined);
+    this.name = 'SqliteCorruptionError';
+  }
+}
+
+/** Error thrown when another browser context already owns a store's OPFS pool. */
+export class SqlitePoolBusyError extends Error {
+  constructor(public readonly poolDirectory: string) {
+    super(`SQLite-OPFS pool "${poolDirectory}" is already in use by another store instance`);
+    this.name = 'SqlitePoolBusyError';
+  }
+}
+
+/** Error thrown when the browser context does not expose the Web Locks API required by the OPFS SAH pool. */
+export class SqliteWebLocksUnavailableError extends Error {
+  constructor() {
+    super('SQLite-OPFS requires the Web Locks API, but it is unavailable in this browser context');
+    this.name = 'SqliteWebLocksUnavailableError';
+  }
+}
+
+/**
+ * Strings/codes raised by SQLite when a database image is corrupt. Kept disjoint
+ * from {@link SQLITE3MC_DECRYPT_ERROR_PATTERNS}: "file is not a database"
+ * (SQLITE_NOTADB) is the decrypt signal, whereas a malformed image is the
+ * genuinely-unrecoverable SQLITE_CORRUPT.
+ **/
+const SQLITE_CORRUPTION_ERROR_PATTERNS: readonly RegExp[] = [
+  /database disk image is malformed/i,
+  /\bSQLITE_CORRUPT\b/i,
+];
+
+/**
+ * Returns `true` if `message` matches one of the known SQLite corruption strings.
+ **/
+export function isCorruptionMessage(message: string): boolean {
+  return SQLITE_CORRUPTION_ERROR_PATTERNS.some(p => p.test(message));
+}

package/src/sqlite-opfs/index.ts

@@ -1,28 +1,16 @@
-import { type Logger, createLogger } from '@aztec/foundation/log';
-import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
+import { createLogger } from '@aztec/foundation/log';
 
-import { initStoreForRollupAndSchemaVersion } from '../utils.js';
 import { AztecSQLiteOPFSStore } from './store.js';
 
 export { AztecSQLiteOPFSStore } from './store.js';
-export { SqliteEncryptionError } from './errors.js';
+export {
+  SqliteCorruptionError,
+  SqliteEncryptionError,
+  SqlitePoolBusyError,
+  SqliteWebLocksUnavailableError,
+} from './errors.js';
 export type { SqliteEncryptionErrorCode } from './errors.js';
-
-export async function createStore(
-  name: string,
-  config: DataStoreConfig,
-  schemaVersion: number | undefined = undefined,
-  log: Logger = createLogger('kv-store'),
-) {
-  const { dataDirectory } = config;
-  log.info(
-    dataDirectory
-      ? `Creating ${name} SQLite-OPFS data store with map size ${config.dataStoreMapSizeKb} KB`
-      : `Creating ${name} ephemeral SQLite-OPFS data store with map size ${config.dataStoreMapSizeKb} KB`,
-  );
-  const store = await AztecSQLiteOPFSStore.open(createLogger('kv-store:sqlite-opfs'), name, false);
-  return initStoreForRollupAndSchemaVersion(store, schemaVersion, config.rollupAddress, log);
-}
+export { OPFS_POOL_DIR_PREFIX, deletePoolDirectory, deleteStore, listStores, storePoolDirectory } from './manage.js';
 
 export function openTmpStore(ephemeral: boolean = false): Promise<AztecSQLiteOPFSStore> {
   return AztecSQLiteOPFSStore.open(createLogger('kv-store:sqlite-opfs'), undefined, ephemeral);

package/src/sqlite-opfs/manage.ts

@@ -0,0 +1,46 @@
+import { normalizePoolDirectory, withPoolLock } from './pool_lock.js';
+
+/** Prefix for the per-store OPFS SAH pool directories owned by this package. */
+export const OPFS_POOL_DIR_PREFIX = '.aztec-kv-';
+
+/**
+ * OPFS directory holding a store's SAH pool. One directory per store: the SAH-pool VFS allows only one
+ * concurrent instance per directory and its capacity does not grow automatically, so sharing a pool across
+ * stores would make concurrently opened stores contend for locks and orphaned stores exhaust pool slots.
+ */
+export function storePoolDirectory(effectiveName: string): string {
+  return `${OPFS_POOL_DIR_PREFIX}${effectiveName}`;
+}
+
+/**
+ * Lists the names of every persistent sqlite-opfs store in this origin, by enumerating the per-store pool
+ * directories. Includes stores other than the current one, so wallets can surface and clean up data for
+ * networks/versions no longer in use.
+ */
+export async function listStores(): Promise<string[]> {
+  const root = await navigator.storage.getDirectory();
+  const names: string[] = [];
+  for await (const [entryName, handle] of root.entries()) {
+    if (handle.kind === 'directory' && entryName.startsWith(OPFS_POOL_DIR_PREFIX)) {
+      names.push(entryName.slice(OPFS_POOL_DIR_PREFIX.length));
+    }
+  }
+  return names;
+}
+
+/**
+ * Permanently deletes a store by effective name (as returned by {@link listStores}). The store must be closed:
+ * an open store holds the directory's Web Lock and the removal will reject with `SqlitePoolBusyError`.
+ */
+export async function deleteStore(effectiveName: string): Promise<void> {
+  await deletePoolDirectory(storePoolDirectory(effectiveName));
+}
+
+/** Permanently deletes one OPFS SAH-pool directory after exclusively locking it. */
+export async function deletePoolDirectory(poolDirectory: string): Promise<void> {
+  poolDirectory = normalizePoolDirectory(poolDirectory);
+  await withPoolLock(poolDirectory, async () => {
+    const root = await navigator.storage.getDirectory();
+    await root.removeEntry(poolDirectory, { recursive: true });
+  });
+}