@breeztech/breez-sdk-spark 0.15.1 → 0.17.0

package/bundler/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -3,13 +3,13 @@
 export const memory: WebAssembly.Memory;
 export const __wbg_bitcoinchainservicehandle_free: (a: number, b: number) => void;
 export const __wbg_breezsdk_free: (a: number, b: number) => void;
-export const __wbg_defaultsigner_free: (a: number, b: number) => void;
-export const __wbg_mysqlconnectionpool_free: (a: number, b: number) => void;
-export const __wbg_passkey_free: (a: number, b: number) => void;
-export const __wbg_postgresconnectionpool_free: (a: number, b: number) => void;
+export const __wbg_externalsigners_free: (a: number, b: number) => void;
+export const __wbg_passkeyclient_free: (a: number, b: number) => void;
+export const __wbg_passkeylabels_free: (a: number, b: number) => void;
 export const __wbg_sdkbuilder_free: (a: number, b: number) => void;
 export const __wbg_tokenissuer_free: (a: number, b: number) => void;
 export const __wbg_wasmsdkcontext_free: (a: number, b: number) => void;
+export const __wbg_wasmstorageconfig_free: (a: number, b: number) => void;
 export const bitcoinchainservicehandle_broadcastTransaction: (a: number, b: number, c: number) => any;
 export const bitcoinchainservicehandle_getAddressUtxos: (a: number, b: number, c: number) => any;
 export const bitcoinchainservicehandle_getTransactionHex: (a: number, b: number, c: number) => any;
