@arkade-os/boltz-swap 0.3.16 → 0.3.18

package/dist/{background-DX6SZGGJ.js → background-65LGXZHJ.js}

@@ -2,8 +2,8 @@ import {
   defineExpoSwapBackgroundTask,
   registerExpoSwapBackgroundTask,
   unregisterExpoSwapBackgroundTask
-} from "./chunk-CNH5DDKV.js";
-import "./chunk-RL4PDED5.js";
+} from "./chunk-GSCLW33R.js";
+import "./chunk-CS6UXZP6.js";
 import "./chunk-3RG5ZIWI.js";
 export {
   defineExpoSwapBackgroundTask,

package/dist/{chunk-RL4PDED5.js → chunk-CS6UXZP6.js}

@@ -465,7 +465,7 @@ var BoltzSwapProvider = class {
       invoiceAmount,
       claimPublicKey,
       preimageHash,
-      ...description?.trim() ? { description: description.trim() } : {},
+      description: description?.trim() || "Send to Arkade address",
       ...this.referralId ? { referralId: this.referralId } : {}
     };
     const response = await this.request(
@@ -3543,16 +3543,39 @@ var ArkadeSwaps = class _ArkadeSwaps {
         `VHTLC address mismatch for swap ${pendingSwap.id}: expected ${pendingSwap.response.address}, got ${vhtlcAddress}`
       );
     const vhtlcPkScriptHex = hex8.encode(vhtlcScript.pkScript);
-    const { vtxos: spendableVtxos } = await this.indexerProvider.getVtxos({
-      scripts: [vhtlcPkScriptHex],
-      spendableOnly: true
-    });
-    if (spendableVtxos.length === 0) {
+    const [spendableResult, recoverableResult] = await Promise.all([
+      this.indexerProvider.getVtxos({
+        scripts: [vhtlcPkScriptHex],
+        spendableOnly: true
+      }),
+      this.indexerProvider.getVtxos({
+        scripts: [vhtlcPkScriptHex],
+        recoverableOnly: true
+      })
+    ]);
+    const refundableVtxos = [
+      ...new Map(
+        [...spendableResult.vtxos, ...recoverableResult.vtxos].map(
+          (vtxo) => [`${vtxo.txid}:${vtxo.vout}`, vtxo]
+        )
+      ).values()
+    ];
+    if (refundableVtxos.length === 0) {
       const { vtxos: allVtxos } = await this.indexerProvider.getVtxos({
         scripts: [vhtlcPkScriptHex]
       });
+      if (allVtxos.length === 0) {
+        throw new Error(
+          `Swap ${pendingSwap.id}: VHTLC not found for address ${pendingSwap.response.address}`
+        );
+      }
+      if (allVtxos.every((vtxo) => vtxo.isSpent)) {
+        throw new Error(
+          `Swap ${pendingSwap.id}: VHTLC is already spent`
+        );
+      }
       throw new Error(
-        allVtxos.length > 0 ? `Swap ${pendingSwap.id}: VHTLC is already spent` : `Swap ${pendingSwap.id}: VHTLC not found for address ${pendingSwap.response.address}`
+        `Swap ${pendingSwap.id}: VHTLC has no refundable VTXOs yet`
       );
     }
     const outputScript = ArkAddress2.decode(address).pkScript;
@@ -3562,7 +3585,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
     const cltvSatisfied = BigInt(currentBlockHeight) >= refundLocktime;
     let boltzCallCount = 0;
     let skippedCount = 0;
-    for (const vtxo of spendableVtxos) {
+    for (const vtxo of refundableVtxos) {
       const isRecoverableVtxo = isRecoverable(vtxo);
       const output = {
         amount: BigInt(vtxo.value),

package/dist/{chunk-CNH5DDKV.js → chunk-GSCLW33R.js}

@@ -8,7 +8,7 @@ import {
   isSubmarineFinalStatus,
   isSubmarineSwapRefundable,
   logger
-} from "./chunk-RL4PDED5.js";
+} from "./chunk-CS6UXZP6.js";
 import {
   __require
 } from "./chunk-3RG5ZIWI.js";

package/dist/expo/index.cjs

@@ -429,7 +429,7 @@ var init_boltz_swap_provider = __esm({
           invoiceAmount,
           claimPublicKey,
           preimageHash,
-          ...description?.trim() ? { description: description.trim() } : {},
+          description: description?.trim() || "Send to Arkade address",
           ...this.referralId ? { referralId: this.referralId } : {}
         };
         const response = await this.request(
@@ -3549,16 +3549,39 @@ var init_arkade_swaps = __esm({
             `VHTLC address mismatch for swap ${pendingSwap.id}: expected ${pendingSwap.response.address}, got ${vhtlcAddress}`
           );
         const vhtlcPkScriptHex = import_base9.hex.encode(vhtlcScript.pkScript);
-        const { vtxos: spendableVtxos } = await this.indexerProvider.getVtxos({
-          scripts: [vhtlcPkScriptHex],
-          spendableOnly: true
-        });
-        if (spendableVtxos.length === 0) {
+        const [spendableResult, recoverableResult] = await Promise.all([
+          this.indexerProvider.getVtxos({
+            scripts: [vhtlcPkScriptHex],
+            spendableOnly: true
+          }),
+          this.indexerProvider.getVtxos({
+            scripts: [vhtlcPkScriptHex],
+            recoverableOnly: true
+          })
+        ]);
+        const refundableVtxos = [
+          ...new Map(
+            [...spendableResult.vtxos, ...recoverableResult.vtxos].map(
+              (vtxo) => [`${vtxo.txid}:${vtxo.vout}`, vtxo]
+            )
+          ).values()
+        ];
+        if (refundableVtxos.length === 0) {
           const { vtxos: allVtxos } = await this.indexerProvider.getVtxos({
             scripts: [vhtlcPkScriptHex]
           });
+          if (allVtxos.length === 0) {
+            throw new Error(
+              `Swap ${pendingSwap.id}: VHTLC not found for address ${pendingSwap.response.address}`
+            );
+          }
+          if (allVtxos.every((vtxo) => vtxo.isSpent)) {
+            throw new Error(
+              `Swap ${pendingSwap.id}: VHTLC is already spent`
+            );
+          }
           throw new Error(
-            allVtxos.length > 0 ? `Swap ${pendingSwap.id}: VHTLC is already spent` : `Swap ${pendingSwap.id}: VHTLC not found for address ${pendingSwap.response.address}`
+            `Swap ${pendingSwap.id}: VHTLC has no refundable VTXOs yet`
           );
         }
         const outputScript = import_sdk8.ArkAddress.decode(address).pkScript;
@@ -3568,7 +3591,7 @@ var init_arkade_swaps = __esm({
         const cltvSatisfied = BigInt(currentBlockHeight) >= refundLocktime;
         let boltzCallCount = 0;
         let skippedCount = 0;
-        for (const vtxo of spendableVtxos) {
+        for (const vtxo of refundableVtxos) {
           const isRecoverableVtxo = (0, import_sdk8.isRecoverable)(vtxo);
           const output = {
             amount: BigInt(vtxo.value),

package/dist/expo/index.js

@@ -4,10 +4,10 @@ import {
   registerExpoSwapBackgroundTask,
   swapsPollProcessor,
   unregisterExpoSwapBackgroundTask
-} from "../chunk-CNH5DDKV.js";
+} from "../chunk-GSCLW33R.js";
 import {
   ArkadeSwaps
-} from "../chunk-RL4PDED5.js";
+} from "../chunk-CS6UXZP6.js";
 import "../chunk-3RG5ZIWI.js";
 
 // src/expo/arkade-lightning.ts
@@ -56,7 +56,7 @@ var ExpoArkadeSwaps = class _ExpoArkadeSwaps {
     await instance.seedSwapPollTask();
     if (config.background.minimumBackgroundInterval) {
       try {
-        const { registerExpoSwapBackgroundTask: registerExpoSwapBackgroundTask2 } = await import("../background-DX6SZGGJ.js");
+        const { registerExpoSwapBackgroundTask: registerExpoSwapBackgroundTask2 } = await import("../background-65LGXZHJ.js");
         await registerExpoSwapBackgroundTask2(
           config.background.taskName,
           {
@@ -129,7 +129,7 @@ var ExpoArkadeSwaps = class _ExpoArkadeSwaps {
     }
     await this.inner.dispose();
     try {
-      const { unregisterExpoSwapBackgroundTask: unregisterExpoSwapBackgroundTask2 } = await import("../background-DX6SZGGJ.js");
+      const { unregisterExpoSwapBackgroundTask: unregisterExpoSwapBackgroundTask2 } = await import("../background-65LGXZHJ.js");
       await unregisterExpoSwapBackgroundTask2(this.taskName);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);

package/dist/index.cjs

@@ -559,7 +559,7 @@ var BoltzSwapProvider = class {
       invoiceAmount,
       claimPublicKey,
       preimageHash,
-      ...description?.trim() ? { description: description.trim() } : {},
+      description: description?.trim() || "Send to Arkade address",
       ...this.referralId ? { referralId: this.referralId } : {}
     };
     const response = await this.request(
@@ -3603,16 +3603,39 @@ var ArkadeSwaps = class _ArkadeSwaps {
         `VHTLC address mismatch for swap ${pendingSwap.id}: expected ${pendingSwap.response.address}, got ${vhtlcAddress}`
       );
     const vhtlcPkScriptHex = import_base9.hex.encode(vhtlcScript.pkScript);
-    const { vtxos: spendableVtxos } = await this.indexerProvider.getVtxos({
-      scripts: [vhtlcPkScriptHex],
-      spendableOnly: true
-    });
-    if (spendableVtxos.length === 0) {
+    const [spendableResult, recoverableResult] = await Promise.all([
+      this.indexerProvider.getVtxos({
+        scripts: [vhtlcPkScriptHex],
+        spendableOnly: true
+      }),
+      this.indexerProvider.getVtxos({
+        scripts: [vhtlcPkScriptHex],
+        recoverableOnly: true
+      })
+    ]);
+    const refundableVtxos = [
+      ...new Map(
+        [...spendableResult.vtxos, ...recoverableResult.vtxos].map(
+          (vtxo) => [`${vtxo.txid}:${vtxo.vout}`, vtxo]
+        )
+      ).values()
+    ];
+    if (refundableVtxos.length === 0) {
       const { vtxos: allVtxos } = await this.indexerProvider.getVtxos({
         scripts: [vhtlcPkScriptHex]
       });
+      if (allVtxos.length === 0) {
+        throw new Error(
+          `Swap ${pendingSwap.id}: VHTLC not found for address ${pendingSwap.response.address}`
+        );
+      }
+      if (allVtxos.every((vtxo) => vtxo.isSpent)) {
+        throw new Error(
+          `Swap ${pendingSwap.id}: VHTLC is already spent`
+        );
+      }
       throw new Error(
-        allVtxos.length > 0 ? `Swap ${pendingSwap.id}: VHTLC is already spent` : `Swap ${pendingSwap.id}: VHTLC not found for address ${pendingSwap.response.address}`
+        `Swap ${pendingSwap.id}: VHTLC has no refundable VTXOs yet`
       );
     }
     const outputScript = import_sdk8.ArkAddress.decode(address).pkScript;
@@ -3622,7 +3645,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
     const cltvSatisfied = BigInt(currentBlockHeight) >= refundLocktime;
     let boltzCallCount = 0;
     let skippedCount = 0;
-    for (const vtxo of spendableVtxos) {
+    for (const vtxo of refundableVtxos) {
       const isRecoverableVtxo = (0, import_sdk8.isRecoverable)(vtxo);
       const output = {
         amount: BigInt(vtxo.value),

package/dist/index.js

@@ -50,7 +50,7 @@ import {
   updateReverseSwapStatus,
   updateSubmarineSwapStatus,
   verifySignatures
-} from "./chunk-RL4PDED5.js";
+} from "./chunk-CS6UXZP6.js";
 import "./chunk-3RG5ZIWI.js";
 
 // src/serviceWorker/arkade-swaps-message-handler.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/boltz-swap",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "type": "module",
   "description": "A production-ready TypeScript package that brings Boltz submarine-swaps to Arkade.",
   "main": "./dist/index.js",
@@ -60,7 +60,7 @@
   "author": "Arkade-OS",
   "license": "MIT",
   "dependencies": {
-    "@arkade-os/sdk": "0.4.15",
+    "@arkade-os/sdk": "0.4.17",
     "@noble/hashes": "2.0.1",
     "@scure/base": "2.0.0",
     "@scure/btc-signer": "2.0.1",