@riftresearch/sdk 0.4.2 → 0.5.0

package/dist/index.js

@@ -1,4 +1,4 @@
-// ../common/src/constants.ts
+// ../common/dist/index.js
 var CBBTC_ADDRESS = "0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf";
 var CBBTC_ADDRESS_LOWER = CBBTC_ADDRESS.toLowerCase();
 var BTC_CHAIN = {
@@ -85,7 +85,9 @@ var Currencies = {
     }
   }
 };
-// src/apiClient.ts
+// src/client.ts
+import { treaty } from "@elysiajs/eden";
+
 class SwapRouterApiError extends Error {
   status;
   body;
@@ -96,57 +98,6 @@ class SwapRouterApiError extends Error {
     this.body = body;
   }
 }
-
-class SwapRouterClient {
-  baseUrl;
-  fetch;
-  constructor(options) {
-    this.baseUrl = options.baseUrl.replace(/\/$/, "");
-    this.fetch = options.fetch ?? globalThis.fetch;
-  }
-  async request(method, path, body) {
-    const url = `${this.baseUrl}${path}`;
-    const response = await this.fetch(url, {
-      method,
-      headers: body ? { "Content-Type": "application/json" } : undefined,
-      body: body ? JSON.stringify(body) : undefined
-    });
-    const text = await response.text();
-    let data;
-    try {
-      data = JSON.parse(text);
-    } catch {
-      if (!response.ok) {
-        throw new SwapRouterApiError(text || `Request failed with status ${response.status}`, response.status);
-      }
-      throw new SwapRouterApiError(`Invalid JSON response: ${text}`, response.status);
-    }
-    if (!response.ok) {
-      throw new SwapRouterApiError(data.error ?? `Request failed with status ${response.status}`, response.status, data);
-    }
-    return data;
-  }
-  async health() {
-    return this.request("GET", "/health");
-  }
-  async status() {
-    return this.request("GET", "/status");
-  }
-  async quote(request) {
-    return this.request("POST", "/quote", request);
-  }
-  async createSwap(request) {
-    return this.request("POST", "/swap", request);
-  }
-  async getSwap(swapId) {
-    return this.request("GET", `/swap/${swapId}`);
-  }
-  async reportStepResult(swapId, result) {
-    await this.request("POST", `/swap/${swapId}/tx`, result);
-  }
-}
-// src/client.ts
-import { treaty } from "@elysiajs/eden";
 function createClient(baseUrl) {
   return treaty(baseUrl);
 }
@@ -155,17 +106,17 @@ import { match, P } from "ts-pattern";
 var CBBTC_ADDRESS2 = "0xcbb7c0000ab88b473b1f5afd9ef808440eed33bf";
 var isBitcoin = (currency) => currency.chain.kind === "BITCOIN";
 var isCbBtc = (currency) => currency.chain.kind === "EVM" && currency.token.kind === "TOKEN" && currency.token.address.toLowerCase() === CBBTC_ADDRESS2;
