@etherisc/gif-next 0.0.2-95b223b-528 → 0.0.2-95f0eec-843

package/contracts/registry/Registry.sol

@@ -12,6 +12,7 @@ import {ObjectType, ObjectTypeLib, PROTOCOL, REGISTRY, SERVICE, INSTANCE, STAKE,
 
 import {ChainNft} from "./ChainNft.sol";
 import {IRegistry} from "./IRegistry.sol";
+import {IRelease} from "./IRelease.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IStaking} from "../staking/IStaking.sol";
 import {ReleaseRegistry} from "./ReleaseRegistry.sol";
@@ -171,7 +172,7 @@ contract Registry is
             revert ErrorRegistryChainRegistryNftIdInvalid(nftId, chainId);
         }
 
-        emit LogChainRegistryRegistration(nftId, chainId, registryAddress);
+        emit LogRegistryChainRegistryRegistered(nftId, chainId, registryAddress);
 
         _registerRegistryForNft(
             chainId,
@@ -230,7 +231,7 @@ contract Registry is
 
         _service[version][domain] = service;
 
-        emit LogServiceRegistration(version, domain);
+        emit LogRegistryServiceRegistered(version, domain);
 
         nftId = _register(info);
     }
@@ -245,6 +246,11 @@ contract Registry is
         address objectAddress = info.objectAddress;
         ObjectType objectType = info.objectType;
 
+        // specialized functions have to be used to register registries and services
+        if(objectType == REGISTRY() || objectType == STAKING() || objectType == SERVICE()) {
+            revert ErrorRegistryObjectTypeNotSupported(objectType);
+        }
+
         // this indidirectly enforces that the parent is registered
         // parentType would be zero for a non-registered parent which is never a valid type combination
         ObjectType parentType = _info[info.parentNftId].objectType;
@@ -252,13 +258,13 @@ contract Registry is
         // check type combinations for core objects
         if(objectAddress == address(0)) {
             if(_coreObjectCombinations[objectType][parentType] == false) {
-                revert ErrorRegistryTypesCombinationInvalid(objectAddress, objectType, parentType);
+                revert ErrorRegistryTypeCombinationInvalid(objectAddress, objectType, parentType);
             }
         }
         // check type combinations for contract objects
         else {
             if(_coreContractCombinations[objectType][parentType] == false) {
-                revert ErrorRegistryTypesCombinationInvalid(objectAddress, objectType, parentType);
+                revert ErrorRegistryTypeCombinationInvalid(objectAddress, objectType, parentType);
             }
         }
 
@@ -283,9 +289,10 @@ contract Registry is
             objectType == ObjectTypeLib.zero() ||
             parentType == ObjectTypeLib.zero() ||
             parentType == PROTOCOL() ||
+            parentType == STAKING() ||
             parentType == SERVICE()
         ) {
-            revert ErrorRegistryTypesCombinationInvalid(info.objectAddress, objectType, parentType);
+            revert ErrorRegistryTypeCombinationInvalid(info.objectAddress, objectType, parentType);
         }
 
         nftId = _register(info);
@@ -307,8 +314,8 @@ contract Registry is
         return _releaseRegistry.getLatestVersion();
     }
 
