@etherisc/gif-next 0.0.2-9d3eab3-323 → 0.0.2-9dc4419-573

package/contracts/registry/RegistryAccessManager.sol

@@ -4,42 +4,43 @@ pragma solidity ^0.8.20;
 import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
 
-import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
 import {RoleId, RoleIdLib,
-        REGISTRY_SERVICE_MANAGER_ROLE,
-        REGISTRY_SERVICE_ADMIN_ROLE,
+        GIF_MANAGER_ROLE,
+        GIF_ADMIN_ROLE,
         RELEASE_MANAGER_ROLE} from "../types/RoleId.sol";
 
-import {Registry} from "./Registry.sol";
-import {IVersionable} from "../shared/IVersionable.sol";
-import {IRegistryService} from "./IRegistryService.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
 import {ReleaseManager} from "./ReleaseManager.sol";
 
 /*
-    3 types of roles: 
-    1) REGISTRAR roles 
-        - each one is unique
-        - always have 1 member
-        - one role is set for each function of each version of registry service
-    2) REGISTRY_SERVICE_MANAGER_ROLE aka GIF_MANAGER_ROLE
+    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
         - can have arbitrary number of members
         - responsible for services registrations
         - responsible for token registration and activation
-    3) REGISTRY_SERVICE_ADMIN_ROLE aka GIF_ADMIN_ROLE
-        - admin of REGISTRY_SERVICE_MANAGER_ROLE
+    3) 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 release manager initialization
-        - responsible for creation and activation of each release
+        - responsible for creation and activation of releases
 
 */
 
 contract RegistryAccessManager is AccessManaged
 {
-    uint64 public constant CUSTOM_ROLE_ID_MIN = 1000000;
+    error NotInitialized();
+    error AlreadyInitialized();
+
+    uint64 public constant UNIQUE_ROLE_ID_MIN = 1000000;
     
-    AccessManager private _accessManager;
+    AccessManager private immutable _accessManager;
     address private _releaseManager;
     address private _tokenRegistry;
 
@@ -48,15 +49,15 @@ contract RegistryAccessManager is AccessManaged
 
     modifier onlyOnce() {
         if(_isInitialized) {
-            revert();
-        }
+            revert AlreadyInitialized();
+        } 
         _;
         _isInitialized = true;
     }
 
     modifier onlyInitialized() {
         if(!_isInitialized) {
-            revert();
+            revert NotInitialized();
         }
         _;
     }
@@ -67,25 +68,25 @@ contract RegistryAccessManager is AccessManaged
         _accessManager = new AccessManager(address(this));
         setAuthority(address(_accessManager));
 
-        _idNext = CUSTOM_ROLE_ID_MIN;
+        _idNext = UNIQUE_ROLE_ID_MIN;
 
         _configureAdminRoleInitial();
 
         address admin = msg.sender;
-        _grantRole(REGISTRY_SERVICE_ADMIN_ROLE(), admin, 0);
-        _grantRole(REGISTRY_SERVICE_MANAGER_ROLE(), manager, 0);
+        _grantRole(GIF_ADMIN_ROLE(), admin, 0);
+        _grantRole(GIF_MANAGER_ROLE(), manager, 0);
     }
 
-    // TODO need release manager authorization to configure roles for service functions and to grant those roles
     function initialize(address releaseManager, address tokenRegistry)
         external 
         restricted // GIF_ADMIN_ROLE
         onlyOnce
     {
-        if(
-            _releaseManager > address(0) ||
-            _tokenRegistry > address(0))
-        { revert(); }
+        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));
 
         _releaseManager = releaseManager;
         _tokenRegistry = tokenRegistry;