@@ -17,18 +17,19 @@ export const bitcoinchainservicehandle_getTransactionStatus: (a: number, b: numb
 export const bitcoinchainservicehandle_recommendedFees: (a: number) => any;
 export const breezsdk_addContact: (a: number, b: any) => any;
 export const breezsdk_addEventListener: (a: number, b: any) => any;
+export const breezsdk_authorizeLightningAddressTransfer: (a: number, b: any) => any;
 export const breezsdk_buyBitcoin: (a: number, b: any) => any;
-export const breezsdk_cancelLeafOptimization: (a: number) => any;
 export const breezsdk_checkLightningAddressAvailable: (a: number, b: any) => any;
 export const breezsdk_checkMessage: (a: number, b: any) => any;
 export const breezsdk_claimDeposit: (a: number, b: any) => any;
 export const breezsdk_claimHtlcPayment: (a: number, b: any) => any;
+export const breezsdk_claimLightningAddressTransfer: (a: number, b: any) => any;
 export const breezsdk_deleteContact: (a: number, b: number, c: number) => any;
 export const breezsdk_deleteLightningAddress: (a: number) => any;
 export const breezsdk_disconnect: (a: number) => any;
 export const breezsdk_fetchConversionLimits: (a: number, b: any) => any;
+export const breezsdk_getCrossChainRoutes: (a: number, b: any) => any;
 export const breezsdk_getInfo: (a: number, b: any) => any;
-export const breezsdk_getLeafOptimizationProgress: (a: number) => any;
 export const breezsdk_getLightningAddress: (a: number) => any;
 export const breezsdk_getPayment: (a: number, b: any) => any;
 export const breezsdk_getTokenIssuer: (a: number) => number;
@@ -43,6 +44,7 @@ export const breezsdk_listWebhooks: (a: number) => any;
 export const breezsdk_lnurlAuth: (a: number, b: any) => any;
 export const breezsdk_lnurlPay: (a: number, b: any) => any;
 export const breezsdk_lnurlWithdraw: (a: number, b: any) => any;
+export const breezsdk_optimizeLeaves: (a: number, b: any) => any;
 export const breezsdk_parse: (a: number, b: number, c: number) => any;
 export const breezsdk_prepareLnurlPay: (a: number, b: any) => any;
 export const breezsdk_prepareSendPayment: (a: number, b: any) => any;
@@ -55,65 +57,72 @@ export const breezsdk_registerWebhook: (a: number, b: any) => any;
 export const breezsdk_removeEventListener: (a: number, b: number, c: number) => any;
 export const breezsdk_sendPayment: (a: number, b: any) => any;
 export const breezsdk_signMessage: (a: number, b: any) => any;
-export const breezsdk_startLeafOptimization: (a: number) => any;
 export const breezsdk_syncWallet: (a: number, b: any) => any;
 export const breezsdk_unregisterWebhook: (a: number, b: any) => any;
 export const breezsdk_updateContact: (a: number, b: any) => any;
 export const breezsdk_updateUserSettings: (a: number, b: any) => any;
 export const connect: (a: any) => any;
-export const connectWithSigner: (a: any, b: any, c: number, d: number) => any;
-export const createMysqlConnectionPool: (a: any) => [number, number, number];
-export const createPostgresConnectionPool: (a: any) => [number, number, number];
+export const connectWithSigner: (a: any, b: any, c: any, d: number, e: number) => any;
+export const createTurnkeySigner: (a: any) => any;
 export const defaultConfig: (a: any) => any;
-export const defaultExternalSigner: (a: number, b: number, c: number, d: number, e: any, f: number) => [number, number, number];
+export const defaultExternalSigners: (a: number, b: number, c: number, d: number, e: any, f: number) => [number, number, number];
 export const defaultMysqlStorageConfig: (a: number, b: number) => any;
 export const defaultPostgresStorageConfig: (a: number, b: number) => any;
 export const defaultServerConfig: (a: any) => any;
-export const defaultsigner_aggregateFrost: (a: number, b: any) => any;
-export const defaultsigner_decryptEcies: (a: number, b: number, c: number, d: number, e: number) => any;
-export const defaultsigner_derivePublicKey: (a: number, b: number, c: number) => any;
-export const defaultsigner_encryptEcies: (a: number, b: number, c: number, d: number, e: number) => any;
-export const defaultsigner_encryptPrivateKeyForReceiver: (a: number, b: any, c: any) => any;
-export const defaultsigner_generateRandomSecret: (a: number) => any;
-export const defaultsigner_generateRandomSigningCommitment: (a: number) => any;
-export const defaultsigner_getPublicKeyForNode: (a: number, b: any) => any;
-export const defaultsigner_hmacSha256: (a: number, b: number, c: number, d: number, e: number) => any;
-export const defaultsigner_identityPublicKey: (a: number) => [number, number, number];
-export const defaultsigner_publicKeyFromSecret: (a: number, b: any) => any;
-export const defaultsigner_signEcdsa: (a: number, b: any, c: number, d: number) => any;
-export const defaultsigner_signEcdsaRecoverable: (a: number, b: any, c: number, d: number) => any;
-export const defaultsigner_signFrost: (a: number, b: any) => any;
-export const defaultsigner_signHashSchnorr: (a: number, b: number, c: number, d: number, e: number) => any;
-export const defaultsigner_splitSecretWithProofs: (a: number, b: any, c: number, d: number) => any;
-export const defaultsigner_staticDepositSecret: (a: number, b: number) => any;
-export const defaultsigner_staticDepositSecretEncrypted: (a: number, b: number) => any;
-export const defaultsigner_staticDepositSigningKey: (a: number, b: number) => any;
-export const defaultsigner_subtractSecrets: (a: number, b: any, c: any) => any;
+export const defaultStorage: (a: number, b: number) => number;
+export const externalbreezsignerhandle_decryptEcies: (a: number, b: number, c: number, d: number, e: number) => any;
+export const externalbreezsignerhandle_derivePublicKey: (a: number, b: number, c: number) => any;
+export const externalbreezsignerhandle_encryptEcies: (a: number, b: number, c: number, d: number, e: number) => any;
+export const externalbreezsignerhandle_hmacSha256: (a: number, b: number, c: number, d: number, e: number) => any;
+export const externalbreezsignerhandle_signEcdsa: (a: number, b: any, c: number, d: number) => any;
+export const externalbreezsignerhandle_signEcdsaRecoverable: (a: number, b: any, c: number, d: number) => any;
+export const externalbreezsignerhandle_signHashSchnorr: (a: number, b: number, c: number, d: number, e: number) => any;
+export const externalsigners_breezSigner: (a: number) => number;
+export const externalsigners_sparkSigner: (a: number) => number;
+export const externalsparksignerhandle_getIdentityPublicKey: (a: number) => any;
+export const externalsparksignerhandle_getPublicKeyForLeaf: (a: number, b: any) => any;
+export const externalsparksignerhandle_getStaticDepositPublicKey: (a: number, b: number) => any;
+export const externalsparksignerhandle_prepareClaim: (a: number, b: any) => any;
+export const externalsparksignerhandle_prepareLightningReceive: (a: number, b: any) => any;
+export const externalsparksignerhandle_prepareStaticDeposit: (a: number, b: any) => any;
+export const externalsparksignerhandle_prepareStaticDepositClaim: (a: number, b: any) => any;
+export const externalsparksignerhandle_prepareTokenTransaction: (a: number, b: any) => any;
+export const externalsparksignerhandle_prepareTransfer: (a: number, b: any) => any;
+export const externalsparksignerhandle_signAuthenticationChallenge: (a: number, b: number, c: number) => any;
+export const externalsparksignerhandle_signFrost: (a: number, b: number, c: number) => any;
+export const externalsparksignerhandle_signMessage: (a: number, b: number, c: number) => any;
+export const externalsparksignerhandle_signSparkInvoice: (a: number, b: any) => any;
+export const externalsparksignerhandle_signStaticDepositRefund: (a: number, b: any) => any;
+export const externalsparksignerhandle_startStaticDepositRefund: (a: number, b: any) => any;
 export const getSparkStatus: () => any;
 export const initLogging: (a: any, b: number, c: number) => any;
+export const mysqlStorage: (a: any) => number;
 export const newRestChainService: (a: number, b: number, c: any, d: any, e: number) => any;
 export const newSharedSdkContext: (a: any) => any;
-export const passkey_getWallet: (a: number, b: number, c: number) => any;
-export const passkey_isAvailable: (a: number) => any;
-export const passkey_listLabels: (a: number) => any;
-export const passkey_new: (a: any, b: number) => number;
-export const passkey_storeLabel: (a: number, b: number, c: number) => any;
+export const passkeyclient_checkAvailability: (a: number) => any;
+export const passkeyclient_labels: (a: number) => number;
+export const passkeyclient_new: (a: any, b: number, c: number, d: number) => number;
+export const passkeyclient_register: (a: number, b: any) => any;
+export const passkeyclient_signIn: (a: number, b: any) => any;
+export const passkeylabels_list: (a: number) => any;
+export const passkeylabels_store: (a: number, b: number, c: number) => any;
+export const postgresStorage: (a: any) => number;
 export const sdkbuilder_build: (a: number) => any;
 export const sdkbuilder_new: (a: any, b: any) => number;
-export const sdkbuilder_newWithSigner: (a: any, b: any) => number;
+export const sdkbuilder_newWithSigner: (a: any, b: any, c: any) => number;
+export const sdkbuilder_withAccountNumber: (a: number, b: number) => number;
 export const sdkbuilder_withChainService: (a: number, b: any) => number;
 export const sdkbuilder_withDefaultStorage: (a: number, b: number, c: number) => any;
 export const sdkbuilder_withFiatService: (a: number, b: any) => number;
-export const sdkbuilder_withKeySet: (a: number, b: any) => number;
 export const sdkbuilder_withLnurlClient: (a: number, b: any) => number;
 export const sdkbuilder_withMysqlBackend: (a: number, b: any) => [number, number, number];
-export const sdkbuilder_withMysqlConnectionPool: (a: number, b: number) => number;
 export const sdkbuilder_withPaymentObserver: (a: number, b: any) => number;
 export const sdkbuilder_withPostgresBackend: (a: number, b: any) => [number, number, number];
-export const sdkbuilder_withPostgresConnectionPool: (a: number, b: number) => number;
 export const sdkbuilder_withRestChainService: (a: number, b: number, c: number, d: any, e: number) => number;
 export const sdkbuilder_withSharedContext: (a: number, b: number) => number;
 export const sdkbuilder_withStorage: (a: number, b: any) => number;
+export const sdkbuilder_withStorageBackend: (a: number, b: number) => number;
+export const start: () => void;
 export const tokenissuer_burnIssuerToken: (a: number, b: any) => any;
 export const tokenissuer_createIssuerToken: (a: number, b: any) => any;
 export const tokenissuer_freezeIssuerToken: (a: number, b: any) => any;
@@ -139,16 +148,21 @@ export const intounderlyingsink_close: (a: number) => any;
 export const intounderlyingsink_write: (a: number, b: any) => any;
 export const intounderlyingsource_cancel: (a: number) => void;
 export const intounderlyingsource_pull: (a: number, b: any) => any;
-export const wasm_bindgen__convert__closures_____invoke__h013a98c02f3b4b21: (a: number, b: number, c: any) => [number, number];
-export const wasm_bindgen__convert__closures_____invoke__h013a98c02f3b4b21_4: (a: number, b: number, c: any) => [number, number];
-export const wasm_bindgen__convert__closures_____invoke__h013a98c02f3b4b21_5: (a: number, b: number, c: any) => [number, number];
-export const wasm_bindgen__convert__closures_____invoke__h013a98c02f3b4b21_6: (a: number, b: number, c: any) => [number, number];
-export const wasm_bindgen__convert__closures_____invoke__h013a98c02f3b4b21_7: (a: number, b: number, c: any) => [number, number];
+export const __wbg_externalsparksignerhandle_free: (a: number, b: number) => void;
+export const __wbg_externalbreezsignerhandle_free: (a: number, b: number) => void;
+export const wasm_bindgen__convert__closures_____invoke__h62bc116e0c266522: (a: number, b: number, c: any) => [number, number];
+export const wasm_bindgen__convert__closures_____invoke__h62bc116e0c266522_6: (a: number, b: number, c: any) => [number, number];
+export const wasm_bindgen__convert__closures_____invoke__h62bc116e0c266522_7: (a: number, b: number, c: any) => [number, number];
+export const wasm_bindgen__convert__closures_____invoke__h62bc116e0c266522_8: (a: number, b: number, c: any) => [number, number];
+export const wasm_bindgen__convert__closures_____invoke__h62bc116e0c266522_9: (a: number, b: number, c: any) => [number, number];
 export const wasm_bindgen__convert__closures_____invoke__h41057d61edf43a32: (a: number, b: number, c: any, d: any) => void;
-export const wasm_bindgen__convert__closures_____invoke__h4819aba3eed2db57: (a: number, b: number, c: any) => void;
-export const wasm_bindgen__convert__closures_____invoke__h4819aba3eed2db57_2: (a: number, b: number, c: any) => void;
-export const wasm_bindgen__convert__closures_____invoke__h4819aba3eed2db57_3: (a: number, b: number, c: any) => void;
-export const wasm_bindgen__convert__closures_____invoke__h124479769cd429fd: (a: number, b: number) => void;
+export const wasm_bindgen__convert__closures_____invoke__h3120db8c4a8a92b2: (a: number, b: number, c: any) => void;
+export const wasm_bindgen__convert__closures_____invoke__h3120db8c4a8a92b2_2: (a: number, b: number, c: any) => void;
+export const wasm_bindgen__convert__closures_____invoke__h3120db8c4a8a92b2_3: (a: number, b: number, c: any) => void;
+export const wasm_bindgen__convert__closures_____invoke__h3120db8c4a8a92b2_4: (a: number, b: number, c: any) => void;
+export const wasm_bindgen__convert__closures_____invoke__h3120db8c4a8a92b2_5: (a: number, b: number, c: any) => void;
+export const wasm_bindgen__convert__closures_____invoke__h1d6669a7b693932a: (a: number, b: number) => void;
+export const wasm_bindgen__convert__closures_____invoke__h0fa3f876e31d2a3e: (a: number, b: number) => void;
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_free: (a: number, b: number, c: number) => void;

package/bundler/storage/index.js

@@ -457,6 +457,135 @@ class MigrationManager {
           }
         }
       },
