@paraswap/dex-lib 3.7.9-dex-deprecation.0 → 3.8.1

package/src/dex/curve-v1-factory/state-polling-pools/pool-polling-base.ts

@@ -5,7 +5,13 @@ import {
   MAX_ALLOWED_STATE_DELAY_FACTOR,
   MIN_LIQUIDITY_IN_USD,
 } from '../constants';
-import { CurveV1FactoryData, PoolConstants, PoolState } from '../types';
+import {
+  CurveV1FactoryData,
+  ImplementationNames,
+  PoolConstants,
+  PoolContextConstants,
+  PoolState,
+} from '../types';
 import { Address } from '@paraswap/core';
 
 export type MulticallReturnedTypes = bigint | bigint[];
@@ -38,11 +44,12 @@ export abstract class PoolPollingBase {
     readonly dexKey: string,
     readonly network: number,
     readonly cacheStateKey: string,
-    readonly implementationName: string,
+    readonly implementationName: ImplementationNames,
     readonly implementationAddress: Address,
     readonly stateUpdatePeriodMs: number,
     readonly poolIdentifier: string,
     readonly poolConstants: PoolConstants,
+    readonly poolContextConstants: PoolContextConstants,
     readonly address: Address,
     readonly curveLiquidityApiSlug: string,
     readonly isLendingPool: boolean,
@@ -120,10 +127,17 @@ export abstract class PoolPollingBase {
 
     if (iC !== undefined && jC !== undefined) {
       return {
-        exchange: this.address,
-        i: iC,
-        j: jC,
-        underlyingSwap: false,
+        path: [
+          {
+            tokenIn: srcAddress,
+            tokenOut: destAddress,
+            exchange: this.address,
+            i: iC,
+            j: jC,
+            underlyingSwap: false,
+            n_coins: this.poolConstants.COINS.length,
+          },
+        ],
       };
     }
 
@@ -140,10 +154,17 @@ export abstract class PoolPollingBase {
       // I expect them to be included in old CurveV1 implementation
       if (iU !== undefined && jU !== undefined && !(iU > 0 && jU > 0)) {
         return {
-          exchange: this.address,
-          i: iU,
-          j: jU,
-          underlyingSwap: true,
+          path: [
+            {
+              tokenIn: srcAddress,
+              tokenOut: destAddress,
+              exchange: this.address,
+              i: iU,
+              j: jU,
+              underlyingSwap: true,
+              n_coins: this.poolConstants.COINS.length,
+            },
+          ],
         };
       }
     }

package/src/dex/curve-v1-factory/types.ts

@@ -15,6 +15,7 @@ export type PoolContextConstants = {
   // for all pools
   isWrapNative: boolean;
   isLending: boolean;
+  isStable?: boolean;
 
   // Starting from this point, constants are context relevant for pricing
 
@@ -68,10 +69,15 @@ export type PoolStateWithUpdateInfo<T> = {
 };
 
 export type CurveV1FactoryData = {
-  exchange: Address;
-  i: number;
-  j: number;
-  underlyingSwap: boolean;
+  path: {
+    tokenIn: Address;
+    tokenOut: Address;
+    exchange: Address;
+    i: number;
+    j: number;
+    underlyingSwap: boolean;
+    n_coins: number;
+  }[];
   isApproved?: boolean;
 };
 
@@ -118,8 +124,6 @@ export enum FactoryImplementationNames {
   FACTORY_PLAIN_4_OPTIMIZED = 'factory_plain_4_optimized',
 
   FACTORY_STABLE_NG = 'factory_stable_ng',
-  // FACTORY_STABLE_6_NG = 'factory_stable_6_ng',
-  // FACTORY_STABLE_8_NG = 'factory_stable_8_ng',
 }
 
 export enum CustomImplementationNames {
@@ -188,6 +192,7 @@ type DexParamFactory = {
 
 export type DexParams = {
   factories: DexParamFactory[] | null;
+  router: Address;
   stateUpdatePeriodMs: number;
   factoryPoolImplementations: Record<Address, FactoryPoolImplementations>;
   customPools: Record<string, CustomPoolConfig>;
@@ -202,8 +207,19 @@ export enum CurveSwapFunctions {
   exchange_underlying = 'exchange_underlying',
 }
 
+export enum CurveRouterSwapType {
+  exchange = 1,
+  exchange_underlying = 2,
+}
+
+export enum CurveRouterPoolType {
+  non_stable = 0,
+  stable = 10,
+}
+
 export type CurveV1FactoryIfaces = {
   exchangeRouter: Interface;
+  curveV1Router: Interface;
   factory: Interface;
   erc20: Interface;
   threePool: Interface;

package/src/dex/curve-v1-stable-ng/config.ts

@@ -13,6 +13,7 @@ const CurveV1StableNgConfig: DexConfigMap<DexParams> = {
           isStableNg: true,
         },
       ],
+      router: '0x16C6521Dff6baB339122a0FE25a9116693265353', // https://github.com/curvefi/curve-router-ng
       stateUpdatePeriodMs: 5 * 1000,
       disabledPools: new Set([]),
       disabledImplementations: new Set([]),
@@ -59,6 +60,18 @@ const CurveV1StableNgConfig: DexConfigMap<DexParams> = {
           liquidityApiSlug: '/factory-stable-ng',
           isStoreRateSupported: true,
         },
+        '0xc65cb3156225380beda366610bab18d5835a1647': {
+          name: ImplementationNames.FACTORY_STABLE_NG,
+          address: '0xc65cb3156225380beda366610bab18d5835a1647',
+          liquidityApiSlug: '/factory-stable-ng',
+          isStoreRateSupported: true,
+        },
+        '0xa0ec67a3c483674f77915893346a8ca3abe2b785': {
+          name: ImplementationNames.FACTORY_STABLE_NG,
+          address: '0xa0ec67a3c483674f77915893346a8ca3abe2b785',
+          liquidityApiSlug: '/factory-stable-ng',
+          isStoreRateSupported: true,
+        },
       },
       customPools: {},
     },
@@ -69,6 +82,7 @@ const CurveV1StableNgConfig: DexConfigMap<DexParams> = {
           isStableNg: true,
         },
       ],
+      router: '0x0DCDED3545D565bA3B19E683431381007245d983', // https://github.com/curvefi/curve-router-ng
       stateUpdatePeriodMs: 2 * 1000,
       disabledPools: new Set([]),
       disabledImplementations: new Set([]),
@@ -95,6 +109,7 @@ const CurveV1StableNgConfig: DexConfigMap<DexParams> = {
           isStableNg: true,
         },
       ],
+      router: '0x0DCDED3545D565bA3B19E683431381007245d983', // https://github.com/curvefi/curve-router-ng
       stateUpdatePeriodMs: 2 * 1000,
       disabledPools: new Set([]),
       disabledImplementations: new Set([]),
@@ -115,6 +130,7 @@ const CurveV1StableNgConfig: DexConfigMap<DexParams> = {
           isStableNg: true,
         },
       ],
+      router: '0x2191718CD32d02B8E60BAdFFeA33E4B5DD9A0A0D', // https://github.com/curvefi/curve-router-ng
       stateUpdatePeriodMs: 2 * 1000,
       disabledPools: new Set([]),
       disabledImplementations: new Set([]),
@@ -141,6 +157,7 @@ const CurveV1StableNgConfig: DexConfigMap<DexParams> = {
           isStableNg: true,
         },
       ],
