diff --git a/helpers/contracts-deployments.ts b/helpers/contracts-deployments.ts index aea69f41..5e03118b 100644 --- a/helpers/contracts-deployments.ts +++ b/helpers/contracts-deployments.ts @@ -377,17 +377,12 @@ export const deployAllMockTokens = async (verify?: boolean) => { const tokens: {[symbol: string]: MockContract | MintableERC20} = {}; const protoConfigData = getReservesConfigByPool(AavePools.proto); - const secondaryConfigData = getReservesConfigByPool(AavePools.secondary); for (const tokenSymbol of Object.keys(TokenContractId)) { let decimals = '18'; let configData = (protoConfigData)[tokenSymbol]; - if (!configData) { - configData = (secondaryConfigData)[tokenSymbol]; - } - tokens[tokenSymbol] = await deployMintableERC20( [tokenSymbol, tokenSymbol, configData ? configData.reserveDecimals : decimals], verify diff --git a/helpers/types.ts b/helpers/types.ts index 1988749c..355e8bda 100644 --- a/helpers/types.ts +++ b/helpers/types.ts @@ -22,7 +22,6 @@ export enum EthereumNetworkNames { export enum AavePools { proto = 'proto', - secondary = 'secondary', } export enum eContractid { @@ -188,7 +187,6 @@ export interface iAssetBase { SUSD: T; AAVE: T; BAT: T; - REP: T; MKR: T; LINK: T; KNC: T; @@ -202,13 +200,6 @@ export interface iAssetBase { USD: T; REN: T; ENJ: T; - - UNI_DAI_ETH: T; - UNI_USDC_ETH: T; - UNI_SETH_ETH: T; - UNI_LEND_ETH: T; - UNI_MKR_ETH: T; - UNI_LINK_ETH: T; } export type iAssetsWithoutETH = Omit, 'ETH'>; @@ -224,7 +215,6 @@ export type iAavePoolAssets = Pick< | 'SUSD' | 'AAVE' | 'BAT' - | 'REP' | 'MKR' | 'LINK' | 'KNC' @@ -240,25 +230,6 @@ export type iAavePoolAssets = Pick< | 'ENJ' >; -export type iUniAssets = Pick< - iAssetBase, - 'UNI_DAI_ETH' | 'UNI_USDC_ETH' | 'UNI_SETH_ETH' | 'UNI_LEND_ETH' | 'UNI_MKR_ETH' | 'UNI_LINK_ETH' ->; - -export type iAaveSecondPoolAssets = Pick< - iAssetBase, - | 'WETH' - | 'DAI' - | 'USDC' - | 'USDT' - | 'UNI_DAI_ETH' - | 'UNI_USDC_ETH' - | 'UNI_SETH_ETH' - | 'UNI_LEND_ETH' - | 'UNI_MKR_ETH' - | 'UNI_LINK_ETH' ->; - export type iMultiPoolsAssets = iAssetCommon | iAavePoolAssets; export type iAavePoolTokens = Omit, 'ETH'>; @@ -280,7 +251,6 @@ export enum TokenContractId { LINK = 'LINK', KNC = 'KNC', MANA = 'MANA', - REP = 'REP', REN = 'REN', SNX = 'SNX', BUSD = 'BUSD', @@ -288,12 +258,6 @@ export enum TokenContractId { YFI = 'YFI', UNI = 'UNI', ENJ = 'ENJ', - UNI_DAI_ETH = 'UNI_DAI_ETH', - UNI_USDC_ETH = 'UNI_USDC_ETH', - UNI_SETH_ETH = 'UNI_SETH_ETH', - UNI_LINK_ETH = 'UNI_LINK_ETH', - UNI_MKR_ETH = 'UNI_MKR_ETH', - UNI_LEND_ETH = 'UNI_LEND_ETH', } export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {} @@ -370,7 +334,6 @@ export interface IProtocolGlobalConfig { } export interface IMocksConfig { - ChainlinkAggregatorPrices: iAssetBase; AllAssetsInitialPrices: iAssetBase; } @@ -408,13 +371,8 @@ export interface ICommonConfiguration { export interface IAaveConfiguration extends ICommonConfiguration { ReservesConfig: iAavePoolAssets; } - -export interface IUniswapConfiguration extends ICommonConfiguration { - ReservesConfig: iAaveSecondPoolAssets; -} - export interface ITokenAddress { [token: string]: tEthereumAddress; } -export type PoolConfiguration = ICommonConfiguration | IAaveConfiguration | IUniswapConfiguration; +export type PoolConfiguration = ICommonConfiguration | IAaveConfiguration; diff --git a/markets/aave/commons.ts b/markets/aave/commons.ts index ebeae617..92efa5ea 100644 --- a/markets/aave/commons.ts +++ b/markets/aave/commons.ts @@ -13,7 +13,6 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = { MANA: oneEther.multipliedBy('0.000158').toFixed(), MKR: oneEther.multipliedBy('2.508581').toFixed(), REN: oneEther.multipliedBy('0.00065133').toFixed(), - REP: oneEther.multipliedBy('0.048235').toFixed(), SNX: oneEther.multipliedBy('0.00442616').toFixed(), SUSD: oneEther.multipliedBy('0.00364714136416').toFixed(), TUSD: oneEther.multipliedBy('0.00364714136416').toFixed(), @@ -25,12 +24,6 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = { YFI: oneEther.multipliedBy('22.407436').toFixed(), ZRX: oneEther.multipliedBy('0.001151').toFixed(), USD: '5848466240000000', - UNI_DAI_ETH: oneEther.multipliedBy('2.1').toFixed(), - UNI_USDC_ETH: oneEther.multipliedBy('2.1').toFixed(), - UNI_SETH_ETH: oneEther.multipliedBy('2.1').toFixed(), - UNI_LEND_ETH: oneEther.multipliedBy('2.1').toFixed(), - UNI_LINK_ETH: oneEther.multipliedBy('2.1').toFixed(), - UNI_MKR_ETH: oneEther.multipliedBy('2.1').toFixed(), }; // ---------------- // PROTOCOL GLOBAL PARAMS @@ -57,9 +50,6 @@ export const CommonsConfig: ICommonConfiguration = { // ---------------- Mocks: { - ChainlinkAggregatorPrices: { - ...MOCK_CHAINLINK_AGGREGATORS_PRICES, - }, AllAssetsInitialPrices: { ...MOCK_CHAINLINK_AGGREGATORS_PRICES, }, @@ -96,9 +86,6 @@ export const CommonsConfig: ICommonConfiguration = { KNC: { borrowRate: oneRay.multipliedBy(0.03).toFixed(), }, - REP: { - borrowRate: oneRay.multipliedBy(0.03).toFixed(), - }, MKR: { borrowRate: oneRay.multipliedBy(0.03).toFixed(), }, @@ -213,7 +200,6 @@ export const CommonsConfig: ICommonConfiguration = { MANA: '0x1b93D8E109cfeDcBb3Cc74eD761DE286d5771511', MKR: '0x0B156192e04bAD92B6C1C13cf8739d14D78D5701', REN: '0xF1939BECE7708382b5fb5e559f630CB8B39a10ee', - REP: '0x3A7e6117F2979EFf81855de32819FBba48a63e9e', SNX: '0xF9A76ae7a1075Fe7d646b06fF05Bd48b9FA5582e', SUSD: '0xb343e7a1aF578FA35632435243D814e7497622f7', TUSD: '0x7aeCF1c19661d12E962b69eBC8f6b2E63a55C660', @@ -224,12 +210,6 @@ export const CommonsConfig: ICommonConfiguration = { YFI: '0xC5d1B1DEb2992738C0273408ac43e1e906086B6C', ZRX: '0xBc3f28Ccc21E9b5856E81E6372aFf57307E2E883', USD: '0x9326BFA02ADD2366b30bacB125260Af641031331', - UNI_DAI_ETH: '0x0338C40020Bf886c11406115fD1ba205Ef1D9Ff9', - UNI_LEND_ETH: '0xB996b1a11BA0aACc4deA57f7f92d1722428f2E90', - UNI_LINK_ETH: '0x267490eE9Ad21dfE839aE73A8B1c8C9A36F60d33', - UNI_MKR_ETH: '0x6eBF25AB0A18B8F6243619f1AE6b94373169A069', - UNI_SETH_ETH: '0xc5F1eA001c1570783b3af418fa775237Eb129EDC', - UNI_USDC_ETH: '0x7f5E5D34591e9a70D187BBA94260C30B92aC0961', }, [EthereumNetwork.ropsten]: { AAVE: ZERO_ADDRESS, @@ -242,7 +222,6 @@ export const CommonsConfig: ICommonConfiguration = { MANA: '0xDab909dedB72573c626481fC98CEE1152b81DEC2', MKR: '0x811B1f727F8F4aE899774B568d2e72916D91F392', REN: ZERO_ADDRESS, - REP: '0xa949ee9ba80c0f381481f2eab538bc5547a5ac67', SNX: '0xA95674a8Ed9aa9D2E445eb0024a9aa05ab44f6bf', SUSD: '0xe054b4aee7ac7645642dd52f1c892ff0128c98f0', TUSD: '0x523ac85618df56e940534443125ef16daf785620', @@ -252,71 +231,51 @@ export const CommonsConfig: ICommonConfiguration = { WBTC: '0x5b8B87A0abA4be247e660B0e0143bB30Cdf566AF', YFI: ZERO_ADDRESS, ZRX: '0x1d0052e4ae5b4ae4563cbac50edc3627ca0460d7', - UNI_DAI_ETH: '0x16048819e3f77b7112eB033624A0bA9d33743028', - UNI_LEND_ETH: '0x43c44B27376Afedee06Bae2A003e979FC3B3Da6C', - UNI_LINK_ETH: '0xb60c29714146EA3539261f599Eb30f62904108Fa', - UNI_MKR_ETH: '0x594ae5421f378b8B4AF9e758C461d2A1FF990BC5', - UNI_SETH_ETH: '0x23Ee5188806BD2D31103368B0EA0259bc6706Af1', - UNI_USDC_ETH: '0x6952A2678D574073DB97963886c2F38CD09C8Ba3', USD: '0x8468b2bDCE073A157E560AA4D9CcF6dB1DB98507', }, [EthereumNetwork.main]: { AAVE: '0x6Df09E975c830ECae5bd4eD9d90f3A95a4f88012', - BAT: '0x9b4e2579895efa2b4765063310Dc4109a7641129', - BUSD: '0x5d4BB541EED49D0290730b4aB332aA46bd27d888', - DAI: '0x037E8F2125bF532F3e228991e051c8A7253B642c', + BAT: '0x0d16d4528239e9ee52fa531af613AcdB23D88c94', + BUSD: '0x614715d2Af89E6EC99A233818275142cE88d1Cfd', + DAI: '0x773616E4d11A78F511299002da57A0a94577F1f4', ENJ: '0x24D9aB51950F3d62E9144fdC2f3135DAA6Ce8D1B', - KNC: '0xd0e785973390fF8E77a83961efDb4F271E6B8152', - LINK: '0xeCfA53A8bdA4F0c4dd39c55CC8deF3757aCFDD07', - MANA: '0xc89c4ed8f52Bb17314022f6c0dCB26210C905C97', - MKR: '0xda3d675d50ff6c555973c4f0424964e1f6a4e7d3', + KNC: '0x656c0544eF4C98A6a98491833A89204Abb045d6b', + LINK: '0xDC530D9457755926550b59e8ECcdaE7624181557', + MANA: '0x82A44D92D6c329826dc557c5E1Be6ebeC5D5FeB9', + MKR: '0x24551a8Fb2A7211A25a17B1481f043A8a8adC7f2', REN: '0x3147D7203354Dc06D9fd350c7a2437bcA92387a4', - REP: '0xb8b513d9cf440C1b6f5C7142120d611C94fC220c', - SNX: '0xE23d1142dE4E83C08bb048bcab54d50907390828', - SUSD: '0x6d626Ff97f0E89F6f983dE425dc5B24A18DE26Ea', - TUSD: '0x73ead35fd6A572EF763B13Be65a9db96f7643577', + SNX: '0x79291A9d692Df95334B1a0B3B4AE6bC606782f8c', + SUSD: '0x8e0b7e6062272B5eF4524250bFFF8e5Bd3497757', + TUSD: '0x3886BA987236181D98F2401c507Fb8BeA7871dF2', UNI: '0xD6aA3D25116d8dA79Ea0246c4826EB951872e02e', - USDC: '0xdE54467873c3BCAA76421061036053e371721708', - USDT: '0xa874fe207DF445ff19E7482C746C4D3fD0CB9AcE', - WBTC: '0x0133Aa47B6197D0BA090Bf2CD96626Eb71fFd13c', + USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4', + USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46', + WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8', YFI: '0x7c5d4F8345e66f68099581Db340cd65B078C41f4', - ZRX: '0xA0F9D94f060836756FFC84Db4C78d097cA8C23E8', - UNI_DAI_ETH: '0x1bAB293850289Bf161C5DA79ff3d1F02A950555b', - UNI_LEND_ETH: '0xF4C8Db2d999b024bBB6c6022566503eD41f2AC1E', - UNI_LINK_ETH: '0xE2A639Beb647d7F709ca805ABa760bBEfdbE37e3', - UNI_MKR_ETH: '0xEe40a5E8F3732bE6ECDb5A90e23D0b7bF0D4a73c', - UNI_SETH_ETH: '0x517D40E49660c7705b2e99eEFA6d7B0E9Ba5BF10', - UNI_USDC_ETH: '0x444315Ee92F2bb3579293C17B07194227fA99bF0', - USD: '0x59b826c214aBa7125bFA52970d97736c105Cc375', + ZRX: '0x2Da4983a622a8498bb1a21FaE9D8F6C664939962', + USD: '0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419', }, [EthereumNetwork.tenderlyMain]: { AAVE: '0x6Df09E975c830ECae5bd4eD9d90f3A95a4f88012', - BAT: '0x9b4e2579895efa2b4765063310Dc4109a7641129', - BUSD: '0x5d4BB541EED49D0290730b4aB332aA46bd27d888', - DAI: '0x037E8F2125bF532F3e228991e051c8A7253B642c', + BAT: '0x0d16d4528239e9ee52fa531af613AcdB23D88c94', + BUSD: '0x614715d2Af89E6EC99A233818275142cE88d1Cfd', + DAI: '0x773616E4d11A78F511299002da57A0a94577F1f4', ENJ: '0x24D9aB51950F3d62E9144fdC2f3135DAA6Ce8D1B', - KNC: '0xd0e785973390fF8E77a83961efDb4F271E6B8152', - LINK: '0xeCfA53A8bdA4F0c4dd39c55CC8deF3757aCFDD07', - MANA: '0xc89c4ed8f52Bb17314022f6c0dCB26210C905C97', - MKR: '0xda3d675d50ff6c555973c4f0424964e1f6a4e7d3', + KNC: '0x656c0544eF4C98A6a98491833A89204Abb045d6b', + LINK: '0xDC530D9457755926550b59e8ECcdaE7624181557', + MANA: '0x82A44D92D6c329826dc557c5E1Be6ebeC5D5FeB9', + MKR: '0x24551a8Fb2A7211A25a17B1481f043A8a8adC7f2', REN: '0x3147D7203354Dc06D9fd350c7a2437bcA92387a4', - REP: '0xb8b513d9cf440C1b6f5C7142120d611C94fC220c', - SNX: '0xE23d1142dE4E83C08bb048bcab54d50907390828', - SUSD: '0x6d626Ff97f0E89F6f983dE425dc5B24A18DE26Ea', - TUSD: '0x73ead35fd6A572EF763B13Be65a9db96f7643577', + SNX: '0x79291A9d692Df95334B1a0B3B4AE6bC606782f8c', + SUSD: '0x8e0b7e6062272B5eF4524250bFFF8e5Bd3497757', + TUSD: '0x3886BA987236181D98F2401c507Fb8BeA7871dF2', UNI: '0xD6aA3D25116d8dA79Ea0246c4826EB951872e02e', - USDC: '0xdE54467873c3BCAA76421061036053e371721708', - USDT: '0xa874fe207DF445ff19E7482C746C4D3fD0CB9AcE', - WBTC: '0x0133Aa47B6197D0BA090Bf2CD96626Eb71fFd13c', + USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4', + USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46', + WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8', YFI: '0x7c5d4F8345e66f68099581Db340cd65B078C41f4', - ZRX: '0xA0F9D94f060836756FFC84Db4C78d097cA8C23E8', - UNI_DAI_ETH: '0x1bAB293850289Bf161C5DA79ff3d1F02A950555b', - UNI_LEND_ETH: '0xF4C8Db2d999b024bBB6c6022566503eD41f2AC1E', - UNI_LINK_ETH: '0xE2A639Beb647d7F709ca805ABa760bBEfdbE37e3', - UNI_MKR_ETH: '0xEe40a5E8F3732bE6ECDb5A90e23D0b7bF0D4a73c', - UNI_SETH_ETH: '0x517D40E49660c7705b2e99eEFA6d7B0E9Ba5BF10', - UNI_USDC_ETH: '0x444315Ee92F2bb3579293C17B07194227fA99bF0', - USD: '0x59b826c214aBa7125bFA52970d97736c105Cc375', + ZRX: '0x2Da4983a622a8498bb1a21FaE9D8F6C664939962', + USD: '0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419', }, }, ReserveAssets: { @@ -333,9 +292,9 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.coverage]: '0x95b73a72c6ecf4ccbbba5178800023260bad8e75cdccdb8e4827a2977a37c820', [eEthereumNetwork.hardhat]: - '0xa14895ab432a9d0712a041fdcea77f7f65826945dc90bf29ea819c2a01e7c5f9', + '0xbae024d959c6a022dc5ed37294cd39c141034b2ae5f02a955cce75c930a81bf5', [eEthereumNetwork.buidlerevm]: - '0xa14895ab432a9d0712a041fdcea77f7f65826945dc90bf29ea819c2a01e7c5f9', + '0xbae024d959c6a022dc5ed37294cd39c141034b2ae5f02a955cce75c930a81bf5', [eEthereumNetwork.kovan]: '', [eEthereumNetwork.ropsten]: '', [eEthereumNetwork.main]: '', diff --git a/markets/aave/index.ts b/markets/aave/index.ts index ea9b27ad..ece2485e 100644 --- a/markets/aave/index.ts +++ b/markets/aave/index.ts @@ -16,7 +16,6 @@ import { strategyMANA, strategyMKR, strategyREN, - strategyREP, strategySNX, strategyUNI, strategyWBTC, @@ -43,7 +42,6 @@ export const AaveConfig: IAaveConfiguration = { MANA: strategyMANA, MKR: strategyMKR, REN: strategyREN, - REP: strategyREP, SNX: strategySNX, SUSD: stablecoinStrategySUSD, TUSD: stablecoinStrategyTUSD, @@ -70,7 +68,6 @@ export const AaveConfig: IAaveConfiguration = { MANA: '0x738Dc6380157429e957d223e6333Dc385c85Fec7', MKR: '0x61e4CAE3DA7FD189e52a4879C7B8067D7C2Cc0FA', REN: '0x5eebf65A6746eed38042353Ba84c8e37eD58Ac6f', - REP: '0x260071C8D61DAf730758f8BD0d6370353956AE0E', SNX: '0x7FDb81B0b8a010dd4FFc57C3fecbf145BA8Bd947', SUSD: '0x99b267b9D96616f906D53c26dECf3C5672401282', TUSD: '0x016750AC630F711882812f24Dba6c95b9D35856d', @@ -93,7 +90,6 @@ export const AaveConfig: IAaveConfiguration = { MANA: '0x78b1F763857C8645E46eAdD9540882905ff32Db7', MKR: '0x2eA9df3bABe04451c9C3B06a2c844587c59d9C37', REN: ZERO_ADDRESS, - REP: '0xBeb13523503d35F9b3708ca577CdCCAdbFB236bD', SNX: '0xF80Aa7e2Fda4DA065C55B8061767F729dA1476c7', SUSD: '0xc374eB17f665914c714Ac4cdC8AF3a3474228cc5', TUSD: '0xa2EA00Df6d8594DBc76b79beFe22db9043b8896F', @@ -109,47 +105,45 @@ export const AaveConfig: IAaveConfiguration = { AAVE: '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9', BAT: '0x0d8775f648430679a709e98d2b0cb6250d2887ef', BUSD: '0x4Fabb145d64652a948d72533023f6E7A623C7C53', - DAI: '0x6b175474e89094c44da98b954eedeac495271d0f', + DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F', ENJ: '0xF629cBd94d3791C9250152BD8dfBDF380E2a3B9c', - KNC: '0xdd974d5c2e2928dea5f71b9825b8b646686bd200', - LINK: '0x514910771af9ca656af840dff83e8264ecf986ca', - MANA: '0x0f5d2fb29fb7d3cfee444a200298f468908cc942', - MKR: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2', + KNC: '0xdd974D5C2e2928deA5F71b9825b8b646686BD200', + LINK: '0x514910771AF9Ca656af840dff83E8264EcF986CA', + MANA: '0x0F5D2fB29fb7d3CFeE444a200298f468908cC942', + MKR: '0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2', REN: '0x408e41876cCCDC0F92210600ef50372656052a38', - REP: '0x1985365e9f78359a9B6AD760e32412f4a445E862', SNX: '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F', - SUSD: '0x57ab1ec28d129707052df4df418d58a2d46d5f51', + SUSD: '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51', TUSD: '0x0000000000085d4780B73119b644AE5ecd22b376', UNI: '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984', - USDC: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', - USDT: '0xdac17f958d2ee523a2206206994597c13d831ec7', - WBTC: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', - WETH: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', + USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', + USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7', + WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', + WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', YFI: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e', - ZRX: '0xe41d2489571d322189246dafa5ebde1f4699f498', + ZRX: '0xE41d2489571d322189246DaFA5ebDe1F4699F498', }, [EthereumNetwork.tenderlyMain]: { AAVE: '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9', BAT: '0x0d8775f648430679a709e98d2b0cb6250d2887ef', BUSD: '0x4Fabb145d64652a948d72533023f6E7A623C7C53', - DAI: '0x6b175474e89094c44da98b954eedeac495271d0f', + DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F', ENJ: '0xF629cBd94d3791C9250152BD8dfBDF380E2a3B9c', - KNC: '0xdd974d5c2e2928dea5f71b9825b8b646686bd200', - LINK: '0x514910771af9ca656af840dff83e8264ecf986ca', - MANA: '0x0f5d2fb29fb7d3cfee444a200298f468908cc942', - MKR: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2', + KNC: '0xdd974D5C2e2928deA5F71b9825b8b646686BD200', + LINK: '0x514910771AF9Ca656af840dff83E8264EcF986CA', + MANA: '0x0F5D2fB29fb7d3CFeE444a200298f468908cC942', + MKR: '0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2', REN: '0x408e41876cCCDC0F92210600ef50372656052a38', - REP: '0x1985365e9f78359a9B6AD760e32412f4a445E862', SNX: '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F', - SUSD: '0x57ab1ec28d129707052df4df418d58a2d46d5f51', + SUSD: '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51', TUSD: '0x0000000000085d4780B73119b644AE5ecd22b376', UNI: '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984', - USDC: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', - USDT: '0xdac17f958d2ee523a2206206994597c13d831ec7', - WBTC: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', - WETH: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', + USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', + USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7', + WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', + WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', YFI: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e', - ZRX: '0xe41d2489571d322189246dafa5ebde1f4699f498', + ZRX: '0xE41d2489571d322189246DaFA5ebDe1F4699F498', }, }, }; diff --git a/markets/aave/reservesConfigs.ts b/markets/aave/reservesConfigs.ts index 2a9c7154..637e2778 100644 --- a/markets/aave/reservesConfigs.ts +++ b/markets/aave/reservesConfigs.ts @@ -116,14 +116,6 @@ export const strategyREN: IReserveParams = { stableBorrowRateEnabled: false, }; -export const strategyREP: IReserveParams = { - ...strategyBase, - baseLTVAsCollateral: '3500', - variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(), - variableRateSlope2: new BigNumber(3).multipliedBy(oneRay).toFixed(), - borrowingEnabled: true, -}; - export const stablecoinStrategySUSD: IReserveParams = { baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(), variableRateSlope1: new BigNumber(0.04).multipliedBy(oneRay).toFixed(), diff --git a/tasks/full/1_address_provider.ts b/tasks/full/1_address_provider.ts index 2397ea46..1ff368af 100644 --- a/tasks/full/1_address_provider.ts +++ b/tasks/full/1_address_provider.ts @@ -1,5 +1,5 @@ import {task} from 'hardhat/config'; -import {getEthersSignersAddresses, getParamPerNetwork} from '../../helpers/contracts-helpers'; +import {getParamPerNetwork} from '../../helpers/contracts-helpers'; import { deployLendingPoolAddressesProvider, deployLendingPoolAddressesProviderRegistry, diff --git a/tasks/full/3_oracles.ts b/tasks/full/3_oracles.ts index 4df4ffa7..47fe4321 100644 --- a/tasks/full/3_oracles.ts +++ b/tasks/full/3_oracles.ts @@ -1,9 +1,9 @@ import {task} from 'hardhat/config'; -import {getEthersSignersAddresses, getParamPerNetwork} from '../../helpers/contracts-helpers'; +import {getParamPerNetwork} from '../../helpers/contracts-helpers'; import {deployAaveOracle, deployLendingRateOracle} from '../../helpers/contracts-deployments'; import {setInitialMarketRatesInRatesOracleByHelper} from '../../helpers/oracles-helpers'; import {ICommonConfiguration, eEthereumNetwork, SymbolMap} from '../../helpers/types'; -import {waitForTx, filterMapBy, notFalsyOrZeroAddress} from '../../helpers/misc-utils'; +import {waitForTx, notFalsyOrZeroAddress} from '../../helpers/misc-utils'; import { ConfigNames, loadPoolConfig, @@ -11,7 +11,6 @@ import { getGenesisPoolAdmin, getLendingRateOracles, } from '../../helpers/configuration'; -import {exit} from 'process'; import { getChainlinkPriceProvider, getLendingPoolAddressesProvider, diff --git a/test/__setup.spec.ts b/test/__setup.spec.ts index beda3b98..add79894 100644 --- a/test/__setup.spec.ts +++ b/test/__setup.spec.ts @@ -52,14 +52,13 @@ import {Weth9Mocked} from '../types/Weth9Mocked'; const MOCK_USD_PRICE_IN_WEI = AaveConfig.ProtocolGlobalParams.MockUsdPriceInWei; const ALL_ASSETS_INITIAL_PRICES = AaveConfig.Mocks.AllAssetsInitialPrices; const USD_ADDRESS = AaveConfig.ProtocolGlobalParams.UsdAddress; -const MOCK_CHAINLINK_AGGREGATORS_PRICES = AaveConfig.Mocks.ChainlinkAggregatorPrices; +const MOCK_CHAINLINK_AGGREGATORS_PRICES = AaveConfig.Mocks.AllAssetsInitialPrices; const LENDING_RATE_ORACLE_RATES_COMMON = AaveConfig.LendingRateOracleRatesCommon; const deployAllMockTokens = async (deployer: Signer) => { const tokens: {[symbol: string]: MockContract | MintableERC20 | Weth9Mocked} = {}; const protoConfigData = getReservesConfigByPool(AavePools.proto); - const secondaryConfigData = getReservesConfigByPool(AavePools.secondary); for (const tokenSymbol of Object.keys(TokenContractId)) { if (tokenSymbol === 'WETH') { @@ -71,10 +70,6 @@ const deployAllMockTokens = async (deployer: Signer) => { let configData = (protoConfigData)[tokenSymbol]; - if (!configData) { - configData = (secondaryConfigData)[tokenSymbol]; - } - if (!configData) { decimals = 18; } @@ -95,10 +90,6 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => { const aaveAdmin = await deployer.getAddress(); const mockTokens = await deployAllMockTokens(deployer); - const mockTokenAddress = Object.keys(mockTokens).reduce<{[key: string]: string}>((acc, key) => { - acc[key] = mockTokens[key].address; - return acc; - }, {}); const addressesProvider = await deployLendingPoolAddressesProvider(); await waitForTx(await addressesProvider.setPoolAdmin(aaveAdmin)); @@ -157,7 +148,6 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => { SUSD: mockTokens.SUSD.address, AAVE: mockTokens.AAVE.address, BAT: mockTokens.BAT.address, - REP: mockTokens.REP.address, MKR: mockTokens.MKR.address, LINK: mockTokens.LINK.address, KNC: mockTokens.KNC.address, @@ -171,13 +161,6 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => { UNI: mockTokens.UNI.address, ENJ: mockTokens.ENJ.address, USD: USD_ADDRESS, - - UNI_DAI_ETH: mockTokens.UNI_DAI_ETH.address, - UNI_USDC_ETH: mockTokens.UNI_USDC_ETH.address, - UNI_SETH_ETH: mockTokens.UNI_SETH_ETH.address, - UNI_LEND_ETH: mockTokens.UNI_LEND_ETH.address, - UNI_MKR_ETH: mockTokens.UNI_MKR_ETH.address, - UNI_LINK_ETH: mockTokens.UNI_LINK_ETH.address, }, fallbackOracle ); @@ -198,15 +181,11 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => { }), {} ); + console.log(allTokenAddresses, allAggregatorsAddresses); const [tokens, aggregators] = getPairsTokenAggregator(allTokenAddresses, allAggregatorsAddresses); - const aaveOracle = await deployAaveOracle([ - tokens, - aggregators, - fallbackOracle.address, - mockTokens.WETH.address, - ]); + await deployAaveOracle([tokens, aggregators, fallbackOracle.address, mockTokens.WETH.address]); await waitForTx(await addressesProvider.setPriceOracle(fallbackOracle.address)); const lendingRateOracle = await deployLendingRateOracle(); @@ -223,16 +202,6 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => { aaveAdmin ); - const { - UNI_DAI_ETH, - UNI_USDC_ETH, - UNI_SETH_ETH, - UNI_LINK_ETH, - UNI_MKR_ETH, - UNI_LEND_ETH, - ...protoPoolReservesAddresses - } = <{[symbol: string]: tEthereumAddress}>allReservesAddresses; - const reservesParams = getReservesConfigByPool(AavePools.proto); const testHelpers = await deployAaveProtocolDataProvider(addressesProvider.address); @@ -241,16 +210,11 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => { const admin = await deployer.getAddress(); console.log('Initialize configuration'); - await initReservesByHelper(reservesParams, protoPoolReservesAddresses, admin, ZERO_ADDRESS); - await enableReservesToBorrowByHelper( - reservesParams, - protoPoolReservesAddresses, - testHelpers, - admin - ); + await initReservesByHelper(reservesParams, allReservesAddresses, admin, ZERO_ADDRESS); + await enableReservesToBorrowByHelper(reservesParams, allReservesAddresses, testHelpers, admin); await enableReservesAsCollateralByHelper( reservesParams, - protoPoolReservesAddresses, + allReservesAddresses, testHelpers, admin );