fix: getRolesId removed

contracts/contracts/HederaTokenManagerFacet.sol

@@ -5,14 +5,14 @@ import {IHederaTokenManager, RolesStruct} from './Interfaces/IHederaTokenManager
 import {_HEDERA_TOKEN_MANAGER_RESOLVER_KEY} from './constants/resolverKeys.sol';
 import {SupplierAdminStorageWrapper} from './extensions/SupplierAdminStorageWrapper.sol';
 import {ReserveStorageWrapper} from './extensions/ReserveStorageWrapper.sol';
-import {IRoles} from './extensions/Interfaces/IRoles.sol';
 // solhint-disable-next-line max-line-length
 import {IHederaTokenService} from '@hashgraph/smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol';
 import {KeysLib} from './library/KeysLib.sol';
 // solhint-disable-next-line max-line-length
 import {IERC20MetadataUpgradeable} from '@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol';
 import {HederaTokenManagerStorageWrapper} from './HederaTokenManagerStorageWrapper.sol';
 import {IStaticFunctionSelectors} from './resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {ADMIN_ROLE} from './constants/roles.sol';
 
 contract HederaTokenManagerFacet is
     IStaticFunctionSelectors,
@@ -129,12 +129,7 @@ contract HederaTokenManagerFacet is
      */
     function updateToken(
         UpdateTokenStruct calldata updatedToken
-    )
-        external
-        override(IHederaTokenManager)
-        lessThan100(updatedToken.tokenMetadataURI)
-        onlyRole(_getRoleId(IRoles.RoleName.ADMIN))
-    {
+    ) external override(IHederaTokenManager) lessThan100(updatedToken.tokenMetadataURI) onlyRole(ADMIN_ROLE) {
         _setMetadata(updatedToken.tokenMetadataURI);
 
         address currentTokenAddress = _getTokenAddress();
@@ -207,7 +202,7 @@ contract HederaTokenManagerFacet is
         }
 
         // granting admin role, always to the SC creator
