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

Renamed flashloan fee in premium

Browse Source
This commit is contained in:
The3D 2020-08-24 01:30:01 +02:00
parent 928770d9d5
commit dce7a73dda
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/interfaces/ILendingPool.sol
View File

@ -90,14 +90,14 @@ interface ILendingPool {
* @param target the address of the flashLoanReceiver * @param target the address of the flashLoanReceiver
* @param reserve the address of the reserve * @param reserve the address of the reserve
* @param amount the amount requested * @param amount the amount requested
* @param totalFee the total fee on the amount * @param totalPremium the total fee on the amount
* @param referralCode the referral code of the caller * @param referralCode the referral code of the caller
**/ **/
event FlashLoan( event FlashLoan(
address indexed target, address indexed target,
address indexed reserve, address indexed reserve,
uint256 amount, uint256 amount,
uint256 totalFee, uint256 totalPremium,
uint16 referralCode uint16 referralCode
); );
/** /**

39
contracts/lendingpool/LendingPool.sol
View File

@ -41,7 +41,7 @@ contract LendingPool is VersionedInitializable, ILendingPool {
//main configuration parameters //main configuration parameters
uint256 public constant REBALANCE_DOWN_RATE_DELTA = (1e27) / 5; uint256 public constant REBALANCE_DOWN_RATE_DELTA = (1e27) / 5;
uint256 public constant MAX_STABLE_RATE_BORROW_SIZE_PERCENT = 25; uint256 public constant MAX_STABLE_RATE_BORROW_SIZE_PERCENT = 25;
uint256 public constant FLASHLOAN_FEE_TOTAL = 9; uint256 public constant FLASHLOAN_PREMIUM_TOTAL = 9;
ILendingPoolAddressesProvider internal addressesProvider; ILendingPoolAddressesProvider internal addressesProvider;
@ -438,9 +438,9 @@ contract LendingPool is VersionedInitializable, ILendingPool {
} }
struct FlashLoanLocalVars{ struct FlashLoanLocalVars{
uint256 amountFee; uint256 premium;
uint256 amountPlusFee; uint256 amountPlusPremium;
uint256 amountPlusFeeInETH; uint256 amountPlusPremiumInETH;
IFlashLoanReceiver receiver; IFlashLoanReceiver receiver;
address aTokenAddress; address aTokenAddress;
address oracle; address oracle;
@ -467,9 +467,9 @@ contract LendingPool is VersionedInitializable, ILendingPool {
vars.aTokenAddress = reserve.aTokenAddress; vars.aTokenAddress = reserve.aTokenAddress;
//calculate amount fee //calculate amount fee
vars.amountFee = amount.mul(FLASHLOAN_FEE_TOTAL).div(10000); vars.premium = amount.mul(FLASHLOAN_PREMIUM_TOTAL).div(10000);
require(vars.amountFee > 0, 'The requested amount is too small for a FlashLoan.'); require(vars.premium > 0, 'The requested amount is too small for a FlashLoan.');
//get the FlashLoanReceiver instance //get the FlashLoanReceiver instance
vars.receiver = IFlashLoanReceiver(receiverAddress); vars.receiver = IFlashLoanReceiver(receiverAddress);
@ -478,37 +478,37 @@ contract LendingPool is VersionedInitializable, ILendingPool {
IAToken(vars.aTokenAddress).transferUnderlyingTo(receiverAddress, amount); IAToken(vars.aTokenAddress).transferUnderlyingTo(receiverAddress, amount);
//execute action of the receiver //execute action of the receiver
vars.receiver.executeOperation(asset, amount, vars.amountFee, params); vars.receiver.executeOperation(asset, amount, vars.premium, params);
//compounding the cumulated interest //compounding the cumulated interest
reserve.updateCumulativeIndexesAndTimestamp(); reserve.updateCumulativeIndexesAndTimestamp();
vars.amountPlusFee = amount.add(vars.amountFee); vars.amountPlusPremium = amount.add(vars.premium);
//transfer from the receiver the amount plus the fee //transfer from the receiver the amount plus the fee
try IERC20(asset).transferFrom(receiverAddress, vars.aTokenAddress, vars.amountPlusFee) { try IERC20(asset).transferFrom(receiverAddress, vars.aTokenAddress, vars.amountPlusPremium) {
//if the transfer succeeded, the executor has repaid the flashloans. //if the transfer succeeded, the executor has repaid the flashloans.
//the fee is compounded into the reserve //the fee is compounded into the reserve
reserve.cumulateToLiquidityIndex(IERC20(vars.aTokenAddress).totalSupply(), vars.amountFee); reserve.cumulateToLiquidityIndex(IERC20(vars.aTokenAddress).totalSupply(), vars.premium);
//refresh interest rates //refresh interest rates
reserve.updateInterestRates(asset, vars.amountFee, 0); reserve.updateInterestRates(asset, vars.premium, 0);
emit FlashLoan(receiverAddress, asset, amount, vars.amountFee, referralCode); emit FlashLoan(receiverAddress, asset, amount, vars.premium, referralCode);
} }
catch(bytes memory reason){ catch(bytes memory reason){
//if the transfer didn't succeed, the executor either didn't return the funds, or didn't approve the transfer. //if the transfer didn't succeed, the executor either didn't return the funds, or didn't approve the transfer.
//we check if the caller has enough collateral to open a variable rate loan. If it does, then debt is mint to msg.sender //we check if the caller has enough collateral to open a variable rate loan. If it does, then debt is mint to msg.sender
vars.oracle = addressesProvider.getPriceOracle(); vars.oracle = addressesProvider.getPriceOracle();
vars.amountPlusFeeInETH = IPriceOracleGetter(vars.oracle) vars.amountPlusPremiumInETH = IPriceOracleGetter(vars.oracle)
.getAssetPrice(asset) .getAssetPrice(asset)
.mul(vars.amountPlusFee) .mul(vars.amountPlusPremium)
.div(10**reserve.configuration.getDecimals()); //price is in ether .div(10**reserve.configuration.getDecimals()); //price is in ether
ValidationLogic.validateBorrow( ValidationLogic.validateBorrow(
reserve, reserve,
asset, asset,
vars.amountPlusFee, vars.amountPlusPremium,
vars.amountPlusFeeInETH, vars.amountPlusPremiumInETH,
uint256(ReserveLogic.InterestRateMode.VARIABLE), uint256(ReserveLogic.InterestRateMode.VARIABLE),
MAX_STABLE_RATE_BORROW_SIZE_PERCENT, MAX_STABLE_RATE_BORROW_SIZE_PERCENT,
_reserves, _reserves,
@ -517,13 +517,14 @@ contract LendingPool is VersionedInitializable, ILendingPool {
vars.oracle vars.oracle
); );
IVariableDebtToken(reserve.variableDebtTokenAddress).mint(msg.sender, vars.amountPlusFee); IVariableDebtToken(reserve.variableDebtTokenAddress).mint(msg.sender, vars.amountPlusPremium);
//refresh interest rates //refresh interest rates
reserve.updateInterestRates(asset, vars.amountFee, 0); reserve.updateInterestRates(asset, vars.premium, 0);
emit Borrow( emit Borrow(
asset, asset,
msg.sender, msg.sender,
vars.amountPlusFee, vars.amountPlusPremium,
uint256(ReserveLogic.InterestRateMode.VARIABLE), uint256(ReserveLogic.InterestRateMode.VARIABLE),
reserve.currentVariableBorrowRate, reserve.currentVariableBorrowRate,
referralCode referralCode