@etherisc/gif-next 0.0.2-8d9d4d6-542 → 0.0.2-8daf0fe-431

package/contracts/authorization/InstanceAdmin.sol

@@ -1,108 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {AccessAdmin} from "../authorization/AccessAdmin.sol";
-import {IInstance} from "../instance/IInstance.sol";
-import {IModuleAuthorization} from "./IModuleAuthorization.sol";
-import {IServiceAuthorization} from "./IServiceAuthorization.sol";
-import {IRegistry} from "../registry/IRegistry.sol";
-import {NftId} from "../type/NftId.sol";
-import {ObjectType, INSTANCE} from "../type/ObjectType.sol";
-import {RegistryLinked} from "../shared/RegistryLinked.sol";
-import {ReleaseManager} from "../registry/ReleaseManager.sol";
-import {RoleId} from "../type/RoleId.sol";
-import {VersionPart} from "../type/Version.sol";
-
-contract InstanceAdmin is
-     AccessAdmin,
-     RegistryLinked
-{
-
-     // initialize
-     error ErrorInstanceAdminNotInstance(address instance);
-     error ErrorInstanceAdminNotRegisteredInstance(address instance);
-     error ErrorInstanceAdminServiceVersionMismatch();
-
-     IInstance private _instance;
-     IModuleAuthorization private _instanceAuthz;
-     IServiceAuthorization private _serviceAuthz;
-
-     function initialize(
-          address registry,
-          address instance,
-          IModuleAuthorization instanceAuthz
-     )
-          external
-          initializer() 
-     {
-          initializeRegistryLinked(registry);
-          _initializeInstance(instance);
-          _initializeAuthorization(instanceAuthz);
-     }
-
-
-    //--- view functions ----------------------------------------------------//
-
-     function getInstance() external view returns(IInstance instance) {
-          return _instance;
-     }
-
-     function getInstanceAuthorization() external view returns(IModuleAuthorization serviceAuthz) {
-          return _instanceAuthz;
-     }
-
-     function getServiceAuthorization() external view returns(IServiceAuthorization serviceAuthz) {
-          return _serviceAuthz;
-     }
-
-    //--- private functions -------------------------------------------------//
-
-     function _initializeInstance(address instance)
-          private
-          onlyInitializing()
-     {
-          IRegistry registry = getRegistry();
-          IRegistry.ObjectInfo memory info = registry.getObjectInfo(instance);
-
-          if (info.objectType != INSTANCE()) {
-               revert ErrorInstanceAdminNotInstance(instance);
-          }
-
-          if (info.nftId.eqz()) {
-               revert ErrorInstanceAdminNotRegisteredInstance(instance);
-          }
-
-          _instance = IInstance(instance);
-     }
-
-
-     function _initializeAuthorization(
-          IModuleAuthorization instanceAuthz
-     )
-          private
-          onlyInitializing()
-     {
-          // check instance version matches with authz relase
-          VersionPart release = instanceAuthz.getRelease();
-          if(release != _instance.getMajorVersion()) {
-               revert ErrorInstanceAdminServiceVersionMismatch();
-          }
-
-          _instanceAuthz = instanceAuthz;
-          _serviceAuthz = _getServiceAuthorization(release);
-     }
-
-
-     function _getServiceAuthorization(VersionPart release)
-          private
-          view
-          returns (IServiceAuthorization serviceAuthz)
-     {
-          ReleaseManager releaseManager = ReleaseManager(
-               getRegistry().getReleaseManagerAddress());
-
-          return releaseManager.getServiceAuthorization(release);
-     }
-
-}
-

package/contracts/instance/InstanceAdminNew.sol

