From c072f3c8e04c958a351b587d7839d3875ef60c77 Mon Sep 17 00:00:00 2001 From: Zer0dot Date: Mon, 22 Feb 2021 11:05:36 -0500 Subject: [PATCH] Updated LP config --- markets/lp/commons.ts | 70 +++++++++++++------------------------------ markets/lp/index.ts | 12 ++++---- 2 files changed, 26 insertions(+), 56 deletions(-) diff --git a/markets/lp/commons.ts b/markets/lp/commons.ts index 1b7f403a..9c7ca2ee 100644 --- a/markets/lp/commons.ts +++ b/markets/lp/commons.ts @@ -1,6 +1,6 @@ import BigNumber from 'bignumber.js'; import { oneEther, oneRay, RAY, ZERO_ADDRESS, MOCK_CHAINLINK_AGGREGATORS_PRICES } from '../../helpers/constants'; -import { ICommonConfiguration, EthereumNetwork, eEthereumNetwork } from '../../helpers/types'; +import { ICommonConfiguration, eEthereumNetwork } from '../../helpers/types'; // ---------------- // PROTOCOL GLOBAL PARAMS @@ -108,8 +108,6 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.ropsten]: undefined, [eEthereumNetwork.main]: undefined, [eEthereumNetwork.tenderlyMain]: undefined, - [eEthereumNetwork.mumbai]: undefined, - [eEthereumNetwork.matic]: undefined, }, PoolAdminIndex: 0, EmergencyAdmin: { @@ -120,8 +118,6 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.ropsten]: undefined, [eEthereumNetwork.main]: undefined, [eEthereumNetwork.tenderlyMain]: undefined, - [eEthereumNetwork.mumbai]: undefined, - [eEthereumNetwork.matic]: undefined, }, EmergencyAdminIndex: 1, ProviderRegistry: { @@ -132,8 +128,6 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.hardhat]: '', [eEthereumNetwork.buidlerevm]: '', [eEthereumNetwork.tenderlyMain]: '0x52D306e36E3B6B02c153d0266ff0f85d18BCD413', - [eEthereumNetwork.mumbai]: '', - [eEthereumNetwork.matic]: '', }, ProviderRegistryOwner: { // DEPLOYED WITH CORRECT ADDRESS [eEthereumNetwork.kovan]: '0x85e4A467343c0dc4aDAB74Af84448D9c45D8ae6F', @@ -143,8 +137,6 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.hardhat]: '', [eEthereumNetwork.buidlerevm]: '', [eEthereumNetwork.tenderlyMain]: '0xbd723fc4f1d737dcfc48a07fe7336766d34cad5f', - [eEthereumNetwork.mumbai]: '', - [eEthereumNetwork.matic]: '', }, LendingRateOracle: { [eEthereumNetwork.coverage]: '', @@ -154,8 +146,6 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.ropsten]: '0x05dcca805a6562c1bdd0423768754acb6993241b', [eEthereumNetwork.main]: '', //'0x8A32f49FFbA88aba6EFF96F45D8BD1D4b3f35c7D', // Need to re-deploy because of onlyOwner [eEthereumNetwork.tenderlyMain]: '0x8A32f49FFbA88aba6EFF96F45D8BD1D4b3f35c7D', - [eEthereumNetwork.mumbai]: '', - [eEthereumNetwork.matic]: '', }, LendingPoolCollateralManager: { [eEthereumNetwork.coverage]: '', @@ -165,8 +155,6 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.ropsten]: '', [eEthereumNetwork.main]: '0xbd4765210d4167CE2A5b87280D9E8Ee316D5EC7C', [eEthereumNetwork.tenderlyMain]: '0xbd4765210d4167CE2A5b87280D9E8Ee316D5EC7C', - [eEthereumNetwork.mumbai]: '', - [eEthereumNetwork.matic]: '', }, WethGateway: { [eEthereumNetwork.coverage]: '', @@ -181,40 +169,34 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.coverage]: '', [eEthereumNetwork.buidlerevm]: '', [eEthereumNetwork.hardhat]: '', - [EthereumNetwork.kovan]: '0x971efe90088f21dc6a36f610ffed77fc19710708', - [EthereumNetwork.ropsten]: '0xeba2ea67942b8250d870b12750b594696d02fc9c', - [EthereumNetwork.main]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae', - [EthereumNetwork.tenderlyMain]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae', - [eEthereumNetwork.mumbai]: '', - [eEthereumNetwork.matic]: '', + [eEthereumNetwork.kovan]: '0x971efe90088f21dc6a36f610ffed77fc19710708', + [eEthereumNetwork.ropsten]: '0xeba2ea67942b8250d870b12750b594696d02fc9c', + [eEthereumNetwork.main]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae', + [eEthereumNetwork.tenderlyMain]: '0xe3d9988f676457123c5fd01297605efdd0cba1ae', }, AaveOracle: { [eEthereumNetwork.coverage]: '', [eEthereumNetwork.hardhat]: '', [eEthereumNetwork.buidlerevm]: '', - [EthereumNetwork.kovan]: '0x8fb777d67e9945e2c01936e319057f9d41d559e6', // Need to re-deploy because of onlyOwner - [EthereumNetwork.ropsten]: ZERO_ADDRESS, - [EthereumNetwork.main]: '',//'0xA50ba011c48153De246E5192C8f9258A2ba79Ca9', // Need to re-deploy because of onlyOwner - [EthereumNetwork.tenderlyMain]: '0xA50ba011c48153De246E5192C8f9258A2ba79Ca9', - [eEthereumNetwork.mumbai]: '', - [eEthereumNetwork.matic]: '', + [eEthereumNetwork.kovan]: '0x8fb777d67e9945e2c01936e319057f9d41d559e6', // Need to re-deploy because of onlyOwner + [eEthereumNetwork.ropsten]: ZERO_ADDRESS, + [eEthereumNetwork.main]: '',//'0xA50ba011c48153De246E5192C8f9258A2ba79Ca9', // Need to re-deploy because of onlyOwner + [eEthereumNetwork.tenderlyMain]: '0xA50ba011c48153De246E5192C8f9258A2ba79Ca9', }, FallbackOracle: { [eEthereumNetwork.coverage]: '', [eEthereumNetwork.hardhat]: '', [eEthereumNetwork.buidlerevm]: '', - [EthereumNetwork.kovan]: '0x50913E8E1c650E790F8a1E741FF9B1B1bB251dfe', - [EthereumNetwork.ropsten]: '0xAD1a978cdbb8175b2eaeC47B01404f8AEC5f4F0d', - [EthereumNetwork.main]: ZERO_ADDRESS, - [EthereumNetwork.tenderlyMain]: ZERO_ADDRESS, - [eEthereumNetwork.mumbai]: ZERO_ADDRESS, - [eEthereumNetwork.matic]: ZERO_ADDRESS, + [eEthereumNetwork.kovan]: '0x50913E8E1c650E790F8a1E741FF9B1B1bB251dfe', + [eEthereumNetwork.ropsten]: '0xAD1a978cdbb8175b2eaeC47B01404f8AEC5f4F0d', + [eEthereumNetwork.main]: ZERO_ADDRESS, + [eEthereumNetwork.tenderlyMain]: ZERO_ADDRESS, }, ChainlinkAggregator: { [eEthereumNetwork.coverage]: {}, [eEthereumNetwork.hardhat]: {}, [eEthereumNetwork.buidlerevm]: {}, - [EthereumNetwork.kovan]: { + [eEthereumNetwork.kovan]: { USDT: '0x0bF499444525a23E7Bb61997539725cA2e928138', WBTC: '0xF7904a295A029a3aBDFFB6F12755974a958C7C25', USDC: '0x64EaC61A2DFda2c3Fa04eED49AA33D021AeC8838', @@ -236,9 +218,9 @@ export const CommonsConfig: ICommonConfiguration = { BptWBTCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', USD: '0x9326BFA02ADD2366b30bacB125260Af641031331', }, - [EthereumNetwork.ropsten]: { + [eEthereumNetwork.ropsten]: { }, - [EthereumNetwork.main]: { + [eEthereumNetwork.main]: { USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46', WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8', USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4', @@ -260,7 +242,7 @@ export const CommonsConfig: ICommonConfiguration = { BptWBTCWETH: ZERO_ADDRESS, USD: '0x9326BFA02ADD2366b30bacB125260Af641031331', }, - [EthereumNetwork.tenderlyMain]: { + [eEthereumNetwork.tenderlyMain]: { USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46', WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8', USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4', @@ -282,19 +264,15 @@ export const CommonsConfig: ICommonConfiguration = { BptWBTCWETH: ZERO_ADDRESS, USD: '0x9326BFA02ADD2366b30bacB125260Af641031331', }, - [eEthereumNetwork.mumbai]: {}, - [eEthereumNetwork.matic]: {}, }, ReserveAssets: { [eEthereumNetwork.coverage]: {}, [eEthereumNetwork.hardhat]: {}, [eEthereumNetwork.buidlerevm]: {}, - [EthereumNetwork.main]: {}, - [EthereumNetwork.kovan]: {}, - [EthereumNetwork.ropsten]: {}, - [EthereumNetwork.tenderlyMain]: {}, - [eEthereumNetwork.mumbai]: {}, - [eEthereumNetwork.matic]: {}, + [eEthereumNetwork.main]: {}, + [eEthereumNetwork.kovan]: {}, + [eEthereumNetwork.ropsten]: {}, + [eEthereumNetwork.tenderlyMain]: {}, }, ReservesConfig: {}, ATokenDomainSeparator: { @@ -308,8 +286,6 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.ropsten]: '', [eEthereumNetwork.main]: '', [eEthereumNetwork.tenderlyMain]: '', - [eEthereumNetwork.mumbai]: '', - [eEthereumNetwork.matic]: '', }, WETH: { [eEthereumNetwork.coverage]: '', // deployed in local evm @@ -319,8 +295,6 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.ropsten]: '0xc778417e063141139fce010982780140aa0cd5ab', [eEthereumNetwork.main]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', [eEthereumNetwork.tenderlyMain]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', - [eEthereumNetwork.mumbai]: '', - [eEthereumNetwork.matic]: '', }, ReserveFactorTreasuryAddress: { [eEthereumNetwork.coverage]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c', @@ -330,7 +304,5 @@ export const CommonsConfig: ICommonConfiguration = { [eEthereumNetwork.ropsten]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c', [eEthereumNetwork.main]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c', [eEthereumNetwork.tenderlyMain]: '0x464c71f6c2f760dda6093dcb91c24c39e5d6e18c', - [eEthereumNetwork.mumbai]: '', - [eEthereumNetwork.matic]: '', }, }; diff --git a/markets/lp/index.ts b/markets/lp/index.ts index d802f372..aeb3bbc7 100644 --- a/markets/lp/index.ts +++ b/markets/lp/index.ts @@ -1,5 +1,5 @@ import { oneRay, ZERO_ADDRESS } from '../../helpers/constants'; -import { ILpConfiguration, EthereumNetwork, eEthereumNetwork } from '../../helpers/types'; +import { ILpConfiguration, eEthereumNetwork } from '../../helpers/types'; import { CommonsConfig } from './commons'; import { @@ -58,9 +58,7 @@ export const lpConfig: ILpConfiguration = { [eEthereumNetwork.buidlerevm]: {}, [eEthereumNetwork.hardhat]: {}, [eEthereumNetwork.coverage]: {}, - [eEthereumNetwork.matic]: {}, - [eEthereumNetwork.mumbai]: {}, - [EthereumNetwork.kovan]: { + [eEthereumNetwork.kovan]: { DAI: '0xFf795577d9AC8bD7D90Ee22b6C1703490b6512FD', USDC: '0xe22da380ee6B445bb8273C81944ADEB6E8450422', USDT: '0x13512979ADE267AB5100878E2e0f485B568328a4', @@ -82,9 +80,9 @@ export const lpConfig: ILpConfiguration = { UniYFIWETH: '0x5af95ddFACC150a1695A3Fc606459fd0dE57b91f', BptWBTCWETH: '0x110569E3261bC0934dA637b019f6f1b6F50ec574', }, - [EthereumNetwork.ropsten]: { + [eEthereumNetwork.ropsten]: { }, - [EthereumNetwork.main]: { + [eEthereumNetwork.main]: { DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F', USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7', @@ -106,7 +104,7 @@ export const lpConfig: ILpConfiguration = { UniYFIWETH: '0x2fDbAdf3C4D5A8666Bc06645B8358ab803996E28', BptWBTCWETH: '0x1efF8aF5D577060BA4ac8A29A13525bb0Ee2A3D5', }, - [EthereumNetwork.tenderlyMain]: { + [eEthereumNetwork.tenderlyMain]: { DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F', USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',