@etherisc/gif-next 0.0.2-6f86ab0-796 → 0.0.2-708facd-459

package/contracts/registry/Registry.sol

@@ -13,7 +13,7 @@ import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, STAKING
 import {ChainNft} from "./ChainNft.sol";
 import {IRegistry} from "./IRegistry.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
-import {ReleaseManager} from "./ReleaseManager.sol";
+import {ReleaseRegistry} from "./ReleaseRegistry.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
 
@@ -58,25 +58,25 @@ contract Registry is
 
     address public _tokenRegistryAddress;
     address public _stakingAddress;
-    ReleaseManager public _releaseManager;
+    ReleaseRegistry public _releaseRegistry;
 
     // TODO 
-    // 1). Registry and ReleaseManager must be treated as whole single entity. 
+    // 1). Registry and ReleaseRegistry must be treated as whole single entity. 
     //     But current limitations of EVM does not allow it -> require it to be splitted
-    // 2). Keep onlyReleaseManager modifier
+    // 2). Keep onlyReleaseRegistry modifier
     // 3). Delete onlyRegistryService in favor of restricted
     // 4). (For GlobalRegistry ONLY) make registerChainRegistry() restricted to GIF_ADMIN_ROLE
     modifier onlyRegistryService() {
-        if(!_releaseManager.isActiveRegistryService(msg.sender)) {
+        if(!_releaseRegistry.isActiveRegistryService(msg.sender)) {
             revert ErrorRegistryCallerNotRegistryService();
         }
         _;
     }
 
 
-    modifier onlyReleaseManager() {
-        if(msg.sender != address(_releaseManager)) {
-            revert ErrorRegistryCallerNotReleaseManager();
+    modifier onlyReleaseRegistry() {
+        if(msg.sender != address(_releaseRegistry)) {
+            revert ErrorRegistryCallerNotReleaseRegistry();
         }
         _;
     }
@@ -101,14 +101,14 @@ contract Registry is
     /// @dev wires release manager and token to registry (this contract).
     /// MUST be called by release manager.
     function initialize(
-        address releaseManager,
+        address releaseRegistry,
         address tokenRegistry,
         address staking
     )
         external
         initializer()
     {
-        _releaseManager = ReleaseManager(releaseManager);
+        _releaseRegistry = ReleaseRegistry(releaseRegistry);
         _tokenRegistryAddress = tokenRegistry;
         _stakingAddress = staking;
 
@@ -121,7 +121,7 @@ contract Registry is
         ObjectType domain
     )
         external
-        onlyReleaseManager
+        onlyReleaseRegistry
         returns(NftId nftId)
     {
         address service = info.objectAddress;
@@ -209,21 +209,21 @@ contract Registry is
 
     /// @dev earliest GIF major version 
     function getInitialVersion() external view returns (VersionPart) {
-        return _releaseManager.getInitialVersion();
+        return _releaseRegistry.getInitialVersion();
     }
 
     /// @dev next GIF release version to be released
     function getNextVersion() external view returns (VersionPart) {
-        return _releaseManager.getNextVersion();
+        return _releaseRegistry.getNextVersion();
     }
 
     /// @dev latest active GIF release version 
     function getLatestVersion() external view returns (VersionPart) { 
-        return _releaseManager.getLatestVersion();
+        return _releaseRegistry.getLatestVersion();
     }
 
     function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory) {
-        return _releaseManager.getReleaseInfo(version);
+        return _releaseRegistry.getReleaseInfo(version);
     }
 
     function getObjectCount() external view returns (uint256) {
@@ -277,7 +277,7 @@ contract Registry is
 
     function isActiveRelease(VersionPart version) external view returns (bool)
     {
-        return _releaseManager.isActiveRelease(version);
+        return _releaseRegistry.isActiveRelease(version);
     }
 
     function getStakingAddress() external view returns (address staking) {
@@ -298,8 +298,8 @@ contract Registry is
         service =  _service[releaseVersion][serviceDomain]; 
     }
 
-    function getReleaseManagerAddress() external view returns (address) {
-        return address(_releaseManager);
+    function getReleaseRegistryAddress() external view returns (address) {
+        return address(_releaseRegistry);
     }
 
     function getChainNftAddress() external view override returns (address) {

package/contracts/registry/RegistryAdmin.sol

@@ -8,7 +8,7 @@ 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 {ReleaseManager} from "./ReleaseManager.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";
@@ -39,11 +39,11 @@ contract RegistryAdmin is
     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_MANAGER_ROLE_NAME = "ReleaseManagerRole";
+    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";
     string public constant STAKING_STORE_TARGET_NAME = "StakingStore";
@@ -52,7 +52,7 @@ contract RegistryAdmin is
 
     mapping(address service => VersionPart majorVersion) private _ServiceRelease;
 
-    address private _releaseManager;
+    address private _releaseRegistry;
     address private _tokenRegistry;
     address private _staking;
     address private _stakingStore;
@@ -71,7 +71,7 @@ contract RegistryAdmin is
         if (_setupCompleted) { revert ErrorRegistryAdminIsAlreadySetUp(); } 
         else { _setupCompleted = true; }
 
-        _releaseManager = registry.getReleaseManagerAddress();
+        _releaseRegistry = registry.getReleaseRegistryAddress();
         _tokenRegistry = registry.getTokenRegistryAddress();
         _staking = registry.getStakingAddress();
         _stakingStore = address(
@@ -83,7 +83,7 @@ contract RegistryAdmin is
         _setupGifAdminRole(gifAdmin);
         _setupGifManagerRole(gifManager);
 
-        _setupReleaseManager();
+        _setupReleaseRegistry();
         _setupStaking();
     }
 
@@ -220,14 +220,14 @@ contract RegistryAdmin is
                 maxMemberCount: 2, // TODO decide on max member count
                 name: GIF_ADMIN_ROLE_NAME}));
 
-        // for ReleaseManager
+        // for ReleaseRegistry
         FunctionInfo[] memory functions;
         functions = new FunctionInfo[](4);
-        functions[0] = toFunction(ReleaseManager.createNextRelease.selector, "createNextRelease");
-        functions[1] = toFunction(ReleaseManager.activateNextRelease.selector, "activateNextRelease");
-        functions[2] = toFunction(ReleaseManager.pauseRelease.selector, "pauseRelease");
-        functions[3] = toFunction(ReleaseManager.unpauseRelease.selector, "unpauseRelease");
-        _authorizeTargetFunctions(_releaseManager, GIF_ADMIN_ROLE(), functions);
+        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);
     }
@@ -253,36 +253,36 @@ contract RegistryAdmin is
         functions[4] = toFunction(TokenRegistry.setActiveWithVersionCheck.selector, "setActiveWithVersionCheck");
         _authorizeTargetFunctions(_tokenRegistry, GIF_MANAGER_ROLE(), functions);
 
-        // for ReleaseManager
+        // for ReleaseRegistry
         functions = new FunctionInfo[](2);
-        functions[0] = toFunction(ReleaseManager.prepareNextRelease.selector, "prepareNextRelease");
-        functions[1] = toFunction(ReleaseManager.registerService.selector, "registerService");
-        _authorizeTargetFunctions(_releaseManager, GIF_MANAGER_ROLE(), functions);
+        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 _setupReleaseManager() private {
+    function _setupReleaseRegistry() private {
 
-        _createTarget(_releaseManager, RELEASE_MANAGER_TARGET_NAME, true, false);
+        _createTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, true, false);
 
-        RoleId releaseManagerRoleId = RoleIdLib.roleForType(RELEASE());
+        RoleId releaseRegistryRoleId = RoleIdLib.roleForType(RELEASE());
         _createRole(
-            releaseManagerRoleId, 
+            releaseRegistryRoleId, 
             toRole({
                 adminRoleId: ADMIN_ROLE(),
                 roleType: RoleType.Contract,
                 maxMemberCount: 1,
-                name: RELEASE_MANAGER_ROLE_NAME}));
+                name: RELEASE_REGISTRY_ROLE_NAME}));
 
         FunctionInfo[] memory functions;
         functions = new FunctionInfo[](2);
         functions[0] = toFunction(RegistryAdmin.authorizeService.selector, "authorizeService");
         functions[1] = toFunction(RegistryAdmin.grantServiceRoleForAllVersions.selector, "grantServiceRoleForAllVersions");