+      {
+        // Recovery migration for the missing "contacts" object store.
+        //
+        // The original "Create contacts store" migration above was INSERTED into
+        // the middle of this array (at index 12) instead of being appended, in
+        // SDK 0.11.0. That index was already occupied by the "Clear cached
+        // lightning address for LnurlInfo schema change" migration, which had
+        // shipped one release earlier in SDK 0.10.0 (dbVersion 13).
+        //
+        // Migration array indices map 1:1 to DB version transitions, so any
+        // database that ran 0.10.0 reached version 13 and, on upgrading to
+        // 0.11.0+ (dbVersion 14), ran only migrations[13] — permanently skipping
+        // the newly-inserted migrations[12]. Those databases never got a
+        // "contacts" object store, so every contact operation fails with
+        // NotFoundError.
+        //
+        // This migration is correctly appended and idempotently (re)creates the
+        // store, so affected databases recover on their next upgrade while
+        // unaffected databases treat it as a no-op. Keep the original migration
+        // in place; do not delete or reorder it.
+        name: "Create contacts store (recovery for skipped migration)",
+        upgrade: (db) => {
+          if (!db.objectStoreNames.contains("contacts")) {
+            const contactsStore = db.createObjectStore("contacts", { keyPath: "id" });
+            contactsStore.createIndex("name_identifier", ["name", "paymentIdentifier"], { unique: false });
+            contactsStore.createIndex("name", "name", { unique: false });
+          }
+        }
+      },
+      {
+        // Add deposit_vout to distinguish deposits sharing a funding tx. The
+        // new field is carried inside the JSON `details` blob. We can't safely
+        // backfill vout on the existing blobs: we never stored the original SSP
+        // output_index, and vout=0 is a valid output index, so defaulting would
+        // silently mislabel. Instead we clear `details` on legacy deposit blobs
+        // so the read path returns `details: None` (matches what the SQL
+        // backends do by leaving the payments row but having no matching
+        // payment_details_deposit row). Reset the bitcoin sync offset so the
+        // resync re-fetches the SSP user_request and the upsert rewrites the
+        // blob with the proper vout.
+        name: "Clear legacy deposit details and reset sync offset for vout",
+        upgrade: (db, transaction) => {
+          if (db.objectStoreNames.contains("payments")) {
+            const paymentStore = transaction.objectStore("payments");
+            const cursorRequest = paymentStore.openCursor();
+            cursorRequest.onsuccess = (event) => {
+              const cursor = event.target.result;
+              if (!cursor) return;
+              const payment = cursor.value;
+              let details = null;
+              if (payment.details && typeof payment.details === "string") {
+                try {
+                  details = JSON.parse(payment.details);
+                } catch (e) {
+                  details = null;
+                }
+              } else {
+                details = payment.details;
+              }
+              if (details && details.type === "deposit") {
+                payment.details = null;
+                cursor.update(payment);
+              }
+              cursor.continue();
+            };
+          }
+          if (db.objectStoreNames.contains("settings")) {
+            const settingsStore = transaction.objectStore("settings");
+            const getRequest = settingsStore.get("sync_offset");
+
+            getRequest.onsuccess = () => {
+              const syncCache = getRequest.result;
+              if (syncCache && syncCache.value) {
+                try {
+                  const syncInfo = JSON.parse(syncCache.value);
+                  syncInfo.offset = 0;
+                  settingsStore.put({
+                    key: "sync_offset",
+                    value: JSON.stringify(syncInfo),
+                  });
+                } catch (e) {
+                  // If parsing fails, just continue
+                }
+              }
+            };
+          }
+        },
+      },
+      {
+        name: "Backfill conversion_info type discriminator for serde tagged enum",
+        upgrade: (db, transaction) => {
+          if (db.objectStoreNames.contains("payment_metadata")) {
+            const store = transaction.objectStore("payment_metadata");
+            const request = store.openCursor();
+            request.onsuccess = (event) => {
+              const cursor = event.target.result;
+              if (cursor) {
+                const record = cursor.value;
+                if (record.conversionInfo) {
+                  try {
+                    const ci = typeof record.conversionInfo === "string"
+                      ? JSON.parse(record.conversionInfo)
+                      : record.conversionInfo;
+                    if (!ci.type) {
+                      ci.type = "amm";
+                      record.conversionInfo = JSON.stringify(ci);
+                      cursor.update(record);
+                    }
+                  } catch (e) {
+                    // Skip unparseable records
+                  }
+                }
+                cursor.continue();
+              }
+            };
+          }
+        },
+      },
+      {
+        // listActiveCrossChainSwaps scans and filters.
+        name: "Create cross_chain_swaps store",
+        upgrade: (db) => {
+          if (!db.objectStoreNames.contains("cross_chain_swaps")) {
+            db.createObjectStore("cross_chain_swaps", {
+              keyPath: ["provider", "id"],
+            });
+          }
+        },
+      },
     ];
   }
 }
