@breeztech/breez-sdk-spark 0.6.6 → 0.7.0-dev1

package/nodejs/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -2,6 +2,7 @@
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
 export const __wbg_breezsdk_free: (a: number, b: number) => void;
+export const __wbg_defaultsigner_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 breezsdk_addEventListener: (a: number, b: any) => any;
@@ -12,6 +13,7 @@ export const breezsdk_claimDeposit: (a: number, b: any) => any;
 export const breezsdk_claimHtlcPayment: (a: number, b: any) => any;
 export const breezsdk_deleteLightningAddress: (a: number) => any;
 export const breezsdk_disconnect: (a: number) => any;
+export const breezsdk_fetchTokenConversionLimits: (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;
@@ -39,14 +41,36 @@ export const breezsdk_startLeafOptimization: (a: number) => void;
 export const breezsdk_syncWallet: (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 defaultConfig: (a: any) => any;
+export const defaultExternalSigner: (a: number, b: number, c: number, d: number, e: any, f: number) => [number, number, number];
+export const defaultsigner_aggregateFrost: (a: number, b: any) => any;
+export const defaultsigner_derivePublicKey: (a: number, b: number, c: number) => any;
+export const defaultsigner_eciesDecrypt: (a: number, b: number, c: number, d: number, e: number) => any;
+export const defaultsigner_eciesEncrypt: (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_generateFrostSigningCommitments: (a: number) => any;
+export const defaultsigner_generateRandomKey: (a: number) => any;
+export const defaultsigner_getPublicKeyForNode: (a: number, b: any) => any;
+export const defaultsigner_getPublicKeyFromPrivateKeySource: (a: number, b: any) => any;
+export const defaultsigner_getStaticDepositPrivateKey: (a: number, b: number) => any;
+export const defaultsigner_getStaticDepositPrivateKeySource: (a: number, b: number) => any;
+export const defaultsigner_getStaticDepositPublicKey: (a: number, b: number) => any;
+export const defaultsigner_identityPublicKey: (a: number) => [number, number, number];
+export const defaultsigner_signEcdsa: (a: number, b: number, c: number, d: number, e: number) => any;
+export const defaultsigner_signEcdsaRecoverable: (a: number, b: number, c: number, d: number, e: 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_subtractPrivateKeys: (a: number, b: any, c: any) => any;
 export const initLogging: (a: any, b: number, c: number) => any;
 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_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, c: number, d: number) => number;
+export const sdkbuilder_withKeySet: (a: number, b: any) => number;
 export const sdkbuilder_withLnurlClient: (a: number, b: any) => number;
 export const sdkbuilder_withPaymentObserver: (a: number, b: any) => number;
 export const sdkbuilder_withRestChainService: (a: number, b: number, c: number, d: any, e: number) => number;
@@ -86,6 +110,6 @@ export const __externref_drop_slice: (a: number, b: number) => void;
 export const __wbindgen_export_7: 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__hdf0ebd5238280272: (a: number, b: number) => void;
-export const closure997_externref_shim: (a: number, b: number, c: any) => void;
-export const closure571_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const closure1047_externref_shim: (a: number, b: number, c: any) => void;
+export const closure632_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/nodejs/storage/index.cjs

@@ -154,18 +154,58 @@ class SqliteStorage {
         params.push(request.toTimestamp);
       }
 
-      // Filter by Spark HTLC status
-      if (
-        request.sparkHtlcStatusFilter &&
-        request.sparkHtlcStatusFilter.length > 0
-      ) {
-        const placeholders = request.sparkHtlcStatusFilter
-          .map(() => "?")
-          .join(", ");
-        whereClauses.push(
-          `json_extract(s.htlc_details, '$.status') IN (${placeholders})`
-        );
-        params.push(...request.sparkHtlcStatusFilter);
+      // Filter by payment details. If any filter matches, we include the payment
+      if (request.paymentDetailsFilter && request.paymentDetailsFilter.length > 0) {
+        const allPaymentDetailsClauses = [];
+        for (const paymentDetailsFilter of request.paymentDetailsFilter) {
+          const paymentDetailsClauses = [];
+          // Filter by Spark HTLC status
+          if (
+            paymentDetailsFilter.type === "spark" &&
+            paymentDetailsFilter.htlcStatus !== undefined &&
+            paymentDetailsFilter.htlcStatus.length > 0
+          ) {
+            const placeholders = paymentDetailsFilter.htlcStatus
+              .map(() => "?")
+              .join(", ");
+            paymentDetailsClauses.push(
+              `json_extract(s.htlc_details, '$.status') IN (${placeholders})`
+            );
+            params.push(...paymentDetailsFilter.htlcStatus);
+          }
+          // Filter by token conversion info presence
+          if (
+            (paymentDetailsFilter.type === "spark" || paymentDetailsFilter.type === "token") &&
+              paymentDetailsFilter.conversionRefundNeeded !== undefined
+          ) {
+            const typeCheck = paymentDetailsFilter.type === "spark" ? "p.spark = 1" : "p.spark IS NULL";
+            const nullCheck =
+              paymentDetailsFilter.conversionRefundNeeded === true
+                ? "IS NULL"
+                : "IS NOT NULL";
+            paymentDetailsClauses.push(
+              `${typeCheck} AND pm.token_conversion_info IS NOT NULL AND
+              json_extract(pm.token_conversion_info, '$.paymentId') IS NULL AND
+              json_extract(pm.token_conversion_info, '$.refundIdentifier') ${nullCheck}`
+            );
+          }
+          // Filter by token transaction hash
+          if (
+            paymentDetailsFilter.type === "token" &&
+            paymentDetailsFilter.txHash !== undefined
+          ) {
+            paymentDetailsClauses.push("t.tx_hash = ?");
+            params.push(paymentDetailsFilter.txHash);
+          }
+
+          if (paymentDetailsClauses.length > 0) {
+            allPaymentDetailsClauses.push(`(${paymentDetailsClauses.join(" AND ")})`);
+          }
+        }
+
+        if (allPaymentDetailsClauses.length > 0) {
+          whereClauses.push(`(${allPaymentDetailsClauses.join(" OR ")})`);
+        }
       }
 
       // Filter by payment details/method
@@ -207,6 +247,7 @@ class SqliteStorage {
             ,       l.preimage AS lightning_preimage
             ,       pm.lnurl_pay_info
             ,       pm.lnurl_withdraw_info
+            ,       pm.token_conversion_info
             ,       t.metadata AS token_metadata
             ,       t.tx_hash AS token_tx_hash
             ,       t.invoice_details AS token_invoice_details
@@ -229,7 +270,8 @@ class SqliteStorage {
       params.push(actualLimit, actualOffset);
       const stmt = this.db.prepare(query);
       const rows = stmt.all(...params);
-      return Promise.resolve(rows.map(this._rowToPayment.bind(this)));
+      const payments = rows.map(this._rowToPayment.bind(this));
+      return Promise.resolve(payments);
     } catch (error) {
       return Promise.reject(
         new StorageError(
@@ -251,23 +293,46 @@ class SqliteStorage {
       }
 
       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)`
+        `INSERT 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)
+         ON CONFLICT(id) DO UPDATE SET
+           payment_type=excluded.payment_type,
+           status=excluded.status,
+           amount=excluded.amount,
+           fees=excluded.fees,
+           timestamp=excluded.timestamp,
+           method=excluded.method,
+           withdraw_tx_id=excluded.withdraw_tx_id,
+           deposit_tx_id=excluded.deposit_tx_id,
+           spark=excluded.spark`
       );
       const lightningInsert = this.db.prepare(
-        `INSERT OR REPLACE INTO payment_details_lightning 
+        `INSERT INTO payment_details_lightning 
           (payment_id, invoice, payment_hash, destination_pubkey, description, preimage) 
-          VALUES (@id, @invoice, @paymentHash, @destinationPubkey, @description, @preimage)`
+          VALUES (@id, @invoice, @paymentHash, @destinationPubkey, @description, @preimage)
+          ON CONFLICT(payment_id) DO UPDATE SET
+            invoice=excluded.invoice,
+            payment_hash=excluded.payment_hash,
+            destination_pubkey=excluded.destination_pubkey,
+            description=excluded.description,
+            preimage=excluded.preimage`
       );
       const tokenInsert = this.db.prepare(
-        `INSERT OR REPLACE INTO payment_details_token 
+        `INSERT INTO payment_details_token 
           (payment_id, metadata, tx_hash, invoice_details) 
-          VALUES (@id, @metadata, @txHash, @invoiceDetails)`
+          VALUES (@id, @metadata, @txHash, @invoiceDetails)
+          ON CONFLICT(payment_id) DO UPDATE SET
+            metadata=excluded.metadata,
+            tx_hash=excluded.tx_hash,
+            invoice_details=COALESCE(excluded.invoice_details, payment_details_token.invoice_details)`
       );
       const sparkInsert = this.db.prepare(
-        `INSERT OR REPLACE INTO payment_details_spark 
+        `INSERT INTO payment_details_spark 
           (payment_id, invoice_details, htlc_details) 
-          VALUES (@id, @invoiceDetails, @htlcDetails)`
+          VALUES (@id, @invoiceDetails, @htlcDetails)
+          ON CONFLICT(payment_id) DO UPDATE SET
+            invoice_details=COALESCE(excluded.invoice_details, payment_details_spark.invoice_details),
+            htlc_details=COALESCE(excluded.htlc_details, payment_details_spark.htlc_details)`
       );
       const transaction = this.db.transaction(() => {
         paymentInsert.run({
@@ -362,6 +427,7 @@ class SqliteStorage {
             ,       l.preimage AS lightning_preimage
             ,       pm.lnurl_pay_info
             ,       pm.lnurl_withdraw_info
+            ,       pm.token_conversion_info
             ,       t.metadata AS token_metadata
             ,       t.tx_hash AS token_tx_hash
             ,       t.invoice_details AS token_invoice_details
@@ -425,6 +491,7 @@ class SqliteStorage {
             ,       l.preimage AS lightning_preimage
             ,       pm.lnurl_pay_info
             ,       pm.lnurl_withdraw_info
+            ,       pm.token_conversion_info
             ,       t.metadata AS token_metadata
             ,       t.tx_hash AS token_tx_hash
             ,       t.invoice_details AS token_invoice_details
@@ -463,17 +530,21 @@ class SqliteStorage {
   setPaymentMetadata(paymentId, metadata) {
     try {
       const stmt = this.db.prepare(`
-                INSERT OR REPLACE INTO payment_metadata (payment_id, lnurl_pay_info, lnurl_withdraw_info, lnurl_description) 
-                VALUES (?, ?, ?, ?)
+                INSERT OR REPLACE INTO payment_metadata (payment_id, parent_payment_id, lnurl_pay_info, lnurl_withdraw_info, lnurl_description, token_conversion_info) 
+                VALUES (?, ?, ?, ?, ?, ?)
             `);
 
       stmt.run(
         paymentId,
+        metadata.parentPaymentId,
         metadata.lnurlPayInfo ? JSON.stringify(metadata.lnurlPayInfo) : null,
         metadata.lnurlWithdrawInfo
           ? JSON.stringify(metadata.lnurlWithdrawInfo)
           : null,
-        metadata.lnurlDescription
+        metadata.lnurlDescription,
+        metadata.tokenConversionInfo
+          ? JSON.stringify(metadata.tokenConversionInfo)
+          : null
       );
       return Promise.resolve();
     } catch (error) {
@@ -676,6 +747,9 @@ class SqliteStorage {
         htlcDetails: row.spark_htlc_details
           ? JSON.parse(row.spark_htlc_details)
           : null,
+        tokenConversionInfo: row.token_conversion_info
+          ? JSON.parse(row.token_conversion_info)
+          : null,
       };
     } else if (row.token_metadata) {
       details = {
@@ -685,6 +759,9 @@ class SqliteStorage {
         invoiceDetails: row.token_invoice_details
           ? JSON.parse(row.token_invoice_details)
           : null,
+        tokenConversionInfo: row.token_conversion_info
+          ? JSON.parse(row.token_conversion_info)
+          : null,
       };
     }
 

package/nodejs/storage/migrations.cjs

@@ -292,7 +292,29 @@ class MigrationManager {
         // Deposits will be recovered on next sync.
         name: "Clear unclaimed deposits for claim_error format change",
         sql: `DELETE FROM unclaimed_deposits`
-      }
+      },
+      {
+        // Clear all sync tables due to BreezSigner signature change.
+        // This forces users to sync from scratch to the sync server.
+        // Also delete the sync_initial_complete flag to force re-populating
+        // all payment metadata for outgoing sync using the new key.
+        name: "Clear sync tables for BreezSigner backward compatibility",
+        sql: [
+          `DELETE FROM sync_outgoing`,
+          `DELETE FROM sync_incoming`,
+          `DELETE FROM sync_state`,
+          `UPDATE sync_revision SET revision = 0`,
+          `DELETE FROM settings WHERE key = 'sync_initial_complete'`
+        ]
+      },
+      {
+        name: "Add token conversion info to payment_metadata",
+        sql: `ALTER TABLE payment_metadata ADD COLUMN token_conversion_info TEXT`
+      },
+      {
+        name: "Add parent payment id to payment_metadata",
+        sql: `ALTER TABLE payment_metadata ADD COLUMN parent_payment_id TEXT`
+      },
     ];
   }
 }

package/package.json

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