@paraswap/dex-lib 3.7.3-idle.2 → 3.7.3-idle.4

package/src/dex/aave-v3-stata/utils.ts

@@ -0,0 +1,84 @@
+// import {
+//   IStaticATokenFactory_ABI,
+//   IStaticATokenLM_ABI,
+// } from '@bgd-labs/aave-address-book';
+import { Interface } from '@ethersproject/abi';
+import Web3 from 'web3';
+import { MultiCallParams, MultiWrapper } from '../../lib/multi-wrapper';
+import { stringDecode, uint8ToNumber, addressDecode } from '../../lib/decoders';
+import { StataToken } from './types';
+import FactoryABI from '../../abi/aavev3stata/Factory.json';
+import TokenABI from '../../abi/aavev3stata/Token.json';
+import { AbiItem } from 'web3-utils';
+
+// const stataInterface = new Interface(IStaticATokenLM_ABI);
+const stataInterface = new Interface(TokenABI);
+
+async function getTokenMetaData(
+  stataTokens: string[],
+  multiWrapper: MultiWrapper,
+  blockNumber?: number,
+): Promise<StataToken[]> {
+  const calls: MultiCallParams<any>[] = stataTokens
+    .map(token => {
+      return [
+        {
+          target: token,
+          callData: stataInterface.encodeFunctionData('symbol'),
+          decodeFunction: stringDecode,
+        },
+        {
+          target: token,
+          callData: stataInterface.encodeFunctionData('decimals'),
+          decodeFunction: uint8ToNumber,
+        },
+        {
+          target: token,
+          callData: stataInterface.encodeFunctionData('asset'),
+          decodeFunction: addressDecode,
+        },
+        {
+          target: token,
+          callData: stataInterface.encodeFunctionData('aToken'),
+          decodeFunction: addressDecode,
+        },
+      ];
+    })
+    .flat();
+
+  const results = await multiWrapper.aggregate<string | number>(
+    calls,
+    blockNumber,
+  );
+
+  let tokenList: StataToken[] = [];
+  for (let i = 0, x = 0; i < stataTokens.length; ++i, x += 4) {
+    tokenList.push({
+      address: stataTokens[i].toLowerCase(),
+      stataSymbol: results[x] as string,
+      decimals: results[x + 1] as number,
+      underlying: (results[x + 2] as string).toLowerCase(),
+      underlyingAToken: (results[x + 3] as string).toLowerCase(),
+    });
+  }
+  return tokenList;
+}
+
+export const fetchTokenList = async (
+  web3Provider: Web3,
+  factoryAddress: string,
+  multiWrapper: MultiWrapper,
+  blockNumber?: number,
+): Promise<StataToken[]> => {
+  let factoryContract = new web3Provider.eth.Contract(
+    FactoryABI as AbiItem[],
+    // IStaticATokenFactory_ABI as any,
+    factoryAddress,
+  );
+
+  let stataList: string[] = await factoryContract.methods
+    .getStaticATokens()
+    .call();
+
+  return getTokenMetaData(stataList, multiWrapper, blockNumber);
+};

package/src/dex/balancer-v2/balancer-v2.ts

@@ -82,7 +82,6 @@ import { hexConcat, hexlify, hexZeroPad, solidityPack } from 'ethers/lib/utils';
 import BalancerVaultABI from '../../abi/balancer-v2/vault.json';
 import { BigNumber } from 'ethers';
 import { SpecialDex } from '../../executor/types';
-import { S } from '@bgd-labs/aave-address-book/dist/AaveV2Ethereum-timF4kft';
 import { extractReturnAmountPosition } from '../../executor/utils';
 
 // If you disable some pool, don't forget to clear the cache, otherwise changes won't be applied immediately

package/src/dex/idle-dao/config.ts

@@ -24,286 +24,3 @@ export const endpoints: Record<number, string> = {
   [Network.OPTIMISM]: 'https://api-optimism.idle.finance/pools',
   [Network.ZKEVM]: 'https://api-zkevm.idle.finance/pools',
 };