-    function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory) {
-        return _releaseRegistry.getReleaseInfo(version);
+    function getReleaseInfo(VersionPart release) external view returns (IRelease.ReleaseInfo memory) {
+        return _releaseRegistry.getReleaseInfo(release);
     }
 
     function chainIds() public view returns (uint256) {
@@ -355,6 +362,10 @@ contract Registry is
         return _info[nftId];
     }
 
+    function getParentNftId(NftId nftId) external view returns (NftId parentNftId) {
+        return _info[nftId].parentNftId;
+    }
+
     function isObjectType(address contractAddress, ObjectType expectedObjectType) external view returns (bool) {
         NftId nftId = _nftIdByAddress[contractAddress];
         return isObjectType(nftId, expectedObjectType);
@@ -490,7 +501,7 @@ contract Registry is
         _info[nftId] = info;
         _setAddressForNftId(nftId, objectAddress);
 
-        emit LogRegistration(nftId, parentNftId, objectType, isInterceptor, objectAddress, owner);
+        emit LogRegistryObjectRegistered(nftId, parentNftId, objectType, isInterceptor, objectAddress, owner);
 
         // calls nft receiver(1) and interceptor(2)
         uint256 mintedTokenId = CHAIN_NFT.mint(

package/contracts/registry/RegistryAdmin.sol

@@ -1,24 +1,23 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.20;
 
-import {AccessAdmin} from "../authorization/AccessAdmin.sol";
-import {IAccess} from "../authorization/IAccess.sol";
+import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IRegistry} from "./IRegistry.sol";
 import {IService} from "../shared/IService.sol";
-import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
 import {IStaking} from "../staking/IStaking.sol";
-import {ObjectType, ObjectTypeLib, ALL, REGISTRY, STAKING, POOL, RELEASE} from "../type/ObjectType.sol";
-import {ReleaseRegistry} from "./ReleaseRegistry.sol";
-import {RoleId, RoleIdLib, ADMIN_ROLE, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {Staking} from "../staking/Staking.sol";
-import {StakingStore} from "../staking/StakingStore.sol";
-import {TokenHandler} from "../shared/TokenHandler.sol";
-import {TokenRegistry} from "./TokenRegistry.sol";
+
+import {AccessAdmin} from "../authorization/AccessAdmin.sol";
+import {AccessAdminLib} from "../authorization/AccessAdminLib.sol";
+import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
+import {ObjectType, REGISTRY} from "../type/ObjectType.sol";
+import {RoleId, RoleIdLib, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE} from "../type/RoleId.sol";
+import {Str} from "../type/String.sol";
 import {VersionPart} from "../type/Version.sol";
 
 /*
     1) GIF_MANAGER_ROLE
         - can have arbitrary number of members
+        - responsible for release preparation
         - responsible for services registrations
         - responsible for token registration and activation
 
@@ -26,29 +25,31 @@ import {VersionPart} from "../type/Version.sol";
         - admin of GIF_MANAGER_ROLE
         - MUST have 1 member at any time
         - granted/revoked ONLY in transferAdminRole() -> consider lock out situations!!!
-        - responsible for creation and activation of releases
+        - responsible for creation, activation and locking/unlocking of releases
 */
+
+/// @dev The RegistryAdmin contract implements the central authorization for the GIF core contracts.
+/// These are the release independent registry and staking contracts and their respective helper contracts.
+/// The RegistryAdmin also manages the access from service contracts to the GIF core contracts
 contract RegistryAdmin is
     AccessAdmin
 {
+    /// @dev gif core roles
     string public constant GIF_ADMIN_ROLE_NAME = "GifAdminRole";
     string public constant GIF_MANAGER_ROLE_NAME = "GifManagerRole";
-    string public constant POOL_SERVICE_ROLE_NAME = "PoolServiceRole";
-    string public constant RELEASE_REGISTRY_ROLE_NAME = "ReleaseRegistryRole";
-    string public constant REGISTRY_SERVICE_ROLE_NAME = "RegistryServiceRole";
-    string public constant STAKING_SERVICE_ROLE_NAME = "StakingServiceRole";
-    string public constant STAKING_ROLE_NAME = "StakingRole";
 
+    /// @dev gif core targets
+    string public constant REGISTRY_ADMIN_TARGET_NAME = "RegistryAdmin";
     string public constant REGISTRY_TARGET_NAME = "Registry";
     string public constant RELEASE_REGISTRY_TARGET_NAME = "ReleaseRegistry";
-    string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
     string public constant STAKING_TARGET_NAME = "Staking";
     string public constant STAKING_TH_TARGET_NAME = "StakingTH";
     string public constant STAKING_STORE_TARGET_NAME = "StakingStore";
+    string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
+    string public constant TOKEN_HANDLER_TARGET_NAME = "TokenHandler";
 
-    uint8 public constant MAX_NUM_RELEASES = 99;
-    // TODO consider deleting this
-    mapping(address service => VersionPart majorVersion) private _ServiceRelease;
+    // completeSetup
+    error ErrorRegistryAdminNotRegistry(address registry);
 
     address internal _registry;
     address private _releaseRegistry;
@@ -56,402 +57,132 @@ contract RegistryAdmin is
     address private _staking;
     address private _stakingStore;
 
-    constructor() AccessAdmin() { }
+    constructor() {
+        initialize(
+            address(new AccessManagerCloneable()),
+            "RegistryAdmin");
+    }
+
 
     function completeSetup(
-        IRegistry registry,
+        address registry,
+        address authorization,
+        VersionPart release,
         address gifAdmin, 
         address gifManager
     )
-        external
-        initializer()
+        public
+        virtual
+        reinitializer(type(uint8).max)
         onlyDeployer()
     {
-        _registry = address(registry);
-        _releaseRegistry = registry.getReleaseRegistryAddress();
-        _tokenRegistry = registry.getTokenRegistryAddress();
-        _staking = registry.getStakingAddress();
+        // checks
+        AccessAdminLib.checkRegistry(registry);
+
+        AccessManagerCloneable(
+            authority()).completeSetup(
+                registry, 
+                release); 
+
+        _checkAuthorization(authorization, REGISTRY(), release, false, true);
+
+        _registry = registry;
+        _authorization = IAuthorization(authorization);
+
+        IRegistry registryContract = IRegistry(registry);
+        _releaseRegistry = registryContract.getReleaseRegistryAddress();
+        _tokenRegistry = registryContract.getTokenRegistryAddress();
+        _staking = registryContract.getStakingAddress();
         _stakingStore = address(
             IStaking(_staking).getStakingStore());
 
-        // at this moment all registry contracts are deployed and fully intialized
-        _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, true, false);
+        // link nft ownability to registry
+        _linkToNftOwnable(_registry);
 
-        _setupGifAdminRole(gifAdmin);
-        _setupGifManagerRole(gifManager);
-
-        _setupReleaseRegistry();
-        _setupRegistry();
-        _setupStaking();
-    }
+        // setup registry core targets
+        _createCoreTargets(_authorization.getMainTargetName());
 
+        // setup non-contract roles
+        _createRoles(_authorization);
+        _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
+        _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
 
-    /// @dev Sets up authorizaion for specified service.
-    /// For all authorized services its authorized functions are enabled.
-    /// Permissioned function: Access is restricted to release manager.
-    function authorizeService(
-        IServiceAuthorization serviceAuthorization,
-        IService service,
-        ObjectType serviceDomain,
-        VersionPart releaseVersion
-    )
-        external
-        restricted()
-    {
-        _createServiceTargetAndRole(service, serviceDomain, releaseVersion);
-        _authorizeServiceFunctions(serviceAuthorization, service, serviceDomain, releaseVersion);
+        // authorize functions of registry and staking contracts
+        _createTargetAuthorizations(_authorization);
     }
 
-    function grantServiceRole(
-        IService service,
-        ObjectType domain, 
-        VersionPart version
-    )
-        external
-        restricted()
-    {
-        _grantRoleToAccount( 
-            RoleIdLib.roleForTypeAndVersion(
-                domain, 
-                version),
-            address(service)); 
-    }
 
-    function grantServiceRoleForAllVersions(IService service, ObjectType domain)
+    function grantServiceRoleForAllVersions(
+        IService service, 
+        ObjectType domain
+    )
         external
         restricted()
     {
         _grantRoleToAccount( 
-            RoleIdLib.roleForTypeAndAllVersions(domain),
+            RoleIdLib.toGenericServiceRoleId(domain),
             address(service)); 
     }
 
-    function setServiceLocked(IService service, bool locked)
-        external
-        restricted()
-    {
-        _setTargetClosed(address(service), locked);
-    }
-
-    /*function transferAdmin(address to)
-        external
-        restricted // only with GIF_ADMIN_ROLE or nft owner
-    {
-        _accessManager.revoke(GIF_ADMIN_ROLE, );
-        _accesssManager.grant(GIF_ADMIN_ROLE, to, 0);
-    }*/
-
     //--- view functions ----------------------------------------------------//
 
-    function getGifAdminRole() external view returns (RoleId) {
+    function getGifAdminRole() external pure returns (RoleId) {
         return GIF_ADMIN_ROLE();
     }
 
-    function getGifManagerRole() external view returns (RoleId) {
+    function getGifManagerRole() external pure returns (RoleId) {
         return GIF_MANAGER_ROLE();
     }
 
-    //--- private functions -------------------------------------------------//
-
-    function _createServiceTargetAndRole(
-        IService service, 
-        ObjectType serviceDomain, 
-        VersionPart releaseVersion
-    )
-        private
-    {
-        string memory baseName = ObjectTypeLib.toName(serviceDomain);
-        uint256 versionInt = releaseVersion.toInt();
-
-        // create service target
-        string memory serviceTargetName = ObjectTypeLib.toVersionedName(
-            baseName, "Service", versionInt);
-
-        _createTarget(
-            address(service), 
-            serviceTargetName,
-            true,
-            false);
-
-        _setTargetClosed(address(service), true);
-
-        // create service role
-        RoleId serviceRoleId = RoleIdLib.roleForTypeAndVersion(
-            serviceDomain, 
-            releaseVersion);
-
-        _createRole(
-            serviceRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: 1,
-                name: ObjectTypeLib.toVersionedName(
-                    baseName, 
-                    "ServiceRole", 
-                    versionInt)}));
-
-        _grantRoleToAccount( 
-            serviceRoleId,
-            address(service)); 
-    }
-
+    //--- private initialization functions -------------------------------------------//
 
-    function _authorizeServiceFunctions(
-        IServiceAuthorization serviceAuthorization,
-        IService service,
-        ObjectType serviceDomain, 
-        VersionPart releaseVersion
-    )
-        private
+    function _createRoles(IAuthorization authorization)
+        internal
     {
-        ObjectType authorizedDomain;
-        RoleId authorizedRoleId;
+        RoleId[] memory roles = authorization.getRoles();
 
-        ObjectType[] memory authorizedDomains = serviceAuthorization.getAuthorizedDomains(serviceDomain);
+        for(uint256 i = 0; i < roles.length; i++) {
+            RoleId roleId = roles[i];
+            RoleInfo memory roleInfo = authorization.getRoleInfo(roleId);
 
-        for (uint256 i = 0; i < authorizedDomains.length; i++) {
-            authorizedDomain = authorizedDomains[i];
-
-            // derive authorized role from authorized domain
-            if (authorizedDomain == ALL()) {
-                authorizedRoleId = PUBLIC_ROLE();
-            } else {
-                authorizedRoleId = RoleIdLib.roleForTypeAndVersion(
-                authorizedDomain, 
-                releaseVersion);
+            // create role if not exists
+            if (!roleExists(roleInfo.name.toString())) {
+                _createRole(
+                    roleId,
+                    roleInfo);
             }
-
-            // get authorized functions for authorized domain
-            IAccess.FunctionInfo[] memory authorizatedFunctions = serviceAuthorization.getAuthorizedFunctions(
-                serviceDomain, 
-                authorizedDomain);
-
-            _authorizeTargetFunctions(
-                    address(service), 
-                    authorizedRoleId, 
-                    authorizatedFunctions);
         }
     }
 
-    //--- private initialization functions -------------------------------------------//
-
-    function _setupGifAdminRole(address gifAdmin) 
-        private 
-        onlyInitializing()
-    {
-        
-        _createRole(
-            GIF_ADMIN_ROLE(), 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Gif,
-                maxMemberCount: 2, // TODO decide on max member count
-                name: GIF_ADMIN_ROLE_NAME}));
-
-        // for Registry
-        FunctionInfo[] memory functions;
-        functions = new FunctionInfo[](1);
-        functions[0] = toFunction(IRegistry.registerRegistry.selector, "registerRegistry");
-        _authorizeTargetFunctions(_registry, GIF_ADMIN_ROLE(), functions);
-
-        // for ReleaseRegistry
-        functions = new FunctionInfo[](4);
-        functions[0] = toFunction(ReleaseRegistry.createNextRelease.selector, "createNextRelease");
-        functions[1] = toFunction(ReleaseRegistry.activateNextRelease.selector, "activateNextRelease");
-        functions[2] = toFunction(ReleaseRegistry.pauseRelease.selector, "pauseRelease");
-        functions[3] = toFunction(ReleaseRegistry.unpauseRelease.selector, "unpauseRelease");
-        _authorizeTargetFunctions(_releaseRegistry, GIF_ADMIN_ROLE(), functions);
-
-        _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
-    }
-    
-    function _setupGifManagerRole(address gifManager)
-        private 
-        onlyInitializing()
-    {
-
-        _createRole(
-            GIF_MANAGER_ROLE(), 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Gif,
-                maxMemberCount: 1,
-                name: GIF_MANAGER_ROLE_NAME}));
-
-        // for TokenRegistry
-        FunctionInfo[] memory functions;
-        functions = new FunctionInfo[](5);
-        functions[0] = toFunction(TokenRegistry.registerToken.selector, "registerToken");
-        functions[1] = toFunction(TokenRegistry.registerRemoteToken.selector, "registerRemoteToken");
-        functions[2] = toFunction(TokenRegistry.setActive.selector, "setActive");
-        functions[3] = toFunction(TokenRegistry.setActiveForVersion.selector, "setActiveForVersion");
-        // TODO find a better way (only needed for testing)
-        functions[4] = toFunction(TokenRegistry.setActiveWithVersionCheck.selector, "setActiveWithVersionCheck");
-        _authorizeTargetFunctions(_tokenRegistry, GIF_MANAGER_ROLE(), functions);
-
-        // for ReleaseRegistry
-        functions = new FunctionInfo[](2);
-        functions[0] = toFunction(ReleaseRegistry.prepareNextRelease.selector, "prepareNextRelease");
-        functions[1] = toFunction(ReleaseRegistry.registerService.selector, "registerService");
-        _authorizeTargetFunctions(_releaseRegistry, GIF_MANAGER_ROLE(), functions);
-
-        _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
-    }
-
 
-    function _setupReleaseRegistry()
-        private 
-        onlyInitializing()
+    function _createCoreTargets(string memory registryTargetName)
+        internal
     {
-
-        _createTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, true, false);
-
-        RoleId releaseRegistryRoleId = RoleIdLib.roleForType(RELEASE());
-        _createRole(
-            releaseRegistryRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: 1,
-                name: RELEASE_REGISTRY_ROLE_NAME}));
-
-        FunctionInfo[] memory functions;
-        functions = new FunctionInfo[](4);
-        functions[0] = toFunction(RegistryAdmin.authorizeService.selector, "authorizeService");
-        functions[1] = toFunction(RegistryAdmin.grantServiceRoleForAllVersions.selector, "grantServiceRoleForAllVersions");
-        functions[2] = toFunction(RegistryAdmin.grantServiceRole.selector, "grantServiceRole");
-        functions[3] = toFunction(RegistryAdmin.setServiceLocked.selector, "setServiceLocked");
-        _authorizeTargetFunctions(address(this), releaseRegistryRoleId, functions);
-
-        _grantRoleToAccount(releaseRegistryRoleId, _releaseRegistry);
+        // registry
+        _createUncheckedTarget(_registry, registryTargetName, TargetType.Core);
+        _createUncheckedTarget(address(this), REGISTRY_ADMIN_TARGET_NAME, TargetType.Core);
+        _createUncheckedTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, TargetType.Core);
+        _createUncheckedTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, TargetType.Core);
+
+        // staking
+        _createUncheckedTarget(_staking, STAKING_TARGET_NAME, TargetType.Core);
+        _createUncheckedTarget(_stakingStore, STAKING_STORE_TARGET_NAME, TargetType.Core);
     }
 
 
