@etherisc/gif-next 0.0.2-e802d97-251 → 0.0.2-e83e4a5-207

package/contracts/registry/ReleaseManager.sol

@@ -10,15 +10,14 @@ import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
 import {NftId} from "../type/NftId.sol";
 import {RoleId, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {ObjectType, ObjectTypeLib, RELEASE, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.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, ACTIVE} from "../type/StateId.sol";
+import {StateId, INITIAL, SCHEDULED, DEPLOYING, ACTIVE, PAUSED, CLOSED} from "../type/StateId.sol";
 import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
 
 import {IService} from "../shared/IService.sol";
-import {AccessManagerExtendedWithDisableInitializeable} from "../shared/AccessManagerExtendedWithDisableInitializeable.sol";
 import {ILifecycle} from "../shared/ILifecycle.sol";
 import {INftOwnable} from "../shared/INftOwnable.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
@@ -26,45 +25,50 @@ import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IRegistry} from "./IRegistry.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 {ServiceAuthorizationsLib} from "./ServiceAuthorizationsLib.sol";
-
+import {ReleaseLifecycle} from "./ReleaseLifecycle.sol";
 
+// TODO rename to something that does not end with 'Manager' 
+// everywhere else *Manager points to an upgradeable contract
 contract ReleaseManager is 
-    AccessManaged, 
-    ILifecycle, 
+    AccessManaged,
+    ReleaseLifecycle, 
     IRegistryLinked
 {
     using ObjectTypeLib for ObjectType;
 
     uint256 public constant INITIAL_GIF_VERSION = 3;
 
-    event LogReleaseCreation(VersionPart version, bytes32 salt, AccessManagerExtendedWithDisableInitializeable accessManager); 
+    event LogReleaseCreation(VersionPart version, bytes32 salt); 
     event LogReleaseActivation(VersionPart version);
+    event LogReleaseDisabled(VersionPart version);
+    event LogReleaseEnabled(VersionPart version);
 
     // constructor
     error ErrorReleaseManagerNotRegistry(Registry registry);
 
     // createNextRelease
-    error ErrorReleaseManagerReleaseCreationDisallowed(StateId currentStateId);
+    error ErrorReleaseManagerReleaseCreationDisallowed(VersionPart version, StateId currentStateId);
 
     // prepareRelease
-    error ErrorReleaseManagerReleasePreparationDisallowed(StateId currentStateId);
-    error ErrorReleaseManagerReleaseAlreadyPrepared(VersionPart version);
-    
-    // register staking
-    //error ErrorReleaseManagerStakingAlreadySet(address stakingAddress);
+    error ErrorReleaseManagerReleasePreparationDisallowed(VersionPart version, StateId currentStateId);
+    error ErrorReleaseManagerReleaseAlreadyPrepared(VersionPart version, StateId currentStateId);
+    error ErrorReleaseManagerVersionMismatch(VersionPart expected, VersionPart actual);
+    error ErrorReleaseManagerNoDomains(VersionPart version);
 
     // registerService
     error ErrorReleaseManagerNoServiceRegistrationExpected();
     error ErrorReleaseManagerServiceRegistrationDisallowed(StateId currentStateId);
-    error ErrorReleaseManagerNotService(IService service);
-    error ErrorReleaseManagerServiceAddressInvalid(IService given, address expected);
+    error ErrorReleaseManagerServiceDomainMismatch(ObjectType expectedDomain, ObjectType actualDomain);
+    error ErrorReleaseManagerNotService(address notService);
+    error ErrorReleaseManagerServiceAddressMismatch(address expected, address actual);
 
     // activateNextRelease
-    error ErrorReleaseManagerReleaseActivationDisallowed(StateId currentStateId);
+    error ErrorReleaseManagerReleaseActivationDisallowed(VersionPart releaseVersion, StateId currentStateId);
     error ErrorReleaseManagerReleaseNotCreated(VersionPart releaseVersion);
     error ErrorReleaseManagerReleaseRegistrationNotFinished(VersionPart releaseVersion, uint awaitingRegistration);
     error ErrorReleaseManagerReleaseAlreadyActivated(VersionPart releaseVersion);
@@ -85,30 +89,27 @@ contract ReleaseManager is
     error ErrorReleaseManagerServiceSelfRegistration(IService service);
     error ErrorReleaseManagerServiceOwnerRegistered(IService service, address owner);
 
-    // _verifyReleaseAuthorizations
-    error ErrorReleaseManagerReleaseEmpty();
-    error ErrorReleaseManagerReleaseServiceRoleInvalid(uint serviceIdx, address service, RoleId role);
-
     Seconds public constant MIN_DISABLE_DELAY = Seconds.wrap(60 * 24 * 365); // 1 year
 
     RegistryAdmin public immutable _admin;
-    address public immutable _releaseAccessManagerCodeAddress;
     Registry public immutable _registry;
     IRegisterable private _staking;
     address private _stakingOwner;
 
-    mapping(VersionPart version => AccessManagerExtendedWithDisableInitializeable accessManager) internal _releaseAccessManager;
     mapping(VersionPart version => IRegistry.ReleaseInfo info) internal _releaseInfo;
+    mapping(VersionPart version => IServiceAuthorization authz) internal _serviceAuthorization;
+
+    // TODO check where/why this is used
     mapping(address registryService => VersionPart version) _releaseVersionByAddress;
 
-    VersionPart immutable internal _initial;// first active version    
+    VersionPart private _initial;// first active version    
     VersionPart internal _latest; // latest active version
     VersionPart internal _next; // version to create and activate 
-    StateId internal _state; // current state of release manager
+    mapping(VersionPart verson => StateId releaseState) private _state;
 
-    uint256 internal _awaitingRegistration; // "services left to register" counter
+    uint256 internal _registeredServices;
+    uint256 internal _servicesToRegister;
 
-    // deployer of this contract must be gif admin
     constructor(Registry registry)
         AccessManaged(msg.sender)
     {
@@ -117,154 +118,135 @@ contract ReleaseManager is
             revert ErrorReleaseManagerNotRegistry(registry);
         }
 
+        setAuthority(registry.getAuthority());
+
         _registry = registry;
-        setAuthority(_registry.getAuthority());
         _admin = RegistryAdmin(_registry.getRegistryAdminAddress());
 
         _initial = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION);
         _next = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION - 1);