-        _authorizeTargetFunctions(address(this), releaseManagerRoleId, functions);
+        _authorizeTargetFunctions(address(this), releaseRegistryRoleId, functions);
 
-        _grantRoleToAccount(releaseManagerRoleId, _releaseManager);
+        _grantRoleToAccount(releaseRegistryRoleId, _releaseRegistry);
     }
 
 

package/contracts/registry/{ReleaseManager.sol → ReleaseRegistry.sol}

@@ -34,7 +34,7 @@ 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 
+contract ReleaseRegistry is 
     AccessManaged,
     ReleaseLifecycle, 
     IRegistryLinked
@@ -49,45 +49,45 @@ contract ReleaseManager is
     event LogReleaseEnabled(VersionPart version);
 
     // constructor
-    error ErrorReleaseManagerNotRegistry(Registry registry);
+    error ErrorReleaseRegistryNotRegistry(Registry registry);
 
     // createNextRelease
-    error ErrorReleaseManagerReleaseCreationDisallowed(VersionPart version, StateId currentStateId);
+    error ErrorReleaseRegistryReleaseCreationDisallowed(VersionPart version, StateId currentStateId);
 
     // prepareRelease
-    error ErrorReleaseManagerReleasePreparationDisallowed(VersionPart version, StateId currentStateId);
-    error ErrorReleaseManagerReleaseAlreadyPrepared(VersionPart version, StateId currentStateId);
-    error ErrorReleaseManagerVersionMismatch(VersionPart expected, VersionPart actual);
-    error ErrorReleaseManagerNoDomains(VersionPart version);
+    error ErrorReleaseRegistryReleasePreparationDisallowed(VersionPart version, StateId currentStateId);
+    error ErrorReleaseRegistryReleaseAlreadyPrepared(VersionPart version, StateId currentStateId);
+    error ErrorReleaseRegistryVersionMismatch(VersionPart expected, VersionPart actual);
+    error ErrorReleaseRegistryNoDomains(VersionPart version);
 
     // registerService
