@breeztech/breez-sdk-spark 0.12.2-dev2 → 0.12.2-dev4

package/nodejs/postgres-tree-store/index.cjs

@@ -28,7 +28,7 @@ const { TreeStoreMigrationManager } = require("./migrations.cjs");
  * Advisory lock key for serializing tree store write operations.
  * Matches the Rust constant TREE_STORE_WRITE_LOCK_KEY = 0x7472_6565_5354_4f52
  */
-const TREE_STORE_WRITE_LOCK_KEY = "8390880541608791890"; // 0x7472656553544f52 as decimal string
+const TREE_STORE_WRITE_LOCK_KEY = "8391086132283252818"; // 0x7472656553544f52 as decimal string
 
 /**
  * Timeout for reservations in seconds. Reservations older than this are stale.
@@ -789,20 +789,10 @@ async function createPostgresTreeStore(config, logger = null) {
     connectionTimeoutMillis: config.createTimeoutSecs * 1000,
     idleTimeoutMillis: config.recycleTimeoutSecs * 1000,
   });
-  return createPostgresTreeStoreWithPool(pool, logger);
-}
 
-/**
- * Create a PostgresTreeStore instance from an existing pg.Pool.
- *
- * @param {pg.Pool} pool - An existing connection pool
- * @param {object} [logger] - Optional logger
- * @returns {Promise<PostgresTreeStore>}
- */
-async function createPostgresTreeStoreWithPool(pool, logger = null) {
   const store = new PostgresTreeStore(pool, logger);
   await store.initialize();
   return store;
 }
 
-module.exports = { PostgresTreeStore, createPostgresTreeStore, createPostgresTreeStoreWithPool, TreeStoreError };
+module.exports = { PostgresTreeStore, createPostgresTreeStore, TreeStoreError };

package/nodejs/storage/index.cjs

@@ -53,7 +53,6 @@ const SELECT_PAYMENT_SQL = `
            pm.lnurl_pay_info,
            pm.lnurl_withdraw_info,
            pm.conversion_info,
-           pm.conversion_status,
            t.metadata AS token_metadata,
            t.tx_hash AS token_tx_hash,
            t.tx_type AS token_tx_type,
@@ -261,6 +260,21 @@ class SqliteStorage {
             paymentDetailsClauses.push("t.tx_type = ?");
             params.push(paymentDetailsFilter.txType);
           }
+          // Filter by LNURL preimage status
+          if (
+            paymentDetailsFilter.type === "lightning" &&
+            paymentDetailsFilter.hasLnurlPreimage !== undefined
+          ) {
+            if (paymentDetailsFilter.hasLnurlPreimage) {
+              paymentDetailsClauses.push("lrm.preimage IS NOT NULL");
+            } else {
+              paymentDetailsClauses.push(
+                "lrm.payment_hash IS NOT NULL AND l.preimage IS NOT NULL AND lrm.preimage IS NULL"
+              );
+            }
+          }
+
+
           if (paymentDetailsClauses.length > 0) {
             allPaymentDetailsClauses.push(`(${paymentDetailsClauses.join(" AND ")})`);
           }
@@ -546,15 +560,14 @@ class SqliteStorage {
   insertPaymentMetadata(paymentId, metadata) {
     try {
       const stmt = this.db.prepare(`
-                INSERT INTO payment_metadata (payment_id, parent_payment_id, lnurl_pay_info, lnurl_withdraw_info, lnurl_description, conversion_info, conversion_status)
-                VALUES (?, ?, ?, ?, ?, ?, ?)
+                INSERT INTO payment_metadata (payment_id, parent_payment_id, lnurl_pay_info, lnurl_withdraw_info, lnurl_description, conversion_info)
+                VALUES (?, ?, ?, ?, ?, ?)
                 ON CONFLICT(payment_id) DO UPDATE SET
                     parent_payment_id = COALESCE(excluded.parent_payment_id, parent_payment_id),
                     lnurl_pay_info = COALESCE(excluded.lnurl_pay_info, lnurl_pay_info),
                     lnurl_withdraw_info = COALESCE(excluded.lnurl_withdraw_info, lnurl_withdraw_info),
                     lnurl_description = COALESCE(excluded.lnurl_description, lnurl_description),
