@etherisc/gif-next 0.0.2-952752e-374 → 0.0.2-957bd35-589

package/contracts/registry/IRegistry.sol

@@ -19,13 +19,16 @@ interface IRegistry is
     IERC165
 {
 
-    event LogRegistration(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
-    event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
-    event LogChainRegistryRegistration(NftId nftId, uint256 chainId, address chainRegistryAddress);
+    event LogRegistryObjectRegistered(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
+    event LogRegistryServiceRegistered(VersionPart majorVersion, ObjectType domain);
+    event LogRegistryChainRegistryRegistered(NftId nftId, uint256 chainId, address chainRegistryAddress);
 
     // initialize
     error ErrorRegistryCallerNotDeployer();
 
+    // register()
+    error ErrorRegistryObjectTypeNotSupported(ObjectType objectType);
+
     // registerRegistry()
     error ErrorRegistryNotOnMainnet(uint256 chainId);
     error ErrorRegistryChainRegistryChainIdZero(NftId nftId);
@@ -36,8 +39,7 @@ interface IRegistry is
     // registerService()
     error ErrorRegistryServiceAddressZero(); 
     error ErrorRegistryServiceVersionZero(address service);
-    //error ErrorRegistryServiceVersionMismatch(address service, VersionPart serviceVersion, VersionPart releaseVersion);
-    //error ErrorRegistryServiceVersionNotDeploying(address service, VersionPart version);
+
     error ErrorRegistryServiceDomainZero(address service, VersionPart version);
     error ErrorRegistryNotService(address service, ObjectType objectType);
     error ErrorRegistryServiceParentNotRegistry(address service, VersionPart version, NftId parentNftId);
@@ -48,16 +50,20 @@ interface IRegistry is
 
     // _register()
     error ErrorRegistryGlobalRegistryAsParent(address objectAddress, ObjectType objectType);
-    error ErrorRegistryTypesCombinationInvalid(address objectAddress, ObjectType objectType, ObjectType parentType);
+    error ErrorRegistryTypeCombinationInvalid(address objectAddress, ObjectType objectType, ObjectType parentType);
     error ErrorRegistryContractAlreadyRegistered(address objectAddress);
 
     struct ObjectInfo {
+        // slot 0
         NftId nftId;
         NftId parentNftId;
         ObjectType objectType;
         bool isInterceptor;
+        // slot 1
         address objectAddress;
+        // slot 2
         address initialOwner;
+        // slot 3
         bytes data;
     }
 
@@ -89,11 +95,11 @@ interface IRegistry is
     /// May not be used to register known core types.
     function registerWithCustomType(ObjectInfo memory info) external returns (NftId nftId);
 
-    function getInitialVersion() external view returns (VersionPart);
+    function getInitialRelease() external view returns (VersionPart);
 
-    function getNextVersion() external view returns (VersionPart);
+    function getNextRelease() external view returns (VersionPart);
 
-    function getLatestVersion() external view returns (VersionPart);
+    function getLatestRelease() external view returns (VersionPart);
 
     function getReleaseInfo(VersionPart release) external view returns (IRelease.ReleaseInfo memory);
 
@@ -118,6 +124,8 @@ interface IRegistry is
 
     function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory info);
 
+    function getParentNftId(NftId nftId) external view returns (NftId parentNftId);
+
     function isObjectType(NftId nftId, ObjectType expectedObjectType) external view returns (bool);
 
     function isObjectType(address contractAddress, ObjectType expectedObjectType) external view returns (bool);

package/contracts/registry/IRelease.sol

@@ -11,13 +11,16 @@ import {VersionPart} from "../type/Version.sol";
 interface IRelease {
 
     struct ReleaseInfo {
+        // slot 0
+        address releaseAdmin;
         StateId state;
         VersionPart version;
-        bytes32 salt;
-        IServiceAuthorization auth;
-        address releaseAdmin;
         Timestamp activatedAt;
         Timestamp disabledAt;
+        // slot 1
+        IServiceAuthorization auth;
+        // slot 2
+        bytes32 salt;
     }
 
     /// @dev Registers a registry contract for a specified chain.

package/contracts/registry/Registry.sol

@@ -172,7 +172,7 @@ contract Registry is
             revert ErrorRegistryChainRegistryNftIdInvalid(nftId, chainId);
         }
 
-        emit LogChainRegistryRegistration(nftId, chainId, registryAddress);
+        emit LogRegistryChainRegistryRegistered(nftId, chainId, registryAddress);
 
         _registerRegistryForNft(
             chainId,
@@ -231,7 +231,7 @@ contract Registry is
 
         _service[version][domain] = service;
 
-        emit LogServiceRegistration(version, domain);
+        emit LogRegistryServiceRegistered(version, domain);
 
         nftId = _register(info);
     }
@@ -246,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;
@@ -253,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);
             }
         }
 
