feat: renamed simpleFlashloan and data structure

aave · Oct 8, 2021 · 9cc4d0c · 9cc4d0c
1 parent f00e109
commit 9cc4d0c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 20 deletions.
diff --git a/contracts/interfaces/IPool.sol b/contracts/interfaces/IPool.sol
@@ -454,7 +454,7 @@ interface IPool {
    * @param referralCode The code used to register the integrator originating the operation, for potential rewards.
    *   0 if the action is executed directly by the user, without any middle-man
    **/
-  function simpleFlashLoan(
+  function flashLoanSimple(
     address receiverAddress,
     address asset,
     uint256 amount,

diff --git a/contracts/protocol/libraries/logic/FlashLoanLogic.sol b/contracts/protocol/libraries/logic/FlashLoanLogic.sol
@@ -174,27 +174,28 @@ library FlashLoanLogic {
 
   struct SimpleFlashLoanLocalVars {
     ISimpleFlashLoanReceiver receiver;
-    address aTokenAddress;
     uint256 totalPremium;
     uint256 premiumToLP;
     uint256 premiumToProtocol;
     uint256 amountPlusPremium;
   }
 
-  function executeSimpleFlashLoan(
+  function executeFlashLoanSimple(
     DataTypes.ReserveData storage reserve,
-    DataTypes.SimpleFlashloanParams memory params
+    DataTypes.FlashloanSimpleParams memory params
   ) external {
     SimpleFlashLoanLocalVars memory vars;
 
-    ValidationLogic.validateSimpleFlashloan(reserve);
+    DataTypes.ReserveCache memory reserveCache = reserve.cache();
+    reserve.updateState(reserveCache);
+
+    ValidationLogic.validateFlashloanSimple(reserveCache);
 
     vars.receiver = ISimpleFlashLoanReceiver(params.receiverAddress);
 
-    vars.aTokenAddress = reserve.aTokenAddress;
     vars.totalPremium = params.amount.percentMul(params.flashLoanPremiumTotal);
     vars.amountPlusPremium = params.amount + vars.totalPremium;
-    IAToken(vars.aTokenAddress).transferUnderlyingTo(params.receiverAddress, params.amount);
+    IAToken(reserveCache.aTokenAddress).transferUnderlyingTo(params.receiverAddress, params.amount);
 
     require(
       vars.receiver.executeOperation(
@@ -210,10 +211,10 @@ library FlashLoanLogic {
     vars.premiumToProtocol = params.amount.percentMul(params.flashLoanPremiumToProtocol);
     vars.premiumToLP = vars.totalPremium - vars.premiumToProtocol;
 
-    DataTypes.ReserveCache memory reserveCache = reserve.cache();
-
-    reserve.updateState(reserveCache);
-    reserve.cumulateToLiquidityIndex(IERC20(vars.aTokenAddress).totalSupply(), vars.premiumToLP);
+    reserve.cumulateToLiquidityIndex(
+      IERC20(reserveCache.aTokenAddress).totalSupply(),
+      vars.premiumToLP
+    );
 
     reserve.accruedToTreasury =
       reserve.accruedToTreasury +
@@ -223,7 +224,7 @@ library FlashLoanLogic {
 
     IERC20(params.asset).safeTransferFrom(
       params.receiverAddress,
-      vars.aTokenAddress,
+      reserveCache.aTokenAddress,
       vars.amountPlusPremium
     );
 

diff --git a/contracts/protocol/libraries/logic/ValidationLogic.sol b/contracts/protocol/libraries/logic/ValidationLogic.sol
@@ -463,10 +463,11 @@ library ValidationLogic {
 
   /**
    * @notice Validates a flashloan action
-   * @param reserveData The state of the reserve
+   * @param reserveCache The cached data of the reserve
    */
-  function validateSimpleFlashloan(DataTypes.ReserveData storage reserveData) internal view {
-    require(!reserveData.configuration.getPaused(), Errors.VL_RESERVE_PAUSED);
+  function validateFlashloanSimple(DataTypes.ReserveCache memory reserveCache) internal view {
+    require(!reserveCache.reserveConfiguration.getPaused(), Errors.VL_RESERVE_PAUSED);
+    require(reserveCache.reserveConfiguration.getActive(), Errors.VL_NO_ACTIVE_RESERVE);
   }
 
   struct ValidateLiquidationCallLocalVars {

diff --git a/contracts/protocol/libraries/types/DataTypes.sol b/contracts/protocol/libraries/types/DataTypes.sol
@@ -184,7 +184,7 @@ library DataTypes {
     bool isAuthorizedFlashBorrower;
   }
 
-  struct SimpleFlashloanParams {
+  struct FlashloanSimpleParams {
     address receiverAddress;
     address asset;
     uint256 amount;

diff --git a/contracts/protocol/pool/Pool.sol b/contracts/protocol/pool/Pool.sol
@@ -380,14 +380,14 @@ contract Pool is VersionedInitializable, IPool, PoolStorage {
   }
 
   /// @inheritdoc IPool
-  function simpleFlashLoan(
+  function flashLoanSimple(
     address receiverAddress,
     address asset,
     uint256 amount,
     bytes calldata params,
     uint16 referralCode
   ) external override {
-    DataTypes.SimpleFlashloanParams memory flashParams = DataTypes.SimpleFlashloanParams(
+    DataTypes.FlashloanSimpleParams memory flashParams = DataTypes.FlashloanSimpleParams(
       receiverAddress,
       asset,
       amount,
@@ -396,7 +396,7 @@ contract Pool is VersionedInitializable, IPool, PoolStorage {
       _flashLoanPremiumToProtocol,
       _flashLoanPremiumTotal
     );
-    FlashLoanLogic.executeSimpleFlashLoan(_reserves[asset], flashParams);
+    FlashLoanLogic.executeFlashLoanSimple(_reserves[asset], flashParams);
   }
 
   /// @inheritdoc IPool

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -36,7 +36,7 @@ const hardhatConfig: HardhatUserConfig = {
     settings: {
       optimizer: {
         enabled: true,
-        runs: 4000,
+        runs: 100000,
       },
       evmVersion: 'london',
     },