@@ -10,6 +10,8 @@ import {IScaledBalanceToken} from '../../../interfaces/IScaledBalanceToken.sol';
1010import {IPriceOracleGetter} from '../../../interfaces/IPriceOracleGetter.sol ' ;
1111import {IAToken} from '../../../interfaces/IAToken.sol ' ;
1212import {IPriceOracleSentinel} from '../../../interfaces/IPriceOracleSentinel.sol ' ;
13+ import {IPoolAddressesProvider} from '../../../interfaces/IPoolAddressesProvider.sol ' ;
14+ import {IAccessControl} from '../../../dependencies/openzeppelin/contracts/IAccessControl.sol ' ;
1315import {ReserveConfiguration} from '../configuration/ReserveConfiguration.sol ' ;
1416import {UserConfiguration} from '../configuration/UserConfiguration.sol ' ;
1517import {Errors} from '../helpers/Errors.sol ' ;
@@ -19,6 +21,7 @@ import {DataTypes} from '../types/DataTypes.sol';
1921import {ReserveLogic} from './ReserveLogic.sol ' ;
2022import {GenericLogic} from './GenericLogic.sol ' ;
2123import {SafeCast} from '../../../dependencies/openzeppelin/contracts/SafeCast.sol ' ;
24+ import {IncentivizedERC20} from '../../tokenization/base/IncentivizedERC20.sol ' ;
2225
2326/**
2427 * @title ReserveLogic library
@@ -49,6 +52,12 @@ library ValidationLogic {
4952 */
5053 uint256 public constant HEALTH_FACTOR_LIQUIDATION_THRESHOLD = 1e18 ;
5154
55+ /**
56+ * @dev Role identifier for the role allowed to supply isolated reserves as collateral
57+ */
58+ bytes32 public constant ISOLATED_COLLATERAL_SUPPLIER_ROLE =
59+ keccak256 ('ISOLATED_COLLATERAL_SUPPLIER ' );
60+
5261 /**
5362 * @notice Validates a supply action.
5463 * @param reserveCache The cached data of the reserve
@@ -664,7 +673,7 @@ library ValidationLogic {
664673 Errors.INCONSISTENT_EMODE_CATEGORY
665674 );
666675
667- //eMode can always be enabled if the user hasn't supplied anything
676+ // eMode can always be enabled if the user hasn't supplied anything
668677 if (userConfig.isEmpty ()) {
669678 return ;
670679 }
@@ -688,10 +697,8 @@ library ValidationLogic {
688697 }
689698
690699 /**
691- * @notice Validates if an asset can be activated as collateral in the following actions: supply, transfer,
692- * set as collateral, mint unbacked, and liquidate
693- * @dev This is used to ensure that the constraints for isolated assets are respected by all the actions that
694- * generate transfers of aTokens
700+ * @notice Validates the action of activating the asset as collateral.
701+ * @dev Only possible if the asset has non-zero LTV and the user is not in isolation mode
695702 * @param reservesData The state of all the reserves
696703 * @param reservesList The addresses of all the active reserves
697704 * @param userConfig the user configuration
@@ -704,11 +711,46 @@ library ValidationLogic {
704711 DataTypes.UserConfigurationMap storage userConfig ,
705712 DataTypes.ReserveConfigurationMap memory reserveConfig
706713 ) internal view returns (bool ) {
714+ if (reserveConfig.getLtv () == 0 ) {
715+ return false ;
716+ }
707717 if (! userConfig.isUsingAsCollateralAny ()) {
708718 return true ;
709719 }
710720 (bool isolationModeActive , , ) = userConfig.getIsolationModeState (reservesData, reservesList);
711721
712722 return (! isolationModeActive && reserveConfig.getDebtCeiling () == 0 );
713723 }
724+
725+ /**
726+ * @notice Validates if an asset should be automatically activated as collateral in the following actions: supply,
727+ * transfer, mint unbacked, and liquidate
728+ * @dev This is used to ensure that isolated assets are not enabled as collateral automatically
729+ * @param reservesData The state of all the reserves
730+ * @param reservesList The addresses of all the active reserves
731+ * @param userConfig the user configuration
732+ * @param reserveConfig The reserve configuration
733+ * @return True if the asset can be activated as collateral, false otherwise
734+ */
735+ function validateAutomaticUseAsCollateral (
736+ mapping (address => DataTypes.ReserveData) storage reservesData ,
737+ mapping (uint256 => address ) storage reservesList ,
738+ DataTypes.UserConfigurationMap storage userConfig ,
739+ DataTypes.ReserveConfigurationMap memory reserveConfig ,
740+ address aTokenAddress
741+ ) internal view returns (bool ) {
742+ if (reserveConfig.getDebtCeiling () != 0 ) {
743+ // ensures only the ISOLATED_COLLATERAL_SUPPLIER_ROLE can enable collateral as side-effect of an action
744+ IPoolAddressesProvider addressesProvider = IncentivizedERC20 (aTokenAddress)
745+ .POOL ()
746+ .ADDRESSES_PROVIDER ();
747+ if (
748+ ! IAccessControl (addressesProvider.getACLManager ()).hasRole (
749+ ISOLATED_COLLATERAL_SUPPLIER_ROLE,
750+ msg .sender
751+ )
752+ ) return false ;
753+ }
754+ return validateUseAsCollateral (reservesData, reservesList, userConfig, reserveConfig);
755+ }
714756}
0 commit comments