@breeztech/breez-sdk-spark 0.8.0-dev1 → 0.8.3-dev1

package/nodejs/breez_sdk_spark_wasm.js

@@ -217,27 +217,6 @@ function debugString(val) {
     // TODO we could test for more things here, like `Set`s and `Map`s.
     return className;
 }
-/**
- * @param {Config} config
- * @param {ExternalSigner} signer
- * @param {string} storage_dir
- * @returns {Promise<BreezSdk>}
- */
-module.exports.connectWithSigner = function(config, signer, storage_dir) {
-    const ptr0 = passStringToWasm0(storage_dir, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-    const len0 = WASM_VECTOR_LEN;
-    const ret = wasm.connectWithSigner(config, signer, ptr0, len0);
-    return ret;
-};
-
-/**
- * @param {ConnectRequest} request
- * @returns {Promise<BreezSdk>}
- */
-module.exports.connect = function(request) {
-    const ret = wasm.connect(request);
-    return ret;
-};
 
 function takeFromExternrefTable0(idx) {
     const value = wasm.__wbindgen_export_5.get(idx);
@@ -263,6 +242,15 @@ module.exports.defaultExternalSigner = function(mnemonic, passphrase, network, k
     return DefaultSigner.__wrap(ret[0]);
 };
 
+/**
+ * @param {ConnectRequest} request
+ * @returns {Promise<BreezSdk>}
+ */
+module.exports.connect = function(request) {
+    const ret = wasm.connect(request);
+    return ret;
+};
+
 /**
  * @param {Logger} logger
  * @param {string | null} [filter]
@@ -276,13 +264,15 @@ module.exports.initLogging = function(logger, filter) {
 };
 
 /**
- * Creates a default external signer from a mnemonic phrase.
- *
- * This creates a signer that can be used with `connectWithSigner` or `SdkBuilder.newWithSigner`.
- * @returns {Promise<SparkStatus>}
+ * @param {Config} config
+ * @param {ExternalSigner} signer
+ * @param {string} storage_dir
+ * @returns {Promise<BreezSdk>}
  */
-module.exports.getSparkStatus = function() {
-    const ret = wasm.getSparkStatus();
+module.exports.connectWithSigner = function(config, signer, storage_dir) {
+    const ptr0 = passStringToWasm0(storage_dir, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+    const len0 = WASM_VECTOR_LEN;
+    const ret = wasm.connectWithSigner(config, signer, ptr0, len0);
     return ret;
 };
 
@@ -295,6 +285,17 @@ module.exports.defaultConfig = function(network) {
     return ret;
 };
 
+/**
+ * Creates a default external signer from a mnemonic phrase.
+ *
+ * This creates a signer that can be used with `connectWithSigner` or `SdkBuilder.newWithSigner`.
+ * @returns {Promise<SparkStatus>}
+ */
+module.exports.getSparkStatus = function() {
+    const ret = wasm.getSparkStatus();
+    return ret;
+};
+
 function passArray8ToWasm0(arg, malloc) {
     const ptr = malloc(arg.length * 1, 1) >>> 0;
     getUint8ArrayMemory0().set(arg, ptr / 1);
@@ -313,15 +314,15 @@ module.exports.task_worker_entry_point = function(ptr) {
 };
 
 function __wbg_adapter_64(arg0, arg1) {
-    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hf2ef52c8a8b47594(arg0, arg1);
+    wasm._dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h127c718764a2a72f(arg0, arg1);
 }
 
 function __wbg_adapter_67(arg0, arg1, arg2) {
-    wasm.closure1078_externref_shim(arg0, arg1, arg2);
+    wasm.closure1090_externref_shim(arg0, arg1, arg2);
 }
 
-function __wbg_adapter_287(arg0, arg1, arg2, arg3) {
-    wasm.closure671_externref_shim(arg0, arg1, arg2, arg3);
+function __wbg_adapter_285(arg0, arg1, arg2, arg3) {
+    wasm.closure670_externref_shim(arg0, arg1, arg2, arg3);
 }
 
 const __wbindgen_enum_ReadableStreamType = ["bytes"];
@@ -1879,7 +1880,7 @@ module.exports.__wbg_new_23a2665fac83c611 = function(arg0, arg1) {
             const a = state0.a;
             state0.a = 0;
             try {
-                return __wbg_adapter_287(a, state0.b, arg0, arg1);
+                return __wbg_adapter_285(a, state0.b, arg0, arg1);
             } finally {
                 state0.a = a;
             }
@@ -2291,11 +2292,6 @@ module.exports.__wbg_syncInsertIncomingRecords_dde4039dbc9cb38f = function() { r
     return ret;
 }, arguments) };
 
-module.exports.__wbg_syncRebasePendingOutgoingRecords_b3441ced5dee0c8e = function() { return handleError(function (arg0, arg1) {
-    const ret = arg0.syncRebasePendingOutgoingRecords(BigInt.asUintN(64, arg1));
-    return ret;
-}, arguments) };
-
 module.exports.__wbg_syncUpdateRecordFromIncoming_a76ad82592bfdcb3 = function() { return handleError(function (arg0, arg1) {
     const ret = arg0.syncUpdateRecordFromIncoming(arg1);
     return ret;
@@ -2409,13 +2405,13 @@ module.exports.__wbindgen_cb_drop = function(arg0) {
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper11759 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 848, __wbg_adapter_64);
+module.exports.__wbindgen_closure_wrapper11879 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 851, __wbg_adapter_64);
     return ret;
 };
 
-module.exports.__wbindgen_closure_wrapper13708 = function(arg0, arg1, arg2) {
-    const ret = makeMutClosure(arg0, arg1, 1079, __wbg_adapter_67);
+module.exports.__wbindgen_closure_wrapper13824 = function(arg0, arg1, arg2) {
+    const ret = makeMutClosure(arg0, arg1, 1091, __wbg_adapter_67);
     return ret;
 };
 

package/nodejs/breez_sdk_spark_wasm_bg.wasm.d.ts

@@ -113,7 +113,7 @@ export const __wbindgen_export_5: WebAssembly.Table;
 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__hf2ef52c8a8b47594: (a: number, b: number) => void;
-export const closure1078_externref_shim: (a: number, b: number, c: any) => void;
-export const closure671_externref_shim: (a: number, b: number, c: any, d: any) => void;
+export const _dyn_core__ops__function__FnMut_____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h127c718764a2a72f: (a: number, b: number) => void;
+export const closure1090_externref_shim: (a: number, b: number, c: any) => void;
+export const closure670_externref_shim: (a: number, b: number, c: any, d: any) => void;
 export const __wbindgen_start: () => void;

package/nodejs/storage/index.cjs

@@ -48,6 +48,8 @@ const SELECT_PAYMENT_SQL = `
            l.destination_pubkey AS lightning_destination_pubkey,
            COALESCE(l.description, pm.lnurl_description) AS lightning_description,
            l.preimage AS lightning_preimage,
+           l.htlc_status AS lightning_htlc_status,
+           l.htlc_expiry_time AS lightning_htlc_expiry_time,
            pm.lnurl_pay_info,
            pm.lnurl_withdraw_info,
            pm.conversion_info,
@@ -200,18 +202,30 @@ class SqliteStorage {
         const allPaymentDetailsClauses = [];
         for (const paymentDetailsFilter of request.paymentDetailsFilter) {
           const paymentDetailsClauses = [];
-          // Filter by Spark HTLC status
+          // Filter by HTLC status (Spark or Lightning)
+          const htlcAlias =
+            paymentDetailsFilter.type === "spark" ? "s"
+              : paymentDetailsFilter.type === "lightning" ? "l"
+                : null;
           if (
-            paymentDetailsFilter.type === "spark" &&
+            htlcAlias &&
             paymentDetailsFilter.htlcStatus !== undefined &&
             paymentDetailsFilter.htlcStatus.length > 0
           ) {
             const placeholders = paymentDetailsFilter.htlcStatus
               .map(() => "?")
               .join(", ");
-            paymentDetailsClauses.push(
-              `json_extract(s.htlc_details, '$.status') IN (${placeholders})`
-            );
+            if (htlcAlias === "l") {
+              // Lightning: htlc_status is a direct column
+              paymentDetailsClauses.push(
+                `l.htlc_status IN (${placeholders})`
+              );
+            } else {
+              // Spark: htlc_details is still JSON
+              paymentDetailsClauses.push(
+                `json_extract(s.htlc_details, '$.status') IN (${placeholders})`
+              );
+            }
             params.push(...paymentDetailsFilter.htlcStatus);
           }
           // Filter by token conversion info presence
@@ -246,6 +260,7 @@ class SqliteStorage {
             params.push(paymentDetailsFilter.txType);
           }
 
+
           if (paymentDetailsClauses.length > 0) {
             allPaymentDetailsClauses.push(`(${paymentDetailsClauses.join(" AND ")})`);
           }
@@ -321,15 +336,17 @@ class SqliteStorage {
            spark=excluded.spark`
       );
       const lightningInsert = this.db.prepare(
-        `INSERT INTO payment_details_lightning 
-          (payment_id, invoice, payment_hash, destination_pubkey, description, preimage) 
-          VALUES (@id, @invoice, @paymentHash, @destinationPubkey, @description, @preimage)
+        `INSERT INTO payment_details_lightning
+          (payment_id, invoice, payment_hash, destination_pubkey, description, preimage, htlc_status, htlc_expiry_time)
+          VALUES (@id, @invoice, @paymentHash, @destinationPubkey, @description, @preimage, @htlcStatus, @htlcExpiryTime)
           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`
+            preimage=COALESCE(excluded.preimage, payment_details_lightning.preimage),
+            htlc_status=COALESCE(excluded.htlc_status, payment_details_lightning.htlc_status),
+            htlc_expiry_time=COALESCE(excluded.htlc_expiry_time, payment_details_lightning.htlc_expiry_time)`
       );
       const tokenInsert = this.db.prepare(
         `INSERT INTO payment_details_token 
@@ -385,10 +402,12 @@ class SqliteStorage {
           lightningInsert.run({
             id: payment.id,
             invoice: payment.details.invoice,
-            paymentHash: payment.details.paymentHash,
+            paymentHash: payment.details.htlcDetails.paymentHash,
             destinationPubkey: payment.details.destinationPubkey,
             description: payment.details.description,
-            preimage: payment.details.preimage,
+            preimage: payment.details.htlcDetails?.preimage,
+            htlcStatus: payment.details.htlcDetails?.status || null,
+            htlcExpiryTime: payment.details.htlcDetails?.expiryTime || 0,
           });
         }
 
@@ -696,10 +715,16 @@ class SqliteStorage {
       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,
+        htlcDetails: row.lightning_htlc_status
+          ? {
+              paymentHash: row.lightning_payment_hash,
+              preimage: row.lightning_preimage || null,
+              expiryTime: row.lightning_htlc_expiry_time || 0,
+              status: row.lightning_htlc_status,
+            }
+          : (() => { throw new StorageError(`htlc_status is required for Lightning payment ${row.id}`); })(),
       };
 
       if (row.lnurl_pay_info) {
@@ -798,14 +823,10 @@ class SqliteStorage {
   syncAddOutgoingChange(record) {
     try {
       const transaction = this.db.transaction(() => {
-        // Compute next revision as max(committed, max outgoing) + 1, without updating sync_revision
+        // This revision is a local queue id for pending rows, not a server revision.
         const revisionQuery = this.db.prepare(`
-          SELECT CAST(
-            MAX(
-              (SELECT revision FROM sync_revision),
-              COALESCE((SELECT MAX(revision) FROM sync_outgoing), 0)
-            ) + 1
-          AS TEXT) AS revision
+          SELECT CAST(COALESCE(MAX(revision), 0) + 1 AS TEXT) AS revision
+          FROM sync_outgoing
         `);
         const revision = BigInt(revisionQuery.get().revision);
 
@@ -931,7 +952,7 @@ class SqliteStorage {
           },
           schemaVersion: row.schema_version,
           updatedFields: JSON.parse(row.updated_fields_json),
-          revision: BigInt(row.revision),
+          localRevision: BigInt(row.revision),
         };
 
         let parent = null;
@@ -1042,50 +1063,6 @@ class SqliteStorage {
     }
   }
 
-  syncRebasePendingOutgoingRecords(revision) {
-    try {
-      const transaction = this.db.transaction(() => {
-        // Get current committed revision from sync_revision table
-        const getLastRevisionStmt = this.db.prepare(`
-          SELECT CAST(revision AS TEXT) as last_revision FROM sync_revision
-        `);
-        const revisionRow = getLastRevisionStmt.get();
-        const lastRevision = revisionRow
-          ? BigInt(revisionRow.last_revision)
-          : BigInt(0);
-
-        // Calculate the difference to add to all revision numbers
-        const diff =
-          revision > lastRevision ? revision - lastRevision : BigInt(0);
-
-        if (diff > BigInt(0)) {
-          // Update all pending outgoing records
-          const updateRecordsStmt = this.db.prepare(`
-            UPDATE sync_outgoing
-            SET revision = revision + CAST(? AS INTEGER)
-          `);
-          updateRecordsStmt.run(diff.toString());
-        }
-
-        // Update sync_revision within the same transaction so retries are idempotent
-        const updateRevisionStmt = this.db.prepare(`
-          UPDATE sync_revision SET revision = MAX(revision, CAST(? AS INTEGER))
-        `);
-        updateRevisionStmt.run(revision.toString());
-      });
-
-      transaction();
-      return Promise.resolve();
-    } catch (error) {
-      return Promise.reject(
-        new StorageError(
-          `Failed to rebase pending outgoing records: ${error.message}`,
-          error
-        )
-      );
-    }
-  }
-
   syncGetIncomingRecords(limit) {
     try {
       const transaction = this.db.transaction(() => {
@@ -1191,7 +1168,7 @@ class SqliteStorage {
         },
         schemaVersion: row.schema_version,
         updatedFields: JSON.parse(row.updated_fields_json),
-        revision: BigInt(row.revision),
+        localRevision: BigInt(row.revision),
       };
 
       let parent = null;

package/nodejs/storage/migrations.cjs

@@ -13,11 +13,12 @@ class MigrationManager {
   }
 
   /**
-   * Run all pending migrations
+   * Run all pending migrations, or up to a specific version.
+   * @param {number|null} targetVersion - Target version to migrate to (default: latest)
    */
-  migrate() {
+  migrate(targetVersion = null) {
     const currentVersion = this._getCurrentVersion();
-    const targetVersion = this.migrations.length;
+    targetVersion = targetVersion ?? this.migrations.length;
 
     if (currentVersion >= targetVersion) {
       this._log("info", `Database is up to date (version ${currentVersion})`);
@@ -345,6 +346,27 @@ class MigrationManager {
           `DELETE FROM settings WHERE key = 'sync_initial_complete'`
         ]
       },
+      {
+        name: "Add htlc_status and htlc_expiry_time to lightning payments",
+        sql: [
+          `ALTER TABLE payment_details_lightning ADD COLUMN htlc_status TEXT NOT NULL DEFAULT 'waitingForPreimage'`,
+          `ALTER TABLE payment_details_lightning ADD COLUMN htlc_expiry_time INTEGER NOT NULL DEFAULT 0`,
+        ]
+      },
+      {
+        name: "Backfill htlc_status for existing Lightning payments",
+        sql: [
+          `UPDATE payment_details_lightning
+           SET htlc_status = CASE
+                   WHEN (SELECT status FROM payments WHERE id = payment_id) = 'completed' THEN 'preimageShared'
+                   WHEN (SELECT status FROM payments WHERE id = payment_id) = 'pending' THEN 'waitingForPreimage'
+                   ELSE 'returned'
+               END`,
+          `UPDATE settings
+           SET value = json_set(value, '$.offset', 0)
+           WHERE key = 'sync_offset' AND json_valid(value)`,
+        ]
+      },
     ];
   }
 }

package/package.json

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