@breeztech/breez-sdk-spark 0.2.5-dev2 → 0.2.6

package/bundler/breez_sdk_spark_wasm.d.ts

@@ -31,12 +31,23 @@ export interface Storage {
     insertPayment: (payment: Payment) => Promise<void>;
     setPaymentMetadata: (paymentId: string, metadata: PaymentMetadata) => Promise<void>;
     getPaymentById: (id: string) => Promise<Payment>;
+    getPaymentByInvoice: (invoice: string) => Promise<Payment>;
     addDeposit: (txid: string, vout: number, amount_sats: number) => Promise<void>;
     deleteDeposit: (txid: string, vout: number) => Promise<void>;
     listDeposits: () => Promise<DepositInfo[]>;
     updateDeposit: (txid: string, vout: number, payload: UpdateDepositPayload) => Promise<void>;
 }
 
+export interface WaitForPaymentResponse {
+    payment: Payment;
+}
+
+export type WaitForPaymentIdentifier = ({ type: "paymentId" } & string) | ({ type: "paymentRequest" } & string);
+
+export interface WaitForPaymentRequest {
+    identifier: WaitForPaymentIdentifier;
+}
+
 export interface Symbol {
     grapheme?: string;
     template?: string;
@@ -137,7 +148,7 @@ export interface SendPaymentRequest {
     options?: SendPaymentOptions;
 }
 
-export type SendPaymentOptions = { type: "bitcoinAddress"; confirmationSpeed: OnchainConfirmationSpeed } | { type: "bolt11Invoice"; preferSpark: boolean };
+export type SendPaymentOptions = { type: "bitcoinAddress"; confirmationSpeed: OnchainConfirmationSpeed } | { type: "bolt11Invoice"; preferSpark: boolean; completionTimeoutSecs?: number };
 
 export type OnchainConfirmationSpeed = "fast" | "medium" | "slow";
 
@@ -513,7 +524,7 @@ export class BreezSdk {
   free(): void;
   addEventListener(listener: EventListener): Promise<string>;
   removeEventListener(id: string): Promise<boolean>;
-  disconnect(): void;
+  disconnect(): Promise<void>;
   getInfo(request: GetInfoRequest): Promise<GetInfoResponse>;
   receivePayment(request: ReceivePaymentRequest): Promise<ReceivePaymentResponse>;
   prepareSendPayment(request: PrepareSendPaymentRequest): Promise<PrepareSendPaymentResponse>;
@@ -532,6 +543,7 @@ export class BreezSdk {
   deleteLightningAddress(): Promise<void>;
   listFiatCurrencies(): Promise<ListFiatCurrenciesResponse>;
   listFiatRates(): Promise<ListFiatRatesResponse>;
+  waitForPayment(request: WaitForPaymentRequest): Promise<WaitForPaymentResponse>;
 }
 export class IntoUnderlyingByteSource {
   private constructor();

package/bundler/breez_sdk_spark_wasm_bg.js

@@ -279,14 +279,14 @@ export function task_worker_entry_point(ptr) {
 }
 
 function __wbg_adapter_52(arg0, arg1) {
-    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf7c49586be6831c4(arg0, arg1);
+    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he5eedad33b9ff4bf(arg0, arg1);
 }
 
 function __wbg_adapter_55(arg0, arg1, arg2) {
-    wasm.closure781_externref_shim(arg0, arg1, arg2);
+    wasm.closure780_externref_shim(arg0, arg1, arg2);
 }
 
-function __wbg_adapter_180(arg0, arg1, arg2, arg3) {
+function __wbg_adapter_183(arg0, arg1, arg2, arg3) {
     wasm.closure434_externref_shim(arg0, arg1, arg2, arg3);
 }
 
@@ -345,11 +345,12 @@ export class BreezSdk {
         const ret = wasm.breezsdk_removeEventListener(this.__wbg_ptr, ptr0, len0);
         return ret;
     }
+    /**
+     * @returns {Promise<void>}
+     */
     disconnect() {
         const ret = wasm.breezsdk_disconnect(this.__wbg_ptr);
-        if (ret[1]) {
-            throw takeFromExternrefTable0(ret[0]);
-        }
+        return ret;
     }
     /**
      * @param {GetInfoRequest} request
@@ -491,6 +492,14 @@ export class BreezSdk {
         const ret = wasm.breezsdk_listFiatRates(this.__wbg_ptr);
         return ret;
     }
+    /**
+     * @param {WaitForPaymentRequest} request
+     * @returns {Promise<WaitForPaymentResponse>}
+     */
+    waitForPayment(request) {
+        const ret = wasm.breezsdk_waitForPayment(this.__wbg_ptr, request);
+        return ret;
+    }
 }
 
 const IntoUnderlyingByteSourceFinalization = (typeof FinalizationRegistry === 'undefined')
@@ -896,6 +905,19 @@ export function __wbg_getPaymentById_c23144bfc404b2fc() { return handleError(fun
     }
 }, arguments) };
 
+export function __wbg_getPaymentByInvoice_afddfcbefa5508b0() { return handleError(function (arg0, arg1, arg2) {
+    let deferred0_0;
+    let deferred0_1;
+    try {
+        deferred0_0 = arg1;
+        deferred0_1 = arg2;
+        const ret = arg0.getPaymentByInvoice(getStringFromWasm0(arg1, arg2));
+        return ret;
+    } finally {
+        wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
+    }
+}, arguments) };
+
 export function __wbg_getRandomValues_b8f5dbd5f3995a9e() { return handleError(function (arg0, arg1) {
     arg0.getRandomValues(arg1);
 }, arguments) };
@@ -1049,7 +1071,7 @@ export function __wbg_new_23a2665fac83c611(arg0, arg1) {
             const a = state0.a;
             state0.a = 0;
             try {
-                return __wbg_adapter_180(a, state0.b, arg0, arg1);
+                return __wbg_adapter_183(a, state0.b, arg0, arg1);
             } finally {
                 state0.a = a;
             }
@@ -1412,13 +1434,13 @@ export function __wbindgen_cb_drop(arg0) {
     return ret;
 };
 
-export function __wbindgen_closure_wrapper8071(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 611, __wbg_adapter_52);
+export function __wbindgen_closure_wrapper8079(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 612, __wbg_adapter_52);
     return ret;
 };
 
-export function __wbindgen_closure_wrapper9713(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 782, __wbg_adapter_55);
+export function __wbindgen_closure_wrapper9672(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 781, __wbg_adapter_55);
     return ret;
 };
 

