@arkade-os/boltz-swap 0.3.9 → 0.3.10

package/dist/{background-VM6FN7TU.js → background-SASNQHX4.js}

@@ -2,8 +2,8 @@ import {
   defineExpoSwapBackgroundTask,
   registerExpoSwapBackgroundTask,
   unregisterExpoSwapBackgroundTask
-} from "./chunk-3XJR3RIH.js";
-import "./chunk-NUR5GPRK.js";
+} from "./chunk-QGPE6POI.js";
+import "./chunk-NTTONVRX.js";
 import "./chunk-3RG5ZIWI.js";
 export {
   defineExpoSwapBackgroundTask,

package/dist/{chunk-NUR5GPRK.js → chunk-NTTONVRX.js}

@@ -3439,21 +3439,6 @@ var ArkadeSwaps = class _ArkadeSwaps {
     const preimageHash = pendingSwap.request.invoice ? getInvoicePaymentHash(pendingSwap.request.invoice) : pendingSwap.preimageHash;
     if (!preimageHash)
       throw new Error("Preimage hash is required to refund VHTLC");
-    const vhtlcPkScript = ArkAddress2.decode(
-      pendingSwap.response.address
-    ).pkScript;
-    const { vtxos } = await this.indexerProvider.getVtxos({
-      scripts: [hex8.encode(vhtlcPkScript)]
-    });
-    if (vtxos.length === 0) {
-      throw new Error(
-        `VHTLC not found for address ${pendingSwap.response.address}`
-      );
-    }
-    const vtxo = vtxos[0];
-    if (vtxo.isSpent) {
-      throw new Error("VHTLC is already spent");
-    }
     const arkInfo = await this.arkProvider.getInfo();
     const address = await this.wallet.getAddress();
     if (!address) throw new Error("Failed to get ark address from wallet");
@@ -3472,7 +3457,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
       "boltz",
       pendingSwap.id
     );
-    const { vhtlcScript } = this.createVHTLCScript({
+    const { vhtlcScript, vhtlcAddress } = this.createVHTLCScript({
       network: arkInfo.network,
       preimageHash: hex8.decode(preimageHash),
       receiverPubkey: hex8.encode(boltzXOnlyPublicKey),
@@ -3482,31 +3467,63 @@ var ArkadeSwaps = class _ArkadeSwaps {
     });
     if (!vhtlcScript.claimScript)
       throw new Error("Failed to create VHTLC script for submarine swap");
-    const isRecoverableVtxo = isRecoverable(vtxo);
-    const input = {
-      ...vtxo,
-      tapLeafScript: isRecoverableVtxo ? vhtlcScript.refundWithoutReceiver() : vhtlcScript.refund(),
-      tapTree: vhtlcScript.encode()
-    };
-    const output = {
-      amount: BigInt(vtxo.value),
-      script: ArkAddress2.decode(address).pkScript
-    };
-    if (isRecoverableVtxo) {
-      await this.joinBatch(this.wallet.identity, input, output, arkInfo);
-    } else {
-      await refundVHTLCwithOffchainTx(
-        pendingSwap.id,
-        this.wallet.identity,
-        this.arkProvider,
-        boltzXOnlyPublicKey,
-        ourXOnlyPublicKey,
-        serverXOnlyPublicKey,
-        input,
-        output,
-        arkInfo,
-        this.swapProvider.refundSubmarineSwap.bind(this.swapProvider)
+    if (vhtlcAddress !== pendingSwap.response.address)
+      throw new Error(
+        `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 { vtxos: allVtxos } = await this.indexerProvider.getVtxos({
+        scripts: [vhtlcPkScriptHex]
+      });
+      throw new Error(
+        allVtxos.length > 0 ? "VHTLC is already spent" : `VHTLC not found for address ${pendingSwap.response.address}`
+      );
+    }
+    const outputScript = ArkAddress2.decode(address).pkScript;
+    let boltzCallCount = 0;
+    for (const vtxo of spendableVtxos) {
+      const isRecoverableVtxo = isRecoverable(vtxo);
+      const input = {
+        ...vtxo,
+        tapLeafScript: isRecoverableVtxo ? vhtlcScript.refundWithoutReceiver() : vhtlcScript.refund(),
+        tapTree: vhtlcScript.encode()
+      };
+      const output = {
+        amount: BigInt(vtxo.value),
+        script: outputScript
+      };
+      if (isRecoverableVtxo) {
+        await this.joinBatch(
+          this.wallet.identity,
+          input,
+          output,
+          arkInfo
+        );
+      } else {
+        if (boltzCallCount > 0) {
+          await new Promise((r) => setTimeout(r, 2e3));
+        }
+        await refundVHTLCwithOffchainTx(
+          pendingSwap.id,
+          this.wallet.identity,
+          this.arkProvider,
+          boltzXOnlyPublicKey,
+          ourXOnlyPublicKey,
+          serverXOnlyPublicKey,
+          input,
+          output,
+          arkInfo,
+          this.swapProvider.refundSubmarineSwap.bind(
+            this.swapProvider
+          )
+        );
+        boltzCallCount++;
+      }
     }
     await updateSubmarineSwapStatus(
       pendingSwap,

package/dist/{chunk-3XJR3RIH.js → chunk-QGPE6POI.js}

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

package/dist/expo/index.cjs

@@ -3444,21 +3444,6 @@ var init_arkade_swaps = __esm({
         const preimageHash = pendingSwap.request.invoice ? getInvoicePaymentHash(pendingSwap.request.invoice) : pendingSwap.preimageHash;
         if (!preimageHash)
           throw new Error("Preimage hash is required to refund VHTLC");
-        const vhtlcPkScript = import_sdk8.ArkAddress.decode(
-          pendingSwap.response.address
-        ).pkScript;
-        const { vtxos } = await this.indexerProvider.getVtxos({
-          scripts: [import_base9.hex.encode(vhtlcPkScript)]
-        });
-        if (vtxos.length === 0) {
-          throw new Error(
-            `VHTLC not found for address ${pendingSwap.response.address}`
-          );
-        }
-        const vtxo = vtxos[0];
-        if (vtxo.isSpent) {
-          throw new Error("VHTLC is already spent");
-        }
         const arkInfo = await this.arkProvider.getInfo();
         const address = await this.wallet.getAddress();
         if (!address) throw new Error("Failed to get ark address from wallet");
@@ -3477,7 +3462,7 @@ var init_arkade_swaps = __esm({
           "boltz",
           pendingSwap.id
         );
-        const { vhtlcScript } = this.createVHTLCScript({
+        const { vhtlcScript, vhtlcAddress } = this.createVHTLCScript({
           network: arkInfo.network,
           preimageHash: import_base9.hex.decode(preimageHash),
           receiverPubkey: import_base9.hex.encode(boltzXOnlyPublicKey),
@@ -3487,31 +3472,63 @@ var init_arkade_swaps = __esm({
         });
         if (!vhtlcScript.claimScript)
           throw new Error("Failed to create VHTLC script for submarine swap");
-        const isRecoverableVtxo = (0, import_sdk8.isRecoverable)(vtxo);
-        const input = {
-          ...vtxo,
-          tapLeafScript: isRecoverableVtxo ? vhtlcScript.refundWithoutReceiver() : vhtlcScript.refund(),
-          tapTree: vhtlcScript.encode()
-        };
-        const output = {
-          amount: BigInt(vtxo.value),
-          script: import_sdk8.ArkAddress.decode(address).pkScript
-        };
-        if (isRecoverableVtxo) {
-          await this.joinBatch(this.wallet.identity, input, output, arkInfo);
-        } else {
-          await refundVHTLCwithOffchainTx(
-            pendingSwap.id,
-            this.wallet.identity,
-            this.arkProvider,
-            boltzXOnlyPublicKey,
-            ourXOnlyPublicKey,
-            serverXOnlyPublicKey,
-            input,
-            output,
-            arkInfo,
-            this.swapProvider.refundSubmarineSwap.bind(this.swapProvider)
+        if (vhtlcAddress !== pendingSwap.response.address)
+          throw new Error(
+            `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 { vtxos: allVtxos } = await this.indexerProvider.getVtxos({
+            scripts: [vhtlcPkScriptHex]
+          });
+          throw new Error(
+            allVtxos.length > 0 ? "VHTLC is already spent" : `VHTLC not found for address ${pendingSwap.response.address}`
+          );
+        }
+        const outputScript = import_sdk8.ArkAddress.decode(address).pkScript;
+        let boltzCallCount = 0;
+        for (const vtxo of spendableVtxos) {
+          const isRecoverableVtxo = (0, import_sdk8.isRecoverable)(vtxo);
+          const input = {
+            ...vtxo,
+            tapLeafScript: isRecoverableVtxo ? vhtlcScript.refundWithoutReceiver() : vhtlcScript.refund(),
+            tapTree: vhtlcScript.encode()
+          };
+          const output = {
+            amount: BigInt(vtxo.value),
+            script: outputScript
+          };
+          if (isRecoverableVtxo) {
+            await this.joinBatch(
+              this.wallet.identity,
+              input,
+              output,
+              arkInfo
+            );
+          } else {
+            if (boltzCallCount > 0) {
+              await new Promise((r) => setTimeout(r, 2e3));
+            }
+            await refundVHTLCwithOffchainTx(
+              pendingSwap.id,
+              this.wallet.identity,
+              this.arkProvider,
+              boltzXOnlyPublicKey,
+              ourXOnlyPublicKey,
+              serverXOnlyPublicKey,
+              input,
+              output,
+              arkInfo,
+              this.swapProvider.refundSubmarineSwap.bind(
+                this.swapProvider
+              )
+            );
+            boltzCallCount++;
+          }
         }
         await updateSubmarineSwapStatus(
           pendingSwap,

package/dist/expo/index.js

@@ -4,10 +4,10 @@ import {
   registerExpoSwapBackgroundTask,
   swapsPollProcessor,
   unregisterExpoSwapBackgroundTask
-} from "../chunk-3XJR3RIH.js";
+} from "../chunk-QGPE6POI.js";
 import {
   ArkadeSwaps
-} from "../chunk-NUR5GPRK.js";
+} from "../chunk-NTTONVRX.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-VM6FN7TU.js");
+        const { registerExpoSwapBackgroundTask: registerExpoSwapBackgroundTask2 } = await import("../background-SASNQHX4.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-VM6FN7TU.js");
+      const { unregisterExpoSwapBackgroundTask: unregisterExpoSwapBackgroundTask2 } = await import("../background-SASNQHX4.js");
       await unregisterExpoSwapBackgroundTask2(this.taskName);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);

package/dist/index.cjs

@@ -3498,21 +3498,6 @@ var ArkadeSwaps = class _ArkadeSwaps {
     const preimageHash = pendingSwap.request.invoice ? getInvoicePaymentHash(pendingSwap.request.invoice) : pendingSwap.preimageHash;
     if (!preimageHash)
       throw new Error("Preimage hash is required to refund VHTLC");
-    const vhtlcPkScript = import_sdk8.ArkAddress.decode(
-      pendingSwap.response.address
-    ).pkScript;
-    const { vtxos } = await this.indexerProvider.getVtxos({
-      scripts: [import_base9.hex.encode(vhtlcPkScript)]
-    });
-    if (vtxos.length === 0) {
-      throw new Error(
-        `VHTLC not found for address ${pendingSwap.response.address}`
-      );
-    }
-    const vtxo = vtxos[0];
-    if (vtxo.isSpent) {
-      throw new Error("VHTLC is already spent");
-    }
     const arkInfo = await this.arkProvider.getInfo();
     const address = await this.wallet.getAddress();
     if (!address) throw new Error("Failed to get ark address from wallet");
@@ -3531,7 +3516,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
       "boltz",
       pendingSwap.id
     );
-    const { vhtlcScript } = this.createVHTLCScript({
+    const { vhtlcScript, vhtlcAddress } = this.createVHTLCScript({
       network: arkInfo.network,
       preimageHash: import_base9.hex.decode(preimageHash),
       receiverPubkey: import_base9.hex.encode(boltzXOnlyPublicKey),
@@ -3541,31 +3526,63 @@ var ArkadeSwaps = class _ArkadeSwaps {
     });
     if (!vhtlcScript.claimScript)
       throw new Error("Failed to create VHTLC script for submarine swap");
-    const isRecoverableVtxo = (0, import_sdk8.isRecoverable)(vtxo);
-    const input = {
-      ...vtxo,
-      tapLeafScript: isRecoverableVtxo ? vhtlcScript.refundWithoutReceiver() : vhtlcScript.refund(),
-      tapTree: vhtlcScript.encode()
-    };
-    const output = {
-      amount: BigInt(vtxo.value),
-      script: import_sdk8.ArkAddress.decode(address).pkScript
-    };
-    if (isRecoverableVtxo) {
-      await this.joinBatch(this.wallet.identity, input, output, arkInfo);
-    } else {
-      await refundVHTLCwithOffchainTx(
-        pendingSwap.id,
-        this.wallet.identity,
-        this.arkProvider,
-        boltzXOnlyPublicKey,
-        ourXOnlyPublicKey,
-        serverXOnlyPublicKey,
-        input,
-        output,
-        arkInfo,
-        this.swapProvider.refundSubmarineSwap.bind(this.swapProvider)
+    if (vhtlcAddress !== pendingSwap.response.address)
+      throw new Error(
+        `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 { vtxos: allVtxos } = await this.indexerProvider.getVtxos({
+        scripts: [vhtlcPkScriptHex]
+      });
+      throw new Error(
+        allVtxos.length > 0 ? "VHTLC is already spent" : `VHTLC not found for address ${pendingSwap.response.address}`
+      );
+    }
+    const outputScript = import_sdk8.ArkAddress.decode(address).pkScript;
+    let boltzCallCount = 0;
+    for (const vtxo of spendableVtxos) {
+      const isRecoverableVtxo = (0, import_sdk8.isRecoverable)(vtxo);
+      const input = {
+        ...vtxo,
+        tapLeafScript: isRecoverableVtxo ? vhtlcScript.refundWithoutReceiver() : vhtlcScript.refund(),
+        tapTree: vhtlcScript.encode()
+      };
+      const output = {
+        amount: BigInt(vtxo.value),
+        script: outputScript
+      };
+      if (isRecoverableVtxo) {
+        await this.joinBatch(
+          this.wallet.identity,
+          input,
+          output,
+          arkInfo
+        );
+      } else {
+        if (boltzCallCount > 0) {
+          await new Promise((r) => setTimeout(r, 2e3));
+        }
+        await refundVHTLCwithOffchainTx(
+          pendingSwap.id,
+          this.wallet.identity,
+          this.arkProvider,
+          boltzXOnlyPublicKey,
+          ourXOnlyPublicKey,
+          serverXOnlyPublicKey,
+          input,
+          output,
+          arkInfo,
+          this.swapProvider.refundSubmarineSwap.bind(
+            this.swapProvider
+          )
+        );
+        boltzCallCount++;
+      }
     }
     await updateSubmarineSwapStatus(
       pendingSwap,

package/dist/index.js

@@ -49,7 +49,7 @@ import {
   updateReverseSwapStatus,
   updateSubmarineSwapStatus,
   verifySignatures
-} from "./chunk-NUR5GPRK.js";
+} from "./chunk-NTTONVRX.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.9",
+  "version": "0.3.10",
   "type": "module",
   "description": "A production-ready TypeScript package that brings Boltz submarine-swaps to Arkade.",
   "main": "./dist/index.js",