@@ -284,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);
@@ -294,17 +300,17 @@ contract Registry is
 
 
     /// @dev earliest GIF major version 
-    function getInitialVersion() external view returns (VersionPart) {
+    function getInitialRelease() external view returns (VersionPart) {
         return VersionPartLib.toVersionPart(_releaseRegistry.INITIAL_GIF_VERSION());
     }
 
     /// @dev next GIF release version to be released
-    function getNextVersion() external view returns (VersionPart) {
+    function getNextRelease() external view returns (VersionPart) {
         return _releaseRegistry.getNextVersion();
     }
 
     /// @dev latest active GIF release version 
-    function getLatestVersion() external view returns (VersionPart) { 
+    function getLatestRelease() external view returns (VersionPart) { 
         return _releaseRegistry.getLatestVersion();
     }
 
@@ -356,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);
@@ -491,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,21 +1,18 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.20;
 
-import {AccessAdmin} from "../authorization/AccessAdmin.sol";
-import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.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 {VersionPart, VersionPartLib} from "../type/Version.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
@@ -40,305 +37,137 @@ contract RegistryAdmin is
     /// @dev gif core roles
     string public constant GIF_ADMIN_ROLE_NAME = "GifAdminRole";
     string public constant GIF_MANAGER_ROLE_NAME = "GifManagerRole";
-    string public constant RELEASE_REGISTRY_ROLE_NAME = "ReleaseRegistryRole";
-    string public constant STAKING_ROLE_NAME = "StakingRole";
-
-    /// @dev gif roles for external contracts
-    string public constant REGISTRY_SERVICE_ROLE_NAME = "RegistryServiceRole";
-    string public constant POOL_SERVICE_ROLE_NAME = "PoolServiceRole";
-    string public constant STAKING_SERVICE_ROLE_NAME = "StakingServiceRole";
 
     /// @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 STAKING_TARGET_NAME = "Staking";
-    string public constant STAKING_TH_TARGET_NAME = "StakingTH";
+    string public constant STAKING_TARGET_HANDLER_NAME = "TargetHandler";
     string public constant STAKING_STORE_TARGET_NAME = "StakingStore";
+    string public constant STAKING_TH_TARGET_NAME = "StakingTH";
     string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
     string public constant TOKEN_HANDLER_TARGET_NAME = "TokenHandler";
 
-    uint8 public constant MAX_NUM_RELEASES = 99;
+    // completeSetup
+    error ErrorRegistryAdminNotRegistry(address registry);
 
     address internal _registry;
     address private _releaseRegistry;
     address private _tokenRegistry;
     address private _staking;
+    address private _stakingTargetHandler;
     address private _stakingStore;
 
     constructor() {
-        initialize(new AccessManagerCloneable());
+        initialize(
+            address(new AccessManagerCloneable()),
+            "RegistryAdmin");
     }
 
+
     function completeSetup(
-        IRegistry registry,
+        address registry,
+        address authorization,
+        VersionPart release,
         address gifAdmin, 
         address gifManager
     )
         public
         virtual
         reinitializer(type(uint8).max)
-        onlyDeployer()
     {
-        AccessManagerCloneable accessManager = AccessManagerCloneable(authority());
-        accessManager.completeSetup(
-            address(registry), 
-            VersionPartLib.toVersionPart(type(uint8).max),
-            false); 
-
-        _registry = address(registry);
-        _releaseRegistry = registry.getReleaseRegistryAddress();
-        _tokenRegistry = registry.getTokenRegistryAddress();
-        _staking = registry.getStakingAddress();
-        _stakingStore = address(
-            IStaking(_staking).getStakingStore());
-
-        _createTargets();
-
-        _setupGifAdminRole(gifAdmin);
-        _setupGifManagerRole(gifManager);
-
-        _setupRegistryRoles();
-        _setupStakingRoles();
+        // 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();
+        _stakingTargetHandler = address(IStaking(_staking).getTargetHandler());
+        _stakingStore = address(IStaking(_staking).getStakingStore());
+
+        // link nft ownability to registry
+        _linkToNftOwnable(_registry);
+
+        _createRoles(_authorization);
+
+        // setup registry core targets
+        _createCoreTargets(_authorization.getMainTargetName());
+
+        // setup non-contract roles
+        _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
+        _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
+
+        // authorize functions of registry and staking contracts
+        _createTargetAuthorizations(_authorization);
     }
 
-    /*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);
-    }*/
 
-    function grantServiceRoleForAllVersions(IService service, ObjectType domain)
+    function grantServiceRoleForAllVersions(
+        IService service, 
+        ObjectType domain
+    )
         external
         restricted()
     {
         _grantRoleToAccount( 
-            RoleIdLib.roleForTypeAndAllVersions(domain),
+            RoleIdLib.toGenericServiceRoleId(domain),
             address(service)); 
     }
 
     //--- 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 initialization functions -------------------------------------------//
 
-    function _createTargets()
-        private 
-        onlyInitializing()
-    {
-        IStaking staking = IStaking(_staking);
-        address tokenHandler = address(staking.getTokenHandler());
-
-        _createTarget(address(this), REGISTRY_ADMIN_TARGET_NAME, false, false);
-        _createTarget(_registry, REGISTRY_TARGET_NAME, true, false);
-        _createTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, true, false);
-        _createTarget(_staking, STAKING_TARGET_NAME, true, false);
-        _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, true, false);
-        _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, true, false);
-        _createTarget(tokenHandler, TOKEN_HANDLER_TARGET_NAME, true, false);
-    }
 