-        _state = getInitialState(RELEASE());
-        
-        AccessManagerExtendedWithDisableInitializeable masterReleaseAccessManager = new AccessManagerExtendedWithDisableInitializeable();
-        masterReleaseAccessManager.initialize(_registry.NFT_LOCK_ADDRESS(), VersionLib.toVersionPart(0));
-        //masterReleaseAccessManager.disable();
-        _releaseAccessManagerCodeAddress = address(masterReleaseAccessManager);
     }
 
     /// @dev skips previous release if was not activated
-    /// sets release manager into state SCHEDULED
+    /// sets next release into state SCHEDULED
     function createNextRelease()
         external
         restricted() // GIF_ADMIN_ROLE
         returns(VersionPart)
     {
-        if (!isValidTransition(RELEASE(), _state, SCHEDULED())) {
-            revert ErrorReleaseManagerReleaseCreationDisallowed(_state);
-        }
-
         _next = VersionPartLib.toVersionPart(_next.toInt() + 1);
-        _awaitingRegistration = 0;
-        _state = SCHEDULED();
+        _servicesToRegister = 0;
+        _registeredServices = 0;
+        _state[_next] = getInitialState(RELEASE());
 
         return _next;
     }
 
-    // TODO order of events
     function prepareNextRelease(
-        address[] memory addresses,
-        string[] memory names, 
-        RoleId[][] memory serviceRoles,
-        string[][] memory serviceRoleNames,
-        RoleId[][] memory functionRoles,
-        string[][] memory functionRoleNames,
-        bytes4[][][] memory selectors, 
+        IServiceAuthorization serviceAuthorization,
         bytes32 salt
     )
         external
         restricted() // GIF_MANAGER_ROLE
         returns(
-            address releaseAccessManagerAddress, 
+            address authority, 
             VersionPart version, 
             bytes32 releaseSalt
         )
     {
-        version = getNextVersion();
+        authority = _admin.authority();
+        version = _next;
 
         // ensures unique salt
+        // TODO CreateX have clones capability also
+        // what would releaseSalt look like if used with CreateX in pemissioned mode?
         releaseSalt = keccak256(
             bytes.concat(
                 bytes32(version.toInt()),
                 salt));
 
-        releaseAccessManagerAddress = Clones.cloneDeterministic(_releaseAccessManagerCodeAddress, releaseSalt);
-        AccessManagerExtendedWithDisableInitializeable releaseAccessManager = AccessManagerExtendedWithDisableInitializeable(releaseAccessManagerAddress);
-        releaseAccessManager.initialize(address(this), version);
+        // verify release in state SCHEDULED
+        if (!isValidTransition(RELEASE(), _state[version], DEPLOYING())) {
+            revert ErrorReleaseManagerReleasePreparationDisallowed(version, _state[version]);
+        }
+
+        _state[version] = DEPLOYING();
 
-        if (!isValidTransition(RELEASE(), _state, DEPLOYING())) {
-            revert ErrorReleaseManagerReleasePreparationDisallowed(_state);
+        // verify authorizaion contract release matches with expected version
+        VersionPart releaseVersion = serviceAuthorization.getRelease();
+        if (releaseVersion != version) {
+            revert ErrorReleaseManagerVersionMismatch(version, releaseVersion);
         }
 
-        _verifyReleaseAuthorizations(addresses, serviceRoles, functionRoles, selectors);
 
-        if(_awaitingRegistration > 0) {
-            revert ErrorReleaseManagerReleaseAlreadyPrepared(version);
+        // sanity check to ensure service domain list is not empty
+        uint256 serviceDomainsCount = serviceAuthorization.getServiceDomains().length;
+        if (serviceDomainsCount == 0) {
+            revert ErrorReleaseManagerNoDomains(version);
+        }
+
+        // verify prepareNextRelease is only called once per release
+        if(_servicesToRegister > 0) {
+            revert ErrorReleaseManagerReleaseAlreadyPrepared(version, _state[version]);
         }
-        // TODO instead of copying just set ServiceAuthorizationsLib for release and array of domains???
-        _releaseInfo[version].version = version;
-        _releaseInfo[version].salt = releaseSalt;
-        _releaseInfo[version].addresses = addresses;
-        _releaseInfo[version].names = names;
-        _releaseInfo[version].serviceRoles = serviceRoles;
-        _releaseInfo[version].serviceRoleNames = serviceRoleNames;
-        _releaseInfo[version].functionRoles = functionRoles;
-        _releaseInfo[version].functionRoleNames = functionRoleNames;
-        _releaseInfo[version].selectors = selectors;
-        _awaitingRegistration = addresses.length;
-        _state = DEPLOYING();        
-        _releaseAccessManager[version] = releaseAccessManager;
-
-        emit LogReleaseCreation(version, releaseSalt, releaseAccessManager);
-    }
 
+        _servicesToRegister = serviceDomainsCount;
+        _serviceAuthorization[version] = serviceAuthorization;
+
+        emit LogReleaseCreation(version, releaseSalt);
+    }
 
+    // TODO this function can have 0 args -> use stored addresses from prepareNextRelease()
     function registerService(IService service) 
         external
         restricted // GIF_MANAGER_ROLE
         returns(NftId nftId)
     {
-        if (!isValidTransition(RELEASE(), _state, DEPLOYING())) {
-            revert ErrorReleaseManagerServiceRegistrationDisallowed(_state);
+        VersionPart releaseVersion = _next;
+        StateId state = _state[releaseVersion];
+
+        // verify release in state DEPLOYING
+        if (!isValidTransition(RELEASE(), state, DEPLOYING())) {
+            // TOOD name must represent failed state transition
+            revert ErrorReleaseManagerServiceRegistrationDisallowed(state);
+        }
+
+        _state[releaseVersion] = DEPLOYING();
+
+        // not all services are registered
+        if (_servicesToRegister == _registeredServices) {
+            revert ErrorReleaseManagerNoServiceRegistrationExpected();
         }
 
+        // service can work with release manager
         (
             IRegistry.ObjectInfo memory info,
-            ObjectType domain,
-            VersionPart version
+            ObjectType serviceDomain,
+            VersionPart serviceVersion
         ) = _verifyService(service);
 
-        // redundant with state var
-        if (_awaitingRegistration == 0) {
-            revert ErrorReleaseManagerNoServiceRegistrationExpected();
+        // service domain matches defined in release config
+        ObjectType expectedDomain = _serviceAuthorization[releaseVersion].getServiceDomain(_registeredServices);
+        if (serviceDomain != expectedDomain) {
+            revert ErrorReleaseManagerServiceDomainMismatch(expectedDomain, serviceDomain);
         }
 
-        uint serviceIdx = _awaitingRegistration - 1;
-        address serviceAddress = _releaseInfo[version].addresses[serviceIdx];
-        // TODO temp, while typescript addresses computation is not implemented 
-        /*if(address(service) != serviceAddress) {
-            revert ErrorReleaseManagerServiceAddressInvalid(service, serviceAddress);
-        }*/
-
-        _setServiceAuthorizations(
-            _releaseAccessManager[version],
-            // TODO temp, while typescript addresses computation is not implemented
-            address(service),//serviceAddress, 
-            _releaseInfo[version].names[serviceIdx], 
-            _releaseInfo[version].serviceRoles[serviceIdx],
-            _releaseInfo[version].serviceRoleNames[serviceIdx],
-            _releaseInfo[version].functionRoles[serviceIdx],
-            _releaseInfo[version].functionRoleNames[serviceIdx],
-            _releaseInfo[version].selectors[serviceIdx]);
-
-        // TODO decide for one of the approaches
-        // // service to service authorization
-        // ServiceAuthorizationsLib.ServiceAuthorization memory authz = ServiceAuthorizationsLib.getAuthorizations(domain);
-        // for(uint8 idx = 0; idx < authz.authorizedRole.length; idx++) {
-        //     _accessManager.setTargetFunctionRole(
-        //         address(service), 
-        //         authz.authorizedSelectors[idx], 
-        //         authz.authorizedRole[idx]);
-        // }
-
-        _awaitingRegistration = serviceIdx;
-        // TODO end state depends on (_awaitingRegistration == 0)
-        _state = DEPLOYING();
-
-        // checked in registry
-        _releaseInfo[version].domains.push(domain);
-
-        nftId = _registry.registerService(info, version, domain);
-
+        // register service with registry
+        nftId = _registry.registerService(info, serviceVersion, serviceDomain);
         service.linkToRegisteredNftId();
+        _registeredServices++;
+
+        // setup service authorization
+        _admin.authorizeService(
+            _serviceAuthorization[releaseVersion], 
+            service);
+
+        // TODO consider to extend this to REGISTRY
+        // special roles for registry/staking/pool service
+        if (serviceDomain == STAKING() || serviceDomain == POOL()) {
+            // TODO rename to grantServiceDomainRole()
+            _admin.grantServiceRoleForAllVersions(service, serviceDomain);
+        }
     }
 
 
@@ -272,31 +254,28 @@ contract ReleaseManager is
         external 
         restricted // GIF_ADMIN_ROLE
     {
-        if (!isValidTransition(RELEASE(), _state, ACTIVE())) {
-            revert ErrorReleaseManagerReleaseActivationDisallowed(_state);
-        }
-
         VersionPart version = _next;
-        address service = _registry.getServiceAddress(REGISTRY(), version);
+        StateId state = _state[version];
+        StateId newState = ACTIVE();
 
-        // release exists, registry service is a MUST
-        //if(_releaseAccessManager[version] == address(0)) {
-        if(service == address(0)) {
-            revert ErrorReleaseManagerReleaseNotCreated(version);
+        // verify release in state DEPLOYING
+        if (!isValidTransition(RELEASE(), state, newState)) {
+            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
         }
 
         // release fully deployed
-        if(_awaitingRegistration > 0) {
-            revert ErrorReleaseManagerReleaseRegistrationNotFinished(version, _awaitingRegistration);
+        if(_registeredServices < _servicesToRegister) {
+            revert ErrorReleaseManagerReleaseRegistrationNotFinished(version, _servicesToRegister - _registeredServices);
         }
 
-        // release is not activated
-        if(_releaseInfo[version].activatedAt.gtz()) {
-            revert ErrorReleaseManagerReleaseAlreadyActivated(version);
+        // release exists, registry service MUST exist
+        address service = _registry.getServiceAddress(REGISTRY(), version);
+        if(service == address(0)) {
+            revert ErrorReleaseManagerReleaseNotCreated(version);
         }
 
         _latest = version;
-        _state = ACTIVE();
+        _state[version] = newState;
 
         _releaseVersionByAddress[service] = version;
         _releaseInfo[version].activatedAt = TimestampLib.blockTimestamp();
@@ -304,41 +283,49 @@ contract ReleaseManager is
         emit LogReleaseActivation(version);
     }
 
-    // release becomes disabled after delay expiration (can be reenabled before that)
-    function disableRelease(VersionPart version, Seconds disableDelay)
+    /// @dev stop all operations with release services
+    function pauseRelease(VersionPart version)
         external
         restricted // GIF_ADMIN_ROLE
     {
-        // release was activated
-        if(_releaseInfo[version].activatedAt.eqz()) {
-            revert ErrorReleaseManagerReleaseNotActivated(version);
-        }
+        StateId state = _state[version];
+        StateId newState = PAUSED();
 
-        // release not disabled already
-        if(_releaseInfo[version].disabledAt.gtz()) {
-            revert ErrorReleaseManagerReleaseAlreadyDisabled(version);
+        // verify release in state ACTIVE
+        if (!isValidTransition(RELEASE(), state, newState)) {
+            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
         }
 
-        disableDelay = SecondsLib.toSeconds(Math.max(disableDelay.toInt(), MIN_DISABLE_DELAY.toInt()));
+        // TODO come up with a substitute
+        //_releaseAccessManager[version].disable();
 
-        _releaseAccessManager[version].disable(disableDelay);
+        _state[version] = newState;
+        _releaseInfo[version].disabledAt = TimestampLib.blockTimestamp();
 
-        _releaseInfo[version].disabledAt = TimestampLib.blockTimestamp().addSeconds(disableDelay);
+        emit LogReleaseDisabled(version);
     }
-    
-    function enableRelease(VersionPart version)
+
+    // TODO consider revert if some delay is expired -> becomes disabled automatically
+    /// @dev resume operations with release services
+    function unpauseRelease(VersionPart version)
         external
         restricted // GIF_ADMIN_ROLE
     {
-        // release was disabled
-        //if(_releaseInfo[version].disabledAt.eqz()) {
-        //    revert ErrorReleaseManagerReleaseAlreadyEnabled(version);
-        //}
+        StateId state = _state[version];
+        StateId newState = ACTIVE();
+
+        // verify release in state PAUSED
+        if (!isValidTransition(RELEASE(), state, newState)) {
+            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
+        }
 
-        // reverts if disable delay expired
-        _releaseAccessManager[version].enable();
+        // TODO come up with a substitute
+        // _releaseAccessManager[version].enable();
         
+        _state[version] = newState;
         _releaseInfo[version].disabledAt = zeroTimestamp();
+
+        emit LogReleaseEnabled(version);
     }
 
     //--- view functions ----------------------------------------------------//
@@ -357,7 +344,7 @@ contract ReleaseManager is
     }
 
     function isActiveRelease(VersionPart version) public view returns(bool) {
-        return _releaseInfo[version].activatedAt.gtz();
+        return _state[version] == ACTIVE();
     }
 
     function getReleaseInfo(VersionPart version) external view returns(IRegistry.ReleaseInfo memory) {
@@ -376,18 +363,22 @@ contract ReleaseManager is
         return _initial;
     }
 
-    function getState() external view returns (StateId stateId) {
-        return _state;
+    function getState(VersionPart version) external view returns (StateId stateId) {
+        return _state[version];
     }
 
     function getRemainingServicesToRegister() external view returns (uint256 services) {
-        return _awaitingRegistration;
+        return _servicesToRegister - _registeredServices;
     }
 
-    function getReleaseAccessManager(VersionPart version) external view returns(AccessManagerExtendedWithDisableInitializeable) {
-        return _releaseAccessManager[version];
+    function getServiceAuthorization(VersionPart version)
+        external
+        view
+        returns (IServiceAuthorization serviceAuthorization)
+    {
+        return _serviceAuthorization[version];
     }
-    // TODO tokenr registry knows nothing about adfmin, only registry
+
     function getRegistryAdmin() external view returns (address) {
         return address(_admin);
     }
@@ -398,37 +389,6 @@ contract ReleaseManager is
         return _registry;
     }
 
-    //--- ILifecycle -----------------------------------------------------------//
-
-    function hasLifecycle(ObjectType objectType) external pure returns (bool) { return objectType == RELEASE(); }
-
-    function getInitialState(ObjectType objectType) public pure returns (StateId stateId) { 
-        if (objectType == RELEASE()) {
-            stateId = INITIAL();
-        }
-    }
-
-    function isValidTransition(
-        ObjectType objectType,
-        StateId fromId,
-        StateId toId
-    )
-        public 
-        pure 
-        returns (bool isValid)
-    {
-        if (objectType != RELEASE()) { return false; }
-
-        if (fromId == INITIAL() && toId == SCHEDULED()) { return true; }
-        if (fromId == SCHEDULED() && toId == DEPLOYING()) { return true; }
-        if (fromId == DEPLOYING() && toId == SCHEDULED()) { return true; }
-        if (fromId == DEPLOYING() && toId == DEPLOYING()) { return true; }
-        if (fromId == DEPLOYING() && toId == ACTIVE()) { return true; }
-        // TODO active -> scheduled missing, add tests to cover this and more scenarios (#358)
-
-        return false;
-    }
-
     //--- private functions ----------------------------------------------------//
 
     function _verifyService(IService service)
@@ -441,7 +401,7 @@ contract ReleaseManager is
         )
     {
         if(!service.supportsInterface(type(IService).interfaceId)) {
-            revert ErrorReleaseManagerNotService(service);
+            revert ErrorReleaseManagerNotService(address(service));
         }
 
         address owner = msg.sender;
@@ -452,15 +412,15 @@ contract ReleaseManager is
 
         _verifyServiceInfo(service, serviceInfo, owner);
 
-        VersionPart releaseVersion = getNextVersion(); // never 0
-        address releaseAuthority = address(_releaseAccessManager[releaseVersion]); // can be zero if registering service when release is not created
+        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 != releaseAuthority) {
+        if(serviceAuthority != expectedAuthority) {
             revert ErrorReleaseManagerServiceReleaseAuthorityMismatch(
                 service,
                 serviceAuthority,
-                releaseAuthority);
+                expectedAuthority);
         }
 
         if(serviceVersion != releaseVersion) {
@@ -488,7 +448,7 @@ contract ReleaseManager is
             revert ErrorReleaseManagerServiceInfoInterceptorInvalid(service, info.isInterceptor);
         }
 
-        if(info.objectType != SERVICE()) {// type is checked in registry anyway...but service logic may depend on expected value
+        if(info.objectType != SERVICE()) {
             revert ErrorReleaseManagerServiceInfoTypeInvalid(service, SERVICE(), info.objectType);
         }
 
@@ -507,81 +467,7 @@ contract ReleaseManager is
         }
     }
 
-
-    function _verifyReleaseAuthorizations(
-        address[] memory serviceAddress,
-        RoleId[][] memory serviceRoles,
-        RoleId[][] memory functionRoles,
-        bytes4[][][] memory selectors
-    )
-        internal
-        pure
-    {
-        if(serviceAddress.length == 0) {
-            revert ErrorReleaseManagerReleaseEmpty();
-        }
-
-        for(uint serviceIdx = 0; serviceIdx < serviceAddress.length; serviceIdx++)
-        {
-            for(uint roleIdx = 0; roleIdx < serviceRoles[serviceIdx].length; roleIdx++)
-            {
-                RoleId role = serviceRoles[serviceIdx][roleIdx];
-                if(role == ADMIN_ROLE() || role == PUBLIC_ROLE()) {
-                    revert ErrorReleaseManagerReleaseServiceRoleInvalid(serviceIdx, serviceAddress[serviceIdx], role);
-                }
-            }
-        }
-
-        // TODO no duplicate service "domain" role per release
-        // TODO no duplicate service roles per service
-        // TODO no duplicate service function roles per service
-        // TODO no duplicate service function selectors per service
-    }
-
-    function _setServiceAuthorizations(
-        AccessManagerExtendedWithDisableInitializeable accessManager, // release access manager
-        address serviceAddress,
-        string memory serviceName,
-        RoleId[] memory serviceRoles,
-        string[] memory serviceRoleNames,
-        RoleId[] memory functionRoles,
-        string[] memory functionRoleNames,
-        bytes4[][] memory selectors
-    )
-        internal
-    {
-        accessManager.createTarget(serviceAddress, serviceName);
-
-        for(uint idx = 0; idx < functionRoles.length; idx++)
-        {
-            uint64 roleInt = functionRoles[idx].toInt();
-
-            if(!accessManager.isRoleExists(roleInt)) {
-                accessManager.createRole(roleInt, functionRoleNames[idx]);
-            }
-
-            accessManager.setTargetFunctionRole(
-                serviceAddress, 
-                selectors[idx],
-                functionRoles[idx].toInt());
-        }
-    
-        for(uint idx = 0; idx < serviceRoles.length; idx++)
-        {
-            uint64 roleInt = serviceRoles[idx].toInt();
-
-            if(!accessManager.isRoleExists(roleInt)) {
-                accessManager.createRole(roleInt, serviceRoleNames[idx]);
-            }
-
-            accessManager.grantRole(
-                serviceRoles[idx].toInt(),
-                serviceAddress, 
-                0);
-        }
-    }
-
-    // returns true iff a the address passes some simple proxy tests.
+    /// @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
@@ -589,7 +475,7 @@ contract ReleaseManager is
             return false;
         }
         // TODO try catch and return false in case of revert
-        // a just panic
+        // or just panic
         // check if contract returns a zero nft id for its own address
         if (IRegistry(registryAddress).getNftId(registryAddress).eqz()) {
             return false;
@@ -598,3 +484,4 @@ contract ReleaseManager is
         return true;
     }
 }
+