@breeztech/breez-sdk-spark 0.27.2 → 0.28.0

package/nodejs/index.mjs

@@ -9,6 +9,7 @@ export const {
   connectWithSigningOnlySigner,
   createTurnkeySigner,
   createTurnkeySigningOnlySigner,
+  defaultBridgingConfig,
   defaultConfig,
   defaultExternalSigners,
   defaultMysqlStorageConfig,
@@ -19,6 +20,7 @@ export const {
   getSparkStatus,
   initLogging,
   mysqlStorage,
+  newBridgingClient,
   newRestChainService,
   newSharedSdkContext,
   parseSparkConfig,
@@ -28,6 +30,8 @@ export const {
   task_worker_entry_point,
   BitcoinChainServiceHandle,
   BreezSdk,
+  BridgingClient,
+  ConsoleLogger,
   DefaultCpfpSigner,
   DefaultSessionStore,
   ExternalBreezSignerHandle,

package/nodejs/mysql-session-store/index.cjs

@@ -71,13 +71,14 @@ class MysqlSessionStore {
 
   /**
    * @param {string} serviceIdentityKey - hex-encoded 33-byte secp256k1 pubkey
-   * @returns {Promise<{token: string, expiration: number} | null>}
+   * @returns {Promise<{token: string, expiration: number, refreshToken?: string, refreshTokenExpiration?: number} | null>}
    */
   async getSession(serviceIdentityKey) {
     const serviceKey = _decodePubkey(serviceIdentityKey);
     try {
       const [rows] = await this.pool.execute(
-        `SELECT token, expiration FROM brz_sessions
+        `SELECT token, expiration, refresh_token, refresh_token_expiration
+         FROM brz_sessions
          WHERE user_id = ? AND service_identity_key = ?`,
         [this.identity, serviceKey]
       );
@@ -88,6 +89,11 @@ class MysqlSessionStore {
       return {
         token: row.token,
         expiration: Number(row.expiration),
+        refreshToken: row.refresh_token ?? undefined,
+        refreshTokenExpiration:
+          row.refresh_token_expiration == null
+            ? undefined
+            : Number(row.refresh_token_expiration),
       };
     } catch (error) {
       throw new SessionStoreError(
@@ -99,16 +105,27 @@ class MysqlSessionStore {
 
   /**
    * @param {string} serviceIdentityKey - hex-encoded 33-byte secp256k1 pubkey
-   * @param {{token: string, expiration: number}} session
+   * @param {{token: string, expiration: number, refreshToken?: string, refreshTokenExpiration?: number}} session
    */
   async setSession(serviceIdentityKey, session) {
     const serviceKey = _decodePubkey(serviceIdentityKey);
     try {
       await this.pool.execute(
-        `INSERT INTO brz_sessions (user_id, service_identity_key, token, expiration)
-         VALUES (?, ?, ?, ?)
-         ON DUPLICATE KEY UPDATE token = VALUES(token), expiration = VALUES(expiration)`,
-        [this.identity, serviceKey, session.token, session.expiration]
+        `INSERT INTO brz_sessions
+           (user_id, service_identity_key, token, expiration,
+            refresh_token, refresh_token_expiration)
+         VALUES (?, ?, ?, ?, ?, ?)
+         ON DUPLICATE KEY UPDATE token = VALUES(token), expiration = VALUES(expiration),
+           refresh_token = VALUES(refresh_token),
+           refresh_token_expiration = VALUES(refresh_token_expiration)`,
+        [
+          this.identity,
+          serviceKey,
+          session.token,
+          session.expiration,
+          session.refreshToken ?? null,
+          session.refreshTokenExpiration ?? null,
+        ]
       );
     } catch (error) {
       throw new SessionStoreError(

package/nodejs/mysql-session-store/migrations.cjs

@@ -129,6 +129,12 @@ class MysqlSessionStoreMigrationManager {
           `ALTER TABLE \`${SESSION_MIGRATIONS_TABLE}\` MODIFY COLUMN applied_at DATETIME(6) NOT NULL DEFAULT (UTC_TIMESTAMP(6))`,
         ],
       },
+      {
+        name: "Add refresh token columns to brz_sessions",
+        sql: [
+          `ALTER TABLE brz_sessions ADD COLUMN refresh_token TEXT NULL, ADD COLUMN refresh_token_expiration BIGINT NULL`,
+        ],
+      },
     ];
   }
 }

package/nodejs/mysql-storage/index.cjs

@@ -65,6 +65,8 @@ const SELECT_PAYMENT_SQL = `
            p.timestamp,
            p.method,
            p.withdraw_tx_id,
+           p.withdraw_vout,
+           p.withdraw_destination_address,
            pd.tx_id AS deposit_tx_id,
            pd.vout AS deposit_vout,
            p.spark,
@@ -88,6 +90,7 @@ const SELECT_PAYMENT_SQL = `
            lrm.nostr_zap_request AS lnurl_nostr_zap_request,
            lrm.nostr_zap_receipt AS lnurl_nostr_zap_receipt,
            lrm.sender_comment AS lnurl_sender_comment,
+           lrm.lightning_address AS lnurl_lightning_address,
            lrm.payment_hash AS lnurl_payment_hash,
            pm.parent_payment_id
       FROM brz_payments p
@@ -510,13 +513,15 @@ class MysqlStorage {
           await this._runPaymentUpsert(conn, payment);
           shouldEmit = true;
         } else if (stored === next) {
-          console.debug(
+          this._log(
+            "DEBUG",
             `Skipping redundant payment event: id=${payment.id} status=${next}`
           );
           await this._runPaymentUpsert(conn, payment);
           shouldEmit = false;
         } else if (this._isFinalPaymentStatus(stored)) {
-          console.warn(
+          this._log(
+            "WARN",
             `Skipping payment update (would replace terminal status): id=${payment.id} stored=${stored} new=${next}`
           );
           shouldEmit = false;
@@ -566,13 +571,12 @@ class MysqlStorage {
   }
 
   async _runPaymentUpsert(conn, payment) {
-    const withdrawTxId =
-      payment.details?.type === "withdraw" ? payment.details.txId : null;
+    const withdraw = payment.details?.type === "withdraw" ? payment.details : null;
     const spark = payment.details?.type === "spark" ? 1 : null;
 
     await conn.query(
-      `INSERT INTO brz_payments (user_id, id, payment_type, status, amount, fees, timestamp, method, withdraw_tx_id, spark)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      `INSERT INTO brz_payments (user_id, id, payment_type, status, amount, fees, timestamp, method, withdraw_tx_id, withdraw_vout, withdraw_destination_address, spark)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
        ON DUPLICATE KEY UPDATE
          payment_type=VALUES(payment_type),
          status=VALUES(status),
@@ -581,6 +585,8 @@ class MysqlStorage {
          timestamp=VALUES(timestamp),
          method=VALUES(method),
          withdraw_tx_id=VALUES(withdraw_tx_id),
+         withdraw_vout=VALUES(withdraw_vout),
+         withdraw_destination_address=VALUES(withdraw_destination_address),
          spark=VALUES(spark)`,
       [
         this.identity,
@@ -591,7 +597,9 @@ class MysqlStorage {
         payment.fees.toString(),
         payment.timestamp,
         payment.method ? toJson(payment.method) : null,
-        withdrawTxId,
+        withdraw?.txId ?? null,
+        withdraw?.vout ?? null,
+        withdraw?.destinationAddress ?? null,
         spark,
       ]
     );
@@ -692,6 +700,10 @@ class MysqlStorage {
       .slice(0, 32);
   }
 
+  _log(level, line) {
+    this.logger?.log({ line, level });
+  }
+
   _normalizePaymentStatus(status) {
     return typeof status === "string" ? status.toLowerCase() : status;
   }
@@ -1170,18 +1182,20 @@ class MysqlStorage {
       await this._withTransaction(async (conn) => {
         for (const item of metadata) {
           await conn.query(
-            `INSERT INTO brz_lnurl_receive_metadata (user_id, payment_hash, nostr_zap_request, nostr_zap_receipt, sender_comment)
-             VALUES (?, ?, ?, ?, ?)
+            `INSERT INTO brz_lnurl_receive_metadata (user_id, payment_hash, nostr_zap_request, nostr_zap_receipt, sender_comment, lightning_address)
+             VALUES (?, ?, ?, ?, ?, ?)
              ON DUPLICATE KEY UPDATE
                nostr_zap_request = VALUES(nostr_zap_request),
                nostr_zap_receipt = VALUES(nostr_zap_receipt),
-               sender_comment = VALUES(sender_comment)`,
+               sender_comment = VALUES(sender_comment),
+               lightning_address = VALUES(lightning_address)`,
             [
               this.identity,
               item.paymentHash,
               item.nostrZapRequest || null,
               item.nostrZapReceipt || null,
               item.senderComment || null,
+              item.lightningAddress || null,
             ]
           );
         }
@@ -1232,6 +1246,7 @@ class MysqlStorage {
           nostrZapRequest: row.lnurl_nostr_zap_request || null,
           nostrZapReceipt: row.lnurl_nostr_zap_receipt || null,
           senderComment: row.lnurl_sender_comment || null,
+          lightningAddress: row.lnurl_lightning_address || null,
         };
       }
 
@@ -1239,10 +1254,16 @@ class MysqlStorage {
         details.conversionInfo = parseJson(row.conversion_info);
       }
     } else if (row.withdraw_tx_id) {
-      details = {
-        type: "withdraw",
-        txId: row.withdraw_tx_id,
-      };
+      // A withdrawal stored before the SDK kept these values has no details
+      // until the next sync rewrites it.
+      if (row.withdraw_vout != null && row.withdraw_destination_address != null) {
+        details = {
+          type: "withdraw",
+          txId: row.withdraw_tx_id,
+          vout: Number(row.withdraw_vout),
+          destinationAddress: row.withdraw_destination_address,
+        };
+      }
     } else if (row.deposit_tx_id) {
       details = {
         type: "deposit",
@@ -1513,11 +1534,7 @@ class MysqlStorage {
 
         if (deleteResult.affectedRows === 0) {
           const msg = `complete_outgoing_sync: DELETE from brz_sync_outgoing matched 0 rows (type=${record.id.type}, data_id=${record.id.dataId}, revision=${localRevision})`;
-          if (this.logger && typeof this.logger.log === "function") {
-            this.logger.log({ line: msg, level: "warn" });
-          } else {
-            console.warn(`[MysqlStorage] ${msg}`);
-          }
+          this._log("WARN", msg);
         }
 
         await conn.query(

package/nodejs/mysql-storage/migrations.cjs

@@ -101,20 +101,20 @@ class MysqlMigrationManager {
         const migrations = this._getMigrations(identity);
 
         if (currentVersion >= migrations.length) {
-          this._log("info", `Database is up to date (version ${currentVersion})`);
+          this._log("INFO", `Database is up to date (version ${currentVersion})`);
           await conn.query("COMMIT");
           return;
         }
 
         this._log(
-          "info",
+          "INFO",
           `Migrating database from version ${currentVersion} to ${migrations.length}`
         );
 
         for (let i = currentVersion; i < migrations.length; i++) {
           const migration = migrations[i];
           const version = i + 1;
-          this._log("debug", `Running migration ${version}: ${migration.name}`);
+          this._log("DEBUG", `Running migration ${version}: ${migration.name}`);
 
           for (const step of migration.sql) {
             await runMigrationStep(conn, step);
@@ -127,7 +127,7 @@ class MysqlMigrationManager {
         }
 
         await conn.query("COMMIT");
-        this._log("info", "Database migration completed successfully");
+        this._log("INFO", "Database migration completed successfully");
       } catch (error) {
         await conn.query("ROLLBACK").catch(() => {});
         throw new StorageError(
@@ -146,11 +146,7 @@ class MysqlMigrationManager {
   }
 
   _log(level, message) {
-    if (this.logger && typeof this.logger.log === "function") {
-      this.logger.log({ line: message, level });
-    } else if (level === "error") {
-      console.error(`[MysqlMigrationManager] ${message}`);
-    }
+    this.logger?.log({ line: message, level });
   }
 
   /**
@@ -655,6 +651,25 @@ class MysqlMigrationManager {
           )`,
         ],
       },
+      {
+        // With the sync offset at 0, the SDK re-fetches every transfer on its
+        // next sync and fills in both columns for past withdrawals.
+        name: "Add withdrawal destination address and output index",
+        sql: [
+          `ALTER TABLE brz_payments ADD COLUMN withdraw_vout INT UNSIGNED NULL`,
+          `ALTER TABLE brz_payments ADD COLUMN withdraw_destination_address TEXT NULL`,
+          `UPDATE brz_settings
+           SET value = JSON_SET(value, '$.offset', 0)
+           WHERE \`key\` = 'sync_offset' AND value IS NOT NULL`,
+        ],
+      },
+      {
+        name: "Add lightning address to brz_lnurl_receive_metadata and force its re-sync",
+        sql: [
+          `ALTER TABLE brz_lnurl_receive_metadata ADD COLUMN lightning_address LONGTEXT NULL`,
+          `DELETE FROM brz_settings WHERE \`key\` = 'lnurl_metadata_updated_after'`,
+        ],
+      },
     ];
   }
 }

package/nodejs/mysql-token-store/index.cjs

@@ -399,7 +399,7 @@ class MysqlTokenStore {
           const metadata = _metadataFor(tokenOutputs.metadata, tokenIdentifier);
           if (!metadata) {
             this._log(
-              "warn",
+              "WARN",
               `Skipping outputs of token ${tokenIdentifier}: no metadata provided`
             );
             continue;
@@ -634,31 +634,26 @@ class MysqlTokenStore {
         }
 
         // 2. Insert new outputs, grouped by the token each one names.
-        for (const [tokenIdentifier, outputs] of _groupOutputsByToken(
+        const spentOutpoints = await this._spentOutpointsAmong(
+          conn,
           outputsToAdd?.outputs
+        );
+        const unspentOutputs = (outputsToAdd?.outputs ?? []).filter(
+          (o) => !spentOutpoints.has(`${o.prevTxHash}:${o.prevTxVout}`)
+        );
+        for (const [tokenIdentifier, outputs] of _groupOutputsByToken(
+          unspentOutputs
         )) {
           const metadata = _metadataFor(outputsToAdd.metadata, tokenIdentifier);
           if (!metadata) {
             this._log(
-              "warn",
+              "WARN",
               `Skipping outputs of token ${tokenIdentifier}: no metadata provided`
             );
             continue;
           }
           await this._upsertMetadata(conn, metadata);
 
-          // Clear spent status for outputs being (re-)added.
-          const params = [this.identity];
-          for (const o of outputs) {
-            params.push(o.prevTxHash, o.prevTxVout);
-          }
-          await conn.query(
-            `DELETE FROM brz_token_spent_outputs WHERE user_id = ? AND (prev_tx_hash, prev_tx_vout) IN (${buildPairPlaceholders(
-              outputs.length
-            )})`,
-            params
-          );
-
           for (const output of outputs) {
             await this._insertSingleOutput(conn, tokenIdentifier, output);
           }
@@ -991,9 +986,7 @@ class MysqlTokenStore {
   // ===== Private Helpers =====
 
   _log(level, message) {
-    if (this.logger && typeof this.logger.log === "function") {
-      this.logger.log({ line: message, level });
-    }
+    this.logger?.log({ line: message, level });
   }
 
   /**
@@ -1185,6 +1178,23 @@ class MysqlTokenStore {
     );
   }
 
+  async _spentOutpointsAmong(conn, outputs) {
+    if (!outputs || outputs.length === 0) {
+      return new Set();
+    }
+    const params = [this.identity];
+    for (const o of outputs) {
+      params.push(o.prevTxHash, o.prevTxVout);
+    }
+    const [rows] = await conn.query(
+      `SELECT prev_tx_hash, prev_tx_vout FROM brz_token_spent_outputs WHERE user_id = ? AND (prev_tx_hash, prev_tx_vout) IN (${buildPairPlaceholders(
+        outputs.length
+      )})`,
+      params
+    );
+    return new Set(rows.map((r) => `${r.prev_tx_hash}:${r.prev_tx_vout}`));
+  }
+
   async _insertSingleOutput(conn, tokenIdentifier, output) {
     // ON DUPLICATE KEY UPDATE prev_tx_hash = prev_tx_hash no-ops on the
     // (user_id, prev_tx_hash, prev_tx_vout) primary key conflict only — unlike

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

@@ -80,13 +80,14 @@ class PostgresSessionStore {
    * if no session is cached. The Rust adapter maps `null` to
    * `SessionStoreError::NotFound`.
    * @param {string} serviceIdentityKey - hex-encoded 33-byte secp256k1 pubkey
-   * @returns {Promise<{token: string, expiration: number} | null>}
+   * @returns {Promise<{token: string, expiration: number, refreshToken?: string, refreshTokenExpiration?: number} | null>}
    */
   async getSession(serviceIdentityKey) {
     const serviceKey = _decodePubkey(serviceIdentityKey);
     try {
       const { rows } = await this.pool.query(
-        `SELECT token, expiration FROM brz_sessions
+        `SELECT token, expiration, refresh_token, refresh_token_expiration
+         FROM brz_sessions
          WHERE user_id = $1 AND service_identity_key = $2`,
         [this.identity, serviceKey]
       );
@@ -97,6 +98,11 @@ class PostgresSessionStore {
       return {
         token: row.token,
         expiration: Number(row.expiration),
+        refreshToken: row.refresh_token ?? undefined,
+        refreshTokenExpiration:
+          row.refresh_token_expiration == null
+            ? undefined
+            : Number(row.refresh_token_expiration),
       };
     } catch (error) {
       throw new SessionStoreError(
@@ -109,17 +115,29 @@ class PostgresSessionStore {
   /**
    * Upserts a session for the given service identity key.
    * @param {string} serviceIdentityKey - hex-encoded 33-byte secp256k1 pubkey
-   * @param {{token: string, expiration: number}} session
+   * @param {{token: string, expiration: number, refreshToken?: string, refreshTokenExpiration?: number}} session
    */
   async setSession(serviceIdentityKey, session) {
     const serviceKey = _decodePubkey(serviceIdentityKey);
     try {
       await this.pool.query(
-        `INSERT INTO brz_sessions (user_id, service_identity_key, token, expiration)
-         VALUES ($1, $2, $3, $4)
+        `INSERT INTO brz_sessions
+           (user_id, service_identity_key, token, expiration,
+            refresh_token, refresh_token_expiration)
+         VALUES ($1, $2, $3, $4, $5, $6)
          ON CONFLICT (user_id, service_identity_key)
-         DO UPDATE SET token = EXCLUDED.token, expiration = EXCLUDED.expiration`,
-        [this.identity, serviceKey, session.token, session.expiration]
+         DO UPDATE SET token = EXCLUDED.token,
+                       expiration = EXCLUDED.expiration,
+                       refresh_token = EXCLUDED.refresh_token,
+                       refresh_token_expiration = EXCLUDED.refresh_token_expiration`,
+        [
+          this.identity,
+          serviceKey,
+          session.token,
+          session.expiration,
+          session.refreshToken ?? null,
+          session.refreshTokenExpiration ?? null,
+        ]
       );
     } catch (error) {
       throw new SessionStoreError(

package/nodejs/postgres-session-store/migrations.cjs

@@ -50,7 +50,7 @@ class SessionStoreMigrationManager {
 
       if (currentVersion >= migrations.length) {
         this._log(
-          "info",
+          "INFO",
           `Session store database is up to date (version ${currentVersion})`
         );
         await client.query("COMMIT");
@@ -58,7 +58,7 @@ class SessionStoreMigrationManager {
       }
 
       this._log(
-        "info",
+        "INFO",
         `Migrating session store database from version ${currentVersion} to ${migrations.length}`
       );
 
@@ -66,7 +66,7 @@ class SessionStoreMigrationManager {
         const migration = migrations[i];
         const version = i + 1;
         this._log(
-          "debug",
+          "DEBUG",
           `Running session store migration ${version}: ${migration.name}`
         );
 
@@ -82,7 +82,7 @@ class SessionStoreMigrationManager {
 
       await client.query("COMMIT");
       this._log(
-        "info",
+        "INFO",
         "Session store database migration completed successfully"
       );
     } catch (error) {
@@ -134,11 +134,7 @@ class SessionStoreMigrationManager {
   }
 
   _log(level, message) {
-    if (this.logger && typeof this.logger.log === "function") {
-      this.logger.log({ line: message, level });
-    } else if (level === "error") {
-      console.error(`[SessionStoreMigrationManager] ${message}`);
-    }
+    this.logger?.log({ line: message, level });
   }
 
   /**
@@ -158,6 +154,13 @@ class SessionStoreMigrationManager {
           )`,
         ],
       },
+      {
+        name: "Add refresh token columns to brz_sessions",
+        sql: [
+          `ALTER TABLE brz_sessions ADD COLUMN IF NOT EXISTS refresh_token TEXT`,
+          `ALTER TABLE brz_sessions ADD COLUMN IF NOT EXISTS refresh_token_expiration BIGINT`,
+        ],
+      },
     ];
   }
 }

package/nodejs/postgres-storage/index.cjs

@@ -50,6 +50,8 @@ const SELECT_PAYMENT_SQL = `
            p.timestamp,
            p.method,
            p.withdraw_tx_id,
+           p.withdraw_vout,
+           p.withdraw_destination_address,
            pd.tx_id AS deposit_tx_id,
            pd.vout AS deposit_vout,
            p.spark,
@@ -73,6 +75,7 @@ const SELECT_PAYMENT_SQL = `
            lrm.nostr_zap_request AS lnurl_nostr_zap_request,
            lrm.nostr_zap_receipt AS lnurl_nostr_zap_receipt,
            lrm.sender_comment AS lnurl_sender_comment,
+           lrm.lightning_address AS lnurl_lightning_address,
            lrm.payment_hash AS lnurl_payment_hash,
            pm.parent_payment_id
       FROM brz_payments p
@@ -412,7 +415,8 @@ class PostgresStorage {
         if (stored != null
             && this._isFinalPaymentStatus(stored)
             && stored !== next) {
-          console.warn(
+          this._log(
+            "WARN",
             `Skipping payment update (would replace terminal status): id=${payment.id} stored=${stored} new=${next}`
           );
           return false;
@@ -420,7 +424,8 @@ class PostgresStorage {
 
         const sameStatus = stored === next;
         if (sameStatus) {
-          console.debug(
+          this._log(
+            "DEBUG",
             `Skipping redundant payment event: id=${payment.id} status=${next}`
           );
         }
@@ -448,13 +453,12 @@ class PostgresStorage {
   }
 
   async _runPaymentUpsert(client, payment) {
-    const withdrawTxId =
-      payment.details?.type === "withdraw" ? payment.details.txId : null;
+    const withdraw = payment.details?.type === "withdraw" ? payment.details : null;
     const spark = payment.details?.type === "spark" ? true : null;
 
     await client.query(
-      `INSERT INTO brz_payments (user_id, id, payment_type, status, amount, fees, timestamp, method, withdraw_tx_id, spark)
-       VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)
+      `INSERT INTO brz_payments (user_id, id, payment_type, status, amount, fees, timestamp, method, withdraw_tx_id, withdraw_vout, withdraw_destination_address, spark)
+       VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
        ON CONFLICT(user_id, id) DO UPDATE SET
          payment_type=EXCLUDED.payment_type,
          status=EXCLUDED.status,
@@ -463,6 +467,8 @@ class PostgresStorage {
          timestamp=EXCLUDED.timestamp,
          method=EXCLUDED.method,
          withdraw_tx_id=EXCLUDED.withdraw_tx_id,
+         withdraw_vout=EXCLUDED.withdraw_vout,
+         withdraw_destination_address=EXCLUDED.withdraw_destination_address,
          spark=EXCLUDED.spark`,
       [
         this.identity,
@@ -473,7 +479,9 @@ class PostgresStorage {
         payment.fees.toString(),
         payment.timestamp,
         payment.method ? toJson(payment.method) : null,
-        withdrawTxId,
+        withdraw?.txId ?? null,
+        withdraw?.vout ?? null,
+        withdraw?.destinationAddress ?? null,
         spark,
       ]
     );
@@ -564,6 +572,10 @@ class PostgresStorage {
     }
   }
 
+  _log(level, line) {
+    this.logger?.log({ line, level });
+  }
+
   _normalizePaymentStatus(status) {
     return typeof status === "string" ? status.toLowerCase() : status;
   }
@@ -1036,18 +1048,20 @@ class PostgresStorage {
       await this._withTransaction(async (client) => {
         for (const item of metadata) {
           await client.query(
-            `INSERT INTO brz_lnurl_receive_metadata (user_id, payment_hash, nostr_zap_request, nostr_zap_receipt, sender_comment)
-             VALUES ($1, $2, $3, $4, $5)
+            `INSERT INTO brz_lnurl_receive_metadata (user_id, payment_hash, nostr_zap_request, nostr_zap_receipt, sender_comment, lightning_address)
+             VALUES ($1, $2, $3, $4, $5, $6)
              ON CONFLICT(user_id, payment_hash) DO UPDATE SET
                nostr_zap_request = EXCLUDED.nostr_zap_request,
                nostr_zap_receipt = EXCLUDED.nostr_zap_receipt,
-               sender_comment = EXCLUDED.sender_comment`,
+               sender_comment = EXCLUDED.sender_comment,
+               lightning_address = EXCLUDED.lightning_address`,
             [
               this.identity,
               item.paymentHash,
               item.nostrZapRequest || null,
               item.nostrZapReceipt || null,
               item.senderComment || null,
+              item.lightningAddress || null,
             ]
           );
         }
@@ -1105,6 +1119,7 @@ class PostgresStorage {
           nostrZapRequest: row.lnurl_nostr_zap_request || null,
           nostrZapReceipt: row.lnurl_nostr_zap_receipt || null,
           senderComment: row.lnurl_sender_comment || null,
+          lightningAddress: row.lnurl_lightning_address || null,
         };
       }
 
@@ -1115,10 +1130,16 @@ class PostgresStorage {
             : row.conversion_info;
       }
     } else if (row.withdraw_tx_id) {
-      details = {
-        type: "withdraw",
-        txId: row.withdraw_tx_id,
-      };
+      // A withdrawal stored before the SDK kept these values has no details
+      // until the next sync rewrites it.
+      if (row.withdraw_vout != null && row.withdraw_destination_address != null) {
+        details = {
+          type: "withdraw",
+          txId: row.withdraw_tx_id,
+          vout: Number(row.withdraw_vout),
+          destinationAddress: row.withdraw_destination_address,
+        };
+      }
     } else if (row.deposit_tx_id) {
       details = {
         type: "deposit",
@@ -1423,11 +1444,7 @@ class PostgresStorage {
 
         if (deleteResult.rowCount === 0) {
           const msg = `complete_outgoing_sync: DELETE from brz_sync_outgoing matched 0 rows (type=${record.id.type}, data_id=${record.id.dataId}, revision=${localRevision})`;
-          if (this.logger && typeof this.logger.log === "function") {
-            this.logger.log({ line: msg, level: "warn" });
-          } else {
-            console.warn(`[PostgresStorage] ${msg}`);
-          }
+          this._log("WARN", msg);
         }
 
         await client.query(