-                    conversion_info = COALESCE(excluded.conversion_info, conversion_info),
-                    conversion_status = COALESCE(excluded.conversion_status, conversion_status)
+                    conversion_info = COALESCE(excluded.conversion_info, conversion_info)
             `);
 
       stmt.run(
@@ -567,8 +580,7 @@ class SqliteStorage {
         metadata.lnurlDescription,
         metadata.conversionInfo
           ? JSON.stringify(metadata.conversionInfo)
-          : null,
-        metadata.conversionStatus ?? null
+          : null
       );
       return Promise.resolve();
     } catch (error) {
@@ -583,15 +595,14 @@ class SqliteStorage {
 
   // ===== Deposit Operations =====
 
-  addDeposit(txid, vout, amountSats, isMature) {
+  addDeposit(txid, vout, amountSats) {
     try {
       const stmt = this.db.prepare(`
-                 INSERT INTO unclaimed_deposits (txid, vout, amount_sats, is_mature)
-                 VALUES (?, ?, ?, ?)
-                 ON CONFLICT(txid, vout) DO UPDATE SET is_mature = excluded.is_mature, amount_sats = excluded.amount_sats
+                 INSERT OR IGNORE INTO unclaimed_deposits (txid, vout, amount_sats) 
+                 VALUES (?, ?, ?)
              `);
 
-      stmt.run(txid, vout, amountSats, isMature ? 1 : 0);
+      stmt.run(txid, vout, amountSats);
       return Promise.resolve();
     } catch (error) {
       return Promise.reject(
@@ -624,7 +635,7 @@ class SqliteStorage {
   listDeposits() {
     try {
       const stmt = this.db.prepare(`
-                SELECT txid, vout, amount_sats, is_mature, claim_error, refund_tx, refund_tx_id
+                SELECT txid, vout, amount_sats, claim_error, refund_tx, refund_tx_id 
                 FROM unclaimed_deposits
             `);
 
@@ -634,7 +645,6 @@ class SqliteStorage {
           txid: row.txid,
           vout: row.vout,
           amountSats: row.amount_sats,
-          isMature: Boolean(row.is_mature ?? 1),
           claimError: row.claim_error ? JSON.parse(row.claim_error) : null,
           refundTx: row.refund_tx,
           refundTxId: row.refund_tx_id,
@@ -685,7 +695,7 @@ class SqliteStorage {
   setLnurlMetadata(metadata) {
     try {
       const stmt = this.db.prepare(
-        "INSERT OR REPLACE INTO lnurl_receive_metadata (payment_hash, nostr_zap_request, nostr_zap_receipt, sender_comment) VALUES (?, ?, ?, ?)"
+        "INSERT OR REPLACE INTO lnurl_receive_metadata (payment_hash, nostr_zap_request, nostr_zap_receipt, sender_comment, preimage) VALUES (?, ?, ?, ?, ?)"
       );
 
       const transaction = this.db.transaction(() => {
@@ -694,7 +704,8 @@ class SqliteStorage {
             item.paymentHash,
             item.nostrZapRequest || null,
             item.nostrZapReceipt || null,
-            item.senderComment || null
+            item.senderComment || null,
+            item.preimage || null
           );
         }
       });
@@ -819,9 +830,7 @@ class SqliteStorage {
       timestamp: row.timestamp,
       method,
       details,
-      conversionDetails: row.conversion_status
-        ? { status: row.conversion_status, from: null, to: null }
-        : null,
+      conversionDetails: null,
     };
   }
 

package/nodejs/storage/migrations.cjs

@@ -392,24 +392,6 @@ class MigrationManager {
           updated_at INTEGER NOT NULL
         )`
       },
-      {
-        name: "Drop preimage column from lnurl_receive_metadata",
-        sql: `ALTER TABLE lnurl_receive_metadata DROP COLUMN preimage`
-      },
-      {
-        name: "Clear cached lightning address for CachedLightningAddress format change",
-        sql: `DELETE FROM settings WHERE key = 'lightning_address'`
-      },
-      {
-        name: "Add is_mature to unclaimed_deposits",
-        sql: [
-          `ALTER TABLE unclaimed_deposits ADD COLUMN is_mature INTEGER NOT NULL DEFAULT 1`,
-        ]
-      },
-      {
-        name: "Add conversion_status to payment_metadata",
-        sql: `ALTER TABLE payment_metadata ADD COLUMN conversion_status TEXT`,
-      },
     ];
   }
 }

package/package.json

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