package/bundler/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -9,7 +9,7 @@ export const defaultStorage: (a: number, b: number) => any;
 export const parse: (a: number, b: number) => any;
 export const breezsdk_addEventListener: (a: number, b: any) => any;
 export const breezsdk_removeEventListener: (a: number, b: number, c: number) => any;
-export const breezsdk_disconnect: (a: number) => [number, number];
+export const breezsdk_disconnect: (a: number) => any;
 export const breezsdk_getInfo: (a: number, b: any) => any;
 export const breezsdk_receivePayment: (a: number, b: any) => any;
 export const breezsdk_prepareSendPayment: (a: number, b: any) => any;
@@ -28,6 +28,7 @@ export const breezsdk_registerLightningAddress: (a: number, b: any) => any;
 export const breezsdk_deleteLightningAddress: (a: number) => any;
 export const breezsdk_listFiatCurrencies: (a: number) => any;
 export const breezsdk_listFiatRates: (a: number) => any;
+export const breezsdk_waitForPayment: (a: number, b: any) => any;
 export const __wbg_sdkbuilder_free: (a: number, b: number) => void;
 export const sdkbuilder_new: (a: any, b: any, c: any) => [number, number, number];
 export const sdkbuilder_withRestChainService: (a: number, b: number, c: number, d: number) => number;
@@ -59,7 +60,7 @@ export const __externref_table_alloc: () => number;
 export const __wbindgen_export_5: WebAssembly.Table;
 export const __wbindgen_export_6: WebAssembly.Table;
 export const __externref_table_dealloc: (a: number) => void;
-export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf7c49586be6831c4: (a: number, b: number) => void;
-export const closure781_externref_shim: (a: number, b: number, c: any) => void;
+export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he5eedad33b9ff4bf: (a: number, b: number) => void;
+export const closure780_externref_shim: (a: number, b: number, c: any) => void;
 export const closure434_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/bundler/storage/index.js

@@ -100,6 +100,17 @@ class MigrationManager {
           }
         },
       },
+      {
+        name: "Create invoice index",
+        upgrade: (db, transaction) => {
+          const paymentStore = transaction.objectStore("payments");
+          if (!paymentStore.indexNames.contains("invoice")) {
+            paymentStore.createIndex("invoice", "details.invoice", {
+              unique: false,
+            });
+          }
+        }
+      }
     ];
   }
 }
@@ -436,6 +447,58 @@ class IndexedDBStorage {
     });
   }
 