-var isEvmToken2 = (currency) => currency.chain.kind === "EVM";
-var isSameEvmChain2 = (a, b) => a.chain.kind === "EVM" && b.chain.kind === "EVM" && a.chain.chainId === b.chain.chainId;
+var isEvmToken = (currency) => currency.chain.kind === "EVM";
+var isSameEvmChain = (a, b) => a.chain.kind === "EVM" && b.chain.kind === "EVM" && a.chain.chainId === b.chain.chainId;
 function detectRoute(from, to) {
   return match({ from, to }).with({ from: P.when(isCbBtc), to: P.when(isBitcoin) }, () => ({
     type: "direct_rift",
     direction: "to_btc"
-  })).with({ from: P.when(isBitcoin), to: P.when(isEvmToken2) }, () => ({
+  })).with({ from: P.when(isBitcoin), to: P.when(isEvmToken) }, () => ({
     type: "direct_rift",
     direction: "from_btc"
   })).with({
-    from: P.when((c) => isEvmToken2(c) && !isCbBtc(c)),
+    from: P.when((c) => isEvmToken(c) && !isCbBtc(c)),
     to: P.when(isBitcoin)
   }, ({ from: from2 }) => {
     if (from2.chain.kind !== "EVM") {
@@ -176,8 +127,8 @@ function detectRoute(from, to) {
       evmChainId: from2.chain.chainId
     };
   }).with({
-    from: P.when(isEvmToken2),
-    to: P.when((c) => isEvmToken2(c) && isSameEvmChain2(from, to))
+    from: P.when(isEvmToken),
+    to: P.when((c) => isEvmToken(c) && isSameEvmChain(from, to))
   }, ({ from: from2 }) => {
     if (from2.chain.kind !== "EVM") {
       throw new Error("Expected EVM chain");
@@ -214,9 +165,8 @@ class RiftSdk {
   integratorName;
   debug;
   constructor(options) {
-    this.riftClient = new SwapRouterClient({
-      baseUrl: options.apiUrl ?? "https://router-api-v2-production.up.railway.app"
-    });
+    const baseUrl = (options.apiUrl ?? "https://router-api-v2-production.up.railway.app").replace(/\/$/, "");
+    this.riftClient = createClient(baseUrl);
     this.preflightCheckBalances = options.preflight?.checkBalances !== false;
     this.integratorName = options.integratorName;
     this.debug = options.debug ?? false;
@@ -230,6 +180,24 @@ class RiftSdk {
     }
     console.log(`[RiftSdk] ${message}`);
   }
+  unwrapEdenResult(result) {
+    if (!result.error) {
+      if (result.data === null) {
+        throw new SwapRouterApiError(`Request failed with status ${result.status}`, result.status);
+      }
+      return result.data;
+    }
+    const error = result.error;
+    const status = error.status ?? result.status;
+    const value = error.value;
+    let message = `Request failed with status ${status}`;
+    if (value && typeof value === "object" && "error" in value && typeof value.error === "string") {
+      message = value.error;
+    } else if (typeof error.message === "string") {
+      message = error.message;
+    }
+    throw new SwapRouterApiError(message, status, value);
+  }
   async getQuote(params) {
     const route = detectRoute(params.from, params.to);
     const isMonochain = route.type === "oneinch_monochain";
@@ -239,12 +207,18 @@ class RiftSdk {
       to: params.to,
       amount: params.amount
     };
-    const riftQuote = await this.riftClient.quote(quoteRequest);
+    const riftQuote = this.unwrapEdenResult(await this.riftClient.quote.post(quoteRequest));
     const quote = this.buildQuoteResult(riftQuote, params);
     const isChained = route.type === "direct_rift" && route.direction === "from_btc" && !isCbBtc(params.to);
     return {
       quote,
-      executeSwap: async (context = {}) => {
+      executeSwap: async (context) => {
+        if (!context?.destinationAddress) {
+          throw new Error("destinationAddress is required to execute swap");
+        }
+        if (params.from.chain.kind === "BITCOIN" && !context.refundAddress) {
+          throw new Error("refundAddress is required for BTC swaps (Bitcoin refund address)");
+        }
         this.logDebug("executeSwap called", {
           route: route.type,
           mode: params.mode,
@@ -252,20 +226,20 @@ class RiftSdk {
           to: params.to,
           amount: params.amount
         });
-        const refundAddress = params.refundAddress ?? this.getRefundAddress(params, context);
+        const refundAddress = context.refundAddress ?? this.getRefundAddress(params, context);
         this.logDebug("resolved refund address", { refundAddress });
         if (this.preflightCheckBalances) {
           this.logDebug("running preflight balance check");
           await this.assertSufficientBalance(params.from, quote.from.amount, context);
         }
         this.logDebug("creating swap", { quoteId: riftQuote.id });
-        const swapResponse = await this.riftClient.createSwap({
+        const swapResponse = this.unwrapEdenResult(await this.riftClient.swap.post({
           id: riftQuote.id,
-          destinationAddress: params.destinationAddress,
+          destinationAddress: context.destinationAddress,
           refundAddress,
           integratorName: this.integratorName,
           approvalMode: params.approvalMode
-        });
+        }));
         this.logDebug("swap created", {
           swapId: swapResponse.swapId,
           steps: swapResponse.executionSteps.length
@@ -288,16 +262,16 @@ class RiftSdk {
               stepId: step.id,
               oneinchSwap: true
             });
-            await this.riftClient.reportStepResult(swapResponse.swapId, {
+            this.unwrapEdenResult(await this.riftClient.swap({ swapId: swapResponse.swapId }).tx.post({
               stepId: step.id,
               ...result
-            });
+            }));
           }
         }
         this.logDebug("fetching swap status", {
           swapId: swapResponse.swapId
         });
-        const swap = await this.riftClient.getSwap(swapResponse.swapId);
+        const swap = this.unwrapEdenResult(await this.riftClient.swap({ swapId: swapResponse.swapId }).get());
         this.logDebug("swap fetched", {
           swapId: swapResponse.swapId,
           status: swap.status
@@ -472,7 +446,7 @@ class RiftSdk {
     return context.sendBitcoin;
   }
   async getSwapStatus(swapId) {
-    return this.riftClient.getSwap(swapId);
+    return this.unwrapEdenResult(await this.riftClient.swap({ swapId }).get());
   }
 }
 function createRiftSdk(options) {
@@ -484,6 +458,7 @@ export {
   createRiftSdk,
   createCurrency,
   createClient,
+  SwapRouterApiError,
   RiftSdk,
   Currencies
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@riftresearch/sdk",
-	"version": "0.4.2",
+	"version": "0.5.0",
 	"description": "SDK for swapping between bitcoin and evm chains",
 	"license": "MIT",
 	"files": [