@ensuro/core 2.0.0-beta6 → 2.0.0-beta8

package/contracts/PolicyPool.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {AddressUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
 import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IAccessManager} from "./interfaces/IAccessManager.sol";
 import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
@@ -13,7 +14,6 @@ import {IPolicyPool} from "./interfaces/IPolicyPool.sol";
 import {IRiskModule} from "./interfaces/IRiskModule.sol";
 import {IPolicyPoolComponent} from "./interfaces/IPolicyPoolComponent.sol";
 import {IEToken} from "./interfaces/IEToken.sol";
-import {IPolicyNFT} from "./interfaces/IPolicyNFT.sol";
 import {IPolicyHolder} from "./interfaces/IPolicyHolder.sol";
 import {Policy} from "./Policy.sol";
 import {WadRayMath} from "./WadRayMath.sol";
@@ -29,7 +29,7 @@ import {WadRayMath} from "./WadRayMath.sol";
  * @custom:security-contact security@ensuro.co
  * @author Ensuro
  */
-contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
+contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable, ERC721Upgradeable {
   using EnumerableSet for EnumerableSet.AddressSet;
   using WadRayMath for uint256;
   using Policy for Policy.PolicyData;
@@ -44,29 +44,52 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
   IAccessManager internal immutable _access;
   /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
   IERC20Metadata internal immutable _currency;
-  /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
-  IPolicyNFT internal immutable _policyNFT;
 
   address internal _treasury; // address of Ensuro treasury
 
   enum ComponentStatus {
-    inactive, // doesn't exists - All operations rejected
-    active, // deposit / withdraw / lockScr / unlockScr / newPolicy / resolvePolicy OK
-    deprecated, // withdraw OK, unlockScr OK, deposit rejected, no new policies
-    suspended // all operations temporarily rejected
+    /**
+     * @dev inactive status = 0 means the component doesn't exists - All operations rejected
+     */
+    inactive,
+    /**
+     * @dev active means the component is fully functional, all the component operations are allowed.
+     *      deposit / withdraw for eTokens
+     *      newPolicy / resolvePolicy for riskModules
+     *      policyCreated / policyExpired / policyResolvedWithPayout for premiumsAccount
+     */
+    active,
+    /**
+     * @dev deprecated means the component is in process of being deactivated. Only some operations are allowed:
+     *      withdraw for eTokens
+     *      resolvePolicy / expirePolicy for riskModules
+     *      policyExpired / policyResolvedWithPayout for premiumsAccount
+     */
+    deprecated,
+    /**
+     * @dev suspended means the component is temporarily deactivated. All the operations are rejected. Only GUARDIAN
+     *      can suspend.
+     */
+    suspended
+  }
+
+  enum ComponentKind {
+    unknown,
+    eToken,
+    riskModule,
+    premiumsAccount
+  }
+
+  struct Component {
+    ComponentStatus status;
+    ComponentKind kind;
   }
 
   /**
-   * @dev Mapping of installed eTokens (see {EToken}) in the PolicyPool. For each one it keep an state
-   * {ComponentStatus}.
-   */
-  mapping(IEToken => ComponentStatus) private _eTokens;
-
-  /**
-   * @dev Mapping of installed risk modules (see {RiskModule}) in the PolicyPool. For each one it keep an state
-   * {ComponentStatus}.
+   * @dev Mapping of installed components (see {EToken}, {RiskModule}, {PremiumsAccount}) in the PolicyPool.
+   * For each one it keep an state {ComponentStatus}.
    */
-  mapping(IRiskModule => ComponentStatus) private _riskModules;
+  mapping(IPolicyPoolComponent => Component) private _components;
 
   /**
    * @dev Mapping that stores the active policies (the policyId is the key). It just saves the hash of the policies,
@@ -87,25 +110,23 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
   event PolicyResolved(IRiskModule indexed riskModule, uint256 indexed policyId, uint256 payout);
 
   /**
-   * @dev Event emitted when a new eToken is added to the pool or the status changes. See {ComponentStatus}.
-   */
-  event ETokenStatusChanged(IEToken indexed eToken, ComponentStatus newStatus);
-
-  /**
-   * @dev Event emitted when a new RiskModule is added to the pool or the status changes. See {ComponentStatus}.
+   * @dev Event emitted when the treasury changes
    */
-  event RiskModuleStatusChanged(IRiskModule indexed riskModule, ComponentStatus newStatus);
+  event ComponentChanged(IAccessManager.GovernanceActions indexed action, address value);
 
   /**
-   * @dev Event emitted when a new PremiumsAccount is added to the pool or the status changes. TODO
+   * @dev Event emitted when a new component added/removed to the pool or the status changes.
+   *
+   * @param component The address of the component, it can be an {EToken}, {RiskModule} or {PremiumsAccount}
+   * @param kind Value indicating the kind of component. See {ComponentKind}
+   * @param newStatus The status of the component after the operation. See {ComponentStatus}
    */
-  event PremiumsAccountStatusChanged(
-    IPremiumsAccount indexed premiumsAccount,
+  event ComponentStatusChanged(
+    IPolicyPoolComponent indexed component,
+    ComponentKind kind,
     ComponentStatus newStatus
   );
 
-  event ComponentChanged(IAccessManager.GovernanceActions indexed action, address value);
-
   modifier onlyRole(bytes32 role) {
     _access.checkRole(role, msg.sender);
     _;
@@ -117,25 +138,24 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
   }
 
   /// @custom:oz-upgrades-unsafe-allow constructor
-  constructor(
-    IAccessManager access_,
-    IPolicyNFT policyNFT_,
-    IERC20Metadata currency_
-  ) {
+  constructor(IAccessManager access_, IERC20Metadata currency_) {
     _access = access_;
-    _policyNFT = policyNFT_;
     _currency = currency_;
   }
 
-  function initialize(address treasury_) public initializer {
+  function initialize(
+    string memory name_,
+    string memory symbol_,
+    address treasury_
+  ) public initializer {
     __UUPSUpgradeable_init();
+    __ERC721_init(name_, symbol_);
     __Pausable_init();
     __PolicyPool_init_unchained(treasury_);
   }
 
   // solhint-disable-next-line func-name-mixedcase
   function __PolicyPool_init_unchained(address treasury_) internal initializer {
-    _policyNFT.connect();
     _treasury = treasury_;
   }
 
@@ -158,10 +178,6 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
     return _currency;
   }
 
-  function policyNFT() external view virtual override returns (address) {
-    return address(_policyNFT);
-  }
-
   function setTreasury(address treasury_) external onlyRole(LEVEL1_ROLE) {
     _treasury = treasury_;
     emit ComponentChanged(IAccessManager.GovernanceActions.setTreasury, _treasury);
@@ -171,106 +187,103 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
     return _treasury;
   }
 
-  function addEToken(IEToken eToken) external onlyRole(LEVEL1_ROLE) {
-    ComponentStatus status = _eTokens[eToken];
-    require(status == ComponentStatus.inactive, "eToken already in the pool");
-    require(
-      IPolicyPoolComponent(address(eToken)).policyPool() == this,
-      "EToken not linked to this pool"
-    );
-
-    _eTokens[eToken] = ComponentStatus.active;
-    emit ETokenStatusChanged(eToken, ComponentStatus.active);
+  function addComponent(IPolicyPoolComponent component, ComponentKind kind)
+    external
+    onlyRole(LEVEL1_ROLE)
+  {
+    Component storage comp = _components[component];
+    require(comp.status == ComponentStatus.inactive, "Component already in the pool");
+    require(component.policyPool() == this, "Component not linked to this pool");
+
+    comp.status = ComponentStatus.active;
+    comp.kind = kind;
+    if (kind == ComponentKind.premiumsAccount) {
+      IPremiumsAccount pa = IPremiumsAccount(address(component));
+      IEToken etk = pa.juniorEtk();
+      if (address(etk) != address(0)) {
+        etk.addBorrower(address(pa));
+      }
+      etk = pa.seniorEtk();
+      if (address(etk) != address(0)) {
+        etk.addBorrower(address(pa));
+      }
+    }
+    emit ComponentStatusChanged(component, kind, ComponentStatus.active);
   }
 
-  function removeEToken(IEToken eToken) external onlyRole(LEVEL3_ROLE) {
-    ComponentStatus status = _eTokens[eToken];
-    require(status == ComponentStatus.deprecated, "EToken not deprecated");
-    require(eToken.totalSupply() == 0, "EToken has liquidity, can't be removed");
-    delete _eTokens[eToken];
-    emit ETokenStatusChanged(eToken, ComponentStatus.inactive);
+  function removeComponent(IPolicyPoolComponent component) external onlyRole(LEVEL1_ROLE) {
+    Component storage comp = _components[component];
+    require(comp.status == ComponentStatus.deprecated, "Component not deprecated");
+    if (comp.kind == ComponentKind.eToken) {
+      require(
+        IEToken(address(component)).totalSupply() == 0,
+        "EToken has liquidity, can't be removed"
+      );
+    } else if (comp.kind == ComponentKind.riskModule) {
+      require(
+        IRiskModule(address(component)).activeExposure() == 0,
+        "Can't remove a module with active policies"
+      );
+    } else if (comp.kind == ComponentKind.premiumsAccount) {
+      IPremiumsAccount pa = IPremiumsAccount(address(component));
+      require(pa.purePremiums() == 0, "Can't remove a PremiumsAccount with premiums");
+      IEToken etk = pa.juniorEtk();
+      if (address(etk) != address(0)) {
+        etk.removeBorrower(address(pa));
+      }
+      etk = pa.seniorEtk();
+      if (address(etk) != address(0)) {
+        etk.removeBorrower(address(pa));
+      }
+    }
+    emit ComponentStatusChanged(component, comp.kind, ComponentStatus.inactive);
+    delete _components[component];
   }
 
-  function changeETokenStatus(IEToken eToken, ComponentStatus newStatus)
+  function changeComponentStatus(IPolicyPoolComponent component, ComponentStatus newStatus)
     external
     onlyRole2(GUARDIAN_ROLE, LEVEL1_ROLE)
   {
-    ComponentStatus status = _eTokens[eToken];
-    require(status != ComponentStatus.inactive, "EToken not found");
+    Component storage comp = _components[component];
+    require(comp.status != ComponentStatus.inactive, "Component not found");
     require(
       (newStatus == ComponentStatus.active && _access.hasRole(LEVEL1_ROLE, msg.sender)) ||
         (newStatus == ComponentStatus.suspended && _access.hasRole(GUARDIAN_ROLE, msg.sender)) ||
         (newStatus == ComponentStatus.deprecated && _access.hasRole(LEVEL1_ROLE, msg.sender)),
       "Only GUARDIAN can suspend / Only LEVEL1 can activate/deprecate"
     );
-    _eTokens[eToken] = newStatus;
-    emit ETokenStatusChanged(eToken, newStatus);
-  }
-
-  function getETokenStatus(IEToken eToken) external view returns (ComponentStatus) {
-    return _eTokens[eToken];
-  }
-
-  function addRiskModule(IRiskModule riskModule) external onlyRole(LEVEL1_ROLE) {
-    require(
-      _riskModules[riskModule] == ComponentStatus.inactive,
-      "Risk Module already in the pool"
-    );
-    require(
-      IPolicyPoolComponent(address(riskModule)).policyPool() == this,
-      "RiskModule not linked to this pool"
-    );
-    _riskModules[riskModule] = ComponentStatus.active;
-    emit RiskModuleStatusChanged(riskModule, ComponentStatus.active);
-  }
-
-  function removeRiskModule(IRiskModule riskModule) external onlyRole(LEVEL2_ROLE) {
-    require(_riskModules[riskModule] != ComponentStatus.inactive, "Risk Module not found");
-    require(riskModule.activeExposure() == 0, "Can't remove a module with active policies");
-    delete _riskModules[riskModule];
-    emit RiskModuleStatusChanged(riskModule, ComponentStatus.inactive);
+    comp.status = newStatus;
+    emit ComponentStatusChanged(component, comp.kind, newStatus);
   }
 
-  function changeRiskModuleStatus(IRiskModule riskModule, ComponentStatus newStatus)
+  function getComponentStatus(IPolicyPoolComponent component)
     external
-    onlyRole2(GUARDIAN_ROLE, LEVEL1_ROLE)
+    view
+    returns (ComponentStatus)
   {
-    require(_riskModules[riskModule] != ComponentStatus.inactive, "Risk Module not found");
-    require(
-      (newStatus == ComponentStatus.active && _access.hasRole(LEVEL1_ROLE, msg.sender)) ||
-        (newStatus == ComponentStatus.suspended && _access.hasRole(GUARDIAN_ROLE, msg.sender)) ||
-        (newStatus == ComponentStatus.deprecated && _access.hasRole(LEVEL1_ROLE, msg.sender)),
-      "Only GUARDIAN can suspend / Only LEVEL1 can activate/deprecate"
-    );
-    _riskModules[riskModule] = newStatus;
-    emit RiskModuleStatusChanged(riskModule, newStatus);
+    return _components[component].status;
   }
 
-  function getRiskModuleStatus(IRiskModule riskModule) external view returns (ComponentStatus) {
-    return _riskModules[riskModule];
+  function _etkStatus(IEToken eToken) internal view returns (ComponentStatus) {
+    Component storage comp = _components[IPolicyPoolComponent(address(eToken))];
+    require(comp.kind == ComponentKind.eToken, "Component is not an eToken");
+    return comp.status;
   }
 
-  function addPremiumsAccount(IPremiumsAccount pa) external onlyRole(LEVEL1_ROLE) {
-    // TODO: keep PremiumsAccount status?
-    require(
-      IPolicyPoolComponent(address(pa)).policyPool() == this,
-      "PremiumsAccount not linked to this pool"
-    );
-    IEToken etk = pa.juniorEtk();
-    if (address(etk) != address(0)) {
-      etk.addBorrower(address(pa));
-    }
-    etk = pa.seniorEtk();
-    if (address(etk) != address(0)) {
-      etk.addBorrower(address(pa));
-    }
-    emit PremiumsAccountStatusChanged(pa, ComponentStatus.active);
-    // TODO: functions for deactivating premiumsAccount (and remove them as borrower)
+  function _rmStatus(IRiskModule riskModule) internal view returns (ComponentStatus) {
+    Component storage comp = _components[IPolicyPoolComponent(address(riskModule))];
+    require(comp.kind == ComponentKind.riskModule, "Component is not a RiskModule");
+    return comp.status;
+  }
+
+  function _paStatus(IPremiumsAccount premiumsAccount) internal view returns (ComponentStatus) {
+    Component storage comp = _components[IPolicyPoolComponent(address(premiumsAccount))];
+    require(comp.kind == ComponentKind.premiumsAccount, "Component is not a PremiumsAccount");
+    return comp.status;
   }
 
   function deposit(IEToken eToken, uint256 amount) external override whenNotPaused {
-    ComponentStatus etkStatus = _eTokens[eToken];
-    require(etkStatus == ComponentStatus.active, "eToken is not active");
+    require(_etkStatus(eToken) == ComponentStatus.active, "eToken is not active");
     _currency.safeTransferFrom(msg.sender, address(eToken), amount);
     eToken.deposit(msg.sender, amount);
   }
@@ -281,7 +294,7 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
     whenNotPaused
     returns (uint256)
   {
-    ComponentStatus etkStatus = _eTokens[eToken];
+    ComponentStatus etkStatus = _etkStatus(eToken);
     require(
       etkStatus == ComponentStatus.active || etkStatus == ComponentStatus.deprecated,
       "eToken not found or withdraws not allowed"
@@ -292,27 +305,27 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
 
   function newPolicy(
     Policy.PolicyData memory policy,
-    address customer,
+    address payer,
+    address policyHolder,
     uint96 internalId
   ) external override whenNotPaused returns (uint256) {
     IRiskModule rm = policy.riskModule;
     require(address(rm) == msg.sender, "Only the RM can create new policies");
-    require(_riskModules[rm] == ComponentStatus.active, "RM module not found or not active");
+    require(_rmStatus(rm) == ComponentStatus.active, "RM module not found or not active");
     policy.id = (uint256(uint160(address(rm))) << 96) + internalId;
     _policies[policy.id] = policy.hash();
     IPremiumsAccount pa = rm.premiumsAccount();
+    require(_paStatus(pa) == ComponentStatus.active, "PremiumsAccount not found or not active");
     pa.policyCreated(policy);
-    _policyNFT.safeMint(customer, policy.id);
+    _safeMint(policyHolder, policy.id, "");
 
     // Distribute the premium
-    _currency.safeTransferFrom(customer, address(pa), policy.purePremium);
-    if (policy.srCoc > 0)
-      _currency.safeTransferFrom(customer, address(pa.seniorEtk()), policy.srCoc);
-    if (policy.jrCoc > 0)
-      _currency.safeTransferFrom(customer, address(pa.juniorEtk()), policy.jrCoc);
-    _currency.safeTransferFrom(customer, _treasury, policy.ensuroCommission);
-    if (policy.partnerCommission > 0 && customer != rm.wallet())
-      _currency.safeTransferFrom(customer, rm.wallet(), policy.partnerCommission);
+    _currency.safeTransferFrom(payer, address(pa), policy.purePremium);
+    if (policy.srCoc > 0) _currency.safeTransferFrom(payer, address(pa.seniorEtk()), policy.srCoc);
+    if (policy.jrCoc > 0) _currency.safeTransferFrom(payer, address(pa.juniorEtk()), policy.jrCoc);
+    _currency.safeTransferFrom(payer, _treasury, policy.ensuroCommission);
+    if (policy.partnerCommission > 0 && payer != rm.wallet())
+      _currency.safeTransferFrom(payer, rm.wallet(), policy.partnerCommission);
     // TODO: this code does up to 5 ERC20 transfers. How we can avoid this? Delayed transfers?
 
     emit NewPolicy(rm, policy);
@@ -365,19 +378,26 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
     IRiskModule rm = policy.riskModule;
     require(expired || address(rm) == msg.sender, "Only the RM can resolve policies");
     require(payout == 0 || policy.expiration > block.timestamp, "Can't pay expired policy");
+    ComponentStatus compStatus = _rmStatus(rm);
     require(
-      _riskModules[rm] == ComponentStatus.active || _riskModules[rm] == ComponentStatus.deprecated,
+      compStatus == ComponentStatus.active || compStatus == ComponentStatus.deprecated,
       "Module must be active or deprecated to process resolutions"
     );
     require(payout <= policy.payout, "payout > policy.payout");
 
     bool customerWon = payout > 0;
 
+    IPremiumsAccount pa = rm.premiumsAccount();
+    compStatus = _paStatus(pa);
+    require(
+      compStatus == ComponentStatus.active || compStatus == ComponentStatus.deprecated,
+      "PremiumsAccount must be active or deprecated to process resolutions"
+    );
     if (customerWon) {
-      address policyOwner = _policyNFT.ownerOf(policy.id);
-      rm.premiumsAccount().policyResolvedWithPayout(policyOwner, policy, payout);
+      address policyOwner = ownerOf(policy.id);
+      pa.policyResolvedWithPayout(policyOwner, policy, payout);
     } else {
-      rm.premiumsAccount().policyExpired(policy);
+      pa.policyExpired(policy);
     }
 
     rm.releaseExposure(policy.payout);
@@ -396,7 +416,7 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
    * contract explicitly reverts. Doesn't reverts is the callback is not implemented.
    */
   function _notifyPayout(uint256 policyId, uint256 payout) internal {
-    address customer = _policyNFT.ownerOf(policyId);
+    address customer = ownerOf(policyId);
     if (!AddressUpgradeable.isContract(customer)) return;
     try
       IPolicyHolder(customer).onPayoutReceived(_msgSender(), address(this), policyId, payout)
@@ -421,7 +441,7 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
    * @dev Notifies the expiration with a callback if the policyholder is a contract. Never reverts.
    */
   function _notifyExpiration(uint256 policyId) internal {
-    address customer = _policyNFT.ownerOf(policyId);
+    address customer = ownerOf(policyId);
     if (!AddressUpgradeable.isContract(customer)) return;
     try IPolicyHolder(customer).onPolicyExpired(_msgSender(), address(this), policyId) returns (
       bytes4

package/contracts/PolicyPoolComponent.sol

@@ -50,29 +50,30 @@ abstract contract PolicyPoolComponent is
     _;
   }
 
-  modifier onlyPoolRole3(
-    bytes32 role1,
-    bytes32 role2,
-    bytes32 role3
-  ) {
-    if (!hasPoolRole(role1)) {
-      _policyPool.access().checkRole2(role2, role3, msg.sender);
-    }
+  modifier onlyComponentRole(bytes32 role) {
+    _policyPool.access().checkComponentRole(address(this), role, msg.sender, false);
     _;
   }
 
-  modifier onlyPoolRole2(bytes32 role1, bytes32 role2) {
-    _policyPool.access().checkRole2(role1, role2, msg.sender);
+  modifier onlyGlobalOrComponentRole(bytes32 role) {
+    _policyPool.access().checkComponentRole(address(this), role, msg.sender, true);
     _;
   }
 
-  modifier onlyPoolRole(bytes32 role) {
-    _policyPool.access().checkRole(role, msg.sender);
+  modifier onlyGlobalOrComponentRole2(bytes32 role1, bytes32 role2) {
+    _policyPool.access().checkComponentRole2(address(this), role1, role2, msg.sender, true);
     _;
   }
 
-  modifier onlyComponentRole(bytes32 role) {
-    _policyPool.access().checkComponentRole(address(this), role, msg.sender);
+  modifier onlyGlobalOrComponentRole3(
+    bytes32 role1,
+    bytes32 role2,
+    bytes32 role3
+  ) {
+    IAccessManager access = _policyPool.access();
+    if (!access.hasComponentRole(address(this), role1, msg.sender, true)) {
+      _policyPool.access().checkComponentRole2(address(this), role2, role3, msg.sender, true);
+    }
     _;
   }
 
@@ -87,14 +88,23 @@ abstract contract PolicyPoolComponent is
     __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) {
+  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,7 +117,7 @@ abstract contract PolicyPoolComponent is
   }
 
   function hasPoolRole(bytes32 role) internal view returns (bool) {
-    return _policyPool.access().hasRole(role, msg.sender);
+    return _policyPool.access().hasComponentRole(address(this), role, msg.sender, true);
   }
 
   function _isTweakRay(