-    function _setupRegistry()
+    function _createTargetAuthorizations(IAuthorization authorization)
         internal
-        virtual
-        onlyInitializing()
     {
-        _createTarget(_registry, REGISTRY_TARGET_NAME, true, false);
-
-        // registry function authorization for registry service
-        RoleId registryServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(REGISTRY());
-        _createRole(
-            registryServiceRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: MAX_NUM_RELEASES,
-                name: REGISTRY_SERVICE_ROLE_NAME}));
-
-        // authorize registry service
-        FunctionInfo[] memory functions;
-        functions = new FunctionInfo[](2);
-        functions[0] = toFunction(IRegistry.register.selector, "register");
-        functions[1] = toFunction(IRegistry.registerWithCustomType.selector, "registerWithCustomType");
-        _authorizeTargetFunctions(_registry, registryServiceRoleId, functions);
-
-        // authorize release registry
-        RoleId releaseRegistryRoleId = RoleIdLib.roleForType(RELEASE());
-        functions = new FunctionInfo[](1);
-        functions[0] = toFunction(IRegistry.registerService.selector, "registerService");
-        _authorizeTargetFunctions(_registry, releaseRegistryRoleId, functions);
-    }
+        Str[] memory targets = authorization.getTargets();
+        Str target;
 
+        for(uint256 i = 0; i < targets.length; i++) {
+            target = targets[i];
+            RoleId[] memory authorizedRoles = authorization.getAuthorizedRoles(target);
 
-    function _setupStaking()
-        private 
-        onlyInitializing()
-    {
-        _createTarget(_staking, STAKING_TARGET_NAME, true, false);
-        _createTarget(address(IStaking(_staking).getTokenHandler()), STAKING_TH_TARGET_NAME, true, false);
-        _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, true, false);
-
-        // staking function authorization for public role
-        FunctionInfo[] memory functions;
-        functions = new FunctionInfo[](1);
-        functions[0] = toFunction(Staking.approveTokenHandler.selector, "approveTokenHandler");
-        _authorizeTargetFunctions(_staking, PUBLIC_ROLE(), functions); // only owner protected
-
-        // staking function authorization for staking service
-        RoleId stakingServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(STAKING());
-        _createRole(
-            stakingServiceRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: MAX_NUM_RELEASES,
-                name: STAKING_SERVICE_ROLE_NAME}));
-
-        functions = new FunctionInfo[](12);
-        functions[0] = toFunction(IStaking.registerTarget.selector, "registerTarget");
-        functions[1] = toFunction(IStaking.setLockingPeriod.selector, "setLockingPeriod");
-        functions[2] = toFunction(IStaking.setRewardRate.selector, "setRewardRate");
-        functions[3] = toFunction(IStaking.refillRewardReserves.selector, "refillRewardReserves");
-        functions[4] = toFunction(IStaking.withdrawRewardReserves.selector, "withdrawRewardReserves");
-        functions[5] = toFunction(IStaking.createStake.selector, "createStake");
-        functions[6] = toFunction(IStaking.stake.selector, "stake");
-        functions[7] = toFunction(IStaking.unstake.selector, "unstake");
-        functions[8] = toFunction(IStaking.restake.selector, "restake");
-        functions[9] = toFunction(IStaking.updateRewards.selector, "updateRewards");
-        functions[10] = toFunction(IStaking.claimRewards.selector, "claimRewards");
-        _authorizeTargetFunctions(_staking, stakingServiceRoleId, functions);
-    
-        // grant token handler authorizations
-        IStaking staking = IStaking(_staking);
-        functions = new FunctionInfo[](2);
-        functions[0] = toFunction(TokenHandler.collectTokens.selector, "collectTokens");
-        functions[1] = toFunction(TokenHandler.distributeTokens.selector, "distributeTokens");
-
-        _authorizeTargetFunctions(
-            address(staking.getTokenHandler()), 
-            stakingServiceRoleId, 
-            functions);
-
-        // staking function authorization for pool service
-        RoleId poolServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(POOL());
-        _createRole(
-            poolServiceRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: MAX_NUM_RELEASES,
-                name: POOL_SERVICE_ROLE_NAME}));
-
-        // staking function authorizations
-        functions = new FunctionInfo[](2);
-        functions[0] = toFunction(IStaking.increaseTotalValueLocked.selector, "increaseTotalValueLocked");
-        functions[1] = toFunction(IStaking.decreaseTotalValueLocked.selector, "decreaseTotalValueLocked");
-        _authorizeTargetFunctions(_staking, poolServiceRoleId, functions);
-
-        // staking store function authorizations
-        RoleId stakingRoleId = RoleIdLib.roleForType(STAKING());
-        _createRole(
-            stakingRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: 1,
-                name: STAKING_ROLE_NAME}));
-
-        functions = new FunctionInfo[](14);
-        functions[0] = toFunction(StakingStore.setStakingRate.selector, "setStakingRate");
-        functions[1] = toFunction(StakingStore.createTarget.selector, "createTarget");
-        functions[2] = toFunction(StakingStore.updateTarget.selector, "updateTarget");
-        functions[3] = toFunction(StakingStore.increaseReserves.selector, "increaseReserves");
-        functions[4] = toFunction(StakingStore.decreaseReserves.selector, "decreaseReserves");
-        functions[5] = toFunction(StakingStore.increaseTotalValueLocked.selector, "increaseTotalValueLocked");
-        functions[6] = toFunction(StakingStore.decreaseTotalValueLocked.selector, "decreaseTotalValueLocked");
-        functions[7] = toFunction(StakingStore.create.selector, "create");
-        functions[8] = toFunction(StakingStore.update.selector, "update");
-        functions[9] = toFunction(StakingStore.increaseStake.selector, "increaseStake");
-        functions[10] = toFunction(StakingStore.restakeRewards.selector, "restakeRewards");
-        functions[11] = toFunction(StakingStore.updateRewards.selector, "updateRewards");
-        functions[12] = toFunction(StakingStore.claimUpTo.selector, "claimUpTo");
-        functions[13] = toFunction(StakingStore.unstakeUpTo.selector, "unstakeUpTo");
-        _authorizeTargetFunctions(_stakingStore, stakingRoleId, functions);
-        
-        _grantRoleToAccount(stakingRoleId, _staking);
+            for(uint256 j = 0; j < authorizedRoles.length; j++) {
+                _authorizeFunctions(authorization, target, authorizedRoles[j]);
+            }
+        }
     }
 }