-    error ErrorReleaseManagerNoServiceRegistrationExpected();
-    error ErrorReleaseManagerServiceRegistrationDisallowed(StateId currentStateId);
-    error ErrorReleaseManagerServiceDomainMismatch(ObjectType expectedDomain, ObjectType actualDomain);
-    error ErrorReleaseManagerNotService(address notService);
-    error ErrorReleaseManagerServiceAddressMismatch(address expected, address actual);
+    error ErrorReleaseRegistryNoServiceRegistrationExpected();
+    error ErrorReleaseRegistryServiceRegistrationDisallowed(StateId currentStateId);
+    error ErrorReleaseRegistryServiceDomainMismatch(ObjectType expectedDomain, ObjectType actualDomain);
+    error ErrorReleaseRegistryNotService(address notService);
+    error ErrorReleaseRegistryServiceAddressMismatch(address expected, address actual);
 
     // activateNextRelease
-    error ErrorReleaseManagerReleaseActivationDisallowed(VersionPart releaseVersion, StateId currentStateId);
-    error ErrorReleaseManagerReleaseNotCreated(VersionPart releaseVersion);
-    error ErrorReleaseManagerReleaseRegistrationNotFinished(VersionPart releaseVersion, uint awaitingRegistration);
-    error ErrorReleaseManagerReleaseAlreadyActivated(VersionPart releaseVersion);
+    error ErrorReleaseRegistryReleaseActivationDisallowed(VersionPart releaseVersion, StateId currentStateId);
+    error ErrorReleaseRegistryReleaseNotCreated(VersionPart releaseVersion);
+    error ErrorReleaseRegistryReleaseRegistrationNotFinished(VersionPart releaseVersion, uint awaitingRegistration);
+    error ErrorReleaseRegistryReleaseAlreadyActivated(VersionPart releaseVersion);
 
     // disableRelease
