Merge branch 'master' into aburkut/back-1824-gyro-eclp-pricing-issue

paraswap · Jan 16, 2025 · bb83a37 · bb83a37
2 parents 3386ea4 + accfda9
commit bb83a37
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 51 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@paraswap/dex-lib",
-  "version": "4.0.19",
+  "version": "4.0.21",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "repository": "https://github.com/paraswap/paraswap-dex-lib",

diff --git a/src/dex/curve-v1/config.ts b/src/dex/curve-v1/config.ts
@@ -617,23 +617,6 @@ export const CurveV1Config: DexConfigMap<DexParams> = {
           isMetapool: false,
           baseToken: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
         },
-        SAAVE: {
-          underlying: [
-            '0x6b175474e89094c44da98b954eedeac495271d0f',
-            '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51',
-          ],
-          coins: [
-            '0x028171bCA77440897B824Ca71D1c56caC55b68A3',
-            '0x6C5024Cd4F8A59110119C56f8933403A539555EB',
-          ],
-          address: '0xeb16ae0052ed37f479f7fe63849198df1765a733',
-          name: 'SAAVE',
-          type: 2,
-          version: 3,
-          isLending: true,
-          isMetapool: false,
-          baseToken: '0x6b175474e89094c44da98b954eedeac495271d0f',
-        },
         BAC: {
           underlying: [
             '0x3449fc1cd036255ba1eb19d65ff4ba2b8903a69a',
@@ -1025,23 +1008,6 @@ export const CurveV1Config: DexConfigMap<DexParams> = {
           isMetapool: false,
           baseToken: '0xd586E7F844cEa2F87f50152665BCbc2C279D8d70',
         },
-        Ren: {
-          underlying: [
-            '0x50b7545627a5162F82A992c33b87aDc75187B218',
-            '0xDBf31dF14B66535aF65AaC99C32e9eA844e14501',
-          ],
-          coins: [
-            '0x686bEF2417b6Dc32C50a3cBfbCC3bb60E1e9a15D',
-            '0xDBf31dF14B66535aF65AaC99C32e9eA844e14501',
-          ],
-          address: '0x16a7DA911A4DD1d83F3fF066fE28F3C792C50d90',
-          name: 'ren',
-          type: 2,
-          version: 3,
-          isLending: true,
-          isMetapool: false,
-          baseToken: '0x50b7545627a5162F82A992c33b87aDc75187B218',
-        },
       },
     },
     [Network.ARBITRUM]: {

diff --git a/src/dex/curve-v1/curve-v1-e2e.test.ts b/src/dex/curve-v1/curve-v1-e2e.test.ts
@@ -25,26 +25,36 @@ describe('CurveV1 E2E', () => {
     );
 
     const tokensToTest = [
+      // [
+      //   {
+      //     symbol: 'USDC',
+      //     amount: (10 ** 8).toString(),
+      //   },
+      //   {
+      //     symbol: 'DAI',
+      //     amount: (10 ** 8).toString(),
+      //   },
+      // ],
+      // [
+      //   {
+      //     symbol: 'CUSDC',
+      //     amount: (10 ** 8).toString(),
+      //   },
+      //   {
+      //     symbol: 'CDAI',
+      //     amount: (10 ** 8).toString(),
+      //   },
+      // ],
       [
         {
-          symbol: 'USDC',
-          amount: (10 ** 8).toString(),
+          symbol: 'sUSD',
+          amount: '76088500000000000000000',
         },
         {
           symbol: 'DAI',
           amount: (10 ** 8).toString(),
         },
       ],
-      [
-        {
-          symbol: 'CUSDC',
-          amount: (10 ** 8).toString(),
-        },
-        {
-          symbol: 'CDAI',
-          amount: (10 ** 8).toString(),
-        },
-      ],
     ];
 
     const sideToContractMethods = new Map([
@@ -54,7 +64,8 @@ describe('CurveV1 E2E', () => {
           // ContractMethod.simpleSwap,
           // ContractMethod.multiSwap,
           // ContractMethod.megaSwap,
-          ContractMethod.swapExactAmountInOnCurveV1,
+          // ContractMethod.swapExactAmountInOnCurveV1,
+          ContractMethod.swapExactAmountIn,
         ],
       ],
     ]);

diff --git a/src/dex/stkgho/stkgho.ts b/src/dex/stkgho/stkgho.ts
@@ -195,16 +195,18 @@ export class StkGHO extends SimpleExchange implements IDex<StkGHOData> {
     limit: number,
   ): Promise<PoolLiquidity[]> {
     tokenAddress = tokenAddress.toLowerCase();
+    const isGHO = tokenAddress == this.config.GHO;
+    const isStkGHO = tokenAddress == this.config.stkGHO;
 
-    if (tokenAddress == this.config.GHO) {
+    if (isGHO || isStkGHO) {
       return [
         {
           exchange: this.dexKey,
           address: this.config.stkGHO,
           connectorTokens: [
             {
               decimals: 18,
-              address: this.config.stkGHO,
+              address: isGHO ? this.config.stkGHO : this.config.GHO,
             },
           ],
           liquidityUSD: 1_000_000_000_000, // GHO to stkGHO supply is unlimited

diff --git a/tests/constants-e2e.ts b/tests/constants-e2e.ts
@@ -540,6 +540,10 @@ export const Tokens: {
       address: '0x7Bc3485026Ac48b6cf9BaF0A377477Fff5703Af8',
       decimals: 6,
     },
+    waEthUSDC: {
+      address: '0xD4fa2D31b7968E448877f69A96DE69f5de8cD23E',
+      decimals: 6,
+    },
     aaveUSDT: {
       address: '0x23878914efe38d27c4d67ab83ed1b93a74d4086a',
       decimals: 6,
@@ -1791,7 +1795,7 @@ export const Holders: {
     aUSDT: '0x4aef720f7bbe98f916221bbc2fb5a15efe6d2cb8',
     BBAUSD: '0x4361b7425cff39b1be9bf12cee2ef32f89656cda',
     sETH: '0x274d9E726844AB52E351e8F1272e7fc3f58B7E5F',
-    sUSD: '0xcb68110C43C97b6051FEd5e2Bacc2814aDaD1688',
+    sUSD: '0xe44b88dadbac54ba75beaa07aae99b243b0b9f87',
     USDD: '0xf89d7b9c864f589bbf53a82105107622b35eaa40',
     alETH: '0xBD28e1B15EcbE72706A445f77bd17FCd8Fe6f652',
     SHIBA: '0x73af3bcf944a6559933396c1577b257e2054d935',
@@ -1821,6 +1825,7 @@ export const Holders: {
     stataUSDT: '0x6803364AceD5181877abC11E865FB27cB654a426',
     aaveUSDT: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c',
     waEthUSDT: '0xbA1333333333a1BA1108E8412f11850A5C319bA9',
+    waEthUSDC: '0xbA1333333333a1BA1108E8412f11850A5C319bA9',
     weETH: '0x267ed5f71EE47D3E45Bb1569Aa37889a2d10f91e',
     rUSD: '0xEC2eda1C4F981E468ABF62424a10B69B738b498E',
     arUSD: '0xeFc24206053a452e2299BF3b8f964512b041Db4C',