@breeztech/breez-sdk-spark 0.12.2 → 0.12.3

package/nodejs/postgres-storage/index.cjs

@@ -50,6 +50,7 @@ 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,
@@ -281,20 +282,6 @@ class PostgresStorage {
             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 ")})`
@@ -564,14 +551,15 @@ class PostgresStorage {
   async insertPaymentMetadata(paymentId, metadata) {
     try {
       await this.pool.query(
-        `INSERT INTO payment_metadata (payment_id, parent_payment_id, lnurl_pay_info, lnurl_withdraw_info, lnurl_description, conversion_info)
-         VALUES ($1, $2, $3, $4, $5, $6)
+        `INSERT INTO payment_metadata (payment_id, parent_payment_id, lnurl_pay_info, lnurl_withdraw_info, lnurl_description, conversion_info, conversion_status)
+         VALUES ($1, $2, $3, $4, $5, $6, $7)
          ON CONFLICT(payment_id) DO UPDATE SET
            parent_payment_id = COALESCE(EXCLUDED.parent_payment_id, payment_metadata.parent_payment_id),
            lnurl_pay_info = COALESCE(EXCLUDED.lnurl_pay_info, payment_metadata.lnurl_pay_info),
            lnurl_withdraw_info = COALESCE(EXCLUDED.lnurl_withdraw_info, payment_metadata.lnurl_withdraw_info),
            lnurl_description = COALESCE(EXCLUDED.lnurl_description, payment_metadata.lnurl_description),
-           conversion_info = COALESCE(EXCLUDED.conversion_info, payment_metadata.conversion_info)`,
+           conversion_info = COALESCE(EXCLUDED.conversion_info, payment_metadata.conversion_info),
+           conversion_status = COALESCE(EXCLUDED.conversion_status, payment_metadata.conversion_status)`,
         [
           paymentId,
           metadata.parentPaymentId,
@@ -585,6 +573,7 @@ class PostgresStorage {
           metadata.conversionInfo
             ? JSON.stringify(metadata.conversionInfo)
             : null,
+          metadata.conversionStatus ?? null,
         ]
       );
     } catch (error) {
@@ -597,13 +586,13 @@ class PostgresStorage {
 
   // ===== Deposit Operations =====
 
-  async addDeposit(txid, vout, amountSats) {
+  async addDeposit(txid, vout, amountSats, isMature) {
     try {
       await this.pool.query(
-        `INSERT INTO unclaimed_deposits (txid, vout, amount_sats)
-         VALUES ($1, $2, $3)
-         ON CONFLICT(txid, vout) DO NOTHING`,
-        [txid, vout, amountSats]
+        `INSERT INTO unclaimed_deposits (txid, vout, amount_sats, is_mature)
+         VALUES ($1, $2, $3, $4)
+         ON CONFLICT(txid, vout) DO UPDATE SET is_mature = EXCLUDED.is_mature, amount_sats = EXCLUDED.amount_sats`,
+        [txid, vout, amountSats, isMature]
       );
     } catch (error) {
       throw new StorageError(
@@ -630,13 +619,14 @@ class PostgresStorage {
   async listDeposits() {
     try {
       const result = await this.pool.query(
-        "SELECT txid, vout, amount_sats, claim_error, refund_tx, refund_tx_id FROM unclaimed_deposits"
+        "SELECT txid, vout, amount_sats, is_mature, claim_error, refund_tx, refund_tx_id FROM unclaimed_deposits"
       );
 
       return result.rows.map((row) => ({
         txid: row.txid,
         vout: row.vout,
         amountSats: row.amount_sats != null ? BigInt(row.amount_sats) : BigInt(0),
+        isMature: row.is_mature ?? true,
         claimError: row.claim_error || null,
         refundTx: row.refund_tx,
         refundTxId: row.refund_tx_id,
@@ -682,19 +672,17 @@ class PostgresStorage {
       await this._withTransaction(async (client) => {
         for (const item of metadata) {
           await client.query(
-            `INSERT INTO lnurl_receive_metadata (payment_hash, nostr_zap_request, nostr_zap_receipt, sender_comment, preimage)
-             VALUES ($1, $2, $3, $4, $5)
+            `INSERT INTO lnurl_receive_metadata (payment_hash, nostr_zap_request, nostr_zap_receipt, sender_comment)
+             VALUES ($1, $2, $3, $4)
              ON CONFLICT(payment_hash) DO UPDATE SET
                nostr_zap_request = EXCLUDED.nostr_zap_request,
                nostr_zap_receipt = EXCLUDED.nostr_zap_receipt,
-               sender_comment = EXCLUDED.sender_comment,
-               preimage = EXCLUDED.preimage`,
+               sender_comment = EXCLUDED.sender_comment`,
             [
               item.paymentHash,
               item.nostrZapRequest || null,
               item.nostrZapReceipt || null,
               item.senderComment || null,
-              item.preimage || null,
             ]
           );
         }
@@ -829,7 +817,9 @@ class PostgresStorage {
       timestamp: Number(row.timestamp),
       method,
       details,
-      conversionDetails: null,
+      conversionDetails: row.conversion_status
+        ? { status: row.conversion_status, from: null, to: null }
+        : null,
     };
   }
 
@@ -1364,16 +1354,37 @@ function defaultPostgresStorageConfig(connectionString) {
  * @returns {Promise<PostgresStorage>}
  */
 async function createPostgresStorage(config, logger = null) {
-  const pool = new pg.Pool({
+  const pool = createPostgresPool(config);
+  return createPostgresStorageWithPool(pool, logger);
+}
+
+/**
+ * Create a pg.Pool from a config object.
+ * The returned pool can be shared across multiple store implementations.
+ *
+ * @param {object} config - PostgreSQL configuration (from defaultPostgresStorageConfig)
+ * @returns {pg.Pool}
+ */
+function createPostgresPool(config) {
+  return new pg.Pool({
     connectionString: config.connectionString,
     max: config.maxPoolSize,
     connectionTimeoutMillis: config.createTimeoutSecs * 1000,
     idleTimeoutMillis: config.recycleTimeoutSecs * 1000,
   });
+}
 
+/**
+ * Create a PostgresStorage instance from an existing pg.Pool.
+ *
+ * @param {pg.Pool} pool - An existing connection pool
+ * @param {object} [logger] - Optional logger
+ * @returns {Promise<PostgresStorage>}
+ */
+async function createPostgresStorageWithPool(pool, logger = null) {
   const storage = new PostgresStorage(pool, logger);
   await storage.initialize();
   return storage;
 }
 
-module.exports = { PostgresStorage, createPostgresStorage, defaultPostgresStorageConfig, StorageError };
+module.exports = { PostgresStorage, createPostgresStorage, createPostgresPool, createPostgresStorageWithPool, defaultPostgresStorageConfig, StorageError };

package/nodejs/postgres-storage/migrations.cjs

@@ -234,6 +234,30 @@ class PostgresMigrationManager {
           )`,
         ],
       },
+      {
+        name: "Drop preimage column from lnurl_receive_metadata",
+        sql: [
+          `ALTER TABLE lnurl_receive_metadata DROP COLUMN IF EXISTS 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 BOOLEAN NOT NULL DEFAULT TRUE`,
+        ],
+      },
+      { 
+        name: "Add conversion_status to payment_metadata",
+        sql: [
+          `ALTER TABLE payment_metadata ADD COLUMN IF NOT EXISTS conversion_status TEXT`,
+        ],
+      },
     ];
   }
 }

package/nodejs/postgres-token-store/errors.cjs

@@ -0,0 +1,13 @@
+// errors.cjs - Token store error wrapper with cause chain support
+class TokenStoreError extends Error {
+    constructor(message, cause = null) {
+        super(message);
+        this.name = 'TokenStoreError';
+        this.cause = cause;
+        if (Error.captureStackTrace) {
+            Error.captureStackTrace(this, TokenStoreError);
+        }
+    }
+}
+
+module.exports = { TokenStoreError };