@@ -1,74 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.20;
-
-import {AccessAdmin} from "../authorization/AccessAdmin.sol";
-import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
-import {IRegistry} from "../registry/IRegistry.sol";
-import {IInstance} from "./IInstance.sol";
-import {IService} from "../shared/IService.sol";
-import {ObjectType, ObjectTypeLib, ALL, POOL, RELEASE} from "../type/ObjectType.sol";
-import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE, INSTANCE_ROLE} from "../type/RoleId.sol";
-import {VersionPart} from "../type/Version.sol";
-
-
-contract InstanceAdminNew is
-    AccessAdmin
-{
-    string public constant INSTANCE_ROLE_NAME = "InstanceRole";
-    string public constant INSTANCE_OWNER_ROLE_NAME = "InstanceOwnerRole";
-
-    string public constant INSTANCE_ADMIN_TARGET_NAME = "InstanceAdmin";
-    string public constant INSTANCE_STORE_TARGET_NAME = "InstanceStore";
-    string public constant INSTANCE_TARGET_NAME = "Instance";
-
-    uint64 public constant CUSTOM_ROLE_ID_MIN = 10000; // MUST be even
-
-    address _instance;
-    IRegistry internal _registry;
-    uint64 _idNext;
-
-    bool private _setupCompleted;
-
-
-    // instance owner role is granted upon instance nft minting in callback function
-    function initialize(address instanceAddress)
-        external
-        initializer() 
-    {
-        _instance = instanceAddress;
-        IInstance instance = IInstance(instanceAddress);
-
-        _initializeAuthority(
-            instance.authority());
-
-        _registry = instance.getRegistry();
-        _idNext = CUSTOM_ROLE_ID_MIN;
-
-        _createInitialRoleSetup();
-        _setupInstanceAdmin();
-        _setupInstance();
-    }
-
-
-    function _setupInstanceAdmin()
-        internal
-    {
-        // _createTarget(address(this), INSTANCE_ADMIN_TARGET_NAME, IAccess.Type.Core);
-    }
-
-
-    function _setupInstance()
-        internal
-    {
-        // _createTarget(_instance, INSTANCE_TARGET_NAME, IAccess.Type.Core);
-
-        // minimum configuration required for nft interception
-        // _createRole(INSTANCE_ROLE(), INSTANCE_ROLE_NAME, IAccess.Type.Core);
-        // _createRole(INSTANCE_OWNER_ROLE(), INSTANCE_OWNER_ROLE_NAME, IAccess.Type.Core);
-        // _grantRole(INSTANCE_ROLE(), _instance);
-
-        // bytes4[] memory instanceAdminInstanceSelectors = new bytes4[](1);
-        // instanceAdminInstanceSelectors[0] = this.transferInstanceOwnerRole.selector;
-        // _setTargetFunctionRole(address(this), instanceAdminInstanceSelectors, INSTANCE_ROLE());                
-    }
-}

package/contracts/instance/InstanceAuthorizationsLib.sol

