@aztec/wallets 0.0.1-commit.a5db02d → 0.0.1-commit.aa0c64f

package/dest/embedded/embedded_wallet.js

@@ -223,7 +223,7 @@ export class EmbeddedWallet extends BaseWallet {
    * private kernel circuit execution.
    */ async simulateViaEntrypoint(executionPayload, opts) {
         const { from, feeOptions, additionalScopes, skipTxValidation, skipFeeEnforcement, sendMessagesAs } = opts;
-        const scopes = this.scopesFrom(from, additionalScopes);
+        const scopes = this.scopesFrom(from, additionalScopes ?? [], sendMessagesAs);
         const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
         const finalExecutionPayload = feeExecutionPayload ? mergeExecutionPayloads([
             feeExecutionPayload,

package/dest/embedded/store_encryption.d.ts

@@ -39,6 +39,13 @@ export interface OpenEncryptedEmbeddedStoresOptions {
  * @internal
  */
 export type OpenSqliteEncryptedStoreFn = (log: Logger, name: string, poolDirectory: string | undefined, encryptionKey: Uint8Array) => Promise<AztecSQLiteOPFSStore>;
+/**
+ * Internal seam for tests to inject a fake store wiper. Defaults to removing the store's OPFS pool directory
+ * outright. Not part of the public API.
+ *
+ * @internal
+ */
+export type WipeSqliteStoreFn = (poolDirectory: string | undefined) => Promise<void>;
 /**
  * Opens the PXE and wallet stores in sequence, both encrypted with keys obtained from `getEncryptionKey`.
  *
@@ -60,8 +67,8 @@ export type OpenSqliteEncryptedStoreFn = (log: Logger, name: string, poolDirecto
  * @param log              - Logger for both stores.
  * @param openStore        - Internal test seam. Do not pass in production code.
  */
-export declare function openEncryptedEmbeddedStores(config: OpenEncryptedEmbeddedStoresOptions, getEncryptionKey: () => Promise<Uint8Array>, log: Logger, openStore?: OpenSqliteEncryptedStoreFn): Promise<{
+export declare function openEncryptedEmbeddedStores(config: OpenEncryptedEmbeddedStoresOptions, getEncryptionKey: () => Promise<Uint8Array>, log: Logger, openStore?: OpenSqliteEncryptedStoreFn, wipeStore?: WipeSqliteStoreFn): Promise<{
     pxeStore: AztecSQLiteOPFSStore;
     walletStore: AztecSQLiteOPFSStore;
 }>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmVfZW5jcnlwdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2VtYmVkZGVkL3N0b3JlX2VuY3J5cHRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7O0dBUUc7QUFDSCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUUxRixnRUFBZ0U7QUFDaEUsTUFBTSxNQUFNLGlCQUFpQixHQUFHLEtBQUssR0FBRyxRQUFRLENBQUM7QUFFakQ7OztHQUdHO0FBQ0gscUJBQWEsNkJBQThCLFNBQVEsS0FBSztJQUN0RCxRQUFRLENBQUMsU0FBUyxFQUFFLGlCQUFpQixDQUFDO0lBRXRDLFlBQVksU0FBUyxFQUFFLGlCQUFpQixFQUFFLElBQUksRUFBRTtRQUFFLEtBQUssRUFBRSxxQkFBcUIsQ0FBQTtLQUFFLEVBSS9FO0NBQ0Y7QUFFRCw2REFBNkQ7QUFDN0QsTUFBTSxXQUFXLGtDQUFrQztJQUNqRCxHQUFHLEVBQUU7UUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDO1FBQUMsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FBQztJQUM5QyxNQUFNLEVBQUU7UUFBRSxJQUFJLEVBQUUsTUFBTSxDQUFDO1FBQUMsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FBQztDQUNsRDtBQUVEOzs7OztHQUtHO0FBQ0gsTUFBTSxNQUFNLDBCQUEwQixHQUFHLENBQ3ZDLEdBQUcsRUFBRSxNQUFNLEVBQ1gsSUFBSSxFQUFFLE1BQU0sRUFDWixhQUFhLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDakMsYUFBYSxFQUFFLFVBQVUsS0FDdEIsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUM7QUFLbkM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JHO0FBQ0gsd0JBQXNCLDJCQUEyQixDQUMvQyxNQUFNLEVBQUUsa0NBQWtDLEVBQzFDLGdCQUFnQixFQUFFLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUMzQyxHQUFHLEVBQUUsTUFBTSxFQUNYLFNBQVMsR0FBRSwwQkFBNkMsR0FDdkQsT0FBTyxDQUFDO0lBQUUsUUFBUSxFQUFFLG9CQUFvQixDQUFDO0lBQUMsV0FBVyxFQUFFLG9CQUFvQixDQUFBO0NBQUUsQ0FBQyxDQVdoRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RvcmVfZW5jcnlwdGlvbi5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2VtYmVkZGVkL3N0b3JlX2VuY3J5cHRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7O0dBUUc7QUFDSCxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNwRCxPQUFPLEVBQ0wsb0JBQW9CLEVBRXBCLHFCQUFxQixFQUV0QixNQUFNLDZCQUE2QixDQUFDO0FBRXJDLGdFQUFnRTtBQUNoRSxNQUFNLE1BQU0saUJBQWlCLEdBQUcsS0FBSyxHQUFHLFFBQVEsQ0FBQztBQUVqRDs7O0dBR0c7QUFDSCxxQkFBYSw2QkFBOEIsU0FBUSxLQUFLO0lBQ3RELFFBQVEsQ0FBQyxTQUFTLEVBQUUsaUJBQWlCLENBQUM7SUFFdEMsWUFBWSxTQUFTLEVBQUUsaUJBQWlCLEVBQUUsSUFBSSxFQUFFO1FBQUUsS0FBSyxFQUFFLHFCQUFxQixDQUFBO0tBQUUsRUFJL0U7Q0FDRjtBQUVELDZEQUE2RDtBQUM3RCxNQUFNLFdBQVcsa0NBQWtDO0lBQ2pELEdBQUcsRUFBRTtRQUFFLElBQUksRUFBRSxNQUFNLENBQUM7UUFBQyxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxDQUFDO0lBQzlDLE1BQU0sRUFBRTtRQUFFLElBQUksRUFBRSxNQUFNLENBQUM7UUFBQyxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUE7S0FBRSxDQUFDO0NBQ2xEO0FBRUQ7Ozs7O0dBS0c7QUFDSCxNQUFNLE1BQU0sMEJBQTBCLEdBQUcsQ0FDdkMsR0FBRyxFQUFFLE1BQU0sRUFDWCxJQUFJLEVBQUUsTUFBTSxFQUNaLGFBQWEsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUNqQyxhQUFhLEVBQUUsVUFBVSxLQUN0QixPQUFPLENBQUMsb0JBQW9CLENBQUMsQ0FBQztBQUtuQzs7Ozs7R0FLRztBQUNILE1BQU0sTUFBTSxpQkFBaUIsR0FBRyxDQUFDLGFBQWEsRUFBRSxNQUFNLEdBQUcsU0FBUyxLQUFLLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztBQWdCckY7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBb0JHO0FBQ0gsd0JBQXNCLDJCQUEyQixDQUMvQyxNQUFNLEVBQUUsa0NBQWtDLEVBQzFDLGdCQUFnQixFQUFFLE1BQU0sT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUMzQyxHQUFHLEVBQUUsTUFBTSxFQUNYLFNBQVMsR0FBRSwwQkFBNkMsRUFDeEQsU0FBUyxHQUFFLGlCQUFvQyxHQUM5QyxPQUFPLENBQUM7SUFBRSxRQUFRLEVBQUUsb0JBQW9CLENBQUM7SUFBQyxXQUFXLEVBQUUsb0JBQW9CLENBQUE7Q0FBRSxDQUFDLENBV2hGIn0=

package/dest/embedded/store_encryption.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store_encryption.d.ts","sourceRoot":"","sources":["../../src/embedded/store_encryption.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAE1F,gEAAgE;AAChE,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,QAAQ,CAAC;AAEjD;;;GAGG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;IAEtC,YAAY,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE;QAAE,KAAK,EAAE,qBAAqB,CAAA;KAAE,EAI/E;CACF;AAED,6DAA6D;AAC7D,MAAM,WAAW,kCAAkC;IACjD,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAClD;AAED;;;;;GAKG;AACH,MAAM,MAAM,0BAA0B,GAAG,CACvC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,aAAa,EAAE,UAAU,KACtB,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAKnC;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,kCAAkC,EAC1C,gBAAgB,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,EAC3C,GAAG,EAAE,MAAM,EACX,SAAS,GAAE,0BAA6C,GACvD,OAAO,CAAC;IAAE,QAAQ,EAAE,oBAAoB,CAAC;IAAC,WAAW,EAAE,oBAAoB,CAAA;CAAE,CAAC,CAWhF"}
+{"version":3,"file":"store_encryption.d.ts","sourceRoot":"","sources":["../../src/embedded/store_encryption.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EACL,oBAAoB,EAEpB,qBAAqB,EAEtB,MAAM,6BAA6B,CAAC;AAErC,gEAAgE;AAChE,MAAM,MAAM,iBAAiB,GAAG,KAAK,GAAG,QAAQ,CAAC;AAEjD;;;GAGG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;IAEtC,YAAY,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE;QAAE,KAAK,EAAE,qBAAqB,CAAA;KAAE,EAI/E;CACF;AAED,6DAA6D;AAC7D,MAAM,WAAW,kCAAkC;IACjD,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAClD;AAED;;;;;GAKG;AACH,MAAM,MAAM,0BAA0B,GAAG,CACvC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,aAAa,EAAE,UAAU,KACtB,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAKnC;;;;;GAKG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAgBrF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,kCAAkC,EAC1C,gBAAgB,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,EAC3C,GAAG,EAAE,MAAM,EACX,SAAS,GAAE,0BAA6C,EACxD,SAAS,GAAE,iBAAoC,GAC9C,OAAO,CAAC;IAAE,QAAQ,EAAE,oBAAoB,CAAC;IAAC,WAAW,EAAE,oBAAoB,CAAA;CAAE,CAAC,CAWhF"}

package/dest/embedded/store_encryption.js

@@ -6,7 +6,7 @@
  *   - `storeName: 'pxe' | 'wallet'`, telling callers WHICH store failed.
  *   - Cleanup: when the wallet store fails to open, ensures the already-opened PXE store is closed before the error
  *     surfaces, so callers don't leak the SAH Pool's OPFS lock.
- */ import { AztecSQLiteOPFSStore, SqliteEncryptionError } from '@aztec/kv-store/sqlite-opfs';
+ */ import { AztecSQLiteOPFSStore, SqliteCorruptionError, SqliteEncryptionError, deletePoolDirectory } from '@aztec/kv-store/sqlite-opfs';
 /**
  * Thrown by {@link openEncryptedEmbeddedStores} when one of the two stores cannot be decrypted with the supplied
  * key. The original {@link SqliteEncryptionError} is preserved as `cause`.
@@ -21,6 +21,18 @@
     }
 }
 const defaultOpenStore = (log, name, poolDirectory, encryptionKey)=>AztecSQLiteOPFSStore.open(log, name, false, poolDirectory, encryptionKey);
+/**
+ * Deletes a store's OPFS pool directory. Safe to call only after a *failed* open() — a live store's SAH pool holds
+ * a lock on the directory and the removal would reject. A store with no `poolDirectory` lives in the shared default
+ * pool, which we won't blow away (it would take unrelated stores with it), so wiping is a no-op there.
+ */ const defaultWipeStore = async (poolDirectory)=>{
+    if (!poolDirectory) {
+        return;
+    }
+    await deletePoolDirectory(poolDirectory).catch(()=>{
+    // Already gone / never created — nothing to wipe.
+    });
+};
 /**
  * Opens the PXE and wallet stores in sequence, both encrypted with keys obtained from `getEncryptionKey`.
  *
@@ -41,10 +53,10 @@ const defaultOpenStore = (log, name, poolDirectory, encryptionKey)=>AztecSQLiteO
  *                           detaches on transfer, so each call must allocate).
  * @param log              - Logger for both stores.
  * @param openStore        - Internal test seam. Do not pass in production code.
- */ export async function openEncryptedEmbeddedStores(config, getEncryptionKey, log, openStore = defaultOpenStore) {
-    const pxeStore = await openOneStore('pxe', config.pxe, getEncryptionKey, log, openStore);
+ */ export async function openEncryptedEmbeddedStores(config, getEncryptionKey, log, openStore = defaultOpenStore, wipeStore = defaultWipeStore) {
+    const pxeStore = await openOneStore('pxe', config.pxe, getEncryptionKey, log, openStore, wipeStore);
     try {
-        const walletStore = await openOneStore('wallet', config.wallet, getEncryptionKey, log, openStore);
+        const walletStore = await openOneStore('wallet', config.wallet, getEncryptionKey, log, openStore, wipeStore);
         return {
             pxeStore,
             walletStore
@@ -56,7 +68,7 @@ const defaultOpenStore = (log, name, poolDirectory, encryptionKey)=>AztecSQLiteO
         throw err;
     }
 }
-async function openOneStore(storeName, { name, poolDirectory }, getEncryptionKey, log, openStore) {
+async function openOneStore(storeName, { name, poolDirectory }, getEncryptionKey, log, openStore, wipeStore) {
     const key = await getEncryptionKey();
     try {
         return await openStore(log, name, poolDirectory, key);
@@ -66,6 +78,16 @@ async function openOneStore(storeName, { name, poolDirectory }, getEncryptionKey
                 cause: err
             });
         }
+        if (err instanceof SqliteCorruptionError) {
+            // A corrupt image is unrecoverable — no key or retry against the same bytes brings it back. Self-heal
+            // instead of dead-ending forever: wipe the store's OPFS directory (safe — the failed open left no SAH-pool
+            // lock behind) and reopen a fresh, empty one, so callers see a normal first-run rather than a permanent
+            // "database disk image is malformed" on every open.
+            log.warn(`Embedded wallet '${storeName}' store is corrupt (${err.message}); wiping and reopening fresh`);
+            await wipeStore(poolDirectory);
+            // open() transferred (detached) the previous key buffer, so fetch a fresh one for the reopen.
+            return await openStore(log, name, poolDirectory, await getEncryptionKey());
+        }
         throw err;
     }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aztec/wallets",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/wallets",
-  "version": "0.0.1-commit.a5db02d",
+  "version": "0.0.1-commit.aa0c64f",
   "type": "module",
   "exports": {
     "./embedded": {
@@ -28,16 +28,16 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.a5db02d",
-    "@aztec/aztec.js": "0.0.1-commit.a5db02d",
-    "@aztec/entrypoints": "0.0.1-commit.a5db02d",
-    "@aztec/foundation": "0.0.1-commit.a5db02d",
-    "@aztec/kv-store": "0.0.1-commit.a5db02d",
-    "@aztec/protocol-contracts": "0.0.1-commit.a5db02d",
-    "@aztec/pxe": "0.0.1-commit.a5db02d",
-    "@aztec/standard-contracts": "0.0.1-commit.a5db02d",
-    "@aztec/stdlib": "0.0.1-commit.a5db02d",
-    "@aztec/wallet-sdk": "0.0.1-commit.a5db02d"
+    "@aztec/accounts": "0.0.1-commit.aa0c64f",
+    "@aztec/aztec.js": "0.0.1-commit.aa0c64f",
+    "@aztec/entrypoints": "0.0.1-commit.aa0c64f",
+    "@aztec/foundation": "0.0.1-commit.aa0c64f",
+    "@aztec/kv-store": "0.0.1-commit.aa0c64f",
+    "@aztec/protocol-contracts": "0.0.1-commit.aa0c64f",
+    "@aztec/pxe": "0.0.1-commit.aa0c64f",
+    "@aztec/standard-contracts": "0.0.1-commit.aa0c64f",
+    "@aztec/stdlib": "0.0.1-commit.aa0c64f",
+    "@aztec/wallet-sdk": "0.0.1-commit.aa0c64f"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",

package/src/embedded/embedded_wallet.ts

@@ -329,7 +329,7 @@ export class EmbeddedWallet extends BaseWallet {
     opts: SimulateViaEntrypointOptions,
   ): Promise<TxSimulationResultWithAppOffset> {
     const { from, feeOptions, additionalScopes, skipTxValidation, skipFeeEnforcement, sendMessagesAs } = opts;
-    const scopes = this.scopesFrom(from, additionalScopes);
+    const scopes = this.scopesFrom(from, additionalScopes ?? [], sendMessagesAs);
 
     const feeExecutionPayload = await feeOptions.walletFeePaymentMethod?.getExecutionPayload();
     const finalExecutionPayload = feeExecutionPayload

package/src/embedded/store_encryption.ts

@@ -8,7 +8,12 @@
  *     surfaces, so callers don't leak the SAH Pool's OPFS lock.
  */
 import type { Logger } from '@aztec/foundation/log';
-import { AztecSQLiteOPFSStore, SqliteEncryptionError } from '@aztec/kv-store/sqlite-opfs';
+import {
+  AztecSQLiteOPFSStore,
+  SqliteCorruptionError,
+  SqliteEncryptionError,
+  deletePoolDirectory,
+} from '@aztec/kv-store/sqlite-opfs';
 
 /** Which of the embedded wallet's two stores failed to open. */
 export type EmbeddedStoreName = 'pxe' | 'wallet';
@@ -49,6 +54,28 @@ export type OpenSqliteEncryptedStoreFn = (
 const defaultOpenStore: OpenSqliteEncryptedStoreFn = (log, name, poolDirectory, encryptionKey) =>
   AztecSQLiteOPFSStore.open(log, name, false, poolDirectory, encryptionKey);
 
+/**
+ * Internal seam for tests to inject a fake store wiper. Defaults to removing the store's OPFS pool directory
+ * outright. Not part of the public API.
+ *
+ * @internal
+ */
+export type WipeSqliteStoreFn = (poolDirectory: string | undefined) => Promise<void>;
+
+/**
+ * Deletes a store's OPFS pool directory. Safe to call only after a *failed* open() — a live store's SAH pool holds
+ * a lock on the directory and the removal would reject. A store with no `poolDirectory` lives in the shared default
+ * pool, which we won't blow away (it would take unrelated stores with it), so wiping is a no-op there.
+ */
+const defaultWipeStore: WipeSqliteStoreFn = async poolDirectory => {
+  if (!poolDirectory) {
+    return;
+  }
+  await deletePoolDirectory(poolDirectory).catch(() => {
+    // Already gone / never created — nothing to wipe.
+  });
+};
+
 /**
  * Opens the PXE and wallet stores in sequence, both encrypted with keys obtained from `getEncryptionKey`.
  *
@@ -75,10 +102,11 @@ export async function openEncryptedEmbeddedStores(
   getEncryptionKey: () => Promise<Uint8Array>,
   log: Logger,
   openStore: OpenSqliteEncryptedStoreFn = defaultOpenStore,
+  wipeStore: WipeSqliteStoreFn = defaultWipeStore,
 ): Promise<{ pxeStore: AztecSQLiteOPFSStore; walletStore: AztecSQLiteOPFSStore }> {
-  const pxeStore = await openOneStore('pxe', config.pxe, getEncryptionKey, log, openStore);
+  const pxeStore = await openOneStore('pxe', config.pxe, getEncryptionKey, log, openStore, wipeStore);
   try {
-    const walletStore = await openOneStore('wallet', config.wallet, getEncryptionKey, log, openStore);
+    const walletStore = await openOneStore('wallet', config.wallet, getEncryptionKey, log, openStore, wipeStore);
     return { pxeStore, walletStore };
   } catch (err) {
     // Cleanup is best-effort — if close() itself throws (e.g. worker already dead), swallow it so the original error
@@ -94,6 +122,7 @@ async function openOneStore(
   getEncryptionKey: () => Promise<Uint8Array>,
   log: Logger,
   openStore: OpenSqliteEncryptedStoreFn,
+  wipeStore: WipeSqliteStoreFn,
 ): Promise<AztecSQLiteOPFSStore> {
   const key = await getEncryptionKey();
   try {
@@ -102,6 +131,16 @@ async function openOneStore(
     if (err instanceof SqliteEncryptionError && err.code === 'decrypt_failed') {
       throw new EmbeddedWalletEncryptionError(storeName, { cause: err });
     }
+    if (err instanceof SqliteCorruptionError) {
+      // A corrupt image is unrecoverable — no key or retry against the same bytes brings it back. Self-heal
+      // instead of dead-ending forever: wipe the store's OPFS directory (safe — the failed open left no SAH-pool
+      // lock behind) and reopen a fresh, empty one, so callers see a normal first-run rather than a permanent
+      // "database disk image is malformed" on every open.
+      log.warn(`Embedded wallet '${storeName}' store is corrupt (${err.message}); wiping and reopening fresh`);
+      await wipeStore(poolDirectory);
+      // open() transferred (detached) the previous key buffer, so fetch a fresh one for the reopen.
+      return await openStore(log, name, poolDirectory, await getEncryptionKey());
+    }
     throw err;
   }
 }