-        _grantRole(_getRoleId(IRoles.RoleName.ADMIN), originalSender);
+        _grantRole(ADMIN_ROLE, originalSender);
     }
 
     /**

contracts/contracts/extensions/BurnableFacet.sol

@@ -4,13 +4,13 @@ pragma solidity 0.8.18;
 // solhint-disable-next-line max-line-length
 import {HoldManagementStorageWrapper} from './HoldManagementStorageWrapper.sol';
 import {IBurnable} from './Interfaces/IBurnable.sol';
-import {IRoles} from './Interfaces/IRoles.sol';
 import {SafeCast} from '@openzeppelin/contracts/utils/math/SafeCast.sol';
 import {_BURNABLE_RESOLVER_KEY} from '../constants/resolverKeys.sol';
 import {RolesStorageWrapper} from './RolesStorageWrapper.sol';
 import {TokenOwnerStorageWrapper} from './TokenOwnerStorageWrapper.sol';
 import {IHederaTokenService} from '@hashgraph/smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol';
 import {IStaticFunctionSelectors} from '../resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {_BURN_ROLE} from '../constants/roles.sol';
 
 contract BurnableFacet is
     IBurnable,
@@ -37,7 +37,7 @@ contract BurnableFacet is
     )
         external
         override(IBurnable)
-        onlyRole(_getRoleId(IRoles.RoleName.BURN))
+        onlyRole(_BURN_ROLE)
         amountIsNotNegative(amount, false)
         checkBurnAmount(amount)
         returns (bool)

contracts/contracts/extensions/CashInFacet.sol

@@ -2,14 +2,14 @@
 pragma solidity 0.8.18;
 
 import {ICashIn} from './Interfaces/ICashIn.sol';
-import {IRoles} from './Interfaces/IRoles.sol';
 import {SupplierAdminStorageWrapper} from './SupplierAdminStorageWrapper.sol';
 // solhint-disable-next-line max-line-length
 import {IHederaTokenService} from '@hashgraph/smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol';
 import {ReserveStorageWrapper} from './ReserveStorageWrapper.sol';
 import {SafeCast} from '@openzeppelin/contracts/utils/math/SafeCast.sol';
 import {_CASH_IN_RESOLVER_KEY} from '../constants/resolverKeys.sol';
 import {IStaticFunctionSelectors} from '../resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {_CASHIN_ROLE} from '../constants/roles.sol';
 
 contract CashInFacet is ICashIn, IStaticFunctionSelectors, SupplierAdminStorageWrapper, ReserveStorageWrapper {
     /**
@@ -25,7 +25,7 @@ contract CashInFacet is ICashIn, IStaticFunctionSelectors, SupplierAdminStorageW
     )
         external
         override(ICashIn)
-        onlyRole(_getRoleId(IRoles.RoleName.CASHIN))
+        onlyRole(_CASHIN_ROLE)
         checkReserveIncrease(SafeCast.toUint256(amount))
         addressIsNotZero(account)
         amountIsNotNegative(amount, false)

contracts/contracts/extensions/CustomFeesFacet.sol

@@ -7,8 +7,8 @@ import {RolesStorageWrapper} from './RolesStorageWrapper.sol';
 // solhint-disable-next-line max-line-length
 import {IHederaTokenService} from '@hashgraph/smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol';
 import {_CUSTOM_FEES_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {IRoles} from './Interfaces/IRoles.sol';
 import {IStaticFunctionSelectors} from '../resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {_CUSTOM_FEES_ROLE} from '../constants/roles.sol';
 
 contract CustomFeesFacet is ICustomFees, IStaticFunctionSelectors, TokenOwnerStorageWrapper, RolesStorageWrapper {
     /**
@@ -20,7 +20,7 @@ contract CustomFeesFacet is ICustomFees, IStaticFunctionSelectors, TokenOwnerSto
     function updateTokenCustomFees(
         IHederaTokenService.FixedFee[] calldata fixedFees,
         IHederaTokenService.FractionalFee[] calldata fractionalFees
-    ) external override(ICustomFees) onlyRole(_getRoleId(IRoles.RoleName.CUSTOM_FEES)) returns (bool) {
+    ) external override(ICustomFees) onlyRole(_CUSTOM_FEES_ROLE) returns (bool) {
         address currentTokenAddress = _getTokenAddress();
 
         int64 responseCode = IHederaTokenService(_PRECOMPILED_ADDRESS).updateFungibleTokenCustomFees(

contracts/contracts/extensions/DeletableFacet.sol

@@ -7,15 +7,15 @@ import {RolesStorageWrapper} from './RolesStorageWrapper.sol';
 import {IHederaTokenService} from '@hashgraph/smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol';
 import {IDeletable} from './Interfaces/IDeletable.sol';
 import {_DELETABLE_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {IRoles} from './Interfaces/IRoles.sol';
 import {IStaticFunctionSelectors} from '../resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {_DELETE_ROLE} from '../constants/roles.sol';
 
 contract DeletableFacet is IDeletable, IStaticFunctionSelectors, TokenOwnerStorageWrapper, RolesStorageWrapper {
     /**
      * @dev Deletes the token
      *
      */
