@arkade-os/boltz-swap 0.3.13 → 0.3.15

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-NStISj0-.cjs';
-export { A as ArkadeSwaps } from './arkade-swaps-NStISj0-.cjs';
-import { P as PendingSwap, D as DecodedInvoice, a as PendingChainSwap, b as PendingReverseSwap, c as PendingSubmarineSwap, 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, B as BtcToArkResponse, i as SwapRepository, j as SwapManagerClient, k as GetSwapsFilter } from './types-NXkA-o9j.cjs';
-export { X as ArkadeSwapsCreateConfig, l as BoltzSwapProvider, m as BoltzSwapStatus, W as IncomingPaymentSubscription, V as SwapManager, $ as SwapManagerCallbacks, Z as SwapManagerConfig, _ as SwapManagerEvents, Y as Vtxo, n as isChainClaimableStatus, o as isChainFailedStatus, p as isChainFinalStatus, q as isChainPendingStatus, r as isChainRefundableStatus, s as isChainSignableStatus, t as isChainSuccessStatus, u as isChainSwapClaimable, v as isChainSwapRefundable, w as isPendingChainSwap, x as isPendingReverseSwap, y as isPendingSubmarineSwap, z as isReverseClaimableStatus, E as isReverseFailedStatus, H as isReverseFinalStatus, I as isReversePendingStatus, J as isReverseSuccessStatus, K as isReverseSwapClaimable, M as isSubmarineFailedStatus, O as isSubmarineFinalStatus, Q as isSubmarinePendingStatus, T as isSubmarineRefundableStatus, R as isSubmarineSuccessStatus, U as isSubmarineSwapRefundable } from './types-NXkA-o9j.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';
@@ -15,7 +15,7 @@ interface ErrorOptions {
     /** Whether the swap's funds can be refunded. */
     isRefundable?: boolean;
     /** The associated pending swap, if available. */
-    pendingSwap?: PendingSwap;
+    pendingSwap?: BoltzSwap;
 }
 /**
  * Base error class for all swap-related errors.
@@ -27,7 +27,7 @@ declare class SwapError extends Error {
     /** Whether the swap can be refunded (default: false). */
     isRefundable: boolean;
     /** The pending swap associated with this error, if available. */
-    pendingSwap?: PendingSwap;
+    pendingSwap?: BoltzSwap;
     constructor(options?: ErrorOptions);
 }
 /** Thrown when a Lightning invoice expires before being paid. The swap may be refundable. */