-    function _setupGifAdminRole(address gifAdmin) 
-        private 
-        onlyInitializing()
+    function _createCoreTargets(string memory registryTargetName)
+        internal
     {
-        // create gif admin role
-        _createRole(
-            GIF_ADMIN_ROLE(), 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Gif,
-                maxMemberCount: 2, // TODO decide on max member count
-                name: GIF_ADMIN_ROLE_NAME}));
-
-        // grant permissions to the gif admin role for registry contract
-        FunctionInfo[] memory functions;
-        functions = new FunctionInfo[](1);
-        functions[0] = toFunction(IRegistry.registerRegistry.selector, "registerRegistry");
-        _authorizeTargetFunctions(_registry, GIF_ADMIN_ROLE(), functions);
-
-        // grant permissions to the gif admin role for release registry contract
-        functions = new FunctionInfo[](3);
-        functions[0] = toFunction(ReleaseRegistry.createNextRelease.selector, "createNextRelease");
-        functions[1] = toFunction(ReleaseRegistry.activateNextRelease.selector, "activateNextRelease");
-        functions[2] = toFunction(ReleaseRegistry.setActive.selector, "setActive");
-        _authorizeTargetFunctions(_releaseRegistry, GIF_ADMIN_ROLE(), functions);
-
-        _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
+        // create unchecked registry targets
+        _createTarget(_registry, registryTargetName, TargetType.Core, false);
+        _createTarget(address(this), REGISTRY_ADMIN_TARGET_NAME, TargetType.Core, false);
+        _createTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, TargetType.Core, false);
+        _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, TargetType.Core, false);
+
+        // create unchecked staking targets
+        _createTarget(_staking, STAKING_TARGET_NAME, TargetType.Core, false);
+        _createTarget(_stakingTargetHandler, STAKING_TARGET_HANDLER_NAME, TargetType.Core, false);
+        _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, TargetType.Core, false);
     }
