@ensuro/core 2.0.0-beta1 → 2.0.0-beta11

package/contracts/PolicyPoolComponent.sol

@@ -3,19 +3,20 @@ pragma solidity ^0.8.0;
 
 import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {IPolicyPool} from "./interfaces/IPolicyPool.sol";
 import {IPolicyPoolComponent} from "./interfaces/IPolicyPoolComponent.sol";
-import {IPolicyPoolConfig} from "./interfaces/IPolicyPoolConfig.sol";
+import {IAccessManager} from "./interfaces/IAccessManager.sol";
 import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
-import {WadRayMath} from "./WadRayMath.sol";
+import {WadRayMath} from "./dependencies/WadRayMath.sol";
 
 /**
  * @title Base class for PolicyPool components
  * @dev This is the base class of all the components of the protocol that are linked to the PolicyPool and created
  *      after it.
  *      Holds the reference to _policyPool as immutable, also provides access to common admin roles:
- *      - LEVEL1_ROLE: High impact changes like upgrades or other critical operations
- *      - LEVEL2_ROLE: Mid-impact changes like adding new risk modules or changing some parameters
+ *      - LEVEL1_ROLE: High impact changes like upgrades, adding or removing components or other critical operations
+ *      - LEVEL2_ROLE: Mid-impact changes like changing some parameters
  *      - LEVEL3_ROLE: Low-impact changes like changing some parameters up to given percentage (tweaks)
  *      - GUARDIAN_ROLE: For emergency operations oriented to protect the protocol in case of attacks or hacking.
  *
@@ -42,59 +43,83 @@ abstract contract PolicyPoolComponent is
   uint40 internal _lastTweakTimestamp;
   uint56 internal _lastTweakActions; // bitwise map of applied actions
 
-  event GovernanceAction(IPolicyPoolConfig.GovernanceActions indexed action, uint256 value);
-  event ComponentChanged(IPolicyPoolConfig.GovernanceActions indexed action, address value);
+  event GovernanceAction(IAccessManager.GovernanceActions indexed action, uint256 value);
+  event ComponentChanged(IAccessManager.GovernanceActions indexed action, address value);
 
   modifier onlyPolicyPool() {
     require(_msgSender() == address(_policyPool), "The caller must be the PolicyPool");
     _;
   }
 
-  modifier onlyPoolRole3(
-    bytes32 role1,
-    bytes32 role2,
-    bytes32 role3
-  ) {
-    if (!hasPoolRole(role1)) {
-      _policyPool.config().checkRole2(role2, role3, msg.sender);
-    }
+  modifier onlyComponentRole(bytes32 role) {
+    _policyPool.access().checkComponentRole(address(this), role, _msgSender(), false);
     _;
   }
 
-  modifier onlyPoolRole2(bytes32 role1, bytes32 role2) {
-    _policyPool.config().checkRole2(role1, role2, msg.sender);
+  modifier onlyGlobalOrComponentRole(bytes32 role) {
+    _policyPool.access().checkComponentRole(address(this), role, _msgSender(), true);
     _;
   }
 
-  modifier onlyPoolRole(bytes32 role) {
-    _policyPool.config().checkRole(role, msg.sender);
+  modifier onlyGlobalOrComponentRole2(bytes32 role1, bytes32 role2) {
+    _policyPool.access().checkComponentRole2(address(this), role1, role2, _msgSender(), true);
     _;
   }
 
-  modifier onlyComponentRole(bytes32 role) {
-    _policyPool.config().checkComponentRole(address(this), role, msg.sender);
+  modifier onlyGlobalOrComponentRole3(
+    bytes32 role1,
+    bytes32 role2,
+    bytes32 role3
+  ) {
+    IAccessManager access = _policyPool.access();
+    if (!access.hasComponentRole(address(this), role1, _msgSender(), true)) {
+      _policyPool.access().checkComponentRole2(address(this), role2, role3, _msgSender(), true);
+    }
     _;
   }
 
   /// @custom:oz-upgrades-unsafe-allow constructor
   constructor(IPolicyPool policyPool_) {
+    require(
+      address(policyPool_) != address(0),
+      "PolicyPoolComponent: policyPool cannot be zero address"
+    );
+    _disableInitializers();
     _policyPool = policyPool_;
   }
 
   // solhint-disable-next-line func-name-mixedcase
-  function __PolicyPoolComponent_init() internal initializer {
+  function __PolicyPoolComponent_init() internal onlyInitializing {
     __UUPSUpgradeable_init();
     __Pausable_init();
   }
 
-  // solhint-disable-next-line no-empty-blocks
-  function _authorizeUpgrade(address) internal override onlyPoolRole2(GUARDIAN_ROLE, LEVEL1_ROLE) {}
+  function _authorizeUpgrade(address newImpl)
+    internal
+    view
+    override
+    onlyGlobalOrComponentRole2(GUARDIAN_ROLE, LEVEL1_ROLE)
+  {
+    require(
+      IPolicyPoolComponent(newImpl).policyPool() == _policyPool,
+      "Can't upgrade changing the PolicyPool!"
+    );
+  }
 
-  function pause() public onlyPoolRole(GUARDIAN_ROLE) {
+  /**
+   * @dev See {IERC165-supportsInterface}.
+   */
+  function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
+    return
+      interfaceId == type(IERC165).interfaceId ||
+      interfaceId == type(IPolicyPoolComponent).interfaceId;
+  }
+
+  function pause() public onlyGlobalOrComponentRole(GUARDIAN_ROLE) {
     _pause();
   }
 
