Updated OpenZeppelin to version 5.1.0

.solhint.json

@@ -3,12 +3,13 @@
   "plugins": ["prettier"],
   "rules": {
     "prettier/prettier": "warn",
-    "reentrancy": "off",
-    "modifier-name-mixedcase": "off",
+    "reentrancy": "warn",
+    "modifier-name-mixedcase": "warn",
     "no-empty-blocks": "off",
-    "func-visibility": "off",
-    "max-states-count": "off",
+    "func-visibility": ["warn", { "ignoreConstructors": true }],
+    "max-states-count": "warn",
     "not-rely-on-time": "off",
-    "compiler-version": "off"
+    "func-name-mixedcase": "off",
+    "no-inline-assembly": "off"
   }
 }

contracts/access/MerkleWhitelisted.sol

@@ -22,16 +22,16 @@ abstract contract MerkleWhitelisted {
 
     bytes32 private _merkleRoot;
 
+    error LeafNotWhitelisted(bytes data);
+    error UserNotWhitelisted(address user);
+
     modifier onlyWhitelisted(bytes memory data_, bytes32[] memory merkleProof_) {
-        require(
-            _isWhitelisted(keccak256(data_), merkleProof_),
-            "MerkleWhitelisted: not whitelisted"
-        );
+        if (!_isWhitelisted(keccak256(data_), merkleProof_)) revert LeafNotWhitelisted(data_);
         _;
     }
 
     modifier onlyWhitelistedUser(address user_, bytes32[] memory merkleProof_) {
-        require(_isWhitelistedUser(user_, merkleProof_), "MerkleWhitelisted: not whitelisted");
+        if (!_isWhitelistedUser(user_, merkleProof_)) revert UserNotWhitelisted(user_);
         _;
     }
 

contracts/access/MultiOwnable.sol

@@ -28,6 +28,9 @@ abstract contract MultiOwnable is IMultiOwnable, Initializable {
 
     EnumerableSet.AddressSet private _owners;
 
+    error InvalidOwner();
+    error UnauthorizedAccount(address account);
+
     modifier onlyOwner() {
         _checkOwner();
         _;
@@ -91,7 +94,7 @@ abstract contract MultiOwnable is IMultiOwnable, Initializable {
     function _addOwners(address[] memory newOwners_) private {
         _owners.add(newOwners_);
 
-        require(!_owners.contains(address(0)), "MultiOwnable: zero address can not be added");
+        if (_owners.contains(address(0))) revert InvalidOwner();
 
         emit OwnersAdded(newOwners_);
     }
@@ -115,6 +118,6 @@ abstract contract MultiOwnable is IMultiOwnable, Initializable {
      * @dev Throws if the sender is not the owner.
      */
     function _checkOwner() private view {
-        require(isOwner(msg.sender), "MultiOwnable: caller is not the owner");
+        if (!isOwner(msg.sender)) revert UnauthorizedAccount(msg.sender);
     }
 }

contracts/access/PermanentOwnable.sol

@@ -15,6 +15,9 @@ pragma solidity ^0.8.4;
 abstract contract PermanentOwnable {
     address private immutable _OWNER;
 
+    error InvalidOwner();
+    error UnauthorizedAccount(address account);
+
     /**
      * @dev Throws if called by any account other than the owner.
      */
@@ -28,7 +31,7 @@ abstract contract PermanentOwnable {
      * @param owner_ the address of the permanent owner.
      */
     constructor(address owner_) {
-        require(owner_ != address(0), "PermanentOwnable: zero address can not be the owner");
+        if (owner_ == address(0)) revert InvalidOwner();
 
         _OWNER = owner_;
     }
@@ -42,6 +45,6 @@ abstract contract PermanentOwnable {
     }
 
     function _onlyOwner() internal view virtual {
-        require(_OWNER == msg.sender, "PermanentOwnable: caller is not the owner");
+        if (_OWNER != msg.sender) revert UnauthorizedAccount(msg.sender);
     }
 }

contracts/access/RBAC.sol

@@ -53,13 +53,12 @@ abstract contract RBAC is IRBAC, Initializable {
 
     mapping(address => DynamicSet.StringSet) private _userRoles;
 
+    error EmptyRoles();
+    error NoPermissionForResource(address account, string permission, string resource);
+
     modifier onlyPermission(string memory resource_, string memory permission_) {
-        require(
-            hasPermission(msg.sender, resource_, permission_),
-            string(
-                abi.encodePacked("RBAC: no ", permission_, " permission for resource ", resource_)
-            )
-        );
+        if (!hasPermission(msg.sender, resource_, permission_))
+            revert NoPermissionForResource(msg.sender, permission_, resource_);
         _;
     }
 
@@ -79,7 +78,7 @@ abstract contract RBAC is IRBAC, Initializable {
         address to_,
         string[] memory rolesToGrant_
     ) public virtual override onlyPermission(RBAC_RESOURCE, CREATE_PERMISSION) {
-        require(rolesToGrant_.length > 0, "RBAC: empty roles");
+        if (rolesToGrant_.length == 0) revert EmptyRoles();
 
         _grantRoles(to_, rolesToGrant_);
     }
@@ -93,7 +92,7 @@ abstract contract RBAC is IRBAC, Initializable {
         address from_,
         string[] memory rolesToRevoke_
     ) public virtual override onlyPermission(RBAC_RESOURCE, DELETE_PERMISSION) {
-        require(rolesToRevoke_.length > 0, "RBAC: empty roles");
+        if (rolesToRevoke_.length == 0) revert EmptyRoles();
 
         _revokeRoles(from_, rolesToRevoke_);
     }

contracts/access/extensions/RBACGroupable.sol

@@ -31,6 +31,8 @@ abstract contract RBACGroupable is IRBACGroupable, RBAC {
     mapping(address => DynamicSet.StringSet) private _userGroups;
     mapping(string => DynamicSet.StringSet) private _groupRoles;
 
+    error EmptyGroups();
+
     /**
      * @notice The initialization function
      */
@@ -47,7 +49,7 @@ abstract contract RBACGroupable is IRBACGroupable, RBAC {
         address who_,
         string[] memory groupsToAddTo_
     ) public virtual override onlyPermission(RBAC_RESOURCE, CREATE_PERMISSION) {
-        require(groupsToAddTo_.length > 0, "RBACGroupable: empty groups");
+        if (groupsToAddTo_.length == 0) revert EmptyGroups();
 
         _addUserToGroups(who_, groupsToAddTo_);
     }
@@ -61,7 +63,7 @@ abstract contract RBACGroupable is IRBACGroupable, RBAC {
         address who_,
         string[] memory groupsToRemoveFrom_
     ) public virtual override onlyPermission(RBAC_RESOURCE, DELETE_PERMISSION) {
-        require(groupsToRemoveFrom_.length > 0, "RBACGroupable: empty groups");
+        if (groupsToRemoveFrom_.length == 0) revert EmptyGroups();
 
         _removeUserFromGroups(who_, groupsToRemoveFrom_);
     }
@@ -75,7 +77,7 @@ abstract contract RBACGroupable is IRBACGroupable, RBAC {
         string memory groupTo_,
         string[] memory rolesToGrant_
     ) public virtual override onlyPermission(RBAC_RESOURCE, CREATE_PERMISSION) {
-        require(rolesToGrant_.length > 0, "RBACGroupable: empty roles");
+        if (rolesToGrant_.length == 0) revert EmptyRoles();
 
         _grantGroupRoles(groupTo_, rolesToGrant_);
     }
@@ -89,7 +91,7 @@ abstract contract RBACGroupable is IRBACGroupable, RBAC {
         string memory groupFrom_,
         string[] memory rolesToRevoke_
     ) public virtual override onlyPermission(RBAC_RESOURCE, DELETE_PERMISSION) {
-        require(rolesToRevoke_.length > 0, "RBACGroupable: empty roles");
+        if (rolesToRevoke_.length == 0) revert EmptyRoles();
 
         _revokeGroupRoles(groupFrom_, rolesToRevoke_);
     }

contracts/contracts-registry/AbstractContractsRegistry.sol

@@ -2,9 +2,9 @@
 pragma solidity ^0.8.4;
 
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
-import {TransparentProxyUpgrader} from "../proxy/transparent/TransparentProxyUpgrader.sol";
+import {AdminableProxyUpgrader} from "../proxy/adminable/AdminableProxyUpgrader.sol";
+import {AdminableProxy} from "../proxy/adminable/AdminableProxy.sol";
 import {AbstractDependant} from "./AbstractDependant.sol";
 
 /**
@@ -26,7 +26,7 @@ import {AbstractDependant} from "./AbstractDependant.sol";
  * 2) Making the system contracts-interchangeable
  * 3) Simplifying the contracts management and deployment
  *
- * The ContractsRegistry acts as a TransparentProxy deployer. One can add proxy-compatible implementations to the registry
+ * The ContractsRegistry acts as a AdminableProxy deployer. One can add proxy-compatible implementations to the registry
  * and deploy proxies to them. Then these proxies can be upgraded easily using the provided interface.
  * The ContractsRegistry itself can be deployed behind a proxy as well.
  *
@@ -38,7 +38,7 @@ import {AbstractDependant} from "./AbstractDependant.sol";
  * Users may also fetch all the contracts present in the system as they are now located in a single place.
  */
 abstract contract AbstractContractsRegistry is Initializable {
-    TransparentProxyUpgrader private _proxyUpgrader;
+    AdminableProxyUpgrader private _proxyUpgrader;
 
     mapping(string => address) private _contracts;
     mapping(address => bool) private _isProxy;
@@ -48,11 +48,15 @@ abstract contract AbstractContractsRegistry is Initializable {
     event ProxyContractUpgraded(string name, address newImplementation);
     event ContractRemoved(string name);
 
+    error NoMappingExists(string contractName);
+    error NotAProxy(string contractName, address contractProxy);
+    error ZeroAddressProvided(string contractName);
+
     /**
      * @notice The initialization function
      */
     function __ContractsRegistry_init() internal onlyInitializing {
-        _proxyUpgrader = new TransparentProxyUpgrader();
+        _proxyUpgrader = new AdminableProxyUpgrader();
     }
 
     /**
@@ -63,7 +67,7 @@ abstract contract AbstractContractsRegistry is Initializable {
     function getContract(string memory name_) public view returns (address) {
         address contractAddress_ = _contracts[name_];
 
-        require(contractAddress_ != address(0), "ContractsRegistry: this mapping doesn't exist");
+        _checkIfMappingExist(contractAddress_, name_);
 
         return contractAddress_;
     }
@@ -93,8 +97,8 @@ abstract contract AbstractContractsRegistry is Initializable {
     function getImplementation(string memory name_) public view returns (address) {
         address contractProxy_ = _contracts[name_];
 
-        require(contractProxy_ != address(0), "ContractsRegistry: this mapping doesn't exist");
-        require(_isProxy[contractProxy_], "ContractsRegistry: not a proxy contract");
+        if (contractProxy_ == address(0)) revert NoMappingExists(name_);
+        if (!_isProxy[contractProxy_]) revert NotAProxy(name_, contractProxy_);
 
         return _proxyUpgrader.getImplementation(contractProxy_);
     }
@@ -118,7 +122,7 @@ abstract contract AbstractContractsRegistry is Initializable {
     ) internal virtual {
         address contractAddress_ = _contracts[name_];
 
-        require(contractAddress_ != address(0), "ContractsRegistry: this mapping doesn't exist");
+        _checkIfMappingExist(contractAddress_, name_);
 
         AbstractDependant dependant_ = AbstractDependant(contractAddress_);
         dependant_.setDependencies(address(this), data_);
@@ -150,8 +154,8 @@ abstract contract AbstractContractsRegistry is Initializable {
     ) internal virtual {
         address contractToUpgrade_ = _contracts[name_];
 
-        require(contractToUpgrade_ != address(0), "ContractsRegistry: this mapping doesn't exist");
-        require(_isProxy[contractToUpgrade_], "ContractsRegistry: not a proxy contract");
+        if (contractToUpgrade_ == address(0)) revert NoMappingExists(name_);
+        if (!_isProxy[contractToUpgrade_]) revert NotAProxy(name_, contractToUpgrade_);
 
         _proxyUpgrader.upgrade(contractToUpgrade_, newImplementation_, data_);
 
@@ -165,7 +169,7 @@ abstract contract AbstractContractsRegistry is Initializable {
      * @param contractAddress_ the address of the contract
      */
     function _addContract(string memory name_, address contractAddress_) internal virtual {
-        require(contractAddress_ != address(0), "ContractsRegistry: zero address is forbidden");
+        if (contractAddress_ == address(0)) revert ZeroAddressProvided(name_);
 
         _contracts[name_] = contractAddress_;
 
@@ -194,7 +198,7 @@ abstract contract AbstractContractsRegistry is Initializable {
         address contractAddress_,
         bytes memory data_
     ) internal virtual {
-        require(contractAddress_ != address(0), "ContractsRegistry: zero address is forbidden");
+        if (contractAddress_ == address(0)) revert ZeroAddressProvided(name_);
 
         address proxyAddr_ = _deployProxy(contractAddress_, address(_proxyUpgrader), data_);
 
@@ -215,7 +219,7 @@ abstract contract AbstractContractsRegistry is Initializable {
         string memory name_,
         address contractAddress_
     ) internal virtual {
-        require(contractAddress_ != address(0), "ContractsRegistry: zero address is forbidden");
+        if (contractAddress_ == address(0)) revert ZeroAddressProvided(name_);
 
         _contracts[name_] = contractAddress_;
         _isProxy[contractAddress_] = true;
@@ -234,7 +238,7 @@ abstract contract AbstractContractsRegistry is Initializable {
     function _removeContract(string memory name_) internal virtual {
         address contractAddress_ = _contracts[name_];
 
-        require(contractAddress_ != address(0), "ContractsRegistry: this mapping doesn't exist");
+        _checkIfMappingExist(contractAddress_, name_);
 
         delete _isProxy[contractAddress_];
         delete _contracts[name_];
@@ -254,6 +258,10 @@ abstract contract AbstractContractsRegistry is Initializable {
         address admin_,
         bytes memory data_
     ) internal virtual returns (address) {
-        return address(new TransparentUpgradeableProxy(contractAddress_, admin_, data_));
+        return address(new AdminableProxy(contractAddress_, admin_, data_));
+    }
+
+    function _checkIfMappingExist(address contractAddress_, string memory name_) internal pure {
+        if (contractAddress_ == address(0)) revert NoMappingExists(name_);
     }
 }

contracts/contracts-registry/AbstractDependant.sol

@@ -22,6 +22,8 @@ abstract contract AbstractDependant {
     bytes32 private constant _INJECTOR_SLOT =
         0x3d1f25f1ac447e55e7fec744471c4dab1c6a2b6ffb897825f9ea3d2e8c9be583;
 
+    error NotAnInjector(address injector, address caller);
+
     modifier dependant() {
         _checkInjector();
         _;
@@ -76,6 +78,7 @@ abstract contract AbstractDependant {
     function _checkInjector() internal view {
         address injector_ = getInjector();
 
-        require(injector_ == address(0) || injector_ == msg.sender, "Dependant: not an injector");
+        if (injector_ != address(0) && injector_ != msg.sender)
+            revert NotAnInjector(injector_, msg.sender);
     }
 }

contracts/contracts-registry/pools/AbstractPoolContractsRegistry.sol

@@ -34,6 +34,10 @@ abstract contract AbstractPoolContractsRegistry is Initializable, AbstractDepend
     mapping(string => ProxyBeacon) private _beacons;
     mapping(string => EnumerableSet.AddressSet) private _pools; // name => pool
 
+    error NoMappingExists(string poolName);
+    error NoPoolsToInject(string poolName);
+    error ProxyDoesNotExist(string poolName);
+
     /**
      * @notice The proxy initializer function
      */
@@ -66,10 +70,7 @@ abstract contract AbstractPoolContractsRegistry is Initializable, AbstractDepend
      * @return address_ the implementation these pools point to
      */
     function getImplementation(string memory name_) public view returns (address) {
-        require(
-            address(_beacons[name_]) != address(0),
-            "PoolContractsRegistry: this mapping doesn't exist"
-        );
+        if (address(_beacons[name_]) == address(0)) revert NoMappingExists(name_);
 
         return _beacons[name_].implementation();
     }
@@ -82,7 +83,7 @@ abstract contract AbstractPoolContractsRegistry is Initializable, AbstractDepend
     function getProxyBeacon(string memory name_) public view returns (address) {
         address beacon_ = address(_beacons[name_]);
 
-        require(beacon_ != address(0), "PoolContractsRegistry: bad ProxyBeacon");
+        if (beacon_ == address(0)) revert ProxyDoesNotExist(name_);
 
         return beacon_;
     }
@@ -173,7 +174,7 @@ abstract contract AbstractPoolContractsRegistry is Initializable, AbstractDepend
 
         uint256 to_ = (offset_ + limit_).min(_namedPools.length()).max(offset_);
 
-        require(to_ != offset_, "PoolContractsRegistry: no pools to inject");
+        if (to_ == offset_) revert NoPoolsToInject(name_);
 
         address contractsRegistry_ = _contractsRegistry;
 

contracts/contracts-registry/pools/presets/OwnablePoolContractsRegistry.sol

@@ -16,7 +16,7 @@ abstract contract OwnablePoolContractsRegistry is
      * @notice The initialization function
      */
     function __OwnablePoolContractsRegistry_init() public initializer {
-        __Ownable_init();
+        __Ownable_init(msg.sender);
         __PoolContractsRegistry_init();
     }
 

contracts/contracts-registry/presets/MultiOwnableContractsRegistry.sol

@@ -72,7 +72,7 @@ contract MultiOwnableContractsRegistry is AbstractContractsRegistry, MultiOwnabl
     }
 
     /**
-     * @notice The function to add the proxy contract to the registry (deploys TransparentProxy on top)
+     * @notice The function to add the proxy contract to the registry (deploys AdminableProxy on top)
      * @param name_ the associative name of the contract
      * @param contractAddress_ the address of the implementation contract to add
      */
@@ -81,7 +81,7 @@ contract MultiOwnableContractsRegistry is AbstractContractsRegistry, MultiOwnabl
     }
 
     /**
-     * @notice The function to add the proxy contract to the registry with immediate call (deploys TransparentProxy on top)
+     * @notice The function to add the proxy contract to the registry with immediate call (deploys AdminableProxy on top)
      * @param name_ the associative name of the contract
      * @param contractAddress_ the address of the implementation contract to add
      * @param data_ the data the proxy contract will be called after the addition