Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '116-migrate-buidler-to-hardhat' of gitlab.com:aave-tech/protocol-v2 into 116-migrate-buidler-to-hardhat

Browse Source
This commit is contained in:
David Racero 2020-11-06 12:18:24 +01:00
commit 8264835735
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
helpers/configuration.ts
View File

@ -7,13 +7,12 @@ import {
ICommonConfiguration, ICommonConfiguration,
eEthereumNetwork, eEthereumNetwork,
} from './types'; } from './types';
import {getParamPerPool} from './contracts-helpers'; import {getParamPerPool} from './contracts-helpers';
import {AaveConfig} from '../config/aave'; import {AaveConfig} from '../config/aave';
import {UniswapConfig} from '../config/uniswap'; import {UniswapConfig} from '../config/uniswap';
import {CommonsConfig} from '../config/commons'; import {CommonsConfig} from '../config/commons';
import {ZERO_ADDRESS} from './constants'; import {ZERO_ADDRESS} from './constants';
import {DRE} from './misc-utils'; import {BRE} from './misc-utils';
import {tEthereumAddress} from './types'; import {tEthereumAddress} from './types';
import {getParamPerNetwork} from './contracts-helpers'; import {getParamPerNetwork} from './contracts-helpers';
import {deployWETHMocked} from './contracts-deployments'; import {deployWETHMocked} from './contracts-deployments';
@ -66,26 +65,26 @@ export const getFeeDistributionParamsCommon = (
}; };
export const getGenesisPoolAdmin = async (config: ICommonConfiguration) => { export const getGenesisPoolAdmin = async (config: ICommonConfiguration) => {
const currentNetwork = DRE.network.name; const currentNetwork = BRE.network.name;
const targetAddress = getParamPerNetwork(config.PoolAdmin, <eEthereumNetwork>currentNetwork); const targetAddress = getParamPerNetwork(config.PoolAdmin, <eEthereumNetwork>currentNetwork);
if (targetAddress) { if (targetAddress) {
return targetAddress; return targetAddress;
} }
const addressList = await Promise.all( const addressList = await Promise.all(
(await DRE.ethers.getSigners()).map((signer) => signer.getAddress()) (await BRE.ethers.getSigners()).map((signer) => signer.getAddress())
); );
const addressIndex = config.PoolAdminIndex; const addressIndex = config.PoolAdminIndex;
return addressList[addressIndex]; return addressList[addressIndex];
}; };
export const getEmergencyAdmin = async (config: ICommonConfiguration) => { export const getEmergencyAdmin = async (config: ICommonConfiguration) => {
const currentNetwork = DRE.network.name; const currentNetwork = BRE.network.name;
const targetAddress = getParamPerNetwork(config.EmergencyAdmin, <eEthereumNetwork>currentNetwork); const targetAddress = getParamPerNetwork(config.EmergencyAdmin, <eEthereumNetwork>currentNetwork);
if (targetAddress) { if (targetAddress) {
return targetAddress; return targetAddress;
} }
const addressList = await Promise.all( const addressList = await Promise.all(
(await DRE.ethers.getSigners()).map((signer) => signer.getAddress()) (await BRE.ethers.getSigners()).map((signer) => signer.getAddress())
); );
const addressIndex = config.EmergencyAdminIndex; const addressIndex = config.EmergencyAdminIndex;
return addressList[addressIndex]; return addressList[addressIndex];
@ -97,7 +96,7 @@ export const getATokenDomainSeparatorPerNetwork = (
): tEthereumAddress => getParamPerNetwork<tEthereumAddress>(config.ATokenDomainSeparator, network); ): tEthereumAddress => getParamPerNetwork<tEthereumAddress>(config.ATokenDomainSeparator, network);
export const getWethAddress = async (config: ICommonConfiguration) => { export const getWethAddress = async (config: ICommonConfiguration) => {
const currentNetwork = DRE.network.name; const currentNetwork = BRE.network.name;
const wethAddress = getParamPerNetwork(config.WETH, <eEthereumNetwork>currentNetwork); const wethAddress = getParamPerNetwork(config.WETH, <eEthereumNetwork>currentNetwork);
if (wethAddress) { if (wethAddress) {
return wethAddress; return wethAddress;