@arkade-os/boltz-swap 0.1.3 → 0.1.4

package/dist/index.cjs

@@ -198,9 +198,7 @@ var ArkadeLightning = class {
         }
         this.storageProvider?.savePendingSubmarineSwap(pendingSwap);
         this.wallet.sendBitcoin({ address: pendingSwap.response.address, amount: pendingSwap.response.expectedAmount }).then((txid) => {
-          this.waitForSwapSettlement(pendingSwap).then(async () => {
-            const finalStatus = await this.swapProvider.getSwapStatus(pendingSwap.response.id);
-            const preimage = finalStatus.transaction?.preimage ?? "";
+          this.waitForSwapSettlement(pendingSwap).then(async ({ preimage }) => {
             resolve({ amount: pendingSwap.response.expectedAmount, preimage, txid });
           }).catch(({ isRefundable }) => {
             if (isRefundable) {
@@ -218,7 +216,7 @@ var ArkadeLightning = class {
       });
     });
   }
-  // create reverse submarine swap
+  // create submarine swap
   async createSubmarineSwap(args) {
     const refundPublicKey = import_base.hex.encode(this.wallet.xOnlyPublicKey());
     if (!refundPublicKey) throw new SwapError({ message: "Failed to get refund public key from wallet" });
@@ -230,6 +228,7 @@ var ArkadeLightning = class {
     };
     const swapResponse = await this.swapProvider.createSubmarineSwap(swapRequest);
     const pendingSwap = {
+      type: "submarine",
       createdAt: Math.floor(Date.now() / 1e3),
       request: swapRequest,
       response: swapResponse,
@@ -253,6 +252,7 @@ var ArkadeLightning = class {
     };
     const swapResponse = await this.swapProvider.createReverseSwap(swapRequest);
     const pendingSwap = {
+      type: "reverse",
       createdAt: Math.floor(Date.now() / 1e3),
       preimage: import_base.hex.encode(preimage),
       request: swapRequest,
@@ -500,10 +500,13 @@ var ArkadeLightning = class {
             this.storageProvider?.savePendingSubmarineSwap({ ...pendingSwap, status });
             reject(new TransactionLockupFailedError({ isRefundable: true, pendingSwap }));
             break;
-          case "transaction.claimed":
-            this.storageProvider?.savePendingSubmarineSwap({ ...pendingSwap, status });
-            resolve();
+          case "transaction.claimed": {
+            const { preimage } = await this.swapProvider.getSwapPreimage(pendingSwap.response.id);
+            console.log("preimage returned", { preimage });
+            this.storageProvider?.savePendingSubmarineSwap({ ...pendingSwap, preimage, status });
+            resolve({ preimage });
             break;
+          }
           default:
             this.storageProvider?.savePendingSubmarineSwap({ ...pendingSwap, status });
             break;
@@ -770,7 +773,7 @@ var StorageProvider = class _StorageProvider {
     const swaps = this.storage[kind];
     const found = swaps.findIndex((s) => s.response.id === swap.response.id);
     if (found !== -1) {
-      swaps[found].status = swap.status;
+      swaps[found] = swap;
     } else {
       if (kind === KEY_REVERSE_SWAPS) {
         swaps.push(swap);
@@ -835,6 +838,9 @@ var isGetPairsResponse = (data) => {
 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" && data.timeoutBlockHeights && typeof data.timeoutBlockHeights === "object" && typeof data.timeoutBlockHeights.unilateralClaim === "number" && typeof data.timeoutBlockHeights.unilateralRefund === "number" && typeof data.timeoutBlockHeights.unilateralRefundWithoutReceiver === "number";
 };
+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" && data.timeoutBlockHeights && typeof data.timeoutBlockHeights === "object" && typeof data.timeoutBlockHeights.refund === "number" && typeof data.timeoutBlockHeights.unilateralClaim === "number" && typeof data.timeoutBlockHeights.unilateralRefund === "number" && typeof data.timeoutBlockHeights.unilateralRefundWithoutReceiver === "number";
 };
@@ -876,6 +882,11 @@ var BoltzSwapProvider = class {
     if (!isGetSwapStatusResponse(response)) throw new SchemaError({ message: `error fetching status for swap: ${id}` });
     return response;
   }
+  async getSwapPreimage(id) {
+    const res = await this.request(`/v2/swap/submarine/${id}/preimage`, "GET");
+    if (!isGetSwapPreimageResponse(res)) throw new SchemaError({ message: `error fetching preimage for swap: ${id}` });
+    return res;
+  }
   async createSubmarineSwap({
     invoice,
     refundPublicKey

package/dist/index.d.cts

@@ -70,6 +70,9 @@ type CreateSubmarineSwapResponse = {
         unilateralRefundWithoutReceiver: number;
     };
 };
+type GetSwapPreimageResponse = {
+    preimage: string;
+};
 type CreateReverseSwapRequest = {
     claimPublicKey: string;
     invoiceAmount: number;
@@ -98,6 +101,7 @@ declare class BoltzSwapProvider {
     getNetwork(): Network;
     getLimits(): Promise<LimitsResponse>;
     getSwapStatus(id: string): Promise<GetSwapStatusResponse>;
+    getSwapPreimage(id: string): Promise<GetSwapPreimageResponse>;
     createSubmarineSwap({ invoice, refundPublicKey, }: CreateSubmarineSwapRequest): Promise<CreateSubmarineSwapResponse>;
     createReverseSwap({ invoiceAmount, claimPublicKey, preimageHash, }: CreateReverseSwapRequest): Promise<CreateReverseSwapResponse>;
     monitorSwap(swapId: string, update: (type: BoltzSwapStatus, data?: any) => void): Promise<void>;
@@ -138,6 +142,7 @@ interface SendLightningPaymentResponse {
     txid: string;
 }
 interface PendingReverseSwap {
+    type: 'reverse';
     createdAt: number;
     preimage: string;
     status: BoltzSwapStatus;
@@ -145,7 +150,9 @@ interface PendingReverseSwap {
     response: CreateReverseSwapResponse;
 }
 interface PendingSubmarineSwap {
+    type: 'submarine';
     createdAt: number;
+    preimage?: string;
     status: BoltzSwapStatus;
     request: CreateSubmarineSwapRequest;
     response: CreateSubmarineSwapResponse;
@@ -225,7 +232,9 @@ declare class ArkadeLightning {
      * @param pendingSwap - The pending swap.
      * @returns The status of the swap settlement.
      */
-    waitForSwapSettlement(pendingSwap: PendingSubmarineSwap): Promise<void>;
+    waitForSwapSettlement(pendingSwap: PendingSubmarineSwap): Promise<{
+        preimage: string;
+    }>;
     /**
      * Validates the final Ark transaction.
      * checks that all inputs have a signature for the given pubkey

package/dist/index.d.ts

@@ -70,6 +70,9 @@ type CreateSubmarineSwapResponse = {
         unilateralRefundWithoutReceiver: number;
     };
 };
+type GetSwapPreimageResponse = {
+    preimage: string;
+};
 type CreateReverseSwapRequest = {
     claimPublicKey: string;
     invoiceAmount: number;
@@ -98,6 +101,7 @@ declare class BoltzSwapProvider {
     getNetwork(): Network;
     getLimits(): Promise<LimitsResponse>;
     getSwapStatus(id: string): Promise<GetSwapStatusResponse>;
+    getSwapPreimage(id: string): Promise<GetSwapPreimageResponse>;
     createSubmarineSwap({ invoice, refundPublicKey, }: CreateSubmarineSwapRequest): Promise<CreateSubmarineSwapResponse>;
     createReverseSwap({ invoiceAmount, claimPublicKey, preimageHash, }: CreateReverseSwapRequest): Promise<CreateReverseSwapResponse>;
     monitorSwap(swapId: string, update: (type: BoltzSwapStatus, data?: any) => void): Promise<void>;
@@ -138,6 +142,7 @@ interface SendLightningPaymentResponse {
     txid: string;
 }
 interface PendingReverseSwap {
+    type: 'reverse';
     createdAt: number;
     preimage: string;
     status: BoltzSwapStatus;
@@ -145,7 +150,9 @@ interface PendingReverseSwap {
     response: CreateReverseSwapResponse;
 }
 interface PendingSubmarineSwap {
+    type: 'submarine';
     createdAt: number;
+    preimage?: string;
     status: BoltzSwapStatus;
     request: CreateSubmarineSwapRequest;
     response: CreateSubmarineSwapResponse;
@@ -225,7 +232,9 @@ declare class ArkadeLightning {
      * @param pendingSwap - The pending swap.
      * @returns The status of the swap settlement.
      */
-    waitForSwapSettlement(pendingSwap: PendingSubmarineSwap): Promise<void>;
+    waitForSwapSettlement(pendingSwap: PendingSubmarineSwap): Promise<{
+        preimage: string;
+    }>;
     /**
      * Validates the final Ark transaction.
      * checks that all inputs have a signature for the given pubkey

package/dist/index.js

@@ -160,9 +160,7 @@ var ArkadeLightning = class {
         }
         this.storageProvider?.savePendingSubmarineSwap(pendingSwap);
         this.wallet.sendBitcoin({ address: pendingSwap.response.address, amount: pendingSwap.response.expectedAmount }).then((txid) => {
-          this.waitForSwapSettlement(pendingSwap).then(async () => {
-            const finalStatus = await this.swapProvider.getSwapStatus(pendingSwap.response.id);
-            const preimage = finalStatus.transaction?.preimage ?? "";
+          this.waitForSwapSettlement(pendingSwap).then(async ({ preimage }) => {
             resolve({ amount: pendingSwap.response.expectedAmount, preimage, txid });
           }).catch(({ isRefundable }) => {
             if (isRefundable) {
@@ -180,7 +178,7 @@ var ArkadeLightning = class {
       });
     });
   }
-  // create reverse submarine swap
+  // create submarine swap
   async createSubmarineSwap(args) {
     const refundPublicKey = hex.encode(this.wallet.xOnlyPublicKey());
     if (!refundPublicKey) throw new SwapError({ message: "Failed to get refund public key from wallet" });
@@ -192,6 +190,7 @@ var ArkadeLightning = class {
     };
     const swapResponse = await this.swapProvider.createSubmarineSwap(swapRequest);
     const pendingSwap = {
+      type: "submarine",
       createdAt: Math.floor(Date.now() / 1e3),
       request: swapRequest,
       response: swapResponse,
@@ -215,6 +214,7 @@ var ArkadeLightning = class {
     };
     const swapResponse = await this.swapProvider.createReverseSwap(swapRequest);
     const pendingSwap = {
+      type: "reverse",
       createdAt: Math.floor(Date.now() / 1e3),
       preimage: hex.encode(preimage),
       request: swapRequest,
@@ -462,10 +462,13 @@ var ArkadeLightning = class {
             this.storageProvider?.savePendingSubmarineSwap({ ...pendingSwap, status });
             reject(new TransactionLockupFailedError({ isRefundable: true, pendingSwap }));
             break;
-          case "transaction.claimed":
-            this.storageProvider?.savePendingSubmarineSwap({ ...pendingSwap, status });
-            resolve();
+          case "transaction.claimed": {
+            const { preimage } = await this.swapProvider.getSwapPreimage(pendingSwap.response.id);
+            console.log("preimage returned", { preimage });
+            this.storageProvider?.savePendingSubmarineSwap({ ...pendingSwap, preimage, status });
+            resolve({ preimage });
             break;
+          }
           default:
             this.storageProvider?.savePendingSubmarineSwap({ ...pendingSwap, status });
             break;
@@ -732,7 +735,7 @@ var StorageProvider = class _StorageProvider {
     const swaps = this.storage[kind];
     const found = swaps.findIndex((s) => s.response.id === swap.response.id);
     if (found !== -1) {
-      swaps[found].status = swap.status;
+      swaps[found] = swap;
     } else {
       if (kind === KEY_REVERSE_SWAPS) {
         swaps.push(swap);
@@ -797,6 +800,9 @@ var isGetPairsResponse = (data) => {
 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" && data.timeoutBlockHeights && typeof data.timeoutBlockHeights === "object" && typeof data.timeoutBlockHeights.unilateralClaim === "number" && typeof data.timeoutBlockHeights.unilateralRefund === "number" && typeof data.timeoutBlockHeights.unilateralRefundWithoutReceiver === "number";
 };
+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" && data.timeoutBlockHeights && typeof data.timeoutBlockHeights === "object" && typeof data.timeoutBlockHeights.refund === "number" && typeof data.timeoutBlockHeights.unilateralClaim === "number" && typeof data.timeoutBlockHeights.unilateralRefund === "number" && typeof data.timeoutBlockHeights.unilateralRefundWithoutReceiver === "number";
 };
@@ -838,6 +844,11 @@ var BoltzSwapProvider = class {
     if (!isGetSwapStatusResponse(response)) throw new SchemaError({ message: `error fetching status for swap: ${id}` });
     return response;
   }
+  async getSwapPreimage(id) {
+    const res = await this.request(`/v2/swap/submarine/${id}/preimage`, "GET");
+    if (!isGetSwapPreimageResponse(res)) throw new SchemaError({ message: `error fetching preimage for swap: ${id}` });
+    return res;
+  }
   async createSubmarineSwap({
     invoice,
     refundPublicKey

package/package.json

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