@arkade-os/boltz-swap 0.2.9 → 0.2.11

package/README.md

@@ -40,6 +40,7 @@ const wallet = await Wallet.create({
 const swapProvider = new BoltzSwapProvider({
   apiUrl: 'https://api.boltz.mutinynet.arkade.sh',
   network: 'mutinynet',
+  referralId: 'arkade', // optional
 });
 
 // Create the ArkadeLightning instance

package/dist/index.cjs

@@ -205,6 +205,7 @@ var BoltzSwapProvider = class {
   wsUrl;
   apiUrl;
   network;
+  referralId;
   constructor(config) {
     this.network = config.network;
     const apiUrl = config.apiUrl || BASE_URLS[config.network];
@@ -301,15 +302,17 @@ var BoltzSwapProvider = class {
         message: "refundPublicKey must be a compressed public key"
       });
     }
+    const requestBody = {
+      from: "ARK",
+      to: "BTC",
+      invoice,
+      refundPublicKey,
+      ...this.referralId ? { referralId: this.referralId } : {}
+    };
     const response = await this.request(
       "/v2/swap/submarine",
       "POST",
-      {
-        from: "ARK",
-        to: "BTC",
-        invoice,
-        refundPublicKey
-      }
+      requestBody
     );
     if (!isCreateSubmarineSwapResponse(response))
       throw new SchemaError({ message: "Error creating submarine swap" });
@@ -332,7 +335,8 @@ var BoltzSwapProvider = class {
       invoiceAmount,
       claimPublicKey,
       preimageHash,
-      ...description?.trim() ? { description: description.trim() } : {}
+      ...description?.trim() ? { description: description.trim() } : {},
+      ...this.referralId ? { referralId: this.referralId } : {}
     };
     const response = await this.request(
       "/v2/swap/reverse",
@@ -793,6 +797,18 @@ var ArkadeLightning = class {
    * @param pendingSwap - The pending submarine swap to refund the VHTLC.
    */
   async refundVHTLC(pendingSwap) {
+    const vhtlcPkScript = import_sdk3.ArkAddress.decode(
+      pendingSwap.response.address
+    ).pkScript;
+    const spendableVtxos = await this.indexerProvider.getVtxos({
+      scripts: [import_base2.hex.encode(vhtlcPkScript)],
+      spendableOnly: true
+    });
+    if (spendableVtxos.vtxos.length === 0) {
+      throw new Error(
+        `VHTLC not found for address ${pendingSwap.response.address}`
+      );
+    }
     const aspInfo = await this.arkProvider.getInfo();
     const address = await this.wallet.getAddress();
     if (!address) throw new Error("Failed to get ark address from wallet");
@@ -811,7 +827,7 @@ var ArkadeLightning = class {
       "boltz",
       pendingSwap.id
     );
-    const { vhtlcScript, vhtlcAddress } = this.createVHTLCScript({
+    const { vhtlcScript } = this.createVHTLCScript({
       network: aspInfo.network,
       preimageHash: import_base2.hex.decode(
         getInvoicePaymentHash(pendingSwap.request.invoice)
@@ -823,15 +839,6 @@ var ArkadeLightning = class {
     });
     if (!vhtlcScript)
       throw new Error("Failed to create VHTLC script for reverse swap");
-    if (vhtlcAddress !== pendingSwap.response.address)
-      throw new Error("Boltz is trying to scam us");
-    const spendableVtxos = await this.indexerProvider.getVtxos({
-      scripts: [import_base2.hex.encode(vhtlcScript.pkScript)],
-      spendableOnly: true
-    });
-    if (spendableVtxos.vtxos.length === 0) {
-      throw new Error("No spendable virtual coins found");
-    }
     const vhtlcIdentity = {
       sign: async (tx2, inputIndexes) => {
         const cpy = tx2.clone();

package/dist/index.d.cts

@@ -1,9 +1,10 @@
-import { Transaction, Wallet, ServiceWorkerWallet, ArkProvider, IndexerProvider, VHTLC } from '@arkade-os/sdk';
+import { Transaction, Wallet, ServiceWorkerWallet, ArkProvider, NetworkName, IndexerProvider, VHTLC } from '@arkade-os/sdk';
 import { Transaction as Transaction$1 } from '@scure/btc-signer';
 
 interface SwapProviderConfig {
     apiUrl?: string;
     network: Network;
+    referralId?: string;
 }
 type BoltzSwapStatus = "invoice.expired" | "invoice.failedToPay" | "invoice.paid" | "invoice.pending" | "invoice.set" | "invoice.settled" | "swap.created" | "swap.expired" | "transaction.claim.pending" | "transaction.claimed" | "transaction.confirmed" | "transaction.failed" | "transaction.lockupFailed" | "transaction.mempool" | "transaction.refunded";
 declare const isSubmarineFinalStatus: (status: BoltzSwapStatus) => boolean;
@@ -71,6 +72,7 @@ declare class BoltzSwapProvider {
     private readonly wsUrl;
     private readonly apiUrl;
     private readonly network;
+    private readonly referralId?;
     constructor(config: SwapProviderConfig);
     getApiUrl(): string;
     getWsUrl(): string;
@@ -101,7 +103,7 @@ interface Vtxo {
         locktime: number;
     };
 }
-type Network = "bitcoin" | "mutinynet" | "regtest" | "signet";
+type Network = NetworkName;
 interface CreateLightningInvoiceRequest {
     amount: number;
     description?: string;

package/dist/index.d.ts

@@ -1,9 +1,10 @@
-import { Transaction, Wallet, ServiceWorkerWallet, ArkProvider, IndexerProvider, VHTLC } from '@arkade-os/sdk';
+import { Transaction, Wallet, ServiceWorkerWallet, ArkProvider, NetworkName, IndexerProvider, VHTLC } from '@arkade-os/sdk';
 import { Transaction as Transaction$1 } from '@scure/btc-signer';
 
 interface SwapProviderConfig {
     apiUrl?: string;
     network: Network;
+    referralId?: string;
 }
 type BoltzSwapStatus = "invoice.expired" | "invoice.failedToPay" | "invoice.paid" | "invoice.pending" | "invoice.set" | "invoice.settled" | "swap.created" | "swap.expired" | "transaction.claim.pending" | "transaction.claimed" | "transaction.confirmed" | "transaction.failed" | "transaction.lockupFailed" | "transaction.mempool" | "transaction.refunded";
 declare const isSubmarineFinalStatus: (status: BoltzSwapStatus) => boolean;
@@ -71,6 +72,7 @@ declare class BoltzSwapProvider {
     private readonly wsUrl;
     private readonly apiUrl;
     private readonly network;
+    private readonly referralId?;
     constructor(config: SwapProviderConfig);
     getApiUrl(): string;
     getWsUrl(): string;
@@ -101,7 +103,7 @@ interface Vtxo {
         locktime: number;
     };
 }
-type Network = "bitcoin" | "mutinynet" | "regtest" | "signet";
+type Network = NetworkName;
 interface CreateLightningInvoiceRequest {
     amount: number;
     description?: string;

package/dist/index.js

@@ -157,6 +157,7 @@ var BoltzSwapProvider = class {
   wsUrl;
   apiUrl;
   network;
+  referralId;
   constructor(config) {
     this.network = config.network;
     const apiUrl = config.apiUrl || BASE_URLS[config.network];
@@ -253,15 +254,17 @@ var BoltzSwapProvider = class {
         message: "refundPublicKey must be a compressed public key"
       });
     }
+    const requestBody = {
+      from: "ARK",
+      to: "BTC",
+      invoice,
+      refundPublicKey,
+      ...this.referralId ? { referralId: this.referralId } : {}
+    };
     const response = await this.request(
       "/v2/swap/submarine",
       "POST",
-      {
-        from: "ARK",
-        to: "BTC",
-        invoice,
-        refundPublicKey
-      }
+      requestBody
     );
     if (!isCreateSubmarineSwapResponse(response))
       throw new SchemaError({ message: "Error creating submarine swap" });
@@ -284,7 +287,8 @@ var BoltzSwapProvider = class {
       invoiceAmount,
       claimPublicKey,
       preimageHash,
-      ...description?.trim() ? { description: description.trim() } : {}
+      ...description?.trim() ? { description: description.trim() } : {},
+      ...this.referralId ? { referralId: this.referralId } : {}
     };
     const response = await this.request(
       "/v2/swap/reverse",
@@ -745,6 +749,18 @@ var ArkadeLightning = class {
    * @param pendingSwap - The pending submarine swap to refund the VHTLC.
    */
   async refundVHTLC(pendingSwap) {
+    const vhtlcPkScript = ArkAddress.decode(
+      pendingSwap.response.address
+    ).pkScript;
+    const spendableVtxos = await this.indexerProvider.getVtxos({
+      scripts: [hex.encode(vhtlcPkScript)],
+      spendableOnly: true
+    });
+    if (spendableVtxos.vtxos.length === 0) {
+      throw new Error(
+        `VHTLC not found for address ${pendingSwap.response.address}`
+      );
+    }
     const aspInfo = await this.arkProvider.getInfo();
     const address = await this.wallet.getAddress();
     if (!address) throw new Error("Failed to get ark address from wallet");
@@ -763,7 +779,7 @@ var ArkadeLightning = class {
       "boltz",
       pendingSwap.id
     );
-    const { vhtlcScript, vhtlcAddress } = this.createVHTLCScript({
+    const { vhtlcScript } = this.createVHTLCScript({
       network: aspInfo.network,
       preimageHash: hex.decode(
         getInvoicePaymentHash(pendingSwap.request.invoice)
@@ -775,15 +791,6 @@ var ArkadeLightning = class {
     });
     if (!vhtlcScript)
       throw new Error("Failed to create VHTLC script for reverse swap");
-    if (vhtlcAddress !== pendingSwap.response.address)
-      throw new Error("Boltz is trying to scam us");
-    const spendableVtxos = await this.indexerProvider.getVtxos({
-      scripts: [hex.encode(vhtlcScript.pkScript)],
-      spendableOnly: true
-    });
-    if (spendableVtxos.vtxos.length === 0) {
-      throw new Error("No spendable virtual coins found");
-    }
     const vhtlcIdentity = {
       sign: async (tx2, inputIndexes) => {
         const cpy = tx2.clone();

package/package.json

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