@etherisc/gif-next 0.0.2-71cf987-554 → 0.0.2-7202758-806

package/contracts/registry/RegistryAdmin.sol

@@ -11,6 +11,7 @@ import {IStaking} from "../staking/IStaking.sol";
 import {ObjectType, ObjectTypeLib, ALL, REGISTRY, STAKING, POOL, RELEASE} from "../type/ObjectType.sol";
 import {ReleaseRegistry} from "./ReleaseRegistry.sol";
 import {RoleId, RoleIdLib, ADMIN_ROLE, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
+import {Staking} from "../staking/Staking.sol";
 import {StakingStore} from "../staking/StakingStore.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
@@ -30,7 +31,9 @@ import {VersionPart, VersionPartLib} from "../type/Version.sol";
         - responsible for creation, activation and locking/unlocking of releases
 */
 
-/// @dev IMPORTANT: MUST not use authority().setLocked() 
+/// @dev The RegistryAdmin contract implements the central authorization for the GIF core contracts.
+/// These are the release independent registry and staking contracts and their respective helper contracts.
+/// The RegistryAdmin also manages the access from service contracts to the GIF core contracts
 contract RegistryAdmin is
     AccessAdmin
 {
@@ -50,6 +53,7 @@ contract RegistryAdmin is
     string public constant REGISTRY_TARGET_NAME = "Registry";
     string public constant RELEASE_REGISTRY_TARGET_NAME = "ReleaseRegistry";
     string public constant STAKING_TARGET_NAME = "Staking";
+    string public constant STAKING_TH_TARGET_NAME = "StakingTH";
     string public constant STAKING_STORE_TARGET_NAME = "StakingStore";
     string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
     string public constant TOKEN_HANDLER_TARGET_NAME = "TokenHandler";
@@ -71,12 +75,16 @@ contract RegistryAdmin is
         address gifAdmin, 
         address gifManager
     )
-        external
+        public
+        virtual
         reinitializer(type(uint8).max)
         onlyDeployer()
     {
         AccessManagerCloneable accessManager = AccessManagerCloneable(authority());
-        accessManager.completeSetup(address(registry), VersionPartLib.toVersionPart(type(uint8).max)); 
+        accessManager.completeSetup(
+            address(registry), 
+            VersionPartLib.toVersionPart(type(uint8).max),
+            false); 
 
         _registry = address(registry);
         _releaseRegistry = registry.getReleaseRegistryAddress();
@@ -298,7 +306,7 @@ contract RegistryAdmin is
                 name: STAKING_SERVICE_ROLE_NAME}));
 
         // grant permissions to the staking service role for staking contract
-        functions = new FunctionInfo[](13);
+        functions = new FunctionInfo[](11);
         functions[0] = toFunction(IStaking.registerTarget.selector, "registerTarget");
         functions[1] = toFunction(IStaking.setLockingPeriod.selector, "setLockingPeriod");
         functions[2] = toFunction(IStaking.setRewardRate.selector, "setRewardRate");
@@ -310,8 +318,6 @@ contract RegistryAdmin is
         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);
 
         // create pool service role
@@ -329,5 +335,10 @@ contract RegistryAdmin is
         functions[0] = toFunction(IStaking.increaseTotalValueLocked.selector, "increaseTotalValueLocked");
         functions[1] = toFunction(IStaking.decreaseTotalValueLocked.selector, "decreaseTotalValueLocked");
         _authorizeTargetFunctions(_staking, poolServiceRoleId, functions);
+
+        // grant permissions to public role for staking contract
+        functions = new FunctionInfo[](1);
+        functions[0] = toFunction(Staking.approveTokenHandler.selector, "approveTokenHandler");
+        _authorizeTargetFunctions(_staking, PUBLIC_ROLE(), functions);
     }
 }

package/contracts/registry/RegistryService.sol

@@ -33,11 +33,11 @@ contract RegistryService is
         initializer()
     {
         (
-            address registryAddress,
-            address initialAuthority
+            address authority,
+            address registry
         ) = abi.decode(data, (address, address));
 
-        _initializeService(registryAddress, initialAuthority, owner);
+        __Service_init(authority, registry, owner);
         _registerInterface(type(IRegistryService).interfaceId);
     }
 

package/contracts/registry/RegistryServiceManager.sol

