Fixed names & added prefixes

helpers/init-helpers.ts

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

helpers/types.ts

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

markets/aave/commons.ts

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

markets/lp/commons.ts

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

markets/lp/index.ts

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

tasks/dev/5_initialize.ts

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

tasks/full/5_initialize.ts

@@ -29,7 +29,15 @@ task('full:initialize-lending-pool', 'Initialize lending pool configuration.')
       await localBRE.run('set-DRE');
       const network = <eEthereumNetwork>localBRE.network.name;
       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);
 
@@ -47,6 +55,10 @@ task('full:initialize-lending-pool', 'Initialize lending pool configuration.')
       await initReservesByHelper(
         ReservesConfig,
         reserveAssets,
+        ATokenNamePrefix,
+        StableDebtTokenNamePrefix,
+        VariableDebtTokenNamePrefix,
+        SymbolPrefix,
         admin,
         treasuryAddress,
         ZERO_ADDRESS,