-    function deleteToken() external override(IDeletable) onlyRole(_getRoleId(IRoles.RoleName.DELETE)) returns (bool) {
+    function deleteToken() external override(IDeletable) onlyRole(_DELETE_ROLE) returns (bool) {
         address currentTokenAddress = _getTokenAddress();
 
         int64 responseCode = IHederaTokenService(_PRECOMPILED_ADDRESS).deleteToken(currentTokenAddress);

contracts/contracts/extensions/FreezableFacet.sol

@@ -7,8 +7,8 @@ import {RolesStorageWrapper} from './RolesStorageWrapper.sol';
 import {IHederaTokenService} from '@hashgraph/smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol';
 import {IFreezable} from './Interfaces/IFreezable.sol';
 import {_FREEZABLE_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {IRoles} from './Interfaces/IRoles.sol';
 import {IStaticFunctionSelectors} from '../resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {_FREEZE_ROLE} from '../constants/roles.sol';
 
 contract FreezableFacet is IFreezable, IStaticFunctionSelectors, TokenOwnerStorageWrapper, RolesStorageWrapper {
     /**
@@ -18,13 +18,7 @@ contract FreezableFacet is IFreezable, IStaticFunctionSelectors, TokenOwnerStora
      */
     function freeze(
         address account
-    )
-        external
-        override(IFreezable)
-        onlyRole(_getRoleId(IRoles.RoleName.FREEZE))
-        addressIsNotZero(account)
-        returns (bool)
-    {
+    ) external override(IFreezable) onlyRole(_FREEZE_ROLE) addressIsNotZero(account) returns (bool) {
         address currentTokenAddress = _getTokenAddress();
 
         int64 responseCode = IHederaTokenService(_PRECOMPILED_ADDRESS).freezeToken(currentTokenAddress, account);
@@ -43,13 +37,7 @@ contract FreezableFacet is IFreezable, IStaticFunctionSelectors, TokenOwnerStora
      */
     function unfreeze(
         address account
-    )
-        external
-        override(IFreezable)
-        onlyRole(_getRoleId(IRoles.RoleName.FREEZE))
-        addressIsNotZero(account)
-        returns (bool)
-    {
+    ) external override(IFreezable) onlyRole(_FREEZE_ROLE) addressIsNotZero(account) returns (bool) {
         address currentTokenAddress = _getTokenAddress();
 
         int64 responseCode = IHederaTokenService(_PRECOMPILED_ADDRESS).unfreezeToken(currentTokenAddress, account);

contracts/contracts/extensions/HoldManagementFacet.sol

@@ -9,8 +9,8 @@ import {RolesStorageWrapper} from './RolesStorageWrapper.sol';
 import {TokenOwnerStorageWrapper} from './TokenOwnerStorageWrapper.sol';
 import {HoldManagementStorageWrapper} from './HoldManagementStorageWrapper.sol';
 import {_HOLD_MANAGEMENT_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {IRoles} from './Interfaces/IRoles.sol';
 import {IStaticFunctionSelectors} from '../resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {_HOLD_CREATOR_ROLE} from '../constants/roles.sol';
 
 // solhint-enable max-line-length
 
@@ -156,7 +156,7 @@ contract HoldManagementFacet is
         validExpiration(_hold.expirationTimestamp)
         addressIsNotZero(_hold.escrow)
         addressIsNotZero(_from)
-        onlyRole(_getRoleId(IRoles.RoleName.HOLD_CREATOR))
+        onlyRole(_HOLD_CREATOR_ROLE)
         amountIsNotNegative(_hold.amount, false)
         returns (bool success_, uint256 holdId_)
     {

contracts/contracts/extensions/Interfaces/IRoles.sol

@@ -2,21 +2,6 @@
 pragma solidity 0.8.18;
 
 interface IRoles {
-    enum RoleName {
-        ADMIN,
-        CASHIN,
-        BURN,
-        WIPE,
-        RESCUE,
-        PAUSE,
-        FREEZE,
-        DELETE,
-        KYC,
-        CUSTOM_FEES,
-        HOLD_CREATOR,
-        DEFAULT_ADMIN_ROLE
-    }
-
     /**
      * @dev Emitted when the provided account is not granted the role
      *
@@ -27,18 +12,19 @@ interface IRoles {
     error AccountHasNoRole(address account, bytes32 role);
 
     /**
-     * @dev Returns an array of roles the account currently has
+     * @dev Emitted when trying to remove a role from the role list passing an out of bound position
+     *
+     * @param length The roles list length
+     * @param position The 0 based index we are trying to access in the role list
      *
-     * @param account The account address
-     * @return bytes32[] The array containing the roles
      */
-    function getRoles(address account) external view returns (bytes32[] memory);
+    error RolePositionOutOfBounds(uint256 length, uint256 position);
 
     /**
-     * @dev Returns a role bytes32 representation
+     * @dev Returns an array of roles the account currently has
      *
-     * @param role The role we want to retrieve the bytes32 for
-     * @return bytes32 The bytes32 of the role
+     * @param account The account address
+     * @return bytes32[] The array containing the roles
      */
-    function getRoleId(RoleName role) external view returns (bytes32);
+    function getRoles(address account) external view returns (bytes32[] memory);
 }

contracts/contracts/extensions/KYCFacet.sol

@@ -7,8 +7,8 @@ import {RolesStorageWrapper} from './RolesStorageWrapper.sol';
 import {IHederaTokenService} from '@hashgraph/smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol';
 import {IKYC} from './Interfaces/IKYC.sol';
 import {_KYC_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {IRoles} from './Interfaces/IRoles.sol';
 import {IStaticFunctionSelectors} from '../resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {_KYC_ROLE} from '../constants/roles.sol';
 
 contract KYCFacet is IKYC, IStaticFunctionSelectors, TokenOwnerStorageWrapper, RolesStorageWrapper {
     /**
@@ -18,7 +18,7 @@ contract KYCFacet is IKYC, IStaticFunctionSelectors, TokenOwnerStorageWrapper, R
      */
     function grantKyc(
         address account
-    ) external override(IKYC) onlyRole(_getRoleId(IRoles.RoleName.KYC)) addressIsNotZero(account) returns (bool) {
+    ) external override(IKYC) onlyRole(_KYC_ROLE) addressIsNotZero(account) returns (bool) {
         address currentTokenAddress = _getTokenAddress();
 
         int64 responseCode = IHederaTokenService(_PRECOMPILED_ADDRESS).grantTokenKyc(currentTokenAddress, account);
@@ -35,9 +35,7 @@ contract KYCFacet is IKYC, IStaticFunctionSelectors, TokenOwnerStorageWrapper, R
      *
      * @param account The account to which the KYC will be revoked
      */
-    function revokeKyc(
-        address account
-    ) external onlyRole(_getRoleId(IRoles.RoleName.KYC)) addressIsNotZero(account) returns (bool) {
+    function revokeKyc(address account) external onlyRole(_KYC_ROLE) addressIsNotZero(account) returns (bool) {
         address currentTokenAddress = _getTokenAddress();
 
         int64 responseCode = IHederaTokenService(_PRECOMPILED_ADDRESS).revokeTokenKyc(currentTokenAddress, account);

contracts/contracts/extensions/PausableFacet.sol

@@ -7,15 +7,15 @@ import {IPausable} from './Interfaces/IPausable.sol';
 // solhint-disable-next-line max-line-length
 import {IHederaTokenService} from '@hashgraph/smart-contracts/contracts/system-contracts/hedera-token-service/IHederaTokenService.sol';
 import {_PAUSABLE_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {IRoles} from './Interfaces/IRoles.sol';
 import {IStaticFunctionSelectors} from '../resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {_PAUSE_ROLE} from '../constants/roles.sol';
 
 contract PausableFacet is IPausable, IStaticFunctionSelectors, TokenOwnerStorageWrapper, RolesStorageWrapper {
     /**
      * @dev Pauses the token in order to prevent it from being involved in any kind of operation
      *
      */
-    function pause() external override(IPausable) onlyRole(_getRoleId(IRoles.RoleName.PAUSE)) returns (bool) {
+    function pause() external override(IPausable) onlyRole(_PAUSE_ROLE) returns (bool) {
         address currentTokenAddress = _getTokenAddress();
 
         int64 responseCode = IHederaTokenService(_PRECOMPILED_ADDRESS).pauseToken(currentTokenAddress);
@@ -31,7 +31,7 @@ contract PausableFacet is IPausable, IStaticFunctionSelectors, TokenOwnerStorage
      * @dev Unpauses the token in order to allow it to be involved in any kind of operation
      *
      */
-    function unpause() external override(IPausable) onlyRole(_getRoleId(IRoles.RoleName.PAUSE)) returns (bool) {
+    function unpause() external override(IPausable) onlyRole(_PAUSE_ROLE) returns (bool) {
         address currentTokenAddress = _getTokenAddress();
 
         int64 responseCode = IHederaTokenService(_PRECOMPILED_ADDRESS).unpauseToken(currentTokenAddress);

contracts/contracts/extensions/RescuableFacet.sol

@@ -9,8 +9,8 @@ import {IHederaTokenService} from '@hashgraph/smart-contracts/contracts/system-c
 import {ReentrancyGuard} from '@openzeppelin/contracts/security/ReentrancyGuard.sol';
 import {SafeCast} from '@openzeppelin/contracts/utils/math/SafeCast.sol';
 import {_RESCUABLE_RESOLVER_KEY} from '../constants/resolverKeys.sol';
-import {IRoles} from './Interfaces/IRoles.sol';
 import {IStaticFunctionSelectors} from '../resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {_RESCUE_ROLE} from '../constants/roles.sol';
 
 contract RescuableFacet is
     ReentrancyGuard,
@@ -31,7 +31,7 @@ contract RescuableFacet is
     )
         external
         override(IRescuable)
-        onlyRole(_getRoleId(IRoles.RoleName.RESCUE))
+        onlyRole(_RESCUE_ROLE)
         amountIsNotNegative(amount, false)
         valueIsNotGreaterThan(SafeCast.toUint256(amount), _balanceOf(address(this)), true)
         returns (bool)
@@ -64,7 +64,7 @@ contract RescuableFacet is
     )
         external
         override(IRescuable)
-        onlyRole(_getRoleId(IRoles.RoleName.RESCUE))
+        onlyRole(_RESCUE_ROLE)
         valueIsNotGreaterThan(amount, address(this).balance, true)
         nonReentrant
         returns (bool)

contracts/contracts/extensions/ReserveFacet.sol

@@ -2,10 +2,10 @@
 pragma solidity 0.8.18;
 
 import {IReserve} from './Interfaces/IReserve.sol';
-import {IRoles} from './Interfaces/IRoles.sol';
 import {ReserveStorageWrapper} from './ReserveStorageWrapper.sol';
 import {_RESERVE_RESOLVER_KEY} from '../constants/resolverKeys.sol';
 import {IStaticFunctionSelectors} from '../resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {ADMIN_ROLE} from '../constants/roles.sol';
 
 contract ReserveFacet is IReserve, IStaticFunctionSelectors, ReserveStorageWrapper {
     /**
@@ -21,9 +21,7 @@ contract ReserveFacet is IReserve, IStaticFunctionSelectors, ReserveStorageWrapp
      *
      * @param newAddress The new reserve address. Can be set to 0.0.0 (zero address) to disable the reserve.
      */
-    function updateReserveAddress(
-        address newAddress
-    ) external override(IReserve) onlyRole(_getRoleId(IRoles.RoleName.ADMIN)) {
+    function updateReserveAddress(address newAddress) external override(IReserve) onlyRole(ADMIN_ROLE) {
         address previous = _reserveStorage().reserveAddress;
         _reserveStorage().reserveAddress = newAddress;
         emit ReserveAddressChanged(previous, newAddress);

contracts/contracts/extensions/RoleManagementFacet.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.18;
 
-import {IRoles} from './Interfaces/IRoles.sol';
 import {IRoleManagement} from './Interfaces/IRoleManagement.sol';
 import {SupplierAdminStorageWrapper} from './SupplierAdminStorageWrapper.sol';
 import {_ROLE_MANAGEMENT_RESOLVER_KEY} from '../constants/resolverKeys.sol';
 import {IStaticFunctionSelectors} from '../resolver/interfaces/resolverProxy/IStaticFunctionSelectors.sol';
+import {ADMIN_ROLE, _CASHIN_ROLE} from '../constants/roles.sol';
 
 contract RoleManagementFacet is IRoleManagement, IStaticFunctionSelectors, SupplierAdminStorageWrapper {
     /**
@@ -19,11 +19,9 @@ contract RoleManagementFacet is IRoleManagement, IStaticFunctionSelectors, Suppl
         bytes32[] calldata roles,
         address[] calldata accounts,
         uint256[] calldata amounts
-    ) external override(IRoleManagement) onlyRole(_getRoleId(IRoles.RoleName.ADMIN)) addressesAreNotZero(accounts) {
-        bytes32 cashInRole = _getRoleId(IRoles.RoleName.CASHIN);
-
+    ) external override(IRoleManagement) onlyRole(ADMIN_ROLE) addressesAreNotZero(accounts) {
         for (uint256 i = 0; i < roles.length; i++) {
-            if (roles[i] == cashInRole) {
+            if (roles[i] == _CASHIN_ROLE) {
                 if (accounts.length != amounts.length) revert ArraysLengthNotEqual(accounts.length, amounts.length);
                 for (uint256 j = 0; j < accounts.length; j++) {
                     if (amounts[j] != 0) _grantSupplierRole(accounts[j], amounts[j]);
@@ -46,11 +44,9 @@ contract RoleManagementFacet is IRoleManagement, IStaticFunctionSelectors, Suppl
     function revokeRoles(
         bytes32[] calldata roles,
         address[] calldata accounts
-    ) external override(IRoleManagement) onlyRole(_getRoleId(IRoles.RoleName.ADMIN)) {
-        bytes32 cashInRole = _getRoleId(IRoles.RoleName.CASHIN);
-
+    ) external override(IRoleManagement) onlyRole(ADMIN_ROLE) {
         for (uint256 i = 0; i < roles.length; i++) {
-            if (roles[i] == cashInRole) {
+            if (roles[i] == _CASHIN_ROLE) {
                 for (uint256 j = 0; j < accounts.length; j++) {
                     _revokeSupplierRole(accounts[j]);
                 }