@@ -108,13 +109,14 @@ contract RegistryAccessManager is AccessManaged
         onlyInitialized
         returns(RoleId)
     {
+        // TODO questionable check...
         // target is not part of `runtime`
-        if(
-            target == address(this) ||
-            target == address(_accessManager) || 
-            target == _releaseManager || 
-            target == _tokenRegistry)
-        { revert(); }
+        //if(
+        //    target == address(this) ||
+        //    target == address(_accessManager) || 
+        //    target == _releaseManager || 
+        //    target == _tokenRegistry)
+        //{ return TargetInvalid(); }
 
         RoleId roleId = _getNextRoleId();
 
@@ -124,10 +126,10 @@ contract RegistryAccessManager is AccessManaged
 
     /*function transferAdmin(address to)
         external
-        restricted // only with REGISTRY_SERVICE_ADMIN_ROLE or nft owner
+        restricted // only with GIF_ADMIN_ROLE or nft owner
     {
-        _accessManager.revoke(REGISTRY_SERVICE_ADMIN_ROLE, );
-        _accesssManager.grant(REGISTRY_SERVICE_ADMIN_ROLE, to, 0);
+        _accessManager.revoke(GIF_ADMIN_ROLE, );
+        _accesssManager.grant(GIF_ADMIN_ROLE, to, 0);
     }*/
 
     //--- view functions ----------------------------------------------------//
@@ -147,41 +149,45 @@ contract RegistryAccessManager is AccessManaged
         bytes4[] memory functionSelector = new bytes4[](1);
 
         functionSelector[0] = RegistryAccessManager.initialize.selector;
-        _setTargetFunctionRole(address(this), functionSelector, REGISTRY_SERVICE_ADMIN_ROLE());
+        _setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
     }
 
     function _configureAdminRole() private
     {
         bytes4[] memory functionSelector = new bytes4[](1);
 
-        // REGISTRY_SERVICE_ADMIN_ROLE for RegistryServiceProxyManager
+        // for RegistryServiceProxyManager
         // TODO upgrading with releaseManager.upgrade()->proxy.upgrade()???
         //functionSelector[0] = RegistryServiceManager.upgrade.selector;
-        //_setTargetFunctionRole(address(this), functionSelector, REGISTRY_SERVICE_ADMIN_ROLE());
+        //_setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
 
-        // REGISTRY_SERVICE_ADMIN_ROLE for TokenRegistry
+        // for TokenRegistry
 
-        // REGISTRY_SERVICE_ADMIN_ROLE for ReleaseManager
+        // for ReleaseManager
         functionSelector[0] = ReleaseManager.createNextRelease.selector;
-        _setTargetFunctionRole(_releaseManager, functionSelector, REGISTRY_SERVICE_ADMIN_ROLE());
-        //functionSelector[0] = ReleaseManager.activateNextRelease.selector;
-        //_setTargetFunctionRole(_releaseManager, functionSelector, REGISTRY_SERVICE_ADMIN_ROLE());
+        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
+
+        functionSelector[0] = ReleaseManager.activateNextRelease.selector;
+        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
     }
     
     function _configureManagerRole() private 
     {
         bytes4[] memory functionSelector = new bytes4[](1);
 
-        // REGISTRY_SERVICE_MANAGER_ROLE for TokenRegistry
+        // for TokenRegistry
         functionSelector[0] = TokenRegistry.setActive.selector;
-        _setTargetFunctionRole(address(_tokenRegistry), functionSelector, REGISTRY_SERVICE_MANAGER_ROLE());
+        _setTargetFunctionRole(address(_tokenRegistry), functionSelector, GIF_MANAGER_ROLE());
 
-        // REGISTRY_SERVICE_MANAGER_ROLE for ReleaseManager
+        // for ReleaseManager
         functionSelector[0] = ReleaseManager.registerService.selector;
-        _setTargetFunctionRole(_releaseManager, functionSelector, REGISTRY_SERVICE_MANAGER_ROLE());
+        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
+
+        functionSelector[0] = ReleaseManager.registerRegistryService.selector;
+        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
 
-        // set REGISTRY_SERVICE_ADMIN_ROLE as admin for REGISTRY_SERVICE_MANAGER_ROLE
-        _setRoleAdmin(REGISTRY_SERVICE_MANAGER_ROLE(), REGISTRY_SERVICE_ADMIN_ROLE());
+        // set admin
+        _setRoleAdmin(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE());
     }
 
     function _configureReleaseManagerRole() private

package/contracts/registry/RegistryService.sol

@@ -2,13 +2,13 @@
 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 {IBaseComponent} from "../../contracts/components/IBaseComponent.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";
