Updated migration scripts

This commit is contained in:
The3D 2020-11-19 18:11:53 +01:00
parent 3f5822f5f6
commit d5f0e9ebf9
4 changed files with 14 additions and 1 deletions

View File

@ -11,6 +11,7 @@ import {
} from '../lendingpool/DefaultReserveInterestRateStrategy.sol'; } from '../lendingpool/DefaultReserveInterestRateStrategy.sol';
import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol'; import {Ownable} from '../dependencies/openzeppelin/contracts/Ownable.sol';
import {StringLib} from '../libraries/helpers/StringLib.sol'; import {StringLib} from '../libraries/helpers/StringLib.sol';
import "hardhat/console.sol";
contract ATokensAndRatesHelper is Ownable { contract ATokensAndRatesHelper is Ownable {
address payable private pool; address payable private pool;
@ -31,9 +32,10 @@ contract ATokensAndRatesHelper is Ownable {
function initDeployment( function initDeployment(
address[] calldata tokens, address[] calldata tokens,
string[] calldata symbols, string[] calldata symbols,
uint256[][6] calldata rates, uint256[6][] calldata rates,
address incentivesController address incentivesController
) external onlyOwner { ) external onlyOwner {
require(tokens.length == symbols.length, 't Arrays not same length'); require(tokens.length == symbols.length, 't Arrays not same length');
require(rates.length == symbols.length, 'r Arrays not same length'); require(rates.length == symbols.length, 'r Arrays not same length');
for (uint256 i = 0; i < tokens.length; i++) { for (uint256 i = 0; i < tokens.length; i++) {

View File

@ -8,6 +8,7 @@ import {
} from './contracts-getters'; } from './contracts-getters';
import { rawInsertContractAddressInDb } from './contracts-helpers'; import { rawInsertContractAddressInDb } from './contracts-helpers';
import { BigNumberish } from 'ethers'; import { BigNumberish } from 'ethers';
import BigNumber from 'bignumber.js';
export const initReservesByHelper = async ( export const initReservesByHelper = async (
reservesParams: iMultiPoolsAssets<IReserveParams>, reservesParams: iMultiPoolsAssets<IReserveParams>,
@ -54,6 +55,7 @@ export const initReservesByHelper = async (
BigNumberish, BigNumberish,
BigNumberish, BigNumberish,
BigNumberish, BigNumberish,
BigNumberish,
BigNumberish BigNumberish
][] = []; ][] = [];
const reservesDecimals: string[] = []; const reservesDecimals: string[] = [];
@ -72,6 +74,7 @@ export const initReservesByHelper = async (
const [ const [
, ,
{ {
optimalUtilizationRate,
baseVariableBorrowRate, baseVariableBorrowRate,
variableRateSlope1, variableRateSlope1,
variableRateSlope2, variableRateSlope2,
@ -83,6 +86,7 @@ export const initReservesByHelper = async (
tokens.push(tokenAddress); tokens.push(tokenAddress);
symbols.push(assetSymbol); symbols.push(assetSymbol);
strategyRates.push([ strategyRates.push([
optimalUtilizationRate,
baseVariableBorrowRate, baseVariableBorrowRate,
variableRateSlope1, variableRateSlope1,
variableRateSlope2, variableRateSlope2,

View File

@ -263,6 +263,7 @@ export enum TokenContractId {
export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {} export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {}
export interface IReserveBorrowParams { export interface IReserveBorrowParams {
optimalUtilizationRate: string;
baseVariableBorrowRate: string; baseVariableBorrowRate: string;
variableRateSlope1: string; variableRateSlope1: string;
variableRateSlope2: string; variableRateSlope2: string;

View File

@ -3,6 +3,7 @@ import {oneRay} from '../../helpers/constants';
import {IReserveParams} from '../../helpers/types'; import {IReserveParams} from '../../helpers/types';
export const strategyBase: IReserveParams = { export const strategyBase: IReserveParams = {
optimalUtilizationRate: new BigNumber(0.8).multipliedBy(oneRay).toFixed(),
baseVariableBorrowRate: new BigNumber(0).multipliedBy(oneRay).toFixed(), baseVariableBorrowRate: new BigNumber(0).multipliedBy(oneRay).toFixed(),
variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(), variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(),
variableRateSlope2: new BigNumber(3).multipliedBy(oneRay).toFixed(), variableRateSlope2: new BigNumber(3).multipliedBy(oneRay).toFixed(),
@ -17,6 +18,7 @@ export const strategyBase: IReserveParams = {
}; };
export const stablecoinStrategyBase: IReserveParams = { export const stablecoinStrategyBase: IReserveParams = {
optimalUtilizationRate: new BigNumber(0.8).multipliedBy(oneRay).toFixed(),
baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(), baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(), variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(),
variableRateSlope2: new BigNumber(1.5).multipliedBy(oneRay).toFixed(), variableRateSlope2: new BigNumber(1.5).multipliedBy(oneRay).toFixed(),
@ -31,6 +33,7 @@ export const stablecoinStrategyBase: IReserveParams = {
}; };
export const stablecoinStrategyCentralized: IReserveParams = { export const stablecoinStrategyCentralized: IReserveParams = {
optimalUtilizationRate: new BigNumber(0.8).multipliedBy(oneRay).toFixed(),
baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(), baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(), variableRateSlope1: new BigNumber(0.07).multipliedBy(oneRay).toFixed(),
variableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(), variableRateSlope2: new BigNumber(0.6).multipliedBy(oneRay).toFixed(),
@ -117,6 +120,7 @@ export const strategyREN: IReserveParams = {
}; };
export const stablecoinStrategySUSD: IReserveParams = { export const stablecoinStrategySUSD: IReserveParams = {
optimalUtilizationRate: new BigNumber(0.8).multipliedBy(oneRay).toFixed(),
baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(), baseVariableBorrowRate: new BigNumber(0.01).multipliedBy(oneRay).toFixed(),
variableRateSlope1: new BigNumber(0.04).multipliedBy(oneRay).toFixed(), variableRateSlope1: new BigNumber(0.04).multipliedBy(oneRay).toFixed(),
variableRateSlope2: new BigNumber(1).multipliedBy(oneRay).toFixed(), variableRateSlope2: new BigNumber(1).multipliedBy(oneRay).toFixed(),
@ -174,6 +178,7 @@ export const stablecoinStrategyUSDT: IReserveParams = {
}; };
export const strategyWBTC: IReserveParams = { export const strategyWBTC: IReserveParams = {
optimalUtilizationRate: new BigNumber(0.8).multipliedBy(oneRay).toFixed(),
baseVariableBorrowRate: new BigNumber(0).multipliedBy(oneRay).toFixed(), baseVariableBorrowRate: new BigNumber(0).multipliedBy(oneRay).toFixed(),
variableRateSlope1: new BigNumber(0.08).multipliedBy(oneRay).toFixed(), variableRateSlope1: new BigNumber(0.08).multipliedBy(oneRay).toFixed(),
variableRateSlope2: new BigNumber(0.5).multipliedBy(oneRay).toFixed(), variableRateSlope2: new BigNumber(0.5).multipliedBy(oneRay).toFixed(),
@ -188,6 +193,7 @@ export const strategyWBTC: IReserveParams = {
}; };
export const strategyWETH: IReserveParams = { export const strategyWETH: IReserveParams = {
optimalUtilizationRate: new BigNumber(0.8).multipliedBy(oneRay).toFixed(),
baseVariableBorrowRate: new BigNumber(0).multipliedBy(oneRay).toFixed(), baseVariableBorrowRate: new BigNumber(0).multipliedBy(oneRay).toFixed(),
variableRateSlope1: new BigNumber(0.08).multipliedBy(oneRay).toFixed(), variableRateSlope1: new BigNumber(0.08).multipliedBy(oneRay).toFixed(),
variableRateSlope2: new BigNumber(1).multipliedBy(oneRay).toFixed(), variableRateSlope2: new BigNumber(1).multipliedBy(oneRay).toFixed(),