@paraswap/dex-lib 2.26.2 → 2.26.3-curve-v1-wbeth-freth

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

@@ -19,6 +19,8 @@ import { address as TBTCPoolAddress } from './pools/tBTCpool';
 import { address as USDKPoolAddress } from './pools/usdkpool';
 import { address as USTPoolAddress } from './pools/ustpool';
 import { address as SLINKPoolAddress } from './pools/sLinkpool';
+import { address as WBETHPoolAddress } from './pools/wbETHpool';
+import { address as FRXETHPoolAddress  } from './pools/frxETHpool';
 
 import { DexParams } from './types';
 import { DexConfigMap, AdapterMappings } from '../../types';
@@ -101,6 +103,8 @@ export const CurveV1Config: DexConfigMap<DexParams> = {
         USDKPoolAddress,
         USTPoolAddress,
         SLINKPoolAddress,
+        WBETHPoolAddress,
+        FRXETHPoolAddress,
       ],
       pools: {
         Compound: {
@@ -259,6 +263,34 @@ export const CurveV1Config: DexConfigMap<DexParams> = {
           isMetapool: false,
           baseToken: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
         },
+        wbETH: {
+          underlying: [],
+          coins: [
+            '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+            '0xa2e3356610840701bdf5611a53974510ae27e2e1',
+          ],
+          address: '0xbfab6fa95e0091ed66058ad493189d2cb29385e6',
+          name: 'wbETH',
+          type: 2,
+          version: 3,
+          isLending: false,
+          isMetapool: false,
+          baseToken: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+        },
+        frxETH: {
+          underlying: [],
+          coins: [
+            '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+            '0x5e8422345238f34275888049021821e8e08caa1f',
+          ],
+          address: '0xa1f8a6807c402e4a15ef4eba36528a3fed24e577',
+          name: 'wbETH',
+          type: 2,
+          version: 3,
+          isLending: false,
+          isMetapool: false,
+          baseToken: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+        },
         stETH: {
           underlying: [],
           coins: [

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

@@ -27,21 +27,41 @@ describe('CurveV1 E2E', () => {
       [
         {
           symbol: 'USDT',
-          amount: (10 ** 8).toString(),
+          amount: '1000000000000',
         },
         {
           symbol: 'DAI',
-          amount: (10 ** 8).toString(),
+          amount: '10000000000000000000',
         },
       ],
       [
         {
           symbol: 'CUSDC',
-          amount: (10 ** 8).toString(),
+          amount: '1000000000000',
         },
         {
           symbol: 'CDAI',
-          amount: (10 ** 8).toString(),
+          amount: '1000000000',
+        },
+      ],
+      [
+        {
+          symbol: 'ETH',
+          amount: '5000000000000000000',
+        },
+        {
+          symbol: 'wBETH',
+          amount: '5000000000000000000',
+        },
+      ],
+      [
+        {
+          symbol: 'ETH',
+          amount: '1666000000000000000',
+        },
+        {
+          symbol: 'frxETH',
+          amount: '10000000000000000',
         },
       ],
     ];
@@ -74,6 +94,19 @@ describe('CurveV1 E2E', () => {
                 provider,
               );
             });
+            it(`${pair[1].symbol} -> ${pair[0].symbol}`, async () => {
+              await testE2E(
+                tokens[pair[1].symbol],
+                tokens[pair[0].symbol],
+                holders[pair[1].symbol],
+                side === SwapSide.SELL ? pair[1].amount : pair[0].amount,
+                side,
+                dexKey,
+                contractMethod,
+                network,
+                provider,
+              );
+            });
           });
         });
       }),

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

@@ -43,6 +43,8 @@ import { DUSDPool, address as DUSDPoolAddress } from './pools/DUSDpool';
 import { BBTCPool, address as BBTCPoolAddress } from './pools/bBTCpool';
 import { GUSDPool, address as GUSDPoolAddress } from './pools/GUSDpool';
 import { HUSDPool, address as HUSDPoolAddress } from './pools/HUSDpool';