@@ -19,7 +19,7 @@ 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 {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, DISTRIBUTION, DISTRIBUTOR, APPLICATION, POLICY, CLAIM, 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";
@@ -31,7 +31,6 @@ import {IRegistryService} from "./IRegistryService.sol";
 import {Registry} from "./Registry.sol";
 
 contract RegistryService is
-    AccessManagedUpgradeable,
     Service,
     IRegistryService
 {
@@ -40,34 +39,54 @@ contract RegistryService is
     // TODO update to real hash when registry is stable
     bytes32 public constant REGISTRY_CREATION_CODE_HASH = bytes32(0);
 
-    address public constant NFT_LOCK_ADDRESS = address(0x1);
+    // 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 registerInstance(IRegisterable instance)
+    function registerInstance(IRegisterable instance, address owner)
         external
+        restricted
         returns(
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
+            IRegistry.ObjectInfo memory info
         ) 
     {
         if(!instance.supportsInterface(type(IInstance).interfaceId)) {
             revert NotInstance();
         }
 
-        (info, data) = _getAndVerifyContractInfo(instance, INSTANCE(), msg.sender);
+        info = _getAndVerifyContractInfo(instance, INSTANCE(), owner);
+        info.nftId = getRegistry().register(info);
 
-        info.nftId = _registry.register(info);
         instance.linkToRegisteredNftId(); // asume safe
-        
-        return (info, data);
     }
 
-    function registerProduct(IBaseComponent product, address owner)
+    function registerProduct(IComponent product, address owner)
         external
         restricted
         returns(
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
+            IRegistry.ObjectInfo memory info
         ) 
     {
         // CAN revert if no ERC165 support -> will revert with empty message 
@@ -75,53 +94,47 @@ contract RegistryService is
             revert NotProduct();
         }
 
-        (info, data) = _getAndVerifyContractInfo(product, PRODUCT(), owner);
-
-        info.nftId = _registry.register(info);
-        // TODO unsafe, let component or its owner derive nftId latter, when state assumptions and modifications of GIF contracts are finished  
-        product.linkToRegisteredNftId();
-
-        return (info, data);  
+        info = _getAndVerifyContractInfo(product, PRODUCT(), owner);
+        info.nftId = getRegistry().register(info);
     }
 
-    function registerPool(IBaseComponent pool, address owner)
+    function registerPool(IComponent pool, address owner)
         external
         restricted
         returns(
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
+            IRegistry.ObjectInfo memory info
         ) 
     {
         if(!pool.supportsInterface(type(IPoolComponent).interfaceId)) {
             revert NotPool();
         }
 
-        (info, data) = _getAndVerifyContractInfo(pool, POOL(), owner);
-
-        info.nftId = _registry.register(info);
-        pool.linkToRegisteredNftId();
-
-        return (info, data);  
+        info = _getAndVerifyContractInfo(pool, POOL(), owner);
+        info.nftId = getRegistry().register(info);
     }
 
-    function registerDistribution(IBaseComponent distribution, address owner)
+    function registerDistribution(IComponent distribution, address owner)
         external
         restricted
         returns(
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
+            IRegistry.ObjectInfo memory info
         ) 
     {
         if(!distribution.supportsInterface(type(IDistributionComponent).interfaceId)) {
             revert NotDistribution();
         }
 
-        (info, data) = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
-
-        info.nftId = _registry.register(info); 
-        distribution.linkToRegisteredNftId();
+        info = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
+        info.nftId = getRegistry().register(info);
+    }
 
-        return (info, data);  
+    function registerDistributor(IRegistry.ObjectInfo memory info)
+        external
+        restricted 
+        returns(NftId nftId) 
+    {
+        _verifyObjectInfo(info, DISTRIBUTOR());
+        nftId = getRegistry().register(info);
     }
 
     function registerPolicy(IRegistry.ObjectInfo memory info)
@@ -131,7 +144,7 @@ contract RegistryService is
     {
         _verifyObjectInfo(info, POLICY());
 
-        nftId = _registry.register(info);
+        nftId = getRegistry().register(info);
     }
 
     function registerBundle(IRegistry.ObjectInfo memory info)
@@ -141,7 +154,7 @@ contract RegistryService is
     {
         _verifyObjectInfo(info, BUNDLE());
 
-        nftId = _registry.register(info);
+        nftId = getRegistry().register(info);
     }
 
     function registerStake(IRegistry.ObjectInfo memory info)
@@ -151,79 +164,56 @@ contract RegistryService is
     {
         _verifyObjectInfo(info, STAKE());
 
-        nftId = _registry.register(info);
-    }
-
-    // From IService
-    function getDomain() public pure override(IService, Service) returns(ObjectType serviceDomain) {
-        return SERVICE(); 
-    }
-
-    // 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 getInitialInfo() 
-        public 
-        view
-        override(IRegisterable, Registerable)
-        returns (IRegistry.ObjectInfo memory info, bytes memory data)
+    function getFunctionConfigs()
+        external
+        pure
+        returns(
+            FunctionConfig[] memory config
+        )
     {
-        (info , data) = super.getInitialInfo();
+        config = new FunctionConfig[](8);
 
-        FunctionConfig[] memory config = new FunctionConfig[](6);
+        // order of service registrations MUST be reverse to this array 
+        /*config[-1].serviceDomain = STAKE();
+        config[-1].selector = RegistryService.registerStake.selector;*/
 
-        // registerInstance() have no restriction
-        config[0].serviceDomain = INSTANCE();
-        config[0].selector = new bytes4[](1);
-        config[0].selector[0] = RegistryService.registerInstance.selector;
+        config[0].serviceDomain = POLICY();
+        config[0].selectors = new bytes4[](0);
 
-        config[1].serviceDomain = POOL();
-        config[1].selector = new bytes4[](1);
-        config[1].selector[0] = RegistryService.registerPool.selector;
+        config[1].serviceDomain = APPLICATION();
+        config[1].selectors = new bytes4[](1);
+        config[1].selectors[0] = RegistryService.registerPolicy.selector;
 
-        config[2].serviceDomain = DISTRIBUTION();
-        config[2].selector = new bytes4[](1);
-        config[2].selector[0] = RegistryService.registerDistribution.selector;
+        config[2].serviceDomain = CLAIM();
+        config[2].selectors = new bytes4[](0);
 
         config[3].serviceDomain = PRODUCT();
-        config[3].selector = new bytes4[](1);
-        config[3].selector[0] = RegistryService.registerProduct.selector;
+        config[3].selectors = new bytes4[](1);
+        config[3].selectors[0] = RegistryService.registerProduct.selector;
 
-        config[4].serviceDomain = POLICY();
-        config[4].selector = new bytes4[](1);
-        config[4].selector[0] = RegistryService.registerPolicy.selector;
+        config[4].serviceDomain = POOL();
+        config[4].selectors = new bytes4[](1);
+        config[4].selectors[0] = RegistryService.registerPool.selector;
 
+        // registration of bundle service must preceed registration of pool service
         config[5].serviceDomain = BUNDLE();
-        config[5].selector = new bytes4[](1);
-        config[5].selector[0] = RegistryService.registerBundle.selector;
+        config[5].selectors = new bytes4[](1);
+        config[5].selectors[0] = RegistryService.registerBundle.selector;
 
-        /*config[6].serviceDomain = STAKE();
-        config[6].selector = new bytes4[](1);
-        config[6].selector[0] = RegistryService.registerStake.selector;*/
+        config[6].serviceDomain = DISTRIBUTION();
+        config[6].selectors = new bytes4[](2);
+        config[6].selectors[0] = RegistryService.registerDistribution.selector;
+        config[6].selectors[1] = RegistryService.registerDistributor.selector;
 
-        data = abi.encode(config);
+        // registerInstance() have no restriction
+        config[7].serviceDomain = INSTANCE();
+        config[7].selectors = new bytes4[](1);
+        config[7].selectors[0] = RegistryService.registerInstance.selector;
     }
 
     // Internal
@@ -234,16 +224,12 @@ contract RegistryService is
         address expectedOwner // assume can be 0 when given by other service
     )
         internal
