@etherisc/gif-next 0.0.2-2a0a7d0-893 → 0.0.2-2a59cd5-352

package/contracts/instance/service/ProductService.sol

@@ -60,11 +60,11 @@ contract ProductService is ComponentService, IProductService {
         address initialOwner;
         (registryAddress, initialOwner) = abi.decode(data, (address, address));
 
-        _initializeService(registryAddress, owner);
+        initializeService(registryAddress, owner);
 
-        _poolService = IPoolService(_registry.getServiceAddress(POOL(), getMajorVersion()));
+        _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getMajorVersion()));
 
-        _registerInterface(type(IProductService).interfaceId);
+        registerInterface(type(IProductService).interfaceId);
     }
 
 
@@ -73,7 +73,7 @@ contract ProductService is ComponentService, IProductService {
         returns(NftId productNftId)
     {
         (
-            IComponent product,
+            IComponent component,
             address owner,
             IInstance instance,
             NftId instanceNftId
@@ -82,37 +82,28 @@ contract ProductService is ComponentService, IProductService {
             PRODUCT(),
             PRODUCT_OWNER_ROLE());
 
-        (
-            IRegistry.ObjectInfo memory productInfo,
-            bytes memory data
-        ) = getRegistryService().registerProduct(product, owner);
-
+        IProductComponent product = IProductComponent(productAddress);
+        IRegistry.ObjectInfo memory productInfo = getRegistryService().registerProduct(product, owner);
         productNftId = productInfo.nftId;
         _createProductSetup(
             instance, 
             product, 
-            productNftId, 
-            data);
+            productNftId);
     }
 
 
     function _createProductSetup(
         IInstance instance, 
-        IComponent product, 
-        NftId productNftId, 
-        bytes memory data
+        IProductComponent product, 
+        NftId productNftId 
     )
         internal
         returns (string memory name)
     {
-        (
-            string memory name, 
-            ISetup.ProductSetupInfo memory setup
-        ) = _decodeAndVerifyProductData(data);
-
         // wire distribution and pool components to product component
-        IComponent distribution = IComponent(_registry.getObjectInfo(setup.distributionNftId).objectAddress);
-        IComponent pool = IComponent(_registry.getObjectInfo(setup.poolNftId).objectAddress);
+        ISetup.ProductSetupInfo memory setup = product.getSetupInfo();
+        IComponent distribution = IComponent(getRegistry().getObjectInfo(setup.distributionNftId).objectAddress);
+        IComponent pool = IComponent(getRegistry().getObjectInfo(setup.poolNftId).objectAddress);
 
         distribution.setProductNftId(productNftId);
         pool.setProductNftId(productNftId);
@@ -120,13 +111,14 @@ contract ProductService is ComponentService, IProductService {
         product.linkToRegisteredNftId();
 
         // create product setup in instance
-        instance.createProductSetup(productNftId, setup);
+        instance.createProductSetup(productNftId, product.getSetupInfo());
 
         // create target for instane access manager
-        getInstanceService().createTarget(
-            _registry.getNftId(address(instance)), 
+        getInstanceService().createGifTarget(
+            getRegistry().getNftId(address(instance)), 
             address(product), 
-            name);
+            product.getName());
+        getInstanceService().grantProductDefaultPermissions(instance.getNftId(), address(product), product.getName());
     }
 
     function getDomain() public pure override(IService, Service) returns(ObjectType) {
@@ -148,13 +140,13 @@ contract ProductService is ComponentService, IProductService {
         //     revert WalletIsZero();
         // }
 
-        // IRegistry.ObjectInfo memory tokenInfo = _registry.getObjectInfo(address(info.token));
+        // IRegistry.ObjectInfo memory tokenInfo = getRegistry().getObjectInfo(address(info.token));
 
         // if(tokenInfo.objectType != TOKEN()) {
         //     revert InvalidToken();
         // } 
 
-        // IRegistry.ObjectInfo memory poolInfo = _registry.getObjectInfo(info.poolNftId);
+        // IRegistry.ObjectInfo memory poolInfo = getRegistry().getObjectInfo(info.poolNftId);
 
         // if(poolInfo.objectType != POOL()) {
         //     revert InvalidPool();
@@ -168,7 +160,7 @@ contract ProductService is ComponentService, IProductService {
         // //require(tokenInfo.objectAddress == address(poolSetup.token), "ERROR:COS-018:PRODUCT_POOL_TOKEN_MISMATCH");
         // // TODO pool is not linked
 
-        // IRegistry.ObjectInfo memory distributionInfo = _registry.getObjectInfo(info.distributionNftId);
+        // IRegistry.ObjectInfo memory distributionInfo = getRegistry().getObjectInfo(info.distributionNftId);
 
         // if(distributionInfo.objectType != DISTRIBUTION()) {
         //     revert  InvalidDistribution();

package/contracts/registry/IRegistry.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.20;
 
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
-import {ChainNft} from "./ChainNft.sol";
 import {NftId} from "../types/NftId.sol";
 import {ObjectType} from "../types/ObjectType.sol";
 import {VersionPart} from "../types/Version.sol";
@@ -92,7 +91,9 @@ interface IRegistry is IERC165 {
         VersionPart releaseVersion
     ) external view returns (address serviceAddress);
 
-    function getChainNft() external view returns (ChainNft);
+    function getReleaseManagerAddress() external view returns (address);
+
+    function getChainNftAddress() external view returns (address);
 
     function getOwner() external view returns (address);
 }

package/contracts/registry/IRegistryService.sol

@@ -35,20 +35,30 @@ interface IRegistryService is
      struct FunctionConfig
      {
           ObjectType serviceDomain;
-          bytes4 selector;
+          bytes4[] selectors;
      }
 
-     function registerInstance(IRegisterable instance, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data); 
+    function getFunctionConfigs()
+        external
+        pure
+        returns(
+            FunctionConfig[] memory config
+        );
+
+     // TODO used by service -> add owner arg 
+    function registerInstance(IRegisterable instance, address owner)
+          external returns(IRegistry.ObjectInfo memory info); 
 
      function registerProduct(IComponent product, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+          external returns(IRegistry.ObjectInfo memory info);
 
      function registerPool(IComponent pool, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+          external returns(IRegistry.ObjectInfo memory info);
 
      function registerDistribution(IComponent distribution, address owner)
-          external returns(IRegistry.ObjectInfo memory info, bytes memory data);
+          external returns(IRegistry.ObjectInfo memory info);
+
+     function registerDistributor(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
 
      function registerPolicy(IRegistry.ObjectInfo memory info) external returns(NftId nftId);
 

package/contracts/registry/Registry.sol

@@ -1,12 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 import {NftId, toNftId, zeroNftId} from "../types/NftId.sol";
 import {VersionPart} from "../types/Version.sol";
-import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, DISTRIBUTION, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
-
-import {ERC165} from "../shared/ERC165.sol";
+import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, DISTRIBUTION, DISTRIBUTOR, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
 
 import {ChainNft} from "./ChainNft.sol";
 import {IRegistry} from "./IRegistry.sol";
@@ -23,7 +22,6 @@ import {ReleaseManager} from "./ReleaseManager.sol";
 // 4) state object by regular service (POLICY, BUNDLE, STAKE)
 
 contract Registry is
-    ERC165,
     IRegistry
 {
     address public constant NFT_LOCK_ADDRESS = address(0x1);
@@ -75,8 +73,6 @@ contract Registry is
 
         // set object types and object parent relations
         _setupValidCoreTypesAndCombinations();
-
-        _registerInterface(type(IRegistry).interfaceId);
     }
 
     function registerService(
@@ -194,6 +190,10 @@ contract Registry is
         return _chainNft.totalSupply();
     }
 
+    function getReleaseManagerAddress() external view returns (address) {
+        return address(_releaseManager);
+    }
+
     function getNftId() external view returns (NftId nftId) {
         return _registryNftId;
     }
@@ -246,14 +246,24 @@ contract Registry is
         //}
     }
 
-    function getChainNft() external view override returns (ChainNft) {
-        return _chainNft;
+    function getChainNftAddress() external view override returns (address) {
+        return address(_chainNft);
     }
 
     function getOwner() public view returns (address owner) {
         return ownerOf(address(this));
     }
 
+    // IERC165
+
+    function supportsInterface(bytes4 interfaceId) external pure returns (bool) {
+        if(interfaceId == type(IERC165).interfaceId || interfaceId == type(IRegistry).interfaceId) {
+            return true;
+        }
+
+        return false;
+    }
+
     // Internals
 
     /// @dev registry protects only against tampering existing records, registering with invalid types pairs and 0 parent address
@@ -442,6 +452,8 @@ contract Registry is
         _coreContractCombinations[ORACLE()][INSTANCE()] = true;
         _coreContractCombinations[POOL()][INSTANCE()] = true;
 
+        _coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
+
         // product as parent, ONLY approved
         _coreObjectCombinations[POLICY()][PRODUCT()] = true;
 

package/contracts/registry/RegistryService.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, 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";
@@ -44,27 +44,24 @@ contract RegistryService is
         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(), owner);
+        info = _getAndVerifyContractInfo(instance, INSTANCE(), owner);
+        info.nftId = getRegistry().register(info);
 
-        info.nftId = _registry.register(info);
-        
-        return (info, data);
+        instance.linkToRegisteredNftId(); // asume safe
     }
 
     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 
@@ -72,49 +69,47 @@ contract RegistryService is
             revert NotProduct();
         }
 
-        (info, data) = _getAndVerifyContractInfo(product, PRODUCT(), owner);
-
-        info.nftId = _registry.register(info);
-
-        return (info, data);  
+        info = _getAndVerifyContractInfo(product, PRODUCT(), owner);
+        info.nftId = getRegistry().register(info);
     }
 
     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);
-
-        return (info, data);  
+        info = _getAndVerifyContractInfo(pool, POOL(), owner);
+        info.nftId = getRegistry().register(info);
     }
 
     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);
