From 584a567635ad4817c7ef105304d62f25158eb120 Mon Sep 17 00:00:00 2001 From: The3D Date: Mon, 23 Nov 2020 18:44:13 +0100 Subject: [PATCH] Updated flashloan updateInterestRates --- contracts/protocol/lendingpool/LendingPool.sol | 2 +- test/flashloan.spec.ts | 5 +++++ test/helpers/utils/calculations.ts | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/contracts/protocol/lendingpool/LendingPool.sol b/contracts/protocol/lendingpool/LendingPool.sol index 0c98374e..45dd53f4 100644 --- a/contracts/protocol/lendingpool/LendingPool.sol +++ b/contracts/protocol/lendingpool/LendingPool.sol @@ -508,7 +508,7 @@ contract LendingPool is VersionedInitializable, ILendingPool, LendingPoolStorage _reserves[vars.currentAsset].updateInterestRates( vars.currentAsset, vars.currentATokenAddress, - vars.currentPremium, + vars.currentAmountPlusPremium, 0 ); diff --git a/test/flashloan.spec.ts b/test/flashloan.spec.ts index b5978d1a..7bfa2781 100644 --- a/test/flashloan.spec.ts +++ b/test/flashloan.spec.ts @@ -252,6 +252,8 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => { await _mockFlashLoanReceiver.setFailExecutionTransfer(false); + const reserveDataBefore = await helpersContract.getReserveData(usdc.address); + const flashloanAmount = await convertToCurrencyDecimals(usdc.address, '500'); await pool.flashLoan( @@ -264,6 +266,9 @@ makeSuite('LendingPool FlashLoan function', (testEnv: TestEnv) => { '0' ); + const reserveDataAfter = helpersContract.getReserveData(usdc.address); + + const reserveData = await helpersContract.getReserveData(usdc.address); const userData = await helpersContract.getUserReserveData(usdc.address, depositor.address); diff --git a/test/helpers/utils/calculations.ts b/test/helpers/utils/calculations.ts index ae787e1d..b334a7f1 100644 --- a/test/helpers/utils/calculations.ts +++ b/test/helpers/utils/calculations.ts @@ -1194,7 +1194,7 @@ const calcCompoundedInterest = ( .plus(thirdTerm); }; -const calcExpectedInterestRates = ( +export const calcExpectedInterestRates = ( reserveSymbol: string, marketStableRate: BigNumber, utilizationRate: BigNumber, @@ -1253,7 +1253,7 @@ const calcExpectedInterestRates = ( return [liquidityRate, stableBorrowRate, variableBorrowRate]; }; -const calcExpectedOverallBorrowRate = ( +export const calcExpectedOverallBorrowRate = ( totalStableDebt: BigNumber, totalVariableDebt: BigNumber, currentVariableBorrowRate: BigNumber, @@ -1274,7 +1274,7 @@ const calcExpectedOverallBorrowRate = ( return overallBorrowRate; }; -const calcExpectedUtilizationRate = ( +export const calcExpectedUtilizationRate = ( totalStableDebt: BigNumber, totalVariableDebt: BigNumber, totalLiquidity: BigNumber