@etherisc/gif-next 0.0.2-7e8dbef-751 → 0.0.2-7edde36-170

package/contracts/registry/RegistryAdmin.sol

@@ -1,18 +1,20 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.20;
 
-import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
-import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
-import {AuthorityUtils} from "@openzeppelin/contracts/access/manager/AuthorityUtils.sol";
-
-import {RoleId, RoleIdLib, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE} from "../type/RoleId.sol";
-
-import {AccessManagerExtendedInitializeable} from "../shared/AccessManagerExtendedInitializeable.sol";
-import {InitializableCustom} from "../shared/InitializableCustom.sol";
-
+import {AccessAdmin} from "../authorization/AccessAdmin.sol";
+import {IAccess} from "../authorization/IAccess.sol";
 import {IRegistry} from "./IRegistry.sol";
-import {ReleaseManager} from "./ReleaseManager.sol";
+import {IService} from "../shared/IService.sol";
+import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
+import {IStaking} from "../staking/IStaking.sol";
+import {ObjectType, ObjectTypeLib, ALL, 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 {StakingStore} from "../staking/StakingStore.sol";
+import {STAKING} from "../type/ObjectType.sol";
+import {TokenHandler} from "../shared/TokenHandler.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
+import {VersionPart} from "../type/Version.sol";
 
 /*
     1) GIF_MANAGER_ROLE
@@ -25,122 +27,168 @@ import {TokenRegistry} from "./TokenRegistry.sol";
         - MUST have 1 member at any time
         - granted/revoked ONLY in transferAdminRole() -> consider lock out situations!!!
         - responsible for creation and activation of releases
-*/
 
-// !!! USE BUILDER PATTERN FOR CONFIG 
-// introduce class - config
-// create instance of this class in admin initializer function
-// call it "add"/"push" function for each entry in config (provide entry parameneters)
-// each call will configure access manager for given parameneters
-// in the end you have fully configured access manager and config object
-
-// grants GIF_ADMIN_ROLE to registry owner as registryOwner is transaction sender
-// grants GIF_MANAGER_ROLE to registry owner via contructor argument
+    createServiceTarget(type, release)
+    createServiceRole(type,release)
+    getServiceRole(type, release)
+*/
 contract RegistryAdmin is
-    AccessManaged,
-    InitializableCustom
+    AccessAdmin
 {
-    error ErrorRegistryAdminReleaseManagerAuthorityMismatch();
-    error ErrorRegistryAdminTokenRegistryAuthorityMismatch();
-    error ErrorRegistryAdminStakingAuthorityMismatch();
+    error ErrorRegistryAdminIsAlreadySetUp();
 
     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 STAKING_SERVICE_ROLE_NAME = "StakingServiceRole";
+    string public constant STAKING_ROLE_NAME = "StakingRole";
 
-    string public constant RELEASE_MANAGER_TARGET_NAME = "ReleaseManager";
+    string public constant RELEASE_REGISTRY_TARGET_NAME = "ReleaseRegistry";
     string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
     string public constant STAKING_TARGET_NAME = "Staking";
-    
-    address private _releaseManager;
+    string public constant STAKING_STORE_TARGET_NAME = "StakingStore";
+
+    uint8 public constant MAX_NUM_RELEASES = 99;
+
+    mapping(address service => VersionPart majorVersion) private _ServiceRelease;
+
+    address private _releaseRegistry;
     address private _tokenRegistry;
     address private _staking;
+    address private _stakingStore;
+    bool private _setupCompleted;
 
-    constructor()
-        AccessManaged(msg.sender)
-        InitializableCustom()
-    {
-        AccessManagerExtendedInitializeable accessManager = new AccessManagerExtendedInitializeable();
-        accessManager.initialize(address(this));
-        setAuthority(address(accessManager));
-    }
+    constructor() AccessAdmin() { }
 
-    function initialize(
+    function completeSetup(
         IRegistry registry,
         address gifAdmin, 
         address gifManager
     )
         external
-        initializer
+        onlyDeployer()
     {
-        // validate input
-        address releaseManagerAddress = registry.getReleaseManagerAddress();
-        if(IAccessManaged(releaseManagerAddress).authority() != authority()) {
-            revert ErrorRegistryAdminReleaseManagerAuthorityMismatch();
-        }
+        if (_setupCompleted) { revert ErrorRegistryAdminIsAlreadySetUp(); } 
+        else { _setupCompleted = true; }
 
-        address tokenRegistryAddress = registry.getTokenRegistryAddress();
-        if(IAccessManaged(tokenRegistryAddress).authority() != authority()) {
-            revert ErrorRegistryAdminTokenRegistryAuthorityMismatch();
-        }
-
-        address stakingAddress = registry.getStakingAddress();
-        if(IAccessManaged(stakingAddress).authority() != authority()) {
-            revert ErrorRegistryAdminStakingAuthorityMismatch();
-        }
-
-        _releaseManager = releaseManagerAddress;
-        _tokenRegistry = tokenRegistryAddress;
-        _staking = stakingAddress;
+        _releaseRegistry = registry.getReleaseRegistryAddress();
+        _tokenRegistry = registry.getTokenRegistryAddress();
+        _staking = registry.getStakingAddress();
+        _stakingStore = address(
+            IStaking(_staking).getStakingStore());
 
         // at this moment all registry contracts are deployed and fully intialized
-        _createRole(GIF_ADMIN_ROLE(), GIF_ADMIN_ROLE_NAME);
-        _createRole(GIF_MANAGER_ROLE(), GIF_MANAGER_ROLE_NAME);
+        _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, true, false);
 
-        _createTarget(_releaseManager, RELEASE_MANAGER_TARGET_NAME);
-        _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME);
-        _createTarget(_staking, STAKING_TARGET_NAME);
+        _setupGifAdminRole(gifAdmin);
+        _setupGifManagerRole(gifManager);
 
-        _setGifAdminRole();
-        _setGifManagerRole();
+        _setupReleaseRegistry();
+        _setupStaking();
+    }
 
-        _grantRole(GIF_ADMIN_ROLE(), gifAdmin, 0);
-        _grantRole(GIF_MANAGER_ROLE(), gifManager, 0);
 
-        // set gif manager role admin
-        _setRoleAdmin(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE());
+    /// @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
+    )
+        external
+        restricted()
+    {
+        _createServiceTargetAndRole(service);
+        _authorizeServiceFunctions(serviceAuthorization, service);
     }
 