@@ -99,35 +99,35 @@ declare const verifySignatures: (tx: Transaction, inputIndex: number, requiredSi
  * Generic type for swap save functions
  */
 type SwapSaver = {
-    saveChainSwap?: (swap: PendingChainSwap) => Promise<void>;
-    saveReverseSwap?: (swap: PendingReverseSwap) => Promise<void>;
-    saveSubmarineSwap?: (swap: PendingSubmarineSwap) => Promise<void>;
+    saveChainSwap?: (swap: BoltzChainSwap) => Promise<void>;
+    saveReverseSwap?: (swap: BoltzReverseSwap) => Promise<void>;
+    saveSubmarineSwap?: (swap: BoltzSubmarineSwap) => Promise<void>;
 };
 /**
  * Save a swap of any type using the appropriate saver function
  * This eliminates the need for type checking in multiple places
  */
-declare function saveSwap(swap: PendingSwap, saver: SwapSaver): Promise<void>;
+declare function saveSwap(swap: BoltzSwap, saver: SwapSaver): Promise<void>;
 /**
  * Update a reverse swap's status and save it
  */
-declare function updateReverseSwapStatus(swap: PendingReverseSwap, status: PendingReverseSwap["status"], saveFunc: (swap: PendingReverseSwap) => Promise<void>, additionalFields?: Partial<PendingReverseSwap>): Promise<void>;
+declare function updateReverseSwapStatus(swap: BoltzReverseSwap, status: BoltzReverseSwap["status"], saveFunc: (swap: BoltzReverseSwap) => Promise<void>, additionalFields?: Partial<BoltzReverseSwap>): Promise<void>;
 /**
  * Update a submarine swap's status and save it
  */
-declare function updateSubmarineSwapStatus(swap: PendingSubmarineSwap, status: PendingSubmarineSwap["status"], saveFunc: (swap: PendingSubmarineSwap) => Promise<void>, additionalFields?: Partial<PendingSubmarineSwap>): Promise<void>;
+declare function updateSubmarineSwapStatus(swap: BoltzSubmarineSwap, status: BoltzSubmarineSwap["status"], saveFunc: (swap: BoltzSubmarineSwap) => Promise<void>, additionalFields?: Partial<BoltzSubmarineSwap>): Promise<void>;
 /**
  * Update a chain swap's status and save it
  */
-declare function updateChainSwapStatus(swap: PendingChainSwap, status: PendingChainSwap["status"], saveFunc: (swap: PendingChainSwap) => Promise<void>, additionalFields?: Partial<PendingChainSwap>): Promise<void>;
+declare function updateChainSwapStatus(swap: BoltzChainSwap, status: BoltzChainSwap["status"], saveFunc: (swap: BoltzChainSwap) => Promise<void>, additionalFields?: Partial<BoltzChainSwap>): Promise<void>;
 /**
  * Enrich a reverse swap with its preimage after validation.
  */
-declare function enrichReverseSwapPreimage(swap: PendingReverseSwap, preimage: string): PendingReverseSwap;
+declare function enrichReverseSwapPreimage(swap: BoltzReverseSwap, preimage: string): BoltzReverseSwap;
 /**
  * Enrich a submarine swap with its invoice after validation.
  */
-declare function enrichSubmarineSwapInvoice(swap: PendingSubmarineSwap, invoice: string): PendingSubmarineSwap;
+declare function enrichSubmarineSwapInvoice(swap: BoltzSubmarineSwap, invoice: string): BoltzSubmarineSwap;
 
 type RequestInitArkSwaps = RequestEnvelope & {
     type: "INIT_ARKADE_SWAPS";
@@ -164,7 +164,7 @@ type RequestCreateSubmarineSwap = RequestEnvelope & {
 };
 type ResponseCreateSubmarineSwap = ResponseEnvelope & {
     type: "SUBMARINE_SWAP_CREATED";
-    payload: PendingSubmarineSwap;
+    payload: BoltzSubmarineSwap;
 };
 type RequestCreateReverseSwap = RequestEnvelope & {
     type: "CREATE_REVERSE_SWAP";
@@ -172,25 +172,25 @@ type RequestCreateReverseSwap = RequestEnvelope & {
 };
 type ResponseCreateReverseSwap = ResponseEnvelope & {
     type: "REVERSE_SWAP_CREATED";
-    payload: PendingReverseSwap;
+    payload: BoltzReverseSwap;
 };
 type RequestClaimVhtlc = RequestEnvelope & {
     type: "CLAIM_VHTLC";
-    payload: PendingReverseSwap;
+    payload: BoltzReverseSwap;
 };
 type ResponseClaimVhtlc = ResponseEnvelope & {
     type: "VHTLC_CLAIMED";
 };
 type RequestRefundVhtlc = RequestEnvelope & {
     type: "REFUND_VHTLC";
-    payload: PendingSubmarineSwap;
+    payload: BoltzSubmarineSwap;
 };
 type ResponseRefundVhtlc = ResponseEnvelope & {
     type: "VHTLC_REFUNDED";
 };
 type RequestWaitAndClaim = RequestEnvelope & {
     type: "WAIT_AND_CLAIM";
-    payload: PendingReverseSwap;
+    payload: BoltzReverseSwap;
 };
 type ResponseWaitAndClaim = ResponseEnvelope & {
     type: "WAIT_AND_CLAIMED";
@@ -200,7 +200,7 @@ type ResponseWaitAndClaim = ResponseEnvelope & {
 };
 type RequestWaitForSwapSettlement = RequestEnvelope & {
     type: "WAIT_FOR_SWAP_SETTLEMENT";
-    payload: PendingSubmarineSwap;
+    payload: BoltzSubmarineSwap;
 };
 type ResponseWaitForSwapSettlement = ResponseEnvelope & {
     type: "SWAP_SETTLED";
@@ -215,32 +215,32 @@ type RequestRestoreSwaps = RequestEnvelope & {
 type ResponseRestoreSwaps = ResponseEnvelope & {
     type: "SWAPS_RESTORED";
     payload: {
-        chainSwaps: PendingChainSwap[];
-        reverseSwaps: PendingReverseSwap[];
-        submarineSwaps: PendingSubmarineSwap[];
+        chainSwaps: BoltzChainSwap[];
+        reverseSwaps: BoltzReverseSwap[];
+        submarineSwaps: BoltzSubmarineSwap[];
     };
 };
 type RequestEnrichReverseSwapPreimage = RequestEnvelope & {
     type: "ENRICH_REVERSE_SWAP_PREIMAGE";
     payload: {
-        swap: PendingReverseSwap;
+        swap: BoltzReverseSwap;
         preimage: string;
     };
 };
 type ResponseEnrichReverseSwapPreimage = ResponseEnvelope & {
     type: "REVERSE_SWAP_PREIMAGE_ENRICHED";
-    payload: PendingReverseSwap;
+    payload: BoltzReverseSwap;
 };
 type RequestEnrichSubmarineSwapInvoice = RequestEnvelope & {
     type: "ENRICH_SUBMARINE_SWAP_INVOICE";
     payload: {
-        swap: PendingSubmarineSwap;
+        swap: BoltzSubmarineSwap;
         invoice: string;
     };
 };
 type ResponseEnrichSubmarineSwapInvoice = ResponseEnvelope & {
     type: "SUBMARINE_SWAP_INVOICE_ENRICHED";
-    payload: PendingSubmarineSwap;
+    payload: BoltzSubmarineSwap;
 };
 type RequestGetFees = RequestEnvelope & {
     type: "GET_FEES";
@@ -279,28 +279,28 @@ type RequestGetPendingSubmarineSwaps = RequestEnvelope & {
 };
 type ResponseGetPendingSubmarineSwaps = ResponseEnvelope & {
     type: "PENDING_SUBMARINE_SWAPS";
-    payload: PendingSubmarineSwap[];
+    payload: BoltzSubmarineSwap[];
 };
 type RequestGetPendingReverseSwaps = RequestEnvelope & {
     type: "GET_PENDING_REVERSE_SWAPS";
 };
 type ResponseGetPendingReverseSwaps = ResponseEnvelope & {
     type: "PENDING_REVERSE_SWAPS";
-    payload: PendingReverseSwap[];
+    payload: BoltzReverseSwap[];
 };
 type RequestGetPendingChainSwaps = RequestEnvelope & {
     type: "GET_PENDING_CHAIN_SWAPS";
 };
 type ResponseGetPendingChainSwaps = ResponseEnvelope & {
     type: "PENDING_CHAIN_SWAPS";
-    payload: PendingChainSwap[];
+    payload: BoltzChainSwap[];
 };
 type RequestGetSwapHistory = RequestEnvelope & {
     type: "GET_SWAP_HISTORY";
 };
 type ResponseGetSwapHistory = ResponseEnvelope & {
     type: "SWAP_HISTORY";
-    payload: (PendingReverseSwap | PendingSubmarineSwap | PendingChainSwap)[];
+    payload: (BoltzReverseSwap | BoltzSubmarineSwap | BoltzChainSwap)[];
 };
 type RequestRefreshSwapsStatus = RequestEnvelope & {
     type: "REFRESH_SWAPS_STATUS";
@@ -346,11 +346,11 @@ type RequestCreateChainSwap = RequestEnvelope & {
 };
 type ResponseCreateChainSwap = ResponseEnvelope & {
     type: "CHAIN_SWAP_CREATED";
-    payload: PendingChainSwap;
+    payload: BoltzChainSwap;
 };
 type RequestWaitAndClaimChain = RequestEnvelope & {
     type: "WAIT_AND_CLAIM_CHAIN";
-    payload: PendingChainSwap;
+    payload: BoltzChainSwap;
 };
 type ResponseWaitAndClaimChain = ResponseEnvelope & {
     type: "CHAIN_CLAIMED";
@@ -360,7 +360,7 @@ type ResponseWaitAndClaimChain = ResponseEnvelope & {
 };
 type RequestWaitAndClaimArk = RequestEnvelope & {
     type: "WAIT_AND_CLAIM_ARK";
-    payload: PendingChainSwap;
+    payload: BoltzChainSwap;
 };
 type ResponseWaitAndClaimArk = ResponseEnvelope & {
     type: "ARK_CLAIMED";
@@ -370,7 +370,7 @@ type ResponseWaitAndClaimArk = ResponseEnvelope & {
 };
 type RequestWaitAndClaimBtc = RequestEnvelope & {
     type: "WAIT_AND_CLAIM_BTC";
-    payload: PendingChainSwap;
+    payload: BoltzChainSwap;
 };
 type ResponseWaitAndClaimBtc = ResponseEnvelope & {
     type: "BTC_CLAIMED";
@@ -380,28 +380,28 @@ type ResponseWaitAndClaimBtc = ResponseEnvelope & {
 };
 type RequestClaimArk = RequestEnvelope & {
     type: "CLAIM_ARK";
-    payload: PendingChainSwap;
+    payload: BoltzChainSwap;
 };
 type ResponseClaimArk = ResponseEnvelope & {
     type: "ARK_CLAIM_EXECUTED";
 };
 type RequestClaimBtc = RequestEnvelope & {
     type: "CLAIM_BTC";
-    payload: PendingChainSwap;
+    payload: BoltzChainSwap;
 };
 type ResponseClaimBtc = ResponseEnvelope & {
     type: "BTC_CLAIM_EXECUTED";
 };
 type RequestRefundArk = RequestEnvelope & {
     type: "REFUND_ARK";
-    payload: PendingChainSwap;
+    payload: BoltzChainSwap;
 };
 type ResponseRefundArk = ResponseEnvelope & {
     type: "ARK_REFUND_EXECUTED";
 };
 type RequestSignServerClaim = RequestEnvelope & {
     type: "SIGN_SERVER_CLAIM";
-    payload: PendingChainSwap;
+    payload: BoltzChainSwap;
 };
 type ResponseSignServerClaim = ResponseEnvelope & {
     type: "SERVER_CLAIM_SIGNED";
@@ -411,7 +411,7 @@ type RequestVerifyChainSwap = RequestEnvelope & {
     payload: {
         to: Chain;
         from: Chain;
-        swap: PendingChainSwap;
+        swap: BoltzChainSwap;
         arkInfo: ArkInfo;
     };
 };
@@ -447,7 +447,7 @@ type ResponseSwapManagerStop = ResponseEnvelope & {
 };
 type RequestSwapManagerAddSwap = RequestEnvelope & {
     type: "SM-ADD_SWAP";
-    payload: PendingReverseSwap | PendingSubmarineSwap | PendingChainSwap;
+    payload: BoltzReverseSwap | BoltzSubmarineSwap | BoltzChainSwap;
 };
 type ResponseSwapManagerAddSwap = ResponseEnvelope & {
     type: "SM-SWAP_ADDED";
@@ -466,7 +466,7 @@ type RequestSwapManagerGetPending = RequestEnvelope & {
 };
 type ResponseSwapManagerGetPending = ResponseEnvelope & {
     type: "SM-PENDING_SWAPS";
-    payload: (PendingReverseSwap | PendingSubmarineSwap | PendingChainSwap)[];
+    payload: (BoltzReverseSwap | BoltzSubmarineSwap | BoltzChainSwap)[];
 };
 type RequestSwapManagerHasSwap = RequestEnvelope & {
     type: "SM-HAS_SWAP";
@@ -573,20 +573,20 @@ declare class ServiceWorkerArkadeSwaps implements IArkadeSwaps {
     getSwapManager(): SwapManagerClient | null;
     createLightningInvoice(args: CreateLightningInvoiceRequest): Promise<CreateLightningInvoiceResponse>;
     sendLightningPayment(args: SendLightningPaymentRequest): Promise<SendLightningPaymentResponse>;
-    createSubmarineSwap(args: SendLightningPaymentRequest): Promise<PendingSubmarineSwap>;
-    createReverseSwap(args: CreateLightningInvoiceRequest): Promise<PendingReverseSwap>;
-    claimVHTLC(pendingSwap: PendingReverseSwap): Promise<void>;
-    refundVHTLC(pendingSwap: PendingSubmarineSwap): Promise<void>;
-    waitAndClaim(pendingSwap: PendingReverseSwap): Promise<{
+    createSubmarineSwap(args: SendLightningPaymentRequest): Promise<BoltzSubmarineSwap>;
+    createReverseSwap(args: CreateLightningInvoiceRequest): Promise<BoltzReverseSwap>;
+    claimVHTLC(pendingSwap: BoltzReverseSwap): Promise<void>;
+    refundVHTLC(pendingSwap: BoltzSubmarineSwap): Promise<void>;
+    waitAndClaim(pendingSwap: BoltzReverseSwap): Promise<{
         txid: string;
     }>;
-    waitForSwapSettlement(pendingSwap: PendingSubmarineSwap): Promise<{
+    waitForSwapSettlement(pendingSwap: BoltzSubmarineSwap): Promise<{
         preimage: string;
     }>;
     restoreSwaps(boltzFees?: FeesResponse): Promise<{
-        chainSwaps: PendingChainSwap[];
-        reverseSwaps: PendingReverseSwap[];
-        submarineSwaps: PendingSubmarineSwap[];
+        chainSwaps: BoltzChainSwap[];
+        reverseSwaps: BoltzReverseSwap[];
+        submarineSwaps: BoltzSubmarineSwap[];
     }>;
     arkToBtc(args: {
         btcAddress: string;
@@ -606,29 +606,29 @@ declare class ServiceWorkerArkadeSwaps implements IArkadeSwaps {
         feeSatsPerByte?: number;
         senderLockAmount?: number;
         receiverLockAmount?: number;
-    }): Promise<PendingChainSwap>;
-    waitAndClaimChain(pendingSwap: PendingChainSwap): Promise<{
+    }): Promise<BoltzChainSwap>;
+    waitAndClaimChain(pendingSwap: BoltzChainSwap): Promise<{
         txid: string;
     }>;
-    waitAndClaimArk(pendingSwap: PendingChainSwap): Promise<{
+    waitAndClaimArk(pendingSwap: BoltzChainSwap): Promise<{
         txid: string;
     }>;
-    waitAndClaimBtc(pendingSwap: PendingChainSwap): Promise<{
+    waitAndClaimBtc(pendingSwap: BoltzChainSwap): Promise<{
         txid: string;
     }>;
-    claimArk(pendingSwap: PendingChainSwap): Promise<void>;
-    claimBtc(pendingSwap: PendingChainSwap): Promise<void>;
-    refundArk(pendingSwap: PendingChainSwap): Promise<void>;
-    signCooperativeClaimForServer(pendingSwap: PendingChainSwap): Promise<void>;
+    claimArk(pendingSwap: BoltzChainSwap): Promise<void>;
+    claimBtc(pendingSwap: BoltzChainSwap): Promise<void>;
+    refundArk(pendingSwap: BoltzChainSwap): Promise<void>;
+    signCooperativeClaimForServer(pendingSwap: BoltzChainSwap): Promise<void>;
     verifyChainSwap(args: {
         to: Chain;
         from: Chain;
-        swap: PendingChainSwap;
+        swap: BoltzChainSwap;
         arkInfo: ArkInfo;
     }): Promise<boolean>;
     quoteSwap(swapId: string): Promise<number>;
-    enrichReverseSwapPreimage(swap: PendingReverseSwap, preimage: string): PendingReverseSwap;
-    enrichSubmarineSwapInvoice(swap: PendingSubmarineSwap, invoice: string): PendingSubmarineSwap;
+    enrichReverseSwapPreimage(swap: BoltzReverseSwap, preimage: string): BoltzReverseSwap;
+    enrichSubmarineSwapInvoice(swap: BoltzSubmarineSwap, invoice: string): BoltzSubmarineSwap;
     createVHTLCScript(_args: {
         network: string;
         preimageHash: Uint8Array;
@@ -651,10 +651,10 @@ declare class ServiceWorkerArkadeSwaps implements IArkadeSwaps {
     getLimits(): Promise<LimitsResponse>;
     getLimits(from: Chain, to: Chain): Promise<LimitsResponse>;
     getSwapStatus(swapId: string): Promise<GetSwapStatusResponse>;
-    getPendingSubmarineSwaps(): Promise<PendingSubmarineSwap[]>;
-    getPendingReverseSwaps(): Promise<PendingReverseSwap[]>;
-    getPendingChainSwaps(): Promise<PendingChainSwap[]>;
-    getSwapHistory(): Promise<(PendingReverseSwap | PendingSubmarineSwap | PendingChainSwap)[]>;
+    getPendingSubmarineSwaps(): Promise<BoltzSubmarineSwap[]>;
+    getPendingReverseSwaps(): Promise<BoltzReverseSwap[]>;
+    getPendingChainSwaps(): Promise<BoltzChainSwap[]>;
+    getSwapHistory(): Promise<(BoltzReverseSwap | BoltzSubmarineSwap | BoltzChainSwap)[]>;
     refreshSwapsStatus(): Promise<void>;
     /**
      * Reset all swap state: stops the SwapManager and clears the swap repository.
@@ -717,9 +717,9 @@ declare class IndexedDbSwapRepository implements SwapRepository {
     private db;
     constructor(dbName?: string);
     private getDB;
-    saveSwap<T extends PendingSwap>(swap: T): Promise<void>;
+    saveSwap<T extends BoltzSwap>(swap: T): Promise<void>;
     deleteSwap(id: string): Promise<void>;
-    getAllSwaps<T extends PendingSwap>(filter?: GetSwapsFilter): Promise<T[]>;
+    getAllSwaps<T extends BoltzSwap>(filter?: GetSwapsFilter): Promise<T[]>;
     clear(): Promise<void>;
     private getSwapsByIndexValues;
     private getAllSwapsFromStore;
@@ -729,4 +729,4 @@ declare class IndexedDbSwapRepository implements SwapRepository {
     [Symbol.asyncDispose](): Promise<void>;
 }
 
-export { ArkToBtcResponse, ArkadeSwapsMessageHandler as ArkadeLightningMessageHandler, ArkadeSwapsConfig, ArkadeSwapsMessageHandler, BtcToArkResponse, Chain, ChainFeesResponse, CreateLightningInvoiceRequest, CreateLightningInvoiceResponse, DecodedInvoice, FeesResponse, IndexedDbSwapRepository, InsufficientFundsError, InvoiceExpiredError, InvoiceFailedToPayError, LimitsResponse, type Logger, Network, NetworkError, PendingChainSwap, PendingReverseSwap, PendingSubmarineSwap, PendingSwap, PreimageFetchError, SchemaError, SendLightningPaymentRequest, SendLightningPaymentResponse, ServiceWorkerArkadeSwaps as ServiceWorkerArkadeLightning, ServiceWorkerArkadeSwaps, SwapError, SwapExpiredError, SwapManagerClient, SwapRepository, type SwapSaver, TransactionFailedError, decodeInvoice, enrichReverseSwapPreimage, enrichSubmarineSwapInvoice, getInvoicePaymentHash, getInvoiceSatoshis, isValidArkAddress, logger, migrateToSwapRepository, saveSwap, setLogger, updateChainSwapStatus, updateReverseSwapStatus, updateSubmarineSwapStatus, verifySignatures };
+export { ArkToBtcResponse, ArkadeSwapsMessageHandler as ArkadeLightningMessageHandler, ArkadeSwapsConfig, ArkadeSwapsMessageHandler, BoltzChainSwap, BoltzReverseSwap, BoltzSubmarineSwap, BoltzSwap, BtcToArkResponse, Chain, ChainFeesResponse, CreateLightningInvoiceRequest, CreateLightningInvoiceResponse, DecodedInvoice, FeesResponse, IndexedDbSwapRepository, InsufficientFundsError, InvoiceExpiredError, InvoiceFailedToPayError, LimitsResponse, type Logger, Network, NetworkError, PreimageFetchError, SchemaError, SendLightningPaymentRequest, SendLightningPaymentResponse, ServiceWorkerArkadeSwaps as ServiceWorkerArkadeLightning, ServiceWorkerArkadeSwaps, SwapError, SwapExpiredError, SwapManagerClient, SwapRepository, type SwapSaver, TransactionFailedError, decodeInvoice, enrichReverseSwapPreimage, enrichSubmarineSwapInvoice, getInvoicePaymentHash, getInvoiceSatoshis, isValidArkAddress, logger, migrateToSwapRepository, saveSwap, setLogger, updateChainSwapStatus, updateReverseSwapStatus, updateSubmarineSwapStatus, verifySignatures };