Fixed names & added prefixes

This commit is contained in:
Zer0dot 2021-02-19 15:50:06 -05:00
parent f44879e625
commit 5965ef09d4
7 changed files with 302 additions and 266 deletions

View File

@ -44,6 +44,10 @@ export const chooseATokenDeployment = (id: eContractid) => {
export const initReservesByHelper = async ( export const initReservesByHelper = async (
reservesParams: iMultiPoolsAssets<IReserveParams>, reservesParams: iMultiPoolsAssets<IReserveParams>,
tokenAddresses: { [symbol: string]: tEthereumAddress }, tokenAddresses: { [symbol: string]: tEthereumAddress },
aTokenNamePrefix: string,
stableDebtTokenNamePrefix: string,
variableDebtTokenNamePrefix: string,
symbolPrefix: string,
admin: tEthereumAddress, admin: tEthereumAddress,
treasuryAddress: tEthereumAddress, treasuryAddress: tEthereumAddress,
incentivesController: tEthereumAddress, incentivesController: tEthereumAddress,
@ -194,12 +198,12 @@ export const initReservesByHelper = async (
treasury: treasuryAddress, treasury: treasuryAddress,
incentivesController: ZERO_ADDRESS, incentivesController: ZERO_ADDRESS,
underlyingAssetName: reserveSymbols[i], underlyingAssetName: reserveSymbols[i],
aTokenName: `Aave interest bearing ${reserveSymbols[i]}`, aTokenName: `${aTokenNamePrefix} ${reserveSymbols[i]}`,
aTokenSymbol: `a${reserveSymbols[i]}`, aTokenSymbol: `a${symbolPrefix}${reserveSymbols[i]}`,
variableDebtTokenName: `Aave variable debt bearing ${reserveSymbols[i]}`, variableDebtTokenName: `${variableDebtTokenNamePrefix} ${symbolPrefix}${reserveSymbols[i]}`,
variableDebtTokenSymbol: `variableDebt${reserveSymbols[i]}`, variableDebtTokenSymbol: `variableDebt${symbolPrefix}${reserveSymbols[i]}`,
stableDebtTokenName: `Aave stable debt bearing ${reserveSymbols[i]}`, stableDebtTokenName: `${stableDebtTokenNamePrefix} ${reserveSymbols[i]}`,
stableDebtTokenSymbol: `stableDebt${reserveSymbols[i]}` stableDebtTokenSymbol: `stableDebt${symbolPrefix}${reserveSymbols[i]}`
}); });
} }

View File

