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

Updated interest rate strategy to generalize fetching of the available liquidity

Browse Source
This commit is contained in:
The3D 2021-03-01 15:58:31 +01:00
parent 0302339892
commit 03a410230d
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/interfaces/IReserveInterestRateStrategy.sol
View File

@ -13,7 +13,9 @@ interface IReserveInterestRateStrategy {
function calculateInterestRates( function calculateInterestRates(
address reserve, address reserve,
uint256 utilizationRate, address aToken,
uint256 liquidityAdded,
uint256 liquidityTaken,
uint256 totalStableDebt, uint256 totalStableDebt,
uint256 totalVariableDebt, uint256 totalVariableDebt,
uint256 averageStableBorrowRate, uint256 averageStableBorrowRate,

13
contracts/protocol/lendingpool/DefaultReserveInterestRateStrategy.sol
View File

@ -7,6 +7,7 @@ import {WadRayMath} from '../libraries/math/WadRayMath.sol';
import {PercentageMath} from '../libraries/math/PercentageMath.sol'; import {PercentageMath} from '../libraries/math/PercentageMath.sol';
import {ILendingPoolAddressesProvider} from '../../interfaces/ILendingPoolAddressesProvider.sol'; import {ILendingPoolAddressesProvider} from '../../interfaces/ILendingPoolAddressesProvider.sol';
import {ILendingRateOracle} from '../../interfaces/ILendingRateOracle.sol'; import {ILendingRateOracle} from '../../interfaces/ILendingRateOracle.sol';
import {IERC20} from '../../dependencies/openzeppelin/contracts/IERC20.sol';
/** /**
* @title DefaultReserveInterestRateStrategy contract * @title DefaultReserveInterestRateStrategy contract
@ -102,12 +103,14 @@ contract DefaultReserveInterestRateStrategy is IReserveInterestRateStrategy {
uint256 currentStableBorrowRate; uint256 currentStableBorrowRate;
uint256 currentLiquidityRate; uint256 currentLiquidityRate;
uint256 utilizationRate; uint256 utilizationRate;
uint256 availableLiquidity;
} }
/** /**
* @dev Calculates the interest rates depending on the reserve's state and configurations * @dev Calculates the interest rates depending on the reserve's state and configurations
* @param reserve The address of the reserve * @param reserve The address of the reserve
* @param availableLiquidity The liquidity available in the reserve * @param liquidityAdded The liquidity added during the operation
* @param liquidityTaken The liquidity taken during the operation
* @param totalStableDebt The total borrowed from the reserve a stable rate * @param totalStableDebt The total borrowed from the reserve a stable rate
* @param totalVariableDebt The total borrowed from the reserve at a variable rate * @param totalVariableDebt The total borrowed from the reserve at a variable rate
* @param averageStableBorrowRate The weighted average of all the stable rate loans * @param averageStableBorrowRate The weighted average of all the stable rate loans
@ -116,7 +119,9 @@ contract DefaultReserveInterestRateStrategy is IReserveInterestRateStrategy {
**/ **/
function calculateInterestRates( function calculateInterestRates(
address reserve, address reserve,
uint256 availableLiquidity, address aToken,
uint256 liquidityAdded,
uint256 liquidityTaken,
uint256 totalStableDebt, uint256 totalStableDebt,
uint256 totalVariableDebt, uint256 totalVariableDebt,
uint256 averageStableBorrowRate, uint256 averageStableBorrowRate,
@ -137,9 +142,11 @@ contract DefaultReserveInterestRateStrategy is IReserveInterestRateStrategy {
vars.currentVariableBorrowRate = 0; vars.currentVariableBorrowRate = 0;
vars.currentStableBorrowRate = 0; vars.currentStableBorrowRate = 0;
vars.currentLiquidityRate = 0; vars.currentLiquidityRate = 0;
vars.availableLiquidity = IERC20(reserve).balanceOf(aToken);
vars.availableLiquidity = vars.availableLiquidity.add(liquidityAdded).sub(liquidityTaken);
uint256 utilizationRate = uint256 utilizationRate =
vars.totalDebt == 0 ? 0 : vars.totalDebt.rayDiv(availableLiquidity.add(vars.totalDebt)); vars.totalDebt == 0 ? 0 : vars.totalDebt.rayDiv(vars.availableLiquidity.add(vars.totalDebt));
vars.currentStableBorrowRate = ILendingRateOracle(addressesProvider.getLendingRateOracle()) vars.currentStableBorrowRate = ILendingRateOracle(addressesProvider.getLendingRateOracle())
.getMarketBorrowRate(reserve); .getMarketBorrowRate(reserve);

6
contracts/protocol/libraries/logic/ReserveLogic.sol
View File

@ -216,15 +216,15 @@ library ReserveLogic {
.scaledTotalSupply() .scaledTotalSupply()
.rayMul(reserve.variableBorrowIndex); .rayMul(reserve.variableBorrowIndex);
vars.availableLiquidity = IERC20(reserveAddress).balanceOf(aTokenAddress);
( (
vars.newLiquidityRate, vars.newLiquidityRate,
vars.newStableRate, vars.newStableRate,
vars.newVariableRate vars.newVariableRate
) = IReserveInterestRateStrategy(reserve.interestRateStrategyAddress).calculateInterestRates( ) = IReserveInterestRateStrategy(reserve.interestRateStrategyAddress).calculateInterestRates(
reserveAddress, reserveAddress,
vars.availableLiquidity.add(liquidityAdded).sub(liquidityTaken), aTokenAddress,
liquidityAdded,
liquidityTaken,
vars.totalStableDebt, vars.totalStableDebt,
vars.totalVariableDebt, vars.totalVariableDebt,
vars.avgStableRate, vars.avgStableRate,