-    error ErrorReleaseManagerReleaseNotActivated(VersionPart releaseVersion);
-    error ErrorReleaseManagerReleaseAlreadyDisabled(VersionPart releaseVersion);
+    error ErrorReleaseRegistryReleaseNotActivated(VersionPart releaseVersion);
+    error ErrorReleaseRegistryReleaseAlreadyDisabled(VersionPart releaseVersion);
 
     // _verifyService
-    error ErrorReleaseManagerServiceReleaseAuthorityMismatch(IService service, address serviceAuthority, address releaseAuthority);
-    error ErrorReleaseManagerServiceReleaseVersionMismatch(IService service, VersionPart serviceVersion, VersionPart releaseVersion);
+    error ErrorReleaseRegistryServiceReleaseAuthorityMismatch(IService service, address serviceAuthority, address releaseAuthority);
+    error ErrorReleaseRegistryServiceReleaseVersionMismatch(IService service, VersionPart serviceVersion, VersionPart releaseVersion);
 
     // _verifyServiceInfo
-    error ErrorReleaseManagerServiceInfoAddressInvalid(IService service, address expected);
-    error ErrorReleaseManagerServiceInfoInterceptorInvalid(IService service, bool isInterceptor);
-    error ErrorReleaseManagerServiceInfoTypeInvalid(IService service, ObjectType expected, ObjectType found);
-    error ErrorReleaseManagerServiceInfoOwnerInvalid(IService service, address expected, address found);
-    error ErrorReleaseManagerServiceSelfRegistration(IService service);
-    error ErrorReleaseManagerServiceOwnerRegistered(IService service, address owner);
+    error ErrorReleaseRegistryServiceInfoAddressInvalid(IService service, address expected);
+    error ErrorReleaseRegistryServiceInfoInterceptorInvalid(IService service, bool isInterceptor);
+    error ErrorReleaseRegistryServiceInfoTypeInvalid(IService service, ObjectType expected, ObjectType found);
+    error ErrorReleaseRegistryServiceInfoOwnerInvalid(IService service, address expected, address found);
+    error ErrorReleaseRegistryServiceSelfRegistration(IService service);
+    error ErrorReleaseRegistryServiceOwnerRegistered(IService service, address owner);
 
     Seconds public constant MIN_DISABLE_DELAY = Seconds.wrap(60 * 24 * 365); // 1 year
 