-    // TODO makes sense to do this in intialize() function
-    // it is a single contract
-    // but if many token registries a possible...
-    /*function setTokenRegistry(
-        address tokenRegistry
-    )
+
+    function grantServiceRoleForAllVersions(IService service, ObjectType domain)
         external
-        restricted() // GIF_ADMIN_ROLE
+        restricted()
     {
-        // for TokenRegistry
-        bytes4[] memory functionSelector = new bytes4[](5);
-        functionSelector[0] = TokenRegistry.registerToken.selector;
-        functionSelector[1] = TokenRegistry.registerRemoteToken.selector;
-        functionSelector[2] = TokenRegistry.setActive.selector;
-        functionSelector[3] = TokenRegistry.setActiveForVersion.selector;
-
-        // only needed for testing TODO find a better way
-        functionSelector[4] = TokenRegistry.setActiveWithVersionCheck.selector;
-        _setTargetFunctionRole(address(tokenRegistry), functionSelector, GIF_MANAGER_ROLE());
-    }*/
+        _grantRoleToAccount( 
+            RoleIdLib.roleForTypeAndAllVersions(domain),
+            address(service)); 
+    }
+
+
+    function _createServiceTargetAndRole(IService service)
+        private
+    {
+        ObjectType serviceDomain = service.getDomain();
+        string memory baseName = ObjectTypeLib.toName(serviceDomain);
+        VersionPart version = service.getVersion().toMajorPart();
+        uint256 versionInt = version.toInt();
+
+        // create service target
+        string memory serviceTargetName = ObjectTypeLib.toVersionedName(
+            baseName, "Service", versionInt);
+
+        _createTarget(
+            address(service), 
+            serviceTargetName,
+            true,
+            false);
+
+        // create service role
+        RoleId serviceRoleId = RoleIdLib.roleForTypeAndVersion(
+            serviceDomain, 
+            version);
+
+        _createRole(
+            serviceRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: 1,
+                name: ObjectTypeLib.toVersionedName(
+                    baseName, 
+                    "ServiceRole", 
+                    versionInt)}));
+
+        _grantRoleToAccount( 
+            serviceRoleId,
+            address(service)); 
+    }
 
 
-    function setTargetFunctionRole(
-        address target, 
-        bytes4[] memory selector,
-        RoleId roleId
+    function _authorizeServiceFunctions(
+        IServiceAuthorization serviceAuthorization,
+        IService service
     )
-        external
-        restricted // RELEASE_MANAGER_ROLE -> TODO create this role
+        private
     {
-        _setTargetFunctionRole(target, selector, roleId);
+        ObjectType serviceDomain = service.getDomain();
+        ObjectType authorizedDomain;
+        RoleId authorizedRoleId;
+
+        VersionPart release = service.getVersion().toMajorPart();
+        ObjectType[] memory authorizedDomains = serviceAuthorization.getAuthorizedDomains(serviceDomain);
+
+        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, 
+                release);
+            }
+
+            // get authorized functions for authorized domain
+            IAccess.FunctionInfo[] memory authorizatedFunctions = serviceAuthorization.getAuthorizedFunctions(
+                serviceDomain, 
+                authorizedDomain);
+
+            _authorizeTargetFunctions(
+                    address(service), 
+                    authorizedRoleId, 
+                    authorizatedFunctions);
+        }
     }
 
     /*function transferAdmin(address to)
@@ -153,85 +201,174 @@ contract RegistryAdmin is
 
     //--- view functions ----------------------------------------------------//
 
-    function hasRole(address account, RoleId roleId) external view returns(bool) {
-        (bool isMember,) =  AccessManagerExtendedInitializeable(authority()).hasRole(roleId.toInt(), account);
-        return isMember;
+    function getGifAdminRole() external view returns (RoleId) {
+        return GIF_ADMIN_ROLE();
     }
 
-
-    function canCall(
-        address account,
-        address target,
-        bytes4 functionSelector
-    )
-        external
-        view
-        returns(bool)
-    {
-        (bool immediate,) = AuthorityUtils.canCallWithDelay(
-            authority(),
-            account,
-            target,
-            functionSelector);
-
-        return immediate;
+    function getGifManagerRole() external view returns (RoleId) {
+        return GIF_MANAGER_ROLE();
     }
 
     //--- private functions -------------------------------------------------//
 
-    function _setGifAdminRole() private
-    {
-        // for ReleaseManager
-        bytes4[] memory functionSelector2 = new bytes4[](2);
-        //functionSelector2[0] = ReleaseManager.registerStaking.selector;
-        functionSelector2[0] = ReleaseManager.createNextRelease.selector;
-        functionSelector2[1] = ReleaseManager.activateNextRelease.selector;
-
-        _setTargetFunctionRole(_releaseManager, functionSelector2, GIF_ADMIN_ROLE());
-
-        // for Staking
+    function _setupGifAdminRole(address gifAdmin) private {
+        
+        _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 ReleaseRegistry
+        FunctionInfo[] memory functions;
+        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 _setGifManagerRole() private 
-    {
+    function _setupGifManagerRole(address gifManager) private {
+
+        _createRole(
+            GIF_MANAGER_ROLE(), 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Gif,
+                maxMemberCount: 1,
+                name: GIF_MANAGER_ROLE_NAME}));
+
         // for TokenRegistry
-        bytes4[] memory functionSelectorTr = new bytes4[](5);
-        functionSelectorTr[0] = TokenRegistry.registerToken.selector;
-        functionSelectorTr[1] = TokenRegistry.registerRemoteToken.selector;
-        functionSelectorTr[2] = TokenRegistry.setActive.selector;
-        functionSelectorTr[3] = TokenRegistry.setActiveForVersion.selector;
-
-        // only needed for testing TODO find a better way
-        functionSelectorTr[4] = TokenRegistry.setActiveWithVersionCheck.selector;
-        _setTargetFunctionRole(_tokenRegistry, functionSelectorTr, GIF_MANAGER_ROLE());
-
-        // for ReleaseManager
-        bytes4[] memory functionSelectorRm = new bytes4[](2);
-        functionSelectorRm[0] = ReleaseManager.registerService.selector;
-        functionSelectorRm[1] = ReleaseManager.prepareNextRelease.selector;
-        _setTargetFunctionRole(_releaseManager, functionSelectorRm, GIF_MANAGER_ROLE());
-
-        // for Staking
+        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 _setTargetFunctionRole(address target, bytes4[] memory selectors, RoleId roleId) private {
-        AccessManagerExtendedInitializeable(authority()).setTargetFunctionRole(target, selectors, roleId.toInt());        
-    }
+    function _setupReleaseRegistry() private {
 
-    function _setRoleAdmin(RoleId roleId, RoleId adminRoleId) private {
-        AccessManagerExtendedInitializeable(authority()).setRoleAdmin(roleId.toInt(), adminRoleId.toInt());
-    }
+        _createTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, true, false);
 
-    function _grantRole(RoleId roleId, address account, uint32 executionDelay) private {
-        AccessManagerExtendedInitializeable(authority()).grantRole(roleId.toInt(), account, executionDelay);
-    }
+        RoleId releaseRegistryRoleId = RoleIdLib.roleForType(RELEASE());
+        _createRole(
+            releaseRegistryRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: 1,
+                name: RELEASE_REGISTRY_ROLE_NAME}));
 
-    function _createRole(RoleId roleId, string memory roleName) private {
-        AccessManagerExtendedInitializeable(authority()).createRole(roleId.toInt(), roleName);
+        FunctionInfo[] memory functions;
+        functions = new FunctionInfo[](2);
+        functions[0] = toFunction(RegistryAdmin.authorizeService.selector, "authorizeService");
+        functions[1] = toFunction(RegistryAdmin.grantServiceRoleForAllVersions.selector, "grantServiceRoleForAllVersions");
+        _authorizeTargetFunctions(address(this), releaseRegistryRoleId, functions);
+
+        _grantRoleToAccount(releaseRegistryRoleId, _releaseRegistry);
     }
 
-    function _createTarget(address target, string memory targetName) private {
-        AccessManagerExtendedInitializeable(authority()).createTarget(target, targetName);
+
+    function _setupStaking() private {
+        _createTarget(_staking, STAKING_TARGET_NAME, true, false);
+        _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, true, false);
+
+        // 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}));
+
+        FunctionInfo[] memory functions;
+        functions = new FunctionInfo[](13);
+        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");
+        functions[11] = toFunction(IStaking.collectDipAmount.selector, "collectDipAmount");
+        functions[12] = toFunction(IStaking.transferDipAmount.selector, "transferDipAmount");
+        _authorizeTargetFunctions(_staking, 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);
+    
+        // 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()), stakingRoleId, functions);
     }
 }

package/contracts/registry/RegistryService.sol

@@ -1,32 +1,18 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
-// import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
-
-import {IRegistry} from "./IRegistry.sol";
-import {IInstance} from "../instance/IInstance.sol";
-
 import {IComponent} from "../../contracts/shared/IComponent.sol";
+import {IDistributionComponent} from "../../contracts/distribution/IDistributionComponent.sol";
+import {IInstance} from "../instance/IInstance.sol";
 import {IPoolComponent} from "../../contracts/pool/IPoolComponent.sol";
 import {IProductComponent} from "../../contracts/product/IProductComponent.sol";
-import {IDistributionComponent} from "../../contracts/distribution/IDistributionComponent.sol";
-
-import {IVersionable} from "../../contracts/shared/IVersionable.sol";
-import {Versionable} from "../../contracts/shared/Versionable.sol";
 import {IRegisterable} from "../../contracts/shared/IRegisterable.sol";
+import {IRegistry} from "./IRegistry.sol";
+import {IRegistryService} from "./IRegistryService.sol";
 
-import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../contracts/type/RoleId.sol";
 import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, APPLICATION, POLICY, CLAIM, BUNDLE, STAKE, STAKING, PRICE} from "../../contracts/type/ObjectType.sol";
-import {StateId, ACTIVE, PAUSED} from "../../contracts/type/StateId.sol";
 import {NftId, NftIdLib} from "../../contracts/type/NftId.sol";
-import {Fee, FeeLib} from "../../contracts/type/Fee.sol";
-import {Version, VersionPart, VersionLib} from "../../contracts/type/Version.sol";
-
 import {Service} from "../shared/Service.sol";
-import {IService} from "../shared/IService.sol";
-import {IRegistryService} from "./IRegistryService.sol";
-import {Registry} from "./Registry.sol";
 
 contract RegistryService is
     Service,
@@ -37,11 +23,6 @@ contract RegistryService is
     // TODO update to real hash when registry is stable
     bytes32 public constant REGISTRY_CREATION_CODE_HASH = bytes32(0);
 
-    // From IService
-    function getDomain() public pure override returns(ObjectType serviceDomain) {
-        return REGISTRY(); 
-    }
-
     // from Versionable
 
     /// @dev top level initializer
@@ -263,4 +244,9 @@ contract RegistryService is
             revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, owner);
         }
     }
+
+    // From IService
+    function _getDomain() internal override pure returns(ObjectType serviceDomain) {
+        return REGISTRY(); 
+    }
 }

package/contracts/registry/RegistryServiceManager.sol

@@ -1,14 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
-
-import {Registry} from "./Registry.sol";
-import {IVersionable} from "../shared/IVersionable.sol";
-import {ProxyManager} from "../shared/ProxyManager.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
+import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {RegistryService} from "./RegistryService.sol";
-import {TokenRegistry} from "./TokenRegistry.sol";
-
 
 contract RegistryServiceManager is
     ProxyManager

package/contracts/registry/ReleaseLifecycle.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {RELEASE} from "../type/ObjectType.sol";
+import {SCHEDULED, DEPLOYING, ACTIVE, PAUSED, CLOSED/*, FREE*/} from "../type/StateId.sol";
+import {Lifecycle} from "../shared/Lifecycle.sol";
+
+contract ReleaseLifecycle is
+    Lifecycle
+{
+    constructor() {
+        _setupLifecycle();
+    }
+
+    function _setupLifecycle()
+        internal 
+        override
+    {
+        setInitialState(RELEASE(), SCHEDULED());
+
+        setStateTransition(RELEASE(), SCHEDULED(), DEPLOYING());
+        setStateTransition(RELEASE(), DEPLOYING(), DEPLOYING());
+        setStateTransition(RELEASE(), DEPLOYING(), ACTIVE());
+        setStateTransition(RELEASE(), ACTIVE(), PAUSED());
+        setStateTransition(RELEASE(), PAUSED(), ACTIVE());
+    }
+}