@etherisc/gif-next 0.0.2-fca9315-260 → 0.0.2-fd4931b-974

package/contracts/registry/RegistryAccessManager.sol

@@ -1,103 +1,87 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.20;
 
-import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
+import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
+import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
+import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
-import {RoleId, RoleIdLib,
-        GIF_MANAGER_ROLE,
-        GIF_ADMIN_ROLE,
-        RELEASE_MANAGER_ROLE} from "../types/RoleId.sol";
+import {RoleId, RoleIdLib, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE} from "../type/RoleId.sol";
+
+import {AccessManagerUpgradeableInitializeable} from "../shared/AccessManagerUpgradeableInitializeable.sol";
 
 import {TokenRegistry} from "./TokenRegistry.sol";
 import {ReleaseManager} from "./ReleaseManager.sol";
 
 /*
-    4 types of roles:
-    1) RELEASE_MANAGER_ROLE
-        - has only ReleaseManager as member
-        - responsible for setting and granting of REGISTRAR roles
-    1) REGISTRAR roles
-        - set and granted by RELEASE_MANAGER_ROLE
-        - each has 1 unique member (regular service ver.X) (subject to change)
-        - each set to 1 target (registry service ver.X) and 1 selector (function of registry service ver.X) (subject to change)
-    2) GIF_MANAGER_ROLE
+    1) GIF_MANAGER_ROLE
         - can have arbitrary number of members
         - responsible for services registrations
         - responsible for token registration and activation
-    3) GIF_ADMIN_ROLE
+
+    2) GIF_ADMIN_ROLE
         - admin of GIF_MANAGER_ROLE
         - MUST have 1 member at any time
         - granted/revoked ONLY in transferAdminRole() -> consider lock out situations!!!
         - responsible for creation and activation of releases
-
 */
 