+  async getPaymentByInvoice(invoice) {
+    if (!this.db) {
+      throw new StorageError("Database not initialized");
+    }
+
+    return new Promise((resolve, reject) => {
+      const transaction = this.db.transaction(
+        ["payments", "payment_metadata"],
+        "readonly"
+      );
+      const paymentStore = transaction.objectStore("payments");
+      const invoiceIndex = paymentStore.index("invoice");
+      const metadataStore = transaction.objectStore("payment_metadata");
+
+      const paymentRequest = invoiceIndex.get(invoice);
+
+      paymentRequest.onsuccess = () => {
+        const payment = paymentRequest.result;
+        if (!payment) {
+          resolve(null);
+          return;
+        }
+
+        // Get metadata for this payment
+        const metadataRequest = metadataStore.get(invoice);
+        metadataRequest.onsuccess = () => {
+          const metadata = metadataRequest.result;
+          const paymentWithMetadata = this._mergePaymentMetadata(
+            payment,
+            metadata
+          );
+          resolve(paymentWithMetadata);
+        };
+        metadataRequest.onerror = () => {
+          // Return payment without metadata if metadata fetch fails
+          resolve(payment);
+        };
+      };
+
+      paymentRequest.onerror = () => {
+        reject(
+          new StorageError(
+            `Failed to get payment by invoice '${invoice}': ${
+              paymentRequest.error?.message || "Unknown error"
+            }`,
+            paymentRequest.error
+          )
+        );
+      };
+    });
+  }
+
   async setPaymentMetadata(paymentId, metadata) {
     if (!this.db) {
       throw new StorageError("Database not initialized");

package/deno/breez_sdk_spark_wasm.d.ts

@@ -31,12 +31,23 @@ export interface Storage {
     insertPayment: (payment: Payment) => Promise<void>;
     setPaymentMetadata: (paymentId: string, metadata: PaymentMetadata) => Promise<void>;
     getPaymentById: (id: string) => Promise<Payment>;
+    getPaymentByInvoice: (invoice: string) => Promise<Payment>;
     addDeposit: (txid: string, vout: number, amount_sats: number) => Promise<void>;
     deleteDeposit: (txid: string, vout: number) => Promise<void>;
     listDeposits: () => Promise<DepositInfo[]>;
     updateDeposit: (txid: string, vout: number, payload: UpdateDepositPayload) => Promise<void>;
 }
 
+export interface WaitForPaymentResponse {
+    payment: Payment;
+}
+
+export type WaitForPaymentIdentifier = ({ type: "paymentId" } & string) | ({ type: "paymentRequest" } & string);
+
+export interface WaitForPaymentRequest {
+    identifier: WaitForPaymentIdentifier;
+}
+
 export interface Symbol {
     grapheme?: string;
     template?: string;
@@ -137,7 +148,7 @@ export interface SendPaymentRequest {
     options?: SendPaymentOptions;
 }
 
-export type SendPaymentOptions = { type: "bitcoinAddress"; confirmationSpeed: OnchainConfirmationSpeed } | { type: "bolt11Invoice"; preferSpark: boolean };
+export type SendPaymentOptions = { type: "bitcoinAddress"; confirmationSpeed: OnchainConfirmationSpeed } | { type: "bolt11Invoice"; preferSpark: boolean; completionTimeoutSecs?: number };
 
 export type OnchainConfirmationSpeed = "fast" | "medium" | "slow";
 
@@ -513,7 +524,7 @@ export class BreezSdk {
   free(): void;
   addEventListener(listener: EventListener): Promise<string>;
   removeEventListener(id: string): Promise<boolean>;
-  disconnect(): void;
+  disconnect(): Promise<void>;
   getInfo(request: GetInfoRequest): Promise<GetInfoResponse>;
   receivePayment(request: ReceivePaymentRequest): Promise<ReceivePaymentResponse>;
   prepareSendPayment(request: PrepareSendPaymentRequest): Promise<PrepareSendPaymentResponse>;
@@ -532,6 +543,7 @@ export class BreezSdk {
   deleteLightningAddress(): Promise<void>;
   listFiatCurrencies(): Promise<ListFiatCurrenciesResponse>;
   listFiatRates(): Promise<ListFiatRatesResponse>;
+  waitForPayment(request: WaitForPaymentRequest): Promise<WaitForPaymentResponse>;
 }
 export class IntoUnderlyingByteSource {
   private constructor();

package/deno/breez_sdk_spark_wasm.js

@@ -262,14 +262,14 @@ export function task_worker_entry_point(ptr) {
 }
 
 function __wbg_adapter_52(arg0, arg1) {
-    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf7c49586be6831c4(arg0, arg1);
+    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he5eedad33b9ff4bf(arg0, arg1);
 }
 
 function __wbg_adapter_55(arg0, arg1, arg2) {
-    wasm.closure781_externref_shim(arg0, arg1, arg2);
+    wasm.closure780_externref_shim(arg0, arg1, arg2);
 }
 
-function __wbg_adapter_180(arg0, arg1, arg2, arg3) {
+function __wbg_adapter_183(arg0, arg1, arg2, arg3) {
     wasm.closure434_externref_shim(arg0, arg1, arg2, arg3);
 }
 
@@ -328,11 +328,12 @@ export class BreezSdk {
         const ret = wasm.breezsdk_removeEventListener(this.__wbg_ptr, ptr0, len0);
         return ret;
     }
+    /**
+     * @returns {Promise<void>}
+     */
     disconnect() {
         const ret = wasm.breezsdk_disconnect(this.__wbg_ptr);
-        if (ret[1]) {
-            throw takeFromExternrefTable0(ret[0]);
-        }
+        return ret;
     }
     /**
      * @param {GetInfoRequest} request
@@ -474,6 +475,14 @@ export class BreezSdk {
         const ret = wasm.breezsdk_listFiatRates(this.__wbg_ptr);
         return ret;
     }
+    /**
+     * @param {WaitForPaymentRequest} request
+     * @returns {Promise<WaitForPaymentResponse>}
+     */
+    waitForPayment(request) {
+        const ret = wasm.breezsdk_waitForPayment(this.__wbg_ptr, request);
+        return ret;
+    }
 }
 
 const IntoUnderlyingByteSourceFinalization = (typeof FinalizationRegistry === 'undefined')
@@ -847,6 +856,18 @@ const imports = {
                 wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
             }
         }, arguments) },
+        __wbg_getPaymentByInvoice_afddfcbefa5508b0: function() { return handleError(function (arg0, arg1, arg2) {
+            let deferred0_0;
+            let deferred0_1;
+            try {
+                deferred0_0 = arg1;
+                deferred0_1 = arg2;
+                const ret = arg0.getPaymentByInvoice(getStringFromWasm0(arg1, arg2));
+                return ret;
+            } finally {
+                wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
+            }
+        }, arguments) },
         __wbg_getRandomValues_b8f5dbd5f3995a9e: function() { return handleError(function (arg0, arg1) {
             arg0.getRandomValues(arg1);
         }, arguments) },
@@ -975,7 +996,7 @@ const imports = {
                     const a = state0.a;
                     state0.a = 0;
                     try {
-                        return __wbg_adapter_180(a, state0.b, arg0, arg1);
+                        return __wbg_adapter_183(a, state0.b, arg0, arg1);
                     } finally {
                         state0.a = a;
                     }
@@ -1271,12 +1292,12 @@ const imports = {
             const ret = false;
             return ret;
         },
-        __wbindgen_closure_wrapper8071: function(arg0, arg1, arg2) {
-            const ret = makeMutClosure(arg0, arg1, 611, __wbg_adapter_52);
+        __wbindgen_closure_wrapper8079: function(arg0, arg1, arg2) {
+            const ret = makeMutClosure(arg0, arg1, 612, __wbg_adapter_52);
             return ret;
         },
-        __wbindgen_closure_wrapper9713: function(arg0, arg1, arg2) {
-            const ret = makeMutClosure(arg0, arg1, 782, __wbg_adapter_55);
+        __wbindgen_closure_wrapper9672: function(arg0, arg1, arg2) {
+            const ret = makeMutClosure(arg0, arg1, 781, __wbg_adapter_55);
             return ret;
         },
         __wbindgen_debug_string: function(arg0, arg1) {

package/deno/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -9,7 +9,7 @@ export const defaultStorage: (a: number, b: number) => any;
 export const parse: (a: number, b: number) => any;
 export const breezsdk_addEventListener: (a: number, b: any) => any;
 export const breezsdk_removeEventListener: (a: number, b: number, c: number) => any;
-export const breezsdk_disconnect: (a: number) => [number, number];
+export const breezsdk_disconnect: (a: number) => any;
 export const breezsdk_getInfo: (a: number, b: any) => any;
 export const breezsdk_receivePayment: (a: number, b: any) => any;
 export const breezsdk_prepareSendPayment: (a: number, b: any) => any;
@@ -28,6 +28,7 @@ export const breezsdk_registerLightningAddress: (a: number, b: any) => any;
 export const breezsdk_deleteLightningAddress: (a: number) => any;
 export const breezsdk_listFiatCurrencies: (a: number) => any;
 export const breezsdk_listFiatRates: (a: number) => any;
+export const breezsdk_waitForPayment: (a: number, b: any) => any;
 export const __wbg_sdkbuilder_free: (a: number, b: number) => void;
 export const sdkbuilder_new: (a: any, b: any, c: any) => [number, number, number];
 export const sdkbuilder_withRestChainService: (a: number, b: number, c: number, d: number) => number;
@@ -59,7 +60,7 @@ export const __externref_table_alloc: () => number;
 export const __wbindgen_export_5: WebAssembly.Table;
 export const __wbindgen_export_6: WebAssembly.Table;
 export const __externref_table_dealloc: (a: number) => void;
-export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf7c49586be6831c4: (a: number, b: number) => void;
-export const closure781_externref_shim: (a: number, b: number, c: any) => void;
+export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he5eedad33b9ff4bf: (a: number, b: number) => void;
+export const closure780_externref_shim: (a: number, b: number, c: any) => void;
 export const closure434_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/nodejs/breez_sdk_spark_wasm.d.ts

@@ -31,12 +31,23 @@ export interface Storage {
     insertPayment: (payment: Payment) => Promise<void>;
     setPaymentMetadata: (paymentId: string, metadata: PaymentMetadata) => Promise<void>;
     getPaymentById: (id: string) => Promise<Payment>;
+    getPaymentByInvoice: (invoice: string) => Promise<Payment>;
     addDeposit: (txid: string, vout: number, amount_sats: number) => Promise<void>;
     deleteDeposit: (txid: string, vout: number) => Promise<void>;
     listDeposits: () => Promise<DepositInfo[]>;
     updateDeposit: (txid: string, vout: number, payload: UpdateDepositPayload) => Promise<void>;
 }
 
+export interface WaitForPaymentResponse {
+    payment: Payment;
+}
+
+export type WaitForPaymentIdentifier = ({ type: "paymentId" } & string) | ({ type: "paymentRequest" } & string);
+
+export interface WaitForPaymentRequest {
+    identifier: WaitForPaymentIdentifier;
+}
+
 export interface Symbol {
     grapheme?: string;
     template?: string;
@@ -137,7 +148,7 @@ export interface SendPaymentRequest {
     options?: SendPaymentOptions;
 }
 
-export type SendPaymentOptions = { type: "bitcoinAddress"; confirmationSpeed: OnchainConfirmationSpeed } | { type: "bolt11Invoice"; preferSpark: boolean };
+export type SendPaymentOptions = { type: "bitcoinAddress"; confirmationSpeed: OnchainConfirmationSpeed } | { type: "bolt11Invoice"; preferSpark: boolean; completionTimeoutSecs?: number };
 
 export type OnchainConfirmationSpeed = "fast" | "medium" | "slow";
 
@@ -513,7 +524,7 @@ export class BreezSdk {
   free(): void;
   addEventListener(listener: EventListener): Promise<string>;
   removeEventListener(id: string): Promise<boolean>;
-  disconnect(): void;
+  disconnect(): Promise<void>;
   getInfo(request: GetInfoRequest): Promise<GetInfoResponse>;
   receivePayment(request: ReceivePaymentRequest): Promise<ReceivePaymentResponse>;
   prepareSendPayment(request: PrepareSendPaymentRequest): Promise<PrepareSendPaymentResponse>;
@@ -532,6 +543,7 @@ export class BreezSdk {
   deleteLightningAddress(): Promise<void>;
   listFiatCurrencies(): Promise<ListFiatCurrenciesResponse>;
   listFiatRates(): Promise<ListFiatRatesResponse>;
+  waitForPayment(request: WaitForPaymentRequest): Promise<WaitForPaymentResponse>;
 }
 export class IntoUnderlyingByteSource {
   private constructor();

package/nodejs/breez_sdk_spark_wasm.js

@@ -275,14 +275,14 @@ module.exports.task_worker_entry_point = function(ptr) {
 };
 
 function __wbg_adapter_52(arg0, arg1) {
-    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf7c49586be6831c4(arg0, arg1);
+    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he5eedad33b9ff4bf(arg0, arg1);
 }
 
 function __wbg_adapter_55(arg0, arg1, arg2) {
-    wasm.closure781_externref_shim(arg0, arg1, arg2);
+    wasm.closure780_externref_shim(arg0, arg1, arg2);
 }
 
-function __wbg_adapter_180(arg0, arg1, arg2, arg3) {
+function __wbg_adapter_183(arg0, arg1, arg2, arg3) {
     wasm.closure434_externref_shim(arg0, arg1, arg2, arg3);
 }
 
@@ -341,11 +341,12 @@ class BreezSdk {
         const ret = wasm.breezsdk_removeEventListener(this.__wbg_ptr, ptr0, len0);
         return ret;
     }
+    /**
+     * @returns {Promise<void>}
+     */
     disconnect() {
         const ret = wasm.breezsdk_disconnect(this.__wbg_ptr);
-        if (ret[1]) {
-            throw takeFromExternrefTable0(ret[0]);
-        }
+        return ret;
     }
     /**
      * @param {GetInfoRequest} request
@@ -487,6 +488,14 @@ class BreezSdk {
         const ret = wasm.breezsdk_listFiatRates(this.__wbg_ptr);
         return ret;
     }
+    /**
+     * @param {WaitForPaymentRequest} request
+     * @returns {Promise<WaitForPaymentResponse>}
+     */
+    waitForPayment(request) {
+        const ret = wasm.breezsdk_waitForPayment(this.__wbg_ptr, request);
+        return ret;
+    }
 }
 module.exports.BreezSdk = BreezSdk;
 
@@ -897,6 +906,19 @@ module.exports.__wbg_getPaymentById_c23144bfc404b2fc = function() { return handl
     }
 }, arguments) };
 
+module.exports.__wbg_getPaymentByInvoice_afddfcbefa5508b0 = function() { return handleError(function (arg0, arg1, arg2) {
+    let deferred0_0;
+    let deferred0_1;
+    try {
+        deferred0_0 = arg1;
+        deferred0_1 = arg2;
+        const ret = arg0.getPaymentByInvoice(getStringFromWasm0(arg1, arg2));
+        return ret;
+    } finally {
+        wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
+    }
+}, arguments) };
+
 module.exports.__wbg_getRandomValues_b8f5dbd5f3995a9e = function() { return handleError(function (arg0, arg1) {
     arg0.getRandomValues(arg1);
 }, arguments) };
@@ -1050,7 +1072,7 @@ module.exports.__wbg_new_23a2665fac83c611 = function(arg0, arg1) {
             const a = state0.a;
             state0.a = 0;
             try {
-                return __wbg_adapter_180(a, state0.b, arg0, arg1);
+                return __wbg_adapter_183(a, state0.b, arg0, arg1);
             } finally {
                 state0.a = a;
             }
@@ -1413,13 +1435,13 @@ module.exports.__wbindgen_cb_drop = function(arg0) {
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper8071 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 611, __wbg_adapter_52);
+module.exports.__wbindgen_closure_wrapper8079 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 612, __wbg_adapter_52);
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper9713 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 782, __wbg_adapter_55);
+module.exports.__wbindgen_closure_wrapper9672 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 781, __wbg_adapter_55);
     return ret;
 };
 

package/nodejs/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -9,7 +9,7 @@ export const defaultStorage: (a: number, b: number) => any;
 export const parse: (a: number, b: number) => any;
 export const breezsdk_addEventListener: (a: number, b: any) => any;
 export const breezsdk_removeEventListener: (a: number, b: number, c: number) => any;
-export const breezsdk_disconnect: (a: number) => [number, number];
+export const breezsdk_disconnect: (a: number) => any;
 export const breezsdk_getInfo: (a: number, b: any) => any;
 export const breezsdk_receivePayment: (a: number, b: any) => any;
 export const breezsdk_prepareSendPayment: (a: number, b: any) => any;
@@ -28,6 +28,7 @@ export const breezsdk_registerLightningAddress: (a: number, b: any) => any;
 export const breezsdk_deleteLightningAddress: (a: number) => any;
 export const breezsdk_listFiatCurrencies: (a: number) => any;
 export const breezsdk_listFiatRates: (a: number) => any;
+export const breezsdk_waitForPayment: (a: number, b: any) => any;
 export const __wbg_sdkbuilder_free: (a: number, b: number) => void;
 export const sdkbuilder_new: (a: any, b: any, c: any) => [number, number, number];
 export const sdkbuilder_withRestChainService: (a: number, b: number, c: number, d: number) => number;
@@ -59,7 +60,7 @@ export const __externref_table_alloc: () => number;
 export const __wbindgen_export_5: WebAssembly.Table;
 export const __wbindgen_export_6: WebAssembly.Table;
 export const __externref_table_dealloc: (a: number) => void;
-export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf7c49586be6831c4: (a: number, b: number) => void;
-export const closure781_externref_shim: (a: number, b: number, c: any) => void;
+export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he5eedad33b9ff4bf: (a: number, b: number) => void;
+export const closure780_externref_shim: (a: number, b: number, c: any) => void;
 export const closure434_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/nodejs/storage/index.cjs

@@ -126,11 +126,27 @@ class SqliteStorage {
       const actualLimit = limit !== null ? limit : 4294967295; // u32::MAX
 
       const stmt = this.db.prepare(`
-                SELECT p.id, p.payment_type, p.status, p.amount, p.fees, p.timestamp, p.details, p.method, pm.lnurl_pay_info, pm.lnurl_description
-                FROM payments p
-                LEFT JOIN payment_metadata pm ON p.id = pm.payment_id
-                ORDER BY p.timestamp DESC 
-                LIMIT ? OFFSET ?
+            SELECT p.id
+            ,       p.payment_type
+            ,       p.status
+            ,       p.amount
+            ,       p.fees
+            ,       p.timestamp
+            ,       p.method
+            ,       p.withdraw_tx_id
+            ,       p.deposit_tx_id
+            ,       p.spark
+            ,       l.invoice AS lightning_invoice
+            ,       l.payment_hash AS lightning_payment_hash
+            ,       l.destination_pubkey AS lightning_destination_pubkey
+            ,       COALESCE(l.description, pm.lnurl_description) AS lightning_description
+            ,       l.preimage AS lightning_preimage
+            ,       pm.lnurl_pay_info
+             FROM payments p
+             LEFT JOIN payment_details_lightning l ON p.id = l.payment_id
+             LEFT JOIN payment_metadata pm ON p.id = pm.payment_id
+             ORDER BY p.timestamp DESC 
+             LIMIT ? OFFSET ?
             `);
 
       const rows = stmt.all(actualLimit, actualOffset);
@@ -153,21 +169,42 @@ class SqliteStorage {
         );
       }
 
-      const stmt = this.db.prepare(`
-                 INSERT OR REPLACE INTO payments (id, payment_type, status, amount, fees, timestamp, details, method) 
-                 VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-             `);
-
-      stmt.run(
-        payment.id,
-        payment.paymentType,
-        payment.status,
-        payment.amount,
-        payment.fees,
-        payment.timestamp,
-        payment.details ? JSON.stringify(payment.details) : null,
-        payment.method ? JSON.stringify(payment.method) : null
+      const paymentInsert = this.db.prepare(
+        `INSERT OR REPLACE INTO payments (id, payment_type, status, amount, fees, timestamp, method, withdraw_tx_id, deposit_tx_id, spark) 
+         VALUES (@id, @paymentType, @status, @amount, @fees, @timestamp, @method, @withdrawTxId, @depositTxId, @spark)`
+      );
+      const lightningInsert = this.db.prepare(
+        `INSERT OR REPLACE INTO payment_details_lightning 
+          (payment_id, invoice, payment_hash, destination_pubkey, description, preimage) 
+          VALUES (@id, @invoice, @paymentHash, @destinationPubkey, @description, @preimage)`
       );
+      const transaction = this.db.transaction(() => {
+        paymentInsert.run({
+          id: payment.id,
+          paymentType: payment.paymentType,
+          status: payment.status,
+          amount: payment.amount,
+          fees: payment.fees,
+          timestamp: payment.timestamp,
+          method: payment.method ? JSON.stringify(payment.method) : null,
+          withdrawTxId: payment.details?.type === 'withdraw' ? payment.details.txId : null,
+          depositTxId: payment.details?.type === 'deposit' ? payment.details.txId : null,
+          spark: payment.details?.type === 'spark' ? 1 : null,
+        });
+
+        if (payment.details?.type === 'lightning') {
+          lightningInsert.run({
+            id: payment.id,
+            invoice: payment.details.invoice,
+            paymentHash: payment.details.paymentHash,
+            destinationPubkey: payment.details.destinationPubkey,
+            description: payment.details.description,
+            preimage: payment.details.preimage,
+          });
+        }
+      });
+      
+      transaction();
       return Promise.resolve();
     } catch (error) {
       return Promise.reject(
@@ -188,10 +225,26 @@ class SqliteStorage {
       }
 
       const stmt = this.db.prepare(`
-                SELECT p.id, p.payment_type, p.status, p.amount, p.fees, p.timestamp, p.details, p.method, pm.lnurl_pay_info, pm.lnurl_description
-                FROM payments p
-                LEFT JOIN payment_metadata pm ON p.id = pm.payment_id
-                WHERE p.id = ?
+            SELECT p.id
+            ,       p.payment_type
+            ,       p.status
+            ,       p.amount
+            ,       p.fees
+            ,       p.timestamp
+            ,       p.method
+            ,       p.withdraw_tx_id
+            ,       p.deposit_tx_id
+            ,       p.spark
+            ,       l.invoice AS lightning_invoice
+            ,       l.payment_hash AS lightning_payment_hash
+            ,       l.destination_pubkey AS lightning_destination_pubkey
+            ,       COALESCE(l.description, pm.lnurl_description) AS lightning_description
+            ,       l.preimage AS lightning_preimage
+            ,       pm.lnurl_pay_info
+             FROM payments p
+             LEFT JOIN payment_details_lightning l ON p.id = l.payment_id
+             LEFT JOIN payment_metadata pm ON p.id = pm.payment_id
+             WHERE p.id = ?
             `);
 
       const row = stmt.get(id);
@@ -214,6 +267,55 @@ class SqliteStorage {
     }
   }
 
+  getPaymentByInvoice(invoice) {
+    try {
+      if (!invoice) {
+        return Promise.reject(
+          new StorageError("Invoice cannot be null or undefined")
+        );
+      }
+
+      const stmt = this.db.prepare(`
+            SELECT p.id
+            ,       p.payment_type
+            ,       p.status
+            ,       p.amount
+            ,       p.fees
+            ,       p.timestamp
+            ,       p.method
+            ,       p.withdraw_tx_id
+            ,       p.deposit_tx_id
+            ,       p.spark
+            ,       l.invoice AS lightning_invoice
+            ,       l.payment_hash AS lightning_payment_hash
+            ,       l.destination_pubkey AS lightning_destination_pubkey
+            ,       COALESCE(l.description, pm.lnurl_description) AS lightning_description
+            ,       l.preimage AS lightning_preimage
+            ,       pm.lnurl_pay_info
+             FROM payments p
+             LEFT JOIN payment_details_lightning l ON p.id = l.payment_id
+             LEFT JOIN payment_metadata pm ON p.id = pm.payment_id
+             WHERE l.invoice = ?
+            `);
+
+      const row = stmt.get(invoice);
+      if (!row) {
+        return Promise.resolve(null);
+      }
+
+      return Promise.resolve(this._rowToPayment(row));
+    } catch (error) {
+      if (error instanceof StorageError) return Promise.reject(error);
+      const paymentId = id || "unknown";
+      return Promise.reject(
+        new StorageError(
+          `Failed to get payment by invoice '${invoice}': ${error.message}`,
+          error
+        )
+      );
+    }
+  }
+
   setPaymentMetadata(paymentId, metadata) {
     try {
       const stmt = this.db.prepare(`
@@ -340,15 +442,41 @@ class SqliteStorage {
 
   _rowToPayment(row) {
     let details = null;
-    if (row.details) {
-      try {
-        details = JSON.parse(row.details);
-      } catch (e) {
-        throw new StorageError(
-          `Failed to parse payment details JSON for payment ${row.id}: ${e.message}`,
-          e
-        );
+    if (row.lightning_invoice) {
+      details = {
+        type: 'lightning',
+        invoice: row.lightning_invoice,
+        paymentHash: row.lightning_payment_hash,
+        destinationPubkey: row.lightning_destination_pubkey,
+        description: row.lightning_description,
+        preimage: row.lightning_preimage,
+      };
+
+      if (row.lnurl_pay_info) {
+        try {
+          details.lnurlPayInfo = JSON.parse(row.lnurl_pay_info);
+        } catch (e) {
+          throw new StorageError(
+            `Failed to parse lnurl_pay_info JSON for payment ${row.id}: ${e.message}`,
+            e
+          );
+        }
       }
+    } else if (row.withdraw_tx_id) {
+      details = {
+        type: 'withdraw',
+        txId: row.withdraw_tx_id,
+      };
+    } else if (row.deposit_tx_id) {
+      details = {
+        type: 'deposit',
+        txId: row.deposit_tx_id,
+      };
+    } else if (row.spark) {
+      details = {
+        type: 'spark',
+        amount: row.spark,
+      };
     }
 
     let method = null;
@@ -363,21 +491,6 @@ class SqliteStorage {
       }
     }
 
-    // If this is a Lightning payment and we have lnurl_pay_info, add it to details
-    if (row.lnurl_pay_info && details && details.type == 'lightning') {
-      try {
-        details.lnurlPayInfo = JSON.parse(row.lnurl_pay_info);
-        if (row.lnurl_description && !details.description) {
-          details.description = row.lnurl_description;
-        }
-      } catch (e) {
-        throw new StorageError(
-          `Failed to parse lnurl_pay_info JSON for payment ${row.id}: ${e.message}`,
-          e
-        );
-      }
-    }
-
     return {
       id: row.id,
       paymentType: row.payment_type,

package/nodejs/storage/migrations.cjs

@@ -148,6 +148,34 @@ class MigrationManager {
       {
         name: "Add lnurl_description column to payment_metadata",
         sql: `ALTER TABLE payment_metadata ADD COLUMN lnurl_description TEXT`,
+      },
+      {
+        name: "Flatten payment details",
+        sql: [
+          `ALTER TABLE payments ADD COLUMN withdraw_tx_id TEXT`,
+          `ALTER TABLE payments ADD COLUMN deposit_tx_id TEXT`,
+          `ALTER TABLE payments ADD COLUMN spark INTEGER`,
+          `CREATE TABLE payment_details_lightning (
+              payment_id TEXT PRIMARY KEY,
+              invoice TEXT NOT NULL,
+              payment_hash TEXT NOT NULL,
+              destination_pubkey TEXT NOT NULL,
+              description TEXT,
+              preimage TEXT,
+              FOREIGN KEY (payment_id) REFERENCES payments(id) ON DELETE CASCADE
+            )`,
+          `INSERT INTO payment_details_lightning (payment_id, invoice, payment_hash, destination_pubkey, description, preimage)
+            SELECT id, json_extract(details, '$.Lightning.invoice'), json_extract(details, '$.Lightning.payment_hash'), 
+                json_extract(details, '$.Lightning.destination_pubkey'), json_extract(details, '$.Lightning.description'), 
+                json_extract(details, '$.Lightning.preimage') 
+            FROM payments WHERE json_extract(details, '$.Lightning.invoice') IS NOT NULL`,
+            `UPDATE payments SET withdraw_tx_id = json_extract(details, '$.Withdraw.tx_id')
+            WHERE json_extract(details, '$.Withdraw.tx_id') IS NOT NULL`,
+            `UPDATE payments SET deposit_tx_id = json_extract(details, '$.Deposit.tx_id')
+            WHERE json_extract(details, '$.Deposit.tx_id') IS NOT NULL`,
+            `ALTER TABLE payments DROP COLUMN details`,
+            `CREATE INDEX idx_payment_details_lightning_invoice ON payment_details_lightning(invoice)`,
+        ]
       }
     ];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@breeztech/breez-sdk-spark",
-    "version": "0.2.5-dev2",
+    "version": "0.2.6",
     "description": "Breez Spark SDK",
     "repository": "https://github.com/breez/spark-sdk",
     "author": "Breez <contact@breez.technology> (https://github.com/breez)",

package/web/breez_sdk_spark_wasm.d.ts

@@ -31,12 +31,23 @@ export interface Storage {
     insertPayment: (payment: Payment) => Promise<void>;
     setPaymentMetadata: (paymentId: string, metadata: PaymentMetadata) => Promise<void>;
     getPaymentById: (id: string) => Promise<Payment>;
+    getPaymentByInvoice: (invoice: string) => Promise<Payment>;
     addDeposit: (txid: string, vout: number, amount_sats: number) => Promise<void>;
     deleteDeposit: (txid: string, vout: number) => Promise<void>;
     listDeposits: () => Promise<DepositInfo[]>;
     updateDeposit: (txid: string, vout: number, payload: UpdateDepositPayload) => Promise<void>;
 }
 
+export interface WaitForPaymentResponse {
+    payment: Payment;
+}
+
+export type WaitForPaymentIdentifier = ({ type: "paymentId" } & string) | ({ type: "paymentRequest" } & string);
+
+export interface WaitForPaymentRequest {
+    identifier: WaitForPaymentIdentifier;
+}
+
 export interface Symbol {
     grapheme?: string;
     template?: string;
@@ -137,7 +148,7 @@ export interface SendPaymentRequest {
     options?: SendPaymentOptions;
 }
 
-export type SendPaymentOptions = { type: "bitcoinAddress"; confirmationSpeed: OnchainConfirmationSpeed } | { type: "bolt11Invoice"; preferSpark: boolean };
+export type SendPaymentOptions = { type: "bitcoinAddress"; confirmationSpeed: OnchainConfirmationSpeed } | { type: "bolt11Invoice"; preferSpark: boolean; completionTimeoutSecs?: number };
 
 export type OnchainConfirmationSpeed = "fast" | "medium" | "slow";
 
@@ -513,7 +524,7 @@ export class BreezSdk {
   free(): void;
   addEventListener(listener: EventListener): Promise<string>;
   removeEventListener(id: string): Promise<boolean>;
-  disconnect(): void;
+  disconnect(): Promise<void>;
   getInfo(request: GetInfoRequest): Promise<GetInfoResponse>;
   receivePayment(request: ReceivePaymentRequest): Promise<ReceivePaymentResponse>;
   prepareSendPayment(request: PrepareSendPaymentRequest): Promise<PrepareSendPaymentResponse>;
@@ -532,6 +543,7 @@ export class BreezSdk {
   deleteLightningAddress(): Promise<void>;
   listFiatCurrencies(): Promise<ListFiatCurrenciesResponse>;
   listFiatRates(): Promise<ListFiatRatesResponse>;
+  waitForPayment(request: WaitForPaymentRequest): Promise<WaitForPaymentResponse>;
 }
 export class IntoUnderlyingByteSource {
   private constructor();
@@ -576,7 +588,7 @@ export interface InitOutput {
   readonly parse: (a: number, b: number) => any;
   readonly breezsdk_addEventListener: (a: number, b: any) => any;
   readonly breezsdk_removeEventListener: (a: number, b: number, c: number) => any;
-  readonly breezsdk_disconnect: (a: number) => [number, number];
+  readonly breezsdk_disconnect: (a: number) => any;
   readonly breezsdk_getInfo: (a: number, b: any) => any;
   readonly breezsdk_receivePayment: (a: number, b: any) => any;
   readonly breezsdk_prepareSendPayment: (a: number, b: any) => any;
@@ -595,6 +607,7 @@ export interface InitOutput {
   readonly breezsdk_deleteLightningAddress: (a: number) => any;
   readonly breezsdk_listFiatCurrencies: (a: number) => any;
   readonly breezsdk_listFiatRates: (a: number) => any;
+  readonly breezsdk_waitForPayment: (a: number, b: any) => any;
   readonly __wbg_sdkbuilder_free: (a: number, b: number) => void;
   readonly sdkbuilder_new: (a: any, b: any, c: any) => [number, number, number];
   readonly sdkbuilder_withRestChainService: (a: number, b: number, c: number, d: number) => number;
@@ -626,8 +639,8 @@ export interface InitOutput {
   readonly __wbindgen_export_5: WebAssembly.Table;
   readonly __wbindgen_export_6: WebAssembly.Table;
   readonly __externref_table_dealloc: (a: number) => void;
-  readonly _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf7c49586be6831c4: (a: number, b: number) => void;
-  readonly closure781_externref_shim: (a: number, b: number, c: any) => void;
+  readonly _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he5eedad33b9ff4bf: (a: number, b: number) => void;
+  readonly closure780_externref_shim: (a: number, b: number, c: any) => void;
   readonly closure434_externref_shim: (a: number, b: number, c: any, d: any) => void;
   readonly __wbindgen_start: () => void;
 }

package/web/breez_sdk_spark_wasm.js

@@ -271,14 +271,14 @@ export function task_worker_entry_point(ptr) {
 }
 
 function __wbg_adapter_52(arg0, arg1) {
-    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf7c49586be6831c4(arg0, arg1);
+    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he5eedad33b9ff4bf(arg0, arg1);
 }
 
 function __wbg_adapter_55(arg0, arg1, arg2) {
-    wasm.closure781_externref_shim(arg0, arg1, arg2);
+    wasm.closure780_externref_shim(arg0, arg1, arg2);
 }
 
-function __wbg_adapter_180(arg0, arg1, arg2, arg3) {
+function __wbg_adapter_183(arg0, arg1, arg2, arg3) {
     wasm.closure434_externref_shim(arg0, arg1, arg2, arg3);
 }
 
@@ -337,11 +337,12 @@ export class BreezSdk {
         const ret = wasm.breezsdk_removeEventListener(this.__wbg_ptr, ptr0, len0);
         return ret;
     }
+    /**
+     * @returns {Promise<void>}
+     */
     disconnect() {
         const ret = wasm.breezsdk_disconnect(this.__wbg_ptr);
-        if (ret[1]) {
-            throw takeFromExternrefTable0(ret[0]);
-        }
+        return ret;
     }
     /**
      * @param {GetInfoRequest} request
@@ -483,6 +484,14 @@ export class BreezSdk {
         const ret = wasm.breezsdk_listFiatRates(this.__wbg_ptr);
         return ret;
     }
+    /**
+     * @param {WaitForPaymentRequest} request
+     * @returns {Promise<WaitForPaymentResponse>}
+     */
+    waitForPayment(request) {
+        const ret = wasm.breezsdk_waitForPayment(this.__wbg_ptr, request);
+        return ret;
+    }
 }
 
 const IntoUnderlyingByteSourceFinalization = (typeof FinalizationRegistry === 'undefined')
@@ -888,6 +897,18 @@ function __wbg_get_imports() {
             wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
         }
     }, arguments) };
+    imports.wbg.__wbg_getPaymentByInvoice_afddfcbefa5508b0 = function() { return handleError(function (arg0, arg1, arg2) {
+        let deferred0_0;
+        let deferred0_1;
+        try {
+            deferred0_0 = arg1;
+            deferred0_1 = arg2;
+            const ret = arg0.getPaymentByInvoice(getStringFromWasm0(arg1, arg2));
+            return ret;
+        } finally {
+            wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
+        }
+    }, arguments) };
     imports.wbg.__wbg_getRandomValues_b8f5dbd5f3995a9e = function() { return handleError(function (arg0, arg1) {
         arg0.getRandomValues(arg1);
     }, arguments) };
@@ -1016,7 +1037,7 @@ function __wbg_get_imports() {
                 const a = state0.a;
                 state0.a = 0;
                 try {
-                    return __wbg_adapter_180(a, state0.b, arg0, arg1);
+                    return __wbg_adapter_183(a, state0.b, arg0, arg1);
                 } finally {
                     state0.a = a;
                 }
@@ -1312,12 +1333,12 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper8071 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 611, __wbg_adapter_52);
+    imports.wbg.__wbindgen_closure_wrapper8079 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 612, __wbg_adapter_52);
         return ret;
     };
-    imports.wbg.__wbindgen_closure_wrapper9713 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 782, __wbg_adapter_55);
+    imports.wbg.__wbindgen_closure_wrapper9672 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 781, __wbg_adapter_55);
         return ret;
     };
     imports.wbg.__wbindgen_debug_string = function(arg0, arg1) {

package/web/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -9,7 +9,7 @@ export const defaultStorage: (a: number, b: number) => any;
 export const parse: (a: number, b: number) => any;
 export const breezsdk_addEventListener: (a: number, b: any) => any;
 export const breezsdk_removeEventListener: (a: number, b: number, c: number) => any;
-export const breezsdk_disconnect: (a: number) => [number, number];
+export const breezsdk_disconnect: (a: number) => any;
 export const breezsdk_getInfo: (a: number, b: any) => any;
 export const breezsdk_receivePayment: (a: number, b: any) => any;
 export const breezsdk_prepareSendPayment: (a: number, b: any) => any;
@@ -28,6 +28,7 @@ export const breezsdk_registerLightningAddress: (a: number, b: any) => any;
 export const breezsdk_deleteLightningAddress: (a: number) => any;
 export const breezsdk_listFiatCurrencies: (a: number) => any;
 export const breezsdk_listFiatRates: (a: number) => any;
+export const breezsdk_waitForPayment: (a: number, b: any) => any;
 export const __wbg_sdkbuilder_free: (a: number, b: number) => void;
 export const sdkbuilder_new: (a: any, b: any, c: any) => [number, number, number];
 export const sdkbuilder_withRestChainService: (a: number, b: number, c: number, d: number) => number;
@@ -59,7 +60,7 @@ export const __externref_table_alloc: () => number;
 export const __wbindgen_export_5: WebAssembly.Table;
 export const __wbindgen_export_6: WebAssembly.Table;
 export const __externref_table_dealloc: (a: number) => void;
-export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf7c49586be6831c4: (a: number, b: number) => void;
-export const closure781_externref_shim: (a: number, b: number, c: any) => void;
+export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__he5eedad33b9ff4bf: (a: number, b: number) => void;
+export const closure780_externref_shim: (a: number, b: number, c: any) => void;
 export const closure434_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/web/storage/index.js

@@ -100,6 +100,17 @@ class MigrationManager {
           }
         },
       },
+      {
+        name: "Create invoice index",
+        upgrade: (db, transaction) => {
+          const paymentStore = transaction.objectStore("payments");
+          if (!paymentStore.indexNames.contains("invoice")) {
+            paymentStore.createIndex("invoice", "details.invoice", {
+              unique: false,
+            });
+          }
+        }
+      }
     ];
   }
 }
@@ -436,6 +447,58 @@ class IndexedDBStorage {
     });
   }
 
+  async getPaymentByInvoice(invoice) {
+    if (!this.db) {
+      throw new StorageError("Database not initialized");
+    }
+
+    return new Promise((resolve, reject) => {
+      const transaction = this.db.transaction(
+        ["payments", "payment_metadata"],
+        "readonly"
+      );
+      const paymentStore = transaction.objectStore("payments");
+      const invoiceIndex = paymentStore.index("invoice");
+      const metadataStore = transaction.objectStore("payment_metadata");
+
+      const paymentRequest = invoiceIndex.get(invoice);
+
+      paymentRequest.onsuccess = () => {
+        const payment = paymentRequest.result;
+        if (!payment) {
+          resolve(null);
+          return;
+        }
+
+        // Get metadata for this payment
+        const metadataRequest = metadataStore.get(invoice);
+        metadataRequest.onsuccess = () => {
+          const metadata = metadataRequest.result;
+          const paymentWithMetadata = this._mergePaymentMetadata(
+            payment,
+            metadata
+          );
+          resolve(paymentWithMetadata);
+        };
+        metadataRequest.onerror = () => {
+          // Return payment without metadata if metadata fetch fails
+          resolve(payment);
+        };
+      };
+
+      paymentRequest.onerror = () => {
+        reject(
+          new StorageError(
+            `Failed to get payment by invoice '${invoice}': ${
+              paymentRequest.error?.message || "Unknown error"
+            }`,
+            paymentRequest.error
+          )
+        );
+      };
+    });
+  }
+
   async setPaymentMetadata(paymentId, metadata) {
     if (!this.db) {
       throw new StorageError("Database not initialized");