-
-export const TOKEN_LISTS: IdleToken[] = [
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x34dCd573C5dE4672C8248cd12A99f875Ca112Ad8',
-    idleAddress: '0x2688fc68c4eac90d9e5e1b94776cf14eade8d877',
-    address: '0xae7ab96520de3a18e5e111b5eaab095312d7fe84',
-    decimals: 18,
-    idleSymbol: 'AA_wstETH',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x34dCd573C5dE4672C8248cd12A99f875Ca112Ad8',
-    idleAddress: '0x3a52fa30c33caf05faee0f9c5dfe5fd5fe8b3978',
-    address: '0xae7ab96520de3a18e5e111b5eaab095312d7fe84',
-    decimals: 18,
-    idleSymbol: 'BB_wstETH',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x8E0A8A5c1e5B3ac0670Ea5a613bB15724D51Fc37',
-    idleAddress: '0xdf17c739b666b259da3416d01f0310a6e429f592',
-    address: '0xae7ab96520de3a18e5e111b5eaab095312d7fe84',
-    decimals: 18,
-    idleSymbol: 'AA_iETHv2',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x8E0A8A5c1e5B3ac0670Ea5a613bB15724D51Fc37',
-    idleAddress: '0x990b3af34ddb502715e1070ce6778d8eb3c8ea82',
-    address: '0xae7ab96520de3a18e5e111b5eaab095312d7fe84',
-    decimals: 18,
-    idleSymbol: 'BB_iETHv2',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x1329E8DB9Ed7a44726572D44729427F132Fa290D',
-    idleAddress: '0x9cacd44cfdf22731bc99facf3531c809d56bd4a2',
-    address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-    decimals: 6,
-    idleSymbol: 'AA_idle_cpPOR-USDC',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x1329E8DB9Ed7a44726572D44729427F132Fa290D',
-    idleAddress: '0xf85fd280b301c0a6232d515001da8b6c8503d714',
-    address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-    decimals: 6,
-    idleSymbol: 'BB_idle_cpPOR-USDC',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xc4574C60a455655864aB80fa7638561A756C5E61',
-    idleAddress: '0x0a6f2449c09769950cfb76f905ad11c341541f70',
-    address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
-    decimals: 6,
-    idleSymbol: 'AA_idle_cpFAS-USDT',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xc4574C60a455655864aB80fa7638561A756C5E61',
-    idleAddress: '0x3eb6318b8d9f362a0e1d99f6032edb1c4c602500',
-    address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
-    decimals: 6,
-    idleSymbol: 'BB_idle_cpFAS-USDT',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xE7C6A4525492395d65e736C3593aC933F33ee46e',
-    idleAddress: '0xdca1dae87f5c733c84e0593984967ed756579bee',
-    address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-    decimals: 6,
-    idleSymbol: 'AA_idle_cpFASA-USDC',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xE7C6A4525492395d65e736C3593aC933F33ee46e',
-    idleAddress: '0xbcc845bb731632ebe8ac0bfacde056170aaaaa06',
-    address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-    decimals: 6,
-    idleSymbol: 'BB_idle_cpFASA-USDC',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x5dcA0B3Ed7594A6613c1A2acd367d56E1f74F92D',
-    idleAddress: '0x43ed68703006add5f99ce36b5182392362369c1c',
-    address: '0x6b175474e89094c44da98b954eedeac495271d0f',
-    decimals: 18,
-    idleSymbol: 'AA_idle_cpPOR-USDC',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x5dcA0B3Ed7594A6613c1A2acd367d56E1f74F92D',
-    idleAddress: '0x38d36353d07cfb92650822d9c31fb4ada1c73d6e',
-    address: '0x6b175474e89094c44da98b954eedeac495271d0f',
-    decimals: 18,
-    idleSymbol: 'BB_idle_cpPOR-USDC',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xF87ec7e1Ee467d7d78862089B92dd40497cBa5B8',
-    idleAddress: '0xaef4fcc4e5f2dc270760063446d4116d24704ad1',
-    address: '0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0',
-    decimals: 18,
-    idleSymbol: 'AA_stMATIC',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xF87ec7e1Ee467d7d78862089B92dd40497cBa5B8',
-    idleAddress: '0x077212c69a66261cf7bd1fd3b5c5db7cffa948ee',
-    address: '0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0',
-    decimals: 18,
-    idleSymbol: 'BB_stMATIC',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x87E53bE99975DA318056af5c4933469a6B513768',
-    idleAddress: '0x2b0e31b8ee653d2077db86dea3acf3f34ae9d5d2',
-    address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-    decimals: 6,
-    idleSymbol: 'AA_steakUSDC',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x87E53bE99975DA318056af5c4933469a6B513768',
-    idleAddress: '0x7b713b1cb6eafd4061064581579ffccf7df21545',
-    address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-    decimals: 6,
-    idleSymbol: 'BB_steakUSDC',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xA8d747Ef758469e05CF505D708b2514a1aB9Cc08',
-    idleAddress: '0x454bb3cb427b21e1c052a080e21a57753cd6969e',
-    address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    decimals: 18,
-    idleSymbol: 'AA_Re7WETH',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xA8d747Ef758469e05CF505D708b2514a1aB9Cc08',
-    idleAddress: '0x20aa3cd83044d2903181f7ef5c2b498a017d1c4a',
-    address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    decimals: 18,
-    idleSymbol: 'BB_Re7WETH',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xD071EA5D2575E155E4e9c2234968D1E11B8a920E',
-    idleAddress: '0xb9d321b26095195610707597aab416925c598aab',
-    address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    decimals: 18,
-    idleSymbol: 'AA_Re7WETH',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xD071EA5D2575E155E4e9c2234968D1E11B8a920E',
-    idleAddress: '0xf529f10fe24367d3a123faf0e9d5f6d80980b46f',
-    address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    decimals: 18,
-    idleSymbol: 'BB_Re7WETH',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x9e0c5ee5e4B187Cf18B23745FCF2b6aE66a9B52f',
-    idleAddress: '0x28d8a22c6689ac1e2ddc43ca6f85c520457351c1',
-    address: '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
-    decimals: 18,
-    idleSymbol: 'AA_ampr-LP-ETH',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x9e0c5ee5e4B187Cf18B23745FCF2b6aE66a9B52f',
-    idleAddress: '0xefc4f43737fd336fa8a8254454ced1e421804b16',
-    address: '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
-    decimals: 18,
-    idleSymbol: 'BB_ampr-LP-ETH',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x1EB1b47D0d8BCD9D761f52D26FCD90bBa225344C',
-    idleAddress: '0xf3188697bd35df73e4293d04a07ebaaf1ffc4018',
-    address: '0x4c9edd5852cd905f086c759e8383e09bff1e68b3',
-    decimals: 18,
-    idleSymbol: 'AA_sUSDe',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0x1EB1b47D0d8BCD9D761f52D26FCD90bBa225344C',
-    idleAddress: '0xb8d0be502a8f12cc5213733285b430a43d07349d',
-    address: '0x4c9edd5852cd905f086c759e8383e09bff1e68b3',
-    decimals: 18,
-    idleSymbol: 'BB_sUSDe',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xbc48967C34d129a2ef25DD4dc693Cc7364d02eb9',
-    idleAddress: '0x0f09a04ad551dd941b589625bd2360fc962ff9f7',
-    address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    decimals: 18,
-    idleSymbol: 'AA_dWETHV3',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xbc48967C34d129a2ef25DD4dc693Cc7364d02eb9',
-    idleAddress: '0x1223ddeee77f8f379ea7a49e7650ff1ec1e2de8a',
-    address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    decimals: 18,
-    idleSymbol: 'BB_dWETHV3',
-    tokenType: 'BB',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xdd4D030A4337CE492B55bc5169F6A9568242C0Bc',
-    idleAddress: '0x450c055a00226f1eba09e8d9627034565b7c4c8a',
-    address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-    decimals: 6,
-    idleSymbol: 'AA_dUSDCV3',
-    tokenType: 'AA',
-  },
-  {
-    blockNumber: 0,
-    idleDecimals: 18,
-    cdoAddress: '0xdd4D030A4337CE492B55bc5169F6A9568242C0Bc',
-    idleAddress: '0x2a84a042db06222c486bcb815e961f26599d0df6',
-    address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-    decimals: 6,
-    idleSymbol: 'BB_dUSDCV3',
-    tokenType: 'BB',
-  },
-];