+import { WBETHPool, address as WBETHPoolAddress } from './pools/wbETHpool';
+import { FRXETHPool, address as FRXPoolAddress } from './pools/frxETHpool';
 import {
   LinkUSDPool,
   address as LinkUSDPoolAddress,
@@ -294,6 +296,10 @@ export class CurveV1
         return new SETHPool(this.dexKey, this.dexHelper);
       case STETHPoolAddress:
         return new STETHPool(this.dexKey, this.dexHelper);
+      case WBETHPoolAddress:
+        return new WBETHPool(this.dexKey, this.dexHelper);
+      case FRXPoolAddress:
+        return new FRXETHPool(this.dexKey, this.dexHelper);
       case EURSPoolAddress:
         return new EURSPool(this.dexKey, this.dexHelper);
       case DUSDPoolAddress:

package/src/dex/curve-v1/pools/curve-metapool.ts

@@ -8,7 +8,6 @@ import { DeepReadonly } from 'ts-essentials';
 import { PoolState as BasepoolState } from './curve-pool';
 import { ThreePool } from './3pool';
 import { BlockHeader } from 'web3-eth';
-// import { getManyPoolStates } from './getstate-multicall';
 
 import { BN_0, BN_600, BN_POWS } from '../../../bignumber-constants';
 import { IDexHelper } from '../../../dex-helper';

package/src/dex/curve-v1/pools/curve-pool.ts

@@ -18,6 +18,10 @@ export interface PoolState {
   admin_fee: BigNumber;
   supply: BigNumber;
   balances: BigNumber[];
+  stored_rates?: BigNumber[];
+  admin_balances?: BigNumber[];
+  eth_balance?: BigNumber;
+  token_balance?: BigNumber;
 }
 
 export abstract class CurvePool extends StatefulEventSubscriber<PoolState> {
@@ -26,6 +30,8 @@ export abstract class CurvePool extends StatefulEventSubscriber<PoolState> {
   protected LENDING_PRECISION: BigNumber = BN_POWS[18];
   protected PRECISION: BigNumber = BN_POWS[18];
 
+  public isAdminBalancesSupported: boolean = false;
+
   public handlers: {
     [event: string]: (event: any, state: PoolState, log: Log) => PoolState;
   } = {};

package/src/dex/curve-v1/pools/frxETHpool.ts

@@ -0,0 +1,38 @@
+import { Address } from '../../../types';
+import { IDexHelper } from '../../../dex-helper';
+import { bigNumberify } from '../../../utils';
+import StableSwapFRXETH from '../../../abi/curve-v1/StableSwapFRXETH.json';
+import { ThreePool } from './3pool';
+
+const pool = 'frxETH';
+export const address: Address =
+  '0xa1f8a6807c402e4a15ef4eba36528a3fed24e577'.toLowerCase();
+const tokenAddress: Address = '0xf43211935c781d5ca1a41d2041f397b8a7366c7a';
+const N_COINS: number = 2;
+const PRECISION_MUL = ['1', '1'].map(bigNumberify);
+const USE_LENDING = [false, false];
+const COINS = [
+  '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
+  '0x5e8422345238f34275888049021821e8e08caa1f',
+];
+const trackCoins = true;
+
+export class FRXETHPool extends ThreePool {
+  constructor(parentName: string, dexHelper: IDexHelper) {
+    super(
+      parentName,
+      dexHelper,
+      pool,
+      address,
+      tokenAddress,
+      trackCoins,
+      StableSwapFRXETH,
+      N_COINS,
+      PRECISION_MUL,
+      USE_LENDING,
+      COINS,
+      'FRXETHPool',
+    );
+  }
+}
+

package/src/dex/curve-v1/pools/getstate-multicall.ts

@@ -3,12 +3,14 @@ import { CurvePool, PoolState } from './curve-pool';
 import _ from 'lodash';
 import { erc20Iface } from '../../../lib/utils-interfaces';
 import { bigNumberify, stringify } from '../../../utils';
+import { uin256DecodeToBigNumber } from '../../../lib/decoders';
+import { Contract } from 'web3-eth-contract';
 
 const strbnify = (val: any) => bigNumberify(stringify(val));
 
 async function _getManyPoolStates(
   pools: (CurvePool | CurveMetapool)[],
-  multi: any,
+  multi: Contract,
   blockNumber: number | 'latest' = 'latest',
 ): Promise<(PoolState | Partial<MetapoolState>)[]> {
   const calldata = _(pools)
@@ -51,6 +53,31 @@ async function _getManyPoolStates(
             },
           ]
         : null,
+      (pool as CurvePool).isAdminBalancesSupported === true
+        ? [
+            {
+              target: pool.address,
+              callData: pool.poolIface.encodeFunctionData('stored_rates', []),
+            },
+            {
+              target: multi.options.address,
+              callData: multi.methods
+                .getEthBalance(pool.address.toLowerCase())
+                .encodeABI(),
+            },
+            {
+              target: pool.COINS[1].toLowerCase(),
+              callData: erc20Iface.encodeFunctionData('balanceOf', [
+                pool.address,
+              ]),
+            },
+          ].concat(
+            _.range(0, pool.N_COINS).map(poolIndex => ({
+              target: pool.address,
+              callData: pool.poolIface.encodeFunctionData('admin_balances', [poolIndex]),
+            }))
+        )
+        : null,
     ])
     .flattenDeep()
     .filter(a => !!a)
@@ -85,7 +112,8 @@ async function _getManyPoolStates(
         ),
       ),
     };
-    return (pool as CurveMetapool).basepool
+
+    const state = (pool as CurveMetapool).basepool
       ? {
           ..._state,
           base_cache_updated: strbnify(
@@ -102,6 +130,29 @@ async function _getManyPoolStates(
           ),
         }
       : _state;
+
+
+    const stateWithBalances =
+      (pool as CurvePool).isAdminBalancesSupported === true
+        ? {
+          ...state,
+          stored_rates: pool.poolIface
+            .decodeFunctionResult('stored_rates', data.returnData[p++])[0]
+            .map(strbnify),
+          eth_balance: uin256DecodeToBigNumber(data.returnData[p++]),
+          token_balance: strbnify(erc20Iface.decodeFunctionResult('balanceOf', data.returnData[p++])[0]),
+          admin_balances: _.range(0, pool.N_COINS).map(i =>
+            strbnify(
+              pool.poolIface.decodeFunctionResult(
+                'admin_balances',
+                data.returnData[p++],
+              )[0],
+            ),
+          ),
+        }
+        : state;
+
+    return stateWithBalances;
   });
 }