@ -205,26 +205,26 @@ export interface iAssetBase<T> {
USD: T; USD: T;
REN: T; REN: T;
ENJ: T; ENJ: T;
LpWETH: T; // LpWETH: T;
LpWBTC: T; // LpWBTC: T;
LpDAI: T; // LpDAI: T;
LpUSDC: T; // LpUSDC: T;
LpUSDT: T; // LpUSDT: T;
LpUniDAIWETH: T; UniDAIWETH: T;
LpUniWBTCWETH: T; UniWBTCWETH: T;
LpUniAAVEWETH: T; UniAAVEWETH: T;
LpUniBATWETH: T; UniBATWETH: T;
LpUniUSDCDAI: T; UniUSDCDAI: T;
LpUniCRVWETH: T; UniCRVWETH: T;
LpUniLINKWETH: T; UniLINKWETH: T;
LpUniMKRWETH: T; UniMKRWETH: T;
LpUniRENWETH: T; UniRENWETH: T;
LpUniSNXWETH: T; UniSNXWETH: T;
LpUniUNIWETH: T; UniUNIWETH: T;
LpUniUSDCWETH: T; UniUSDCWETH: T;
LpUniWBTCUSDC: T; UniWBTCUSDC: T;
LpUniYFIWETH: T; UniYFIWETH: T;
LpBalWBTCWETH: T; BptWBTCWETH: T;
} }
export type iAssetsWithoutETH<T> = Omit<iAssetBase<T>, 'ETH'>; export type iAssetsWithoutETH<T> = Omit<iAssetBase<T>, 'ETH'>;
@ -257,26 +257,26 @@ export type iAavePoolAssets<T> = Pick<
export type iLpPoolAssets<T> = Pick< export type iLpPoolAssets<T> = Pick<
iAssetsWithoutUSD<T>, iAssetsWithoutUSD<T>,
| 'LpDAI' | 'DAI'
| 'LpUSDC' | 'USDC'
| 'LpUSDT' | 'USDT'
| 'LpWBTC' | 'WBTC'
| 'LpWETH' | 'WETH'
| 'LpUniDAIWETH' | 'UniDAIWETH'
| 'LpUniWBTCWETH' | 'UniWBTCWETH'
| 'LpUniAAVEWETH' | 'UniAAVEWETH'
| 'LpUniBATWETH' | 'UniBATWETH'
| 'LpUniUSDCDAI' | 'UniUSDCDAI'
| 'LpUniCRVWETH' | 'UniCRVWETH'
| 'LpUniLINKWETH' | 'UniLINKWETH'
| 'LpUniMKRWETH' | 'UniMKRWETH'
| 'LpUniRENWETH' | 'UniRENWETH'
| 'LpUniSNXWETH' | 'UniSNXWETH'
| 'LpUniUNIWETH' | 'UniUNIWETH'
| 'LpUniUSDCWETH' | 'UniUSDCWETH'
| 'LpUniWBTCUSDC' | 'UniWBTCUSDC'
| 'LpUniYFIWETH' | 'UniYFIWETH'
| 'LpBalWBTCWETH' | 'BptWBTCWETH'
>; >;
export type iMultiPoolsAssets<T> = iAssetCommon<T> | iAavePoolAssets<T>; export type iMultiPoolsAssets<T> = iAssetCommon<T> | iAavePoolAssets<T>;
@ -307,26 +307,26 @@ export enum TokenContractId {
YFI = 'YFI', YFI = 'YFI',
UNI = 'UNI', UNI = 'UNI',
ENJ = 'ENJ', ENJ = 'ENJ',
LpWETH = 'LpWETH', // LpWETH = 'LpWETH',
LpWBTC = 'LpWBTC', // LpWBTC = 'LpWBTC',
LpDAI = 'LpDAI', // LpDAI = 'LpDAI',
LpUSDC = 'LpUSDC', // LpUSDC = 'LpUSDC',
LpUSDT = 'LpUSDT', // LpUSDT = 'LpUSDT',
LpUniDAIWETH = 'LpUniDAIWETH', UniDAIWETH = 'UniDAIWETH',
LpUniWBTCWETH = 'LpUniWBTCWETH', UniWBTCWETH = 'UniWBTCWETH',
LpUniAAVEWETH = 'LpUniAAVEWETH', UniAAVEWETH = 'UniAAVEWETH',
LpUniBATWETH = 'LpUniBATWETH', UniBATWETH = 'UniBATWETH',
LpUniUSDCDAI = 'LpUniUSDCDAI', UniUSDCDAI = 'UniUSDCDAI',
LpUniCRVWETH = 'LpUniCRVWETH', UniCRVWETH = 'UniCRVWETH',
LpUniLINKWETH = 'LpUniLINKWETH', UniLINKWETH = 'UniLINKWETH',
LpUniMKRWETH = 'LpUniMKRWETH', UniMKRWETH = 'UniMKRWETH',
LpUniRENWETH = 'LpUniRENWETH', UniRENWETH = 'UniRENWETH',
LpUniSNXWETH = 'LpUniSNXWETH', UniSNXWETH = 'UniSNXWETH',
LpUniUNIWETH = 'LpUniUNIWETH', UniUNIWETH = 'UniUNIWETH',
LpUniUSDCWETH = 'LpUniUSDCWETH', UniUSDCWETH = 'UniUSDCWETH',
LpUniWBTCUSDC = 'LpUniWBTCUSDC', UniWBTCUSDC = 'UniWBTCUSDC',
LpUniYFIWETH = 'LpUniYFIWETH', UniYFIWETH = 'UniYFIWETH',
LpBalWBTCWETH = 'LpBalWBTCWETH', BptWBTCWETH = 'BptWBTCWETH',
} }
export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams { export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {
@ -428,6 +428,10 @@ export interface ILendingRate {
export interface ICommonConfiguration { export interface ICommonConfiguration {
MarketId: string; MarketId: string;
ATokenNamePrefix: string;
StableDebtTokenNamePrefix: string;
VariableDebtTokenNamePrefix: string;
SymbolPrefix: string;
ProviderId: number; ProviderId: number;
ProtocolGlobalParams: IProtocolGlobalConfig; ProtocolGlobalParams: IProtocolGlobalConfig;
Mocks: IMocksConfig; Mocks: IMocksConfig;

View File

@ -23,35 +23,38 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
WBTC: oneEther.multipliedBy('47.332685').toFixed(), WBTC: oneEther.multipliedBy('47.332685').toFixed(),
YFI: oneEther.multipliedBy('22.407436').toFixed(), YFI: oneEther.multipliedBy('22.407436').toFixed(),
ZRX: oneEther.multipliedBy('0.001151').toFixed(), ZRX: oneEther.multipliedBy('0.001151').toFixed(),
LpDAI: oneEther.multipliedBy('0.00369068412860').toFixed(), // LpDAI: oneEther.multipliedBy('0.00369068412860').toFixed(),
LpUSDC: oneEther.multipliedBy('0.00367714136416').toFixed(), // LpUSDC: oneEther.multipliedBy('0.00367714136416').toFixed(),
LpUSDT: oneEther.multipliedBy('0.00369068412860').toFixed(), // LpUSDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
LpWBTC: oneEther.multipliedBy('47.332685').toFixed(), // LpWBTC: oneEther.multipliedBy('47.332685').toFixed(),
LpWETH: oneEther.toFixed(), // LpWETH: oneEther.toFixed(),
LpUniDAIWETH: oneEther.multipliedBy('22.407436').toFixed(), UniDAIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(), UniWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniAAVEWETH: oneEther.multipliedBy('0.003620948469').toFixed(), UniAAVEWETH: oneEther.multipliedBy('0.003620948469').toFixed(),
LpUniBATWETH: oneEther.multipliedBy('22.407436').toFixed(), UniBATWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniUSDCDAI: oneEther.multipliedBy('22.407436').toFixed(), UniUSDCDAI: oneEther.multipliedBy('22.407436').toFixed(),
LpUniCRVWETH: oneEther.multipliedBy('22.407436').toFixed(), UniCRVWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniLINKWETH: oneEther.multipliedBy('0.009955').toFixed(), UniLINKWETH: oneEther.multipliedBy('0.009955').toFixed(),
LpUniMKRWETH: oneEther.multipliedBy('22.407436').toFixed(), UniMKRWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniRENWETH: oneEther.multipliedBy('22.407436').toFixed(), UniRENWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniSNXWETH: oneEther.multipliedBy('22.407436').toFixed(), UniSNXWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniUNIWETH: oneEther.multipliedBy('22.407436').toFixed(), UniUNIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniUSDCWETH: oneEther.multipliedBy('22.407436').toFixed(), UniUSDCWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniWBTCUSDC: oneEther.multipliedBy('22.407436').toFixed(), UniWBTCUSDC: oneEther.multipliedBy('22.407436').toFixed(),
LpUniYFIWETH: oneEther.multipliedBy('22.407436').toFixed(), UniYFIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpBalWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(), BptWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(),
USD: '5848466240000000', USD: '5848466240000000',
}; };
// ---------------- // ----------------
// PROTOCOL GLOBAL PARAMS // PROTOCOL GLOBAL PARAMS
// ---------------- // ----------------
export const CommonsConfig: ICommonConfiguration = { export const CommonsConfig: ICommonConfiguration = {
MarketId: 'Commons', MarketId: 'Commons',
ATokenNamePrefix: 'Aave interest bearing',
StableDebtTokenNamePrefix: 'Aave stable debt bearing',
VariableDebtTokenNamePrefix: 'Aave variable debt bearing',
SymbolPrefix: '',
ProviderId: 0, ProviderId: 0,
ProtocolGlobalParams: { ProtocolGlobalParams: {
TokenDistributorPercentageBase: '10000', TokenDistributorPercentageBase: '10000',

View File

@ -23,26 +23,26 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
WBTC: oneEther.multipliedBy('47.332685').toFixed(), WBTC: oneEther.multipliedBy('47.332685').toFixed(),
YFI: oneEther.multipliedBy('22.407436').toFixed(), YFI: oneEther.multipliedBy('22.407436').toFixed(),
ZRX: oneEther.multipliedBy('0.001151').toFixed(), ZRX: oneEther.multipliedBy('0.001151').toFixed(),
LpDAI: oneEther.multipliedBy('0.00369068412860').toFixed(), // DAI: oneEther.multipliedBy('0.00369068412860').toFixed(),
LpUSDC: oneEther.multipliedBy('0.00367714136416').toFixed(), // USDC: oneEther.multipliedBy('0.00367714136416').toFixed(),
LpUSDT: oneEther.multipliedBy('0.00369068412860').toFixed(), // USDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
LpWBTC: oneEther.multipliedBy('47.332685').toFixed(), // WBTC: oneEther.multipliedBy('47.332685').toFixed(),
LpWETH: oneEther.toFixed(), // WETH: oneEther.toFixed(),
LpUniDAIWETH: oneEther.multipliedBy('22.407436').toFixed(), UniDAIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(), UniWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniAAVEWETH: oneEther.multipliedBy('0.003620948469').toFixed(), UniAAVEWETH: oneEther.multipliedBy('0.003620948469').toFixed(),
LpUniBATWETH: oneEther.multipliedBy('22.407436').toFixed(), UniBATWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniUSDCDAI: oneEther.multipliedBy('22.407436').toFixed(), UniUSDCDAI: oneEther.multipliedBy('22.407436').toFixed(),
LpUniCRVWETH: oneEther.multipliedBy('22.407436').toFixed(), UniCRVWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniLINKWETH: oneEther.multipliedBy('0.009955').toFixed(), UniLINKWETH: oneEther.multipliedBy('0.009955').toFixed(),
LpUniMKRWETH: oneEther.multipliedBy('22.407436').toFixed(), UniMKRWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniRENWETH: oneEther.multipliedBy('22.407436').toFixed(), UniRENWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniSNXWETH: oneEther.multipliedBy('22.407436').toFixed(), UniSNXWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniUNIWETH: oneEther.multipliedBy('22.407436').toFixed(), UniUNIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniUSDCWETH: oneEther.multipliedBy('22.407436').toFixed(), UniUSDCWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUniWBTCUSDC: oneEther.multipliedBy('22.407436').toFixed(), UniWBTCUSDC: oneEther.multipliedBy('22.407436').toFixed(),
LpUniYFIWETH: oneEther.multipliedBy('22.407436').toFixed(), UniYFIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpBalWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(), BptWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(),
USD: '5848466240000000', USD: '5848466240000000',
}; };
// ---------------- // ----------------
@ -51,6 +51,10 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
export const CommonsConfig: ICommonConfiguration = { export const CommonsConfig: ICommonConfiguration = {
MarketId: 'Commons', MarketId: 'Commons',
ATokenNamePrefix: 'Aave AMM Market',
StableDebtTokenNamePrefix: 'Aave AMM Market stable debt',
VariableDebtTokenNamePrefix: 'Aave AMM Market variable debt',
SymbolPrefix: 'Amm',
ProviderId: 0, ProviderId: 0,
ProtocolGlobalParams: { ProtocolGlobalParams: {
TokenDistributorPercentageBase: '10000', TokenDistributorPercentageBase: '10000',
@ -72,64 +76,64 @@ export const CommonsConfig: ICommonConfiguration = {
}, },
// TODO: reorg alphabetically, checking the reason of tests failing // TODO: reorg alphabetically, checking the reason of tests failing
LendingRateOracleRatesCommon: { LendingRateOracleRatesCommon: {
LpWETH: { WETH: {
borrowRate: oneRay.multipliedBy(0.03).toFixed(), borrowRate: oneRay.multipliedBy(0.03).toFixed(),
}, },
LpDAI: { DAI: {
borrowRate: oneRay.multipliedBy(0.039).toFixed(), borrowRate: oneRay.multipliedBy(0.039).toFixed(),
}, },
LpUSDC: { USDC: {
borrowRate: oneRay.multipliedBy(0.039).toFixed(), borrowRate: oneRay.multipliedBy(0.039).toFixed(),
}, },
LpUSDT: { USDT: {
borrowRate: oneRay.multipliedBy(0.035).toFixed(), borrowRate: oneRay.multipliedBy(0.035).toFixed(),
}, },
LpWBTC: { WBTC: {
borrowRate: oneRay.multipliedBy(0.03).toFixed(), borrowRate: oneRay.multipliedBy(0.03).toFixed(),
}, },
LpUniDAIWETH: { UniDAIWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniWBTCWETH: { UniWBTCWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniAAVEWETH:{ UniAAVEWETH:{
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniBATWETH: { UniBATWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniUSDCDAI: { UniUSDCDAI: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniCRVWETH: { UniCRVWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniLINKWETH: { UniLINKWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniMKRWETH: { UniMKRWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniRENWETH: { UniRENWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniSNXWETH: { UniSNXWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniUNIWETH: { UniUNIWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniUSDCWETH: { UniUSDCWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniWBTCUSDC: { UniWBTCUSDC: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUniYFIWETH: { UniYFIWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpBalWBTCWETH: { BptWBTCWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
}, },
@ -227,71 +231,71 @@ export const CommonsConfig: ICommonConfiguration = {
[eEthereumNetwork.hardhat]: {}, [eEthereumNetwork.hardhat]: {},
[eEthereumNetwork.buidlerevm]: {}, [eEthereumNetwork.buidlerevm]: {},
[EthereumNetwork.kovan]: { [EthereumNetwork.kovan]: {
LpUSDT: '0x0bF499444525a23E7Bb61997539725cA2e928138', USDT: '0x0bF499444525a23E7Bb61997539725cA2e928138',
LpWBTC: '0xF7904a295A029a3aBDFFB6F12755974a958C7C25', WBTC: '0xF7904a295A029a3aBDFFB6F12755974a958C7C25',
LpUSDC: '0x64EaC61A2DFda2c3Fa04eED49AA33D021AeC8838', USDC: '0x64EaC61A2DFda2c3Fa04eED49AA33D021AeC8838',
LpDAI:'0x22B58f1EbEDfCA50feF632bD73368b2FdA96D541', DAI:'0x22B58f1EbEDfCA50feF632bD73368b2FdA96D541',
LpUniDAIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', // Mock oracles UniDAIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', // Mock oracles
LpUniWBTCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniWBTCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniAAVEWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniAAVEWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniBATWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniBATWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniUSDCDAI: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniUSDCDAI: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniCRVWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniCRVWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniLINKWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniLINKWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniMKRWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniMKRWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniRENWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniRENWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniSNXWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniSNXWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniUNIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniUNIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniUSDCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniUSDCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniWBTCUSDC: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniWBTCUSDC: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUniYFIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', UniYFIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpBalWBTCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', BptWBTCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
USD: '0x9326BFA02ADD2366b30bacB125260Af641031331', USD: '0x9326BFA02ADD2366b30bacB125260Af641031331',
}, },
[EthereumNetwork.ropsten]: { [EthereumNetwork.ropsten]: {
}, },
[EthereumNetwork.main]: { [EthereumNetwork.main]: {
LpUSDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46', USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46',
LpWBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8', WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8',
LpUSDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4', USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4',
LpDAI:'0x773616E4d11A78F511299002da57A0a94577F1f4', DAI:'0x773616E4d11A78F511299002da57A0a94577F1f4',
LpUniDAIWETH: '0xf4071801C4421Db7e63DaC15B9432e50C44a7F42', UniDAIWETH: '0xf4071801C4421Db7e63DaC15B9432e50C44a7F42',
LpUniWBTCWETH: ZERO_ADDRESS, UniWBTCWETH: ZERO_ADDRESS,
LpUniAAVEWETH: ZERO_ADDRESS, UniAAVEWETH: ZERO_ADDRESS,
LpUniBATWETH: ZERO_ADDRESS, UniBATWETH: ZERO_ADDRESS,
LpUniUSDCDAI: ZERO_ADDRESS, UniUSDCDAI: ZERO_ADDRESS,
LpUniCRVWETH: ZERO_ADDRESS, UniCRVWETH: ZERO_ADDRESS,
LpUniLINKWETH: ZERO_ADDRESS, UniLINKWETH: ZERO_ADDRESS,
LpUniMKRWETH: ZERO_ADDRESS, UniMKRWETH: ZERO_ADDRESS,
LpUniRENWETH: ZERO_ADDRESS, UniRENWETH: ZERO_ADDRESS,
LpUniSNXWETH: ZERO_ADDRESS, UniSNXWETH: ZERO_ADDRESS,
LpUniUNIWETH: ZERO_ADDRESS, UniUNIWETH: ZERO_ADDRESS,
LpUniUSDCWETH: ZERO_ADDRESS, UniUSDCWETH: ZERO_ADDRESS,
LpUniWBTCUSDC: ZERO_ADDRESS, UniWBTCUSDC: ZERO_ADDRESS,
LpUniYFIWETH: ZERO_ADDRESS, UniYFIWETH: ZERO_ADDRESS,
LpBalWBTCWETH: ZERO_ADDRESS, BptWBTCWETH: ZERO_ADDRESS,
USD: '0x9326BFA02ADD2366b30bacB125260Af641031331', USD: '0x9326BFA02ADD2366b30bacB125260Af641031331',
}, },
[EthereumNetwork.tenderlyMain]: { [EthereumNetwork.tenderlyMain]: {
LpUSDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46', USDT: '0xEe9F2375b4bdF6387aa8265dD4FB8F16512A1d46',
LpWBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8', WBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8',
LpUSDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4', USDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4',
LpDAI:'0x773616E4d11A78F511299002da57A0a94577F1f4', DAI:'0x773616E4d11A78F511299002da57A0a94577F1f4',
LpUniDAIWETH: ZERO_ADDRESS, UniDAIWETH: ZERO_ADDRESS,
LpUniWBTCWETH: ZERO_ADDRESS, UniWBTCWETH: ZERO_ADDRESS,
LpUniAAVEWETH: ZERO_ADDRESS, UniAAVEWETH: ZERO_ADDRESS,
LpUniBATWETH: ZERO_ADDRESS, UniBATWETH: ZERO_ADDRESS,
LpUniUSDCDAI: ZERO_ADDRESS, UniUSDCDAI: ZERO_ADDRESS,
LpUniCRVWETH: ZERO_ADDRESS, UniCRVWETH: ZERO_ADDRESS,
LpUniLINKWETH: ZERO_ADDRESS, UniLINKWETH: ZERO_ADDRESS,
LpUniMKRWETH: ZERO_ADDRESS, UniMKRWETH: ZERO_ADDRESS,
LpUniRENWETH: ZERO_ADDRESS, UniRENWETH: ZERO_ADDRESS,
LpUniSNXWETH: ZERO_ADDRESS, UniSNXWETH: ZERO_ADDRESS,
LpUniUNIWETH: ZERO_ADDRESS, UniUNIWETH: ZERO_ADDRESS,
LpUniUSDCWETH: ZERO_ADDRESS, UniUSDCWETH: ZERO_ADDRESS,
LpUniWBTCUSDC: ZERO_ADDRESS, UniWBTCUSDC: ZERO_ADDRESS,
LpUniYFIWETH: ZERO_ADDRESS, UniYFIWETH: ZERO_ADDRESS,
LpBalWBTCWETH: ZERO_ADDRESS, BptWBTCWETH: ZERO_ADDRESS,
USD: '0x9326BFA02ADD2366b30bacB125260Af641031331', USD: '0x9326BFA02ADD2366b30bacB125260Af641031331',
}, },
}, },

View File

@ -33,98 +33,98 @@ export const lpConfig: ILpConfiguration = {
MarketId: 'Aave LP market', MarketId: 'Aave LP market',
ProviderId: 2, ProviderId: 2,
ReservesConfig: { ReservesConfig: {
LpWETH: strategyWETH, WETH: strategyWETH,
LpDAI: strategyDAI, DAI: strategyDAI,
LpUSDC: strategyUSDC, USDC: strategyUSDC,
LpUSDT: strategyUSDT, USDT: strategyUSDT,
LpWBTC: strategyWBTC, WBTC: strategyWBTC,
LpUniDAIWETH: strategyDAIWETH, UniDAIWETH: strategyDAIWETH,
LpUniWBTCWETH: strategyWBTCWETH, UniWBTCWETH: strategyWBTCWETH,
LpUniAAVEWETH: strategyAAVEWETH, UniAAVEWETH: strategyAAVEWETH,
LpUniBATWETH: strategyBATWETH, UniBATWETH: strategyBATWETH,
LpUniUSDCDAI: strategyUSDCDAI, UniUSDCDAI: strategyUSDCDAI,
LpUniCRVWETH: strategyCRVWETH, UniCRVWETH: strategyCRVWETH,
LpUniLINKWETH: strategyLINKWETH, UniLINKWETH: strategyLINKWETH,
LpUniMKRWETH: strategyMKRWETH, UniMKRWETH: strategyMKRWETH,
LpUniRENWETH: strategyRENWETH, UniRENWETH: strategyRENWETH,
LpUniSNXWETH: strategySNXWETH, UniSNXWETH: strategySNXWETH,
LpUniUNIWETH: strategyUNIWETH, UniUNIWETH: strategyUNIWETH,
LpUniUSDCWETH: strategyUSDCWETH, UniUSDCWETH: strategyUSDCWETH,
LpUniWBTCUSDC: strategyWBTCUSDC, UniWBTCUSDC: strategyWBTCUSDC,
LpUniYFIWETH: strategyYFIWETH, UniYFIWETH: strategyYFIWETH,
LpBalWBTCWETH: strategyWBTCWETH, BptWBTCWETH: strategyWBTCWETH,
}, },
ReserveAssets: { ReserveAssets: {
[eEthereumNetwork.buidlerevm]: {}, [eEthereumNetwork.buidlerevm]: {},
[eEthereumNetwork.hardhat]: {}, [eEthereumNetwork.hardhat]: {},
[eEthereumNetwork.coverage]: {}, [eEthereumNetwork.coverage]: {},
[EthereumNetwork.kovan]: { [EthereumNetwork.kovan]: {
LpDAI: '0xFf795577d9AC8bD7D90Ee22b6C1703490b6512FD', DAI: '0xFf795577d9AC8bD7D90Ee22b6C1703490b6512FD',
LpUSDC: '0xe22da380ee6B445bb8273C81944ADEB6E8450422', USDC: '0xe22da380ee6B445bb8273C81944ADEB6E8450422',
LpUSDT: '0x13512979ADE267AB5100878E2e0f485B568328a4', USDT: '0x13512979ADE267AB5100878E2e0f485B568328a4',
LpWBTC: '0xD1B98B6607330172f1D991521145A22BCe793277', WBTC: '0xD1B98B6607330172f1D991521145A22BCe793277',
LpWETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c', WETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
LpUniDAIWETH: '0x7e48b02B21D784e79E17b06988fc150c8b5945df', UniDAIWETH: '0x7e48b02B21D784e79E17b06988fc150c8b5945df',
LpUniWBTCWETH: '0x4Fd18882730dc5f945d5049C3f99Ee43CCA1F3d9', UniWBTCWETH: '0x4Fd18882730dc5f945d5049C3f99Ee43CCA1F3d9',
LpUniAAVEWETH: '0xC173038224d47e11962bb0Bd10e036c573C57dF0', UniAAVEWETH: '0xC173038224d47e11962bb0Bd10e036c573C57dF0',
LpUniBATWETH: '0xfC482c56A91Cc92019FF6522B2FB76F41B7e2535', UniBATWETH: '0xfC482c56A91Cc92019FF6522B2FB76F41B7e2535',
LpUniUSDCDAI: '0xFD0795980D4c37Fd867228C86A1f7693C9219142', UniUSDCDAI: '0xFD0795980D4c37Fd867228C86A1f7693C9219142',
LpUniCRVWETH: '0xC7f1899F8B5861d8A3Ce1385194bc130A15C8a74', UniCRVWETH: '0xC7f1899F8B5861d8A3Ce1385194bc130A15C8a74',
LpUniLINKWETH: '0xCe2355F9249ced9E51ecc35AbB749352C2557D0d', UniLINKWETH: '0xCe2355F9249ced9E51ecc35AbB749352C2557D0d',
LpUniMKRWETH: '0xDCf7A28f4102B7f5813148cCEFb02134648E6F0C', UniMKRWETH: '0xDCf7A28f4102B7f5813148cCEFb02134648E6F0C',
LpUniRENWETH: '0xe46C9459833bBa061471DF2a383D27a20FE97E23', UniRENWETH: '0xe46C9459833bBa061471DF2a383D27a20FE97E23',
LpUniSNXWETH: '0xAa5826dea7cfEc02AcB644b24387bE2648feAbB9', UniSNXWETH: '0xAa5826dea7cfEc02AcB644b24387bE2648feAbB9',
LpUniUNIWETH: '0xD4C255B5500cFB262EB5F9105Ea546Aa0610A0d3', UniUNIWETH: '0xD4C255B5500cFB262EB5F9105Ea546Aa0610A0d3',
LpUniUSDCWETH: '0x509f6ce2F9718E3dd854cCE1857FabCc59C6dd5e', UniUSDCWETH: '0x509f6ce2F9718E3dd854cCE1857FabCc59C6dd5e',
LpUniWBTCUSDC: '0x9D15e3A14926A16C9B285A5c6bd6c9e82d5F8031', UniWBTCUSDC: '0x9D15e3A14926A16C9B285A5c6bd6c9e82d5F8031',
LpUniYFIWETH: '0xC6Dc783B3C2E2Cbf71791d253f8b4993D40DBf98', UniYFIWETH: '0xC6Dc783B3C2E2Cbf71791d253f8b4993D40DBf98',
LpBalWBTCWETH: '0x930087451C5940B28bE556d32a4CF22D5d9754A1', BptWBTCWETH: '0x930087451C5940B28bE556d32a4CF22D5d9754A1',
}, },
[EthereumNetwork.ropsten]: { [EthereumNetwork.ropsten]: {
}, },
[EthereumNetwork.main]: { [EthereumNetwork.main]: {
LpDAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F', DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
LpUSDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
LpUSDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7', USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
LpWBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
LpWETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
LpUniDAIWETH: '0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11', UniDAIWETH: '0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11',
LpUniWBTCWETH: '0xBb2b8038a1640196FbE3e38816F3e67Cba72D940', UniWBTCWETH: '0xBb2b8038a1640196FbE3e38816F3e67Cba72D940',
LpUniAAVEWETH: '0xDFC14d2Af169B0D36C4EFF567Ada9b2E0CAE044f', UniAAVEWETH: '0xDFC14d2Af169B0D36C4EFF567Ada9b2E0CAE044f',
LpUniBATWETH: '0xB6909B960DbbE7392D405429eB2b3649752b4838', UniBATWETH: '0xB6909B960DbbE7392D405429eB2b3649752b4838',
LpUniUSDCDAI: '0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5', UniUSDCDAI: '0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5',
LpUniCRVWETH: '0x3dA1313aE46132A397D90d95B1424A9A7e3e0fCE', UniCRVWETH: '0x3dA1313aE46132A397D90d95B1424A9A7e3e0fCE',
LpUniLINKWETH: '0xa2107FA5B38d9bbd2C461D6EDf11B11A50F6b974', UniLINKWETH: '0xa2107FA5B38d9bbd2C461D6EDf11B11A50F6b974',
LpUniMKRWETH: '0xC2aDdA861F89bBB333c90c492cB837741916A225', UniMKRWETH: '0xC2aDdA861F89bBB333c90c492cB837741916A225',
LpUniRENWETH: '0x8Bd1661Da98EBDd3BD080F0bE4e6d9bE8cE9858c', UniRENWETH: '0x8Bd1661Da98EBDd3BD080F0bE4e6d9bE8cE9858c',
LpUniSNXWETH: '0x43AE24960e5534731Fc831386c07755A2dc33D47', UniSNXWETH: '0x43AE24960e5534731Fc831386c07755A2dc33D47',
LpUniUNIWETH: '0xd3d2E2692501A5c9Ca623199D38826e513033a17', UniUNIWETH: '0xd3d2E2692501A5c9Ca623199D38826e513033a17',
LpUniUSDCWETH: '0xB4e16d0168e52d35CaCD2c6185b44281Ec28C9Dc', UniUSDCWETH: '0xB4e16d0168e52d35CaCD2c6185b44281Ec28C9Dc',
LpUniWBTCUSDC: '0x004375Dff511095CC5A197A54140a24eFEF3A416', UniWBTCUSDC: '0x004375Dff511095CC5A197A54140a24eFEF3A416',
LpUniYFIWETH: '0x2fDbAdf3C4D5A8666Bc06645B8358ab803996E28', UniYFIWETH: '0x2fDbAdf3C4D5A8666Bc06645B8358ab803996E28',
LpBalWBTCWETH: '0x1efF8aF5D577060BA4ac8A29A13525bb0Ee2A3D5', BptWBTCWETH: '0x1efF8aF5D577060BA4ac8A29A13525bb0Ee2A3D5',
}, },
[EthereumNetwork.tenderlyMain]: { [EthereumNetwork.tenderlyMain]: {
LpDAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F', DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
LpUSDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
LpUSDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7', USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
LpWBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
LpWETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
LpUniDAIWETH: '0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11', UniDAIWETH: '0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11',
LpUniWBTCWETH: '0xBb2b8038a1640196FbE3e38816F3e67Cba72D940', UniWBTCWETH: '0xBb2b8038a1640196FbE3e38816F3e67Cba72D940',
LpUniAAVEWETH: '0xDFC14d2Af169B0D36C4EFF567Ada9b2E0CAE044f', UniAAVEWETH: '0xDFC14d2Af169B0D36C4EFF567Ada9b2E0CAE044f',
LpUniBATWETH: '0xB6909B960DbbE7392D405429eB2b3649752b4838', UniBATWETH: '0xB6909B960DbbE7392D405429eB2b3649752b4838',
LpUniUSDCDAI: '0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5', UniUSDCDAI: '0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5',
LpUniCRVWETH: '0x3dA1313aE46132A397D90d95B1424A9A7e3e0fCE', UniCRVWETH: '0x3dA1313aE46132A397D90d95B1424A9A7e3e0fCE',
LpUniLINKWETH: '0xa2107FA5B38d9bbd2C461D6EDf11B11A50F6b974', UniLINKWETH: '0xa2107FA5B38d9bbd2C461D6EDf11B11A50F6b974',
LpUniMKRWETH: '0xC2aDdA861F89bBB333c90c492cB837741916A225', UniMKRWETH: '0xC2aDdA861F89bBB333c90c492cB837741916A225',
LpUniRENWETH: '0x8Bd1661Da98EBDd3BD080F0bE4e6d9bE8cE9858c', UniRENWETH: '0x8Bd1661Da98EBDd3BD080F0bE4e6d9bE8cE9858c',
LpUniSNXWETH: '0x43AE24960e5534731Fc831386c07755A2dc33D47', UniSNXWETH: '0x43AE24960e5534731Fc831386c07755A2dc33D47',
LpUniUNIWETH: '0xd3d2E2692501A5c9Ca623199D38826e513033a17', UniUNIWETH: '0xd3d2E2692501A5c9Ca623199D38826e513033a17',
LpUniUSDCWETH: '0xB4e16d0168e52d35CaCD2c6185b44281Ec28C9Dc', UniUSDCWETH: '0xB4e16d0168e52d35CaCD2c6185b44281Ec28C9Dc',
LpUniWBTCUSDC: '0x004375Dff511095CC5A197A54140a24eFEF3A416', UniWBTCUSDC: '0x004375Dff511095CC5A197A54140a24eFEF3A416',
LpUniYFIWETH: '0x2fDbAdf3C4D5A8666Bc06645B8358ab803996E28', UniYFIWETH: '0x2fDbAdf3C4D5A8666Bc06645B8358ab803996E28',
LpBalWBTCWETH: '0x1efF8aF5D577060BA4ac8A29A13525bb0Ee2A3D5', BptWBTCWETH: '0x1efF8aF5D577060BA4ac8A29A13525bb0Ee2A3D5',
}, },
}, },
}; };

View File

@ -31,7 +31,12 @@ task('dev:initialize-lending-pool', 'Initialize lending pool configuration.')
.setAction(async ({ verify, pool }, localBRE) => { .setAction(async ({ verify, pool }, localBRE) => {
await localBRE.run('set-DRE'); await localBRE.run('set-DRE');
const poolConfig = loadPoolConfig(pool); const poolConfig = loadPoolConfig(pool);
const {
ATokenNamePrefix,
StableDebtTokenNamePrefix,
VariableDebtTokenNamePrefix,
SymbolPrefix,
} = poolConfig;
const mockTokens = await getAllMockedTokens(); const mockTokens = await getAllMockedTokens();
const allTokenAddresses = getAllTokenAddresses(mockTokens); const allTokenAddresses = getAllTokenAddresses(mockTokens);
@ -52,6 +57,10 @@ task('dev:initialize-lending-pool', 'Initialize lending pool configuration.')
await initReservesByHelper( await initReservesByHelper(
reservesParams, reservesParams,
protoPoolReservesAddresses, protoPoolReservesAddresses,
ATokenNamePrefix,
StableDebtTokenNamePrefix,
VariableDebtTokenNamePrefix,
SymbolPrefix,
admin, admin,
treasuryAddress, treasuryAddress,
ZERO_ADDRESS, ZERO_ADDRESS,

View File

@ -29,7 +29,15 @@ task('full:initialize-lending-pool', 'Initialize lending pool configuration.')
await localBRE.run('set-DRE'); await localBRE.run('set-DRE');
const network = <eEthereumNetwork>localBRE.network.name; const network = <eEthereumNetwork>localBRE.network.name;
const poolConfig = loadPoolConfig(pool); const poolConfig = loadPoolConfig(pool);
const { ReserveAssets, ReservesConfig, LendingPoolCollateralManager } = poolConfig as ICommonConfiguration; const {
ATokenNamePrefix,
StableDebtTokenNamePrefix,
VariableDebtTokenNamePrefix,
SymbolPrefix,
ReserveAssets,
ReservesConfig,
LendingPoolCollateralManager
} = poolConfig as ICommonConfiguration;
const reserveAssets = await getParamPerNetwork(ReserveAssets, network); const reserveAssets = await getParamPerNetwork(ReserveAssets, network);
@ -47,6 +55,10 @@ task('full:initialize-lending-pool', 'Initialize lending pool configuration.')
await initReservesByHelper( await initReservesByHelper(
ReservesConfig, ReservesConfig,
reserveAssets, reserveAssets,
ATokenNamePrefix,
StableDebtTokenNamePrefix,
VariableDebtTokenNamePrefix,
SymbolPrefix,
admin, admin,
treasuryAddress, treasuryAddress,
ZERO_ADDRESS, ZERO_ADDRESS,