-        view
+        // view
         returns(
-            IRegistry.ObjectInfo memory info, 
-            bytes memory data
+            IRegistry.ObjectInfo memory info 
         )
     {
-        (
-            info, 
-            data
-        ) = registerable.getInitialInfo();
+        info = registerable.getInitialInfo();
         info.objectAddress = address(registerable);
 
         if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
@@ -252,13 +238,8 @@ contract RegistryService is
 
         address owner = info.initialOwner;
 
-        // solhint-disable-next-line 
-        if(expectedType == INSTANCE()) { 
-            // any address may create a new instance via instance service
-        } else {
-            if(owner != expectedOwner) { // registerable owner protection
-                revert NotRegisterableOwner(expectedOwner);
-            }
+        if(owner != expectedOwner) { // registerable owner protection
+            revert NotRegisterableOwner(expectedOwner);
         }
 
         if(owner == address(registerable)) {
@@ -272,15 +253,6 @@ contract RegistryService is
         if(getRegistry().isRegistered(owner)) { 
             revert RegisterableOwnerIsRegistered();
         }
-
-        /*NftId parentNftId = info.parentNftId;
-        IRegistry.ObjectInfo memory parentInfo = getRegistry().getObjectInfo(parentNftId);
-
-        if(parentInfo.objectType != parentType) { // parent registration + type
-            revert InvalidParent(parentNftId);
-        }*/
-
-        return(info, data);
     }
 
     function _verifyObjectInfo(
@@ -306,25 +278,5 @@ contract RegistryService is
         if(getRegistry().isRegistered(owner)) { 
             revert RegisterableOwnerIsRegistered();
         }
-
-        // can catch all 3 if check that initialOwner is not registered
-        /*if(info.initialOwner == msg.sender) {
-            revert InitialOwnerIsParent();
-        }
-
-        if(info.initialOwner == address(this)) {
-            revert InitialOwnerIsService();
-        }
-
-        if(info.initialOwner == address(getRegistry())) {
-            revert InitialOwnerIsRegistry();
-        }*/
-
-        /*NftId parentNftId = info.parentNftId;
-        IRegistry.ObjectInfo memory parentInfo = getRegistry().getObjectInfo(parentNftId);
-
-        if(parentInfo.objectType != parentType) { // parent registration + type
-            revert InvalidParent(parentNftId);
-        }*/        
     }
 }

package/contracts/registry/RegistryServiceManager.sol

@@ -17,35 +17,37 @@ contract RegistryServiceManager is
 {
     bytes32 constant public ACCESS_MANAGER_CREATION_CODE_HASH = 0x0;
 
-    RegistryService private immutable _registryService; 
+    RegistryService private immutable _registryService;
 
     /// @dev initializes proxy manager with registry service implementation and deploys registry
     constructor(
         address initialAuthority, // used by implementation 
-        address registry) // used by implementation 
-        ProxyManager()
+        address registryAddress) // used by implementation 
+        ProxyManager(registryAddress)
     {
+        require(initialAuthority > address(0), "RegistryServiceManager: initial authority is 0");
+        require(registryAddress > address(0), "RegistryServiceManager: registry is 0");
+        
         // implementation's initializer func `data` argument
-        bytes memory initializationData = abi.encode(
-            initialAuthority,
-            registry); 
-
+        RegistryService srv = new RegistryService();
+        bytes memory data = abi.encode(registryAddress, initialAuthority);
         IVersionable versionable = deploy(
-            address(new RegistryService()), 
-            initializationData);
+            address(srv), 
+            data);
 
         _registryService = RegistryService(address(versionable));
 
+//        _linkToNftOwnable(address(_registryService));
     }
 
-    // from IRegisterable
+    // // from IRegisterable
 
-    // IMPORTANT: registry here and in constructor MUST be the same
-    function linkToNftOwnable(address registry)
+    // // IMPORTANT: registry here and in constructor MUST be the same
+    function linkOwnershipToServiceNft()
         public
         onlyOwner
     {
-        _linkToNftOwnable(registry, address(_registryService));
+        _linkToNftOwnable(address(_registryService));
     }
 
     //--- view functions ----------------------------------------------------//