fix response func handleSimulateSwap

oraidex · Apr 25, 2024 · e394946 · e394946
1 parent 1c2de82
commit e394946
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/packages/universal-swap/package.json b/packages/universal-swap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oraichain/oraidex-universal-swap",
-  "version": "1.0.73",
+  "version": "1.0.74",
   "main": "build/index.js",
   "files": [
     "build/"

diff --git a/packages/universal-swap/src/helper.ts b/packages/universal-swap/src/helper.ts
@@ -653,25 +653,31 @@ export class UniversalSwapHelper {
       throw new Error(
         `Cannot find token on Oraichain for token ${query.originalFromInfo.coinGeckoId} and ${query.originalToInfo.coinGeckoId}`
       );
-    const amount = query.useSmartRoute
-      ? (
-          await UniversalSwapHelper.simulateSwapUsingSmartRoute({
-            fromInfo,
-            toInfo,
-            amount: toAmount(query.originalAmount, fromInfo.decimals).toString()
-          })
-        ).returnAmount
-      : (
-          await UniversalSwapHelper.simulateSwap({
-            fromInfo,
-            toInfo,
-            amount: toAmount(query.originalAmount, fromInfo.decimals).toString(),
-            routerClient: query.routerClient
-          })
-        ).amount;
+    let amount;
+    let routes = [];
+    if (query.useSmartRoute) {
+      const { returnAmount, routes: routesSwap }: SmartRouterResponse =
+        await UniversalSwapHelper.simulateSwapUsingSmartRoute({
+          fromInfo,
+          toInfo,
+          amount: toAmount(query.originalAmount, fromInfo.decimals).toString()
+        });
+      routes = routesSwap;
+      amount = returnAmount;
+    } else {
+      amount = (
+        await UniversalSwapHelper.simulateSwap({
+          fromInfo,
+          toInfo,
+          amount: toAmount(query.originalAmount, fromInfo.decimals).toString(),
+          routerClient: query.routerClient
+        })
+      ).amount;
+    }
     return {
       amount,
-      displayAmount: toDisplay(amount, getTokenOnOraichain(toInfo.coinGeckoId)?.decimals)
+      displayAmount: toDisplay(amount, getTokenOnOraichain(toInfo.coinGeckoId)?.decimals),
+      routes
     };
   };
 

diff --git a/packages/universal-swap/src/types.ts b/packages/universal-swap/src/types.ts
@@ -16,6 +16,7 @@ export enum SwapDirection {
 export interface SimulateResponse {
   amount: Uint128;
   displayAmount: number;
+  routes?: SmartRouteSwapOperations[];
 }
 
 export interface SwapData {