mirror of
https://github.com/Instadapp/aave-protocol-v2.git
synced 2024-07-29 21:47:30 +00:00
Fixed borrow tests
This commit is contained in:
The3D
parent
a784e42b78
commit
e16eed2d03
|
|
@ -11,6 +11,7 @@ usePlugin('solidity-coverage');
|
|||
usePlugin('@nomiclabs/buidler-waffle');
|
||||
usePlugin('@nomiclabs/buidler-etherscan');
|
||||
|
||||
|
||||
['misc', 'deployments', 'migrations'].forEach((folder) => {
|
||||
const tasksPath = path.join(__dirname, 'tasks', folder);
|
||||
fs.readdirSync(tasksPath).forEach((task) => require(`${tasksPath}/${task}`));
|
||||
|
|
|
|||
|
|
@ -280,8 +280,8 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
|
||||
bool isFirstDeposit = aToken.balanceOf(msg.sender) == 0;
|
||||
|
||||
reserve.updateCumulativeIndexes();
|
||||
reserve.updateInterestRatesAndTimestamp(_reserve, _amount, 0);
|
||||
reserve.updateCumulativeIndexesAndTimestamp();
|
||||
reserve.updateInterestRates(_reserve, _amount, 0);
|
||||
|
||||
if (isFirstDeposit) {
|
||||
user.useAsCollateral = true;
|
||||
|
|
@ -320,8 +320,8 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
user.useAsCollateral = false;
|
||||
}
|
||||
|
||||
reserve.updateCumulativeIndexes();
|
||||
reserve.updateInterestRatesAndTimestamp(_reserve, 0, _amount);
|
||||
reserve.updateCumulativeIndexesAndTimestamp();
|
||||
reserve.updateInterestRates(_reserve, 0, _amount);
|
||||
|
||||
IERC20(_reserve).universalTransfer(_user, _amount);
|
||||
|
||||
|
|
@ -346,12 +346,9 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
CoreLibrary.ReserveData storage reserve = reserves[_reserve];
|
||||
CoreLibrary.UserReserveData storage user = usersReserveData[msg.sender][_reserve];
|
||||
|
||||
//calculating fees
|
||||
uint256 borrowFee = feeProvider.calculateLoanOriginationFee(msg.sender, _amount);
|
||||
|
||||
uint256 amountInETH = IPriceOracleGetter(addressesProvider.getPriceOracle())
|
||||
.getAssetPrice(_reserve)
|
||||
.mul(_amount.add(borrowFee))
|
||||
.mul(_amount)
|
||||
.div(10 ** reserve.decimals); //price is in ether
|
||||
|
||||
ValidationLogic.validateBorrow(
|
||||
|
|
@ -361,7 +358,6 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
_amount,
|
||||
amountInETH,
|
||||
_interestRateMode,
|
||||
borrowFee,
|
||||
MAX_STABLE_RATE_BORROW_SIZE_PERCENT,
|
||||
reserves,
|
||||
usersReserveData,
|
||||
|
|
@ -370,21 +366,35 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
);
|
||||
|
||||
//borrow passed
|
||||
reserve.updateCumulativeIndexes();
|
||||
reserve.updateCumulativeIndexesAndTimestamp();
|
||||
|
||||
//solium-disable-next-line
|
||||
reserve.lastUpdateTimestamp = uint40(block.timestamp);
|
||||
|
||||
uint256 userStableRate = reserve.currentStableBorrowRate;
|
||||
|
||||
if(CoreLibrary.InterestRateMode(_interestRateMode) == CoreLibrary.InterestRateMode.STABLE) {
|
||||
IStableDebtToken(reserve.stableDebtTokenAddress).mint(msg.sender, _amount, reserve.currentStableBorrowRate);
|
||||
IStableDebtToken(reserve.stableDebtTokenAddress).mint(msg.sender, _amount, userStableRate);
|
||||
uint40 stableRateLastUpdated = IStableDebtToken(reserve.stableDebtTokenAddress).getUserLastUpdated(msg.sender);
|
||||
console.log("Stable rate last updated in borrow is %s", stableRateLastUpdated);
|
||||
|
||||
}
|
||||
else {
|
||||
IVariableDebtToken(reserve.variableDebtTokenAddress).mint(msg.sender, _amount);
|
||||
}
|
||||
uint256 userStableRate = reserve.currentStableBorrowRate;
|
||||
|
||||
reserve.updateInterestRatesAndTimestamp(_reserve, 0, _amount);
|
||||
reserve.updateInterestRates(_reserve, 0, _amount);
|
||||
|
||||
|
||||
//if we reached this point, we can transfer
|
||||
IERC20(_reserve).universalTransfer(msg.sender, _amount);
|
||||
|
||||
(uint256 stableBalance, uint256 variableBalance) = UserLogic.getUserBorrowBalances(msg.sender, reserve);
|
||||
|
||||
console.log("Debt balances: %s %s", stableBalance, variableBalance);
|
||||
|
||||
console.log("User variable borrow index %s reserve index %s", IVariableDebtToken(reserve.variableDebtTokenAddress).getUserIndex(msg.sender), reserve.lastVariableBorrowCumulativeIndex);
|
||||
console.log("User stable rate %s", IStableDebtToken(reserve.stableDebtTokenAddress).getUserStableRate(msg.sender));
|
||||
emit Borrow(
|
||||
_reserve,
|
||||
msg.sender,
|
||||
|
|
@ -427,20 +437,32 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
CoreLibrary.ReserveData storage reserve = reserves[_reserve];
|
||||
CoreLibrary.UserReserveData storage user = usersReserveData[_onBehalfOf][_reserve];
|
||||
|
||||
console.log("Getting balances...");
|
||||
|
||||
(
|
||||
vars.stableBorrowBalance,
|
||||
vars.variableBorrowBalance
|
||||
) = UserLogic.getUserBorrowBalances(_onBehalfOf, reserve);
|
||||
|
||||
|
||||
console.log("Balances calculated, %s %s", vars.stableBorrowBalance, vars.variableBorrowBalance);
|
||||
|
||||
console.log("Interest rate mode %s", _rateMode);
|
||||
|
||||
CoreLibrary.InterestRateMode rateMode = CoreLibrary.InterestRateMode(_rateMode);
|
||||
|
||||
console.log("Interest rate mode %s", _rateMode);
|
||||
|
||||
//default to max amount
|
||||
vars.paybackAmount = rateMode == CoreLibrary.InterestRateMode.STABLE ? vars.stableBorrowBalance : vars.variableBorrowBalance;
|
||||
|
||||
console.log("Payback amount %s stable rate %s", vars.paybackAmount, IStableDebtToken(reserve.stableDebtTokenAddress).getUserStableRate(_onBehalfOf));
|
||||
|
||||
if (_amount != UINT_MAX_VALUE && _amount < vars.paybackAmount) {
|
||||
vars.paybackAmount = _amount;
|
||||
}
|
||||
|
||||
console.log("Validating repay...");
|
||||
|
||||
ValidationLogic.validateRepay(
|
||||
reserve,
|
||||
|
|
@ -454,8 +476,9 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
msg.value
|
||||
);
|
||||
|
||||
reserve.updateCumulativeIndexes();
|
||||
reserve.updateCumulativeIndexesAndTimestamp();
|
||||
|
||||
console.log("Burning tokens...");
|
||||
//burns an equivalent amount of debt tokens
|
||||
if(rateMode == CoreLibrary.InterestRateMode.STABLE) {
|
||||
IStableDebtToken(reserve.stableDebtTokenAddress).burn(_onBehalfOf, vars.paybackAmount);
|
||||
|
|
@ -464,7 +487,7 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
IVariableDebtToken(reserve.variableDebtTokenAddress).burn(_onBehalfOf, vars.paybackAmount);
|
||||
}
|
||||
|
||||
reserve.updateInterestRatesAndTimestamp(_reserve, vars.paybackAmount, 0);
|
||||
reserve.updateInterestRates(_reserve, vars.paybackAmount, 0);
|
||||
|
||||
IERC20(_reserve).universalTransferFromSenderToThis(vars.paybackAmount, false);
|
||||
|
||||
|
|
@ -512,7 +535,7 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
TODO: Burn old tokens and mint new ones
|
||||
**/
|
||||
|
||||
reserve.updateInterestRatesAndTimestamp(_reserve, 0, 0);
|
||||
reserve.updateInterestRates(_reserve, 0, 0);
|
||||
/*
|
||||
CoreLibrary.InterestRateMode newRateMode = user.getCurrentBorrowRateMode();
|
||||
emit Swap(
|
||||
|
|
@ -580,7 +603,7 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
//solium-disable-next-line
|
||||
user.lastUpdateTimestamp = uint40(block.timestamp);
|
||||
|
||||
reserve.updateInterestRatesAndTimestamp(_reserve, 0, 0);
|
||||
reserve.updateInterestRates(_reserve, 0, 0);
|
||||
|
||||
emit RebalanceStableBorrowRate(
|
||||
_reserve,
|
||||
|
|
@ -859,6 +882,7 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
uint256 stableBorrowRate,
|
||||
uint256 liquidityRate,
|
||||
uint256 variableBorrowIndex,
|
||||
uint40 stableRateLastUpdated,
|
||||
bool usageAsCollateralEnabled
|
||||
)
|
||||
{
|
||||
|
|
@ -869,6 +893,8 @@ contract LendingPool is ReentrancyGuard, VersionedInitializable {
|
|||
(principalStableBorrowBalance, principalVariableBorrowBalance) = UserLogic.getUserPrincipalBorrowBalances(_user,reserve);
|
||||
liquidityRate = reserve.currentLiquidityRate;
|
||||
stableBorrowRate = IStableDebtToken(reserve.stableDebtTokenAddress).getUserStableRate(_user);
|
||||
stableRateLastUpdated = IStableDebtToken(reserve.stableDebtTokenAddress).getUserLastUpdated(_user);
|
||||
console.log("Stable rate last updated is %s", stableRateLastUpdated);
|
||||
usageAsCollateralEnabled = usersReserveData[_user][_reserve].useAsCollateral;
|
||||
variableBorrowIndex = IVariableDebtToken(reserve.variableDebtTokenAddress).getUserIndex(_user);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ library CoreLibrary {
|
|||
* a formal specification.
|
||||
* @param _self the reserve object
|
||||
**/
|
||||
function updateCumulativeIndexes(ReserveData storage _self) internal {
|
||||
function updateCumulativeIndexesAndTimestamp(ReserveData storage _self) internal {
|
||||
uint256 totalBorrows = getTotalBorrows(_self);
|
||||
|
||||
if (totalBorrows > 0) {
|
||||
|
|
@ -133,6 +133,9 @@ library CoreLibrary {
|
|||
_self.lastVariableBorrowCumulativeIndex
|
||||
);
|
||||
}
|
||||
|
||||
//solium-disable-next-line
|
||||
_self.lastUpdateTimestamp = uint40(block.timestamp);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -244,7 +247,7 @@ library CoreLibrary {
|
|||
_self.usageAsCollateralEnabled = false;
|
||||
}
|
||||
|
||||
function getTotalBorrows(ReserveData storage _self) internal view returns(uint256) {
|
||||
function getTotalBorrows(ReserveData storage _self) internal view returns (uint256) {
|
||||
return
|
||||
IERC20(_self.stableDebtTokenAddress).totalSupply().add(
|
||||
IERC20(_self.variableDebtTokenAddress).totalSupply()
|
||||
|
|
|
|||
|
|
@ -150,6 +150,7 @@ library GenericLogic {
|
|||
CalculateUserAccountDataVars memory vars;
|
||||
|
||||
for (vars.i = 0; vars.i < _reserves.length; vars.i++) {
|
||||
|
||||
vars.currentReserveAddress = _reserves[vars.i];
|
||||
|
||||
CoreLibrary.ReserveData storage currentReserve = _reservesData[vars
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ library ReserveLogic {
|
|||
uint256 _protocolFee
|
||||
) external {
|
||||
//compounding the cumulated interest
|
||||
_reserve.updateCumulativeIndexes();
|
||||
_reserve.updateCumulativeIndexesAndTimestamp();
|
||||
|
||||
uint256 totalLiquidityBefore = _availableLiquidityBefore.add(_reserve.getTotalBorrows());
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ library ReserveLogic {
|
|||
_reserve.cumulateToLiquidityIndex(totalLiquidityBefore, _income);
|
||||
|
||||
//refresh interest rates
|
||||
updateInterestRatesAndTimestamp(_reserve, _reserveAddress, _income, 0);
|
||||
updateInterestRates(_reserve, _reserveAddress, _income, 0);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -89,10 +89,10 @@ library ReserveLogic {
|
|||
uint256 _collateralToLiquidate,
|
||||
bool _liquidatorReceivesAToken
|
||||
) external {
|
||||
_collateralReserve.updateCumulativeIndexes();
|
||||
_collateralReserve.updateCumulativeIndexesAndTimestamp();
|
||||
|
||||
if (!_liquidatorReceivesAToken) {
|
||||
updateInterestRatesAndTimestamp(
|
||||
updateInterestRates(
|
||||
_collateralReserve,
|
||||
_collateralReserveAddress,
|
||||
0,
|
||||
|
|
@ -125,7 +125,7 @@ library ReserveLogic {
|
|||
* @param _liquidityAdded the amount of liquidity added to the protocol (deposit or repay) in the previous action
|
||||
* @param _liquidityTaken the amount of liquidity taken from the protocol (redeem or borrow)
|
||||
**/
|
||||
function updateInterestRatesAndTimestamp(
|
||||
function updateInterestRates(
|
||||
CoreLibrary.ReserveData storage _reserve,
|
||||
address _reserveAddress,
|
||||
uint256 _liquidityAdded,
|
||||
|
|
@ -156,9 +156,6 @@ library ReserveLogic {
|
|||
_reserve.currentStableBorrowRate = newStableRate;
|
||||
_reserve.currentVariableBorrowRate = newVariableRate;
|
||||
|
||||
//solium-disable-next-line
|
||||
_reserve.lastUpdateTimestamp = uint40(block.timestamp);
|
||||
|
||||
emit ReserveDataUpdated(
|
||||
_reserveAddress,
|
||||
newLiquidityRate,
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@ library ValidationLogic {
|
|||
* @param _amount the amount to be borrowed
|
||||
* @param _amountInETH the amount to be borrowed, in ETH
|
||||
* @param _interestRateMode the interest rate mode at which the user is borrowing
|
||||
* @param _borrowFee the fee
|
||||
* @param _maxStableLoanPercent the max amount of the liquidity that can be borrowed at stable rate, in percentage
|
||||
* @param _reservesData the state of all the reserves
|
||||
* @param _usersData the state of all the users for all the reserves
|
||||
|
|
@ -99,7 +98,6 @@ library ValidationLogic {
|
|||
uint256 _amount,
|
||||
uint256 _amountInETH,
|
||||
uint256 _interestRateMode,
|
||||
uint256 _borrowFee,
|
||||
uint256 _maxStableLoanPercent,
|
||||
mapping(address => CoreLibrary.ReserveData) storage _reservesData,
|
||||
mapping(address => mapping(address => CoreLibrary.UserReserveData)) storage _usersData,
|
||||
|
|
@ -143,8 +141,6 @@ library ValidationLogic {
|
|||
|
||||
require(vars.healthFactor > GenericLogic.HEALTH_FACTOR_LIQUIDATION_THRESHOLD, '8');
|
||||
|
||||
require(_borrowFee > 0, 'The amount to borrow is too small');
|
||||
|
||||
//add the current already borrowed amount to the amount requested to calculate the total collateral needed.
|
||||
vars.amountOfCollateralNeededETH = vars
|
||||
.userBorrowBalanceETH
|
||||
|
|
|
|||
|
|
@ -43,6 +43,11 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
|
|||
return avgStableRate;
|
||||
}
|
||||
|
||||
function getUserLastUpdated(address _user) external virtual override view returns (uint40) {
|
||||
return usersData[_user].lastUpdateTimestamp;
|
||||
}
|
||||
|
||||
|
||||
function getUserStableRate(address _user) external virtual override view returns (uint256) {
|
||||
return usersData[_user].currentRate;
|
||||
}
|
||||
|
|
@ -91,8 +96,9 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
|
|||
usersData[account].currentRate = usersData[account]
|
||||
.currentRate
|
||||
.rayMul(currentBalance.wadToRay())
|
||||
.add(amountInRay.wadMul(rate))
|
||||
.add(amountInRay.rayMul(rate))
|
||||
.rayDiv(currentBalance.add(amount).wadToRay());
|
||||
|
||||
usersData[account].lastUpdateTimestamp = uint40(block.timestamp);
|
||||
|
||||
avgStableRate = avgStableRate
|
||||
|
|
@ -143,6 +149,11 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
|
|||
.rayDiv(newSupply.wadToRay());
|
||||
}
|
||||
|
||||
if(_amount == currentBalance){
|
||||
usersData[_account].currentRate = 0;
|
||||
usersData[_account].lastUpdateTimestamp = 0;
|
||||
}
|
||||
|
||||
internalBurn(_account, _amount);
|
||||
|
||||
emit burnDebt(_account, _amount, previousBalance, currentBalance, balanceIncrease);
|
||||
|
|
@ -163,6 +174,10 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
|
|||
{
|
||||
uint256 previousPrincipalBalance = balances[_user];
|
||||
|
||||
if(previousPrincipalBalance == 0){
|
||||
return (0,0,0);
|
||||
}
|
||||
|
||||
//calculate the accrued interest since the last accumulation
|
||||
uint256 balanceIncrease = balanceOf(_user).sub(previousPrincipalBalance);
|
||||
//mints an amount of tokens equivalent to the amount accumulated
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import {WadRayMath} from '../libraries/WadRayMath.sol';
|
|||
import '@nomiclabs/buidler/console.sol';
|
||||
import {IVariableDebtToken} from './interfaces/IVariableDebtToken.sol';
|
||||
|
||||
|
||||
contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
|
||||
using SafeMath for uint256;
|
||||
using WadRayMath for uint256;
|
||||
|
|
@ -38,7 +37,6 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
|
|||
* @dev See {IERC20-balanceOf}.
|
||||
*/
|
||||
function balanceOf(address account) public virtual override view returns (uint256) {
|
||||
|
||||
if (balances[account] == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -47,12 +45,14 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
|
|||
balances[account]
|
||||
.wadToRay()
|
||||
.rayMul(pool.getReserveNormalizedVariableDebt(underlyingAssetAddress))
|
||||
.rayDiv(userIndexes[account])
|
||||
.rayToWad();
|
||||
}
|
||||
|
||||
function getUserIndex(address _user) public virtual override view returns(uint256) {
|
||||
function getUserIndex(address _user) public virtual override view returns (uint256) {
|
||||
return userIndexes[_user];
|
||||
}
|
||||
|
||||
/** @dev Creates `amount` tokens and assigns them to `account`, increasing
|
||||
* the total supply.
|
||||
*
|
||||
|
|
@ -63,17 +63,17 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
|
|||
* - `to` cannot be the zero address.
|
||||
*/
|
||||
function mint(address account, uint256 amount) public override onlyLendingPool {
|
||||
|
||||
(
|
||||
uint256 previousBalance,
|
||||
uint256 currentBalance,
|
||||
uint256 balanceIncrease,
|
||||
uint256 index
|
||||
uint256 balanceIncrease
|
||||
) = internalCumulateBalance(account);
|
||||
|
||||
internalMint(account, amount);
|
||||
|
||||
emit mintDebt(account, amount, previousBalance, currentBalance, balanceIncrease, index);
|
||||
userIndexes[account] = pool.getReserveNormalizedVariableDebt(underlyingAssetAddress);
|
||||
|
||||
emit mintDebt(account, amount, previousBalance, currentBalance, balanceIncrease, userIndexes[account]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -91,13 +91,19 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
|
|||
(
|
||||
uint256 previousBalance,
|
||||
uint256 currentBalance,
|
||||
uint256 balanceIncrease,
|
||||
uint256 index
|
||||
uint256 balanceIncrease
|
||||
) = internalCumulateBalance(account);
|
||||
|
||||
internalBurn(account, amount);
|
||||
|
||||
emit burnDebt(account, amount, previousBalance, currentBalance, balanceIncrease, index);
|
||||
//if user repaid everything
|
||||
if (currentBalance == amount) {
|
||||
userIndexes[account] = 0;
|
||||
} else {
|
||||
userIndexes[account] = pool.getReserveNormalizedVariableDebt(underlyingAssetAddress);
|
||||
}
|
||||
|
||||
emit burnDebt(account, amount, previousBalance, currentBalance, balanceIncrease, userIndexes[account]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -109,7 +115,6 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
|
|||
function internalCumulateBalance(address _user)
|
||||
internal
|
||||
returns (
|
||||
uint256,
|
||||
uint256,
|
||||
uint256,
|
||||
uint256
|
||||
|
|
@ -117,19 +122,20 @@ contract VariableDebtToken is DebtTokenBase, IVariableDebtToken {
|
|||
{
|
||||
uint256 previousPrincipalBalance = balances[_user];
|
||||
|
||||
if (previousPrincipalBalance == 0) {
|
||||
return (0, 0, 0);
|
||||
}
|
||||
|
||||
//calculate the accrued interest since the last accumulation
|
||||
uint256 balanceIncrease = balanceOf(_user).sub(previousPrincipalBalance);
|
||||
|
||||
//mints an amount of tokens equivalent to the amount accumulated
|
||||
internalMint(_user, balanceIncrease);
|
||||
//updates the user index
|
||||
uint256 index = userIndexes[_user] = pool.getReserveNormalizedVariableDebt(
|
||||
underlyingAssetAddress
|
||||
);
|
||||
|
||||
return (
|
||||
previousPrincipalBalance,
|
||||
previousPrincipalBalance.add(balanceIncrease),
|
||||
balanceIncrease,
|
||||
index
|
||||
balanceIncrease
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,4 +14,6 @@ interface IStableDebtToken {
|
|||
function getAverageStableRate() external virtual view returns(uint256);
|
||||
|
||||
function getUserStableRate(address _user) external virtual view returns(uint256);
|
||||
|
||||
function getUserLastUpdated(address _user) external virtual view returns (uint40);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x749258D38b0473d96FEcc14cC5e7DCE12d7Bd6f6",
|
||||
"address": "0xB00cC45B4a7d3e1FEE684cFc4417998A1c183e6d",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xA29C2A7e59aa49C71aF084695337E3AA5e820758",
|
||||
"address": "0x58F132FBB86E21545A4Bace3C19f1C05d86d7A22",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x4a2a69879B8fD38371e804eD0415c7A187A6aD13",
|
||||
"address": "0x22474D350EC2dA53D717E30b96e9a2B7628Ede5b",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
"address": "0x852e3718A320aD93Ad8692E8D663d247e4c1b400"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x6DCCc1c1A3b5eD8c3Ef8DA857ed06d806B6Db68A"
|
||||
"address": "0x852e3718A320aD93Ad8692E8D663d247e4c1b400"
|
||||
}
|
||||
},
|
||||
"LendingPoolParametersProvider": {
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
"address": "0x2C4603396dE2F08642354A3A102760827FfFe113"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xf8EcabD263c539005407C99346E145d046AeC2E7"
|
||||
"address": "0x2C4603396dE2F08642354A3A102760827FfFe113"
|
||||
}
|
||||
},
|
||||
"LendingPoolDataProvider": {
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
"address": "0xA10958a24032283FbE2D23cedf264d6eC9411CBA"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x2d2F372ba90F87Ac45e93eFEa29c20cDD696e764"
|
||||
"address": "0xA10958a24032283FbE2D23cedf264d6eC9411CBA"
|
||||
}
|
||||
},
|
||||
"PriceOracle": {
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x8a854d2cf4f20b72B02e8c0F5781E3C11519d320",
|
||||
"address": "0x8731324a6C09a1745bD15009Dc8FcceF11c05F4a",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xfC6d9227413D021f7a50EF3AAdF9545aA4ebb439",
|
||||
"address": "0x474d9b0D5F1Bb1602711F9346743a7a7478d6f52",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xdc006C4186148C29B57f52A8ad7694542ad4E675",
|
||||
"address": "0xf91aC1098F3b154671Ce83290114aaE45ac0225f",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x107Aa2cc3FE981E78140424C3d4DD55aF00Ab24C",
|
||||
"address": "0xf4830d6b1D70C8595d3BD8A63f9ed9F636DB9ef2",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -114,7 +114,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x77183A4B7c0375bA9A5090Ae68c32A5C567d77c6",
|
||||
"address": "0xC8Df507578fEfb60aA626ABFDDB20B48ee439ad1",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -130,7 +130,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x5B51d8344769d18fB85DF29EDbaB8E94dbA38455",
|
||||
"address": "0x4b2c297ba5be42610994974b9543D56B864CA011",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -140,7 +140,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xd8f831Ef919D3f38694f2797CD44D7Cc7d595A67",
|
||||
"address": "0x24E420B42971372F060a93129846761F354Bc50B",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -149,7 +149,7 @@
|
|||
"address": "0xb840b4fe440b5E26e1840cd2D6320FAda1C0ca5d"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xc52Df73f1BBe582061C65a2bd36A1d685f0a2BE5"
|
||||
"address": "0xb840b4fe440b5E26e1840cd2D6320FAda1C0ca5d"
|
||||
}
|
||||
},
|
||||
"InitializableAdminUpgradeabilityProxy": {
|
||||
|
|
@ -158,7 +158,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xc52Df73f1BBe582061C65a2bd36A1d685f0a2BE5",
|
||||
"address": "0xb840b4fe440b5E26e1840cd2D6320FAda1C0ca5d",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -167,7 +167,7 @@
|
|||
"address": "0x5c98c9202b73d27A618662d34A6805c34AB041B8"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x09157249a5937Bd78fea52CE189887Bd55c13050"
|
||||
"address": "0x5c98c9202b73d27A618662d34A6805c34AB041B8"
|
||||
}
|
||||
},
|
||||
"WalletBalanceProvider": {
|
||||
|
|
@ -176,7 +176,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x2848E572a05Ed122E538E8d611AB1bb76DF7E98d",
|
||||
"address": "0x435250F99d9ec2D7956773c6768392caD183765e",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -186,7 +186,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x79B51482dA73373D7828Ed728F8fC8d3994c4141",
|
||||
"address": "0x7c2C195CD6D34B8F845992d380aADB2730bB9C6F",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -196,7 +196,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x8eF6CAbcAE15FB78b436e67B26FFE80Ba7ef8424",
|
||||
"address": "0x8858eeB3DfffA017D4BCE9801D340D36Cf895CCf",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -206,7 +206,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xd0FD468D3ff12932f997a8298fe267BE55a9cCC6",
|
||||
"address": "0x0078371BDeDE8aAc7DeBfFf451B74c5EDB385Af7",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -216,7 +216,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xA106BFbDB5C925A04358bE49db41aDd308a1458f",
|
||||
"address": "0xf4e77E5Da47AC3125140c470c71cBca77B5c638c",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -226,7 +226,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x9c91aEaD98b1354C7B0EAfb8ff539d0796c79894",
|
||||
"address": "0xf784709d2317D872237C4bC22f867d1BAe2913AB",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -236,7 +236,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x48FAde2E719B770E1783d03466dAEe98b5183538",
|
||||
"address": "0x3619DbE27d7c1e7E91aA738697Ae7Bc5FC3eACA5",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -246,7 +246,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x145b7B6368Df63e7F3497b0A948B30fC1A4d5E55",
|
||||
"address": "0x038B86d9d8FAFdd0a02ebd1A476432877b0107C8",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -256,7 +256,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x1Dbf1BB6407f30661756b236D809930762BEa337",
|
||||
"address": "0x1A1FEe7EeD918BD762173e4dc5EfDB8a78C924A8",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -266,7 +266,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x142bFA0788F794d3D0aE1EC36373ee034aABC11f",
|
||||
"address": "0x500D1d6A4c7D8Ae28240b47c8FCde034D827fD5e",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -276,7 +276,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xC052EC931CdA4aC288BD60c1F8D3E29412976837",
|
||||
"address": "0xc4905364b78a742ccce7B890A89514061E47068D",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -286,7 +286,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x3894795f9e148D52731Bc35A9B21583F20E6e4A2",
|
||||
"address": "0xD6C850aeBFDC46D7F4c207e445cC0d6B0919BDBe",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -296,7 +296,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xe01B716332D22c496812c2c2BaAF6d20f299C069",
|
||||
"address": "0x8B5B7a6055E54a36fF574bbE40cf2eA68d5554b3",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -306,7 +306,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x02e85B5D2BB248d76eb5be13826793AA841f01D1",
|
||||
"address": "0xEcc0a6dbC0bb4D51E4F84A315a9e5B0438cAD4f0",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -316,7 +316,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xAAeA2C44686fBEE1e9972723D50f12977345A7aa",
|
||||
"address": "0x20Ce94F404343aD2752A2D01b43fa407db9E0D00",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -326,7 +326,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xF657a556c7fE4F6C46fAEd02E876f70FA413318f",
|
||||
"address": "0x1d80315fac6aBd3EfeEbE97dEc44461ba7556160",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -336,7 +336,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xaA9e95d9131774A1Fb02122111CF860a40A83B2f",
|
||||
"address": "0x2D8553F9ddA85A9B3259F6Bf26911364B85556F5",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -346,7 +346,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x9Ec40e5F15c197F46350AA248910E8cDAc3fa5c9",
|
||||
"address": "0x52d3b94181f8654db2530b0fEe1B19173f519C52",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -356,7 +356,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x477F33Ca315d5C9D64Dd23F2D5696d5F629b15c6",
|
||||
"address": "0xd15468525c35BDBC1eD8F2e09A00F8a173437f2f",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -366,7 +366,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x8ae47ca16f5017d5E2369c71540C1DF582719a30",
|
||||
"address": "0x7e35Eaf7e8FBd7887ad538D4A38Df5BbD073814a",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -376,7 +376,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xe0c40bFb910c24368bBcd2dE9Dc3af45684F96d5",
|
||||
"address": "0x5bcb88A0d20426e451332eE6C4324b0e663c50E0",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -386,7 +386,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xc2517909aE3cFacC0283EB8FB917EAe273a3aE9e",
|
||||
"address": "0x3521eF8AaB0323004A6dD8b03CE890F4Ea3A13f5",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -396,7 +396,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xAd49512dFBaD6fc13D67d3935283c0606812E962",
|
||||
"address": "0x53369fd4680FfE3DfF39Fc6DDa9CfbfD43daeA2E",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -406,7 +406,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x749258D38b0473d96FEcc14cC5e7DCE12d7Bd6f6",
|
||||
"address": "0xB00cC45B4a7d3e1FEE684cFc4417998A1c183e6d",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -415,7 +415,7 @@
|
|||
"address": "0xBE7fFcC01164C890e59D298FD755FcBE6B7941a9"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0xF85d6001ADaD5376ef63143bdf1f11D9b163ac4f"
|
||||
"address": "0xBE7fFcC01164C890e59D298FD755FcBE6B7941a9"
|
||||
}
|
||||
},
|
||||
"StableDebtToken": {
|
||||
|
|
@ -424,7 +424,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x209bb253C2f894D3Cc53b9dC23d308Eb8593613A",
|
||||
"address": "0xD325d114a728C2114Bd33Ad47152f790f2a29c5c",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
},
|
||||
|
|
@ -434,7 +434,7 @@
|
|||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
},
|
||||
"localhost": {
|
||||
"address": "0x8744c818024B89571C9eB9e798a55fd7bad3Dc43",
|
||||
"address": "0x910b6a78b413e47401f20aA2350d264b55ae0189",
|
||||
"deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,13 +61,12 @@ const almostEqualOrEqual = function (
|
|||
expect(expected[key] != undefined, `Property ${key} is undefined in the expected data`);
|
||||
|
||||
if (actual[key] instanceof BigNumber) {
|
||||
if(!expected[key]){
|
||||
console.log("Key ", key, " value ", expected[key], actual[key]);
|
||||
|
||||
if (!expected[key]) {
|
||||
console.log('Key ', key, ' value ', expected[key], actual[key]);
|
||||
}
|
||||
const actualValue = (<BigNumber>actual[key]).decimalPlaces(0, BigNumber.ROUND_DOWN);
|
||||
const expectedValue = (<BigNumber>expected[key]).decimalPlaces(0, BigNumber.ROUND_DOWN);
|
||||
|
||||
|
||||
this.assert(
|
||||
actualValue.eq(expectedValue) ||
|
||||
actualValue.plus(1).eq(expectedValue) ||
|
||||
|
|
@ -82,7 +81,6 @@ const almostEqualOrEqual = function (
|
|||
actualValue.toFixed(0)
|
||||
);
|
||||
} else {
|
||||
console.log("Key ", key, " value ", expected[key], actual[key]);
|
||||
this.assert(
|
||||
actual[key] !== null &&
|
||||
expected[key] !== null &&
|
||||
|
|
@ -325,18 +323,14 @@ export const borrow = async (
|
|||
const secondsToTravel = new BigNumber(timeTravel).multipliedBy(ONE_YEAR).div(365).toNumber();
|
||||
|
||||
await increaseTime(secondsToTravel);
|
||||
|
||||
}
|
||||
|
||||
|
||||
const {
|
||||
reserveData: reserveDataAfter,
|
||||
userData: userDataAfter,
|
||||
timestamp,
|
||||
} = await getContractsData(reserve, user.address, testEnv);
|
||||
|
||||
console.log(txTimestamp, timestamp);
|
||||
|
||||
const expectedReserveData = calcExpectedReserveDataAfterBorrow(
|
||||
amountToBorrow.toString(),
|
||||
interestRateMode,
|
||||
|
|
@ -441,12 +435,15 @@ export const repay = async (
|
|||
}
|
||||
|
||||
if (expectedResult === 'success') {
|
||||
|
||||
const txResult = await waitForTx(
|
||||
await pool
|
||||
.connect(user.signer)
|
||||
.repay(reserve, amountToRepay, rateMode, onBehalfOf.address, txOptions)
|
||||
);
|
||||
|
||||
console.log('Done.');
|
||||
|
||||
const {txCost, txTimestamp} = await getTxCostAndTimestamp(txResult);
|
||||
|
||||
const {
|
||||
|
|
@ -457,7 +454,7 @@ export const repay = async (
|
|||
|
||||
const expectedReserveData = calcExpectedReserveDataAfterRepay(
|
||||
amountToRepay,
|
||||
<RateMode>(rateMode),
|
||||
<RateMode>rateMode,
|
||||
reserveDataBefore,
|
||||
userDataBefore,
|
||||
txTimestamp,
|
||||
|
|
@ -466,7 +463,7 @@ export const repay = async (
|
|||
|
||||
const expectedUserData = calcExpectedUserDataAfterRepay(
|
||||
amountToRepay,
|
||||
<RateMode>(rateMode),
|
||||
<RateMode>rateMode,
|
||||
reserveDataBefore,
|
||||
expectedReserveData,
|
||||
userDataBefore,
|
||||
|
|
@ -491,7 +488,9 @@ export const repay = async (
|
|||
// });
|
||||
} else if (expectedResult === 'revert') {
|
||||
await expect(
|
||||
pool.connect(user.signer).repay(reserve, amountToRepay, onBehalfOf.address, txOptions),
|
||||
pool
|
||||
.connect(user.signer)
|
||||
.repay(reserve, amountToRepay, rateMode, onBehalfOf.address, txOptions),
|
||||
revertMessage
|
||||
).to.be.reverted;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -175,6 +175,8 @@ const executeAction = async (
|
|||
userToRepayOnBehalf = users[parseInt(onBehalfOfIndex)];
|
||||
}
|
||||
|
||||
console.log(user.address, userToRepayOnBehalf.address)
|
||||
|
||||
await repay(
|
||||
reserve,
|
||||
amount,
|
||||
|
|
|
|||
|
|
@ -97,7 +97,8 @@
|
|||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "1",
|
||||
"onBehalfOf": "1"
|
||||
"onBehalfOf": "1",
|
||||
"borrowRateMode": "stable"
|
||||
},
|
||||
"expected": "success"
|
||||
}
|
||||
|
|
@ -159,216 +160,6 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "User 1 deposits 1000 DAI, user 2 deposits 0.92267103215 ETH, tries to borrow 187.5 DAI which is the maximum amount he can borrow, if fees were not considered. (revert expected)",
|
||||
"actions": [
|
||||
{
|
||||
"name": "mint",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "1000",
|
||||
"user": "1"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "approve",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"user": "1"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "1000",
|
||||
"user": "1"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "0.92267103215",
|
||||
"user": "2",
|
||||
"sendValue": "0.92267103215"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "borrow",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "187.5",
|
||||
"borrowRateMode": "stable",
|
||||
"user": "2"
|
||||
},
|
||||
"expected": "revert",
|
||||
"revertMessage": "There is not enough collateral to cover a new borrow"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "-1",
|
||||
"user": "2"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "1"
|
||||
},
|
||||
"expected": "success"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "User 1 deposits 1000 USDC, user 2 deposits 0.91928534104 ETH, tries to borrow 187.5 USDC which is the maximum amount he can borrow, if fees were not considered. (revert expected)",
|
||||
"actions": [
|
||||
{
|
||||
"name": "mint",
|
||||
"args": {
|
||||
"reserve": "USDC",
|
||||
"amount": "1000",
|
||||
"user": "1"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "approve",
|
||||
"args": {
|
||||
"reserve": "USDC",
|
||||
"user": "1"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "USDC",
|
||||
"amount": "1000",
|
||||
"user": "1"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "0.91928534104",
|
||||
"user": "2",
|
||||
"sendValue": "0.91928534104"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "borrow",
|
||||
"args": {
|
||||
"reserve": "USDC",
|
||||
"amount": "187.5",
|
||||
"borrowRateMode": "stable",
|
||||
"user": "2"
|
||||
},
|
||||
"expected": "revert",
|
||||
"revertMessage": "There is not enough collateral to cover a new borrow"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "-1",
|
||||
"user": "2"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "USDC",
|
||||
"amount": "-1",
|
||||
"user": "1"
|
||||
},
|
||||
"expected": "success"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "User 1 deposits 1.5 ETH, user 2 deposits 100 DAI, tries to borrow 0.276801309645 ETH which is the maximum amount he can borrow, if fees were not considered. (revert expected)",
|
||||
"actions": [
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "1.5",
|
||||
"user": "1",
|
||||
"sendValue": "1.5"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "mint",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "100",
|
||||
"user": "2"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "approve",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"user": "2"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "100",
|
||||
"user": "2"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "borrow",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "0.276801309645",
|
||||
"borrowRateMode": "stable",
|
||||
"user": "2"
|
||||
},
|
||||
"expected": "revert",
|
||||
"revertMessage": "There is not enough collateral to cover a new borrow"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "2"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "-1",
|
||||
"user": "1"
|
||||
},
|
||||
"expected": "success"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "User 0 deposits 1000 DAI, user 1,2,3,4 deposit 1 ETH each and borrow 100 DAI at stable rate. Everything is repaid, user 0 redeems",
|
||||
"actions": [
|
||||
|
|
@ -506,16 +297,17 @@
|
|||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "1",
|
||||
"onBehalfOf": "1"
|
||||
"onBehalfOf": "1",
|
||||
"borrowRateMode": "stable"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "mint",
|
||||
"description": "Mint 15 DAI to cover the interest",
|
||||
"description": "Mint 20 DAI to cover the interest",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "15",
|
||||
"amount": "20",
|
||||
"user": "2"
|
||||
},
|
||||
"expected": "success"
|
||||
|
|
@ -534,7 +326,8 @@
|
|||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "2",
|
||||
"onBehalfOf": "2"
|
||||
"onBehalfOf": "2",
|
||||
"borrowRateMode": "stable"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
|
|
@ -562,7 +355,9 @@
|
|||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "3",
|
||||
"onBehalfOf": "3"
|
||||
"onBehalfOf": "3",
|
||||
"borrowRateMode": "stable"
|
||||
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
|
|
@ -590,7 +385,8 @@
|
|||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "4",
|
||||
"onBehalfOf": "4"
|
||||
"onBehalfOf": "4",
|
||||
"borrowRateMode": "stable"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
|
|
@ -690,7 +486,8 @@
|
|||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "1",
|
||||
"onBehalfOf": "1"
|
||||
"onBehalfOf": "1",
|
||||
"borrowRateMode": "stable"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -85,22 +85,6 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "User 1 tries to borrow a very small amount of DAI, which would result in 0 fee accrued (revert expected)",
|
||||
"actions": [
|
||||
{
|
||||
"name": "borrow",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "0.000000000000000001",
|
||||
"borrowRateMode": "variable",
|
||||
"user": "1"
|
||||
},
|
||||
"expected": "revert",
|
||||
"revertMessage": "The amount to borrow is too small"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "User 1 tries to borrow the rest of the DAI liquidity (revert expected)",
|
||||
"actions": [
|
||||
|
|
@ -134,7 +118,7 @@
|
|||
]
|
||||
},
|
||||
{
|
||||
"description": "User 1 repays a small amount of DAI, enough to cover the origination fee + a small part of the interest",
|
||||
"description": "User 1 repays a small amount of DAI, enough to cover a small part of the interest",
|
||||
"actions": [
|
||||
{
|
||||
"name": "approve",
|
||||
|
|
@ -150,7 +134,8 @@
|
|||
"reserve": "DAI",
|
||||
"amount": "1.25",
|
||||
"user": "1",
|
||||
"onBehalfOf": "1"
|
||||
"onBehalfOf": "1",
|
||||
"borrowRateMode": "variable"
|
||||
},
|
||||
"expected": "success"
|
||||
}
|
||||
|
|
@ -175,7 +160,8 @@
|
|||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "1",
|
||||
"onBehalfOf": "1"
|
||||
"onBehalfOf": "1",
|
||||
"borrowRateMode": "variable"
|
||||
},
|
||||
"expected": "success"
|
||||
}
|
||||
|
|
@ -520,8 +506,9 @@
|
|||
"reserve": "USDC",
|
||||
"amount": "-1",
|
||||
"user": "1",
|
||||
"onBehalfOf": "1"
|
||||
},
|
||||
"onBehalfOf": "1",
|
||||
"borrowRateMode": "variable"
|
||||
},
|
||||
"expected": "success"
|
||||
}
|
||||
]
|
||||
|
|
@ -718,216 +705,6 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "User 4 deposits 1000 DAI, user 5 deposits 0.92267103215 ETH, tries to borrow 187.5 DAI which is the maximum amount he can borrow, if fees were not considered. (revert expected)",
|
||||
"actions": [
|
||||
{
|
||||
"name": "mint",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "1000",
|
||||
"user": "4"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "approve",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"user": "4"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "1000",
|
||||
"user": "4"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "0.92267103215",
|
||||
"user": "5",
|
||||
"sendValue": "0.92267103215"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "borrow",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "187.5",
|
||||
"borrowRateMode": "variable",
|
||||
"user": "5"
|
||||
},
|
||||
"expected": "revert",
|
||||
"revertMessage": "There is not enough collateral to cover a new borrow"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "-1",
|
||||
"user": "5"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "4"
|
||||
},
|
||||
"expected": "success"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "User 4 deposits 1000 USDC, user 5 deposits 0.91928534104 ETH, tries to borrow 187.5 USDC which is the maximum amount he can borrow, if fees were not considered. (revert expected)",
|
||||
"actions": [
|
||||
{
|
||||
"name": "mint",
|
||||
"args": {
|
||||
"reserve": "USDC",
|
||||
"amount": "1000",
|
||||
"user": "4"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "approve",
|
||||
"args": {
|
||||
"reserve": "USDC",
|
||||
"user": "4"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "USDC",
|
||||
"amount": "1000",
|
||||
"user": "4"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "0.91928534104",
|
||||
"user": "5",
|
||||
"sendValue": "0.91928534104"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "borrow",
|
||||
"args": {
|
||||
"reserve": "USDC",
|
||||
"amount": "187.5",
|
||||
"borrowRateMode": "variable",
|
||||
"user": "5"
|
||||
},
|
||||
"expected": "revert",
|
||||
"revertMessage": "There is not enough collateral to cover a new borrow"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "-1",
|
||||
"user": "5"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "USDC",
|
||||
"amount": "-1",
|
||||
"user": "4"
|
||||
},
|
||||
"expected": "success"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "User 4 deposits 1.5 ETH, user 5 deposits 100 DAI, tries to borrow 0.276801309645 ETH which is the maximum amount he can borrow, if fees were not considered. (revert expected)",
|
||||
"actions": [
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "1.5",
|
||||
"user": "4",
|
||||
"sendValue": "1.5"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "mint",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount" : "100",
|
||||
"user": "5"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "approve",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"user": "5"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "deposit",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "100",
|
||||
"user": "5"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "borrow",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "0.276801309645",
|
||||
"borrowRateMode": "variable",
|
||||
"user": "5"
|
||||
},
|
||||
"expected": "revert",
|
||||
"revertMessage": "There is not enough collateral to cover a new borrow"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "5"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "redeem",
|
||||
"args": {
|
||||
"reserve": "ETH",
|
||||
"amount": "-1",
|
||||
"user": "4"
|
||||
},
|
||||
"expected": "success"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"description": "User 0 deposits 1000 DAI, user 6 deposits 2 ETH and borrow 100 DAI at variable rate first, then 100 DAI at stable rate, repays everything. User 0 redeems",
|
||||
"actions": [
|
||||
|
|
@ -1013,7 +790,19 @@
|
|||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "6",
|
||||
"onBehalfOf": "6"
|
||||
"onBehalfOf": "6",
|
||||
"borrowRateMode": "stable"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
{
|
||||
"name": "repay",
|
||||
"args": {
|
||||
"reserve": "DAI",
|
||||
"amount": "-1",
|
||||
"user": "6",
|
||||
"onBehalfOf": "6",
|
||||
"borrowRateMode": "variable"
|
||||
},
|
||||
"expected": "success"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ export const calcExpectedUserDataAfterDeposit = (
|
|||
const expectedUserData = <UserReserveData>{};
|
||||
|
||||
expectedUserData.currentStableBorrowBalance = expectedUserData.principalStableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
|
@ -48,6 +47,7 @@ export const calcExpectedUserDataAfterDeposit = (
|
|||
userDataBeforeAction.principalVariableBorrowBalance;
|
||||
expectedUserData.variableBorrowIndex = userDataBeforeAction.variableBorrowIndex;
|
||||
expectedUserData.stableBorrowRate = userDataBeforeAction.stableBorrowRate;
|
||||
expectedUserData.stableRateLastUpdated = userDataBeforeAction.stableRateLastUpdated;
|
||||
|
||||
expectedUserData.liquidityRate = reserveDataAfterAction.liquidityRate;
|
||||
|
||||
|
|
@ -95,7 +95,6 @@ export const calcExpectedUserDataAfterDeposit = (
|
|||
);
|
||||
|
||||
expectedUserData.currentStableBorrowBalance = expectedUserData.principalStableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
|
@ -143,7 +142,6 @@ export const calcExpectedUserDataAfterRedeem = (
|
|||
);
|
||||
|
||||
expectedUserData.currentStableBorrowBalance = expectedUserData.principalStableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
|
@ -159,6 +157,7 @@ export const calcExpectedUserDataAfterRedeem = (
|
|||
userDataBeforeAction.principalVariableBorrowBalance;
|
||||
expectedUserData.variableBorrowIndex = userDataBeforeAction.variableBorrowIndex;
|
||||
expectedUserData.stableBorrowRate = userDataBeforeAction.stableBorrowRate;
|
||||
expectedUserData.stableRateLastUpdated = userDataBeforeAction.stableRateLastUpdated;
|
||||
|
||||
expectedUserData.liquidityRate = reserveDataAfterAction.liquidityRate;
|
||||
|
||||
|
|
@ -332,7 +331,6 @@ export const calcExpectedReserveDataAfterBorrow = (
|
|||
const amountBorrowedBN = new BigNumber(amountBorrowed);
|
||||
|
||||
const userStableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
|
@ -347,6 +345,7 @@ export const calcExpectedReserveDataAfterBorrow = (
|
|||
const debtAccrued = userStableBorrowBalance.minus(
|
||||
userDataBeforeAction.principalStableBorrowBalance
|
||||
);
|
||||
|
||||
expectedReserveData.totalLiquidity = reserveDataBeforeAction.totalLiquidity.plus(debtAccrued);
|
||||
|
||||
expectedReserveData.totalBorrowsStable = reserveDataBeforeAction.totalBorrowsStable
|
||||
|
|
@ -354,9 +353,9 @@ export const calcExpectedReserveDataAfterBorrow = (
|
|||
.plus(debtAccrued);
|
||||
|
||||
expectedReserveData.averageStableBorrowRate = calcExpectedAverageStableBorrowRate(
|
||||
expectedReserveData.averageStableBorrowRate,
|
||||
expectedReserveData.totalBorrowsStable,
|
||||
userDataBeforeAction.principalStableBorrowBalance.plus(amountBorrowedBN),
|
||||
reserveDataBeforeAction.averageStableBorrowRate,
|
||||
reserveDataBeforeAction.totalBorrowsStable,
|
||||
userStableBorrowBalance.plus(amountBorrowedBN),
|
||||
reserveDataBeforeAction.stableBorrowRate
|
||||
);
|
||||
expectedReserveData.totalBorrowsVariable = reserveDataBeforeAction.totalBorrowsVariable;
|
||||
|
|
@ -425,7 +424,6 @@ export const calcExpectedReserveDataAfterRepay = (
|
|||
let amountRepaidBN = new BigNumber(amountRepaid);
|
||||
|
||||
const userStableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
|
@ -450,6 +448,15 @@ export const calcExpectedReserveDataAfterRepay = (
|
|||
userDataBeforeAction.principalStableBorrowBalance
|
||||
);
|
||||
|
||||
console.log(
|
||||
'Debt accrued: ',
|
||||
debtAccrued.toFixed(),
|
||||
' Total liquidity:',
|
||||
reserveDataBeforeAction.totalLiquidity.toFixed(),
|
||||
' total borrow stable: ',
|
||||
reserveDataBeforeAction.totalBorrowsStable.toFixed()
|
||||
);
|
||||
|
||||
expectedReserveData.totalLiquidity = reserveDataBeforeAction.totalLiquidity.plus(debtAccrued);
|
||||
|
||||
expectedReserveData.totalBorrowsStable = reserveDataBeforeAction.totalBorrowsStable
|
||||
|
|
@ -457,9 +464,9 @@ export const calcExpectedReserveDataAfterRepay = (
|
|||
.plus(debtAccrued);
|
||||
|
||||
expectedReserveData.averageStableBorrowRate = calcExpectedAverageStableBorrowRate(
|
||||
expectedReserveData.averageStableBorrowRate,
|
||||
expectedReserveData.totalBorrowsStable,
|
||||
userDataBeforeAction.principalStableBorrowBalance.minus(amountRepaidBN),
|
||||
reserveDataBeforeAction.averageStableBorrowRate,
|
||||
reserveDataBeforeAction.totalBorrowsStable.plus(debtAccrued),
|
||||
amountRepaidBN.negated(),
|
||||
userDataBeforeAction.stableBorrowRate
|
||||
);
|
||||
expectedReserveData.totalBorrowsVariable = reserveDataBeforeAction.totalBorrowsVariable;
|
||||
|
|
@ -470,9 +477,10 @@ export const calcExpectedReserveDataAfterRepay = (
|
|||
|
||||
expectedReserveData.totalLiquidity = reserveDataBeforeAction.totalLiquidity.plus(debtAccrued);
|
||||
|
||||
expectedReserveData.totalBorrowsVariable = reserveDataBeforeAction.totalBorrowsVariable.minus(
|
||||
amountRepaidBN
|
||||
);
|
||||
expectedReserveData.totalBorrowsVariable = reserveDataBeforeAction.totalBorrowsVariable
|
||||
.plus(debtAccrued)
|
||||
.minus(amountRepaidBN);
|
||||
|
||||
expectedReserveData.totalBorrowsStable = reserveDataBeforeAction.totalBorrowsStable;
|
||||
expectedReserveData.averageStableBorrowRate = reserveDataBeforeAction.averageStableBorrowRate;
|
||||
}
|
||||
|
|
@ -531,73 +539,74 @@ export const calcExpectedUserDataAfterBorrow = (
|
|||
): UserReserveData => {
|
||||
const expectedUserData = <UserReserveData>{};
|
||||
|
||||
const stableBorrowBalanceBeforeTx = calcExpectedStableDebtTokenBalance(
|
||||
const currentStableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
||||
const currentVariableBorrowBalance = calcExpectedVariableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
||||
const variableBorrowBalanceBeforeTx = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
if (interestRateMode == RateMode.Stable) {
|
||||
expectedUserData.principalStableBorrowBalance = currentStableBorrowBalance.plus(
|
||||
amountBorrowed
|
||||
);
|
||||
expectedUserData.principalVariableBorrowBalance = userDataBeforeAction.principalVariableBorrowBalance;
|
||||
|
||||
if (currentTimestamp.gt(txTimestamp)) {
|
||||
if (interestRateMode == RateMode.Stable) {
|
||||
expectedUserData.principalStableBorrowBalance = stableBorrowBalanceBeforeTx.plus(
|
||||
amountBorrowed
|
||||
);
|
||||
expectedUserData.stableBorrowRate = reserveDataBeforeAction.stableBorrowRate;
|
||||
|
||||
//calculate also the accrued balance after the time passed
|
||||
expectedUserData.currentStableBorrowBalance = calcExpectedVariableDebtTokenBalance(
|
||||
expectedDataAfterAction,
|
||||
{
|
||||
...userDataBeforeAction,
|
||||
currentStableBorrowBalance: expectedUserData.principalStableBorrowBalance,
|
||||
principalStableBorrowBalance: expectedUserData.principalStableBorrowBalance,
|
||||
variableBorrowIndex: expectedDataAfterAction.variableBorrowIndex,
|
||||
lastUpdateTimestamp: txTimestamp,
|
||||
},
|
||||
currentTimestamp
|
||||
);
|
||||
expectedUserData.stableRateLastUpdated = txTimestamp;
|
||||
|
||||
expectedUserData.principalVariableBorrowBalance =
|
||||
userDataBeforeAction.principalVariableBorrowBalance;
|
||||
|
||||
expectedUserData.currentVariableBorrowBalance = variableBorrowBalanceBeforeTx;
|
||||
expectedUserData.variableBorrowIndex = userDataBeforeAction.variableBorrowIndex;
|
||||
} else {
|
||||
expectedUserData.principalStableBorrowBalance =
|
||||
userDataBeforeAction.principalStableBorrowBalance;
|
||||
|
||||
expectedUserData.currentStableBorrowBalance = stableBorrowBalanceBeforeTx;
|
||||
expectedUserData.stableBorrowRate = userDataBeforeAction.stableBorrowRate;
|
||||
|
||||
|
||||
|
||||
|
||||
expectedUserData.principalVariableBorrowBalance = variableBorrowBalanceBeforeTx.plus(
|
||||
amountBorrowed
|
||||
);
|
||||
expectedUserData.variableBorrowIndex = expectedDataAfterAction.variableBorrowIndex;
|
||||
|
||||
console.log("Variable borrow index is ", expectedUserData.variableBorrowIndex);
|
||||
|
||||
//calculate also the accrued balance after the time passed
|
||||
expectedUserData.currentVariableBorrowBalance = calcExpectedVariableDebtTokenBalance(
|
||||
expectedDataAfterAction,
|
||||
{
|
||||
...userDataBeforeAction,
|
||||
currentVariableBorrowBalance: expectedUserData.principalVariableBorrowBalance,
|
||||
principalVariableBorrowBalance: expectedUserData.principalVariableBorrowBalance,
|
||||
variableBorrowIndex: expectedDataAfterAction.variableBorrowIndex,
|
||||
lastUpdateTimestamp: txTimestamp,
|
||||
},
|
||||
currentTimestamp
|
||||
);
|
||||
}
|
||||
} else {
|
||||
expectedUserData.principalVariableBorrowBalance = currentVariableBorrowBalance.plus(
|
||||
amountBorrowed
|
||||
);
|
||||
expectedUserData.principalStableBorrowBalance = userDataBeforeAction.principalStableBorrowBalance;
|
||||
|
||||
expectedUserData.stableBorrowRate = userDataBeforeAction.stableBorrowRate;
|
||||
|
||||
expectedUserData.stableRateLastUpdated = userDataBeforeAction.stableRateLastUpdated;
|
||||
}
|
||||
|
||||
//calculate also the accrued balance after the time passed
|
||||
expectedUserData.currentStableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
{
|
||||
...userDataBeforeAction,
|
||||
currentStableBorrowBalance: expectedUserData.principalStableBorrowBalance,
|
||||
principalStableBorrowBalance: expectedUserData.principalStableBorrowBalance,
|
||||
stableBorrowRate:
|
||||
interestRateMode == RateMode.Stable
|
||||
? reserveDataBeforeAction.stableBorrowRate
|
||||
: userDataBeforeAction.stableBorrowRate,
|
||||
stableRateLastUpdated: expectedUserData.stableRateLastUpdated,
|
||||
},
|
||||
currentTimestamp
|
||||
);
|
||||
|
||||
expectedUserData.currentVariableBorrowBalance = calcExpectedVariableDebtTokenBalance(
|
||||
expectedDataAfterAction,
|
||||
{
|
||||
...userDataBeforeAction,
|
||||
currentVariableBorrowBalance: expectedUserData.principalVariableBorrowBalance,
|
||||
principalVariableBorrowBalance: expectedUserData.principalVariableBorrowBalance,
|
||||
variableBorrowIndex:
|
||||
interestRateMode == RateMode.Variable
|
||||
? expectedDataAfterAction.variableBorrowIndex
|
||||
: userDataBeforeAction.variableBorrowIndex
|
||||
},
|
||||
currentTimestamp
|
||||
);
|
||||
|
||||
if (expectedUserData.principalVariableBorrowBalance.eq(0)) {
|
||||
expectedUserData.variableBorrowIndex = new BigNumber(0);
|
||||
} else {
|
||||
expectedUserData.variableBorrowIndex =
|
||||
interestRateMode == RateMode.Variable
|
||||
? expectedDataAfterAction.variableBorrowIndex
|
||||
: userDataBeforeAction.variableBorrowIndex;
|
||||
}
|
||||
|
||||
expectedUserData.liquidityRate = expectedDataAfterAction.liquidityRate;
|
||||
|
|
@ -615,6 +624,7 @@ export const calcExpectedUserDataAfterBorrow = (
|
|||
expectedUserData.redirectionAddressRedirectedBalance =
|
||||
userDataBeforeAction.redirectionAddressRedirectedBalance;
|
||||
expectedUserData.currentATokenUserIndex = userDataBeforeAction.currentATokenUserIndex;
|
||||
|
||||
if (reserveDataBeforeAction.address === configuration.ethereumAddress) {
|
||||
expectedUserData.walletBalance = userDataBeforeAction.walletBalance
|
||||
.minus(txCost)
|
||||
|
|
@ -647,39 +657,48 @@ export const calcExpectedUserDataAfterRepay = (
|
|||
);
|
||||
|
||||
const stableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
currentTimestamp
|
||||
);
|
||||
|
||||
if (new BigNumber(totalRepaid).abs().eq(MAX_UINT_AMOUNT)) {
|
||||
if (rateMode == RateMode.Stable) {
|
||||
totalRepaid = stableBorrowBalance.toFixed(0);
|
||||
expectedUserData.principalVariableBorrowBalance =
|
||||
userDataBeforeAction.principalVariableBorrowBalance;
|
||||
expectedUserData.currentVariableBorrowBalance = variableBorrowBalance;
|
||||
expectedUserData.variableBorrowIndex = userDataBeforeAction.variableBorrowIndex;
|
||||
totalRepaid =
|
||||
rateMode == RateMode.Stable
|
||||
? stableBorrowBalance.toFixed(0)
|
||||
: variableBorrowBalance.toFixed();
|
||||
}
|
||||
|
||||
expectedUserData.currentStableBorrowBalance = stableBorrowBalance.minus(totalRepaid);
|
||||
if (expectedUserData.currentStableBorrowBalance.eq('0')) {
|
||||
//user repaid everything
|
||||
expectedUserData.stableBorrowRate = new BigNumber('0');
|
||||
}
|
||||
if (rateMode == RateMode.Stable) {
|
||||
|
||||
expectedUserData.principalVariableBorrowBalance =
|
||||
userDataBeforeAction.principalVariableBorrowBalance;
|
||||
expectedUserData.currentVariableBorrowBalance = variableBorrowBalance;
|
||||
expectedUserData.variableBorrowIndex = userDataBeforeAction.variableBorrowIndex;
|
||||
|
||||
expectedUserData.currentStableBorrowBalance = expectedUserData.principalStableBorrowBalance = stableBorrowBalance.minus(
|
||||
totalRepaid
|
||||
);
|
||||
|
||||
if (expectedUserData.currentStableBorrowBalance.eq('0')) {
|
||||
//user repaid everything
|
||||
expectedUserData.stableBorrowRate = expectedUserData.stableRateLastUpdated = new BigNumber('0');
|
||||
}
|
||||
} else {
|
||||
expectedUserData.currentStableBorrowBalance = stableBorrowBalance;
|
||||
expectedUserData.principalStableBorrowBalance =
|
||||
userDataBeforeAction.principalStableBorrowBalance;
|
||||
expectedUserData.stableBorrowRate = userDataBeforeAction.stableBorrowRate;
|
||||
expectedUserData.stableRateLastUpdated = userDataBeforeAction.stableRateLastUpdated;
|
||||
|
||||
expectedUserData.currentVariableBorrowBalance = expectedUserData.principalVariableBorrowBalance = variableBorrowBalance.minus(
|
||||
totalRepaid
|
||||
);
|
||||
|
||||
if (expectedUserData.currentVariableBorrowBalance.eq('0')) {
|
||||
//user repaid everything
|
||||
expectedUserData.variableBorrowIndex = new BigNumber('0');
|
||||
} else {
|
||||
totalRepaid = variableBorrowBalance.toFixed();
|
||||
|
||||
expectedUserData.currentStableBorrowBalance = stableBorrowBalance;
|
||||
expectedUserData.principalStableBorrowBalance =
|
||||
userDataBeforeAction.principalStableBorrowBalance;
|
||||
expectedUserData.stableBorrowRate = userDataBeforeAction.stableBorrowRate;
|
||||
|
||||
expectedUserData.currentVariableBorrowBalance = variableBorrowBalance.minus(totalRepaid);
|
||||
expectedUserData.variableBorrowIndex = expectedDataAfterAction.variableBorrowIndex;
|
||||
|
||||
if (expectedUserData.currentVariableBorrowBalance.eq('0')) {
|
||||
//user repaid everything
|
||||
expectedUserData.variableBorrowIndex = new BigNumber('0');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -697,12 +716,7 @@ export const calcExpectedUserDataAfterRepay = (
|
|||
expectedUserData.interestRedirectionAddress = userDataBeforeAction.interestRedirectionAddress;
|
||||
expectedUserData.redirectionAddressRedirectedBalance =
|
||||
userDataBeforeAction.redirectionAddressRedirectedBalance;
|
||||
expectedUserData.currentATokenUserIndex = calcExpectedATokenUserIndex(
|
||||
reserveDataBeforeAction,
|
||||
expectedUserData.currentATokenBalance,
|
||||
expectedUserData.redirectedBalance,
|
||||
txTimestamp
|
||||
);
|
||||
expectedUserData.currentATokenUserIndex = userDataBeforeAction.currentATokenUserIndex;
|
||||
|
||||
if (user === onBehalfOf) {
|
||||
//if user repaid for himself, update the wallet balances
|
||||
|
|
@ -756,7 +770,6 @@ export const calcExpectedReserveDataAfterSwapRateMode = (
|
|||
);
|
||||
|
||||
const stableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
|
@ -849,7 +862,6 @@ export const calcExpectedUserDataAfterSwapRateMode = (
|
|||
);
|
||||
|
||||
const stableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
|
@ -917,7 +929,6 @@ export const calcExpectedReserveDataAfterStableRateRebalance = (
|
|||
expectedReserveData.address = reserveDataBeforeAction.address;
|
||||
|
||||
const stableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
|
@ -978,13 +989,12 @@ export const calcExpectedUserDataAfterStableRateRebalance = (
|
|||
): UserReserveData => {
|
||||
const expectedUserData = {...userDataBeforeAction};
|
||||
|
||||
expectedUserData.principalVariableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
expectedUserData.principalVariableBorrowBalance = calcExpectedVariableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
expectedUserData.currentStableBorrowBalance = expectedUserData.principalStableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
userDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
|
@ -1041,7 +1051,6 @@ export const calcExpectedUsersDataAfterRedirectInterest = (
|
|||
const expectedToData = {...toDataBeforeAction};
|
||||
|
||||
expectedFromData.currentStableBorrowBalance = calcExpectedStableDebtTokenBalance(
|
||||
reserveDataBeforeAction,
|
||||
fromDataBeforeAction,
|
||||
txTimestamp
|
||||
);
|
||||
|
|
@ -1186,6 +1195,7 @@ const calcExpectedAverageStableBorrowRate = (
|
|||
amountChanged: string | BigNumber,
|
||||
rate: BigNumber
|
||||
) => {
|
||||
console.log(avgStableRateBefore, totalBorrowsStableBefore);
|
||||
const weightedTotalBorrows = avgStableRateBefore.multipliedBy(totalBorrowsStableBefore);
|
||||
const weightedAmountBorrowed = rate.multipliedBy(amountChanged);
|
||||
const totalBorrowedStable = totalBorrowsStableBefore.plus(new BigNumber(amountChanged));
|
||||
|
|
@ -1214,22 +1224,14 @@ const calcExpectedVariableDebtTokenBalance = (
|
|||
userDataBeforeAction: UserReserveData,
|
||||
currentTimestamp: BigNumber
|
||||
) => {
|
||||
console.log('Calculate normalized debt');
|
||||
|
||||
const debt = calcExpectedReserveNormalizedDebt(reserveDataBeforeAction, currentTimestamp);
|
||||
|
||||
console.log('Normalized debt is, ', debt.toFixed());
|
||||
|
||||
const {principalVariableBorrowBalance, variableBorrowIndex} = userDataBeforeAction;
|
||||
|
||||
console.log('Data fetched');
|
||||
|
||||
if (variableBorrowIndex.eq(0)) {
|
||||
return principalVariableBorrowBalance;
|
||||
}
|
||||
|
||||
console.log('Principal variable balance: ', principalVariableBorrowBalance);
|
||||
|
||||
return principalVariableBorrowBalance
|
||||
.wadToRay()
|
||||
.rayMul(debt)
|
||||
|
|
@ -1238,20 +1240,23 @@ const calcExpectedVariableDebtTokenBalance = (
|
|||
};
|
||||
|
||||
const calcExpectedStableDebtTokenBalance = (
|
||||
reserveDataBeforeAction: ReserveData,
|
||||
userDataBeforeAction: UserReserveData,
|
||||
currentTimestamp: BigNumber
|
||||
) => {
|
||||
const {principalStableBorrowBalance, stableBorrowRate} = userDataBeforeAction;
|
||||
const {
|
||||
principalStableBorrowBalance,
|
||||
stableBorrowRate,
|
||||
stableRateLastUpdated,
|
||||
} = userDataBeforeAction;
|
||||
|
||||
if (stableBorrowRate.eq(0)) {
|
||||
if (stableBorrowRate.eq(0) || currentTimestamp.eq(stableRateLastUpdated) || stableRateLastUpdated.eq(0)) {
|
||||
return principalStableBorrowBalance;
|
||||
}
|
||||
|
||||
const cumulatedInterest = calcCompoundedInterest(
|
||||
stableBorrowRate,
|
||||
currentTimestamp,
|
||||
reserveDataBeforeAction.lastUpdateTimestamp
|
||||
stableRateLastUpdated
|
||||
);
|
||||
|
||||
return principalStableBorrowBalance.wadToRay().rayMul(cumulatedInterest).rayToWad();
|
||||
|
|
@ -1411,13 +1416,6 @@ const calcExpectedReserveNormalizedDebt = (
|
|||
return variableBorrowIndex;
|
||||
}
|
||||
|
||||
console.log(
|
||||
'Current timestamp is: ',
|
||||
currentTimestamp,
|
||||
'Last updated timestamp is: ',
|
||||
lastUpdateTimestamp
|
||||
);
|
||||
|
||||
const cumulatedInterest = calcCompoundedInterest(
|
||||
variableBorrowRate,
|
||||
currentTimestamp,
|
||||
|
|
@ -1459,10 +1457,6 @@ const calcExpectedVariableBorrowIndex = (reserveData: ReserveData, timestamp: Bi
|
|||
return cumulatedInterest.rayMul(reserveData.variableBorrowIndex);
|
||||
};
|
||||
|
||||
const calcExpectedOriginationFee = (amount: string): BigNumber => {
|
||||
return new BigNumber(amount).multipliedBy(0.0025).decimalPlaces(0, BigNumber.ROUND_DOWN);
|
||||
};
|
||||
|
||||
export const calculateHealthFactorFromBalances = (
|
||||
collateralBalanceETH: BigNumber,
|
||||
borrowBalanceETH: BigNumber,
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@ export const getUserData = async (
|
|||
stableBorrowRate: new BigNumber(userData.stableBorrowRate.toString()),
|
||||
liquidityRate: new BigNumber(userData.liquidityRate.toString()),
|
||||
usageAsCollateralEnabled: userData.usageAsCollateralEnabled,
|
||||
stableRateLastUpdated: new BigNumber(userData.stableRateLastUpdated.toString()),
|
||||
walletBalance,
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ export interface UserReserveData {
|
|||
variableBorrowIndex: BigNumber
|
||||
liquidityRate: BigNumber
|
||||
stableBorrowRate: BigNumber
|
||||
stableRateLastUpdated: BigNumber
|
||||
usageAsCollateralEnabled: Boolean
|
||||
walletBalance: BigNumber
|
||||
[key: string]: BigNumber | string | Boolean
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
10
types/IStableDebtToken.d.ts
vendored
10
types/IStableDebtToken.d.ts
vendored
|
|
@ -18,6 +18,10 @@ interface IStableDebtTokenInterface extends Interface {
|
|||
|
||||
getAverageStableRate: TypedFunctionDescription<{ encode([]: []): string }>;
|
||||
|
||||
getUserLastUpdated: TypedFunctionDescription<{
|
||||
encode([_user]: [string]): string;
|
||||
}>;
|
||||
|
||||
getUserStableRate: TypedFunctionDescription<{
|
||||
encode([_user]: [string]): string;
|
||||
}>;
|
||||
|
|
@ -59,6 +63,8 @@ export class IStableDebtToken extends Contract {
|
|||
|
||||
getAverageStableRate(): Promise<BigNumber>;
|
||||
|
||||
getUserLastUpdated(_user: string): Promise<number>;
|
||||
|
||||
getUserStableRate(_user: string): Promise<BigNumber>;
|
||||
|
||||
mint(
|
||||
|
|
@ -77,6 +83,8 @@ export class IStableDebtToken extends Contract {
|
|||
|
||||
getAverageStableRate(): Promise<BigNumber>;
|
||||
|
||||
getUserLastUpdated(_user: string): Promise<number>;
|
||||
|
||||
getUserStableRate(_user: string): Promise<BigNumber>;
|
||||
|
||||
mint(
|
||||
|
|
@ -93,6 +101,8 @@ export class IStableDebtToken extends Contract {
|
|||
|
||||
getAverageStableRate(): Promise<BigNumber>;
|
||||
|
||||
getUserLastUpdated(_user: string): Promise<BigNumber>;
|
||||
|
||||
getUserStableRate(_user: string): Promise<BigNumber>;
|
||||
|
||||
mint(
|
||||
|
|
|
|||
|
|
@ -47,6 +47,25 @@ const _abi = [
|
|||
stateMutability: "view",
|
||||
type: "function"
|
||||
},
|
||||
{
|
||||
inputs: [
|
||||
{
|
||||
internalType: "address",
|
||||
name: "_user",
|
||||
type: "address"
|
||||
}
|
||||
],
|
||||
name: "getUserLastUpdated",
|
||||
outputs: [
|
||||
{
|
||||
internalType: "uint40",
|
||||
name: "",
|
||||
type: "uint40"
|
||||
}
|
||||
],
|
||||
stateMutability: "view",
|
||||
type: "function"
|
||||
},
|
||||
{
|
||||
inputs: [
|
||||
{
|
||||
|
|
|
|||
10
types/IVariableDebtToken.d.ts
vendored
10
types/IVariableDebtToken.d.ts
vendored
|
|
@ -16,6 +16,10 @@ interface IVariableDebtTokenInterface extends Interface {
|
|||
encode([_account, _amount]: [string, BigNumberish]): string;
|
||||
}>;
|
||||
|
||||
getUserIndex: TypedFunctionDescription<{
|
||||
encode([_account]: [string]): string;
|
||||
}>;
|
||||
|
||||
mint: TypedFunctionDescription<{
|
||||
encode([account, amount]: [string, BigNumberish]): string;
|
||||
}>;
|
||||
|
|
@ -47,6 +51,8 @@ export class IVariableDebtToken extends Contract {
|
|||
overrides?: TransactionOverrides
|
||||
): Promise<ContractTransaction>;
|
||||
|
||||
getUserIndex(_account: string): Promise<BigNumber>;
|
||||
|
||||
mint(
|
||||
account: string,
|
||||
amount: BigNumberish,
|
||||
|
|
@ -60,6 +66,8 @@ export class IVariableDebtToken extends Contract {
|
|||
overrides?: TransactionOverrides
|
||||
): Promise<ContractTransaction>;
|
||||
|
||||
getUserIndex(_account: string): Promise<BigNumber>;
|
||||
|
||||
mint(
|
||||
account: string,
|
||||
amount: BigNumberish,
|
||||
|
|
@ -71,6 +79,8 @@ export class IVariableDebtToken extends Contract {
|
|||
estimate: {
|
||||
burn(_account: string, _amount: BigNumberish): Promise<BigNumber>;
|
||||
|
||||
getUserIndex(_account: string): Promise<BigNumber>;
|
||||
|
||||
mint(account: string, amount: BigNumberish): Promise<BigNumber>;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,25 @@ const _abi = [
|
|||
stateMutability: "nonpayable",
|
||||
type: "function"
|
||||
},
|
||||
{
|
||||
inputs: [
|
||||
{
|
||||
internalType: "address",
|
||||
name: "_account",
|
||||
type: "address"
|
||||
}
|
||||
],
|
||||
name: "getUserIndex",
|
||||
outputs: [
|
||||
{
|
||||
internalType: "uint256",
|
||||
name: "",
|
||||
type: "uint256"
|
||||
}
|
||||
],
|
||||
stateMutability: "view",
|
||||
type: "function"
|
||||
},
|
||||
{
|
||||
inputs: [
|
||||
{
|
||||
|
|
|
|||
8
types/LendingPool.d.ts
vendored
8
types/LendingPool.d.ts
vendored
|
|
@ -473,6 +473,7 @@ export class LendingPool extends Contract {
|
|||
stableBorrowRate: BigNumber;
|
||||
liquidityRate: BigNumber;
|
||||
variableBorrowIndex: BigNumber;
|
||||
stableRateLastUpdated: number;
|
||||
usageAsCollateralEnabled: boolean;
|
||||
0: BigNumber;
|
||||
1: BigNumber;
|
||||
|
|
@ -482,7 +483,8 @@ export class LendingPool extends Contract {
|
|||
5: BigNumber;
|
||||
6: BigNumber;
|
||||
7: BigNumber;
|
||||
8: boolean;
|
||||
8: number;
|
||||
9: boolean;
|
||||
}>;
|
||||
|
||||
initReserve(
|
||||
|
|
@ -735,6 +737,7 @@ export class LendingPool extends Contract {
|
|||
stableBorrowRate: BigNumber;
|
||||
liquidityRate: BigNumber;
|
||||
variableBorrowIndex: BigNumber;
|
||||
stableRateLastUpdated: number;
|
||||
usageAsCollateralEnabled: boolean;
|
||||
0: BigNumber;
|
||||
1: BigNumber;
|
||||
|
|
@ -744,7 +747,8 @@ export class LendingPool extends Contract {
|
|||
5: BigNumber;
|
||||
6: BigNumber;
|
||||
7: BigNumber;
|
||||
8: boolean;
|
||||
8: number;
|
||||
9: boolean;
|
||||
}>;
|
||||
|
||||
initReserve(
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
10
types/StableDebtToken.d.ts
vendored
10
types/StableDebtToken.d.ts
vendored
|
|
@ -36,6 +36,10 @@ interface StableDebtTokenInterface extends Interface {
|
|||
|
||||
getAverageStableRate: TypedFunctionDescription<{ encode([]: []): string }>;
|
||||
|
||||
getUserLastUpdated: TypedFunctionDescription<{
|
||||
encode([_user]: [string]): string;
|
||||
}>;
|
||||
|
||||
getUserStableRate: TypedFunctionDescription<{
|
||||
encode([_user]: [string]): string;
|
||||
}>;
|
||||
|
|
@ -172,6 +176,8 @@ export class StableDebtToken extends Contract {
|
|||
|
||||
getAverageStableRate(): Promise<BigNumber>;
|
||||
|
||||
getUserLastUpdated(_user: string): Promise<number>;
|
||||
|
||||
getUserStableRate(_user: string): Promise<BigNumber>;
|
||||
|
||||
increaseAllowance(
|
||||
|
|
@ -246,6 +252,8 @@ export class StableDebtToken extends Contract {
|
|||
|
||||
getAverageStableRate(): Promise<BigNumber>;
|
||||
|
||||
getUserLastUpdated(_user: string): Promise<number>;
|
||||
|
||||
getUserStableRate(_user: string): Promise<BigNumber>;
|
||||
|
||||
increaseAllowance(
|
||||
|
|
@ -338,6 +346,8 @@ export class StableDebtToken extends Contract {
|
|||
|
||||
getAverageStableRate(): Promise<BigNumber>;
|
||||
|
||||
getUserLastUpdated(_user: string): Promise<BigNumber>;
|
||||
|
||||
getUserStableRate(_user: string): Promise<BigNumber>;
|
||||
|
||||
increaseAllowance(
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
10
types/VariableDebtToken.d.ts
vendored
10
types/VariableDebtToken.d.ts
vendored
|
|
@ -34,6 +34,10 @@ interface VariableDebtTokenInterface extends Interface {
|
|||
encode([spender, subtractedValue]: [string, BigNumberish]): string;
|
||||
}>;
|
||||
|
||||
getUserIndex: TypedFunctionDescription<{
|
||||
encode([_user]: [string]): string;
|
||||
}>;
|
||||
|
||||
increaseAllowance: TypedFunctionDescription<{
|
||||
encode([spender, addedValue]: [string, BigNumberish]): string;
|
||||
}>;
|
||||
|
|
@ -161,6 +165,8 @@ export class VariableDebtToken extends Contract {
|
|||
overrides?: TransactionOverrides
|
||||
): Promise<ContractTransaction>;
|
||||
|
||||
getUserIndex(_user: string): Promise<BigNumber>;
|
||||
|
||||
increaseAllowance(
|
||||
spender: string,
|
||||
addedValue: BigNumberish,
|
||||
|
|
@ -230,6 +236,8 @@ export class VariableDebtToken extends Contract {
|
|||
overrides?: TransactionOverrides
|
||||
): Promise<ContractTransaction>;
|
||||
|
||||
getUserIndex(_user: string): Promise<BigNumber>;
|
||||
|
||||
increaseAllowance(
|
||||
spender: string,
|
||||
addedValue: BigNumberish,
|
||||
|
|
@ -318,6 +326,8 @@ export class VariableDebtToken extends Contract {
|
|||
subtractedValue: BigNumberish
|
||||
): Promise<BigNumber>;
|
||||
|
||||
getUserIndex(_user: string): Promise<BigNumber>;
|
||||
|
||||
increaseAllowance(
|
||||
spender: string,
|
||||
addedValue: BigNumberish
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -134,4 +134,4 @@ const _abi = [
|
|||
];
|
||||
|
||||
const _bytecode =
|
||||
"0x608060405234801561001057600080fd5b5060405161099e38038061099e8339818101604052602081101561003357600080fd5b5051600080546001600160a01b039092166001600160a01b0319909216919091179055610939806100656000396000f3fe6080604052600436106100385760003560e01c80639e3c930914610083578063b59b28ef1461014f578063f7888aec146102d35761007e565b3661007e5761004633610320565b61007c576040805162461bcd60e51b8152602060048201526002602482015261191960f11b604482015290519081900360640190fd5b005b600080fd5b34801561008f57600080fd5b506100b6600480360360208110156100a657600080fd5b50356001600160a01b031661035c565b604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b838110156100fa5781810151838201526020016100e2565b50505050905001838103825284818151815260200191508051906020019060200280838360005b83811015610139578181015183820152602001610121565b5050505090500194505050505060405180910390f35b34801561015b57600080fd5b506102836004803603604081101561017257600080fd5b81019060208101813564010000000081111561018d57600080fd5b82018360208201111561019f57600080fd5b803590602001918460208302840111640100000000831117156101c157600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561021157600080fd5b82018360208201111561022357600080fd5b8035906020019184602083028401116401000000008311171561024557600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295506106a9945050505050565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156102bf5781810151838201526020016102a7565b505050509050019250505060405180910390f35b3480156102df57600080fd5b5061030e600480360360408110156102f657600080fd5b506001600160a01b0381358116916020013516610841565b60408051918252519081900360200190f35b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47081811480159061035457508115155b949350505050565b60608060008060009054906101000a90046001600160a01b03166001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103ae57600080fd5b505afa1580156103c2573d6000803e3d6000fd5b505050506040513d60208110156103d857600080fd5b505160408051630240bc6b60e21b815290519192506060916001600160a01b03841691630902f1ac916004808301926000929190829003018186803b15801561042057600080fd5b505afa158015610434573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052602081101561045d57600080fd5b810190808051604051939291908464010000000082111561047d57600080fd5b90830190602082018581111561049257600080fd5b82518660208202830111640100000000821117156104af57600080fd5b82525081516020918201928201910280838360005b838110156104dc5781810151838201526020016104c4565b5050505090500160405250505090506060815167ffffffffffffffff8111801561050557600080fd5b5060405190808252806020026020018201604052801561052f578160200160208202803683370190505b50905060005b825181101561069d576000846001600160a01b0316633e15014185848151811061055b57fe5b60200260200101516040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b031681526020019150506101406040518083038186803b1580156105aa57600080fd5b505afa1580156105be573d6000803e3d6000fd5b505050506040513d6101408110156105d557600080fd5b5061010001519050806106025760008383815181106105f057fe5b60200260200101818152505050610695565b61060a6108eb565b6001600160a01b031684838151811061061f57fe5b60200260200101516001600160a01b03161461066f576106528885848151811061064557fe5b6020026020010151610841565b83838151811061065e57fe5b602002602001018181525050610693565b876001600160a01b03163183838151811061068657fe5b6020026020010181815250505b505b600101610535565b50909350915050915091565b606080825184510267ffffffffffffffff811180156106c757600080fd5b506040519080825280602002602001820160405280156106f1578160200160208202803683370190505b50905060005b84518110156108375760005b845181101561082e57845182026107186108eb565b6001600160a01b031686838151811061072d57fe5b60200260200101516001600160a01b031614156107815786838151811061075057fe5b60200260200101516001600160a01b031631848383018151811061077057fe5b602002602001018181525050610825565b6107a686838151811061079057fe5b60200260200101516001600160a01b0316610320565b6107e7576040805162461bcd60e51b815260206004820152600d60248201526c24a72b20a624a22faa27a5a2a760991b604482015290519081900360640190fd5b61080a8784815181106107f657fe5b602002602001015187848151811061064557fe5b848383018151811061081857fe5b6020026020010181815250505b50600101610703565b506001016106f7565b5090505b92915050565b6000610855826001600160a01b0316610320565b156108e357816001600160a01b03166370a08231846040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156108b057600080fd5b505afa1580156108c4573d6000803e3d6000fd5b505050506040513d60208110156108da57600080fd5b5051905061083b565b50600061083b565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee9056fea26469706673582212207285b910f911868636ce78fa21192b5ac0a86df35b25c04e8445ba9b97d183ea64736f6c63430006080033";
|
||||
"0x608060405234801561001057600080fd5b5060405161099e38038061099e8339818101604052602081101561003357600080fd5b5051600080546001600160a01b039092166001600160a01b0319909216919091179055610939806100656000396000f3fe6080604052600436106100385760003560e01c80639e3c930914610083578063b59b28ef1461014f578063f7888aec146102d35761007e565b3661007e5761004633610320565b61007c576040805162461bcd60e51b8152602060048201526002602482015261191960f11b604482015290519081900360640190fd5b005b600080fd5b34801561008f57600080fd5b506100b6600480360360208110156100a657600080fd5b50356001600160a01b031661035c565b604051808060200180602001838103835285818151815260200191508051906020019060200280838360005b838110156100fa5781810151838201526020016100e2565b50505050905001838103825284818151815260200191508051906020019060200280838360005b83811015610139578181015183820152602001610121565b5050505090500194505050505060405180910390f35b34801561015b57600080fd5b506102836004803603604081101561017257600080fd5b81019060208101813564010000000081111561018d57600080fd5b82018360208201111561019f57600080fd5b803590602001918460208302840111640100000000831117156101c157600080fd5b919080806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250929594936020810193503591505064010000000081111561021157600080fd5b82018360208201111561022357600080fd5b8035906020019184602083028401116401000000008311171561024557600080fd5b9190808060200260200160405190810160405280939291908181526020018383602002808284376000920191909152509295506106a9945050505050565b60408051602080825283518183015283519192839290830191858101910280838360005b838110156102bf5781810151838201526020016102a7565b505050509050019250505060405180910390f35b3480156102df57600080fd5b5061030e600480360360408110156102f657600080fd5b506001600160a01b0381358116916020013516610841565b60408051918252519081900360200190f35b6000813f7fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47081811480159061035457508115155b949350505050565b60608060008060009054906101000a90046001600160a01b03166001600160a01b0316630261bf8b6040518163ffffffff1660e01b815260040160206040518083038186803b1580156103ae57600080fd5b505afa1580156103c2573d6000803e3d6000fd5b505050506040513d60208110156103d857600080fd5b505160408051630240bc6b60e21b815290519192506060916001600160a01b03841691630902f1ac916004808301926000929190829003018186803b15801561042057600080fd5b505afa158015610434573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052602081101561045d57600080fd5b810190808051604051939291908464010000000082111561047d57600080fd5b90830190602082018581111561049257600080fd5b82518660208202830111640100000000821117156104af57600080fd5b82525081516020918201928201910280838360005b838110156104dc5781810151838201526020016104c4565b5050505090500160405250505090506060815167ffffffffffffffff8111801561050557600080fd5b5060405190808252806020026020018201604052801561052f578160200160208202803683370190505b50905060005b825181101561069d576000846001600160a01b0316633e15014185848151811061055b57fe5b60200260200101516040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b031681526020019150506101406040518083038186803b1580156105aa57600080fd5b505afa1580156105be573d6000803e3d6000fd5b505050506040513d6101408110156105d557600080fd5b5061010001519050806106025760008383815181106105f057fe5b60200260200101818152505050610695565b61060a6108eb565b6001600160a01b031684838151811061061f57fe5b60200260200101516001600160a01b03161461066f576106528885848151811061064557fe5b6020026020010151610841565b83838151811061065e57fe5b602002602001018181525050610693565b876001600160a01b03163183838151811061068657fe5b6020026020010181815250505b505b600101610535565b50909350915050915091565b606080825184510267ffffffffffffffff811180156106c757600080fd5b506040519080825280602002602001820160405280156106f1578160200160208202803683370190505b50905060005b84518110156108375760005b845181101561082e57845182026107186108eb565b6001600160a01b031686838151811061072d57fe5b60200260200101516001600160a01b031614156107815786838151811061075057fe5b60200260200101516001600160a01b031631848383018151811061077057fe5b602002602001018181525050610825565b6107a686838151811061079057fe5b60200260200101516001600160a01b0316610320565b6107e7576040805162461bcd60e51b815260206004820152600d60248201526c24a72b20a624a22faa27a5a2a760991b604482015290519081900360640190fd5b61080a8784815181106107f657fe5b602002602001015187848151811061064557fe5b848383018151811061081857fe5b6020026020010181815250505b50600101610703565b506001016106f7565b5090505b92915050565b6000610855826001600160a01b0316610320565b156108e357816001600160a01b03166370a08231846040518263ffffffff1660e01b815260040180826001600160a01b03166001600160a01b0316815260200191505060206040518083038186803b1580156108b057600080fd5b505afa1580156108c4573d6000803e3d6000fd5b505050506040513d60208110156108da57600080fd5b5051905061083b565b50600061083b565b73eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee9056fea26469706673582212201c3d00b6898c7cba8e1984b191e380cdb722e5f2a344c682d01a8f97133fa70e64736f6c63430006080033";
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user