+        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)
@@ -124,7 +119,7 @@ contract RegistryService is
     {
         _verifyObjectInfo(info, POLICY());
 
-        nftId = _registry.register(info);
+        nftId = getRegistry().register(info);
     }
 
     function registerBundle(IRegistry.ObjectInfo memory info)
@@ -134,7 +129,7 @@ contract RegistryService is
     {
         _verifyObjectInfo(info, BUNDLE());
 
-        nftId = _registry.register(info);
+        nftId = getRegistry().register(info);
     }
 
     function registerStake(IRegistry.ObjectInfo memory info)
@@ -144,7 +139,7 @@ contract RegistryService is
     {
         _verifyObjectInfo(info, STAKE());
 
-        nftId = _registry.register(info);
+        nftId = getRegistry().register(info);
     }
 
     // From IService
@@ -170,47 +165,50 @@ contract RegistryService is
 
         __AccessManaged_init(initialAuthority);
 
-        _initializeService(address(registry), owner);
-
-        _registerInterface(type(IRegistryService).interfaceId);
+        initializeService(address(registry), owner);
+        registerInterface(type(IRegistryService).interfaceId);
     }
 
     // from IRegisterable
 
-    function getInitialInfo() 
-        public 
-        view
-        virtual override(IRegisterable, Registerable)
-        returns (IRegistry.ObjectInfo memory info, bytes memory data)
+    function getFunctionConfigs()
+        external
+        pure
+        returns(
+            FunctionConfig[] memory config
+        )
     {
-        (info , data) = super.getInitialInfo();
-
-        FunctionConfig[] memory config = new FunctionConfig[](6);
+        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[0].selectors = new bytes4[](1);
+        config[0].selectors[0] = RegistryService.registerPolicy.selector;
 
         config[1].serviceDomain = BUNDLE();
-        config[1].selector = RegistryService.registerBundle.selector;
+        config[1].selectors = new bytes4[](1);
+        config[1].selectors[0] = RegistryService.registerBundle.selector;
 
         config[2].serviceDomain = PRODUCT();
-        config[2].selector = RegistryService.registerProduct.selector;
+        config[2].selectors = new bytes4[](1);
+        config[2].selectors[0] = RegistryService.registerProduct.selector;
 
         config[3].serviceDomain = POOL();
-        config[3].selector = RegistryService.registerPool.selector;
+        config[3].selectors = new bytes4[](1);
+        config[3].selectors[0] = RegistryService.registerPool.selector;
 
         config[4].serviceDomain = DISTRIBUTION();
-        config[4].selector = RegistryService.registerDistribution.selector;
+        config[4].selectors = new bytes4[](2);
+        config[4].selectors[0] = RegistryService.registerDistribution.selector;
+        config[4].selectors[1] = RegistryService.registerDistributor.selector;
 
         // registerInstance() have no restriction
         config[5].serviceDomain = INSTANCE();
-        config[5].selector = RegistryService.registerInstance.selector;
-
-        data = abi.encode(config);
+        config[5].selectors = new bytes4[](1);
+        config[5].selectors[0] = RegistryService.registerInstance.selector;
     }
 
     // Internal
