Merge pull request #269 from skip-mev/smart-swap

package.json

@@ -65,7 +65,7 @@
     "@radix-ui/react-switch": "^1.0.3",
     "@radix-ui/react-tooltip": "^1.0.7",
     "@sentry/nextjs": "^7.99.0",
-    "@skip-router/core": "^3.0.1",
+    "@skip-router/core": "4.0.0",
     "@solana/spl-token": "^0.4.1",
     "@solana/wallet-adapter-react": "^0.15.35",
     "@solana/wallet-adapter-wallets": "^0.19.31",

src/components/PreviewRoute/ChainStep.tsx

@@ -271,7 +271,7 @@ export const ChainStep = ({
           )}
         </div>
         <div className="flex flex-1 flex-col space-y-0">
-          {swapAction && signRequired && !isSource ? (
+          {swapAction && signRequired && (!isSource || (isSource && route.chainIDs.length === 1)) ? (
             <AssetSwap
               in={{
                 amount: swapAction.amountIn,

src/components/PreviewRoute/make-actions.ts

@@ -1,4 +1,4 @@
-import { BridgeType, RouteResponse, SwapVenue } from "@skip-router/core";
+import { BridgeType, RouteResponse } from "@skip-router/core";
 
 export interface TransferAction {
   type: "TRANSFER";
@@ -19,7 +19,6 @@ export interface SwapAction {
   denomIn: string;
   denomOut: string;
   chainID: string;
-  swapVenue: SwapVenue;
   id: string;
   signRequired: boolean;
   amountIn: string;
@@ -48,34 +47,18 @@ export const makeActions = ({ route }: { route: RouteResponse }): Action[] => {
     })();
 
     if ("swap" in operation) {
-      if ("swapIn" in operation.swap) {
-        _actions.push({
-          type: "SWAP",
-          denomIn: operation.swap.denomIn,
-          denomOut: operation.swap.denomOut,
-          chainID: operation.swap.chainID,
-          id: `swap-${swapCount}-${transferCount}-${i}`,
-          swapVenue: operation.swap.swapIn.swapVenue,
-          signRequired,
-          amountIn: operation.amountIn,
-          amountOut: operation.amountOut,
-          txIndex: operation.txIndex,
-        });
-      }
-      if ("swapOut" in operation.swap) {
-        _actions.push({
-          type: "SWAP",
-          denomIn: operation.swap.denomIn,
-          denomOut: operation.swap.denomOut,
-          chainID: operation.swap.chainID,
-          id: `swap-${swapCount}-${transferCount}-${i}`,
-          swapVenue: operation.swap.swapOut.swapVenue,
-          signRequired,
-          amountIn: operation.amountIn,
-          amountOut: operation.amountOut,
-          txIndex: operation.txIndex,
-        });
-      }
+      _actions.push({
+        type: "SWAP",
+        denomIn: operation.swap.denomIn,
+        denomOut: operation.swap.denomOut,
+        chainID: operation.swap.chainID,
+        id: `swap-${swapCount}-${transferCount}-${i}`,
+        signRequired,
+        amountIn: operation.amountIn,
+        amountOut: operation.amountOut,
+        txIndex: operation.txIndex,
+      });
+
       swapCount++;
       return;
     }

src/solve/queries.ts

@@ -133,6 +133,9 @@ export function useRoute({
                 allowUnsafe: true,
                 experimentalFeatures,
                 smartRelay: true,
+                smartSwapOptions: {
+                  splitRoutes: true,
+                },
               }
             : {
                 amountOut: amount,
@@ -145,6 +148,9 @@ export function useRoute({
                 allowUnsafe: true,
                 experimentalFeatures,
                 smartRelay: true,
+                smartSwapOptions: {
+                  splitRoutes: true,
+                },
               },
         );