fix: Fetch addressesProvider from AToken

bgd-labs · Mar 22, 2023 · 27d2e6e · 27d2e6e
1 parent b252276
commit 27d2e6e
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/contracts/protocol/libraries/logic/BridgeLogic.sol b/contracts/protocol/libraries/logic/BridgeLogic.sol
@@ -56,8 +56,7 @@ library BridgeLogic {
     address asset,
     uint256 amount,
     address onBehalfOf,
-    uint16 referralCode,
-    address addressesProvider
+    uint16 referralCode
   ) external {
     DataTypes.ReserveData storage reserve = reservesData[asset];
     DataTypes.ReserveCache memory reserveCache = reserve.cache();
@@ -89,7 +88,7 @@ library BridgeLogic {
           reservesList,
           userConfig,
           reserveCache.reserveConfiguration,
-          addressesProvider
+          reserveCache.aTokenAddress
         )
       ) {
         userConfig.setUsingAsCollateral(reserve.id, true);

diff --git a/contracts/protocol/libraries/logic/LiquidationLogic.sol b/contracts/protocol/libraries/logic/LiquidationLogic.sol
@@ -305,7 +305,7 @@ library LiquidationLogic {
           reservesList,
           liquidatorConfig,
           collateralReserve.configuration,
-          params.addressesProvider
+          collateralReserve.aTokenAddress
         )
       ) {
         liquidatorConfig.setUsingAsCollateral(collateralReserve.id, true);

diff --git a/contracts/protocol/libraries/logic/SupplyLogic.sol b/contracts/protocol/libraries/logic/SupplyLogic.sol
@@ -80,7 +80,7 @@ library SupplyLogic {
           reservesList,
           userConfig,
           reserveCache.reserveConfiguration,
-          params.addressesProvider
+          reserveCache.aTokenAddress
         )
       ) {
         userConfig.setUsingAsCollateral(reserve.id, true);
@@ -218,7 +218,7 @@ library SupplyLogic {
             reservesList,
             toConfig,
             reserve.configuration,
-            params.addressesProvider
+            reserve.aTokenAddress
           )
         ) {
           toConfig.setUsingAsCollateral(reserveId, true);

diff --git a/contracts/protocol/libraries/logic/ValidationLogic.sol b/contracts/protocol/libraries/logic/ValidationLogic.sol
@@ -21,6 +21,7 @@ import {DataTypes} from '../types/DataTypes.sol';
 import {ReserveLogic} from './ReserveLogic.sol';
 import {GenericLogic} from './GenericLogic.sol';
 import {SafeCast} from '../../../dependencies/openzeppelin/contracts/SafeCast.sol';
+import {IncentivizedERC20} from '../../tokenization/base/IncentivizedERC20.sol';
 
 /**
  * @title ReserveLogic library
@@ -52,9 +53,10 @@ library ValidationLogic {
   uint256 public constant HEALTH_FACTOR_LIQUIDATION_THRESHOLD = 1e18;
 
   /**
-  * @dev Role identifier for the role allowed to supply isolated reserves as collateral
-  */
-  bytes32 public constant ISOLATED_COLLATERAL_SUPPLIER_ROLE = keccak256('ISOLATED_COLLATERAL_SUPPLIER');
+   * @dev Role identifier for the role allowed to supply isolated reserves as collateral
+   */
+  bytes32 public constant ISOLATED_COLLATERAL_SUPPLIER_ROLE =
+    keccak256('ISOLATED_COLLATERAL_SUPPLIER');
 
   /**
    * @notice Validates a supply action.
@@ -734,11 +736,19 @@ library ValidationLogic {
     mapping(uint256 => address) storage reservesList,
     DataTypes.UserConfigurationMap storage userConfig,
     DataTypes.ReserveConfigurationMap memory reserveConfig,
-    address addressesProvider
+    address aTokenAddress
   ) internal view returns (bool) {
     if (reserveConfig.getDebtCeiling() != 0) {
       // ensures only the ISOLATED_COLLATERAL_SUPPLIER_ROLE can enable collateral as side-effect of an action
-      if(!IAccessControl(IPoolAddressesProvider(addressesProvider).getACLManager()).hasRole(ISOLATED_COLLATERAL_SUPPLIER_ROLE, msg.sender)) return false;
+      IPoolAddressesProvider addressesProvider = IncentivizedERC20(aTokenAddress)
+        .POOL()
+        .ADDRESSES_PROVIDER();
+      if (
+        !IAccessControl(addressesProvider.getACLManager()).hasRole(
+          ISOLATED_COLLATERAL_SUPPLIER_ROLE,
+          msg.sender
+        )
+      ) return false;
     }
     return validateUseAsCollateral(reservesData, reservesList, userConfig, reserveConfig);
   }

diff --git a/contracts/protocol/libraries/types/DataTypes.sol b/contracts/protocol/libraries/types/DataTypes.sol
@@ -113,15 +113,13 @@ library DataTypes {
     address priceOracle;
     uint8 userEModeCategory;
     address priceOracleSentinel;
-    address addressesProvider;
   }
 
   struct ExecuteSupplyParams {
     address asset;
     uint256 amount;
     address onBehalfOf;
     uint16 referralCode;
-    address addressesProvider;
   }
 
   struct ExecuteBorrowParams {
@@ -172,7 +170,6 @@ library DataTypes {
     uint256 reservesCount;
     address oracle;
     uint8 fromEModeCategory;
-    address addressesProvider;
   }
 
   struct FlashloanParams {

diff --git a/contracts/protocol/pool/Pool.sol b/contracts/protocol/pool/Pool.sol
@@ -127,8 +127,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
       asset,
       amount,
       onBehalfOf,
-      referralCode,
-      address(ADDRESSES_PROVIDER)
+      referralCode
     );
   }
 
@@ -157,8 +156,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
         asset: asset,
         amount: amount,
         onBehalfOf: onBehalfOf,
-        referralCode: referralCode,
-        addressesProvider: address(ADDRESSES_PROVIDER)
+        referralCode: referralCode
       })
     );
   }
@@ -191,8 +189,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
         asset: asset,
         amount: amount,
         onBehalfOf: onBehalfOf,
-        referralCode: referralCode,
-        addressesProvider: address(ADDRESSES_PROVIDER)
+        referralCode: referralCode
       })
     );
   }
@@ -383,8 +380,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
         receiveAToken: receiveAToken,
         priceOracle: ADDRESSES_PROVIDER.getPriceOracle(),
         userEModeCategory: _usersEModeCategory[user],
-        priceOracleSentinel: ADDRESSES_PROVIDER.getPriceOracleSentinel(),
-        addressesProvider: address(ADDRESSES_PROVIDER)
+        priceOracleSentinel: ADDRESSES_PROVIDER.getPriceOracleSentinel()
       })
     );
   }
@@ -612,8 +608,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
         balanceToBefore: balanceToBefore,
         reservesCount: _reservesCount,
         oracle: ADDRESSES_PROVIDER.getPriceOracle(),
-        fromEModeCategory: _usersEModeCategory[from],
-        addressesProvider: address(ADDRESSES_PROVIDER)
+        fromEModeCategory: _usersEModeCategory[from]
       })
     );
   }
@@ -772,8 +767,7 @@ contract Pool is VersionedInitializable, PoolStorage, IPool {
         asset: asset,
         amount: amount,
         onBehalfOf: onBehalfOf,
-        referralCode: referralCode,
-        addressesProvider: address(ADDRESSES_PROVIDER)
+        referralCode: referralCode
       })
     );
   }