@@ -31,7 +31,7 @@ contract RegistryServiceManager is
         }
         
         RegistryService srv = new RegistryService{ salt: salt }();
-        bytes memory data = abi.encode(registry, authority);
+        bytes memory data = abi.encode(authority, registry);
         IVersionable versionable = initialize(
             registry,
             address(srv), 

package/contracts/registry/ReleaseAdmin.sol

@@ -2,22 +2,26 @@
 pragma solidity ^0.8.20;
 
 import {AccessAdmin} from "../authorization/AccessAdmin.sol";
+import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
 import {IAccess} from "../authorization/IAccess.sol";
-import {IAccessAdmin} from "../authorization/IAccessAdmin.sol";
 import {IService} from "../shared/IService.sol";
 import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
-import {ObjectType, ObjectTypeLib, ALL, RELEASE} from "../type/ObjectType.sol";
+import {ObjectType, ObjectTypeLib, ALL} from "../type/ObjectType.sol";
 import {RoleId, RoleIdLib, ADMIN_ROLE, RELEASE_REGISTRY_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
-import {VersionPart, VersionPartLib} from "../type/Version.sol";
-import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
-
+import {VersionPart} from "../type/Version.sol";
 
+/// @dev The ReleaseAdmin contract implements the central authorization for the services of a specific release.
+/// There is one ReleaseAdmin contract per major GIF release.
+/// Locking/unlocking of all services of a release is implemented in function setReleaseLocked.
 contract ReleaseAdmin is
     AccessAdmin
 {
+    event LogReleaseAdminReleaseLockChanged(VersionPart release, bool locked);
+    event LogReleaseAdminServiceLockChanged(VersionPart release, address service, bool locked);
+
     error ErrorReleaseAdminCallerNotReleaseRegistry(address caller);
     error ErrorReleaseAdminNotService(address notService);
-    error ErrorReleaseAdminReleaseAlreadyLocked();
+    error ErrorReleaseAdminReleaseLockAlreadySetTo(bool locked);
 
     /// @dev release core roles
     string public constant RELEASE_REGISTRY_ROLE_NAME = "ReleaseRegistryRole";
@@ -33,6 +37,7 @@ contract ReleaseAdmin is
         }
         _;
     }
+
     /// @dev Only used for master release admin.
     /// Contracts created via constructor come with disabled initializers.
     constructor() {
@@ -41,15 +46,17 @@ contract ReleaseAdmin is
     }
 
     function completeSetup(
-        address registry, 
+        address registry,
         address releaseRegistry,
-        VersionPart releaseVersion
+        VersionPart release
     )
         external
-        reinitializer(uint64(releaseVersion.toInt()))
+        reinitializer(uint64(release.toInt()))
     {
-        AccessManagerCloneable accessManager = AccessManagerCloneable(authority());
-        accessManager.completeSetup(registry, releaseVersion); 
+        AccessManagerCloneable(
+            authority()).completeSetup(
+                registry, 
+                release); 
 
         _setupReleaseRegistry(releaseRegistry);
     }
@@ -78,7 +85,16 @@ contract ReleaseAdmin is
         external
         onlyReleaseRegistry()
     {
-        _setReleaseLocked(locked);
+        // checks
+        AccessManagerCloneable accessManager = AccessManagerCloneable(authority());
+        if(accessManager.isLocked() == locked) {
+            revert ErrorReleaseAdminReleaseLockAlreadySetTo(locked);
+        }
+
+        // effects
+        accessManager.setLocked(locked);
+
+        emit LogReleaseAdminReleaseLockChanged(getRelease(), locked);
     }
 
     /// @dev Lock/unlock specific service of release.
@@ -94,17 +110,12 @@ contract ReleaseAdmin is
         }
 
         _setTargetClosed(address(service), locked);
-    }
 
-    /*function transferAdmin(address to)
-        external
-        restricted // only with GIF_ADMIN_ROLE or nft owner
-    {
-        _accessManager.revoke(GIF_ADMIN_ROLE, );
-        _accesssManager.grant(GIF_ADMIN_ROLE, to, 0);
-    }*/
+        emit LogReleaseAdminServiceLockChanged(service.getRelease(), address(service), locked);
+    }
 
     //--- view functions ----------------------------------------------------//