-  function unpause() public onlyPoolRole2(GUARDIAN_ROLE, LEVEL1_ROLE) {
+  function unpause() public onlyGlobalOrComponentRole2(GUARDIAN_ROLE, LEVEL1_ROLE) {
     _unpause();
   }
 
@@ -107,22 +132,7 @@ abstract contract PolicyPoolComponent is
   }
 
   function hasPoolRole(bytes32 role) internal view returns (bool) {
-    return _policyPool.config().hasRole(role, msg.sender);
-  }
-
-  function _isTweakRay(
-    uint256 oldValue,
-    uint256 newValue,
-    uint256 maxTweak
-  ) internal pure returns (bool) {
-    if (oldValue == newValue) return true;
-    if (oldValue == 0) return maxTweak >= WadRayMath.RAY;
-    if (newValue == 0) return false;
-    if (oldValue < newValue) {
-      return (newValue.rayDiv(oldValue) - WadRayMath.RAY) <= maxTweak;
-    } else {
-      return (WadRayMath.RAY - newValue.rayDiv(oldValue)) <= maxTweak;
-    }
+    return _policyPool.access().hasComponentRole(address(this), role, _msgSender(), true);
   }
 
   function _isTweakWad(
@@ -144,7 +154,7 @@ abstract contract PolicyPoolComponent is
   function _validateParameters() internal view virtual {} // Must be reimplemented with specific validations
 
   function _parameterChanged(
-    IPolicyPoolConfig.GovernanceActions action,
+    IAccessManager.GovernanceActions action,
     uint256 value,
     bool tweak
   ) internal {
@@ -153,7 +163,7 @@ abstract contract PolicyPoolComponent is
     emit GovernanceAction(action, value);
   }
 
-  function _componentChanged(IPolicyPoolConfig.GovernanceActions action, address value) internal {
+  function _componentChanged(IAccessManager.GovernanceActions action, address value) internal {
     _validateParameters();
     emit ComponentChanged(action, value);
   }
@@ -162,7 +172,7 @@ abstract contract PolicyPoolComponent is
     return (_lastTweakTimestamp, _lastTweakActions);
   }
 
-  function _registerTweak(IPolicyPoolConfig.GovernanceActions action) internal {
+  function _registerTweak(IAccessManager.GovernanceActions action) internal {
     uint56 actionBitMap = uint56(1 << (uint8(action) - 1));
     if ((uint40(block.timestamp) - _lastTweakTimestamp) > TWEAK_EXPIRATION) {
       _lastTweakTimestamp = uint40(block.timestamp);
@@ -176,4 +186,11 @@ abstract contract PolicyPoolComponent is
       }
     }
   }
+
+  /**
+   * @dev This empty reserved space is put in place to allow future versions to add new
+   * variables without shifting down storage in the inheritance chain.
+   * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps
+   */
+  uint256[49] private __gap;
 }