@ensuro/core 2.0.0-beta2 → 2.0.0-beta5

package/build/contracts/mocks/PolicyPoolMock.sol/PolicyPoolMockForward.json

@@ -16,8 +16,8 @@
           "type": "address"
         },
         {
-          "internalType": "contract IPolicyPoolConfig",
-          "name": "config_",
+          "internalType": "contract IAccessManager",
+          "name": "access_",
           "type": "address"
         }
       ],
@@ -43,10 +43,10 @@
     },
     {
       "inputs": [],
-      "name": "config",
+      "name": "access",
       "outputs": [
         {
-          "internalType": "contract IPolicyPoolConfig",
+          "internalType": "contract IAccessManager",
           "name": "",
           "type": "address"
         }
@@ -85,8 +85,8 @@
       "type": "receive"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b506040516102e83803806102e883398101604081905261002f916100bd565b600080546001600160a01b038086166001600160a01b031992831617835560018054868316908416179055600280549185169190921681179091556040805163948cb71960e01b81529051919263948cb7199260048084019382900301818387803b15801561009d57600080fd5b505af11580156100b1573d6000803e3d6000fd5b50505050505050610122565b6000806000606084860312156100d257600080fd5b83516100dd8161010a565b60208501519093506100ee8161010a565b60408501519092506100ff8161010a565b809150509250925092565b6001600160a01b038116811461011f57600080fd5b50565b6101b7806101316000396000f3fe6080604052600436106100435760003560e01c8063098d32281461005a57806379502c5514610083578063d4b27001146100b5578063e5a6b10f146100f257610052565b3661005257610050610110565b005b610050610110565b34801561006657600080fd5b5061007060001981565b6040519081526020015b60405180910390f35b34801561008f57600080fd5b506002546001600160a01b03165b6040516001600160a01b03909116815260200161007a565b3480156100c157600080fd5b506100506100d0366004610151565b600080546001600160a01b0319166001600160a01b0392909216919091179055565b3480156100fe57600080fd5b506001546001600160a01b031661009d565b61012a6101256000546001600160a01b031690565b61012c565b565b366000803760008036600080855af13d6000803e80801561014c573d6000f35b3d6000fd5b60006020828403121561016357600080fd5b81356001600160a01b038116811461017a57600080fd5b939250505056fea2646970667358221220e6192b34ccc4edb74a04897a74de4040f67b7ccaf7f930d6a713d7781890b97b64736f6c63430008060033",
-  "deployedBytecode": "0x6080604052600436106100435760003560e01c8063098d32281461005a57806379502c5514610083578063d4b27001146100b5578063e5a6b10f146100f257610052565b3661005257610050610110565b005b610050610110565b34801561006657600080fd5b5061007060001981565b6040519081526020015b60405180910390f35b34801561008f57600080fd5b506002546001600160a01b03165b6040516001600160a01b03909116815260200161007a565b3480156100c157600080fd5b506100506100d0366004610151565b600080546001600160a01b0319166001600160a01b0392909216919091179055565b3480156100fe57600080fd5b506001546001600160a01b031661009d565b61012a6101256000546001600160a01b031690565b61012c565b565b366000803760008036600080855af13d6000803e80801561014c573d6000f35b3d6000fd5b60006020828403121561016357600080fd5b81356001600160a01b038116811461017a57600080fd5b939250505056fea2646970667358221220e6192b34ccc4edb74a04897a74de4040f67b7ccaf7f930d6a713d7781890b97b64736f6c63430008060033",
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161029c38038061029c83398101604081905261002f91610071565b600080546001600160a01b039485166001600160a01b0319918216179091556001805493851693821693909317909255600280549190931691161790556100d6565b60008060006060848603121561008657600080fd5b8351610091816100be565b60208501519093506100a2816100be565b60408501519092506100b3816100be565b809150509250925092565b6001600160a01b03811681146100d357600080fd5b50565b6101b7806100e56000396000f3fe6080604052600436106100435760003560e01c8063098d32281461005a57806371907f1714610083578063d4b27001146100b5578063e5a6b10f146100f257610052565b3661005257610050610110565b005b610050610110565b34801561006657600080fd5b5061007060001981565b6040519081526020015b60405180910390f35b34801561008f57600080fd5b506002546001600160a01b03165b6040516001600160a01b03909116815260200161007a565b3480156100c157600080fd5b506100506100d0366004610151565b600080546001600160a01b0319166001600160a01b0392909216919091179055565b3480156100fe57600080fd5b506001546001600160a01b031661009d565b61012a6101256000546001600160a01b031690565b61012c565b565b366000803760008036600080855af13d6000803e80801561014c573d6000f35b3d6000fd5b60006020828403121561016357600080fd5b81356001600160a01b038116811461017a57600080fd5b939250505056fea2646970667358221220d557744d7b910fc7fa89da179a00dcce31a4dc9474da1b42f972c509d050b83364736f6c63430008060033",
+  "deployedBytecode": "0x6080604052600436106100435760003560e01c8063098d32281461005a57806371907f1714610083578063d4b27001146100b5578063e5a6b10f146100f257610052565b3661005257610050610110565b005b610050610110565b34801561006657600080fd5b5061007060001981565b6040519081526020015b60405180910390f35b34801561008f57600080fd5b506002546001600160a01b03165b6040516001600160a01b03909116815260200161007a565b3480156100c157600080fd5b506100506100d0366004610151565b600080546001600160a01b0319166001600160a01b0392909216919091179055565b3480156100fe57600080fd5b506001546001600160a01b031661009d565b61012a6101256000546001600160a01b031690565b61012c565b565b366000803760008036600080855af13d6000803e80801561014c573d6000f35b3d6000fd5b60006020828403121561016357600080fd5b81356001600160a01b038116811461017a57600080fd5b939250505056fea2646970667358221220d557744d7b910fc7fa89da179a00dcce31a4dc9474da1b42f972c509d050b83364736f6c63430008060033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/contracts/AccessManager.sol

@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
+import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import {IAccessManager} from "./interfaces/IAccessManager.sol";
+
+/**
+ * @title AccessManager - Protocol access roles
+ * @dev Contract that holds the access roles for PolicyPool and other components of the protocol.
+ * @custom:security-contact security@ensuro.co
+ * @author Ensuro
+ */
+contract AccessManager is Initializable, AccessControlUpgradeable, UUPSUpgradeable, IAccessManager {
+  // Core governance roles
+  bytes32 public constant GUARDIAN_ROLE = keccak256("GUARDIAN_ROLE");
+  bytes32 public constant LEVEL1_ROLE = keccak256("LEVEL1_ROLE");
+  bytes32 public constant LEVEL2_ROLE = keccak256("LEVEL2_ROLE");
+  bytes32 public constant LEVEL3_ROLE = keccak256("LEVEL3_ROLE");
+
+  modifier onlyRole2(bytes32 role1, bytes32 role2) {
+    if (!hasRole(role1, _msgSender())) _checkRole(role2, _msgSender());
+    _;
+  }
+
+  function initialize() public initializer {
+    __AccessControl_init();
+    __UUPSUpgradeable_init();
+    __AccessManager_init_unchained();
+  }
+
+  // solhint-disable-next-line func-name-mixedcase
+  function __AccessManager_init_unchained() internal initializer {
+    _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
+  }
+
+  // solhint-disable-next-line no-empty-blocks
+  function _authorizeUpgrade(address) internal override onlyRole2(GUARDIAN_ROLE, LEVEL1_ROLE) {}
+
+  function getComponentRole(address component, bytes32 role) public pure returns (bytes32) {
+    return bytes32(bytes20(component)) ^ role;
+  }
+
+  function checkComponentRole(
+    address component,
+    bytes32 role,
+    address account
+  ) external view override {
+    _checkRole(getComponentRole(component, role), account);
+  }
+
+  function grantComponentRole(
+    address component,
+    bytes32 role,
+    address account
+  ) external onlyRole(getRoleAdmin(getComponentRole(component, role))) {
+    _grantRole(getComponentRole(component, role), account);
+  }
+
+  function checkRole(bytes32 role, address account) external view override {
+    _checkRole(role, account);
+  }
+
+  function checkRole2(
+    bytes32 role1,
+    bytes32 role2,
+    address account
+  ) external view override {
+    if (!hasRole(role1, account)) _checkRole(role2, account);
+  }
+}

package/contracts/EToken.sol

@@ -6,7 +6,7 @@ import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol
 import {IPolicyPool} from "./interfaces/IPolicyPool.sol";
 import {Reserve} from "./Reserve.sol";
 import {IEToken} from "./interfaces/IEToken.sol";
-import {IPolicyPoolConfig} from "./interfaces/IPolicyPoolConfig.sol";
+import {IAccessManager} from "./interfaces/IAccessManager.sol";
 import {IPolicyPoolComponent} from "./interfaces/IPolicyPoolComponent.sol";
 import {ILPWhitelist} from "./interfaces/ILPWhitelist.sol";
 import {WadRayMath} from "./WadRayMath.sol";
@@ -634,11 +634,7 @@ contract EToken is Reserve, IERC20Metadata, IEToken {
     // loan. Since it's a permissioned call, I'm ok with this. If a caller wants to reduce the impact, it can
     // issue 1 wei repayLoan to each active loan, forcing the update of the scales
     _params.internalLoanInterestRate = uint16(newRate / 1e14);
-    _parameterChanged(
-      IPolicyPoolConfig.GovernanceActions.setInternalLoanInterestRate,
-      newRate,
-      tweak
-    );
+    _parameterChanged(IAccessManager.GovernanceActions.setInternalLoanInterestRate, newRate, tweak);
   }
 
   function setLiquidityRequirement(uint256 newRate)
@@ -651,7 +647,7 @@ contract EToken is Reserve, IERC20Metadata, IEToken {
       "Tweak exceeded: liquidityRequirement tweaks only up to 10%"
     );
     _params.liquidityRequirement = uint16(newRate / 1e14);
-    _parameterChanged(IPolicyPoolConfig.GovernanceActions.setLiquidityRequirement, newRate, tweak);
+    _parameterChanged(IAccessManager.GovernanceActions.setLiquidityRequirement, newRate, tweak);
   }
 
   function setMaxUtilizationRate(uint256 newRate) external onlyPoolRole2(LEVEL2_ROLE, LEVEL3_ROLE) {
@@ -661,7 +657,7 @@ contract EToken is Reserve, IERC20Metadata, IEToken {
       "Tweak exceeded: maxUtilizationRate tweaks only up to 30%"
     );
     _params.maxUtilizationRate = uint16(newRate / 1e14);
-    _parameterChanged(IPolicyPoolConfig.GovernanceActions.setMaxUtilizationRate, newRate, tweak);
+    _parameterChanged(IAccessManager.GovernanceActions.setMaxUtilizationRate, newRate, tweak);
   }
 
   function setMinUtilizationRate(uint256 newRate) external onlyPoolRole2(LEVEL2_ROLE, LEVEL3_ROLE) {
@@ -671,7 +667,7 @@ contract EToken is Reserve, IERC20Metadata, IEToken {
       "Tweak exceeded: minUtilizationRate tweaks only up to 30%"
     );
     _params.minUtilizationRate = uint16(newRate / 1e14);
-    _parameterChanged(IPolicyPoolConfig.GovernanceActions.setMinUtilizationRate, newRate, tweak);
+    _parameterChanged(IAccessManager.GovernanceActions.setMinUtilizationRate, newRate, tweak);
   }
 
   function setWhitelist(ILPWhitelist lpWhitelist_)
@@ -684,10 +680,7 @@ contract EToken is Reserve, IERC20Metadata, IEToken {
       "Component not linked to this PolicyPool"
     );
     _params.whitelist = lpWhitelist_;
-    emit ComponentChanged(
-      IPolicyPoolConfig.GovernanceActions.setLPWhitelist,
-      address(lpWhitelist_)
-    );
+    emit ComponentChanged(IAccessManager.GovernanceActions.setLPWhitelist, address(lpWhitelist_));
   }
 
   function whitelist() external view returns (ILPWhitelist) {

package/contracts/PolicyNFT.sol

@@ -28,12 +28,12 @@ contract PolicyNFT is UUPSUpgradeable, ERC721Upgradeable, PausableUpgradeable, I
   }
 
   modifier onlyPoolRole2(bytes32 role1, bytes32 role2) {
-    _policyPool.config().checkRole2(role1, role2, msg.sender);
+    _policyPool.access().checkRole2(role1, role2, msg.sender);
     _;
   }
 
   modifier onlyPoolRole(bytes32 role) {
-    _policyPool.config().checkRole(role, msg.sender);
+    _policyPool.access().checkRole(role, msg.sender);
     _;
   }
 