@@ -115,7 +115,7 @@ contract ReleaseManager is
     {
         // TODO move this part to RegistryLinked constructor
         if(!_isRegistry(address(registry))) {
-            revert ErrorReleaseManagerNotRegistry(registry);
+            revert ErrorReleaseRegistryNotRegistry(registry);
         }
 
         setAuthority(registry.getAuthority());
@@ -167,7 +167,7 @@ contract ReleaseManager is
 
         // verify release in state SCHEDULED
         if (!isValidTransition(RELEASE(), _state[version], DEPLOYING())) {
-            revert ErrorReleaseManagerReleasePreparationDisallowed(version, _state[version]);
+            revert ErrorReleaseRegistryReleasePreparationDisallowed(version, _state[version]);
         }
 
         _state[version] = DEPLOYING();
@@ -175,19 +175,19 @@ contract ReleaseManager is
         // verify authorizaion contract release matches with expected version
         VersionPart releaseVersion = serviceAuthorization.getRelease();
         if (releaseVersion != version) {
-            revert ErrorReleaseManagerVersionMismatch(version, releaseVersion);
+            revert ErrorReleaseRegistryVersionMismatch(version, releaseVersion);
         }
 
 
         // sanity check to ensure service domain list is not empty
         uint256 serviceDomainsCount = serviceAuthorization.getServiceDomains().length;
         if (serviceDomainsCount == 0) {
-            revert ErrorReleaseManagerNoDomains(version);
+            revert ErrorReleaseRegistryNoDomains(version);
         }
 
         // verify prepareNextRelease is only called once per release
         if(_servicesToRegister > 0) {
-            revert ErrorReleaseManagerReleaseAlreadyPrepared(version, _state[version]);
+            revert ErrorReleaseRegistryReleaseAlreadyPrepared(version, _state[version]);
         }
 
         _servicesToRegister = serviceDomainsCount;
@@ -208,14 +208,14 @@ contract ReleaseManager is
         // verify release in state DEPLOYING
         if (!isValidTransition(RELEASE(), state, DEPLOYING())) {
             // TOOD name must represent failed state transition
-            revert ErrorReleaseManagerServiceRegistrationDisallowed(state);
+            revert ErrorReleaseRegistryServiceRegistrationDisallowed(state);
         }
 
         _state[releaseVersion] = DEPLOYING();
 
         // not all services are registered
         if (_servicesToRegister == _registeredServices) {
-            revert ErrorReleaseManagerNoServiceRegistrationExpected();
+            revert ErrorReleaseRegistryNoServiceRegistrationExpected();
         }
 
         // service can work with release manager
@@ -228,7 +228,7 @@ contract ReleaseManager is
         // service domain matches defined in release config
         ObjectType expectedDomain = _serviceAuthorization[releaseVersion].getServiceDomain(_registeredServices);
         if (serviceDomain != expectedDomain) {
-            revert ErrorReleaseManagerServiceDomainMismatch(expectedDomain, serviceDomain);
+            revert ErrorReleaseRegistryServiceDomainMismatch(expectedDomain, serviceDomain);
         }
 
         // register service with registry
@@ -260,18 +260,18 @@ contract ReleaseManager is
 
         // verify release in state DEPLOYING
         if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
+            revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
         }
 
         // release fully deployed
         if(_registeredServices < _servicesToRegister) {
-            revert ErrorReleaseManagerReleaseRegistrationNotFinished(version, _servicesToRegister - _registeredServices);
+            revert ErrorReleaseRegistryReleaseRegistrationNotFinished(version, _servicesToRegister - _registeredServices);
         }
 
         // release exists, registry service MUST exist
         address service = _registry.getServiceAddress(REGISTRY(), version);
         if(service == address(0)) {
-            revert ErrorReleaseManagerReleaseNotCreated(version);
+            revert ErrorReleaseRegistryReleaseNotCreated(version);
         }
 
         _latest = version;
@@ -293,7 +293,7 @@ contract ReleaseManager is
 
         // verify release in state ACTIVE
         if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
+            revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
         }
 
         // TODO come up with a substitute
@@ -316,7 +316,7 @@ contract ReleaseManager is
 
         // verify release in state PAUSED
         if (!isValidTransition(RELEASE(), state, newState)) {
-            revert ErrorReleaseManagerReleaseActivationDisallowed(version, state);
+            revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
         }
 
         // TODO come up with a substitute