@@ -221,16 +219,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
@@ -254,15 +248,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(
@@ -288,25 +273,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/ReleaseManager.sol

@@ -61,7 +61,7 @@ contract ReleaseManager is AccessManaged
 
     mapping(VersionPart version => IRegistry.ReleaseInfo info) _release;
 
-    mapping(VersionPart version => mapping(ObjectType serviceDomain => bytes4)) _selector; // registry service function selector assigned to domain 
+    mapping(VersionPart version => mapping(ObjectType serviceDomain => bytes4[])) _selectors; // registry service function selector assigned to domain 
 
     uint _awaitingRegistration; // "services left to register" counter
 
@@ -135,6 +135,7 @@ contract ReleaseManager is AccessManaged
         if(!service.supportsInterface(type(IRegistryService).interfaceId)) {
             revert NotRegistryService();
         }
+
         // TODO unreliable! MUST guarantee the same authority -> how?
         address serviceAuthority = service.authority();
         if(serviceAuthority != authority()) {
@@ -143,16 +144,14 @@ contract ReleaseManager is AccessManaged
                 serviceAuthority); 
         }
 
-        (
-            IRegistry.ObjectInfo memory info, 
-            bytes memory data
-        ) = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
+        IRegistry.ObjectInfo memory info = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
 
         VersionPart version = _next;
         ObjectType domain = REGISTRY();
         _verifyServiceInfo(info, version, domain);
 
