@riftresearch/sdk 0.7.1 → 0.9.0

package/dist/index.d.ts

@@ -148,7 +148,7 @@ type ExecutionAction = "evm_call" | "btc_transfer";
 /**
 * Step kinds grouped by action type.
 */
-type EvmCallKind = "approval" | "transfer_erc20" | "oneinch_swap" | "dex_swap";
+type EvmCallKind = "approval" | "transfer_erc20" | "dex_swap";
 type BtcTransferKind = "transfer_btc";
 /**
 * EVM Call step - execute calldata on an EVM chain.
@@ -376,6 +376,8 @@ type SendBitcoinFn = (params: {
 	/** Amount to send in satoshis */
 	amountSats: string;
 }) => Promise<void>;
+type ExecuteSwapStepType = "approval" | "transaction";
+type ExecuteSwapOnExecuteStepCallback = (type: ExecuteSwapStepType) => void | Promise<void>;
 type ExecuteSwapContext<chain extends Chain2 | undefined = Chain2 | undefined> = {
 	/** Viem PublicClient for reading chain data */
 	publicClient?: PublicClient<Transport, chain>;
@@ -383,6 +385,11 @@ type ExecuteSwapContext<chain extends Chain2 | undefined = Chain2 | undefined> =
 	walletClient?: WalletClient<Transport, chain, Account | undefined>;
 	/** Function to send Bitcoin (implement using your preferred wallet) */
 	sendBitcoin?: SendBitcoinFn;
+	/**
+	* Optional callback invoked immediately before prompting the user's wallet to
+	* sign/send a transaction (after estimateGas/simulation has succeeded).
+	*/
+	onExecuteStep?: ExecuteSwapOnExecuteStepCallback;
 };
 type ExecuteSwapOptions<chain extends Chain2 | undefined = Chain2 | undefined> = ExecuteSwapContext<chain> & {
 	/** Address to receive the output tokens */
@@ -462,4 +469,4 @@ declare class RiftSdk {
 	getSwapStatus(swapId: string): Promise<SwapStatusResponse>;
 }
 declare function createRiftSdk(options: RiftSdkOptions): RiftSdk;
-export { getSupportedModes, detectRoute, createRiftSdk, createCurrency, TokenIdentifier, SwapStatus, SwapRouterApiError, SwapRoute, SwapResult, SwapResponse, SupportedModes, SendBitcoinFn, RiftSwap, RiftSdkOptions, RiftSdk, QuoteResult, QuoteQuality, QuoteParameters, NativeToken, GetQuoteResult, ExecutionStep, ExecutionAction, ExecuteSwapOptions, EvmChain, EvmCallStep, EvmCallKind, Erc20Token, Currency, Currencies, Chain, BtcTransferStep, BtcTransferKind, BitcoinChain };
+export { getSupportedModes, detectRoute, createRiftSdk, createCurrency, TokenIdentifier, SwapStatus, SwapRouterApiError, SwapRoute, SwapResult, SwapResponse, SupportedModes, SendBitcoinFn, RiftSwap, RiftSdkOptions, RiftSdk, QuoteResult, QuoteQuality, QuoteParameters, NativeToken, GetQuoteResult, ExecutionStep, ExecutionAction, ExecuteSwapStepType, ExecuteSwapOptions, ExecuteSwapOnExecuteStepCallback, EvmChain, EvmCallStep, EvmCallKind, Erc20Token, Currency, Currencies, Chain, BtcTransferStep, BtcTransferKind, BitcoinChain };

package/dist/index.js

@@ -247,8 +247,10 @@ class RiftSdk {
           await this.assertSufficientBalance(params.from, quote.from.expected, context);
         }
         this.logDebug("creating swap", { quoteId: riftQuote.id });
+        const senderAddress = params.from.chain.kind === "EVM" ? this.getAddress(context) : undefined;
         const swapResponse = this.unwrapEdenResult(await this.riftClient.swap.post({
           id: riftQuote.id,
+          ...senderAddress ? { senderAddress } : {},
           destinationAddress: context.destinationAddress,
           refundAddress,
           integratorName: this.integratorName,
@@ -266,15 +268,16 @@ class RiftSdk {
             kind: "kind" in step ? step.kind : undefined,
             chainId: "chainId" in step ? step.chainId : undefined
           });
-          const result = await this.executeStep(step, context);
+          const result = await this.executeStep(step, context, swapResponse.swapId);
           this.logDebug("step completed", {
             stepId: step.id,
             txHash: result.txHash
           });
-          if (isMonochain && step.action === "evm_call" && (step.kind === "dex_swap" || step.kind === "oneinch_swap") && result.txHash) {
+          if (step.action === "evm_call" && step.kind === "dex_swap" && result.txHash) {
             this.logDebug("reporting step result", {
               stepId: step.id,
-              dexSwap: true
+              dexSwap: true,
+              monochain: isMonochain
             });
             this.unwrapEdenResult(await this.riftClient.swap({ swapId: swapResponse.swapId }).tx.post({
               stepId: step.id,
@@ -297,15 +300,15 @@ class RiftSdk {
       }
     };
   }
-  async executeStep(step, context) {
+  async executeStep(step, context, swapId) {
     switch (step.action) {
       case "evm_call":
-        return this.executeEvmCallStep(step, context);
+        return this.executeEvmCallStep(step, context, swapId);
       case "btc_transfer":
         return this.executeBtcTransferStep(step, context);
     }
   }
-  async executeEvmCallStep(step, context) {
+  async executeEvmCallStep(step, context, swapId) {
     const walletClient = this.requireWalletClient(context);
     const publicClient = this.requirePublicClient(context);
     const account = walletClient.account;
@@ -323,19 +326,53 @@ class RiftSdk {
         return {};
       }
     }
-    const txRequest = {
+    let effectiveStep = step;
+    let txRequest = {
       account,
-      to: step.to,
-      data: step.calldata,
-      value: step.value ? BigInt(step.value) : undefined
+      to: effectiveStep.to,
+      data: effectiveStep.calldata,
+      value: effectiveStep.value ? BigInt(effectiveStep.value) : undefined
     };
-    const estimatedGas = await publicClient.estimateGas(txRequest);
+    let estimatedGas;
+    try {
+      estimatedGas = await publicClient.estimateGas(txRequest);
+    } catch (estimateError) {
+      if (effectiveStep.kind !== "dex_swap") {
+        throw estimateError;
+      }
+      this.logDebug("estimateGas failed; attempting refresh-step", {
+        swapId,
+        stepId: effectiveStep.id,
+        error: estimateError instanceof Error ? estimateError.message : String(estimateError)
+      });
+      let refreshed;
+      try {
+        refreshed = this.unwrapEdenResult(await this.riftClient.swap({ swapId })["refresh-step"].post({ stepId: effectiveStep.id }));
+      } catch (refreshError) {
+        throw new Error(`estimateGas failed for dex_swap step and refresh-step failed: ${refreshError instanceof Error ? refreshError.message : String(refreshError)}`);
+      }
+      if (!refreshed?.step) {
+        throw new Error("estimateGas failed for dex_swap step and refresh-step returned no step");
+      }
+      if (refreshed.step.kind !== "dex_swap") {
+        throw new Error(`refresh-step returned unexpected step kind: ${refreshed.step.kind}`);
+      }
+      effectiveStep = refreshed.step;
+      txRequest = {
+        account,
+        to: effectiveStep.to,
+        data: effectiveStep.calldata,
+        value: effectiveStep.value ? BigInt(effectiveStep.value) : undefined
+      };
+      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()
     });
+    await context.onExecuteStep?.(effectiveStep.kind === "approval" ? "approval" : "transaction");
     const txHash = await walletClient.sendTransaction({
       ...txRequest,
       gas: gasLimit
@@ -344,12 +381,13 @@ class RiftSdk {
       hash: txHash
     });
     if (receipt.status !== "success") {
-      throw new Error(`EVM step transaction reverted (${step.kind}) with hash ${txHash}`);
+      throw new Error(`EVM step transaction reverted (${effectiveStep.kind}) with hash ${txHash}`);
     }
     return { txHash };
   }
   async executeBtcTransferStep(step, context) {
     const sendBitcoin = this.requireSendBitcoin(context);
+    await context.onExecuteStep?.("transaction");
     await sendBitcoin({
       recipient: step.toAddress,
       amountSats: step.amountSats

package/package.json

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