@breeztech/breez-sdk-spark 0.13.5 → 0.13.6

package/bundler/breez_sdk_spark_wasm.d.ts

@@ -449,7 +449,7 @@ export interface AesSuccessActionData {
 
 export type InputType = ({ type: "bitcoinAddress" } & BitcoinAddressDetails) | ({ type: "bolt11Invoice" } & Bolt11InvoiceDetails) | ({ type: "bolt12Invoice" } & Bolt12InvoiceDetails) | ({ type: "bolt12Offer" } & Bolt12OfferDetails) | ({ type: "lightningAddress" } & LightningAddressDetails) | ({ type: "lnurlPay" } & LnurlPayRequestDetails) | ({ type: "silentPaymentAddress" } & SilentPaymentAddressDetails) | ({ type: "lnurlAuth" } & LnurlAuthRequestDetails) | ({ type: "url" } & string) | ({ type: "bip21" } & Bip21Details) | ({ type: "bolt12InvoiceRequest" } & Bolt12InvoiceRequestDetails) | ({ type: "lnurlWithdraw" } & LnurlWithdrawRequestDetails) | ({ type: "sparkAddress" } & SparkAddressDetails) | ({ type: "sparkInvoice" } & SparkInvoiceDetails);
 
-export type BuyBitcoinRequest = { type: "moonpay"; lockedAmountSat?: number; redirectUrl?: string } | { type: "cashApp"; amountSats?: number };
+export type BuyBitcoinRequest = { type: "moonpay"; lockedAmountSat?: number; redirectUrl?: string } | { type: "cashApp"; amountSats: number };
 
 export interface SetLnurlMetadataItem {
     paymentHash: string;

package/deno/breez_sdk_spark_wasm.d.ts

@@ -449,7 +449,7 @@ export interface AesSuccessActionData {
 
 export type InputType = ({ type: "bitcoinAddress" } & BitcoinAddressDetails) | ({ type: "bolt11Invoice" } & Bolt11InvoiceDetails) | ({ type: "bolt12Invoice" } & Bolt12InvoiceDetails) | ({ type: "bolt12Offer" } & Bolt12OfferDetails) | ({ type: "lightningAddress" } & LightningAddressDetails) | ({ type: "lnurlPay" } & LnurlPayRequestDetails) | ({ type: "silentPaymentAddress" } & SilentPaymentAddressDetails) | ({ type: "lnurlAuth" } & LnurlAuthRequestDetails) | ({ type: "url" } & string) | ({ type: "bip21" } & Bip21Details) | ({ type: "bolt12InvoiceRequest" } & Bolt12InvoiceRequestDetails) | ({ type: "lnurlWithdraw" } & LnurlWithdrawRequestDetails) | ({ type: "sparkAddress" } & SparkAddressDetails) | ({ type: "sparkInvoice" } & SparkInvoiceDetails);
 
-export type BuyBitcoinRequest = { type: "moonpay"; lockedAmountSat?: number; redirectUrl?: string } | { type: "cashApp"; amountSats?: number };
+export type BuyBitcoinRequest = { type: "moonpay"; lockedAmountSat?: number; redirectUrl?: string } | { type: "cashApp"; amountSats: number };
 
 export interface SetLnurlMetadataItem {
     paymentHash: string;

package/nodejs/breez_sdk_spark_wasm.d.ts

@@ -449,7 +449,7 @@ export interface AesSuccessActionData {
 
 export type InputType = ({ type: "bitcoinAddress" } & BitcoinAddressDetails) | ({ type: "bolt11Invoice" } & Bolt11InvoiceDetails) | ({ type: "bolt12Invoice" } & Bolt12InvoiceDetails) | ({ type: "bolt12Offer" } & Bolt12OfferDetails) | ({ type: "lightningAddress" } & LightningAddressDetails) | ({ type: "lnurlPay" } & LnurlPayRequestDetails) | ({ type: "silentPaymentAddress" } & SilentPaymentAddressDetails) | ({ type: "lnurlAuth" } & LnurlAuthRequestDetails) | ({ type: "url" } & string) | ({ type: "bip21" } & Bip21Details) | ({ type: "bolt12InvoiceRequest" } & Bolt12InvoiceRequestDetails) | ({ type: "lnurlWithdraw" } & LnurlWithdrawRequestDetails) | ({ type: "sparkAddress" } & SparkAddressDetails) | ({ type: "sparkInvoice" } & SparkInvoiceDetails);
 
-export type BuyBitcoinRequest = { type: "moonpay"; lockedAmountSat?: number; redirectUrl?: string } | { type: "cashApp"; amountSats?: number };
+export type BuyBitcoinRequest = { type: "moonpay"; lockedAmountSat?: number; redirectUrl?: string } | { type: "cashApp"; amountSats: number };
 
 export interface SetLnurlMetadataItem {
     paymentHash: string;

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

@@ -36,6 +36,12 @@ const TOKEN_STORE_WRITE_LOCK_KEY = "8390042714201347154"; // 0x746F6B656E535452
  */
 const SPENT_MARKER_CLEANUP_THRESHOLD_MS = 5 * 60 * 1000; // 5 minutes
 
+/**
+ * Reservations whose created_at is older than this are considered stale and are
+ * dropped at the start of setTokensOutputs. Matches the tree store's timeout.
+ */
+const RESERVATION_TIMEOUT_SECS = 300; // 5 minutes
+
 class PostgresTokenStore {
   constructor(pool, logger = null) {
     this.pool = pool;
@@ -102,6 +108,13 @@ class PostgresTokenStore {
       const refreshTimestamp = new Date(refreshStartedAtMs);
 
       await this._withWriteTransaction(async (client) => {
+        // Drop expired reservations BEFORE evaluating has_active_swap, otherwise a stale
+        // Swap reservation (from a crashed client or a swap whose finalize/cancel never
+        // ran) keeps has_active_swap true forever, which makes setTokensOutputs
+        // early-return and never reach any subsequent reconciliation. The reservation
+        // pins itself in place and the local token-output set freezes.
+        await this._cleanupStaleReservations(client);
+
         // Skip if swap is active or completed during this refresh
         const swapCheckResult = await client.query(
           `SELECT
@@ -725,6 +738,19 @@ class PostgresTokenStore {
     });
   }
 
+  /**
+   * Delete reservations that have exceeded the timeout.
+   * Called during setTokensOutputs to clean up stale reservations from crashed clients.
+   * The ON DELETE SET NULL foreign key constraint automatically releases the outputs.
+   */
+  async _cleanupStaleReservations(client) {
+    await client.query(
+      `DELETE FROM token_reservations
+       WHERE created_at < NOW() - make_interval(secs => $1)`,
+      [RESERVATION_TIMEOUT_SECS]
+    );
+  }
+
   /**
    * Upsert token metadata.
    */

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

@@ -189,6 +189,12 @@ class PostgresTreeStore {
       await this._withWriteTransaction(async (client) => {
         const refreshTimestamp = new Date(refreshStartedAtMs);
 
+        // Drop expired reservations BEFORE evaluating has_active_swap, otherwise a stale
+        // Swap reservation (from a crashed client or a swap whose finalize/cancel never
+        // ran) keeps has_active_swap true forever, which makes set_leaves early-return
+        // and never reach the cleanup again. The reservation pins itself in place.
+        await this._cleanupStaleReservations(client);
+
         // Check for active swap or swap completed during refresh
         const swapCheckResult = await client.query(`
           SELECT
@@ -211,15 +217,15 @@ class PostgresTreeStore {
         );
         const spentIds = new Set(spentResult.rows.map((r) => r.leaf_id));
 
-        // Delete non-reserved leaves added before refresh started
+        // Delete non-reserved leaves added before refresh started.
+        // Includes leaves released earlier in this transaction by _cleanupStaleReservations
+        // (FK ON DELETE SET NULL) — those rows kept their old added_at, so they are
+        // dropped here and re-fetched from the operator response in the upsert below.
         await client.query(
           "DELETE FROM tree_leaves WHERE reservation_id IS NULL AND added_at < $1",
           [refreshTimestamp]
         );
 
-        // Clean up stale reservations (after leaf delete)
-        await this._cleanupStaleReservations(client);
-
         // Upsert all leaves (filtering spent)
         await this._batchUpsertLeaves(client, leaves, false, spentIds);
         await this._batchUpsertLeaves(client, missingLeaves, true, spentIds);

package/package.json

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

package/web/breez_sdk_spark_wasm.d.ts

@@ -449,7 +449,7 @@ export interface AesSuccessActionData {
 
 export type InputType = ({ type: "bitcoinAddress" } & BitcoinAddressDetails) | ({ type: "bolt11Invoice" } & Bolt11InvoiceDetails) | ({ type: "bolt12Invoice" } & Bolt12InvoiceDetails) | ({ type: "bolt12Offer" } & Bolt12OfferDetails) | ({ type: "lightningAddress" } & LightningAddressDetails) | ({ type: "lnurlPay" } & LnurlPayRequestDetails) | ({ type: "silentPaymentAddress" } & SilentPaymentAddressDetails) | ({ type: "lnurlAuth" } & LnurlAuthRequestDetails) | ({ type: "url" } & string) | ({ type: "bip21" } & Bip21Details) | ({ type: "bolt12InvoiceRequest" } & Bolt12InvoiceRequestDetails) | ({ type: "lnurlWithdraw" } & LnurlWithdrawRequestDetails) | ({ type: "sparkAddress" } & SparkAddressDetails) | ({ type: "sparkInvoice" } & SparkInvoiceDetails);
 
-export type BuyBitcoinRequest = { type: "moonpay"; lockedAmountSat?: number; redirectUrl?: string } | { type: "cashApp"; amountSats?: number };
+export type BuyBitcoinRequest = { type: "moonpay"; lockedAmountSat?: number; redirectUrl?: string } | { type: "cashApp"; amountSats: number };
 
 export interface SetLnurlMetadataItem {
     paymentHash: string;