@riftresearch/sdk 0.4.3 → 0.6.0

package/dist/index.js

@@ -123,7 +123,7 @@ function detectRoute(from, to) {
       throw new Error("Expected EVM chain");
     }
     return {
-      type: "oneinch_then_rift",
+      type: "dex_then_rift",
       evmChainId: from2.chain.chainId
     };
   }).with({
@@ -134,7 +134,7 @@ function detectRoute(from, to) {
       throw new Error("Expected EVM chain");
     }
     return {
-      type: "oneinch_monochain",
+      type: "dex_monochain",
       evmChainId: from2.chain.chainId
     };
   }).otherwise(() => {
@@ -143,10 +143,10 @@ function detectRoute(from, to) {
 }
 function getSupportedModes(from, to) {
   const route = detectRoute(from, to);
-  if (route.type === "oneinch_then_rift") {
-    return { exactInput: true, exactOutput: false };
+  if (route.type === "dex_then_rift") {
+    return { exactInput: true, exactOutput: true };
   }
-  if (route.type === "oneinch_monochain") {
+  if (route.type === "dex_monochain") {
     return { exactInput: true, exactOutput: false };
   }
   if (route.direction === "to_btc") {
@@ -159,13 +159,16 @@ function getSupportedModes(from, to) {
 }
 // src/sdk.ts
 import { erc20Abi } from "viem";
+var GAS_LIMIT_MULTIPLIER_NUMERATOR = 3n;
+var GAS_LIMIT_MULTIPLIER_DENOMINATOR = 2n;
+
 class RiftSdk {
   riftClient;
   preflightCheckBalances;
   integratorName;
   debug;
   constructor(options) {
-    const baseUrl = (options.apiUrl ?? "https://router-api-v2-production.up.railway.app").replace(/\/$/, "");
+    const baseUrl = (options.apiUrl ?? "https://api.rift.trade").replace(/\/$/, "");
     this.riftClient = createClient(baseUrl);
     this.preflightCheckBalances = options.preflight?.checkBalances !== false;
     this.integratorName = options.integratorName;
@@ -200,19 +203,26 @@ class RiftSdk {
   }
   async getQuote(params) {
     const route = detectRoute(params.from, params.to);
-    const isMonochain = route.type === "oneinch_monochain";
+    const isMonochain = route.type === "dex_monochain";
     const quoteRequest = {
       type: params.mode === "exact_input" ? "EXACT_INPUT" : "EXACT_OUTPUT",
       from: params.from,
       to: params.to,
-      amount: params.amount
+      amount: params.amount,
+      quoteQuality: params.quoteQuality
     };
     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,
@@ -220,7 +230,7 @@ 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");
@@ -229,7 +239,7 @@ class RiftSdk {
         this.logDebug("creating swap", { quoteId: riftQuote.id });
         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
@@ -251,10 +261,10 @@ class RiftSdk {
             stepId: step.id,
             txHash: result.txHash
           });
-          if (isMonochain && step.action === "evm_call" && step.kind === "oneinch_swap" && result.txHash) {
+          if (isMonochain && step.action === "evm_call" && (step.kind === "dex_swap" || step.kind === "oneinch_swap") && result.txHash) {
             this.logDebug("reporting step result", {
               stepId: step.id,
-              oneinchSwap: true
+              dexSwap: true
             });
             this.unwrapEdenResult(await this.riftClient.swap({ swapId: swapResponse.swapId }).tx.post({
               stepId: step.id,
@@ -303,13 +313,29 @@ class RiftSdk {
         return {};
       }
     }
-    const txHash = await walletClient.sendTransaction({
+    const txRequest = {
       account,
       to: step.to,
       data: step.calldata,
       value: step.value ? BigInt(step.value) : undefined
+    };
+    const estimatedGas = await publicClient.estimateGas(txRequest);
+    const gasLimit = (estimatedGas * GAS_LIMIT_MULTIPLIER_NUMERATOR + GAS_LIMIT_MULTIPLIER_DENOMINATOR - 1n) / GAS_LIMIT_MULTIPLIER_DENOMINATOR;
+    this.logDebug("using buffered gas limit", {
+      stepId: step.id,
+      estimatedGas: estimatedGas.toString(),
+      gasLimit: gasLimit.toString()
+    });
+    const txHash = await walletClient.sendTransaction({
+      ...txRequest,
+      gas: gasLimit
     });
-    await publicClient.waitForTransactionReceipt({ hash: txHash });
+    const receipt = await publicClient.waitForTransactionReceipt({
+      hash: txHash
+    });
+    if (receipt.status !== "success") {
+      throw new Error(`EVM step transaction reverted (${step.kind}) with hash ${txHash}`);
+    }
     return { txHash };
   }
   async executeBtcTransferStep(step, context) {

package/package.json

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