pendleCurve adapter

.github/workflows/unit-tests-router.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Use Node.js 18.14.2
+      - name: Use Node.js 21.1.0
         uses: actions/setup-node@v3
         with:
-          node-version: 18.14.2
+          node-version: 21.1.0
       - name: Build for testing router
         run: |
           cd packages/router

packages/deploy/src/config.ts

@@ -379,6 +379,55 @@ export enum Dex {
   Woofi,
 }
 
+export type AdapterPair =
+  | GeneralAdapterPair
+  | PendleUniswapAdapterPair
+  | PendleMarketAdapterPair
+  | PendleCurveAdapterPair
+  | PendleCurveRouterAdapterPair;
+
+export interface GeneralAdapterPair {
+  tokenAId: string;
+  tokenBId: string;
+  poolAddress: string;
+}
+
+export interface PendleUniswapAdapterPair {
+  tokenAId: string;
+  tokenBId: string;
+  poolAddress: string;
+  ibTokenId: string;
+  pendleMarket: string;
+  slippage: number;
+}
+
+export interface PendleMarketAdapterPair {
+  tokenAId: string;
+  tokenBId: string;
+  poolAddress: string;
+  slippage: number;
+}
+
+export interface PendleCurveAdapterPair {
+  ibTokenId: string;
+  quoteTokenId: string;
+  curvePool: string;
+  pendleMarket: string;
+  slippage: number;
+  curveSlippage: number;
+}
+
+export interface PendleCurveRouterAdapterPair {
+  tokenAId: string;
+  tokenBId: string;
+  pendleMarket: string;
+  slippage: number;
+  curveRoute: string[];
+  curveSwapParams: number[][];
+  curvePools: string[];
+  curveSlippage: number;
+}
+
 export interface MarginlyDeployConfig {
   connection: EthConnectionConfig;
   tokens: MarginlyDeployConfigToken[];
@@ -389,14 +438,8 @@ export interface MarginlyDeployConfig {
     dexId: number;
     adapterName: string;
     balancerVault?: string;
-    pools: {
-      tokenAId: string;
-      tokenBId: string;
-      poolAddress: string;
-      ibTokenId?: string;
-      pendleMarket?: string;
-      slippage?: number;
-    }[];
+    curveRouter?: string;
+    pools: AdapterPair[];
   }[];
   marginlyFactory: {
     feeHolder: string;

packages/deploy/src/deployer/MarginlyRouterDeployer.ts

@@ -7,8 +7,12 @@ import {
   AdapterParam,
   MarginlyAdapterParam,
   PendleAdapterParam,
+  PendleCurveAdapterParam,
+  PendleCurveRouterAdapterParam,
   PendleMarketAdapterParam,
   isPendleAdapter,
+  isPendleCurveAdapter,
+  isPendleCurveRouterAdapter,
   isPendleMarketAdapter,
 } from './configs';
 import { EthOptions } from '../config';
@@ -24,7 +28,8 @@ export class MarginlyRouterDeployer extends BaseDeployer {
     dexId: BigNumber,
     adapterName: string,
     pools: AdapterParam[],
-    balancerVault?: EthAddress
+    balancerVault?: EthAddress,
+    curveRouter?: EthAddress
   ): Promise<DeployResult> {
     let args: any[];
     if (isPendleAdapter(pools[0])) {
@@ -55,6 +60,39 @@ export class MarginlyRouterDeployer extends BaseDeployer {
           ];
         }),
       ];
+    } else if (isPendleCurveAdapter(pools[0])) {
+      args = [
+        pools.map((x) => {
+          const locConfig = x as PendleCurveAdapterParam;
+          return [
+            locConfig.pendleMarket.toString(),
+            locConfig.slippage,
+            locConfig.curveSlippage,
+            locConfig.curvePool.toString(),
+            tokenRepository.getTokenInfo(locConfig.ibToken.id).address.toString(),
+            tokenRepository.getTokenInfo(locConfig.quoteToken.id).address.toString(),
+          ];
+        }),
+      ];
+    } else if (isPendleCurveRouterAdapter(pools[0])) {
+      if (!curveRouter) {
+        throw new Error('CurveRouter address is required for PendleCurveRouterAdapter');
+      }
+
+      args = [
+        curveRouter.toString(),
+        pools.map((x) => {
+          const locConfig = x as PendleCurveRouterAdapterParam;
+          return [
+            locConfig.pendleMarket.toString(),
+            locConfig.slippage,
+            locConfig.curveSlippage,
+            locConfig.curveRoute.map((y) => y.toString()),
+            locConfig.curveSwapParams,
+            locConfig.curvePools.map((y) => y.toString()),
+          ];
+        }),
+      ];
     } else {
       args = [
         pools.map((x) => {
@@ -66,6 +104,7 @@ export class MarginlyRouterDeployer extends BaseDeployer {
           ];
         }),
       ];
+
       if (balancerVault !== undefined) {
         args.push(balancerVault.toString());
       }