-contract RegistryAccessManager is AccessManaged
+contract RegistryAccessManager is AccessManaged, Initializable
 {
-    error NotInitialized();
-    error AlreadyInitialized();
+    error ErrorRegistryAccessManagerReleaseManagerAuthorityMismatch();
+    error ErrorRegistryAccessManagerTokenRegistryZero();
 
     uint64 public constant UNIQUE_ROLE_ID_MIN = 1000000;
     
-    AccessManager private immutable _accessManager;
     address private _releaseManager;
     address private _tokenRegistry;
 
     uint64 private _idNext; // role id
-    bool private _isInitialized;
-
-    modifier onlyOnce() {
-        if(_isInitialized) {
-            revert AlreadyInitialized();
-        } 
-        _;
-        _isInitialized = true;
-    }
 
-    modifier onlyInitialized() {
-        if(!_isInitialized) {
-            revert NotInitialized();
-        }
-        _;
-    }
 
-    constructor(address manager)
+    // IMPORTNAT: this.authority() must be valid before initialize() function....
+    // -> have constructor and initializer function
+    constructor()
         AccessManaged(msg.sender)
     {
-        _accessManager = new AccessManager(address(this));
-        setAuthority(address(_accessManager));
-
-        _idNext = UNIQUE_ROLE_ID_MIN;
-
-        _configureAdminRoleInitial();
-
-        address admin = msg.sender;
-        _grantRole(GIF_ADMIN_ROLE(), admin, 0);
-        _grantRole(GIF_MANAGER_ROLE(), manager, 0);
+        AccessManagerUpgradeableInitializeable accessManager = new AccessManagerUpgradeableInitializeable();
+        accessManager.initialize(address(this));
+        setAuthority(address(accessManager));
     }
 
-    function initialize(address releaseManager, address tokenRegistry)
-        external 
-        restricted // GIF_ADMIN_ROLE
-        onlyOnce
+    function initialize(
+        address admin, 
+        address manager, 
+        address releaseManager, 
+        address tokenRegistry
+    )
+        external
+        initializer
     {
-        require(
-            ReleaseManager(releaseManager).authority() == address(_accessManager),
-            "RegistryAccessManager: release manager authority is invalid");
-        require(tokenRegistry > address(0), "RegistryAccessManager: token registry is 0");
-        //require(tokenRegistry.authority() == address(_accessManager));
+        // validate input
+        if(IAccessManaged(releaseManager).authority() != authority()) {
+            revert ErrorRegistryAccessManagerReleaseManagerAuthorityMismatch();
+        }
+
+        if(tokenRegistry == address(0)) {
+            revert ErrorRegistryAccessManagerTokenRegistryZero();
+        }
 
         _releaseManager = releaseManager;
         _tokenRegistry = tokenRegistry;
+        _idNext = UNIQUE_ROLE_ID_MIN;
+
+        _setAdminRole();
+        _setManagerRole();
 
-        _configureAdminRole();
-        _configureManagerRole();
-        _configureReleaseManagerRole();
+        _grantRole(GIF_ADMIN_ROLE(), admin, 0);
+        _grantRole(GIF_MANAGER_ROLE(), manager, 0);
 
-        _grantRole(RELEASE_MANAGER_ROLE(), releaseManager, 0);
+        // set admin
+        _setRoleAdmin(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE());
     }
 
+
     // set unique role for target, role forever have 1 member and never revoked
     function setAndGrantUniqueRole(
         address account, 
@@ -106,24 +90,26 @@ contract RegistryAccessManager is AccessManaged
     )
         external
         restricted // RELEASE_MANAGER_ROLE
-        onlyInitialized
         returns(RoleId)
     {
-        // TODO questionable check...
-        // target is not part of `runtime`
-        //if(
-        //    target == address(this) ||
-        //    target == address(_accessManager) || 
-        //    target == _releaseManager || 
-        //    target == _tokenRegistry)
-        //{ return TargetInvalid(); }
-
+        // TODO define and add checks
         RoleId roleId = _getNextRoleId();
 
         _setTargetFunctionRole(target, selector, roleId);
         _grantRole(roleId, account, 0);
     }
 
+    function setTargetFunctionRole(
+        address target, 
+        bytes4[] memory selector,
+        RoleId roleId
+    )
+        external
+        restricted // RELEASE_MANAGER_ROLE
+    {
+        _setTargetFunctionRole(target, selector, roleId);
+    }
+
     /*function transferAdmin(address to)
         external
         restricted // only with GIF_ADMIN_ROLE or nft owner
@@ -134,80 +120,45 @@ contract RegistryAccessManager is AccessManaged
 
     //--- view functions ----------------------------------------------------//
 
-    function getAccessManager()
-        external
-        view
-        returns (AccessManager)
-    {
-        return _accessManager;
-    }
-
     //--- private functions -------------------------------------------------//
 
-    function _configureAdminRoleInitial() private
+    function _setAdminRole() private
     {
-        bytes4[] memory functionSelector = new bytes4[](1);
-
-        functionSelector[0] = RegistryAccessManager.initialize.selector;
-        _setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
-    }
-
-    function _configureAdminRole() private
-    {
-        bytes4[] memory functionSelector = new bytes4[](1);
-
-        // for RegistryServiceProxyManager
-        // TODO upgrading with releaseManager.upgrade()->proxy.upgrade()???
-        //functionSelector[0] = RegistryServiceManager.upgrade.selector;
-        //_setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
-
-        // for TokenRegistry
-
         // for ReleaseManager
-        functionSelector[0] = ReleaseManager.createNextRelease.selector;
-        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
+        bytes4[] memory functionSelector = new bytes4[](3);
+        functionSelector[0] = ReleaseManager.registerStaking.selector;
+        functionSelector[1] = ReleaseManager.createNextRelease.selector;
+        functionSelector[2] = ReleaseManager.activateNextRelease.selector;
 
-        functionSelector[0] = ReleaseManager.activateNextRelease.selector;
         _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
     }
     
-    function _configureManagerRole() private 
+    function _setManagerRole() private 
     {
-        bytes4[] memory functionSelector = new bytes4[](1);
-
-        // for TokenRegistry
-        functionSelector[0] = TokenRegistry.setActive.selector;
-        _setTargetFunctionRole(address(_tokenRegistry), functionSelector, GIF_MANAGER_ROLE());
-
-        // for ReleaseManager
-        functionSelector[0] = ReleaseManager.registerService.selector;
-        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
+        bytes4[] memory functionSelector = new bytes4[](2);
 
-        functionSelector[0] = ReleaseManager.registerRegistryService.selector;
+        functionSelector[0] = ReleaseManager.registerService.selector; // for ReleaseManager
+        functionSelector[1] = ReleaseManager.prepareNextRelease.selector;
         _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
 
-        // set admin
-        _setRoleAdmin(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE());
+        // for TokenRegistry
+        bytes4[] memory functionSelector2 = new bytes4[](2);
+        functionSelector2[0] = TokenRegistry.setActive.selector;
+        functionSelector2[1] = TokenRegistry.setActiveForVersion.selector;
+        _setTargetFunctionRole(address(_tokenRegistry), functionSelector2, GIF_MANAGER_ROLE());
     }
 
-    function _configureReleaseManagerRole() private
-    {
-        bytes4[] memory functionSelector = new bytes4[](1);
-
-        functionSelector[0] = RegistryAccessManager.setAndGrantUniqueRole.selector;
-        _setTargetFunctionRole(address(this), functionSelector, RELEASE_MANAGER_ROLE());
-    }
 
     function _setTargetFunctionRole(address target, bytes4[] memory selectors, RoleId roleId) private {
-        _accessManager.setTargetFunctionRole(target, selectors, roleId.toInt());        
+        AccessManager(authority()).setTargetFunctionRole(target, selectors, roleId.toInt());        
     }
 
     function _setRoleAdmin(RoleId roleId, RoleId adminRoleId) private {
-        _accessManager.setRoleAdmin(roleId.toInt(), adminRoleId.toInt());
+        AccessManager(authority()).setRoleAdmin(roleId.toInt(), adminRoleId.toInt());
     }
 
     function _grantRole(RoleId roleId, address account, uint32 executionDelay) private {
-            _accessManager.grantRole(roleId.toInt(), account, executionDelay);
+        AccessManager(authority()).grantRole(roleId.toInt(), account, executionDelay);
     }
 
     function _getNextRoleId() private returns(RoleId roleId) {

package/contracts/registry/RegistryService.sol

@@ -2,28 +2,27 @@
 pragma solidity ^0.8.20;
 
 import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
-import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
+// import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
 
 import {IRegistry} from "./IRegistry.sol";
 import {IInstance} from "../instance/IInstance.sol";
 
-import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
-import {IComponent} from "../../contracts/components/IComponent.sol";
-import {IPoolComponent} from "../../contracts/components/IPoolComponent.sol";
-import {IProductComponent} from "../../contracts/components/IProductComponent.sol";
-import {IDistributionComponent} from "../../contracts/components/IDistributionComponent.sol";
+import {IComponent} from "../../contracts/shared/IComponent.sol";
+import {IPoolComponent} from "../../contracts/pool/IPoolComponent.sol";
+import {IProductComponent} from "../../contracts/product/IProductComponent.sol";
+import {IDistributionComponent} from "../../contracts/distribution/IDistributionComponent.sol";
 
 import {IVersionable} from "../../contracts/shared/IVersionable.sol";
 import {Versionable} from "../../contracts/shared/Versionable.sol";
 import {IRegisterable} from "../../contracts/shared/IRegisterable.sol";
 import {Registerable} from "../../contracts/shared/Registerable.sol";
 
-import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../contracts/types/RoleId.sol";
-import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, DISTRIBUTION, POLICY, BUNDLE, STAKE} from "../../contracts/types/ObjectType.sol";
-import {StateId, ACTIVE, PAUSED} from "../../contracts/types/StateId.sol";
-import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
-import {Fee, FeeLib} from "../../contracts/types/Fee.sol";
-import {Version, VersionPart, VersionLib} from "../../contracts/types/Version.sol";
+import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../contracts/type/RoleId.sol";
+import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, APPLICATION, POLICY, CLAIM, BUNDLE, STAKE, STAKING, PRICE} from "../../contracts/type/ObjectType.sol";
+import {StateId, ACTIVE, PAUSED} from "../../contracts/type/StateId.sol";
+import {NftId, NftIdLib} from "../../contracts/type/NftId.sol";
+import {Fee, FeeLib} from "../../contracts/type/Fee.sol";
+import {Version, VersionPart, VersionLib} from "../../contracts/type/Version.sol";
 
 import {Service} from "../shared/Service.sol";
 import {IService} from "../shared/IService.sol";
@@ -31,7 +30,6 @@ import {IRegistryService} from "./IRegistryService.sol";
 import {Registry} from "./Registry.sol";
 
 contract RegistryService is
-    AccessManagedUpgradeable,
     Service,
     IRegistryService
 {
@@ -40,19 +38,59 @@ contract RegistryService is
     // TODO update to real hash when registry is stable
     bytes32 public constant REGISTRY_CREATION_CODE_HASH = bytes32(0);
 
+    // From IService
+    function getDomain() public pure override returns(ObjectType serviceDomain) {
+        return REGISTRY(); 
+    }
+
+    // from Versionable
+
+    /// @dev top level initializer
+    function _initialize(
+        address owner, 
+        bytes memory data
+    )
+        internal
+        virtual override
+        initializer()
+    {
+        (
+            address registryAddress,
+            address initialAuthority
+        ) = abi.decode(data, (address, address));
+
+        initializeService(registryAddress, initialAuthority, owner);
+        registerInterface(type(IRegistryService).interfaceId);
+    }
+
+
+    function registerStaking(IRegisterable staking, address owner)
+        external
+        virtual
+        restricted()
+        returns(
+            IRegistry.ObjectInfo memory info
+        )
+    {
+        info = _getAndVerifyContractInfo(staking, STAKING(), owner);
+        info.nftId = getRegistry().register(info);
+    }
+
+
     function registerInstance(IRegisterable instance, address owner)
         external
+        virtual
         restricted
         returns(
             IRegistry.ObjectInfo memory info
         ) 
     {
         if(!instance.supportsInterface(type(IInstance).interfaceId)) {
-            revert NotInstance();
+            revert ErrorRegistryServiceNotInstance(address(instance));
         }
 
         info = _getAndVerifyContractInfo(instance, INSTANCE(), owner);
-        info.nftId = _registry.register(info);
+        info.nftId = getRegistry().register(info);
 
         instance.linkToRegisteredNftId(); // asume safe
     }
@@ -66,11 +104,31 @@ contract RegistryService is
     {
         // CAN revert if no ERC165 support -> will revert with empty message 
         if(!product.supportsInterface(type(IProductComponent).interfaceId)) {
-            revert NotProduct();
+            revert ErrorRegistryServiceNotProduct(address(product));
         }
 
         info = _getAndVerifyContractInfo(product, PRODUCT(), owner);
-        info.nftId = _registry.register(info);
+        info.nftId = getRegistry().register(info);
+    }
+
+    function registerComponent(
+        IComponent component, 
+        ObjectType objectType,
+        address initialOwner
+    )
+        external
+        restricted
+        returns(
+            IRegistry.ObjectInfo memory info
+        ) 
+    {
+        // CAN revert if no ERC165 support -> will revert with empty message 
+        if(!component.supportsInterface(type(IComponent).interfaceId)) {
+            revert ErrorRegistryServiceNotComponent(address(component));
+        }
+
+        info = _getAndVerifyContractInfo(component, objectType, initialOwner);
+        info.nftId = getRegistry().register(info);
     }
 
     function registerPool(IComponent pool, address owner)
@@ -81,11 +139,11 @@ contract RegistryService is
         ) 
     {
         if(!pool.supportsInterface(type(IPoolComponent).interfaceId)) {
-            revert NotPool();
+            revert ErrorRegistryServiceNotPool(address(pool));
         }
 
         info = _getAndVerifyContractInfo(pool, POOL(), owner);
-        info.nftId = _registry.register(info);
+        info.nftId = getRegistry().register(info);
     }
 
     function registerDistribution(IComponent distribution, address owner)
@@ -96,11 +154,20 @@ contract RegistryService is
         ) 
     {
         if(!distribution.supportsInterface(type(IDistributionComponent).interfaceId)) {
-            revert NotDistribution();
+            revert ErrorRegistryServiceNotDistribution(address(distribution));
         }
 
         info = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
-        info.nftId = _registry.register(info);
+        info.nftId = getRegistry().register(info);
+    }
+
+    function registerDistributor(IRegistry.ObjectInfo memory info)
+        external
+        restricted 
+        returns(NftId nftId) 
+    {
+        _verifyObjectInfo(info, DISTRIBUTOR());
+        nftId = getRegistry().register(info);
     }
 
     function registerPolicy(IRegistry.ObjectInfo memory info)
@@ -109,8 +176,7 @@ contract RegistryService is
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, POLICY());
-
-        nftId = _registry.register(info);
+        nftId = getRegistry().register(info);
     }
 
     function registerBundle(IRegistry.ObjectInfo memory info)
@@ -119,8 +185,7 @@ contract RegistryService is
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, BUNDLE());
-
-        nftId = _registry.register(info);
+        nftId = getRegistry().register(info);
     }
 
     function registerStake(IRegistry.ObjectInfo memory info)
@@ -129,72 +194,70 @@ contract RegistryService is
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, STAKE());
-
-        nftId = _registry.register(info);
-    }
-
-    // From IService
-    function getDomain() public pure override(IService, Service) returns(ObjectType serviceDomain) {
-        return REGISTRY(); 
-    }
-
-    // from Versionable
-
-    /// @dev top level initializer
-    function _initialize(
-        address owner, 
-        bytes memory data
-    )
-        internal
-        initializer
-        virtual override
-    {
-        (
-            address initialAuthority,
-            address registry
-        ) = abi.decode(data, (address, address));
-
-        __AccessManaged_init(initialAuthority);
-
-        _initializeService(address(registry), owner);
-
-        _registerInterface(type(IRegistryService).interfaceId);
+        nftId = getRegistry().register(info);
     }
 
     // from IRegisterable
 
-    function getFunctionConfigs()
-        external
-        pure
-        returns(
-            FunctionConfig[] memory config
-        )
-    {
-        config = new FunctionConfig[](6);
-
-        // order of service registrations MUST be reverse to this array 
-        /*config[-1].serviceDomain = STAKE();
-        config[-1].selector = RegistryService.registerStake.selector;*/
-
-        config[0].serviceDomain = POLICY();
-        config[0].selector = RegistryService.registerPolicy.selector;
-
-        config[1].serviceDomain = BUNDLE();
-        config[1].selector = RegistryService.registerBundle.selector;
-
-        config[2].serviceDomain = PRODUCT();
-        config[2].selector = RegistryService.registerProduct.selector;
-
-        config[3].serviceDomain = POOL();
-        config[3].selector = RegistryService.registerPool.selector;
-
-        config[4].serviceDomain = DISTRIBUTION();
-        config[4].selector = RegistryService.registerDistribution.selector;
-
-        // registerInstance() have no restriction
-        config[5].serviceDomain = INSTANCE();
-        config[5].selector = RegistryService.registerInstance.selector;
-    }
+    // TODO cleanup
+    // function getFunctionConfigs()
+    //     external
+    //     pure
+    //     returns(
+    //         FunctionConfig[] memory config
+    //     )
+    // {
+    //     config = new FunctionConfig[](11);
+
+    //     // order of service registrations MUST be reverse to this array 
+    //     /*config[-1].serviceDomain = STAKE();
+    //     config[-1].selector = RegistryService.registerStake.selector;*/
+
+    //     config[0].serviceDomain = POLICY();
+    //     config[0].authorizedSelectors = new bytes4[](0);
+
+    //     config[1].serviceDomain = APPLICATION();
+    //     config[1].authorizedSelectors = new bytes4[](1);
+    //     config[1].authorizedSelectors[0] = RegistryService.registerPolicy.selector;
+
+    //     config[2].serviceDomain = CLAIM();
+    //     config[2].authorizedSelectors = new bytes4[](0);
+
+    //     config[3].serviceDomain = PRODUCT();
+    //     config[3].authorizedSelectors = new bytes4[](1);
+    //     config[3].authorizedSelectors[0] = RegistryService.registerProduct.selector;
+
+    //     config[4].serviceDomain = POOL();
+    //     config[4].authorizedSelectors = new bytes4[](1);
+    //     config[4].authorizedSelectors[0] = RegistryService.registerPool.selector;
+
+    //     // registration of bundle service must preceed registration of pool service
+    //     config[5].serviceDomain = BUNDLE();
+    //     config[5].authorizedSelectors = new bytes4[](1);
+    //     config[5].authorizedSelectors[0] = RegistryService.registerBundle.selector;
+
+    //     // registration of pricing service must preceed registration of application service
+    //     config[6].serviceDomain = PRICE();
+    //     config[6].authorizedSelectors = new bytes4[](0);
+
+    //     // registration of distribution service must preceed registration of pricing service
+    //     config[7].serviceDomain = DISTRIBUTION();
+    //     config[7].authorizedSelectors = new bytes4[](2);
+    //     config[7].authorizedSelectors[0] = RegistryService.registerDistribution.selector;
+    //     config[7].authorizedSelectors[1] = RegistryService.registerDistributor.selector;
+
+    //     config[8].serviceDomain = COMPONENT();
+    //     config[8].authorizedSelectors = new bytes4[](1);
+    //     config[8].authorizedSelectors[0] = RegistryService.registerComponent.selector;
+
+    //     config[9].serviceDomain = INSTANCE();
+    //     config[9].authorizedSelectors = new bytes4[](1);
+    //     config[9].authorizedSelectors[0] = RegistryService.registerInstance.selector;
+
+    //     config[10].serviceDomain = STAKING();
+    //     config[10].authorizedSelectors = new bytes4[](1);
+    //     config[10].authorizedSelectors[0] = RegistryService.registerStaking.selector;
+    // }
 
     // Internal
 