-    
-    function _setupGifManagerRole(address gifManager)
-        private 
-        onlyInitializing()
-    {
-        // create gif manager role
-        _createRole(
-            GIF_MANAGER_ROLE(), 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Gif,
-                maxMemberCount: 1, // TODO decide on max member count
-                name: GIF_MANAGER_ROLE_NAME}));
-
-        // grant permissions to the gif manager role for token registry contract
-        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);
-
-        // grant permissions to the gif manager role for release registry contract
-        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 _setupRegistryRoles()
-        private
-        onlyInitializing()
+    function _createTargetAuthorizations(IAuthorization authorization)
+        internal
     {
-        // TODO use RELEASE_REGISTRY_ROLE instead
-        // create and grant release registry role
-        RoleId releaseRegistryRoleId = RoleIdLib.roleForType(RELEASE());
-        _createRole(
-            releaseRegistryRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: 1,
-                name: RELEASE_REGISTRY_ROLE_NAME}));
-        _grantRoleToAccount(releaseRegistryRoleId, _releaseRegistry);
-
-        // grant permissions to the release registry role for release admin contract
-        FunctionInfo[] memory functions;
-        functions = new FunctionInfo[](1);
-        functions[0] = toFunction(RegistryAdmin.grantServiceRoleForAllVersions.selector, "grantServiceRoleForAllVersions");
-        _authorizeTargetFunctions(address(this), releaseRegistryRoleId, functions);
-
-        // grant permissions to the release registry role for registry contract
-        functions = new FunctionInfo[](1);
-        functions[0] = toFunction(IRegistry.registerService.selector, "registerService");
-        _authorizeTargetFunctions(_registry, releaseRegistryRoleId, functions);
-
-        // create registry service role
-        RoleId registryServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(REGISTRY());
-        _createRole(
-            registryServiceRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: MAX_NUM_RELEASES,
-                name: REGISTRY_SERVICE_ROLE_NAME}));
-
-        // grant permissions to the registry service role for registry contract
-        functions = new FunctionInfo[](2);
-        functions[0] = toFunction(IRegistry.register.selector, "register");
-        functions[1] = toFunction(IRegistry.registerWithCustomType.selector, "registerWithCustomType");
-        _authorizeTargetFunctions(_registry, registryServiceRoleId, 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 _setupStakingRoles()
-        private 
-        onlyInitializing()
-    {
-        // create and grant staking contract role
-        RoleId stakingRoleId = RoleIdLib.roleForType(STAKING());
-        _createRole(
-            stakingRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: 1,
-                name: STAKING_ROLE_NAME}));
-        _grantRoleToAccount(stakingRoleId, _staking);
-
-        // grant permissions to the staking role for staking store contract
-        FunctionInfo[] memory functions;
-        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);
-    
-        // grant permissions to the staking role for token handler contract
-        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()), stakingRoleId, functions);
-
-        // create staking service role
-        RoleId stakingServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(STAKING());
-        _createRole(
-            stakingServiceRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: MAX_NUM_RELEASES,
-                name: STAKING_SERVICE_ROLE_NAME}));
-
-        // grant permissions to the staking service role for staking contract
-        functions = new FunctionInfo[](11);
-        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);
-
-        // create pool service role
-        RoleId poolServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(POOL());
-        _createRole(
-            poolServiceRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: MAX_NUM_RELEASES,
-                name: POOL_SERVICE_ROLE_NAME}));
-
-        // grant permissions to the pool service role for staking contract
-        functions = new FunctionInfo[](2);
-        functions[0] = toFunction(IStaking.increaseTotalValueLocked.selector, "increaseTotalValueLocked");
-        functions[1] = toFunction(IStaking.decreaseTotalValueLocked.selector, "decreaseTotalValueLocked");
-        _authorizeTargetFunctions(_staking, poolServiceRoleId, functions);
-
-        // grant permissions to public role for staking contract
-        functions = new FunctionInfo[](1);
-        functions[0] = toFunction(Staking.approveTokenHandler.selector, "approveTokenHandler");
-        _authorizeTargetFunctions(_staking, PUBLIC_ROLE(), functions);
+            for(uint256 j = 0; j < authorizedRoles.length; j++) {
+                _authorizeFunctions(authorization, target, authorizedRoles[j]);
+            }
+        }
     }
 }