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

feat: added args to ui pool data provider deployment

Browse Source
This commit is contained in:
sendra 2021-10-14 10:25:34 +02:00
parent 5c84b4e486
commit 602cb3d7fd
5 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/interfaces/IChainlinkAggregator.sol
View File

@ -2,6 +2,8 @@
pragma solidity 0.6.12; pragma solidity 0.6.12;
interface IChainlinkAggregator { interface IChainlinkAggregator {
function decimals() external view returns (uint8);
function latestAnswer() external view returns (int256); function latestAnswer() external view returns (int256);
function latestTimestamp() external view returns (uint256); function latestTimestamp() external view returns (uint256);

9
contracts/misc/UiPoolDataProvider.sol
View File

@ -14,6 +14,7 @@ import {WadRayMath} from '../protocol/libraries/math/WadRayMath.sol';
import {ReserveConfiguration} from '../protocol/libraries/configuration/ReserveConfiguration.sol'; import {ReserveConfiguration} from '../protocol/libraries/configuration/ReserveConfiguration.sol';
import {UserConfiguration} from '../protocol/libraries/configuration/UserConfiguration.sol'; import {UserConfiguration} from '../protocol/libraries/configuration/UserConfiguration.sol';
import {DataTypes} from '../protocol/libraries/types/DataTypes.sol'; import {DataTypes} from '../protocol/libraries/types/DataTypes.sol';
import {IChainlinkAggregator} from '../interfaces/IChainlinkAggregator.sol';
import { import {
DefaultReserveInterestRateStrategy DefaultReserveInterestRateStrategy
} from '../protocol/lendingpool/DefaultReserveInterestRateStrategy.sol'; } from '../protocol/lendingpool/DefaultReserveInterestRateStrategy.sol';
@ -24,10 +25,13 @@ contract UiPoolDataProvider is IUiPoolDataProvider {
using UserConfiguration for DataTypes.UserConfigurationMap; using UserConfiguration for DataTypes.UserConfigurationMap;
address public constant MOCK_USD_ADDRESS = 0x10F7Fc1F91Ba351f9C629c5947AD69bD03C05b96; address public constant MOCK_USD_ADDRESS = 0x10F7Fc1F91Ba351f9C629c5947AD69bD03C05b96;
IChainlinkAggregator public _networkBaseTokenPriceInUsdProxyAggregator;
uint256 public constant USD_PRICE = 100000000; uint256 public constant USD_PRICE = 100000000;
uint256 public constant ETH_CURRENCY_DECIMALS = 18; uint256 public constant ETH_CURRENCY_DECIMALS = 18;
constructor() public {
constructor(IChainlinkAggregator networkBaseTokenPriceInUsdProxyAggregator) public {
_networkBaseTokenPriceInUsdProxyAggregator = networkBaseTokenPriceInUsdProxyAggregator;
} }
function getInterestRateStrategySlopes(DefaultReserveInterestRateStrategy interestRateStrategy) function getInterestRateStrategySlopes(DefaultReserveInterestRateStrategy interestRateStrategy)
@ -132,6 +136,9 @@ contract UiPoolDataProvider is IUiPoolDataProvider {
} }
BaseCurrencyInfo memory baseCurrencyInfo; BaseCurrencyInfo memory baseCurrencyInfo;
baseCurrencyInfo.networkBaseTokenPriceInUsd = _networkBaseTokenPriceInUsdProxyAggregator.latestAnswer();
baseCurrencyInfo.networkBaseTokenDecimals = _networkBaseTokenPriceInUsdProxyAggregator.decimals();
try oracle.BASE_CURRENCY_UNIT() returns (uint256 baseCurrencyUnit) { try oracle.BASE_CURRENCY_UNIT() returns (uint256 baseCurrencyUnit) {
baseCurrencyInfo.baseCurrencyDecimals = baseCurrencyUnit; baseCurrencyInfo.baseCurrencyDecimals = baseCurrencyUnit;
if (address(0) == oracle.BASE_CURRENCY()) { if (address(0) == oracle.BASE_CURRENCY()) {

2
contracts/misc/interfaces/IUiPoolDataProvider.sol
View File

@ -56,6 +56,8 @@ interface IUiPoolDataProvider {
struct BaseCurrencyInfo { struct BaseCurrencyInfo {
uint256 baseCurrencyDecimals; uint256 baseCurrencyDecimals;
uint256 baseCurrencyPriceInUsd; uint256 baseCurrencyPriceInUsd;
int256 networkBaseTokenPriceInUsd;
uint8 networkBaseTokenDecimals;
} }
function getReservesList(ILendingPoolAddressesProvider provider) function getReservesList(ILendingPoolAddressesProvider provider)

9
helpers/contracts-deployments.ts
View File

@ -79,11 +79,14 @@ export const deployUiIncentiveDataProvider = async (verify?: boolean) =>
verify verify
); );
export const deployUiPoolDataProvider = async (verify?: boolean) => export const deployUiPoolDataProvider = async (
chainlinkAggregatorProxy: string,
verify?: boolean
) =>
withSaveAndVerify( withSaveAndVerify(
await new UiPoolDataProviderFactory(await getFirstSigner()).deploy(), await new UiPoolDataProviderFactory(await getFirstSigner()).deploy(chainlinkAggregatorProxy),
eContractid.UiPoolDataProvider, eContractid.UiPoolDataProvider,
[], [chainlinkAggregatorProxy],
verify verify
); );

16
tasks/deployments/deploy-UiPoolDataProvider.ts
View File

@ -10,9 +10,23 @@ task(`deploy-${eContractid.UiPoolDataProvider}`, `Deploys the UiPoolDataProvider
throw new Error('INVALID_CHAIN_ID'); throw new Error('INVALID_CHAIN_ID');
} }
const chainlinkAggregatorProxy = {
mainnet: '0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419',
kovan: '0x9326BFA02ADD2366b30bacB125260Af641031331',
matic: '0xAB594600376Ec9fD91F8e885dADF0CE036862dE0',
mumbai: '0xd0D5e3DB44DE05E9F294BB0a3bEEaF030DE24Ada',
avalanche: '0x0A77230d17318075983913bC2145DB16C7366156',
fuji: '0x5498BB86BC934c8D34FDA08E81D444153d0D06aD',
};
console.log(
`\n- UiPoolDataProvider price aggregator: ${chainlinkAggregatorProxy[localBRE.network.name]}`
);
console.log(`\n- UiPoolDataProvider deployment`); console.log(`\n- UiPoolDataProvider deployment`);
const uiPoolDataProvider = await deployUiPoolDataProvider(verify); const uiPoolDataProvider = await deployUiPoolDataProvider(
chainlinkAggregatorProxy[localBRE.network.name],
verify
);
console.log('UiPoolDataProvider deployed at:', uiPoolDataProvider.address); console.log('UiPoolDataProvider deployed at:', uiPoolDataProvider.address);
console.log(`\tFinished UiPoolDataProvider deployment`); console.log(`\tFinished UiPoolDataProvider deployment`);