@@ -204,34 +267,37 @@ contract RegistryService is
         address expectedOwner // assume can be 0 when given by other service
     )
         internal
-        // view
+        view
         returns(
             IRegistry.ObjectInfo memory info 
         )
     {
         info = registerable.getInitialInfo();
-        info.objectAddress = address(registerable);
+
+        if(info.objectAddress != address(registerable)) {
+            revert ErrorRegistryServiceRegisterableAddressInvalid(registerable, info.objectAddress);
+        }
 
         if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
-            revert UnexpectedRegisterableType(expectedType, info.objectType);
+            revert ErrorRegistryServiceRegisterableTypeInvalid(registerable, expectedType, info.objectType);
         }
 
         address owner = info.initialOwner;
 
         if(owner != expectedOwner) { // registerable owner protection
-            revert NotRegisterableOwner(expectedOwner);
+            revert ErrorRegistryServiceRegisterableOwnerInvalid(registerable, expectedOwner, owner);
         }
 
         if(owner == address(registerable)) {
-            revert SelfRegistration();
+            revert ErrorRegistryServiceRegisterableSelfRegistration(registerable);
         }
 
         if(owner == address(0)) {
-            revert RegisterableOwnerIsZero();
+            revert ErrorRegistryServiceRegisterableOwnerZero(registerable);
         }
         
         if(getRegistry().isRegistered(owner)) { 
-            revert RegisterableOwnerIsRegistered();
+            revert ErrorRegistryServiceRegisterableOwnerRegistered(registerable, owner);
         }
     }
 
@@ -246,17 +312,17 @@ contract RegistryService is
         info.objectAddress = address(0);
 
         if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
-            revert UnexpectedRegisterableType(expectedType, info.objectType);
+            revert ErrorRegistryServiceObjectTypeInvalid(expectedType, info.objectType);
         }
 
         address owner = info.initialOwner;
 
         if(owner == address(0)) {
-            revert RegisterableOwnerIsZero();
+            revert ErrorRegistryServiceObjectOwnerZero(info.objectType);
         }
 
         if(getRegistry().isRegistered(owner)) { 
-            revert RegisterableOwnerIsRegistered();
+            revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, owner);
         }
     }
-}
+}