-        _createRelease(data);
+        // data: config bytes
+        _createRelease(service.getFunctionConfigs());
 
         //setTargetClosed(service, true);
         
@@ -173,24 +172,19 @@ contract ReleaseManager is AccessManaged
             revert NotService();
         }
 
-        (
-            IRegistry.ObjectInfo memory info, 
-            //bytes memory data
-        ) = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
-
-        VersionPart version = _next;
+        IRegistry.ObjectInfo memory info = _getAndVerifyContractInfo(service, SERVICE(), msg.sender);
+        VersionPart version = getNextVersion();
         ObjectType domain = _release[version].domains[_awaitingRegistration];// reversed registration order of services specified in RegistryService config
         _verifyServiceInfo(info, version, domain);
 
         // setup and grant unique role if service does registrations
-        bytes4[] memory selector = new bytes4[](1);
-        selector[0] = _selector[version][domain];
+        bytes4[] memory selectors = _selectors[version][domain];
         address registryService = _registry.getServiceAddress(REGISTRY(), version);
-        if(selector[0] != 0) {
+        if(selectors.length > 0) {
             _accessManager.setAndGrantUniqueRole(
                 address(service), 
                 registryService, 
-                selector);
+                selectors);
         }
         
         _awaitingRegistration--;
@@ -244,13 +238,12 @@ contract ReleaseManager is AccessManaged
         address expectedOwner // assume always valid, can not be 0
     )
         internal
-        view
+        // view
         returns(
-            IRegistry.ObjectInfo memory info, 
-            bytes memory data
+            IRegistry.ObjectInfo memory info
         )
     {
-        (info, data) = service.getInitialInfo();
+        info = service.getInitialInfo();
         info.objectAddress = address(service);
         info.isInterceptor = false; // service is never interceptor, at least now
 
@@ -267,23 +260,10 @@ contract ReleaseManager is AccessManaged
         if(owner == address(service)) {
             revert SelfRegistration();
         }
-
-        /*if(owner == address(0)) { // never 0
-            revert();// RegisterableOwnerIsZero();
-        }*/
         
         if(_registry.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 _verifyServiceInfo(
@@ -312,11 +292,10 @@ contract ReleaseManager is AccessManaged
     }
 
     // TODO check if registry supports types specified in the config array
-    function _createRelease(bytes memory configBytes)
+    function _createRelease(IRegistryService.FunctionConfig[] memory config)
         internal
     {
-        VersionPart version = _next;
-        IRegistryService.FunctionConfig[] memory config = abi.decode(configBytes, (IRegistryService.FunctionConfig[]));
+        VersionPart version = getNextVersion();
 
         if(config.length == 0) {
             revert ConfigMissing();
@@ -326,21 +305,21 @@ contract ReleaseManager is AccessManaged
         for(uint idx = 0; idx < config.length; idx++)
         {
             ObjectType domain = config[idx].serviceDomain;
-            bytes4 selector = config[idx].selector;
-
             // not "registry service" / zero domain
             if(
                 domain == REGISTRY() ||
                 domain.eqz()
             ) { revert ConfigServiceDomainInvalid(idx, domain); } 
 
+            bytes4[] memory selectors = config[idx].selectors;
+
             // TODO can be zero -> e.g. duplicate domain, first with zero selector, second with non zero selector -> need to check _release[version].domains.contains(domain) instead
             // no overwrite
-            if(_selector[version][domain] > 0) {
+            if(_selectors[version][domain].length > 0) {
                 revert SelectorAlreadyExists(version, domain); 
             }
             
-            _selector[version][domain] = selector;
+            _selectors[version][domain] = selectors;
             _release[version].domains.push(domain);
         }
         // TODO set when activated?

package/contracts/registry/TokenRegistry.sol

@@ -27,8 +27,9 @@ contract TokenRegistry is
     mapping(address token => mapping(VersionPart majorVersion => bool isActive)) internal _active;
 
     constructor()
-        NftOwnable()
-    { }
+    { 
+        initializeOwner(msg.sender);
+    }
 
 
     /// @dev link ownership of token registry to nft owner of registry service
@@ -60,7 +61,7 @@ contract TokenRegistry is
         // verify valid major version
         // ensure major version increments is one
         uint256 version = majorVersion.toInt();
-        if (!_registry.isValidRelease(majorVersion)) {
+        if (!getRegistry().isValidRelease(majorVersion)) {
             revert TokenMajorVersionInvalid(majorVersion);
         }