@@ -1,377 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.20;
-
-import {ADMIN_ROLE, INSTANCE_OWNER_ROLE, ORACLE_SERVICE_ROLE, DISTRIBUTION_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE, ORACLE_OWNER_ROLE, INSTANCE_SERVICE_ROLE, COMPONENT_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE, POOL_SERVICE_ROLE, PRODUCT_SERVICE_ROLE, APPLICATION_SERVICE_ROLE, POLICY_SERVICE_ROLE, CLAIM_SERVICE_ROLE, BUNDLE_SERVICE_ROLE, INSTANCE_ROLE} from "../type/RoleId.sol";
-import {APPLICATION, BUNDLE, CLAIM, COMPONENT, DISTRIBUTION, INSTANCE, ORACLE, POLICY, POOL, PRODUCT, REGISTRY} from "../type/ObjectType.sol";
-import {VersionPart} from "../type/Version.sol";
-
-import {IRegistry} from "../registry/IRegistry.sol";
-
-import {Instance} from "./Instance.sol";
-import {InstanceAdmin} from "./InstanceAdmin.sol";
-import {InstanceReader} from "./InstanceReader.sol";
-import {BundleManager} from "./BundleManager.sol";
-import {AccessManagerExtendedInitializeable} from "../shared/AccessManagerExtendedInitializeable.sol";
-import {InstanceStore} from "./InstanceStore.sol";
-
-
-library InstanceAuthorizationsLib
-{
-    function grantInitialAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        Instance instance,
-        BundleManager bundleManager,
-        InstanceStore instanceStore,
-        address instanceOwner,
-        IRegistry registry,
-        VersionPart majorVersion)
-            external
-    {
-        _createRoles(instanceAdmin);
-        _createTargets(instanceAdmin, instance, bundleManager, instanceStore);
-        _grantComponentServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantOracleServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantDistributionServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantPoolServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantProductServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantApplicationServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantPolicyServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantClaimServiceAuthorizations(accessManager, instanceAdmin, instanceStore, registry, majorVersion);
-        _grantBundleServiceAuthorizations(accessManager, instanceAdmin, instanceStore, bundleManager, registry, majorVersion);
-        _grantInstanceServiceAuthorizations(accessManager, instanceAdmin, instance, registry, majorVersion);
-        _grantInstanceAuthorizations(accessManager, instanceAdmin, instance, registry, majorVersion);
-        _grantInstanceOwnerAuthorizations(instanceAdmin, instance, registry, majorVersion);
-    }
-
-    function _createRoles(InstanceAdmin instanceAdmin) private {
-        // default roles controlled by ADMIN_ROLE -> core roles
-        // all set/granted only once during cloning (the only exception is INSTANCE_OWNER_ROLE, hooked to instance nft)
-        instanceAdmin.createCoreRole(INSTANCE_SERVICE_ROLE(), "InstanceServiceRole");
-        instanceAdmin.createCoreRole(COMPONENT_SERVICE_ROLE(), "ComponentServiceRole");
-        instanceAdmin.createCoreRole(DISTRIBUTION_SERVICE_ROLE(), "DistributionServiceRole");
-        instanceAdmin.createCoreRole(ORACLE_SERVICE_ROLE(), "OracleServiceRole");
-        instanceAdmin.createCoreRole(POOL_SERVICE_ROLE(), "PoolServiceRole");
-        instanceAdmin.createCoreRole(APPLICATION_SERVICE_ROLE(), "ApplicationServiceRole");
-        instanceAdmin.createCoreRole(PRODUCT_SERVICE_ROLE(), "ProductServiceRole");
-        instanceAdmin.createCoreRole(CLAIM_SERVICE_ROLE(), "ClaimServiceRole");
-        instanceAdmin.createCoreRole(POLICY_SERVICE_ROLE(), "PolicyServiceRole");
-        instanceAdmin.createCoreRole(BUNDLE_SERVICE_ROLE(), "BundleServiceRole");
-
-        // default roles controlled by INSTANCE_OWNER_ROLE -> gif roles
-        instanceAdmin.createGifRole(DISTRIBUTION_OWNER_ROLE(), "DistributionOwnerRole", INSTANCE_OWNER_ROLE());
-        instanceAdmin.createGifRole(ORACLE_OWNER_ROLE(), "OracleOwnerRole", INSTANCE_OWNER_ROLE());
-        instanceAdmin.createGifRole(POOL_OWNER_ROLE(), "PoolOwnerRole", INSTANCE_OWNER_ROLE());
-        instanceAdmin.createGifRole(PRODUCT_OWNER_ROLE(), "ProductOwnerRole", INSTANCE_OWNER_ROLE());
-    }
-
-    function _createTargets(
-        InstanceAdmin instanceAdmin,
-        Instance instance,
-        BundleManager bundleManager,
-        InstanceStore instanceStore)
-        private
-    {
-        instanceAdmin.createCoreTarget(address(instance), "Instance");
-        //instanceAdmin.createCoreTarget(address(instanceAdmin), "InstanceAdmin");
-        instanceAdmin.createCoreTarget(address(bundleManager), "BundleManager");
-        instanceAdmin.createCoreTarget(address(instanceStore), "InstanceStore");
-    }
-
-    function _grantComponentServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for component service on instance store
-        address componentServiceAddress = registry.getServiceAddress(COMPONENT(), majorVersion);
-        accessManager.grantRole(COMPONENT_SERVICE_ROLE().toInt(), componentServiceAddress, 0);
-
-        bytes4[] memory serviceSelectors = new bytes4[](8);
-        serviceSelectors[0] = instanceStore.createComponent.selector;
-        serviceSelectors[1] = instanceStore.updateComponent.selector;
-        serviceSelectors[2] = instanceStore.createPool.selector;
-        serviceSelectors[3] = instanceStore.createProduct.selector;
-        serviceSelectors[5] = instanceStore.updateProduct.selector;
-        serviceSelectors[6] = instanceStore.increaseBalance.selector;
-        serviceSelectors[7] = instanceStore.increaseFees.selector;
-
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            serviceSelectors,
-            COMPONENT_SERVICE_ROLE());
-    }
-
-    function _grantOracleServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion
-    )
-        private
-    {
-        // configure authorization for distribution service on instance
-        address oracleServiceAddress = registry.getServiceAddress(ORACLE(), majorVersion);
-        accessManager.grantRole(ORACLE_SERVICE_ROLE().toInt(), oracleServiceAddress, 0);
-
-        bytes4[] memory instanceOracleServiceSelectors = new bytes4[](3);
-        instanceOracleServiceSelectors[0] = instanceStore.createRequest.selector;
-        instanceOracleServiceSelectors[1] = instanceStore.updateRequest.selector;
-        instanceOracleServiceSelectors[2] = instanceStore.updateRequestState.selector;
-
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceOracleServiceSelectors,
-            ORACLE_SERVICE_ROLE());
-    }
-
-    function _grantDistributionServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion
-    )
-        private
-    {
-        // configure authorization for distribution service on instance
-        address distributionServiceAddress = registry.getServiceAddress(DISTRIBUTION(), majorVersion);
-        accessManager.grantRole(DISTRIBUTION_SERVICE_ROLE().toInt(), distributionServiceAddress, 0);
-        bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](9);
-        //instanceDistributionServiceSelectors[0] = instanceStore.createDistributionSetup.selector;
-        //instanceDistributionServiceSelectors[1] = instanceStore.updateDistributionSetup.selector;
-        instanceDistributionServiceSelectors[0] = instanceStore.createDistributorType.selector;
-        instanceDistributionServiceSelectors[1] = instanceStore.updateDistributorType.selector;
-        instanceDistributionServiceSelectors[2] = instanceStore.updateDistributorTypeState.selector;
-        instanceDistributionServiceSelectors[3] = instanceStore.createDistributor.selector;
-        instanceDistributionServiceSelectors[4] = instanceStore.updateDistributor.selector;
-        instanceDistributionServiceSelectors[5] = instanceStore.updateDistributorState.selector;
-        instanceDistributionServiceSelectors[6] = instanceStore.createReferral.selector;
-        instanceDistributionServiceSelectors[7] = instanceStore.updateReferral.selector;
-        instanceDistributionServiceSelectors[8] = instanceStore.updateReferralState.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceDistributionServiceSelectors,
-            DISTRIBUTION_SERVICE_ROLE());
-    }
-
-    function _grantPoolServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for pool service on instance
-        address poolServiceAddress = registry.getServiceAddress(POOL(), majorVersion);
-        accessManager.grantRole(POOL_SERVICE_ROLE().toInt(), address(poolServiceAddress), 0);
-        bytes4[] memory instancePoolServiceSelectors = new bytes4[](1); // TODO works with (4)
-        instancePoolServiceSelectors[0] = instanceStore.updatePool.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instancePoolServiceSelectors,
-            POOL_SERVICE_ROLE());
-    }
-
-    function _grantProductServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for product service on instance
-        address productServiceAddress = registry.getServiceAddress(PRODUCT(), majorVersion);
-        accessManager.grantRole(PRODUCT_SERVICE_ROLE().toInt(), productServiceAddress, 0);
-        bytes4[] memory instanceProductServiceSelectors = new bytes4[](3);
-        instanceProductServiceSelectors[0] = instanceStore.createRisk.selector;
-        instanceProductServiceSelectors[1] = instanceStore.updateRisk.selector;
-        instanceProductServiceSelectors[2] = instanceStore.updateRiskState.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceProductServiceSelectors,
-            PRODUCT_SERVICE_ROLE());
-    }
-
-    function _grantApplicationServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for application services on instance
-        address applicationServiceAddress = registry.getServiceAddress(APPLICATION(), majorVersion);
-        accessManager.grantRole(APPLICATION_SERVICE_ROLE().toInt(), applicationServiceAddress, 0);
-        bytes4[] memory instanceApplicationServiceSelectors = new bytes4[](3);
-        instanceApplicationServiceSelectors[0] = instanceStore.createApplication.selector;
-        instanceApplicationServiceSelectors[1] = instanceStore.updateApplication.selector;
-        instanceApplicationServiceSelectors[2] = instanceStore.updateApplicationState.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceApplicationServiceSelectors,
-            APPLICATION_SERVICE_ROLE());
-    }
-
-    function _grantPolicyServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for policy services on instance
-        address policyServiceAddress = registry.getServiceAddress(POLICY(), majorVersion);
-        accessManager.grantRole(POLICY_SERVICE_ROLE().toInt(), policyServiceAddress, 0);
-        bytes4[] memory instancePolicyServiceSelectors = new bytes4[](2);
-        instancePolicyServiceSelectors[0] = instanceStore.updatePolicy.selector;
-        instancePolicyServiceSelectors[1] = instanceStore.updatePolicyState.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instancePolicyServiceSelectors,
-            POLICY_SERVICE_ROLE());
-    }
-
-    function _grantClaimServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for claim/payout services on instance
-        address claimServiceAddress = registry.getServiceAddress(CLAIM(), majorVersion);
-        accessManager.grantRole(CLAIM_SERVICE_ROLE().toInt(), claimServiceAddress, 0);
-
-        bytes4[] memory instancePolicyServiceSelectors = new bytes4[](1);
-        instancePolicyServiceSelectors[0] = instanceStore.updatePolicyClaims.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instancePolicyServiceSelectors, 
-            CLAIM_SERVICE_ROLE());
-
-        bytes4[] memory instanceClaimServiceSelectors = new bytes4[](4);
-        instanceClaimServiceSelectors[0] = instanceStore.createClaim.selector;
-        instanceClaimServiceSelectors[1] = instanceStore.updateClaim.selector;
-        instanceClaimServiceSelectors[2] = instanceStore.createPayout.selector;
-        instanceClaimServiceSelectors[3] = instanceStore.updatePayout.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceClaimServiceSelectors, 
-            CLAIM_SERVICE_ROLE());
-    }
-
-    function _grantBundleServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        InstanceStore instanceStore,
-        BundleManager bundleManager,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for bundle service on instance
-        address bundleServiceAddress = registry.getServiceAddress(BUNDLE(), majorVersion);
-        accessManager.grantRole(BUNDLE_SERVICE_ROLE().toInt(), bundleServiceAddress, 0);
-        bytes4[] memory instanceBundleServiceSelectors = new bytes4[](5);
-        instanceBundleServiceSelectors[0] = instanceStore.createBundle.selector;
-        instanceBundleServiceSelectors[1] = instanceStore.updateBundle.selector;
-        instanceBundleServiceSelectors[2] = instanceStore.updateBundleState.selector;
-        instanceBundleServiceSelectors[3] = instanceStore.increaseLocked.selector;
-        instanceBundleServiceSelectors[4] = instanceStore.decreaseLocked.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceStore",
-            instanceBundleServiceSelectors,
-            BUNDLE_SERVICE_ROLE());
-
-        // configure authorization for bundle service on bundle manager
-        bytes4[] memory bundleManagerBundleServiceSelectors = new bytes4[](5);
-        bundleManagerBundleServiceSelectors[0] = bundleManager.linkPolicy.selector;
-        bundleManagerBundleServiceSelectors[1] = bundleManager.unlinkPolicy.selector;
-        bundleManagerBundleServiceSelectors[2] = bundleManager.add.selector;
-        bundleManagerBundleServiceSelectors[3] = bundleManager.lock.selector;
-        bundleManagerBundleServiceSelectors[4] = bundleManager.unlock.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "BundleManager",
-            bundleManagerBundleServiceSelectors,
-            BUNDLE_SERVICE_ROLE());
-    }
-
-    function _grantInstanceServiceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        Instance instance,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorization for instance service on instance
-        address instanceServiceAddress = registry.getServiceAddress(INSTANCE(), majorVersion);
-        accessManager.grantRole(INSTANCE_SERVICE_ROLE().toInt(), instanceServiceAddress, 0);
-        bytes4[] memory instanceInstanceServiceSelectors = new bytes4[](1);
-        instanceInstanceServiceSelectors[0] = instance.setInstanceReader.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "Instance",
-            instanceInstanceServiceSelectors,
-            INSTANCE_SERVICE_ROLE());
-
-        // configure authorizations for instance service on instance access manager
-        bytes4[] memory instanceAdminInstanceServiceSelectors = new bytes4[](3);
-        instanceAdminInstanceServiceSelectors[0] = instanceAdmin.createGifTarget.selector;
-        instanceAdminInstanceServiceSelectors[1] = instanceAdmin.setTargetLockedByService.selector;
-        instanceAdminInstanceServiceSelectors[2] = instanceAdmin.setTargetFunctionRoleByService.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceAdmin",
-            instanceAdminInstanceServiceSelectors,
-            INSTANCE_SERVICE_ROLE());
-    }
-
-    function _grantInstanceAuthorizations(
-        AccessManagerExtendedInitializeable accessManager,
-        InstanceAdmin instanceAdmin,
-        Instance instance,
-        IRegistry registry,
-        VersionPart majorVersion)
-        private
-    {
-        // configure authorizations for instance on instance admin
-        bytes4[] memory instanceAdminInstanceSelectors = new bytes4[](4);
-        instanceAdminInstanceSelectors[0] = instanceAdmin.createRole.selector;
-        instanceAdminInstanceSelectors[1] = instanceAdmin.createTarget.selector;
-        instanceAdminInstanceSelectors[2] = instanceAdmin.setTargetFunctionRoleByInstance.selector;
-        instanceAdminInstanceSelectors[3] = instanceAdmin.setTargetLockedByInstance.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "InstanceAdmin",
-            instanceAdminInstanceSelectors,
-            INSTANCE_ROLE());
-    }
-
-    function _grantInstanceOwnerAuthorizations(
-        InstanceAdmin instanceAdmin,
-        Instance instance,
-        IRegistry registry,
-        VersionPart majorVersion) 
-        private 
-    {
-        // configure authorization for instance owner on instance access manager
-        // instance owner role is granted/revoked ONLY by INSTANCE_ROLE
-        bytes4[] memory instanceInstanceOwnerSelectors = new bytes4[](4);
-        instanceInstanceOwnerSelectors[0] = instance.createRole.selector;
-        instanceInstanceOwnerSelectors[1] = instance.createTarget.selector;
-        instanceInstanceOwnerSelectors[2] = instance.setTargetFunctionRole.selector;
-        instanceInstanceOwnerSelectors[3] = instance.setTargetLocked.selector;
-        instanceAdmin.setTargetFunctionRoleByService(
-            "Instance",
-            instanceInstanceOwnerSelectors,
-            INSTANCE_OWNER_ROLE());
-    }
-}