update func gen smart router osmosis pool

packages/universal-swap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oraichain/oraidex-universal-swap",
-  "version": "1.0.89-beta.2",
+  "version": "1.0.89-beta.3",
   "main": "build/index.js",
   "files": [
     "build/"

packages/universal-swap/src/handler.ts

@@ -315,7 +315,7 @@ export class UniversalSwapHandler {
     return receiver;
   };
 
-  private getSwapAndActionInOsmosis(
+  public getSwapAndActionInOsmosis(
     route: Routes,
     { oraiAddress, injAddress },
     isOnlySwap: boolean,
@@ -420,7 +420,7 @@ export class UniversalSwapHandler {
     return { msgTransferInfo };
   }
 
-  private createForwardObject = (route: Routes, { oraiAddress, injAddress }) => {
+  public createForwardObject = (route: Routes, { oraiAddress, injAddress }) => {
     const { prefixReceiver, chainInfoReceiver } = this.getPrefixCosmos(route);
     return {
       msgForwardObject: {
@@ -456,7 +456,7 @@ export class UniversalSwapHandler {
     return { prefixRecover, prefixReceiver, chainInfoRecover, chainInfoReceiver };
   };
 
-  private getMsgTransfer = (route: Routes, { oraiAddress, injAddress }) => {
+  public getMsgTransfer = (route: Routes, { oraiAddress, injAddress }) => {
     const { prefixReceiver, prefixRecover, chainInfoRecover, chainInfoReceiver } = this.getPrefixCosmos(route);
     return {
       sourcePort: route.bridgeInfo.port,
@@ -486,10 +486,12 @@ export class UniversalSwapHandler {
   getMessagesAndMsgTransfers = (routeFlatten: Routes[], { oraiAddress, injAddress }) => {
     let messages = [];
     let msgTransfers = [];
-    let pathProperty = "";
+    let pathProperty = [];
+    let pathReceiver = [];
 
     routeFlatten.forEach((route: Routes, index: number, routes: Routes[]) => {
-      const isLastRoute = index + 1 === routes.length;
+      const isLastRoute = route.isLastPath;
+
       const isOsmosisChain = route.chainId === "osmosis-1";
       const isSwap = route.type === "Swap";
       const isConvert = route.type === "Convert";
@@ -511,30 +513,46 @@ export class UniversalSwapHandler {
               true
             );
             msgTransfers[route.path] = msgActionSwap;
-            pathProperty = "msg.swap_and_action.post_swap_action";
+            pathProperty[route.path] = "msg.swap_and_action.post_swap_action";
+            pathReceiver[route.path] = isLastRoute
+              ? pathProperty[route.path] + ".transfer.to_address"
+              : pathProperty[route.path] + ".ibc_transfer.ibc_info.receiver";
           } else {
             msgTransfers[route.path] = this.getMsgTransfer(route, { oraiAddress, injAddress });
-            pathProperty = "memo";
+            pathProperty[route.path] = "memo";
+            pathReceiver[route.path] = "receiver";
           }
         } else {
           if (isOsmosisChain) {
             if (isSwap) {
               const { msgActionSwap } = this.getSwapAndActionInOsmosis(route, { oraiAddress, injAddress }, isLastRoute);
-              this.updateNestedProperty(msgTransfers[route.path], pathProperty, msgActionSwap);
-              pathProperty += ".wasm.msg.swap_and_action.post_swap_action";
+              this.updateNestedProperty(msgTransfers[route.path], pathProperty[route.path], msgActionSwap);
+              pathProperty[route.path] += ".wasm.msg.swap_and_action.post_swap_action";
+              pathReceiver[route.path] = isLastRoute
+                ? pathProperty[route.path] + ".transfer.to_address"
+                : pathProperty[route.path] + ".ibc_transfer.ibc_info.receiver";
             } else if (index > 0 && routes[index - 1].chainId === route.chainId) {
               const { msgTransferInfo } = this.getIbcTransferInfo(route, { oraiAddress, injAddress });
-              this.updateNestedProperty(msgTransfers[route.path], pathProperty, msgTransferInfo);
-              pathProperty += ".ibc_transfer.ibc_info.memo";
+              this.updateNestedProperty(msgTransfers[route.path], pathProperty[route.path], msgTransferInfo);
+              pathReceiver[route.path] = pathProperty[route.path] + ".ibc_transfer.ibc_info.receiver";
+              pathProperty[route.path] += ".ibc_transfer.ibc_info.memo";
             }
           } else {
             const { msgForwardObject } = this.createForwardObject(route, { oraiAddress, injAddress });
-            this.updateNestedProperty(msgTransfers[route.path], pathProperty, msgForwardObject);
-            pathProperty += ".forward.next";
+            this.updateNestedProperty(msgTransfers[route.path], pathProperty[route.path], msgForwardObject);
+            pathProperty[route.path] += ".forward.next";
+            pathReceiver[route.path] = pathProperty[route.path] + ".receiver";
           }
         }
       }
     });
+
+    if (this.swapData?.recipientAddress && msgTransfers?.length) {
+      msgTransfers.forEach((msg, i) =>
+        this.updateNestedReceiveProperty(msg, pathReceiver[i], this.swapData.recipientAddress)
+      );
+    }
+
     return { messages, msgTransfers };
   };
 
@@ -553,7 +571,7 @@ export class UniversalSwapHandler {
       }
     );
 
-    const { routesFlatten } = this.flattenSmartRouters(alphaSmartRoutes.routes);
+    const routesFlatten = this.flattenSmartRouters(alphaSmartRoutes.routes);
     const [oraiAddress, injAddress] = await Promise.all([
       this.config.cosmosWallet.getKeplrAddr("Oraichain"),
       this.config.cosmosWallet.getKeplrAddr("injective-1")
@@ -589,17 +607,18 @@ export class UniversalSwapHandler {
     return client.signAndBroadcast(this.swapData.sender.cosmos, [...msgExecuteSwap, ...transferStringifyMemo], "auto");
   }
 
-  private flattenSmartRouters(routers: Route[]) {
+  flattenSmartRouters(routers: Route[]): Routes[] {
     const routesFlatten = routers.flatMap((router, i) =>
-      router.paths.flatMap((path) =>
-        path.actions.map((action) => ({
+      router.paths.flatMap((path, ind, arrPath) =>
+        path.actions.map((action, index, arrAction) => ({
           ...action,
           path: i,
-          chainId: path.chainId
+          chainId: path.chainId,
+          isLastPath: arrPath.length === ind + 1 && !arrAction[index + 1]
         }))
       )
     );
-    return { routesFlatten };
+    return routesFlatten;
   }
 
   private updateNestedProperty = (obj, key, value) => {
@@ -610,6 +629,19 @@ export class UniversalSwapHandler {
     }, obj)[keys[keys.length - 1]] = value;
   };
 
+  private updateNestedReceiveProperty = (obj, path: string, value: any) => {
+    const keys = path.split(".");
+    let current = obj;
+    for (let i = 0; i < keys.length - 1; i++) {
+      if (!current[keys[i]]) {
+        throw new Error(`Invalid path: ${keys.slice(0, i + 1).join(".")}`);
+      }
+      current = current[keys[i]];
+    }
+    current[keys[keys.length - 1]] = value;
+    return obj;
+  };
+
   private stringifyMemos = (obj) => {
     for (let key in obj) {
       if (obj.hasOwnProperty(key)) {
@@ -1056,15 +1088,15 @@ export class UniversalSwapHandler {
       msg: {
         send: {
           contract: network.converter,
-          amount: route.tokenOutAmount,
+          amount: route.tokenInAmount,
           msg: toBinary({
             convert_reverse: {
               from: { native_token: { denom: route.tokenOut } }
             }
           })
         }
       },
-      fund: undefined
+      funds: []
     };
   }
 

packages/universal-swap/src/types.ts

@@ -252,6 +252,7 @@ interface RouteBase {
   tokenInAmount: string;
   tokenOut: string;
   tokenOutAmount: string;
+  isLastPath: boolean;
 }
 
 export interface Routes extends RouteBase {