+      router: '0x0DCDED3545D565bA3B19E683431381007245d983', // https://github.com/curvefi/curve-router-ng
       stateUpdatePeriodMs: 2 * 1000,
       disabledPools: new Set([]),
       disabledImplementations: new Set([]),
@@ -161,6 +178,7 @@ const CurveV1StableNgConfig: DexConfigMap<DexParams> = {
           isStableNg: true,
         },
       ],
+      router: '0x4f37A9d177470499A2dD084621020b023fcffc1F', // https://github.com/curvefi/curve-router-ng
       stateUpdatePeriodMs: 2 * 1000,
       disabledPools: new Set([]),
       disabledImplementations: new Set([]),

package/src/dex/curve-v1-stable-ng/curve-v1-stable-ng-e2e.test.ts

@@ -63,6 +63,23 @@ describe('CurveV1StableNG E2E', () => {
         sidesToContractMethods,
       );
     });
+
+    describe('GHO -> crvUSD', () => {
+      const tokenASymbol: string = 'GHO';
+      const tokenBSymbol: string = 'crvUSD';
+
+      const tokenAAmount: string = '1000000000000000000';
+      const tokenBAmount: string = '1000000000000000000';
+
+      testForNetwork(
+        network,
+        dexKey,
+        tokenASymbol,
+        tokenBSymbol,
+        tokenAAmount,
+        tokenBAmount,
+      );
+    });
   });
 
   describe('Polygon', () => {

package/src/dex/index.ts

@@ -55,6 +55,7 @@ import { CurveFork } from './curve-v1/forks/curve-forks/curve-forks';
 import { Swerve } from './curve-v1/forks/swerve/swerve';
 import { CurveV1Factory } from './curve-v1-factory/curve-v1-factory';
 import { CurveV1StableNg } from './curve-v1-stable-ng/curve-v1-stable-ng';
+import { curveV1Merge } from './curve-v1-factory/optimizer';
 import { GenericRFQ } from './generic-rfq/generic-rfq';
 import { WstETH } from './wsteth/wsteth';
 import { Camelot } from './camelot/camelot';
@@ -187,6 +188,7 @@ export class DexAdapterService {
     balancerV1Merge,
     balancerV2Merge,
     uniswapMerge,
+    curveV1Merge,
   ];
 
   constructor(
@@ -322,8 +324,7 @@ export class DexAdapterService {
     if (this.genericRFQDexKeys.has(dexKey)) {
       return dexKey;
     }
-    if (!isAdapters && /^paraswappool(.*)/i.test(dexKey)) return 'zerox';
-    else if ('uniswapforkoptimized' === dexKey) {
+    if ('uniswapforkoptimized' === dexKey) {
       if (!this.uniswapV2Alias)
         throw new Error(
           `${dexKey} dex is not supported for network(${this.network})!`,

package/src/generic-swap-transaction-builder.ts

@@ -623,9 +623,7 @@ export class GenericSwapTransactionBuilder {
     // This assumes that the sum of all swaps srcAmount would sum to priceRoute.srcAmount
     // Also that it is a direct swap.
     const _srcAmount =
-      swapIndex > 0 ||
-      side === SwapSide.SELL ||
-      this.dexAdapterService.getDexKeySpecial(se.exchange) === 'zerox'
+      swapIndex > 0 || side === SwapSide.SELL
         ? se.srcAmount
         : (
             (BigInt(se.srcAmount) * BigInt(minMaxAmount)) /

package/src/router/simpleswap.ts

@@ -103,9 +103,7 @@ export abstract class SimpleRouterBase<RouterParam>
           // This assumes that the sum of all swaps srcAmount would sum to priceRoute.srcAmount
           // Also that it is a direct swap.
           const _srcAmount =
-            swapIndex > 0 ||
-            this.side === SwapSide.SELL ||
-            this.dexAdapterService.getDexKeySpecial(se.exchange) === 'zerox'
+            swapIndex > 0 || this.side === SwapSide.SELL
               ? se.srcAmount
               : (
                   (BigInt(se.srcAmount) * BigInt(minMaxAmount)) /

package/tests/constants-e2e.ts

@@ -1556,7 +1556,7 @@ export const Holders: {
     USDA: '0x2686bC6A56D205010637CE1DF124b20Cb19E4054',
     stUSD: '0x4e83c0a323b68E3Bc7CC8a4E35326Fd0544A291E',
     crvUSD: '0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635',
-    GHO: '0x844Dc85EdD8492A56228D293cfEbb823EF3E10EC',
+    GHO: '0x0F11640BF66e2D9352d9c41434A5C6E597c5e4c8',
     wibBTC: '0xFbdCA68601f835b27790D98bbb8eC7f05FDEaA9B',
     MATIC: '0x7073783eee7e9b3e6e4ddac4d7f49dc46044dd9a',
     POL: '0x05A47D9f589a001C15E38D068dCc5DaE6D96a2eb',

package/tests/utils-e2e.ts

@@ -43,6 +43,7 @@ import {
   constructSimpleSDK,
   SimpleFetchSDK,
 } from '@paraswap/sdk';
+import { ParaSwapVersion } from '@paraswap/core';
 import axios from 'axios';
 import { SmartToken, StateOverrides } from './smart-tokens';
 import {
@@ -127,6 +128,7 @@ class APIParaswapSDK implements IParaSwapSDK {
   ) {
     this.dexKeys = Array.isArray(dexKeys) ? dexKeys : [dexKeys];
     this.paraSwap = constructSimpleSDK({
+      version: ParaSwapVersion.V6,
       chainId: network,
       axios,
       apiURL: testingEndpoint,