package/src/dex/idle-dao/idle-dao.ts

@@ -25,13 +25,14 @@ import {
   setTokensOnNetwork,
   getPoolsByTokenAddress,
   getTokenFromIdleToken,
+  getIdleTokenByAddress,
 } from './tokens';
 import FACTORY_ABI from '../../abi/idle-dao/idle-cdo-factory.json';
 import CDO_ABI from '../../abi/idle-dao/idle-cdo.json';
+import { extractReturnAmountPosition } from '../../executor/utils';
 
 export const TOKEN_LIST_CACHE_KEY = 'token-list';
 const TOKEN_LIST_TTL_SECONDS = 24 * 60 * 60;
-const TOKEN_LIST_LOCAL_TTL_SECONDS = 3 * 60 * 60;
 
 export class IdleDao extends SimpleExchange implements IDex<IdleDaoData> {
   readonly hasConstantPriceLargeAmounts = false;
@@ -76,7 +77,6 @@ export class IdleDao extends SimpleExchange implements IDex<IdleDaoData> {
       this.tokenList = await fetchTokenList_api(
         this.network,
         this.dexHelper,
-        blockNumber,
         this.cdo,
         this.erc20Interface,
         this.dexHelper.multiWrapper,
@@ -96,10 +96,15 @@ export class IdleDao extends SimpleExchange implements IDex<IdleDaoData> {
   }
 
   async initializePricing(blockNumber: number) {
-    let cachedTokenList = await this.dexHelper.cache.get(
+    await this.initializeTokens(blockNumber);
+  }
+
+  async initializeTokens(blockNumber?: number) {
+    let cachedTokenList = await this.dexHelper.cache.getAndCacheLocally(
       this.dexKey,
       this.network,
       TOKEN_LIST_CACHE_KEY,
+      TOKEN_LIST_TTL_SECONDS,
     );
 
     if (cachedTokenList !== null) {
@@ -113,14 +118,14 @@ export class IdleDao extends SimpleExchange implements IDex<IdleDaoData> {
     this.tokenList = await fetchTokenList_api(
       this.network,
       this.dexHelper,
-      blockNumber,
       this.cdo,
       this.erc20Interface,
       this.dexHelper.multiWrapper,
       this.idleDaoAuthToken,
+      blockNumber,
     );
 
-    await this.dexHelper.cache.setex(
+    await this.dexHelper.cache.setexAndCacheLocally(
       this.dexKey,
       this.network,
       TOKEN_LIST_CACHE_KEY,
@@ -132,12 +137,13 @@ export class IdleDao extends SimpleExchange implements IDex<IdleDaoData> {
   }
 
   getAdapters(side: SwapSide): { name: string; index: number }[] | null {
-    return this.adapters[side] ? this.adapters[side] : null;
+    return null;
   }
 
   private _getPoolIdentifier(srcToken: Token, destToken: Token): string {
     return (
       this.dexKey +
+      '_' +
       [srcToken.address.toLowerCase(), destToken.address.toLowerCase()]
         .sort((a, b) => (a > b ? 1 : -1))
         .join('_')
@@ -300,6 +306,8 @@ export class IdleDao extends SimpleExchange implements IDex<IdleDaoData> {
     _: Context,
     executorAddress: Address,
   ): DexExchangeParam {
+    let returnAmountPos = undefined;
+
     const [Interface, swapCallee, swapFunction, swapFunctionParams] = ((): [
       Interface,
       Address,
@@ -307,6 +315,10 @@ export class IdleDao extends SimpleExchange implements IDex<IdleDaoData> {
       Param,
     ] => {
       if (data.fromIdleToken) {
+        returnAmountPos = extractReturnAmountPosition(
+          this.cdo,
+          PoolFunctions[`withdraw${data.idleToken.tokenType}`],
+        );
         return [
           this.cdo,
           data.idleToken.cdoAddress,
@@ -315,6 +327,10 @@ export class IdleDao extends SimpleExchange implements IDex<IdleDaoData> {
         ];
       }
 
+      returnAmountPos = extractReturnAmountPosition(
+        this.cdo,
+        PoolFunctions[`deposit${data.idleToken.tokenType}`],
+      );
       return [
         this.cdo,
         data.idleToken.cdoAddress,
@@ -333,7 +349,7 @@ export class IdleDao extends SimpleExchange implements IDex<IdleDaoData> {
       dexFuncHasRecipient: false,
       exchangeData,
       targetExchange: swapCallee,
-      returnAmountPos: undefined,
+      returnAmountPos: side === SwapSide.SELL ? returnAmountPos : undefined,
     };
   }
 
@@ -341,21 +357,45 @@ export class IdleDao extends SimpleExchange implements IDex<IdleDaoData> {
     tokenAddress: Address,
     limit: number,
   ): Promise<PoolLiquidity[]> {
-    if (!this.tokenList) {
-      const blockNumber =
-        await this.dexHelper.web3Provider.eth.getBlockNumber();
-      this.initializePricing(blockNumber);
+    await this.initializeTokens();
+    const idleTokens: IdleToken[] = getPoolsByTokenAddress(
+      this.network,
+      tokenAddress,
+    );
+
+    if (idleTokens.length > 0) {
+      return idleTokens
+        .map((idleToken: IdleToken) => ({
+          // liquidity is infinite, tokens are minted when swapping for idle tokens
+          liquidityUSD: 1e9,
+          exchange: this.dexKey,
+          address: idleToken.cdoAddress,
+          connectorTokens: [getTokenFromIdleToken(idleToken)],
+        }))
+        .slice(0, limit);
+    }
+
+    const idleToken = getIdleTokenByAddress(
+      this.network,
+      tokenAddress.toLowerCase(),
+    );
+
+    if (idleToken) {
+      return [
+        {
+          liquidityUSD: 1e9,
+          exchange: this.dexKey,
+          address: idleToken.cdoAddress,
+          connectorTokens: [
+            {
+              address: idleToken.address,
+              decimals: idleToken.decimals,
+            },
+          ],
+        },
+      ];
     }
-    const idleTokens: IdleToken[] = getPoolsByTokenAddress(tokenAddress);
-
-    return idleTokens
-      .map((idleToken: IdleToken) => ({
-        // liquidity is infinite, tokens are minted when swapping for idle tokens
-        liquidityUSD: 1e12,
-        exchange: this.dexKey,
-        address: idleToken.cdoAddress,
-        connectorTokens: [getTokenFromIdleToken(idleToken)],
-      }))
-      .slice(0, limit);
+
+    return [];
   }
 }