@@ -480,7 +609,12 @@ class IndexedDBStorage {
     this.db = null;
     this.migrationManager = null;
     this.logger = logger;
-    this.dbVersion = 15; // Current schema version
+    // IMPORTANT: the migrations array in MigrationManager is append-only. The
+    // migration at array index N is the upgrade step from DB version N to N+1,
+    // so existing databases depend on indices never shifting. Never insert,
+    // reorder, or delete a migration — only append. dbVersion MUST equal the
+    // number of migrations (enforced by the guard in initialize()).
+    this.dbVersion = 20; // Current schema version (= migration count)
   }
 
   /**
@@ -495,6 +629,17 @@ class IndexedDBStorage {
       throw new StorageError("IndexedDB is not available in this environment");
     }
 
+    // Guard: dbVersion must equal the migration count. If they drift apart, the
+    // upgrade loop either skips the trailing migration(s) or requests a version
+    // no migration fills in. Fail fast — this is a programming error.
+    const migrationCount = new MigrationManager(null, StorageError).migrations.length;
+    if (this.dbVersion !== migrationCount) {
+      throw new StorageError(
+        `dbVersion (${this.dbVersion}) must equal the migration count (${migrationCount}). ` +
+        `Migrations are append-only: append a new migration and bump dbVersion to match.`
+      );
+    }
+
     return new Promise((resolve, reject) => {
       const request = indexedDB.open(this.dbName, this.dbVersion);
 
@@ -802,31 +947,98 @@ class IndexedDBStorage {
     });
   }
 
-  async insertPayment(payment) {
+  async applyPaymentUpdate(payment) {
     if (!this.db) {
       throw new StorageError("Database not initialized");
     }
 
     return new Promise((resolve, reject) => {
+      let shouldEmit = false;
+      let settled = false;
       const transaction = this.db.transaction("payments", "readwrite");
       const store = transaction.objectStore("payments");
 
-      // Ensure details and method are serialized properly
-      const paymentToStore = {
-        ...payment,
-        details: payment.details ? JSON.stringify(payment.details) : null,
-        method: payment.method ? JSON.stringify(payment.method) : null,
+      const rejectOnce = (message, error) => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        reject(new StorageError(message, error));
       };
 
-      const request = store.put(paymentToStore);
-      request.onsuccess = () => resolve();
-      request.onerror = () => {
-        reject(
-          new StorageError(
-            `Failed to insert payment '${payment.id}': ${request.error?.message || "Unknown error"
+      transaction.oncomplete = () => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        resolve(shouldEmit);
+      };
+
+      transaction.onerror = () => {
+        rejectOnce(
+          `Failed to apply payment update '${payment.id}': ${transaction.error?.message || "Unknown error"
+          }`,
+          transaction.error
+        );
+      };
+
+      transaction.onabort = () => {
+        rejectOnce(
+          `Payment update transaction aborted for '${payment.id}': ${transaction.error?.message || "Unknown error"
+          }`,
+          transaction.error
+        );
+      };
+
+      const getRequest = store.get(payment.id);
+
+      getRequest.onsuccess = () => {
+        const storedPayment = getRequest.result;
+        const stored = storedPayment
+          ? this._normalizePaymentStatus(storedPayment.status)
+          : null;
+        const next = this._normalizePaymentStatus(payment.status);
+
+        let shouldPersist;
+        if (stored == null) {
+          shouldPersist = true;
+          shouldEmit = true;
+        } else if (stored === next) {
+          console.debug(
+            `Skipping redundant payment event: id=${payment.id} status=${next}`
+          );
+          shouldPersist = true;
+          shouldEmit = false;
+        } else if (this._isFinalPaymentStatus(stored)) {
+          console.warn(
+            `Skipping payment update (would replace terminal status): id=${payment.id} stored=${stored} new=${next}`
+          );
+          shouldPersist = false;
+          shouldEmit = false;
+        } else {
+          shouldPersist = true;
+          shouldEmit = true;
+        }
+
+        if (!shouldPersist) {
+          return;
+        }
+
+        const putRequest = store.put(this._paymentToStore(payment));
+        putRequest.onerror = () => {
+          rejectOnce(
+            `Failed to persist payment update '${payment.id}': ${putRequest.error?.message || "Unknown error"
             }`,
-            request.error
-          )
+            putRequest.error
+          );
+        };
+      };
+
+      getRequest.onerror = () => {
+        rejectOnce(
+          `Failed to read payment '${payment.id}' before update: ${getRequest.error?.message || "Unknown error"
+          }`,
+          getRequest.error
         );
       };
     });
@@ -2019,8 +2231,98 @@ class IndexedDBStorage {
     });
   }
 
+  // ===== Cross-Chain Swap Operations =====
+
+  async setCrossChainSwap(swap) {
+    if (!this.db) {
+      throw new StorageError("Database not initialized");
+    }
+
+    return new Promise((resolve, reject) => {
+      const transaction = this.db.transaction("cross_chain_swaps", "readwrite");
+      const store = transaction.objectStore("cross_chain_swaps");
+      // IndexedDB stores nested objects natively, so `data` is kept as-is.
+      const request = store.put(swap);
+      request.onsuccess = () => resolve();
+      request.onerror = () => {
+        reject(
+          new StorageError(
+            `Failed to set cross-chain swap '${swap.provider}:${swap.id}': ${request.error?.message || "Unknown error"}`,
+            request.error
+          )
+        );
+      };
+    });
+  }
+
+  async getCrossChainSwap(provider, id) {
+    if (!this.db) {
+      throw new StorageError("Database not initialized");
+    }
+
+    return new Promise((resolve, reject) => {
+      const transaction = this.db.transaction("cross_chain_swaps", "readonly");
+      const store = transaction.objectStore("cross_chain_swaps");
+      const request = store.get([provider, id]);
+      request.onsuccess = () => resolve(request.result || null);
+      request.onerror = () => {
+        reject(
+          new StorageError(
+            `Failed to get cross-chain swap '${provider}:${id}': ${request.error?.message || "Unknown error"}`,
+            request.error
+          )
+        );
+      };
+    });
+  }
+
+  async listActiveCrossChainSwaps(provider) {
+    if (!this.db) {
+      throw new StorageError("Database not initialized");
+    }
+
+    return new Promise((resolve, reject) => {
+      const transaction = this.db.transaction("cross_chain_swaps", "readonly");
+      const store = transaction.objectStore("cross_chain_swaps");
+      const request = store.getAll();
+      request.onsuccess = () => {
+        const all = request.result || [];
+        resolve(
+          all.filter((swap) => swap.provider === provider && !swap.isTerminal)
+        );
+      };
+      request.onerror = () => {
+        reject(
+          new StorageError(
+            `Failed to list active cross-chain swaps for '${provider}': ${request.error?.message || "Unknown error"}`,
+            request.error
+          )
+        );
+      };
+    });
+  }
+
   // ===== Private Helper Methods =====
 
+  _paymentToStore(payment) {
+    // Ensure details and method are serialized properly
+    return {
+      ...payment,
+      details: payment.details ? JSON.stringify(payment.details) : null,
+      method: payment.method ? JSON.stringify(payment.method) : null,
+    };
+  }
+
+  _normalizePaymentStatus(status) {
+    return typeof status === "string" ? status.toLowerCase() : status;
+  }
+
+  _isFinalPaymentStatus(status) {
+    const normalized = this._normalizePaymentStatus(status);
+    return normalized === "completed" || normalized === "failed";
+  }
+
+
   _matchesFilters(payment, request) {
     // Filter by payment type
     if (request.typeFilter && request.typeFilter.length > 0) {
@@ -2075,6 +2377,10 @@ class IndexedDBStorage {
       // Filter by payment details. If any filter matches, we include the payment
       let paymentDetailsFilterMatches = false;
       for (const paymentDetailsFilter of request.paymentDetailsFilter) {
+        // Base type check: the payment's details type must match the filter type
+        if (details.type !== paymentDetailsFilter.type) {
+          continue;
+        }
         // Filter by HTLC status (Spark or Lightning)
         if (
           (paymentDetailsFilter.type === "spark" ||
@@ -2092,11 +2398,12 @@ class IndexedDBStorage {
             continue;
           }
         }
-        // Filter by token conversion info presence
+        // Filter by conversion type + status
         if (
           (paymentDetailsFilter.type === "spark" ||
-            paymentDetailsFilter.type === "token") &&
-          paymentDetailsFilter.conversionRefundNeeded != null
+            paymentDetailsFilter.type === "token" ||
+            paymentDetailsFilter.type === "lightning") &&
+          paymentDetailsFilter.conversionFilter != null
         ) {
           if (
             details.type !== paymentDetailsFilter.type ||
@@ -2105,11 +2412,20 @@ class IndexedDBStorage {
             continue;
           }
 
-          if (
-            paymentDetailsFilter.conversionRefundNeeded ===
-            (details.conversionInfo.status !== "refundNeeded")
-          ) {
-            continue;
+          const ci = details.conversionInfo;
+          if (paymentDetailsFilter.conversionFilter === "ammRefundNeeded") {
+            if (ci.type !== "amm" || ci.status !== "refundNeeded") {
+              continue;
+            }
+          } else if (paymentDetailsFilter.conversionFilter === "orchestraPending") {
+            if (ci.type !== "orchestra" || ["completed", "failed", "refunded"].includes(ci.status)) {
+              continue;
+            }
+          } else if (paymentDetailsFilter.conversionFilter === "boltzPending") {
+            // Boltz conversion lives on the Lightning leg.
+            if (ci.type !== "boltz" || ["completed", "failed", "refunded"].includes(ci.status)) {
+              continue;
+            }
           }
         }
         // Filter by token transaction hash
@@ -2250,17 +2566,23 @@ class IndexedDBStorage {
             );
           }
         }
-      } else if (details.type == "spark" || details.type == "token") {
-        // If conversionInfo exists, parse and add to details
-        if (metadata.conversionInfo) {
-          try {
-            details.conversionInfo = JSON.parse(metadata.conversionInfo);
-          } catch (e) {
-            throw new StorageError(
-              `Failed to parse conversionInfo JSON for payment ${payment.id}: ${e.message}`,
-              e
-            );
-          }
+      }
+
+      // conversionInfo is surfaced on Lightning (Boltz hold-invoice pay),
+      // Spark, and Token details — every variant that can carry a conversion.
+      if (
+        (details.type == "lightning" ||
+          details.type == "spark" ||
+          details.type == "token") &&
+        metadata.conversionInfo
+      ) {
+        try {
+          details.conversionInfo = JSON.parse(metadata.conversionInfo);
+        } catch (e) {
+          throw new StorageError(
+            `Failed to parse conversionInfo JSON for payment ${payment.id}: ${e.message}`,
+            e
+          );
         }
       }
     }