@etherisc/gif-next 0.0.2-79292f9-089 → 0.0.2-79a4d57-521

package/contracts/registry/ReleaseRegistry.sol

@@ -1,83 +1,69 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {Create2} from "@openzeppelin/contracts/utils/Create2.sol";
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
-import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
-import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
+import {ContractLib} from "../shared/ContractLib.sol";
 import {NftId} from "../type/NftId.sol";
-import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
 import {ObjectType, ObjectTypeLib, POOL, RELEASE, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.sol";
-import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
-import {Timestamp, TimestampLib, zeroTimestamp, ltTimestamp} from "../type/Timestamp.sol";
-import {Seconds, SecondsLib} from "../type/Seconds.sol";
-import {StateId, INITIAL, SCHEDULED, DEPLOYING, SKIPPED, ACTIVE, PAUSED, CLOSED} from "../type/StateId.sol";
-import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
+import {TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
+import {Seconds} from "../type/Seconds.sol";
+import {StateId, SCHEDULED, DEPLOYING, DEPLOYED, SKIPPED, ACTIVE, PAUSED} from "../type/StateId.sol";
+import {VersionPart, VersionPartLib} from "../type/Version.sol";
 
 import {IService} from "../shared/IService.sol";
-import {ILifecycle} from "../shared/ILifecycle.sol";
-import {INftOwnable} from "../shared/INftOwnable.sol";
-import {IRegisterable} from "../shared/IRegisterable.sol";
+
+import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
+import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 
 import {IRegistry} from "./IRegistry.sol";
+import {IRelease} from "./IRelease.sol";
 import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
-import {IRegistryService} from "./IRegistryService.sol";
 import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
-import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
 import {Registry} from "./Registry.sol";
-import {TokenRegistry} from "./TokenRegistry.sol";
 import {ReleaseLifecycle} from "./ReleaseLifecycle.sol";
-
+import {ReleaseAdmin} from "./ReleaseAdmin.sol";
+
+/// @dev The ReleaseRegistry manages the lifecycle of major GIF releases and their services.
+/// The creation of a new GIF release is a multi-step process:
+/// 1. The creation of a new GIF release is initiated by the GIF admin.
+/// 2. A GIF manager then prepares the release by setting up the service authorization contract.
+/// 3. The GIF manager deploys and registers all related service contracts with the release registry.
+/// 4. The GIF admin verifies and activates the release.
+/// 3. The GIF admin may pause and resume a release.
 contract ReleaseRegistry is 
     AccessManaged,
     ReleaseLifecycle, 
     IRegistryLinked
 {
-    using ObjectTypeLib for ObjectType;
-
-    uint256 public constant INITIAL_GIF_VERSION = 3;// first active version  
+    uint256 public constant INITIAL_GIF_VERSION = 3;// first active release version  
 
-    event LogReleaseCreation(VersionPart version, bytes32 salt); 
-    event LogReleaseActivation(VersionPart version);
-    event LogReleaseDisabled(VersionPart version);
-    event LogReleaseEnabled(VersionPart version);
+    event LogReleaseCreation(IAccessAdmin admin, VersionPart release, bytes32 salt); 
+    event LogReleaseActivation(VersionPart release);
+    event LogReleaseDisabled(VersionPart release);
+    event LogReleaseEnabled(VersionPart release);
 
     // constructor
     error ErrorReleaseRegistryNotRegistry(Registry registry);
 
-    // createNextRelease
-    error ErrorReleaseRegistryReleaseCreationDisallowed(VersionPart version, StateId currentStateId);
-
-    // prepareRelease
-    error ErrorReleaseRegistryReleasePreparationDisallowed(VersionPart version, StateId currentStateId);
-    error ErrorReleaseRegistryReleaseAlreadyPrepared(VersionPart version, StateId currentStateId);
-    error ErrorReleaseRegistryVersionMismatch(VersionPart expected, VersionPart actual);
-    error ErrorReleaseRegistryNoDomains(VersionPart version);
+    // _verifyServiceAuthorization
+    error ErrorReleaseRegistryNotServiceAuth(address notAuth);
+    error ErrorReleaseRegistryServiceAuthVersionMismatch(IServiceAuthorization auth, VersionPart expected, VersionPart actual);
+    error ErrorReleaseRegistryServiceAuthDomainsZero(IServiceAuthorization auth, VersionPart release);
 
     // registerService
-    error ErrorReleaseRegistryNoServiceRegistrationExpected();
-    error ErrorReleaseRegistryServiceRegistrationDisallowed(StateId currentStateId);
-    error ErrorReleaseRegistryServiceDomainMismatch(ObjectType expectedDomain, ObjectType actualDomain);
-    error ErrorReleaseRegistryNotService(address notService);
     error ErrorReleaseRegistryServiceAddressMismatch(address expected, address actual);
 
     // activateNextRelease
-    error ErrorReleaseRegistryReleaseActivationDisallowed(VersionPart releaseVersion, StateId currentStateId);
-    error ErrorReleaseRegistryReleaseNotCreated(VersionPart releaseVersion);
-    error ErrorReleaseRegistryReleaseRegistrationNotFinished(VersionPart releaseVersion, uint awaitingRegistration);
-    error ErrorReleaseRegistryReleaseAlreadyActivated(VersionPart releaseVersion);
-
-    // disableRelease
-    error ErrorReleaseRegistryReleaseNotActivated(VersionPart releaseVersion);
-    error ErrorReleaseRegistryReleaseAlreadyDisabled(VersionPart releaseVersion);
+    error ErrorReleaseRegistryRegistryServiceMissing(VersionPart releaseVersion);
 
     // _verifyService
-    error ErrorReleaseRegistryServiceReleaseAuthorityMismatch(IService service, address serviceAuthority, address releaseAuthority);
-    error ErrorReleaseRegistryServiceReleaseVersionMismatch(IService service, VersionPart serviceVersion, VersionPart releaseVersion);
+    error ErrorReleaseRegistryNotService(address notService);
+    error ErrorReleaseRegistryServiceAuthorityMismatch(IService service, address serviceAuthority, address releaseAuthority);
+    error ErrorReleaseRegistryServiceVersionMismatch(IService service, VersionPart serviceVersion, VersionPart releaseVersion);
+    error ErrorReleaseRegistryServiceDomainMismatch(IService service, ObjectType expectedDomain, ObjectType actualDomain);
 
     // _verifyServiceInfo
     error ErrorReleaseRegistryServiceInfoAddressInvalid(IService service, address expected);
@@ -87,26 +73,24 @@ contract ReleaseRegistry is
     error ErrorReleaseRegistryServiceSelfRegistration(IService service);
     error ErrorReleaseRegistryServiceOwnerRegistered(IService service, address owner);
 
-    Seconds public constant MIN_DISABLE_DELAY = Seconds.wrap(60 * 24 * 365); // 1 year
-
     RegistryAdmin public immutable _admin;
     Registry public immutable _registry;
-    IRegisterable private _staking;
-    address private _stakingOwner;
 
-    mapping(VersionPart version => IRegistry.ReleaseInfo info) internal _releaseInfo;
+    mapping(VersionPart release => IRelease.ReleaseInfo info) internal _releaseInfo;
+    VersionPart [] internal _release; // array of all created releases    
+    ReleaseAdmin internal _masterReleaseAdmin;
 
-    VersionPart internal _latest; // latest active version
-    VersionPart internal _next; // version to create and activate 
+    VersionPart internal _latest; // latest active release
+    VersionPart internal _next; // release version to create and activate 
 
-    uint256 internal _registeredServices;
-    uint256 internal _servicesToRegister;
+    // counters per release
+    uint256 internal _registeredServices = 0;
+    uint256 internal _servicesToRegister = 0;
 
     constructor(Registry registry)
         AccessManaged(msg.sender)
     {
-        // TODO move this part to RegistryLinked constructor
-        if(!_isRegistry(address(registry))) {
+        if (!ContractLib.isRegistry(address(registry))) {
             revert ErrorReleaseRegistryNotRegistry(registry);
         }
 
@@ -115,27 +99,31 @@ contract ReleaseRegistry is
         _registry = registry;
         _admin = RegistryAdmin(_registry.getRegistryAdminAddress());
 
+        _masterReleaseAdmin = new ReleaseAdmin();
+
         _next = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION - 1);
     }
 
-    /// @dev skips previous release if was not activated
-    /// sets next release into state SCHEDULED
+    /// @dev Initiates the creation of a new GIF release by the GIF admin.
+    /// Sets previous release into SKIPPED state if it was created but not activated.
+    /// Sets the new release into state SCHEDULED.
     function createNextRelease()
         external
         restricted() // GIF_ADMIN_ROLE
         returns(VersionPart)
     {
-        VersionPart version = _next;
+        VersionPart release = _next;
 
-        if(isValidTransition(RELEASE(), _releaseInfo[version].state, SKIPPED())) {
-            // set previous release into SKIPPED state if was created but not activated
-            _releaseInfo[version].state == SKIPPED();
+        if(isValidTransition(RELEASE(), _releaseInfo[release].state, SKIPPED())) {
+            _releaseInfo[release].state = SKIPPED();
         }
 
-        version = VersionPartLib.toVersionPart(version.toInt() + 1);
+        release = VersionPartLib.toVersionPart(release.toInt() + 1);
+        _release.push(release);
 
-        _next = version;
-        _releaseInfo[version].state = getInitialState(RELEASE());
+        _next = release;
+        _releaseInfo[release].version = release;
+        _releaseInfo[release].state = getInitialState(RELEASE());
         _servicesToRegister = 0;
         _registeredServices = 0;
 
@@ -149,52 +137,39 @@ contract ReleaseRegistry is
         external
         restricted() // GIF_MANAGER_ROLE
         returns(
-            address authority, 
+            ReleaseAdmin releaseAdmin, 
             VersionPart releaseVersion, 
             bytes32 releaseSalt
         )
     {
-        authority = _admin.authority();
         releaseVersion = _next;
-        StateId state = _releaseInfo[releaseVersion].state;
-        StateId newState = DEPLOYING();
+
+        // release can transition into DEPLOYING state
+        checkTransition(_releaseInfo[releaseVersion].state, RELEASE(), SCHEDULED(), DEPLOYING());
+
+        // verify authorizations
+        uint256 serviceDomainsCount = _verifyServiceAuthorization(serviceAuthorization, releaseVersion, salt);
+
+        // create and initialize release admin
+        releaseAdmin = _cloneNewReleaseAdmin(releaseVersion);
+        releaseSalt = salt;
 
         // ensures unique salt
         // TODO CreateX have clones capability also
         // what would releaseSalt look like if used with CreateX in pemissioned mode?
-        releaseSalt = keccak256(
+        /*releaseSalt = keccak256(
             bytes.concat(
                 bytes32(releaseVersion.toInt()),
-                salt));
-
-        // verify release in state SCHEDULED or DEPLOYING
-        if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseRegistryReleasePreparationDisallowed(releaseVersion, state);
-        }
-
-        // verify authorizaion contract release matches with expected version
-        VersionPart authVersion = serviceAuthorization.getRelease();
-        if (releaseVersion != authVersion) {
-            revert ErrorReleaseRegistryVersionMismatch(releaseVersion, authVersion);
-        }
-
-        // sanity check to ensure service domain list is not empty
-        uint256 serviceDomainsCount = serviceAuthorization.getServiceDomains().length;
-        if (serviceDomainsCount == 0) {
-            revert ErrorReleaseRegistryNoDomains(releaseVersion);
-        }
-
-        // verify prepareNextRelease is only called once per release, in state SCHEDULED
-        if(_servicesToRegister > 0) {
-            revert ErrorReleaseRegistryReleaseAlreadyPrepared(releaseVersion, state);
-        }
+                salt));*/
 
         _servicesToRegister = serviceDomainsCount;
-        // TODO allow for the same serviceAuthorization address to be used for multiple releases????
+        _releaseInfo[releaseVersion].state = DEPLOYING();
+        _releaseInfo[releaseVersion].salt = releaseSalt;
+        // TODO allow for the same serviceAuthorization address to be used for multiple releases?
         _releaseInfo[releaseVersion].auth = serviceAuthorization;
-        _releaseInfo[releaseVersion].state = newState;
+        _releaseInfo[releaseVersion].releaseAdmin = address(releaseAdmin);
 
-        emit LogReleaseCreation(releaseVersion, releaseSalt);
+        emit LogReleaseCreation(releaseAdmin, releaseVersion, releaseSalt);
     }
 
     function registerService(IService service) 
@@ -203,58 +178,50 @@ contract ReleaseRegistry is
         returns(NftId nftId)
     {
         VersionPart releaseVersion = _next;
-        StateId state = _releaseInfo[releaseVersion].state;
-        StateId newState = DEPLOYING();
-        IServiceAuthorization auth = _releaseInfo[releaseVersion].auth;
-
-        // verify release in state DEPLOYING
-        if (!isValidTransition(RELEASE(), state, newState)) {
-            // TOOD name must represent failed state transition
-            revert ErrorReleaseRegistryServiceRegistrationDisallowed(state);
-        }
 
-        // not all services are registered
-        if (_servicesToRegister == _registeredServices) {
-            revert ErrorReleaseRegistryNoServiceRegistrationExpected();
-        }
+        // release can transition to DEPLOYED state
+        checkTransition(_releaseInfo[releaseVersion].state, RELEASE(), DEPLOYING(), DEPLOYED());
+
+        address releaseAuthority = ReleaseAdmin(_releaseInfo[releaseVersion].releaseAdmin).authority();
+        IServiceAuthorization releaseAuth = _releaseInfo[releaseVersion].auth;
+        ObjectType expectedDomain = releaseAuth.getServiceDomain(_registeredServices);
 
         // service can work with release registry and release version
         (
             IRegistry.ObjectInfo memory info,
             ObjectType serviceDomain,
             VersionPart serviceVersion
-        ) = _verifyService(service);
+            //,string memory serviceName
+        ) = _verifyService(
+            service, 
+            releaseAuthority, 
+            releaseVersion, 
+            expectedDomain
+        );
+
+        //_releaseInfo[releaseVersion].addresses.push(address(service)); // TODO get this info from auth contract?
+        //_releaseInfo[releaseVersion].domains.push(serviceDomain);
+        //_releaseInfo[releaseVersion].names.push(serviceName); // TODO if needed read in _verifyService()
+
+        _registeredServices++; // TODO use releaseInfo.someArray.length instead of _registeredServices
 
-        // service domain matches defined in release config
-        ObjectType expectedDomain = auth.getServiceDomain(_registeredServices);
-        if (serviceDomain != expectedDomain) {
-            revert ErrorReleaseRegistryServiceDomainMismatch(expectedDomain, serviceDomain);
+        // release fully deployed
+        if(_servicesToRegister == _registeredServices) {
+            _releaseInfo[releaseVersion].state = DEPLOYED();
         }
 
-        // TODO: service address matches defined in release auth
+        // TODO: service address matches defined in release auth (precalculated one)
+        // revert ErrorReleaseRegistryServiceAddressMismatch()
 
         // setup service authorization
-        _admin.authorizeService(
-            auth, 
+        ReleaseAdmin releaseAdmin = ReleaseAdmin(_releaseInfo[releaseVersion].releaseAdmin);
+        releaseAdmin.setReleaseLocked(false);
+        releaseAdmin.authorizeService(
+            releaseAuth, 
             service,
             serviceDomain,
             releaseVersion);
-
-        // special roles for registry/staking/pool service
-        if (
-            serviceDomain == REGISTRY() ||
-            serviceDomain == STAKING() ||
-            serviceDomain == POOL()) 
-        {
-            _admin.grantServiceRoleForAllVersions(service, serviceDomain);
-        }
-
-        _releaseInfo[releaseVersion].state = newState;
-        //_releaseInfo[releaseVersion].addresses.push(address(service)); // TODO get this info from auth contract?
-        //_releaseInfo[releaseVersion].domains.push(serviceDomain);
-        //_releaseInfo[releaseVersion].names.push(service.getName()); // TODO if needed read name in _verifyService()?
-
-        _registeredServices++;
+        releaseAdmin.setReleaseLocked(true); 
 
         // register service with registry
         nftId = _registry.registerService(info, serviceVersion, serviceDomain);
@@ -262,79 +229,67 @@ contract ReleaseRegistry is
     }
 
 
+    // TODO return activated version
     function activateNextRelease() 
         external 
         restricted // GIF_ADMIN_ROLE
     {
-        VersionPart version = _next;
-        StateId state = _releaseInfo[version].state;
-        StateId newState = ACTIVE();
+        VersionPart release = _next;
 
-        // verify release in state DEPLOYING
-        if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
-        }
+        // release can transition to ACTIVE state
+        checkTransition(_releaseInfo[release].state, RELEASE(), DEPLOYED(), ACTIVE());
 
-        // release fully deployed
-        if(_registeredServices < _servicesToRegister) {
-            revert ErrorReleaseRegistryReleaseRegistrationNotFinished(version, _servicesToRegister - _registeredServices);
-        }
+        _latest = release;
+        _releaseInfo[release].state = ACTIVE();
+        _releaseInfo[release].activatedAt = TimestampLib.blockTimestamp();
+        _releaseInfo[release].disabledAt = TimestampLib.max();
+
+        // grant special roles for registry/staking/pool services
+        // this will enable access to core contracts functions
 
-        // release exists, registry service MUST exist
-        address service = _registry.getServiceAddress(REGISTRY(), version);
+        // registry service MUST be registered for each release
+        address service = _registry.getServiceAddress(REGISTRY(), release);
         if(service == address(0)) {
-            revert ErrorReleaseRegistryReleaseNotCreated(version);
+            revert ErrorReleaseRegistryRegistryServiceMissing(release);
         }
 
-        _latest = version;
-        _releaseInfo[version].state = newState;
-        _releaseInfo[version].activatedAt = TimestampLib.blockTimestamp();
-
-        emit LogReleaseActivation(version);
-    }
+        _admin.grantServiceRoleForAllVersions(IService(service), REGISTRY());
 
-    /// @dev stop all operations with release services
-    function pauseRelease(VersionPart version)
-        external
-        restricted // GIF_ADMIN_ROLE
-    {
-        StateId state = _releaseInfo[version].state;
-        StateId newState = PAUSED();
-
-        // verify release in state ACTIVE
-        if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
+        service = _registry.getServiceAddress(STAKING(), release);
+        if(service != address(0)) {
+            _admin.grantServiceRoleForAllVersions(IService(service), STAKING());
         }
 
-        // TODO may run out of gas
-        // TODO test how many service roles can be revoked in one transaction -> add to docs + each release must test for this -> add to release registry tests, call in test with some gas limit?
-        _revokeReleaseRoles(version);
+        service = _registry.getServiceAddress(POOL(), release);
+        if(service != address(0)) {
+            _admin.grantServiceRoleForAllVersions(IService(service), POOL());
+        }
 
-        _releaseInfo[version].state = newState;
-        _releaseInfo[version].disabledAt = TimestampLib.blockTimestamp();
+        _setReleaseLocked(release, false);
 
-        emit LogReleaseDisabled(version);
+        emit LogReleaseActivation(release);
     }
 
-    /// @dev resume operations with release services
-    function unpauseRelease(VersionPart version)
-        external
-        restricted // GIF_ADMIN_ROLE
+    /// @dev stop/resume operations with restricted functions
+    function setActive(VersionPart release, bool active) 
+        public
+        restricted
     {
-        StateId state = _releaseInfo[version].state;
-        StateId newState = ACTIVE();
-
-        // verify release in state PAUSED
-        if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
+        StateId state = _releaseInfo[release].state;
+
+        if(active) {
+            checkTransition(state, RELEASE(), PAUSED(), ACTIVE());
+            _releaseInfo[release].state = ACTIVE();
+            _releaseInfo[release].disabledAt = TimestampLib.max();
+            emit LogReleaseEnabled(release);
+        } else {
+            checkTransition(state, RELEASE(), ACTIVE(), PAUSED());
+            _releaseInfo[release].state = PAUSED();
+            _releaseInfo[release].disabledAt = TimestampLib.blockTimestamp();
+            emit LogReleaseDisabled(release);
         }
 
-        _grantReleaseRoles(version);
-        
-        _releaseInfo[version].state = newState;
-        _releaseInfo[version].disabledAt = zeroTimestamp();
-
-        emit LogReleaseEnabled(version);
+        _setReleaseLocked(release, !active);
     }
 
     //--- view functions ----------------------------------------------------//
@@ -347,36 +302,51 @@ contract ReleaseRegistry is
         return Clones.predictDeterministicAddress(implementation, salt, deployer);
     }
 
-    function isActiveRelease(VersionPart version) public view returns(bool) {
-        return _releaseInfo[version].state == ACTIVE();
+    function isActiveRelease(VersionPart release) public view returns(bool) {
+        return _releaseInfo[release].state == ACTIVE();
+    }
+
+    function getReleaseInfo(VersionPart release) external view returns(IRelease.ReleaseInfo memory) {
+        return _releaseInfo[release];
+    }
+
+    /// @dev Returns the number of created releases.
+    /// Releases might be in another state than ACTIVE.
+    function releases() external view returns (uint) {
+        return _release.length;
     }
 
-    function getReleaseInfo(VersionPart version) external view returns(IRegistry.ReleaseInfo memory) {
-        return _releaseInfo[version];
+    /// @dev Returns the n-th release version.
+    /// Valid values for idx [0 .. releases() - 1]
+    function getVersion(uint256 idx) external view returns (VersionPart release) {
+        // return _releases;
+        return _release[idx];
     }
 
     function getNextVersion() public view returns(VersionPart) {
         return _next;
     }
 
+    /// @dev Returns the latest activated relase version.
+    /// There is no guarantee that the release is not currently paused.
     function getLatestVersion() external view returns(VersionPart) {
         return _latest;
     }
 
-    function getState(VersionPart version) external view returns (StateId stateId) {
-        return _releaseInfo[version].state;
+    function getState(VersionPart release) external view returns (StateId stateId) {
+        return _releaseInfo[release].state;
     }
 
     function getRemainingServicesToRegister() external view returns (uint256 services) {
         return _servicesToRegister - _registeredServices;
     }
 
-    function getServiceAuthorization(VersionPart version)
+    function getServiceAuthorization(VersionPart release)
         external
         view
         returns (IServiceAuthorization serviceAuthorization)
     {
-        return _releaseInfo[version].auth;
+        return _releaseInfo[release].auth;
     }
 
     function getRegistryAdmin() external view returns (address) {
@@ -391,59 +361,75 @@ contract ReleaseRegistry is
 
     //--- private functions ----------------------------------------------------//
 
-    function _revokeReleaseRoles(VersionPart version)
+    function _setReleaseLocked(VersionPart release, bool locked)
         private
     {
-        address service;
-        ObjectType domain;
-        IServiceAuthorization auth = _releaseInfo[version].auth;
-
-        ObjectType[] memory domains = auth.getServiceDomains();
-        for(uint idx = 0; idx < domains.length; idx++)
-        {
-            domain = domains[idx];
-            service = _registry.getServiceAddress(domain, version);
-            _admin.revokeServiceRole(IService(service), domain, version);
-
-            // special roles for registry/staking/pool service
-            if(
-                domain == REGISTRY() ||
-                domain == STAKING() ||
-                domain == POOL()
-            )
-            {
-                _admin.revokeServiceRoleForAllVersions(IService(service), domain);
-            }
-        }
+        ReleaseAdmin(
+            _releaseInfo[release].releaseAdmin).setReleaseLocked(locked);
     }
 
-    function _grantReleaseRoles(VersionPart version)
+
+    function _cloneNewReleaseAdmin(VersionPart release)
         private
+        returns (ReleaseAdmin clonedAdmin)
     {
-        address service;
-        ObjectType domain;
-        IServiceAuthorization auth = _releaseInfo[version].auth;
-
-        ObjectType[] memory domains = auth.getServiceDomains();
-        for(uint idx = 0; idx < domains.length; idx++)
-        {
-            domain = domains[idx];
-            service = _registry.getServiceAddress(domain, version);
-            _admin.grantServiceRole(IService(service), domain, version);
-
-            // special roles for registry/staking/pool service
-            if(
-                domain == REGISTRY() ||
-                domain == STAKING() ||
-                domain == POOL()
+        AccessManagerCloneable clonedAccessManager = AccessManagerCloneable(
+            Clones.clone(
+                _masterReleaseAdmin.authority()
             )
-            {
-                _admin.grantServiceRoleForAllVersions(IService(service), domain);
-            }
+        );
+
+        clonedAdmin = ReleaseAdmin(
+            Clones.clone(
+                address(_masterReleaseAdmin)
+            )
+        );
+
+        clonedAdmin.initialize(clonedAccessManager);
+        clonedAdmin.completeSetup(
+            address(_registry), 
+            address(this), // release registry (this contract)
+            release);
+
+        // lock release (remains locked until activation)
+        clonedAdmin.setReleaseLocked(true);
+    }
+
+
+    function _verifyServiceAuthorization(
+        IServiceAuthorization serviceAuthorization,
+        VersionPart releaseVersion,
+        bytes32 salt
+    )
+        private
+        view
+        returns (uint256 serviceDomainsCount)
+    {
+        // authorization contract supports IServiceAuthorization interface
+        if(!serviceAuthorization.supportsInterface(type(IServiceAuthorization).interfaceId)) {
+                revert ErrorReleaseRegistryNotServiceAuth(address(serviceAuthorization));
+        }
+
+        // authorizaions contract version matches with release version
+        VersionPart authVersion = serviceAuthorization.getRelease();
+        if (releaseVersion != authVersion) {
+            revert ErrorReleaseRegistryServiceAuthVersionMismatch(serviceAuthorization, releaseVersion, authVersion);
+        }
+
+        // sanity check to ensure service domain list is not empty
+        serviceDomainsCount = serviceAuthorization.getServiceDomains().length;
+        if (serviceDomainsCount == 0) {
+            revert ErrorReleaseRegistryServiceAuthDomainsZero(serviceAuthorization, releaseVersion);
         }
     }
 
-    function _verifyService(IService service)
+    // TODO get service names 
+    function _verifyService(
+        IService service, 
+        address expectedAuthority, 
+        VersionPart expectedVersion,
+        ObjectType expectedDomain
+    )
         internal
         view
         returns(
@@ -464,22 +450,25 @@ contract ReleaseRegistry is
 
         _verifyServiceInfo(service, serviceInfo, owner);
 
-        VersionPart releaseVersion = _next; // never 0
-        address expectedAuthority = _admin.authority(); // can be zero if registering service when release is not created
-
-        // IMPORTANT: can not guarantee service access is actually controlled by authority
         if(serviceAuthority != expectedAuthority) {
-            revert ErrorReleaseRegistryServiceReleaseAuthorityMismatch(
+            revert ErrorReleaseRegistryServiceAuthorityMismatch(
                 service,
                 serviceAuthority,
                 expectedAuthority);
         }
 
-        if(serviceVersion != releaseVersion) {
-            revert ErrorReleaseRegistryServiceReleaseVersionMismatch(
+        if(serviceVersion != expectedVersion) {
+            revert ErrorReleaseRegistryServiceVersionMismatch(
                 service,
                 serviceVersion,
-                releaseVersion);            
+                expectedVersion);            
+        }
+
+        if(serviceDomain != expectedDomain) {
+            revert ErrorReleaseRegistryServiceDomainMismatch(
+                service,
+                expectedDomain,
+                serviceDomain);
         }
     }
 
@@ -493,7 +482,7 @@ contract ReleaseRegistry is
         view
     {
         if(info.objectAddress != address(service)) {
-            revert ErrorReleaseRegistryServiceInfoAddressInvalid(service, address(service));
+            revert ErrorReleaseRegistryServiceInfoAddressInvalid(service, info.objectAddress);
         }
 
         if(info.isInterceptor != false) { // service is never interceptor
@@ -518,21 +507,5 @@ contract ReleaseRegistry is
             revert ErrorReleaseRegistryServiceOwnerRegistered(service, owner);
         }
     }
-
-    /// @dev returns true iff a the address passes some simple proxy tests.
-    function _isRegistry(address registryAddress) internal view returns (bool) {
-
-        // zero address is certainly not registry
-        if (registryAddress == address(0)) {
-            return false;
-        }
-        // TODO try catch and return false in case of revert or just panic
-        // check if contract returns a zero nft id for its own address
-        if (IRegistry(registryAddress).getNftId(registryAddress).eqz()) {
-            return false;
-        }
-
-        return true;
-    }
 }