@@ -75,7 +75,7 @@ contract PolicyNFT is UUPSUpgradeable, ERC721Upgradeable, PausableUpgradeable, I
     );
     _policyPool = IPolicyPool(_msgSender());
     // Not possible to do this validation because connect is called in _policyPool initialize :'(
-    // require(_policyPool.policyNFT() == address(this), "PolicyPool not connected to this config");
+    // require(_policyPool.policyNFT() == address(this), "PolicyPool not connected to this access");
   }
 
   function policyPool() external view returns (IPolicyPool) {

package/contracts/PolicyPool.sol

@@ -5,7 +5,7 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 import {AddressUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
 import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {IPolicyPoolConfig} from "./interfaces/IPolicyPoolConfig.sol";
+import {IAccessManager} from "./interfaces/IAccessManager.sol";
 import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
 import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import {IPremiumsAccount} from "./interfaces/IPremiumsAccount.sol";
@@ -41,24 +41,32 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
   bytes32 public constant LEVEL3_ROLE = keccak256("LEVEL3_ROLE");
 
   /// @custom:oz-upgrades-unsafe-allow state-variable-immutable
-  IPolicyPoolConfig internal immutable _config;
+  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;
 
-  enum ETokenStatus {
+  address internal _treasury; // address of Ensuro treasury
+
+  enum ComponentStatus {
     inactive, // doesn't exists - All operations rejected
-    active, // deposit / withdraw / lockScr / unlockScr OK
+    active, // deposit / withdraw / lockScr / unlockScr / newPolicy / resolvePolicy OK
     deprecated, // withdraw OK, unlockScr OK, deposit rejected, no new policies
     suspended // all operations temporarily rejected
   }
 
   /**
    * @dev Mapping of installed eTokens (see {EToken}) in the PolicyPool. For each one it keep an state
-   * {ETokenStatus}.
+   * {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}.
    */
-  mapping(IEToken => ETokenStatus) private _eTokens;
+  mapping(IRiskModule => ComponentStatus) private _riskModules;
 
   /**
    * @dev Mapping that stores the active policies (the policyId is the key). It just saves the hash of the policies,
@@ -79,49 +87,56 @@ 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 {ETokenStatus}.
+   * @dev Event emitted when a new eToken is added to the pool or the status changes. See {ComponentStatus}.
    */
-  event ETokenStatusChanged(IEToken indexed eToken, ETokenStatus newStatus);
+  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}.
+   */
+  event RiskModuleStatusChanged(IRiskModule indexed riskModule, ComponentStatus newStatus);
 
   /**
    * @dev Event emitted when a new PremiumsAccount is added to the pool or the status changes. TODO
    */
   event PremiumsAccountStatusChanged(
     IPremiumsAccount indexed premiumsAccount,
-    ETokenStatus newStatus
+    ComponentStatus newStatus
   );
 
+  event ComponentChanged(IAccessManager.GovernanceActions indexed action, address value);
+
   modifier onlyRole(bytes32 role) {
-    _config.checkRole(role, msg.sender);
+    _access.checkRole(role, msg.sender);
     _;
   }
 
   modifier onlyRole2(bytes32 role1, bytes32 role2) {
-    _config.checkRole2(role1, role2, msg.sender);
+    _access.checkRole2(role1, role2, msg.sender);
     _;
   }
 
   /// @custom:oz-upgrades-unsafe-allow constructor
   constructor(
-    IPolicyPoolConfig config_,
+    IAccessManager access_,
     IPolicyNFT policyNFT_,
     IERC20Metadata currency_
   ) {
-    _config = config_;
+    _access = access_;
     _policyNFT = policyNFT_;
     _currency = currency_;
   }
 
-  function initialize() public initializer {
+  function initialize(address treasury_) public initializer {
     __UUPSUpgradeable_init();
     __Pausable_init();
-    __PolicyPool_init_unchained();
+    __PolicyPool_init_unchained(treasury_);
   }
 
   // solhint-disable-next-line func-name-mixedcase
-  function __PolicyPool_init_unchained() internal initializer {
-    _config.connect();
+  function __PolicyPool_init_unchained(address treasury_) internal initializer {
     _policyNFT.connect();
+    _treasury = treasury_;
   }
 
   // solhint-disable-next-line no-empty-blocks
@@ -135,8 +150,8 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
     _unpause();
   }
 
-  function config() external view virtual override returns (IPolicyPoolConfig) {
-    return _config;
+  function access() external view virtual override returns (IAccessManager) {
+    return _access;
   }
 
   function currency() external view virtual override returns (IERC20Metadata) {
@@ -147,49 +162,96 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
     return address(_policyNFT);
   }
 
+  function setTreasury(address treasury_) external onlyRole(LEVEL1_ROLE) {
+    _treasury = treasury_;
+    emit ComponentChanged(IAccessManager.GovernanceActions.setTreasury, _treasury);
+  }
+
+  function treasury() external view override returns (address) {
+    return _treasury;
+  }
+
   function addEToken(IEToken eToken) external onlyRole(LEVEL1_ROLE) {
-    ETokenStatus status = _eTokens[eToken];
-    require(status == ETokenStatus.inactive, "eToken already in the pool");
-    require(address(eToken) != address(0), "eToken can't be zero");
+    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] = ETokenStatus.active;
-    emit ETokenStatusChanged(eToken, ETokenStatus.active);
+    _eTokens[eToken] = ComponentStatus.active;
+    emit ETokenStatusChanged(eToken, ComponentStatus.active);
   }
 
   function removeEToken(IEToken eToken) external onlyRole(LEVEL3_ROLE) {
-    ETokenStatus status = _eTokens[eToken];
-    require(status == ETokenStatus.deprecated, "EToken not deprecated");
+    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, ETokenStatus.inactive);
+    emit ETokenStatusChanged(eToken, ComponentStatus.inactive);
   }
 
-  function changeETokenStatus(IEToken eToken, ETokenStatus newStatus)
+  function changeETokenStatus(IEToken eToken, ComponentStatus newStatus)
     external
     onlyRole2(GUARDIAN_ROLE, LEVEL1_ROLE)
   {
-    ETokenStatus status = _eTokens[eToken];
-    require(status != ETokenStatus.inactive, "EToken not found");
+    ComponentStatus status = _eTokens[eToken];
+    require(status != ComponentStatus.inactive, "EToken not found");
     require(
-      newStatus != ETokenStatus.suspended || _config.hasRole(GUARDIAN_ROLE, msg.sender),
-      "Only GUARDIAN can suspend eTokens"
+      (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 (ETokenStatus) {
+  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);
+  }
+
+  function changeRiskModuleStatus(IRiskModule riskModule, ComponentStatus newStatus)
+    external
+    onlyRole2(GUARDIAN_ROLE, LEVEL1_ROLE)
+  {
+    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);
+  }
+
+  function getRiskModuleStatus(IRiskModule riskModule) external view returns (ComponentStatus) {
+    return _riskModules[riskModule];
+  }
+
   function addPremiumsAccount(IPremiumsAccount pa) external onlyRole(LEVEL1_ROLE) {
-    // TODO: limit in # of PremiumsAccount?
     // TODO: keep PremiumsAccount status?
-    require(address(pa) != address(0), "PremiumsAccount can't be zero");
     require(
       IPolicyPoolComponent(address(pa)).policyPool() == this,
       "PremiumsAccount not linked to this pool"
@@ -202,13 +264,13 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
     if (address(etk) != address(0)) {
       etk.addBorrower(address(pa));
     }
-    emit PremiumsAccountStatusChanged(pa, ETokenStatus.active);
+    emit PremiumsAccountStatusChanged(pa, ComponentStatus.active);
     // TODO: functions for deactivating premiumsAccount (and remove them as borrower)
   }
 
   function deposit(IEToken eToken, uint256 amount) external override whenNotPaused {
-    ETokenStatus etkStatus = _eTokens[eToken];
-    require(etkStatus == ETokenStatus.active, "eToken is not active");
+    ComponentStatus etkStatus = _eTokens[eToken];
+    require(etkStatus == ComponentStatus.active, "eToken is not active");
     _currency.safeTransferFrom(msg.sender, address(eToken), amount);
     eToken.deposit(msg.sender, amount);
   }
@@ -219,9 +281,9 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
     whenNotPaused
     returns (uint256)
   {
-    ETokenStatus etkStatus = _eTokens[eToken];
+    ComponentStatus etkStatus = _eTokens[eToken];
     require(
-      etkStatus == ETokenStatus.active || etkStatus == ETokenStatus.deprecated,
+      etkStatus == ComponentStatus.active || etkStatus == ComponentStatus.deprecated,
       "eToken not found or withdraws not allowed"
     );
     address provider = msg.sender;
@@ -235,7 +297,7 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
   ) external override whenNotPaused returns (uint256) {
     IRiskModule rm = policy.riskModule;
     require(address(rm) == msg.sender, "Only the RM can create new policies");
-    _config.checkAcceptsNewPolicy(rm);
+    require(_riskModules[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();
@@ -248,7 +310,7 @@ contract PolicyPool is IPolicyPool, PausableUpgradeable, UUPSUpgradeable {
       _currency.safeTransferFrom(customer, address(pa.seniorEtk()), policy.srCoc);
     if (policy.jrCoc > 0)
       _currency.safeTransferFrom(customer, address(pa.juniorEtk()), policy.jrCoc);
-    _currency.safeTransferFrom(customer, _config.treasury(), policy.ensuroCommission);
+    _currency.safeTransferFrom(customer, _treasury, policy.ensuroCommission);
     if (policy.partnerCommission > 0 && customer != rm.wallet())
       _currency.safeTransferFrom(customer, rm.wallet(), policy.partnerCommission);
     // TODO: this code does up to 5 ERC20 transfers. How we can avoid this? Delayed transfers?
@@ -303,7 +365,10 @@ 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");
-    _config.checkAcceptsResolvePolicy(rm);
+    require(
+      _riskModules[rm] == ComponentStatus.active || _riskModules[rm] == ComponentStatus.deprecated,
+      "Module must be active or deprecated to process resolutions"
+    );
     require(payout <= policy.payout, "payout > policy.payout");
 
     bool customerWon = payout > 0;

package/contracts/PolicyPoolComponent.sol

@@ -5,7 +5,7 @@ import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/U
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.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";
 
@@ -42,8 +42,8 @@ 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");
@@ -56,23 +56,23 @@ abstract contract PolicyPoolComponent is
     bytes32 role3
   ) {
     if (!hasPoolRole(role1)) {
-      _policyPool.config().checkRole2(role2, role3, msg.sender);
+      _policyPool.access().checkRole2(role2, role3, msg.sender);
     }
     _;
   }
 
   modifier onlyPoolRole2(bytes32 role1, bytes32 role2) {
-    _policyPool.config().checkRole2(role1, role2, msg.sender);
+    _policyPool.access().checkRole2(role1, role2, msg.sender);
     _;
   }
 
   modifier onlyPoolRole(bytes32 role) {
-    _policyPool.config().checkRole(role, msg.sender);
+    _policyPool.access().checkRole(role, msg.sender);
     _;
   }
 
   modifier onlyComponentRole(bytes32 role) {
-    _policyPool.config().checkComponentRole(address(this), role, msg.sender);
+    _policyPool.access().checkComponentRole(address(this), role, msg.sender);
     _;
   }
 
@@ -107,7 +107,7 @@ abstract contract PolicyPoolComponent is
   }
 
   function hasPoolRole(bytes32 role) internal view returns (bool) {
-    return _policyPool.config().hasRole(role, msg.sender);
+    return _policyPool.access().hasRole(role, msg.sender);
   }
 
   function _isTweakRay(
@@ -144,7 +144,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 +153,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 +162,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);

package/contracts/PremiumsAccount.sol

@@ -177,7 +177,7 @@ contract PremiumsAccount is IPremiumsAccount, Reserve {
     if (amount > _wonPurePremiums) amount = _wonPurePremiums;
     require(amount > 0, "No premiums to withdraw");
     _wonPurePremiums -= amount;
-    _transferTo(_policyPool.config().treasury(), amount); // TODO: discuss if destination shoud be msg.sender
+    _transferTo(_policyPool.treasury(), amount); // TODO: discuss if destination shoud be msg.sender
     // TODO: see if this will be a component role
     emit WonPremiumsInOut(false, amount);
     return amount;

package/contracts/RiskModule.sol

@@ -6,7 +6,7 @@ import {IPolicyPool} from "./interfaces/IPolicyPool.sol";
 import {PolicyPoolComponent} from "./PolicyPoolComponent.sol";
 import {IRiskModule} from "./interfaces/IRiskModule.sol";
 import {IPremiumsAccount} from "./interfaces/IPremiumsAccount.sol";
-import {IPolicyPoolConfig} from "./interfaces/IPolicyPoolConfig.sol";
+import {IAccessManager} from "./interfaces/IAccessManager.sol";
 import {Policy} from "./Policy.sol";
 
 /**
@@ -238,8 +238,8 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
       _params.maxDuration = uint16(newValue);
     }
     _parameterChanged(
-      IPolicyPoolConfig.GovernanceActions(
-        uint256(IPolicyPoolConfig.GovernanceActions.setMoc) + uint256(param)
+      IAccessManager.GovernanceActions(
+        uint256(IAccessManager.GovernanceActions.setMoc) + uint256(param)
       ),
       newValue,
       tweak
@@ -261,11 +261,7 @@ abstract contract RiskModule is IRiskModule, PolicyPoolComponent {
 
   function setWallet(address wallet_) external onlyComponentRole(RM_PROVIDER_ROLE) {
     _wallet = wallet_;
-    _parameterChanged(
-      IPolicyPoolConfig.GovernanceActions.setWallet,
-      uint256(uint160(wallet_)),
-      false
-    );
+    _parameterChanged(IAccessManager.GovernanceActions.setWallet, uint256(uint160(wallet_)), false);
   }
 
   function getMinimumPremium(