@arkade-os/boltz-swap 0.3.14 → 0.3.15

package/dist/{arkade-swaps-BfHIKMq0.d.ts → arkade-swaps-DRMB_apa.d.ts}

@@ -1,5 +1,5 @@
 import { IWallet, ArkProvider, IndexerProvider, ArkInfo, Identity, ArkTxInput, VHTLC } from '@arkade-os/sdk';
-import { m as BoltzSwapProvider, V as SwapManager, j as SwapRepository, X as ArkadeSwapsCreateConfig, A as ArkadeSwapsConfig, k as SwapManagerClient, C as CreateLightningInvoiceRequest, e as CreateLightningInvoiceResponse, b as BoltzReverseSwap, S as SendLightningPaymentRequest, f as SendLightningPaymentResponse, c as BoltzSubmarineSwap, h as ArkToBtcResponse, a as BoltzChainSwap, i as BtcToArkResponse, d as Chain, F as FeesResponse, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, B as BoltzSwap } from './types-x542EUL6.js';
+import { m as BoltzSwapProvider, V as SwapManager, j as SwapRepository, X as ArkadeSwapsCreateConfig, A as ArkadeSwapsConfig, k as SwapManagerClient, C as CreateLightningInvoiceRequest, e as CreateLightningInvoiceResponse, b as BoltzReverseSwap, S as SendLightningPaymentRequest, f as SendLightningPaymentResponse, c as BoltzSubmarineSwap, h as ArkToBtcResponse, a as BoltzChainSwap, i as BtcToArkResponse, d as Chain, F as FeesResponse, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, B as BoltzSwap } from './types-C-2sBQWJ.js';
 import { TransactionOutput } from '@scure/btc-signer/psbt.js';
 
 /**

package/dist/{arkade-swaps-CwQbGdU9.d.cts → arkade-swaps-DkM_5yuv.d.cts}

@@ -1,5 +1,5 @@
 import { IWallet, ArkProvider, IndexerProvider, ArkInfo, Identity, ArkTxInput, VHTLC } from '@arkade-os/sdk';
-import { m as BoltzSwapProvider, V as SwapManager, j as SwapRepository, X as ArkadeSwapsCreateConfig, A as ArkadeSwapsConfig, k as SwapManagerClient, C as CreateLightningInvoiceRequest, e as CreateLightningInvoiceResponse, b as BoltzReverseSwap, S as SendLightningPaymentRequest, f as SendLightningPaymentResponse, c as BoltzSubmarineSwap, h as ArkToBtcResponse, a as BoltzChainSwap, i as BtcToArkResponse, d as Chain, F as FeesResponse, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, B as BoltzSwap } from './types-x542EUL6.cjs';
+import { m as BoltzSwapProvider, V as SwapManager, j as SwapRepository, X as ArkadeSwapsCreateConfig, A as ArkadeSwapsConfig, k as SwapManagerClient, C as CreateLightningInvoiceRequest, e as CreateLightningInvoiceResponse, b as BoltzReverseSwap, S as SendLightningPaymentRequest, f as SendLightningPaymentResponse, c as BoltzSubmarineSwap, h as ArkToBtcResponse, a as BoltzChainSwap, i as BtcToArkResponse, d as Chain, F as FeesResponse, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, B as BoltzSwap } from './types-C-2sBQWJ.cjs';
 import { TransactionOutput } from '@scure/btc-signer/psbt.js';
 
 /**

package/dist/{background-5XMCGVMS.js → background-646NBLSK.js}

@@ -2,8 +2,8 @@ import {
   defineExpoSwapBackgroundTask,
   registerExpoSwapBackgroundTask,
   unregisterExpoSwapBackgroundTask
-} from "./chunk-2TWYSAFO.js";
-import "./chunk-AIVWXKNG.js";
+} from "./chunk-DPGNWPDB.js";
+import "./chunk-Y6GPJDXY.js";
 import "./chunk-3RG5ZIWI.js";
 export {
   defineExpoSwapBackgroundTask,

package/dist/{chunk-2TWYSAFO.js → chunk-DPGNWPDB.js}

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

package/dist/{chunk-AIVWXKNG.js → chunk-Y6GPJDXY.js}

@@ -221,7 +221,7 @@ var isGetReverseSwapTxIdResponse = (data) => {
   return data && typeof data === "object" && typeof data.id === "string" && typeof data.timeoutBlockHeight === "number";
 };
 var isGetSwapStatusResponse = (data) => {
-  return data && typeof data === "object" && typeof data.status === "string" && (data.zeroConfRejected === void 0 || typeof data.zeroConfRejected === "boolean") && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && (data.transaction.eta === void 0 || typeof data.transaction.eta === "number") && (data.transaction.hex === void 0 || typeof data.transaction.hex === "string") && (data.transaction.preimage === void 0 || typeof data.transaction.preimage === "string"));
+  return data && typeof data === "object" && typeof data.status === "string" && (data.zeroConfRejected === void 0 || typeof data.zeroConfRejected === "boolean") && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && (data.transaction.confirmed === void 0 || typeof data.transaction.confirmed === "boolean") && (data.transaction.eta === void 0 || typeof data.transaction.eta === "number") && (data.transaction.hex === void 0 || typeof data.transaction.hex === "string") && (data.transaction.preimage === void 0 || typeof data.transaction.preimage === "string"));
 };
 var isGetSubmarinePairsResponse = (data) => {
   return data && typeof data === "object" && data.ARK && typeof data.ARK === "object" && data.ARK.BTC && typeof data.ARK.BTC === "object" && typeof data.ARK.BTC.hash === "string" && typeof data.ARK.BTC.rate === "number" && data.ARK.BTC.limits && typeof data.ARK.BTC.limits === "object" && typeof data.ARK.BTC.limits.maximal === "number" && typeof data.ARK.BTC.limits.minimal === "number" && typeof data.ARK.BTC.limits.maximalZeroConf === "number" && data.ARK.BTC.fees && typeof data.ARK.BTC.fees === "object" && typeof data.ARK.BTC.fees.percentage === "number" && typeof data.ARK.BTC.fees.minerFees === "number";
@@ -230,13 +230,13 @@ var isGetReversePairsResponse = (data) => {
   return data && typeof data === "object" && data.BTC && typeof data.BTC === "object" && data.BTC.ARK && typeof data.BTC.ARK === "object" && data.BTC.ARK.hash && typeof data.BTC.ARK.hash === "string" && typeof data.BTC.ARK.rate === "number" && data.BTC.ARK.limits && typeof data.BTC.ARK.limits === "object" && typeof data.BTC.ARK.limits.maximal === "number" && typeof data.BTC.ARK.limits.minimal === "number" && data.BTC.ARK.fees && typeof data.BTC.ARK.fees === "object" && typeof data.BTC.ARK.fees.percentage === "number" && typeof data.BTC.ARK.fees.minerFees === "object" && typeof data.BTC.ARK.fees.minerFees.claim === "number" && typeof data.BTC.ARK.fees.minerFees.lockup === "number";
 };
 var isCreateSubmarineSwapResponse = (data) => {
-  return data && typeof data === "object" && typeof data.id === "string" && typeof data.address === "string" && typeof data.expectedAmount === "number" && typeof data.claimPublicKey === "string" && typeof data.acceptZeroConf === "boolean" && isTimeoutBlockHeights(data.timeoutBlockHeights);
+  return data && typeof data === "object" && typeof data.id === "string" && typeof data.expectedAmount === "number" && (data.address === void 0 || typeof data.address === "string") && (data.claimPublicKey === void 0 || typeof data.claimPublicKey === "string") && (data.acceptZeroConf === void 0 || typeof data.acceptZeroConf === "boolean") && (data.timeoutBlockHeight === void 0 || typeof data.timeoutBlockHeight === "number") && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights));
 };
 var isGetSwapPreimageResponse = (data) => {
   return data && typeof data === "object" && typeof data.preimage === "string";
 };
 var isCreateReverseSwapResponse = (data) => {
-  return data && typeof data === "object" && typeof data.id === "string" && typeof data.invoice === "string" && typeof data.onchainAmount === "number" && typeof data.lockupAddress === "string" && typeof data.refundPublicKey === "string" && isTimeoutBlockHeights(data.timeoutBlockHeights);
+  return data && typeof data === "object" && typeof data.id === "string" && typeof data.invoice === "string" && (data.onchainAmount === void 0 || typeof data.onchainAmount === "number") && (data.lockupAddress === void 0 || typeof data.lockupAddress === "string") && (data.refundPublicKey === void 0 || typeof data.refundPublicKey === "string") && (data.timeoutBlockHeight === void 0 || typeof data.timeoutBlockHeight === "number") && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights));
 };
 var isRefundSubmarineSwapResponse = (data) => {
   return data && typeof data === "object" && typeof data.transaction === "string" && typeof data.checkpoint === "string";
@@ -275,19 +275,19 @@ var isLeaf = (data) => {
   return data && typeof data === "object" && typeof data.version === "number" && typeof data.output === "string";
 };
 var isTree = (data) => {
-  return data && typeof data === "object" && isLeaf(data.claimLeaf) && isLeaf(data.refundLeaf) && isLeaf(data.refundWithoutBoltzLeaf) && isLeaf(data.unilateralClaimLeaf) && isLeaf(data.unilateralRefundLeaf) && isLeaf(data.unilateralRefundWithoutBoltzLeaf);
+  return data && typeof data === "object" && isLeaf(data.claimLeaf) && isLeaf(data.refundLeaf) && (data.covenantClaimLeaf === void 0 || isLeaf(data.covenantClaimLeaf)) && (data.refundWithoutBoltzLeaf === void 0 || isLeaf(data.refundWithoutBoltzLeaf)) && (data.unilateralClaimLeaf === void 0 || isLeaf(data.unilateralClaimLeaf)) && (data.unilateralRefundLeaf === void 0 || isLeaf(data.unilateralRefundLeaf)) && (data.unilateralRefundWithoutBoltzLeaf === void 0 || isLeaf(data.unilateralRefundWithoutBoltzLeaf));
 };
 var isDetails = (data) => {
-  return data && typeof data === "object" && isTree(data.tree) && (data.amount === void 0 || typeof data.amount === "number") && typeof data.keyIndex === "number" && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && typeof data.transaction.vout === "number") && typeof data.lockupAddress === "string" && typeof data.serverPublicKey === "string" && typeof data.timeoutBlockHeight === "number" && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights)) && (data.preimageHash === void 0 || typeof data.preimageHash === "string");
+  return data && typeof data === "object" && isTree(data.tree) && (data.amount === void 0 || typeof data.amount === "number") && typeof data.keyIndex === "number" && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && typeof data.transaction.vout === "number") && typeof data.lockupAddress === "string" && typeof data.serverPublicKey === "string" && (data.timeoutBlockHeight === void 0 || typeof data.timeoutBlockHeight === "number") && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights)) && (data.preimageHash === void 0 || typeof data.preimageHash === "string");
 };
 var isRestoredChainSwap = (data) => {
-  return data && typeof data === "object" && typeof data.id === "string" && data.type === "chain" && typeof data.status === "string" && typeof data.createdAt === "number" && (data.from === "ARK" || data.from === "BTC") && (data.to === "ARK" || data.to === "BTC") && typeof data.preimageHash === "string" && data.refundDetails && typeof data.refundDetails === "object" && isTree(data.refundDetails.tree) && typeof data.refundDetails.amount === "number" && typeof data.refundDetails.keyIndex === "number" && (data.refundDetails.transaction === void 0 || data.refundDetails.transaction && typeof data.refundDetails.transaction === "object" && typeof data.refundDetails.transaction.id === "string" && typeof data.refundDetails.transaction.vout === "number") && typeof data.refundDetails.lockupAddress === "string" && typeof data.refundDetails.serverPublicKey === "string" && typeof data.refundDetails.timeoutBlockHeight === "number";
+  return data && typeof data === "object" && typeof data.id === "string" && data.type === "chain" && typeof data.status === "string" && typeof data.createdAt === "number" && (data.from === "ARK" || data.from === "BTC") && (data.to === "ARK" || data.to === "BTC") && (data.preimageHash === void 0 || typeof data.preimageHash === "string") && (data.invoice === void 0 || typeof data.invoice === "string") && (data.refundDetails === void 0 || isDetails(data.refundDetails)) && (data.claimDetails === void 0 || isDetails(data.claimDetails));
 };
 var isRestoredSubmarineSwap = (data) => {
-  return data && typeof data === "object" && data.to === "BTC" && typeof data.id === "string" && data.from === "ARK" && data.type === "submarine" && typeof data.createdAt === "number" && typeof data.preimageHash === "string" && typeof data.status === "string" && isDetails(data.refundDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
+  return data && typeof data === "object" && data.to === "BTC" && typeof data.id === "string" && data.from === "ARK" && data.type === "submarine" && typeof data.createdAt === "number" && (data.preimageHash === void 0 || typeof data.preimageHash === "string") && typeof data.status === "string" && isDetails(data.refundDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
 };
 var isRestoredReverseSwap = (data) => {
-  return data && typeof data === "object" && data.to === "ARK" && typeof data.id === "string" && data.from === "BTC" && data.type === "reverse" && typeof data.createdAt === "number" && typeof data.preimageHash === "string" && typeof data.status === "string" && isDetails(data.claimDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
+  return data && typeof data === "object" && data.to === "ARK" && typeof data.id === "string" && data.from === "BTC" && data.type === "reverse" && typeof data.createdAt === "number" && (data.preimageHash === void 0 || typeof data.preimageHash === "string") && typeof data.status === "string" && isDetails(data.claimDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
 };
 var isCreateSwapsRestoreResponse = (data) => {
   return Array.isArray(data) && data.every(
@@ -3214,6 +3214,9 @@ var ArkadeSwaps = class _ArkadeSwaps {
   async claimVHTLC(pendingSwap) {
     if (!pendingSwap.preimage)
       throw new Error("Preimage is required to claim VHTLC");
+    const { refundPublicKey, lockupAddress, timeoutBlockHeights } = pendingSwap.response;
+    if (!refundPublicKey || !lockupAddress || !timeoutBlockHeights)
+      throw new Error("Incomplete reverse swap response");
     const preimage = hex8.decode(pendingSwap.preimage);
     const arkInfo = await this.arkProvider.getInfo();
     const address = await this.wallet.getAddress();
@@ -3223,7 +3226,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
       pendingSwap.id
     );
     const senderXOnly = normalizeToXOnlyKey(
-      hex8.decode(pendingSwap.response.refundPublicKey),
+      hex8.decode(refundPublicKey),
       "boltz",
       pendingSwap.id
     );
@@ -3238,11 +3241,11 @@ var ArkadeSwaps = class _ArkadeSwaps {
       receiverPubkey: hex8.encode(receiverXOnly),
       senderPubkey: hex8.encode(senderXOnly),
       serverPubkey: hex8.encode(serverXOnly),
-      timeoutBlockHeights: pendingSwap.response.timeoutBlockHeights
+      timeoutBlockHeights
     });
     if (!vhtlcScript.claimScript)
       throw new Error("Failed to create VHTLC script for reverse swap");
-    if (vhtlcAddress !== pendingSwap.response.lockupAddress)
+    if (vhtlcAddress !== lockupAddress)
       throw new Error("Boltz is trying to scam us");
     const { vtxos } = await this.indexerProvider.getVtxos({
       scripts: [hex8.encode(vhtlcScript.pkScript)]
@@ -3383,6 +3386,8 @@ var ArkadeSwaps = class _ArkadeSwaps {
    */
   async sendLightningPayment(args) {
     const pendingSwap = await this.createSubmarineSwap(args);
+    if (!pendingSwap.response.address)
+      throw new Error("Missing address in submarine swap response");
     await this.savePendingSubmarineSwap(pendingSwap);
     const txid = await this.wallet.send({
       address: pendingSwap.response.address,
@@ -3466,8 +3471,11 @@ var ArkadeSwaps = class _ArkadeSwaps {
       "server",
       pendingSwap.id
     );
+    const { claimPublicKey, timeoutBlockHeights } = pendingSwap.response;
+    if (!claimPublicKey || !timeoutBlockHeights)
+      throw new Error("Incomplete submarine swap response");
     const boltzXOnlyPublicKey = normalizeToXOnlyKey(
-      hex8.decode(pendingSwap.response.claimPublicKey),
+      hex8.decode(claimPublicKey),
       "boltz",
       pendingSwap.id
     );
@@ -3477,7 +3485,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
       receiverPubkey: hex8.encode(boltzXOnlyPublicKey),
       senderPubkey: hex8.encode(ourXOnlyPublicKey),
       serverPubkey: hex8.encode(serverXOnlyPublicKey),
-      timeoutBlockHeights: pendingSwap.response.timeoutBlockHeights
+      timeoutBlockHeights
     });
     if (!vhtlcScript.claimScript)
       throw new Error("Failed to create VHTLC script for submarine swap");
@@ -4479,7 +4487,8 @@ var ArkadeSwaps = class _ArkadeSwaps {
           lockupAddress,
           preimageHash,
           serverPublicKey,
-          tree
+          tree,
+          timeoutBlockHeights
         } = swap.claimDetails;
         reverseSwaps.push({
           id,
@@ -4495,18 +4504,18 @@ var ArkadeSwaps = class _ArkadeSwaps {
             onchainAmount: amount,
             lockupAddress,
             refundPublicKey: serverPublicKey,
-            timeoutBlockHeights: {
+            timeoutBlockHeights: timeoutBlockHeights ?? {
               refund: extractTimeLockFromLeafOutput(
-                tree.refundWithoutBoltzLeaf.output
+                tree.refundWithoutBoltzLeaf?.output ?? ""
               ),
               unilateralClaim: extractTimeLockFromLeafOutput(
-                tree.unilateralClaimLeaf.output
+                tree.unilateralClaimLeaf?.output ?? ""
               ),
               unilateralRefund: extractTimeLockFromLeafOutput(
-                tree.unilateralRefundLeaf.output
+                tree.unilateralRefundLeaf?.output ?? ""
               ),
               unilateralRefundWithoutReceiver: extractTimeLockFromLeafOutput(
-                tree.unilateralRefundWithoutBoltzLeaf.output
+                tree.unilateralRefundWithoutBoltzLeaf?.output ?? ""
               )
             }
           },
@@ -4515,7 +4524,13 @@ var ArkadeSwaps = class _ArkadeSwaps {
           preimage: ""
         });
       } else if (isRestoredSubmarineSwap(swap)) {
-        const { amount, lockupAddress, serverPublicKey, tree } = swap.refundDetails;
+        const {
+          amount,
+          lockupAddress,
+          serverPublicKey,
+          tree,
+          timeoutBlockHeights
+        } = swap.refundDetails;
         let preimage = "";
         if (!isSubmarineFinalStatus(status)) {
           try {
@@ -4546,29 +4561,31 @@ var ArkadeSwaps = class _ArkadeSwaps {
             address: lockupAddress,
             expectedAmount: amount,
             claimPublicKey: serverPublicKey,
-            timeoutBlockHeights: {
+            timeoutBlockHeights: timeoutBlockHeights ?? {
               refund: extractTimeLockFromLeafOutput(
-                tree.refundWithoutBoltzLeaf.output
+                tree.refundWithoutBoltzLeaf?.output ?? ""
               ),
               unilateralClaim: extractTimeLockFromLeafOutput(
-                tree.unilateralClaimLeaf.output
+                tree.unilateralClaimLeaf?.output ?? ""
               ),
               unilateralRefund: extractTimeLockFromLeafOutput(
-                tree.unilateralRefundLeaf.output
+                tree.unilateralRefundLeaf?.output ?? ""
               ),
               unilateralRefundWithoutReceiver: extractTimeLockFromLeafOutput(
-                tree.unilateralRefundWithoutBoltzLeaf.output
+                tree.unilateralRefundWithoutBoltzLeaf?.output ?? ""
               )
             }
           }
         });
       } else if (isRestoredChainSwap(swap)) {
+        const refundDetails = swap.refundDetails;
+        if (!refundDetails) continue;
         const {
           amount,
           lockupAddress,
           serverPublicKey,
           timeoutBlockHeight
-        } = swap.refundDetails;
+        } = refundDetails;
         chainSwaps.push({
           id,
           type: "chain",

package/dist/expo/index.cjs

@@ -185,7 +185,7 @@ var init_boltz_swap_provider = __esm({
       return data && typeof data === "object" && typeof data.id === "string" && typeof data.timeoutBlockHeight === "number";
     };
     isGetSwapStatusResponse = (data) => {
-      return data && typeof data === "object" && typeof data.status === "string" && (data.zeroConfRejected === void 0 || typeof data.zeroConfRejected === "boolean") && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && (data.transaction.eta === void 0 || typeof data.transaction.eta === "number") && (data.transaction.hex === void 0 || typeof data.transaction.hex === "string") && (data.transaction.preimage === void 0 || typeof data.transaction.preimage === "string"));
+      return data && typeof data === "object" && typeof data.status === "string" && (data.zeroConfRejected === void 0 || typeof data.zeroConfRejected === "boolean") && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && (data.transaction.confirmed === void 0 || typeof data.transaction.confirmed === "boolean") && (data.transaction.eta === void 0 || typeof data.transaction.eta === "number") && (data.transaction.hex === void 0 || typeof data.transaction.hex === "string") && (data.transaction.preimage === void 0 || typeof data.transaction.preimage === "string"));
     };
     isGetSubmarinePairsResponse = (data) => {
       return data && typeof data === "object" && data.ARK && typeof data.ARK === "object" && data.ARK.BTC && typeof data.ARK.BTC === "object" && typeof data.ARK.BTC.hash === "string" && typeof data.ARK.BTC.rate === "number" && data.ARK.BTC.limits && typeof data.ARK.BTC.limits === "object" && typeof data.ARK.BTC.limits.maximal === "number" && typeof data.ARK.BTC.limits.minimal === "number" && typeof data.ARK.BTC.limits.maximalZeroConf === "number" && data.ARK.BTC.fees && typeof data.ARK.BTC.fees === "object" && typeof data.ARK.BTC.fees.percentage === "number" && typeof data.ARK.BTC.fees.minerFees === "number";
@@ -194,13 +194,13 @@ var init_boltz_swap_provider = __esm({
       return data && typeof data === "object" && data.BTC && typeof data.BTC === "object" && data.BTC.ARK && typeof data.BTC.ARK === "object" && data.BTC.ARK.hash && typeof data.BTC.ARK.hash === "string" && typeof data.BTC.ARK.rate === "number" && data.BTC.ARK.limits && typeof data.BTC.ARK.limits === "object" && typeof data.BTC.ARK.limits.maximal === "number" && typeof data.BTC.ARK.limits.minimal === "number" && data.BTC.ARK.fees && typeof data.BTC.ARK.fees === "object" && typeof data.BTC.ARK.fees.percentage === "number" && typeof data.BTC.ARK.fees.minerFees === "object" && typeof data.BTC.ARK.fees.minerFees.claim === "number" && typeof data.BTC.ARK.fees.minerFees.lockup === "number";
     };
     isCreateSubmarineSwapResponse = (data) => {
-      return data && typeof data === "object" && typeof data.id === "string" && typeof data.address === "string" && typeof data.expectedAmount === "number" && typeof data.claimPublicKey === "string" && typeof data.acceptZeroConf === "boolean" && isTimeoutBlockHeights(data.timeoutBlockHeights);
+      return data && typeof data === "object" && typeof data.id === "string" && typeof data.expectedAmount === "number" && (data.address === void 0 || typeof data.address === "string") && (data.claimPublicKey === void 0 || typeof data.claimPublicKey === "string") && (data.acceptZeroConf === void 0 || typeof data.acceptZeroConf === "boolean") && (data.timeoutBlockHeight === void 0 || typeof data.timeoutBlockHeight === "number") && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights));
     };
     isGetSwapPreimageResponse = (data) => {
       return data && typeof data === "object" && typeof data.preimage === "string";
     };
     isCreateReverseSwapResponse = (data) => {
-      return data && typeof data === "object" && typeof data.id === "string" && typeof data.invoice === "string" && typeof data.onchainAmount === "number" && typeof data.lockupAddress === "string" && typeof data.refundPublicKey === "string" && isTimeoutBlockHeights(data.timeoutBlockHeights);
+      return data && typeof data === "object" && typeof data.id === "string" && typeof data.invoice === "string" && (data.onchainAmount === void 0 || typeof data.onchainAmount === "number") && (data.lockupAddress === void 0 || typeof data.lockupAddress === "string") && (data.refundPublicKey === void 0 || typeof data.refundPublicKey === "string") && (data.timeoutBlockHeight === void 0 || typeof data.timeoutBlockHeight === "number") && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights));
     };
     isRefundSubmarineSwapResponse = (data) => {
       return data && typeof data === "object" && typeof data.transaction === "string" && typeof data.checkpoint === "string";
@@ -239,19 +239,19 @@ var init_boltz_swap_provider = __esm({
       return data && typeof data === "object" && typeof data.version === "number" && typeof data.output === "string";
     };
     isTree = (data) => {
-      return data && typeof data === "object" && isLeaf(data.claimLeaf) && isLeaf(data.refundLeaf) && isLeaf(data.refundWithoutBoltzLeaf) && isLeaf(data.unilateralClaimLeaf) && isLeaf(data.unilateralRefundLeaf) && isLeaf(data.unilateralRefundWithoutBoltzLeaf);
+      return data && typeof data === "object" && isLeaf(data.claimLeaf) && isLeaf(data.refundLeaf) && (data.covenantClaimLeaf === void 0 || isLeaf(data.covenantClaimLeaf)) && (data.refundWithoutBoltzLeaf === void 0 || isLeaf(data.refundWithoutBoltzLeaf)) && (data.unilateralClaimLeaf === void 0 || isLeaf(data.unilateralClaimLeaf)) && (data.unilateralRefundLeaf === void 0 || isLeaf(data.unilateralRefundLeaf)) && (data.unilateralRefundWithoutBoltzLeaf === void 0 || isLeaf(data.unilateralRefundWithoutBoltzLeaf));
     };
     isDetails = (data) => {
-      return data && typeof data === "object" && isTree(data.tree) && (data.amount === void 0 || typeof data.amount === "number") && typeof data.keyIndex === "number" && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && typeof data.transaction.vout === "number") && typeof data.lockupAddress === "string" && typeof data.serverPublicKey === "string" && typeof data.timeoutBlockHeight === "number" && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights)) && (data.preimageHash === void 0 || typeof data.preimageHash === "string");
+      return data && typeof data === "object" && isTree(data.tree) && (data.amount === void 0 || typeof data.amount === "number") && typeof data.keyIndex === "number" && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && typeof data.transaction.vout === "number") && typeof data.lockupAddress === "string" && typeof data.serverPublicKey === "string" && (data.timeoutBlockHeight === void 0 || typeof data.timeoutBlockHeight === "number") && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights)) && (data.preimageHash === void 0 || typeof data.preimageHash === "string");
     };
     isRestoredChainSwap = (data) => {
-      return data && typeof data === "object" && typeof data.id === "string" && data.type === "chain" && typeof data.status === "string" && typeof data.createdAt === "number" && (data.from === "ARK" || data.from === "BTC") && (data.to === "ARK" || data.to === "BTC") && typeof data.preimageHash === "string" && data.refundDetails && typeof data.refundDetails === "object" && isTree(data.refundDetails.tree) && typeof data.refundDetails.amount === "number" && typeof data.refundDetails.keyIndex === "number" && (data.refundDetails.transaction === void 0 || data.refundDetails.transaction && typeof data.refundDetails.transaction === "object" && typeof data.refundDetails.transaction.id === "string" && typeof data.refundDetails.transaction.vout === "number") && typeof data.refundDetails.lockupAddress === "string" && typeof data.refundDetails.serverPublicKey === "string" && typeof data.refundDetails.timeoutBlockHeight === "number";
+      return data && typeof data === "object" && typeof data.id === "string" && data.type === "chain" && typeof data.status === "string" && typeof data.createdAt === "number" && (data.from === "ARK" || data.from === "BTC") && (data.to === "ARK" || data.to === "BTC") && (data.preimageHash === void 0 || typeof data.preimageHash === "string") && (data.invoice === void 0 || typeof data.invoice === "string") && (data.refundDetails === void 0 || isDetails(data.refundDetails)) && (data.claimDetails === void 0 || isDetails(data.claimDetails));
     };
     isRestoredSubmarineSwap = (data) => {
-      return data && typeof data === "object" && data.to === "BTC" && typeof data.id === "string" && data.from === "ARK" && data.type === "submarine" && typeof data.createdAt === "number" && typeof data.preimageHash === "string" && typeof data.status === "string" && isDetails(data.refundDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
+      return data && typeof data === "object" && data.to === "BTC" && typeof data.id === "string" && data.from === "ARK" && data.type === "submarine" && typeof data.createdAt === "number" && (data.preimageHash === void 0 || typeof data.preimageHash === "string") && typeof data.status === "string" && isDetails(data.refundDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
     };
     isRestoredReverseSwap = (data) => {
-      return data && typeof data === "object" && data.to === "ARK" && typeof data.id === "string" && data.from === "BTC" && data.type === "reverse" && typeof data.createdAt === "number" && typeof data.preimageHash === "string" && typeof data.status === "string" && isDetails(data.claimDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
+      return data && typeof data === "object" && data.to === "ARK" && typeof data.id === "string" && data.from === "BTC" && data.type === "reverse" && typeof data.createdAt === "number" && (data.preimageHash === void 0 || typeof data.preimageHash === "string") && typeof data.status === "string" && isDetails(data.claimDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
     };
     isCreateSwapsRestoreResponse = (data) => {
       return Array.isArray(data) && data.every(
@@ -3219,6 +3219,9 @@ var init_arkade_swaps = __esm({
       async claimVHTLC(pendingSwap) {
         if (!pendingSwap.preimage)
           throw new Error("Preimage is required to claim VHTLC");
+        const { refundPublicKey, lockupAddress, timeoutBlockHeights } = pendingSwap.response;
+        if (!refundPublicKey || !lockupAddress || !timeoutBlockHeights)
+          throw new Error("Incomplete reverse swap response");
         const preimage = import_base9.hex.decode(pendingSwap.preimage);
         const arkInfo = await this.arkProvider.getInfo();
         const address = await this.wallet.getAddress();
@@ -3228,7 +3231,7 @@ var init_arkade_swaps = __esm({
           pendingSwap.id
         );
         const senderXOnly = normalizeToXOnlyKey(
-          import_base9.hex.decode(pendingSwap.response.refundPublicKey),
+          import_base9.hex.decode(refundPublicKey),
           "boltz",
           pendingSwap.id
         );
@@ -3243,11 +3246,11 @@ var init_arkade_swaps = __esm({
           receiverPubkey: import_base9.hex.encode(receiverXOnly),
           senderPubkey: import_base9.hex.encode(senderXOnly),
           serverPubkey: import_base9.hex.encode(serverXOnly),
-          timeoutBlockHeights: pendingSwap.response.timeoutBlockHeights
+          timeoutBlockHeights
         });
         if (!vhtlcScript.claimScript)
           throw new Error("Failed to create VHTLC script for reverse swap");
-        if (vhtlcAddress !== pendingSwap.response.lockupAddress)
+        if (vhtlcAddress !== lockupAddress)
           throw new Error("Boltz is trying to scam us");
         const { vtxos } = await this.indexerProvider.getVtxos({
           scripts: [import_base9.hex.encode(vhtlcScript.pkScript)]
@@ -3388,6 +3391,8 @@ var init_arkade_swaps = __esm({
        */
       async sendLightningPayment(args) {
         const pendingSwap = await this.createSubmarineSwap(args);
+        if (!pendingSwap.response.address)
+          throw new Error("Missing address in submarine swap response");
         await this.savePendingSubmarineSwap(pendingSwap);
         const txid = await this.wallet.send({
           address: pendingSwap.response.address,
@@ -3471,8 +3476,11 @@ var init_arkade_swaps = __esm({
           "server",
           pendingSwap.id
         );
+        const { claimPublicKey, timeoutBlockHeights } = pendingSwap.response;
+        if (!claimPublicKey || !timeoutBlockHeights)
+          throw new Error("Incomplete submarine swap response");
         const boltzXOnlyPublicKey = normalizeToXOnlyKey(
-          import_base9.hex.decode(pendingSwap.response.claimPublicKey),
+          import_base9.hex.decode(claimPublicKey),
           "boltz",
           pendingSwap.id
         );
@@ -3482,7 +3490,7 @@ var init_arkade_swaps = __esm({
           receiverPubkey: import_base9.hex.encode(boltzXOnlyPublicKey),
           senderPubkey: import_base9.hex.encode(ourXOnlyPublicKey),
           serverPubkey: import_base9.hex.encode(serverXOnlyPublicKey),
-          timeoutBlockHeights: pendingSwap.response.timeoutBlockHeights
+          timeoutBlockHeights
         });
         if (!vhtlcScript.claimScript)
           throw new Error("Failed to create VHTLC script for submarine swap");
@@ -4484,7 +4492,8 @@ var init_arkade_swaps = __esm({
               lockupAddress,
               preimageHash,
               serverPublicKey,
-              tree
+              tree,
+              timeoutBlockHeights
             } = swap.claimDetails;
             reverseSwaps.push({
               id,
@@ -4500,18 +4509,18 @@ var init_arkade_swaps = __esm({
                 onchainAmount: amount,
                 lockupAddress,
                 refundPublicKey: serverPublicKey,
-                timeoutBlockHeights: {
+                timeoutBlockHeights: timeoutBlockHeights ?? {
                   refund: extractTimeLockFromLeafOutput(
-                    tree.refundWithoutBoltzLeaf.output
+                    tree.refundWithoutBoltzLeaf?.output ?? ""
                   ),
                   unilateralClaim: extractTimeLockFromLeafOutput(
-                    tree.unilateralClaimLeaf.output
+                    tree.unilateralClaimLeaf?.output ?? ""
                   ),
                   unilateralRefund: extractTimeLockFromLeafOutput(
-                    tree.unilateralRefundLeaf.output
+                    tree.unilateralRefundLeaf?.output ?? ""
                   ),
                   unilateralRefundWithoutReceiver: extractTimeLockFromLeafOutput(
-                    tree.unilateralRefundWithoutBoltzLeaf.output
+                    tree.unilateralRefundWithoutBoltzLeaf?.output ?? ""
                   )
                 }
               },
@@ -4520,7 +4529,13 @@ var init_arkade_swaps = __esm({
               preimage: ""
             });
           } else if (isRestoredSubmarineSwap(swap)) {
-            const { amount, lockupAddress, serverPublicKey, tree } = swap.refundDetails;
+            const {
+              amount,
+              lockupAddress,
+              serverPublicKey,
+              tree,
+              timeoutBlockHeights
+            } = swap.refundDetails;
             let preimage = "";
             if (!isSubmarineFinalStatus(status)) {
               try {
@@ -4551,29 +4566,31 @@ var init_arkade_swaps = __esm({
                 address: lockupAddress,
                 expectedAmount: amount,
                 claimPublicKey: serverPublicKey,
-                timeoutBlockHeights: {
+                timeoutBlockHeights: timeoutBlockHeights ?? {
                   refund: extractTimeLockFromLeafOutput(
-                    tree.refundWithoutBoltzLeaf.output
+                    tree.refundWithoutBoltzLeaf?.output ?? ""
                   ),
                   unilateralClaim: extractTimeLockFromLeafOutput(
-                    tree.unilateralClaimLeaf.output
+                    tree.unilateralClaimLeaf?.output ?? ""
                   ),
                   unilateralRefund: extractTimeLockFromLeafOutput(
-                    tree.unilateralRefundLeaf.output
+                    tree.unilateralRefundLeaf?.output ?? ""
                   ),
                   unilateralRefundWithoutReceiver: extractTimeLockFromLeafOutput(
-                    tree.unilateralRefundWithoutBoltzLeaf.output
+                    tree.unilateralRefundWithoutBoltzLeaf?.output ?? ""
                   )
                 }
               }
             });
           } else if (isRestoredChainSwap(swap)) {
+            const refundDetails = swap.refundDetails;
+            if (!refundDetails) continue;
             const {
               amount,
               lockupAddress,
               serverPublicKey,
               timeoutBlockHeight
-            } = swap.refundDetails;
+            } = refundDetails;
             chainSwaps.push({
               id,
               type: "chain",

package/dist/expo/index.d.cts

@@ -1,5 +1,5 @@
-import { I as IArkadeSwaps, A as ArkadeSwaps } from '../arkade-swaps-CwQbGdU9.cjs';
-import { A as ArkadeSwapsConfig, j as SwapRepository, m as BoltzSwapProvider, N as Network, k as SwapManagerClient, C as CreateLightningInvoiceRequest, e as CreateLightningInvoiceResponse, S as SendLightningPaymentRequest, f as SendLightningPaymentResponse, c as BoltzSubmarineSwap, b as BoltzReverseSwap, F as FeesResponse, a as BoltzChainSwap, h as ArkToBtcResponse, i as BtcToArkResponse, d as Chain, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, B as BoltzSwap } from '../types-x542EUL6.cjs';
+import { I as IArkadeSwaps, A as ArkadeSwaps } from '../arkade-swaps-DkM_5yuv.cjs';
+import { A as ArkadeSwapsConfig, j as SwapRepository, m as BoltzSwapProvider, N as Network, k as SwapManagerClient, C as CreateLightningInvoiceRequest, e as CreateLightningInvoiceResponse, S as SendLightningPaymentRequest, f as SendLightningPaymentResponse, c as BoltzSubmarineSwap, b as BoltzReverseSwap, F as FeesResponse, a as BoltzChainSwap, h as ArkToBtcResponse, i as BtcToArkResponse, d as Chain, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, B as BoltzSwap } from '../types-C-2sBQWJ.cjs';
 import { Identity, ArkProvider, IndexerProvider, IWallet, ArkInfo, ArkTxInput, VHTLC } from '@arkade-os/sdk';
 import { AsyncStorageTaskQueue, TaskProcessor } from '@arkade-os/sdk/worker/expo';
 import { TransactionOutput } from '@scure/btc-signer/psbt.js';

package/dist/expo/index.d.ts

@@ -1,5 +1,5 @@
-import { I as IArkadeSwaps, A as ArkadeSwaps } from '../arkade-swaps-BfHIKMq0.js';
-import { A as ArkadeSwapsConfig, j as SwapRepository, m as BoltzSwapProvider, N as Network, k as SwapManagerClient, C as CreateLightningInvoiceRequest, e as CreateLightningInvoiceResponse, S as SendLightningPaymentRequest, f as SendLightningPaymentResponse, c as BoltzSubmarineSwap, b as BoltzReverseSwap, F as FeesResponse, a as BoltzChainSwap, h as ArkToBtcResponse, i as BtcToArkResponse, d as Chain, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, B as BoltzSwap } from '../types-x542EUL6.js';
+import { I as IArkadeSwaps, A as ArkadeSwaps } from '../arkade-swaps-DRMB_apa.js';
+import { A as ArkadeSwapsConfig, j as SwapRepository, m as BoltzSwapProvider, N as Network, k as SwapManagerClient, C as CreateLightningInvoiceRequest, e as CreateLightningInvoiceResponse, S as SendLightningPaymentRequest, f as SendLightningPaymentResponse, c as BoltzSubmarineSwap, b as BoltzReverseSwap, F as FeesResponse, a as BoltzChainSwap, h as ArkToBtcResponse, i as BtcToArkResponse, d as Chain, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, B as BoltzSwap } from '../types-C-2sBQWJ.js';
 import { Identity, ArkProvider, IndexerProvider, IWallet, ArkInfo, ArkTxInput, VHTLC } from '@arkade-os/sdk';
 import { AsyncStorageTaskQueue, TaskProcessor } from '@arkade-os/sdk/worker/expo';
 import { TransactionOutput } from '@scure/btc-signer/psbt.js';

package/dist/expo/index.js

@@ -4,10 +4,10 @@ import {
   registerExpoSwapBackgroundTask,
   swapsPollProcessor,
   unregisterExpoSwapBackgroundTask
-} from "../chunk-2TWYSAFO.js";
+} from "../chunk-DPGNWPDB.js";
 import {
   ArkadeSwaps
-} from "../chunk-AIVWXKNG.js";
+} from "../chunk-Y6GPJDXY.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-5XMCGVMS.js");
+        const { registerExpoSwapBackgroundTask: registerExpoSwapBackgroundTask2 } = await import("../background-646NBLSK.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-5XMCGVMS.js");
+      const { unregisterExpoSwapBackgroundTask: unregisterExpoSwapBackgroundTask2 } = await import("../background-646NBLSK.js");
       await unregisterExpoSwapBackgroundTask2(this.taskName);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);

package/dist/index.cjs

@@ -314,7 +314,7 @@ var isGetReverseSwapTxIdResponse = (data) => {
   return data && typeof data === "object" && typeof data.id === "string" && typeof data.timeoutBlockHeight === "number";
 };
 var isGetSwapStatusResponse = (data) => {
-  return data && typeof data === "object" && typeof data.status === "string" && (data.zeroConfRejected === void 0 || typeof data.zeroConfRejected === "boolean") && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && (data.transaction.eta === void 0 || typeof data.transaction.eta === "number") && (data.transaction.hex === void 0 || typeof data.transaction.hex === "string") && (data.transaction.preimage === void 0 || typeof data.transaction.preimage === "string"));
+  return data && typeof data === "object" && typeof data.status === "string" && (data.zeroConfRejected === void 0 || typeof data.zeroConfRejected === "boolean") && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && (data.transaction.confirmed === void 0 || typeof data.transaction.confirmed === "boolean") && (data.transaction.eta === void 0 || typeof data.transaction.eta === "number") && (data.transaction.hex === void 0 || typeof data.transaction.hex === "string") && (data.transaction.preimage === void 0 || typeof data.transaction.preimage === "string"));
 };
 var isGetSubmarinePairsResponse = (data) => {
   return data && typeof data === "object" && data.ARK && typeof data.ARK === "object" && data.ARK.BTC && typeof data.ARK.BTC === "object" && typeof data.ARK.BTC.hash === "string" && typeof data.ARK.BTC.rate === "number" && data.ARK.BTC.limits && typeof data.ARK.BTC.limits === "object" && typeof data.ARK.BTC.limits.maximal === "number" && typeof data.ARK.BTC.limits.minimal === "number" && typeof data.ARK.BTC.limits.maximalZeroConf === "number" && data.ARK.BTC.fees && typeof data.ARK.BTC.fees === "object" && typeof data.ARK.BTC.fees.percentage === "number" && typeof data.ARK.BTC.fees.minerFees === "number";
@@ -323,13 +323,13 @@ var isGetReversePairsResponse = (data) => {
   return data && typeof data === "object" && data.BTC && typeof data.BTC === "object" && data.BTC.ARK && typeof data.BTC.ARK === "object" && data.BTC.ARK.hash && typeof data.BTC.ARK.hash === "string" && typeof data.BTC.ARK.rate === "number" && data.BTC.ARK.limits && typeof data.BTC.ARK.limits === "object" && typeof data.BTC.ARK.limits.maximal === "number" && typeof data.BTC.ARK.limits.minimal === "number" && data.BTC.ARK.fees && typeof data.BTC.ARK.fees === "object" && typeof data.BTC.ARK.fees.percentage === "number" && typeof data.BTC.ARK.fees.minerFees === "object" && typeof data.BTC.ARK.fees.minerFees.claim === "number" && typeof data.BTC.ARK.fees.minerFees.lockup === "number";
 };
 var isCreateSubmarineSwapResponse = (data) => {
-  return data && typeof data === "object" && typeof data.id === "string" && typeof data.address === "string" && typeof data.expectedAmount === "number" && typeof data.claimPublicKey === "string" && typeof data.acceptZeroConf === "boolean" && isTimeoutBlockHeights(data.timeoutBlockHeights);
+  return data && typeof data === "object" && typeof data.id === "string" && typeof data.expectedAmount === "number" && (data.address === void 0 || typeof data.address === "string") && (data.claimPublicKey === void 0 || typeof data.claimPublicKey === "string") && (data.acceptZeroConf === void 0 || typeof data.acceptZeroConf === "boolean") && (data.timeoutBlockHeight === void 0 || typeof data.timeoutBlockHeight === "number") && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights));
 };
 var isGetSwapPreimageResponse = (data) => {
   return data && typeof data === "object" && typeof data.preimage === "string";
 };
 var isCreateReverseSwapResponse = (data) => {
-  return data && typeof data === "object" && typeof data.id === "string" && typeof data.invoice === "string" && typeof data.onchainAmount === "number" && typeof data.lockupAddress === "string" && typeof data.refundPublicKey === "string" && isTimeoutBlockHeights(data.timeoutBlockHeights);
+  return data && typeof data === "object" && typeof data.id === "string" && typeof data.invoice === "string" && (data.onchainAmount === void 0 || typeof data.onchainAmount === "number") && (data.lockupAddress === void 0 || typeof data.lockupAddress === "string") && (data.refundPublicKey === void 0 || typeof data.refundPublicKey === "string") && (data.timeoutBlockHeight === void 0 || typeof data.timeoutBlockHeight === "number") && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights));
 };
 var isRefundSubmarineSwapResponse = (data) => {
   return data && typeof data === "object" && typeof data.transaction === "string" && typeof data.checkpoint === "string";
@@ -368,19 +368,19 @@ var isLeaf = (data) => {
   return data && typeof data === "object" && typeof data.version === "number" && typeof data.output === "string";
 };
 var isTree = (data) => {
-  return data && typeof data === "object" && isLeaf(data.claimLeaf) && isLeaf(data.refundLeaf) && isLeaf(data.refundWithoutBoltzLeaf) && isLeaf(data.unilateralClaimLeaf) && isLeaf(data.unilateralRefundLeaf) && isLeaf(data.unilateralRefundWithoutBoltzLeaf);
+  return data && typeof data === "object" && isLeaf(data.claimLeaf) && isLeaf(data.refundLeaf) && (data.covenantClaimLeaf === void 0 || isLeaf(data.covenantClaimLeaf)) && (data.refundWithoutBoltzLeaf === void 0 || isLeaf(data.refundWithoutBoltzLeaf)) && (data.unilateralClaimLeaf === void 0 || isLeaf(data.unilateralClaimLeaf)) && (data.unilateralRefundLeaf === void 0 || isLeaf(data.unilateralRefundLeaf)) && (data.unilateralRefundWithoutBoltzLeaf === void 0 || isLeaf(data.unilateralRefundWithoutBoltzLeaf));
 };
 var isDetails = (data) => {
-  return data && typeof data === "object" && isTree(data.tree) && (data.amount === void 0 || typeof data.amount === "number") && typeof data.keyIndex === "number" && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && typeof data.transaction.vout === "number") && typeof data.lockupAddress === "string" && typeof data.serverPublicKey === "string" && typeof data.timeoutBlockHeight === "number" && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights)) && (data.preimageHash === void 0 || typeof data.preimageHash === "string");
+  return data && typeof data === "object" && isTree(data.tree) && (data.amount === void 0 || typeof data.amount === "number") && typeof data.keyIndex === "number" && (data.transaction === void 0 || data.transaction && typeof data.transaction === "object" && typeof data.transaction.id === "string" && typeof data.transaction.vout === "number") && typeof data.lockupAddress === "string" && typeof data.serverPublicKey === "string" && (data.timeoutBlockHeight === void 0 || typeof data.timeoutBlockHeight === "number") && (data.timeoutBlockHeights === void 0 || isTimeoutBlockHeights(data.timeoutBlockHeights)) && (data.preimageHash === void 0 || typeof data.preimageHash === "string");
 };
 var isRestoredChainSwap = (data) => {
-  return data && typeof data === "object" && typeof data.id === "string" && data.type === "chain" && typeof data.status === "string" && typeof data.createdAt === "number" && (data.from === "ARK" || data.from === "BTC") && (data.to === "ARK" || data.to === "BTC") && typeof data.preimageHash === "string" && data.refundDetails && typeof data.refundDetails === "object" && isTree(data.refundDetails.tree) && typeof data.refundDetails.amount === "number" && typeof data.refundDetails.keyIndex === "number" && (data.refundDetails.transaction === void 0 || data.refundDetails.transaction && typeof data.refundDetails.transaction === "object" && typeof data.refundDetails.transaction.id === "string" && typeof data.refundDetails.transaction.vout === "number") && typeof data.refundDetails.lockupAddress === "string" && typeof data.refundDetails.serverPublicKey === "string" && typeof data.refundDetails.timeoutBlockHeight === "number";
+  return data && typeof data === "object" && typeof data.id === "string" && data.type === "chain" && typeof data.status === "string" && typeof data.createdAt === "number" && (data.from === "ARK" || data.from === "BTC") && (data.to === "ARK" || data.to === "BTC") && (data.preimageHash === void 0 || typeof data.preimageHash === "string") && (data.invoice === void 0 || typeof data.invoice === "string") && (data.refundDetails === void 0 || isDetails(data.refundDetails)) && (data.claimDetails === void 0 || isDetails(data.claimDetails));
 };
 var isRestoredSubmarineSwap = (data) => {
-  return data && typeof data === "object" && data.to === "BTC" && typeof data.id === "string" && data.from === "ARK" && data.type === "submarine" && typeof data.createdAt === "number" && typeof data.preimageHash === "string" && typeof data.status === "string" && isDetails(data.refundDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
+  return data && typeof data === "object" && data.to === "BTC" && typeof data.id === "string" && data.from === "ARK" && data.type === "submarine" && typeof data.createdAt === "number" && (data.preimageHash === void 0 || typeof data.preimageHash === "string") && typeof data.status === "string" && isDetails(data.refundDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
 };
 var isRestoredReverseSwap = (data) => {
-  return data && typeof data === "object" && data.to === "ARK" && typeof data.id === "string" && data.from === "BTC" && data.type === "reverse" && typeof data.createdAt === "number" && typeof data.preimageHash === "string" && typeof data.status === "string" && isDetails(data.claimDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
+  return data && typeof data === "object" && data.to === "ARK" && typeof data.id === "string" && data.from === "BTC" && data.type === "reverse" && typeof data.createdAt === "number" && (data.preimageHash === void 0 || typeof data.preimageHash === "string") && typeof data.status === "string" && isDetails(data.claimDetails) && (data.invoice === void 0 || typeof data.invoice === "string");
 };
 var isCreateSwapsRestoreResponse = (data) => {
   return Array.isArray(data) && data.every(
@@ -3273,6 +3273,9 @@ var ArkadeSwaps = class _ArkadeSwaps {
   async claimVHTLC(pendingSwap) {
     if (!pendingSwap.preimage)
       throw new Error("Preimage is required to claim VHTLC");
+    const { refundPublicKey, lockupAddress, timeoutBlockHeights } = pendingSwap.response;
+    if (!refundPublicKey || !lockupAddress || !timeoutBlockHeights)
+      throw new Error("Incomplete reverse swap response");
     const preimage = import_base9.hex.decode(pendingSwap.preimage);
     const arkInfo = await this.arkProvider.getInfo();
     const address = await this.wallet.getAddress();
@@ -3282,7 +3285,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
       pendingSwap.id
     );
     const senderXOnly = normalizeToXOnlyKey(
-      import_base9.hex.decode(pendingSwap.response.refundPublicKey),
+      import_base9.hex.decode(refundPublicKey),
       "boltz",
       pendingSwap.id
     );
@@ -3297,11 +3300,11 @@ var ArkadeSwaps = class _ArkadeSwaps {
       receiverPubkey: import_base9.hex.encode(receiverXOnly),
       senderPubkey: import_base9.hex.encode(senderXOnly),
       serverPubkey: import_base9.hex.encode(serverXOnly),
-      timeoutBlockHeights: pendingSwap.response.timeoutBlockHeights
+      timeoutBlockHeights
     });
     if (!vhtlcScript.claimScript)
       throw new Error("Failed to create VHTLC script for reverse swap");
-    if (vhtlcAddress !== pendingSwap.response.lockupAddress)
+    if (vhtlcAddress !== lockupAddress)
       throw new Error("Boltz is trying to scam us");
     const { vtxos } = await this.indexerProvider.getVtxos({
       scripts: [import_base9.hex.encode(vhtlcScript.pkScript)]
@@ -3442,6 +3445,8 @@ var ArkadeSwaps = class _ArkadeSwaps {
    */
   async sendLightningPayment(args) {
     const pendingSwap = await this.createSubmarineSwap(args);
+    if (!pendingSwap.response.address)
+      throw new Error("Missing address in submarine swap response");
     await this.savePendingSubmarineSwap(pendingSwap);
     const txid = await this.wallet.send({
       address: pendingSwap.response.address,
@@ -3525,8 +3530,11 @@ var ArkadeSwaps = class _ArkadeSwaps {
       "server",
       pendingSwap.id
     );
+    const { claimPublicKey, timeoutBlockHeights } = pendingSwap.response;
+    if (!claimPublicKey || !timeoutBlockHeights)
+      throw new Error("Incomplete submarine swap response");
     const boltzXOnlyPublicKey = normalizeToXOnlyKey(
-      import_base9.hex.decode(pendingSwap.response.claimPublicKey),
+      import_base9.hex.decode(claimPublicKey),
       "boltz",
       pendingSwap.id
     );
@@ -3536,7 +3544,7 @@ var ArkadeSwaps = class _ArkadeSwaps {
       receiverPubkey: import_base9.hex.encode(boltzXOnlyPublicKey),
       senderPubkey: import_base9.hex.encode(ourXOnlyPublicKey),
       serverPubkey: import_base9.hex.encode(serverXOnlyPublicKey),
-      timeoutBlockHeights: pendingSwap.response.timeoutBlockHeights
+      timeoutBlockHeights
     });
     if (!vhtlcScript.claimScript)
       throw new Error("Failed to create VHTLC script for submarine swap");
@@ -4538,7 +4546,8 @@ var ArkadeSwaps = class _ArkadeSwaps {
           lockupAddress,
           preimageHash,
           serverPublicKey,
-          tree
+          tree,
+          timeoutBlockHeights
         } = swap.claimDetails;
         reverseSwaps.push({
           id,
@@ -4554,18 +4563,18 @@ var ArkadeSwaps = class _ArkadeSwaps {
             onchainAmount: amount,
             lockupAddress,
             refundPublicKey: serverPublicKey,
-            timeoutBlockHeights: {
+            timeoutBlockHeights: timeoutBlockHeights ?? {
               refund: extractTimeLockFromLeafOutput(
-                tree.refundWithoutBoltzLeaf.output
+                tree.refundWithoutBoltzLeaf?.output ?? ""
               ),
               unilateralClaim: extractTimeLockFromLeafOutput(
-                tree.unilateralClaimLeaf.output
+                tree.unilateralClaimLeaf?.output ?? ""
               ),
               unilateralRefund: extractTimeLockFromLeafOutput(
-                tree.unilateralRefundLeaf.output
+                tree.unilateralRefundLeaf?.output ?? ""
               ),
               unilateralRefundWithoutReceiver: extractTimeLockFromLeafOutput(
-                tree.unilateralRefundWithoutBoltzLeaf.output
+                tree.unilateralRefundWithoutBoltzLeaf?.output ?? ""
               )
             }
           },
@@ -4574,7 +4583,13 @@ var ArkadeSwaps = class _ArkadeSwaps {
           preimage: ""
         });
       } else if (isRestoredSubmarineSwap(swap)) {
-        const { amount, lockupAddress, serverPublicKey, tree } = swap.refundDetails;
+        const {
+          amount,
+          lockupAddress,
+          serverPublicKey,
+          tree,
+          timeoutBlockHeights
+        } = swap.refundDetails;
         let preimage = "";
         if (!isSubmarineFinalStatus(status)) {
           try {
@@ -4605,29 +4620,31 @@ var ArkadeSwaps = class _ArkadeSwaps {
             address: lockupAddress,
             expectedAmount: amount,
             claimPublicKey: serverPublicKey,
-            timeoutBlockHeights: {
+            timeoutBlockHeights: timeoutBlockHeights ?? {
               refund: extractTimeLockFromLeafOutput(
-                tree.refundWithoutBoltzLeaf.output
+                tree.refundWithoutBoltzLeaf?.output ?? ""
               ),
               unilateralClaim: extractTimeLockFromLeafOutput(
-                tree.unilateralClaimLeaf.output
+                tree.unilateralClaimLeaf?.output ?? ""
               ),
               unilateralRefund: extractTimeLockFromLeafOutput(
-                tree.unilateralRefundLeaf.output
+                tree.unilateralRefundLeaf?.output ?? ""
               ),
               unilateralRefundWithoutReceiver: extractTimeLockFromLeafOutput(
-                tree.unilateralRefundWithoutBoltzLeaf.output
+                tree.unilateralRefundWithoutBoltzLeaf?.output ?? ""
               )
             }
           }
         });
       } else if (isRestoredChainSwap(swap)) {
+        const refundDetails = swap.refundDetails;
+        if (!refundDetails) continue;
         const {
           amount,
           lockupAddress,
           serverPublicKey,
           timeoutBlockHeight
-        } = swap.refundDetails;
+        } = refundDetails;
         chainSwaps.push({
           id,
           type: "chain",

package/dist/index.d.cts

@@ -1,7 +1,7 @@
-import { I as IArkadeSwaps } from './arkade-swaps-CwQbGdU9.cjs';
-export { A as ArkadeSwaps } from './arkade-swaps-CwQbGdU9.cjs';
-import { B as BoltzSwap, D as DecodedInvoice, a as BoltzChainSwap, b as BoltzReverseSwap, c as BoltzSubmarineSwap, A as ArkadeSwapsConfig, N as Network, C as CreateLightningInvoiceRequest, S as SendLightningPaymentRequest, F as FeesResponse, d as Chain, e as CreateLightningInvoiceResponse, f as SendLightningPaymentResponse, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, h as ArkToBtcResponse, i as BtcToArkResponse, j as SwapRepository, k as SwapManagerClient, l as GetSwapsFilter } from './types-x542EUL6.cjs';
-export { X as ArkadeSwapsCreateConfig, m as BoltzSwapProvider, n as BoltzSwapStatus, W as IncomingPaymentSubscription, V as SwapManager, $ as SwapManagerCallbacks, Z as SwapManagerConfig, _ as SwapManagerEvents, Y as Vtxo, o as isChainClaimableStatus, p as isChainFailedStatus, q as isChainFinalStatus, r as isChainPendingStatus, s as isChainRefundableStatus, t as isChainSignableStatus, u as isChainSuccessStatus, v as isChainSwapClaimable, w as isChainSwapRefundable, x as isPendingChainSwap, y as isPendingReverseSwap, z as isPendingSubmarineSwap, E as isReverseClaimableStatus, H as isReverseFailedStatus, I as isReverseFinalStatus, J as isReversePendingStatus, K as isReverseSuccessStatus, M as isReverseSwapClaimable, O as isSubmarineFailedStatus, P as isSubmarineFinalStatus, Q as isSubmarinePendingStatus, T as isSubmarineRefundableStatus, R as isSubmarineSuccessStatus, U as isSubmarineSwapRefundable } from './types-x542EUL6.cjs';
+import { I as IArkadeSwaps } from './arkade-swaps-DkM_5yuv.cjs';
+export { A as ArkadeSwaps } from './arkade-swaps-DkM_5yuv.cjs';
+import { B as BoltzSwap, D as DecodedInvoice, a as BoltzChainSwap, b as BoltzReverseSwap, c as BoltzSubmarineSwap, A as ArkadeSwapsConfig, N as Network, C as CreateLightningInvoiceRequest, S as SendLightningPaymentRequest, F as FeesResponse, d as Chain, e as CreateLightningInvoiceResponse, f as SendLightningPaymentResponse, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, h as ArkToBtcResponse, i as BtcToArkResponse, j as SwapRepository, k as SwapManagerClient, l as GetSwapsFilter } from './types-C-2sBQWJ.cjs';
+export { X as ArkadeSwapsCreateConfig, m as BoltzSwapProvider, n as BoltzSwapStatus, W as IncomingPaymentSubscription, V as SwapManager, $ as SwapManagerCallbacks, Z as SwapManagerConfig, _ as SwapManagerEvents, Y as Vtxo, o as isChainClaimableStatus, p as isChainFailedStatus, q as isChainFinalStatus, r as isChainPendingStatus, s as isChainRefundableStatus, t as isChainSignableStatus, u as isChainSuccessStatus, v as isChainSwapClaimable, w as isChainSwapRefundable, x as isPendingChainSwap, y as isPendingReverseSwap, z as isPendingSubmarineSwap, E as isReverseClaimableStatus, H as isReverseFailedStatus, I as isReverseFinalStatus, J as isReversePendingStatus, K as isReverseSuccessStatus, M as isReverseSwapClaimable, O as isSubmarineFailedStatus, P as isSubmarineFinalStatus, Q as isSubmarinePendingStatus, T as isSubmarineRefundableStatus, R as isSubmarineSuccessStatus, U as isSubmarineSwapRefundable } from './types-C-2sBQWJ.cjs';
 import { Transaction } from '@scure/btc-signer';
 import { MessageHandler, RequestEnvelope, ArkInfo, ResponseEnvelope, IWallet, IReadonlyWallet, VHTLC, Identity, ArkTxInput } from '@arkade-os/sdk';
 import { TransactionOutput } from '@scure/btc-signer/psbt.js';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-import { I as IArkadeSwaps } from './arkade-swaps-BfHIKMq0.js';
-export { A as ArkadeSwaps } from './arkade-swaps-BfHIKMq0.js';
-import { B as BoltzSwap, D as DecodedInvoice, a as BoltzChainSwap, b as BoltzReverseSwap, c as BoltzSubmarineSwap, A as ArkadeSwapsConfig, N as Network, C as CreateLightningInvoiceRequest, S as SendLightningPaymentRequest, F as FeesResponse, d as Chain, e as CreateLightningInvoiceResponse, f as SendLightningPaymentResponse, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, h as ArkToBtcResponse, i as BtcToArkResponse, j as SwapRepository, k as SwapManagerClient, l as GetSwapsFilter } from './types-x542EUL6.js';
-export { X as ArkadeSwapsCreateConfig, m as BoltzSwapProvider, n as BoltzSwapStatus, W as IncomingPaymentSubscription, V as SwapManager, $ as SwapManagerCallbacks, Z as SwapManagerConfig, _ as SwapManagerEvents, Y as Vtxo, o as isChainClaimableStatus, p as isChainFailedStatus, q as isChainFinalStatus, r as isChainPendingStatus, s as isChainRefundableStatus, t as isChainSignableStatus, u as isChainSuccessStatus, v as isChainSwapClaimable, w as isChainSwapRefundable, x as isPendingChainSwap, y as isPendingReverseSwap, z as isPendingSubmarineSwap, E as isReverseClaimableStatus, H as isReverseFailedStatus, I as isReverseFinalStatus, J as isReversePendingStatus, K as isReverseSuccessStatus, M as isReverseSwapClaimable, O as isSubmarineFailedStatus, P as isSubmarineFinalStatus, Q as isSubmarinePendingStatus, T as isSubmarineRefundableStatus, R as isSubmarineSuccessStatus, U as isSubmarineSwapRefundable } from './types-x542EUL6.js';
+import { I as IArkadeSwaps } from './arkade-swaps-DRMB_apa.js';
+export { A as ArkadeSwaps } from './arkade-swaps-DRMB_apa.js';
+import { B as BoltzSwap, D as DecodedInvoice, a as BoltzChainSwap, b as BoltzReverseSwap, c as BoltzSubmarineSwap, A as ArkadeSwapsConfig, N as Network, C as CreateLightningInvoiceRequest, S as SendLightningPaymentRequest, F as FeesResponse, d as Chain, e as CreateLightningInvoiceResponse, f as SendLightningPaymentResponse, g as ChainFeesResponse, L as LimitsResponse, G as GetSwapStatusResponse, h as ArkToBtcResponse, i as BtcToArkResponse, j as SwapRepository, k as SwapManagerClient, l as GetSwapsFilter } from './types-C-2sBQWJ.js';
+export { X as ArkadeSwapsCreateConfig, m as BoltzSwapProvider, n as BoltzSwapStatus, W as IncomingPaymentSubscription, V as SwapManager, $ as SwapManagerCallbacks, Z as SwapManagerConfig, _ as SwapManagerEvents, Y as Vtxo, o as isChainClaimableStatus, p as isChainFailedStatus, q as isChainFinalStatus, r as isChainPendingStatus, s as isChainRefundableStatus, t as isChainSignableStatus, u as isChainSuccessStatus, v as isChainSwapClaimable, w as isChainSwapRefundable, x as isPendingChainSwap, y as isPendingReverseSwap, z as isPendingSubmarineSwap, E as isReverseClaimableStatus, H as isReverseFailedStatus, I as isReverseFinalStatus, J as isReversePendingStatus, K as isReverseSuccessStatus, M as isReverseSwapClaimable, O as isSubmarineFailedStatus, P as isSubmarineFinalStatus, Q as isSubmarinePendingStatus, T as isSubmarineRefundableStatus, R as isSubmarineSuccessStatus, U as isSubmarineSwapRefundable } from './types-C-2sBQWJ.js';
 import { Transaction } from '@scure/btc-signer';
 import { MessageHandler, RequestEnvelope, ArkInfo, ResponseEnvelope, IWallet, IReadonlyWallet, VHTLC, Identity, ArkTxInput } from '@arkade-os/sdk';
 import { TransactionOutput } from '@scure/btc-signer/psbt.js';

package/dist/index.js

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

package/dist/repositories/realm/index.d.cts

@@ -1,4 +1,4 @@
-import { j as SwapRepository, B as BoltzSwap, l as GetSwapsFilter } from '../../types-x542EUL6.cjs';
+import { j as SwapRepository, B as BoltzSwap, l as GetSwapsFilter } from '../../types-C-2sBQWJ.cjs';
 import '@arkade-os/sdk';
 
 /**

package/dist/repositories/realm/index.d.ts

@@ -1,4 +1,4 @@
-import { j as SwapRepository, B as BoltzSwap, l as GetSwapsFilter } from '../../types-x542EUL6.js';
+import { j as SwapRepository, B as BoltzSwap, l as GetSwapsFilter } from '../../types-C-2sBQWJ.js';
 import '@arkade-os/sdk';
 
 /**

package/dist/repositories/sqlite/index.d.cts

@@ -1,5 +1,5 @@
 import { SQLExecutor } from '@arkade-os/sdk/repositories/sqlite';
-import { j as SwapRepository, B as BoltzSwap, l as GetSwapsFilter } from '../../types-x542EUL6.cjs';
+import { j as SwapRepository, B as BoltzSwap, l as GetSwapsFilter } from '../../types-C-2sBQWJ.cjs';
 import '@arkade-os/sdk';
 
 /**

package/dist/repositories/sqlite/index.d.ts

@@ -1,5 +1,5 @@
 import { SQLExecutor } from '@arkade-os/sdk/repositories/sqlite';
-import { j as SwapRepository, B as BoltzSwap, l as GetSwapsFilter } from '../../types-x542EUL6.js';
+import { j as SwapRepository, B as BoltzSwap, l as GetSwapsFilter } from '../../types-C-2sBQWJ.js';
 import '@arkade-os/sdk';
 
 /**

package/dist/{types-x542EUL6.d.cts → types-C-2sBQWJ.d.cts}

@@ -81,6 +81,7 @@ type GetSwapStatusResponse = {
     transaction?: {
         id: string;
         hex?: string;
+        confirmed?: boolean;
         eta?: number;
         preimage?: string;
     };
@@ -96,16 +97,18 @@ type CreateSubmarineSwapRequest = {
 type CreateSubmarineSwapResponse = {
     /** Unique swap ID. */
     id: string;
-    /** ARK lockup address to send funds to. */
-    address: string;
     /** Amount in satoshis to send. */
     expectedAmount: number;
+    /** ARK lockup address to send funds to. */
+    address?: string;
     /** Boltz's public key for the claim path. */
-    claimPublicKey: string;
+    claimPublicKey?: string;
     /** Whether zero-conf transactions are accepted. */
-    acceptZeroConf: boolean;
+    acceptZeroConf?: boolean;
+    /** Block height for the onchain HTLC timeout. */
+    timeoutBlockHeight?: number;
     /** Block heights for various timeout/refund scenarios. */
-    timeoutBlockHeights: TimeoutBlockHeights;
+    timeoutBlockHeights?: TimeoutBlockHeights;
 };
 type GetSwapPreimageResponse = {
     preimage: string;
@@ -128,13 +131,15 @@ type CreateReverseSwapResponse = {
     /** BOLT11-encoded Lightning invoice to be paid. */
     invoice: string;
     /** On-chain amount in satoshis (after Boltz fees). */
-    onchainAmount: number;
+    onchainAmount?: number;
     /** ARK lockup address where Boltz will lock funds. */
-    lockupAddress: string;
+    lockupAddress?: string;
     /** Boltz's public key for the refund path. */
-    refundPublicKey: string;
+    refundPublicKey?: string;
+    /** Block height for the onchain HTLC timeout. */
+    timeoutBlockHeight?: number;
     /** Block heights for various timeout/refund scenarios. */
-    timeoutBlockHeights: TimeoutBlockHeights;
+    timeoutBlockHeights?: TimeoutBlockHeights;
 };
 type SwapTree = {
     claimLeaf: {
@@ -223,10 +228,11 @@ type Leaf = {
 type Tree = {
     claimLeaf: Leaf;
     refundLeaf: Leaf;
-    refundWithoutBoltzLeaf: Leaf;
-    unilateralClaimLeaf: Leaf;
-    unilateralRefundLeaf: Leaf;
-    unilateralRefundWithoutBoltzLeaf: Leaf;
+    covenantClaimLeaf?: Leaf;
+    refundWithoutBoltzLeaf?: Leaf;
+    unilateralClaimLeaf?: Leaf;
+    unilateralRefundLeaf?: Leaf;
+    unilateralRefundWithoutBoltzLeaf?: Leaf;
 };
 type Details = {
     tree: Tree;
@@ -238,7 +244,7 @@ type Details = {
     };
     lockupAddress: string;
     serverPublicKey: string;
-    timeoutBlockHeight: number;
+    timeoutBlockHeight?: number;
     timeoutBlockHeights?: TimeoutBlockHeights;
     preimageHash?: string;
 };
@@ -249,19 +255,10 @@ type RestoredChainSwap = {
     createdAt: number;
     from: "ARK" | "BTC";
     to: "ARK" | "BTC";
-    preimageHash: string;
-    refundDetails: {
-        amount: number;
-        keyIndex: number;
-        lockupAddress: string;
-        serverPublicKey: string;
-        timeoutBlockHeight: number;
-        transaction?: {
-            id: string;
-            vout: number;
-        };
-        tree: Tree;
-    };
+    preimageHash?: string;
+    invoice?: string;
+    refundDetails?: Details;
+    claimDetails?: Details;
 };
 type RestoredSubmarineSwap = {
     to: "BTC";
@@ -269,7 +266,7 @@ type RestoredSubmarineSwap = {
     from: "ARK";
     type: "submarine";
     createdAt: number;
-    preimageHash: string;
+    preimageHash?: string;
     status: BoltzSwapStatus;
     refundDetails: Details;
     invoice?: string;
@@ -280,7 +277,7 @@ type RestoredReverseSwap = {
     from: "BTC";
     type: "reverse";
     createdAt: number;
-    preimageHash: string;
+    preimageHash?: string;
     status: BoltzSwapStatus;
     claimDetails: Details;
     invoice?: string;

package/dist/{types-x542EUL6.d.ts → types-C-2sBQWJ.d.ts}

@@ -81,6 +81,7 @@ type GetSwapStatusResponse = {
     transaction?: {
         id: string;
         hex?: string;
+        confirmed?: boolean;
         eta?: number;
         preimage?: string;
     };
@@ -96,16 +97,18 @@ type CreateSubmarineSwapRequest = {
 type CreateSubmarineSwapResponse = {
     /** Unique swap ID. */
     id: string;
-    /** ARK lockup address to send funds to. */
-    address: string;
     /** Amount in satoshis to send. */
     expectedAmount: number;
+    /** ARK lockup address to send funds to. */
+    address?: string;
     /** Boltz's public key for the claim path. */
-    claimPublicKey: string;
+    claimPublicKey?: string;
     /** Whether zero-conf transactions are accepted. */
-    acceptZeroConf: boolean;
+    acceptZeroConf?: boolean;
+    /** Block height for the onchain HTLC timeout. */
+    timeoutBlockHeight?: number;
     /** Block heights for various timeout/refund scenarios. */
-    timeoutBlockHeights: TimeoutBlockHeights;
+    timeoutBlockHeights?: TimeoutBlockHeights;
 };
 type GetSwapPreimageResponse = {
     preimage: string;
@@ -128,13 +131,15 @@ type CreateReverseSwapResponse = {
     /** BOLT11-encoded Lightning invoice to be paid. */
     invoice: string;
     /** On-chain amount in satoshis (after Boltz fees). */
-    onchainAmount: number;
+    onchainAmount?: number;
     /** ARK lockup address where Boltz will lock funds. */
-    lockupAddress: string;
+    lockupAddress?: string;
     /** Boltz's public key for the refund path. */
-    refundPublicKey: string;
+    refundPublicKey?: string;
+    /** Block height for the onchain HTLC timeout. */
+    timeoutBlockHeight?: number;
     /** Block heights for various timeout/refund scenarios. */
-    timeoutBlockHeights: TimeoutBlockHeights;
+    timeoutBlockHeights?: TimeoutBlockHeights;
 };
 type SwapTree = {
     claimLeaf: {
@@ -223,10 +228,11 @@ type Leaf = {
 type Tree = {
     claimLeaf: Leaf;
     refundLeaf: Leaf;
-    refundWithoutBoltzLeaf: Leaf;
-    unilateralClaimLeaf: Leaf;
-    unilateralRefundLeaf: Leaf;
-    unilateralRefundWithoutBoltzLeaf: Leaf;
+    covenantClaimLeaf?: Leaf;
+    refundWithoutBoltzLeaf?: Leaf;
+    unilateralClaimLeaf?: Leaf;
+    unilateralRefundLeaf?: Leaf;
+    unilateralRefundWithoutBoltzLeaf?: Leaf;
 };
 type Details = {
     tree: Tree;
@@ -238,7 +244,7 @@ type Details = {
     };
     lockupAddress: string;
     serverPublicKey: string;
-    timeoutBlockHeight: number;
+    timeoutBlockHeight?: number;
     timeoutBlockHeights?: TimeoutBlockHeights;
     preimageHash?: string;
 };
@@ -249,19 +255,10 @@ type RestoredChainSwap = {
     createdAt: number;
     from: "ARK" | "BTC";
     to: "ARK" | "BTC";
-    preimageHash: string;
-    refundDetails: {
-        amount: number;
-        keyIndex: number;
-        lockupAddress: string;
-        serverPublicKey: string;
-        timeoutBlockHeight: number;
-        transaction?: {
-            id: string;
-            vout: number;
-        };
-        tree: Tree;
-    };
+    preimageHash?: string;
+    invoice?: string;
+    refundDetails?: Details;
+    claimDetails?: Details;
 };
 type RestoredSubmarineSwap = {
     to: "BTC";
@@ -269,7 +266,7 @@ type RestoredSubmarineSwap = {
     from: "ARK";
     type: "submarine";
     createdAt: number;
-    preimageHash: string;
+    preimageHash?: string;
     status: BoltzSwapStatus;
     refundDetails: Details;
     invoice?: string;
@@ -280,7 +277,7 @@ type RestoredReverseSwap = {
     from: "BTC";
     type: "reverse";
     createdAt: number;
-    preimageHash: string;
+    preimageHash?: string;
     status: BoltzSwapStatus;
     claimDetails: Details;
     invoice?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkade-os/boltz-swap",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "type": "module",
   "description": "A production-ready TypeScript package that brings Boltz submarine-swaps to Arkade.",
   "main": "./dist/index.js",