@@ -401,7 +401,7 @@ contract ReleaseManager is
         )
     {
         if(!service.supportsInterface(type(IService).interfaceId)) {
-            revert ErrorReleaseManagerNotService(address(service));
+            revert ErrorReleaseRegistryNotService(address(service));
         }
 
         address owner = msg.sender;
@@ -417,14 +417,14 @@ contract ReleaseManager is
 
         // IMPORTANT: can not guarantee service access is actually controlled by authority
         if(serviceAuthority != expectedAuthority) {
-            revert ErrorReleaseManagerServiceReleaseAuthorityMismatch(
+            revert ErrorReleaseRegistryServiceReleaseAuthorityMismatch(
                 service,
                 serviceAuthority,
                 expectedAuthority);
         }
 
         if(serviceVersion != releaseVersion) {
-            revert ErrorReleaseManagerServiceReleaseVersionMismatch(
+            revert ErrorReleaseRegistryServiceReleaseVersionMismatch(
                 service,
                 serviceVersion,
                 releaseVersion);            
@@ -441,29 +441,29 @@ contract ReleaseManager is
         view
     {
         if(info.objectAddress != address(service)) {
-            revert ErrorReleaseManagerServiceInfoAddressInvalid(service, address(service));
+            revert ErrorReleaseRegistryServiceInfoAddressInvalid(service, address(service));
         }
 
         if(info.isInterceptor != false) { // service is never interceptor
-            revert ErrorReleaseManagerServiceInfoInterceptorInvalid(service, info.isInterceptor);
+            revert ErrorReleaseRegistryServiceInfoInterceptorInvalid(service, info.isInterceptor);
         }
 
         if(info.objectType != SERVICE()) {
-            revert ErrorReleaseManagerServiceInfoTypeInvalid(service, SERVICE(), info.objectType);
+            revert ErrorReleaseRegistryServiceInfoTypeInvalid(service, SERVICE(), info.objectType);
         }
 
         address owner = info.initialOwner;
 
         if(owner != expectedOwner) { // registerable owner protection
-            revert ErrorReleaseManagerServiceInfoOwnerInvalid(service, expectedOwner, owner); 
+            revert ErrorReleaseRegistryServiceInfoOwnerInvalid(service, expectedOwner, owner); 
         }
 
         if(owner == address(service)) {
-            revert ErrorReleaseManagerServiceSelfRegistration(service);
+            revert ErrorReleaseRegistryServiceSelfRegistration(service);
         }
         
         if(_registry.isRegistered(owner)) { 
-            revert ErrorReleaseManagerServiceOwnerRegistered(service, owner);
+            revert ErrorReleaseRegistryServiceOwnerRegistered(service, owner);
         }
     }
 

package/contracts/registry/TokenRegistry.sol

@@ -12,7 +12,7 @@ import {IRegisterable} from "../shared/IRegisterable.sol";
 
 import {IRegistry} from "./IRegistry.sol";
 import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
-import {ReleaseManager} from "./ReleaseManager.sol";
+import {ReleaseRegistry} from "./ReleaseRegistry.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
 
 
@@ -49,7 +49,7 @@ contract TokenRegistry is
     TokenInfo [] internal _token;
 
     IRegistry internal _registry;
-    ReleaseManager internal _releaseManager;
+    ReleaseRegistry internal _releaseRegistry;
     IERC20Metadata internal _dipToken;
 
     /// @dev enforces msg.sender is owner of nft (or initial owner of nft ownable)

package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol}

@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 import {LibNftIdSet} from "../type/NftIdSet.sol";
 import {NftId} from "../type/NftId.sol";
 
-contract NftIdSetManager {
+contract NftIdSet {
 
     error ErrorNftIdSetManagerNotOwner(address owner, address sender);
     error ErrorNftIdSetManagerOwnerAlreadySet(address owner);

package/contracts/staking/IStaking.sol

@@ -5,7 +5,6 @@ import {Amount} from "../type/Amount.sol";
 import {IComponent} from "../shared/IComponent.sol";
 import {IVersionable} from "../shared/IVersionable.sol";
 import {NftId} from "../type/NftId.sol";
-import {NftIdSetManager} from "../shared/NftIdSetManager.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {StakingReader} from "./StakingReader.sol";

package/contracts/staking/IStakingService.sol

@@ -44,6 +44,13 @@ interface IStakingService is IService
     error ErrorStakingServiceDipBalanceInsufficient(NftId targetNftId, uint256 amount, uint256 balance);
     error ErrorStakingServiceDipAllowanceInsufficient(NftId targetNftId, address tokenHandler, uint256 amount, uint256 allowance);
 
+    /// @dev Set the protocol reward rate stake locking period to the specified duration.
+    /// Permissioned: only staking owner
+    // TODO implement
+    // function setProtocolRewardRate(UFixed rewardRate) external;
+    // function setProtocolLockingPeriod(Seconds lockingPeriod) external;
+    // TODO also make sure that protocol rewards can be refilled and withdrawn
+
     /// @dev creates/registers an on-chain instance staking target.
     /// function granted to instance service
     function createInstanceTarget(
@@ -53,11 +60,11 @@ interface IStakingService is IService
     ) external;
 
     /// @dev Set the instance stake locking period to the specified duration.
-    /// permissioned: only the owner of the specified target may set the locking period
+    /// Permissioned: Only owner of the specified target.
     function setInstanceLockingPeriod(NftId instanceNftId, Seconds lockingPeriod) external;
 
-    /// @dev Set the instance reward rate to the specified value
-    /// permissioned: only the owner of the specified target may set the locking period
+    /// @dev Set the instance reward rate to the specified value.
+    /// Permissioned: Only owner of the specified target.
     function setInstanceRewardRate(NftId instanceNftId, UFixed rewardRate) external;
 
     /// @dev (Re)fills the staking reward reserves for the specified target using the dips provided by the reward provider.
@@ -68,8 +75,8 @@ interface IStakingService is IService
     /// unpermissioned: anybody may fill up staking reward reserves
     function refillRewardReservesBySender(NftId targetNftId, Amount dipAmount) external returns (Amount newBalance);
 
-    /// @dev defunds the staking reward reserves for the specified target
-    /// permissioned: only the target owner may call this function
+    /// @dev Defunds the staking reward reserves for the specified target
+    /// Permissioned: only the target owner may call this function
     function withdrawInstanceRewardReserves(NftId instanceNftId, Amount dipAmount) external returns (Amount newBalance);
 
     /// @dev create a new stake with amount DIP to the specified target

package/contracts/staking/Staking.sol

@@ -9,9 +9,7 @@ import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IStaking} from "./IStaking.sol";
 import {IVersionable} from "../shared/IVersionable.sol";
 import {Key32} from "../type/Key32.sol";
-import {LibNftIdSet} from "../type/NftIdSet.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
-import {NftIdSetManager} from "../shared/NftIdSetManager.sol";
 import {ObjectType, INSTANCE, PROTOCOL, STAKE, STAKING, TARGET} from "../type/ObjectType.sol";
 import {Seconds, SecondsLib} from "../type/Seconds.sol";
 import {StakeManagerLib} from "./StakeManagerLib.sol";
@@ -54,7 +52,7 @@ contract Staking is
 
 
     modifier onlyTarget(NftId targetNftId) {
-        if (!_getStakingStorage()._store.getTargetManager().exists(targetNftId)) {
+        if (!_getStakingStorage()._store.getTargetNftIdSet().exists(targetNftId)) {
             revert ErrorStakingNotTarget(targetNftId);
         }
         _;

package/contracts/staking/StakingManager.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.20;
 
 import {IVersionable} from "../shared/IVersionable.sol";
 import {ProxyManager} from "../shared/ProxyManager.sol";
-import {ReleaseManager} from "../registry/ReleaseManager.sol";
 import {Staking} from "./Staking.sol";
 import {StakingReader} from "./StakingReader.sol";
 import {StakingStore} from "./StakingStore.sol";

package/contracts/staking/StakingReader.sol

@@ -11,7 +11,6 @@ import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
 import {IStaking} from "../staking/IStaking.sol";
 import {IVersionable} from "../shared/IVersionable.sol";
 import {NftId} from "../type/NftId.sol";
-import {NftIdSetManager} from "../shared/NftIdSetManager.sol";
 import {ObjectType, STAKE, TARGET} from "../type/ObjectType.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {StakingStore} from "./StakingStore.sol";
@@ -60,32 +59,32 @@ contract StakingReader is
 
 
     function isTarget(NftId targetNftId) external view returns (bool) {
-        return _store.getTargetManager().exists(targetNftId);
+        return _store.getTargetNftIdSet().exists(targetNftId);
     }
 
 
     function targets() external view returns (uint256) {
-        return _store.getTargetManager().nftIds();
+        return _store.getTargetNftIdSet().nftIds();
     }
 
 
     function getTargetNftId(uint256 idx) external view returns (NftId) {
-        return _store.getTargetManager().getNftId(idx);
+        return _store.getTargetNftIdSet().getNftId(idx);
     }
 
 
     function isActive(NftId targetNftId) external view returns (bool) {
-        return _store.getTargetManager().isActive(targetNftId);
+        return _store.getTargetNftIdSet().isActive(targetNftId);
     }
 
 
     function activeTargets() external view returns (uint256) {
-        return _store.getTargetManager().activeNftIds();
+        return _store.getTargetNftIdSet().activeNftIds();
     }
 
 
     function getActiveTargetNftId(uint256 idx) external view returns (NftId) {
-        return _store.getTargetManager().getActiveNftId(idx);
+        return _store.getTargetNftIdSet().getActiveNftId(idx);
     }