+
 /*
     function getReleaseAdminRole() external view returns (RoleId) {
         return GIF_ADMIN_ROLE();
@@ -207,17 +218,6 @@ contract ReleaseAdmin is
         }
     }
 
-    function _setReleaseLocked(bool locked)
-        private
-    {
-        AccessManagerCloneable accessManager = AccessManagerCloneable(authority());
-        if(accessManager.isLocked() == locked) {
-            revert ErrorReleaseAdminReleaseAlreadyLocked();
-        }
-
-        accessManager.setLocked(locked);
-    }
-
     //--- private initialization functions -------------------------------------------//
 
     function _setupReleaseRegistry(address releaseRegistry)
@@ -226,11 +226,8 @@ contract ReleaseAdmin is
     {
         _createTarget(address(this), RELEASE_ADMIN_TARGET_NAME, false, false);
 
-        // TODO why release registry role is calculated?
-        //RoleId releaseRegistryRoleId = RoleIdLib.roleForType(RELEASE());
-        RoleId releaseRegistryRoleId = RELEASE_REGISTRY_ROLE();
         _createRole(
-            releaseRegistryRoleId, 
+            RELEASE_REGISTRY_ROLE(), 
             toRole({
                 adminRoleId: ADMIN_ROLE(),
                 roleType: RoleType.Contract,
@@ -241,8 +238,8 @@ contract ReleaseAdmin is
         functions = new FunctionInfo[](2);
         functions[0] = toFunction(ReleaseAdmin.authorizeService.selector, "authorizeService");
         functions[1] = toFunction(ReleaseAdmin.setServiceLocked.selector, "setServiceLocked");
-        _authorizeTargetFunctions(address(this), releaseRegistryRoleId, functions);
+        _authorizeTargetFunctions(address(this), RELEASE_REGISTRY_ROLE(), functions);
 
-        _grantRoleToAccount(releaseRegistryRoleId, releaseRegistry);
+        _grantRoleToAccount(RELEASE_REGISTRY_ROLE(), releaseRegistry);
     }
 }

package/contracts/registry/ReleaseLifecycle.sol

@@ -5,6 +5,8 @@ import {RELEASE} from "../type/ObjectType.sol";
 import {SCHEDULED, DEPLOYING, DEPLOYED, SKIPPED, ACTIVE, PAUSED, CLOSED} from "../type/StateId.sol";
 import {Lifecycle} from "../shared/Lifecycle.sol";
 
+/// @dev Release lifeycle state machine.
+/// Helper contract for ReleaseRegistry.
 contract ReleaseLifecycle is
     Lifecycle
 {

package/contracts/registry/ReleaseRegistry.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.20;
 import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
 
+import {ContractLib} from "../shared/ContractLib.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType, ObjectTypeLib, POOL, RELEASE, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.sol";
 import {TimestampLib, zeroTimestamp} from "../type/Timestamp.sol";
@@ -17,6 +18,7 @@ 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 {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
@@ -24,18 +26,24 @@ import {Registry} from "./Registry.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
 {
-    uint256 public constant INITIAL_GIF_VERSION = 3;// first active version  
+    uint256 public constant INITIAL_GIF_VERSION = 3;// first active release version  
 
-    event LogReleaseCreation(IAccessAdmin admin, 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);
@@ -43,7 +51,7 @@ contract ReleaseRegistry is
     // _verifyServiceAuthorization
     error ErrorReleaseRegistryNotServiceAuth(address notAuth);
     error ErrorReleaseRegistryServiceAuthVersionMismatch(IServiceAuthorization auth, VersionPart expected, VersionPart actual);
-    error ErrorReleaseRegistryServiceAuthDomainsZero(IServiceAuthorization auth, VersionPart version);
+    error ErrorReleaseRegistryServiceAuthDomainsZero(IServiceAuthorization auth, VersionPart release);
 
     // registerService
     error ErrorReleaseRegistryServiceAddressMismatch(address expected, address actual);
@@ -68,21 +76,21 @@ contract ReleaseRegistry is
     RegistryAdmin public immutable _admin;
     Registry public immutable _registry;
 
-    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 _masterReleaseAdmin;
+    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);
         }
 
@@ -96,25 +104,26 @@ contract ReleaseRegistry is
         _next = VersionPartLib.toVersionPart(INITIAL_GIF_VERSION - 1);
     }
 
-    /// @dev sets previous release into SKIPPED state if it was created but 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())) {
-            _releaseInfo[version].state = SKIPPED();
+        if(isValidTransition(RELEASE(), _releaseInfo[release].state, SKIPPED())) {
+            _releaseInfo[release].state = SKIPPED();
         }
 
-        version = VersionPartLib.toVersionPart(version.toInt() + 1);
-        _release.push(version);
+        release = VersionPartLib.toVersionPart(release.toInt() + 1);
+        _release.push(release);
 
-        _next = version;
-        _releaseInfo[version].version = version;
-        _releaseInfo[version].state = getInitialState(RELEASE());
+        _next = release;
+        _releaseInfo[release].version = release;
+        _releaseInfo[release].state = getInitialState(RELEASE());
         _servicesToRegister = 0;
         _registeredServices = 0;
 
@@ -128,7 +137,7 @@ contract ReleaseRegistry is
         external
         restricted() // GIF_MANAGER_ROLE
         returns(
-            IAccessAdmin releaseAdmin, 
+            ReleaseAdmin releaseAdmin, 
             VersionPart releaseVersion, 
             bytes32 releaseSalt
         )
@@ -142,8 +151,9 @@ contract ReleaseRegistry is
         uint256 serviceDomainsCount = _verifyServiceAuthorization(serviceAuthorization, releaseVersion, salt);
 
         // create and initialize release admin
-        releaseAdmin = _createReleaseAdmin();
+        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?
@@ -157,7 +167,7 @@ contract ReleaseRegistry is
         _releaseInfo[releaseVersion].salt = releaseSalt;
         // TODO allow for the same serviceAuthorization address to be used for multiple releases?
         _releaseInfo[releaseVersion].auth = serviceAuthorization;
-        _releaseInfo[releaseVersion].admin = releaseAdmin;
+        _releaseInfo[releaseVersion].releaseAdmin = address(releaseAdmin);
 
         emit LogReleaseCreation(releaseAdmin, releaseVersion, releaseSalt);
     }
@@ -172,7 +182,7 @@ contract ReleaseRegistry is
         // release can transition to DEPLOYED state
         checkTransition(_releaseInfo[releaseVersion].state, RELEASE(), DEPLOYING(), DEPLOYED());
 
-        address releaseAuthority = _releaseInfo[releaseVersion].admin.authority();
+        address releaseAuthority = ReleaseAdmin(_releaseInfo[releaseVersion].releaseAdmin).authority();
         IServiceAuthorization releaseAuth = _releaseInfo[releaseVersion].auth;
         ObjectType expectedDomain = releaseAuth.getServiceDomain(_registeredServices);
 
@@ -204,7 +214,7 @@ contract ReleaseRegistry is
         // revert ErrorReleaseRegistryServiceAddressMismatch()
 
         // setup service authorization
-        ReleaseAdmin releaseAdmin = ReleaseAdmin(address(_releaseInfo[releaseVersion].admin));
+        ReleaseAdmin releaseAdmin = ReleaseAdmin(_releaseInfo[releaseVersion].releaseAdmin);
         releaseAdmin.setReleaseLocked(false);
         releaseAdmin.authorizeService(
             releaseAuth, 
@@ -217,66 +227,69 @@ contract ReleaseRegistry is
         nftId = _registry.registerService(info, serviceVersion, serviceDomain);
         service.linkToRegisteredNftId();
     }
+
+
     // TODO return activated version
     function activateNextRelease() 
         external 
         restricted // GIF_ADMIN_ROLE
     {
-        VersionPart version = _next;
+        VersionPart release = _next;
 
         // release can transition to ACTIVE state
-        checkTransition(_releaseInfo[version].state, RELEASE(), DEPLOYED(), ACTIVE());
+        checkTransition(_releaseInfo[release].state, RELEASE(), DEPLOYED(), ACTIVE());
 
-        _latest = version;
-        _releaseInfo[version].state = ACTIVE();
-        _releaseInfo[version].activatedAt = TimestampLib.blockTimestamp();
+        _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
 
         // registry service MUST be registered for each release
-        address service = _registry.getServiceAddress(REGISTRY(), version);
+        address service = _registry.getServiceAddress(REGISTRY(), release);
         if(service == address(0)) {
-            revert ErrorReleaseRegistryRegistryServiceMissing(version);
+            revert ErrorReleaseRegistryRegistryServiceMissing(release);
         }
 
         _admin.grantServiceRoleForAllVersions(IService(service), REGISTRY());
 
-        service = _registry.getServiceAddress(STAKING(), version);
+        service = _registry.getServiceAddress(STAKING(), release);
         if(service != address(0)) {
             _admin.grantServiceRoleForAllVersions(IService(service), STAKING());
         }
 
-        service = _registry.getServiceAddress(POOL(), version);
+        service = _registry.getServiceAddress(POOL(), release);
         if(service != address(0)) {
             _admin.grantServiceRoleForAllVersions(IService(service), POOL());
         }
 
-        _setReleaseLocked(version, false);
+        _setReleaseLocked(release, false);
 
-        emit LogReleaseActivation(version);
+        emit LogReleaseActivation(release);
     }
 
     /// @dev stop/resume operations with restricted functions
-    function setActive(VersionPart version, bool active) 
+    function setActive(VersionPart release, bool active) 
         public
         restricted
     {
-        StateId state = _releaseInfo[version].state;
+        StateId state = _releaseInfo[release].state;
 
         if(active) {
             checkTransition(state, RELEASE(), PAUSED(), ACTIVE());
-            _releaseInfo[version].state = ACTIVE();
-            _releaseInfo[version].disabledAt = zeroTimestamp();
-            emit LogReleaseEnabled(version);
+            _releaseInfo[release].state = ACTIVE();
+            _releaseInfo[release].disabledAt = TimestampLib.max();
+            emit LogReleaseEnabled(release);
         } else {
             checkTransition(state, RELEASE(), ACTIVE(), PAUSED());
-            _releaseInfo[version].state = PAUSED();
-            _releaseInfo[version].disabledAt = TimestampLib.blockTimestamp();
-            emit LogReleaseDisabled(version);
+            _releaseInfo[release].state = PAUSED();
+            _releaseInfo[release].disabledAt = TimestampLib.blockTimestamp();
+            emit LogReleaseDisabled(release);
         }
 
-        _setReleaseLocked(version, !active);
+        _setReleaseLocked(release, !active);
     }
 
     //--- view functions ----------------------------------------------------//
@@ -289,12 +302,12 @@ 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 version) external view returns(IRegistry.ReleaseInfo memory) {
-        return _releaseInfo[version];
+    function getReleaseInfo(VersionPart release) external view returns(IRelease.ReleaseInfo memory) {
+        return _releaseInfo[release];
     }
 
     /// @dev Returns the number of created releases.
@@ -305,7 +318,7 @@ contract ReleaseRegistry is
 
     /// @dev Returns the n-th release version.
     /// Valid values for idx [0 .. releases() - 1]
-    function getVersion(uint256 idx) external view returns (VersionPart version) {
+    function getVersion(uint256 idx) external view returns (VersionPart release) {
         // return _releases;
         return _release[idx];
     }
@@ -320,20 +333,20 @@ contract ReleaseRegistry is
         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) {
@@ -348,32 +361,41 @@ contract ReleaseRegistry is
 
     //--- private functions ----------------------------------------------------//
 
-    function _setReleaseLocked(VersionPart version, bool locked)
+    function _setReleaseLocked(VersionPart release, bool locked)
         private
     {
-        ReleaseAdmin releaseAdmin = ReleaseAdmin(address(_releaseInfo[version].admin));
-        releaseAdmin.setReleaseLocked(locked);
+        ReleaseAdmin(
+            _releaseInfo[release].releaseAdmin).setReleaseLocked(locked);
     }
 
-    function _createReleaseAdmin()
+
+    function _cloneNewReleaseAdmin(VersionPart release)
         private
         returns (ReleaseAdmin clonedAdmin)
     {
-        AccessManagerCloneable releaseAccessManager = AccessManagerCloneable(
+        AccessManagerCloneable clonedAccessManager = AccessManagerCloneable(
             Clones.clone(
                 _masterReleaseAdmin.authority()
             )
         );
+
         clonedAdmin = ReleaseAdmin(
             Clones.clone(
                 address(_masterReleaseAdmin)
             )
         );
-        clonedAdmin.initialize(releaseAccessManager);
-        clonedAdmin.completeSetup(address(_registry), address(this), _next);
+
+        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,
@@ -485,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).getNftIdForAddress(registryAddress).eqz()) {
-            return false;
-        }
-
-        return true;
-    }
 }