@etherisc/gif-next 0.0.2-790d44b-698 → 0.0.2-7acbd99-227

package/contracts/registry/Registry.sol

@@ -10,449 +10,489 @@ import {IRegistry} from "./IRegistry.sol";
 import {NftId, toNftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
 import {Version, VersionPart, VersionLib} from "../types/Version.sol";
 import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, DISTRIBUTION, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
+import {ITransferInterceptor} from "./ITransferInterceptor.sol";
 
-import {Versionable} from "../shared/Versionable.sol";
+import {IOwnable} from "../shared/IOwnable.sol";
+import {ERC165} from "../shared/ERC165.sol";
 
 
+// IMPORTANT
+// Each NFT minted by registry is accosiated with:
+// 1) NFT owner
+// 2) registred contract OR object stored in registered (parent) contract
+// Four registration flows:
+// 1) non IRegisterable address by registryOwner (TOKEN)
+// 2) IRegisterable address by registryOwner (SERVICE)
+// 3) IRegisterable address by approved service (INSTANCE, COMPONENT)
+// 4) state object by approved service (POLICY, BUNDLE, STAKE)
+
 contract Registry is
-    Versionable,
-    IRegisterable,
+    ERC165,
     IRegistry
 {
-    using NftIdLib for NftId;
-
+    // register
+    error NotRegistryService();
+    error ZeroParentAddress();
+    error ContractAlreadyRegistered(address objectAddress);
+    error InvalidServiceVersion(VersionPart majorVersion);
+    error ServiceNameAlreadyRegistered(string name, VersionPart majorVersion);
+            
+    // approve
+    error NotOwner();
+    error NotRegisteredContract(NftId registrarNftId);
+    error NotService(NftId registrarNftId);
+    error InvalidTypesCombination(ObjectType objectType, ObjectType parentType);
+
+    uint256 public constant MAJOR_VERSION_MIN = 3;
+    
     string public constant EMPTY_URI = "";
 
-    // IMPORTANT Every new version with storage changes must implement its own struct
-    // copy paste previous version and add changes
-    // @custom:storage-location erc7201:gif-next.contracts.registry.Registry.sol
-    struct StorageV1 {
+    address constant public NFT_LOCK_ADDRESS = address(0x1);
+
+    mapping(NftId nftId => ObjectInfo info) _info;
+    mapping(address object => NftId nftId) _nftIdByAddress;
+
+    mapping(NftId registrator => mapping(
+            ObjectType objectType => bool)) _isApproved;
 
-        mapping(NftId nftId => ObjectInfo info) _info;
-        mapping(address object => NftId nftId) _nftIdByAddress;
-        mapping(ObjectType objectType => bool) _isValidType;
-        mapping(ObjectType objectType => mapping(ObjectType objectParentType => bool)) _isValidParentType;
+    mapping(ObjectType objectType => mapping(
+            ObjectType parentType => bool)) _isValidContractCombination;
 
-        mapping(NftId nftId => string stringValue) _string;
-        mapping(bytes32 serviceNameHash => mapping(VersionPart majorVersion => address service)) _service;
+    mapping(ObjectType objectType => mapping(
+            ObjectType parentType => bool)) _isValidObjectCombination;
 
-        NftId _nftId;
-        IChainNft _chainNft;
-        ChainNft _chainNftInternal;
-        address _initialOwner;
+    mapping(NftId nftId => string name) _string;
+    mapping(bytes32 serviceNameHash => mapping(
+            VersionPart majorVersion => address service)) _service;
+
+    NftId _registryNftId;
+    NftId _serviceNftId; // set in stone upon registry creation
+    IChainNft _chainNft;
+    ChainNft _chainNftInternal;
+
+    /*
+    modifier onlyInitialOwner() {
+        if(
+            msg.sender != getOwner() ||
+            msg.sender != _info[_registryNftId].initialOwner) {
+            revert NotInitialOwner();
+        }
+    }*/
 
-        /// @dev will own protocol nft and registry nft(s) minted during initialize
-        address _protocolOwner;
-        // if struct goes here
-        // then you cannot add new vars here
+    modifier onlyOwner() {
+        if(msg.sender != getOwner()) {
+            revert NotOwner();
+        }
+        _;
     }
 
-    // TODO do not use gif-next in namespace id
-    // TODO ask openzeppelin about public location
-    // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.registry.Registry.sol")) - 1)) & ~bytes32(uint256(0xff));
-    bytes32 public constant LOCATION_V1 = 0x6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300;
-
-    // TODO check how usage of "$.data" influences gas costs 
-    // IMPORTANT Every new version must implement this function
-    // keep it private -> if unreachable from the next version then not included in its byte code
-    // each version MUST use the same locationV1, just change return type
-    function _getStorage() private pure returns (StorageV1 storage $) {
-        assembly {
-            $.slot := LOCATION_V1
+    modifier onlyRegistryService() {
+        
+        if(msg.sender != _info[_serviceNftId].objectAddress) {
+            revert NotRegistryService();
         }
+        _;
     }
 
-    /// @dev the protocol owner will get ownership of the
-    // protocol nft and the global registry nft minted in this 
-    // initializer function 
-    function _initialize(bytes memory data) 
-        internal
-        onlyInitializing
-        virtual override
+    constructor(address registryOwner, VersionPart majorVersion)
     {
-        address protocolOwner = abi.decode(data, (address));
-        StorageV1 storage $ = _getStorage();
+        require(registryOwner > address(0), "Registry: protocol owner is 0");
+        require(majorVersion.toInt() == MAJOR_VERSION_MIN, "Registry: initial major version of registry service is not MAJOR_VERSION_MIN");
 
-         // TODO here delegate call from proxy constructor, msg.sender is proxy deployer -> Proxy.sol
-        $._initialOwner = msg.sender;
-        $._protocolOwner = protocolOwner;
-
-        // TODO deployment size is to big, call another contract which keeps and deploys ChainNft byte code  
         // deploy NFT 
-        $._chainNftInternal = new ChainNft(address(this));// adds 10kb to deployment size
-        $._chainNft = IChainNft($._chainNftInternal);
-        
+        _chainNftInternal = new ChainNft(address(this));// adds 10kb to deployment size
+        _chainNft = IChainNft(_chainNftInternal);
+
         // initial registry setup
         _registerProtocol();
-        $._nftId = _registerRegistry();
-
-        // setup rules for further registrations
-        _setupValidTypes();
-        _setupValidParentTypes();
-    }
-
-    function register(
-        address objectAddress
-    )
-    // TODO add authz (only services may register components etc)
-    // we have to check how we do authz for registring services (just restrict to protocol owner/registry owner)
-    external override returns (NftId nftId) {
-        StorageV1 storage $ = _getStorage();
-
-        require(
-            $._nftIdByAddress[objectAddress].eqz(),
-            "ERROR:REG-002:ALREADY_REGISTERED"
-        );
-
-        IRegisterable registerable = IRegisterable(objectAddress);
-        require(
-            registerable.supportsInterface(type(IRegisterable).interfaceId),
-            "ERROR:REG-003:NOT_REGISTERABLE"
-        );
-
-        ObjectType objectType = registerable.getType();
-        require(
-            $._isValidType[objectType],
-            "ERROR:REG-004:TYPE_INVALID"
-        );
-
-        NftId parentNftId = registerable.getParentNftId();
-        require(
-            isRegistered(parentNftId),
-            "ERROR:REG-005:PARENT_NOT_REGISTERED"
-        );
-
-        require(
-            $._isValidParentType[objectType][$._info[parentNftId].objectType],
-            "ERROR:REG-006:PARENT_TYPE_INVALID"
-        );
 
-        // also check that nftId and parentNFtId are on the same chain if applicable
+        _registerRegistry(registryOwner);
 
-        // nft minting
-        uint256 mintedTokenId = $._chainNft.mint(
-            registerable.getOwner(),
-            EMPTY_URI
-        );
+        _registerRegistryService();
 
-        nftId = toNftId(mintedTokenId);
+        // set object parent relations
+        _setupValidObjectParentCombinations();
 
-        // special case services
-        if(registerable.getType() == SERVICE()) {
-            IService service = IService(objectAddress);
-            require(
-                service.supportsInterface(type(IService).interfaceId),
-                "ERROR:REG-007:NOT_SERVICE"
-            );
-
-            string memory serviceName = service.getName();
-            VersionPart majorVersion = service.getMajorVersion();
-            bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
-
-            // service specific state
-            $._string[nftId] = serviceName;
-
-            require(
-                $._service[serviceNameHash][majorVersion] == address(0),
-                "ERROR:REG-008:ALREADY_REGISTERED"
-            );
-            $._service[serviceNameHash][majorVersion] = objectAddress;
-        }
-
-        // create object info and link nft id with it
-        _registerObjectInfo(registerable, nftId);
+        _registerInterface(type(IRegistry).interfaceId);
+        _registerInterface(type(IOwnable).interfaceId);
     }
 
-
-    function registerObjectForInstance(
-        NftId parentNftId,
-        ObjectType objectType,
-        address initialOwner,
-        bytes memory data
-    )
+    /// @dev registry protects only from tampering existing records and invalid types pairs
+    // IMPORTANT: rare case when parentNftId is not registered and == next nftId -> technincally this is ZeroParentAddress error
+    // to catch this check parent address before minting !!!!
+    // TODO service registration means its approval for some type?
+    function register(ObjectInfo memory info)
         external
-        override
-        returns (
-            // TODO add onlyRegisteredInstance
-            NftId nftId
-        )
+        onlyRegistryService
+        returns(NftId nftId)
     {
-        StorageV1 storage $ = _getStorage();
+        ObjectType objectType = info.objectType;
+        NftId parentNftId = info.parentNftId;
+        ObjectInfo memory parentInfo = _info[parentNftId];
+        ObjectType parentType = parentInfo.objectType; // see function header
+        address parentAddress = parentInfo.objectAddress;
+
+        // parent is contract -> need to check? -> check before minting
+        // special case: global registry nft as parent when not on mainnet -> global registry address is 0
+        // special case: when parentNftId == _chainNft.mint(), check for zero parent address before mint
+        // special case: when parentNftId == _chainNft.mint() && objectAddress == initialOwner
+        if(parentAddress == address(0)) {
+            revert ZeroParentAddress();
+        }
 
-        // TODO add more validation
-        require(
-            objectType == POLICY() || objectType == BUNDLE(),
-            "ERROR:REG-010:TYPE_INVALID"
-        );
+        address interceptor = _getInterceptor(info.isInterceptor, info.objectAddress, parentInfo.isInterceptor, parentAddress);
 
-        uint256 mintedTokenId = $._chainNft.mint(initialOwner, EMPTY_URI);
+        uint256 mintedTokenId = _chainNft.mint(
+            info.initialOwner,
+            interceptor,
+            EMPTY_URI);
         nftId = toNftId(mintedTokenId);
 
-        ObjectInfo memory info = ObjectInfo(
-            nftId,
-            parentNftId,
-            objectType,
-            address(0),
-            initialOwner,
-            data
-        );
-
-        $._info[nftId] = info;
-
-        // add logging
-    }
+        // TODO move nftId out of info struct
+        // getters by nftId -> return struct without nftId
+        // getters by address -> return nftId AND struct
+        info.nftId = nftId;
+        _info[nftId] = info;
+
+        if(info.objectAddress > address(0)) 
+        {
+            // TODO if need to add types latter -> at least call this check from registry service
+            // parent is registered + object-parent types are valid
+            if(_isValidContractCombination[objectType][parentType] == false) {
+                revert InvalidTypesCombination(objectType, parentType);
+            }
+
+            address contractAddress = info.objectAddress;
+
+            if(_nftIdByAddress[contractAddress].gtz()) { 
+                revert ContractAlreadyRegistered(contractAddress);
+            }
+
+            _nftIdByAddress[contractAddress] = nftId;
+
+            // special case
+            if(objectType == SERVICE())
+            {
+                (
+                    string memory serviceName,
+                    VersionPart majorVersion
+                ) = abi.decode(info.data, (string, VersionPart));
+                bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
+
+                // TODO MUST guarantee consistency of registerable.getVersion() and majorVersion here
+                // TODO update _serviceNftId when registryService with new major version is registered? -> it is fixed in current setup
+                // TODO do not use names -> each object type is registered by corresponding service -> conflicting with approve()
+                if(
+                    majorVersion.toInt() < MAJOR_VERSION_MIN ||
+                    (majorVersion.toInt() > MAJOR_VERSION_MIN &&
+                    _service[serviceNameHash][VersionLib.toVersionPart(majorVersion.toInt() - 1)] == address(0) )
+                ) {
+                    revert InvalidServiceVersion(majorVersion);
+                }
+                
+                if(_service[serviceNameHash][majorVersion] != address(0)) {
+                    revert ServiceNameAlreadyRegistered(serviceName, majorVersion);
+                }
+
+                _string[nftId] = serviceName;
+                _service[serviceNameHash][majorVersion] = contractAddress;
+
+                emit LogServiceNameRegistration(serviceName, majorVersion); 
+            }
+        }
+        else
+        {
+            if(_isValidObjectCombination[objectType][parentType] == false) {
+                revert InvalidTypesCombination(objectType, parentType);
+            }
+        }
 
-    function getObjectCount() external view override returns (uint256) {
-        return _getStorage()._chainNft.totalSupply();
+        emit LogRegistration(nftId, info.parentNftId, info.objectType, info.objectAddress, info.initialOwner);
     }
 
-    function getNftId(
-        address object
-    ) external view override returns (NftId id) {
-        return _getStorage()._nftIdByAddress[object];
+    function registerFrom(
+        address from, 
+        ObjectInfo memory info
+    ) external returns (NftId nftId) 
+    {
+        revert();
     }
+    
+
+    /// @dev 
+    // msg.sender - registry owner 
+    //     CAN approve only registered service contract
+    //     CAN approve any combination specified in _isValidCombination
+    //     CAN NOT approve itself
+    // TODO in case where exists exactly one registered service per objectType (and major version):
+    // - registration and approve is a single operation, no need for separate approve() function
+    // - then approve can be used to adding new valid object-parent combinations???
+    function approve(
+        NftId serviceNftId,
+        ObjectType objectType,
+        ObjectType parentType 
+    ) 
+        public
+        onlyOwner()
+    {
+        address serviceAddress = _info[serviceNftId].objectAddress;
+            
+        if(_nftIdByAddress[serviceAddress].eqz()) {
+            revert NotRegisteredContract(serviceNftId);
+        }
 
-    function isRegistered(
-        NftId nftId
-    ) public view override returns (bool) {
-        return _getStorage()._info[nftId].objectType.gtz();
-    }
+        if(_info[serviceNftId].objectType != SERVICE()) {
+            revert NotService(serviceNftId);
+        }
 
-    function isRegistered(
-        address object
-    ) external view override returns (bool) {
-        return _getStorage()._nftIdByAddress[object].gtz();
-    }
+        if(
+            _isValidContractCombination[objectType][parentType] == false &&
+            _isValidObjectCombination[objectType][parentType] == false) {
+            revert InvalidTypesCombination(objectType, parentType);
+        }
 
-    function getObjectInfo(
-        NftId nftId
-    ) external view override returns (ObjectInfo memory info) {
-        return _getStorage()._info[nftId];
-    }
+        _isApproved[serviceNftId][objectType] = true;
 
-    function getName(
-        NftId nftId
-    ) external view returns (string memory name) {
-        return _getStorage()._string[nftId];
+        emit LogApproval(serviceNftId, objectType);
     }
 
-    function getOwner(NftId nftId) external view override returns (address) {
-        return _getStorage()._chainNft.ownerOf(nftId.toInt());
+    /// @dev returns false for registry owner nft
+    // TODO allowance by address?
+    // TODO checked by registry service -> but registry owner can upgrade registry service not to check allowance....
+    function allowance(
+        NftId nftId,
+        ObjectType object
+    ) 
+        public
+        view 
+        returns (bool)
+    {
+        return _isApproved[nftId][object];
     }
 
-    function getChainNft() external view override returns (IChainNft) {
-        return _getStorage()._chainNft;
+    // from IRegistry
+    function getObjectCount() external view override returns (uint256) {
+        
+        return _chainNft.totalSupply();
     }
 
-    // special case to retrive a gif service
-    function getServiceAddress(string memory serviceName, VersionPart majorVersion) external view override returns (address serviceAddress) {
-        bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
-        return _getStorage()._service[serviceNameHash][majorVersion];
+    function getNftId(address object) external view override returns (NftId id) {
+        return _nftIdByAddress[object];
     }
 
-    // from IERC165
-    function supportsInterface(bytes4 interfaceId) external pure override returns (bool) {
-        return interfaceId == type(IRegistry).interfaceId;
+    function ownerOf(NftId nftId) public view override returns (address) {
+        return _chainNft.ownerOf(nftId.toInt());
     }
 
-    // from IRegistryLinked
-    function getRegistry() external view override returns (IRegistry registry) {
-        return this;
+    function ownerOf(address contractAddress) public view returns (address) {
+        
+        return _chainNft.ownerOf(_nftIdByAddress[contractAddress].toInt());
     }
 
-    // from IVersionable
-    function getVersion() public pure virtual override returns (Version) {
-        return VersionLib.toVersion(1, 0, 0);
-    } 
-
-    // from IRegisterable
-    // TODO 
-    // 1) Registerable can not register itself -> otherwise register have to trust owner address provided by registerable
-    // registerable owner MUST call register and provide registerable address
-    // 2) Who is msg.sender here???
-    function register() external pure override returns (NftId nftId) {
-        return zeroNftId();
+    function getObjectInfo(NftId nftId) external view override returns (ObjectInfo memory) {
+        return _info[nftId];
     }
 
-    function getType() external pure override returns (ObjectType objectType) {
-        return REGISTRY();
+    function getObjectInfo(address object) external view override returns (ObjectInfo memory) {
+        
+        return _info[_nftIdByAddress[object]];
     }
 
-    function getOwner() public view override returns (address owner) {
-        StorageV1 storage $ = _getStorage();
-        return $._nftId.gtz() ? this.getOwner($._nftId) : $._initialOwner;
+    function isRegistered(NftId nftId) public view override returns (bool) {
+        return _info[nftId].objectType.gtz();
     }
 
-    function getNftId() public view override (IRegisterable, IRegistry) returns (NftId nftId) {
-        return _getStorage()._nftId;
+    function isRegistered(address object) external view override returns (bool) {
+        return _nftIdByAddress[object].gtz();
     }
 
-    function getParentNftId() public view returns (NftId nftId) {
-        StorageV1 storage $ = _getStorage();
-        nftId = $._info[$._nftId].parentNftId;
+    function getServiceName(NftId nftId) external view returns (string memory) {
+        return _string[nftId];
     }
 
-    function getData() public pure returns (bytes memory data) {
-        return "";
+    // special case to retrive a gif service
+    function getServiceAddress(
+        string memory serviceName, 
+        VersionPart majorVersion
+    ) external view returns (address)
+    {
+        bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
+        return _service[serviceNameHash][majorVersion];
     }
 
-    // registry specific functions
-    function getProtocolOwner() external view override returns (address) {
-        return _getStorage()._protocolOwner;
+    function getChainNft() external view override returns (IChainNft) {
+        return _chainNft;
     }
 
-    /// @dev defines which types are allowed to register
-    function _setupValidTypes() internal onlyInitializing {
-        StorageV1 storage $ = _getStorage();
-        $._isValidType[REGISTRY()] = true; // only for global registry 
-        $._isValidType[TOKEN()] = true;
-        $._isValidType[SERVICE()] = true;
-        $._isValidType[INSTANCE()] = true;
-        $._isValidType[STAKE()] = true;
-        $._isValidType[PRODUCT()] = true;
-        $._isValidType[ORACLE()] = true;
-        $._isValidType[POOL()] = true;
-        $._isValidType[DISTRIBUTION()] = true;
-        $._isValidType[POLICY()] = true;
-        $._isValidType[BUNDLE()] = true;
+    // from IOwnable
+    function getOwner() public view returns (address owner) {
+        return ownerOf(address(this));
     }
 
-    /// @dev defines which types - parent type relations are allowed to register
-    function _setupValidParentTypes() internal onlyInitializing {
-        StorageV1 storage $ = _getStorage();
-        // registry as parent
-        $._isValidParentType[TOKEN()][REGISTRY()] = true;
-        $._isValidParentType[SERVICE()][REGISTRY()] = true;
-        $._isValidParentType[INSTANCE()][REGISTRY()] = true;
-
-        // instance as parent
-        $._isValidParentType[PRODUCT()][INSTANCE()] = true;
-        $._isValidParentType[DISTRIBUTION()][INSTANCE()] = true;
-        $._isValidParentType[ORACLE()][INSTANCE()] = true;
-        $._isValidParentType[POOL()][INSTANCE()] = true;
-
-        // product as parent
-        $._isValidParentType[POLICY()][PRODUCT()] = true;
-
-        // pool as parent
-        $._isValidParentType[BUNDLE()][POOL()] = true;
-        $._isValidParentType[STAKE()][POOL()] = true;
-    }
+    // Internals, called only in constructor
 
     /// @dev protocol registration used to anchor the dip ecosystem relations
     function _registerProtocol() 
-        virtual 
         internal
-        onlyInitializing 
     {
-        StorageV1 storage $ = _getStorage();
+        uint256 protocolId = _chainNftInternal.PROTOCOL_NFT_ID();
+        NftId protocolNftId = toNftId(protocolId);
 
-        uint256 protocolId = $._chainNftInternal.PROTOCOL_NFT_ID();
-        $._chainNftInternal.mint($._protocolOwner, protocolId);
+        _chainNftInternal.mint(NFT_LOCK_ADDRESS, protocolId);
 
-        NftId protocolNftid = toNftId(protocolId);
-        ObjectInfo memory protocolInfo = ObjectInfo(
-            protocolNftid,
-            zeroNftId(), // parent nft id
+        _info[protocolNftId] = ObjectInfo(
+            protocolNftId,
+            zeroNftId(), // parent
             PROTOCOL(),
-            address(0), // contract address
-            $._protocolOwner,
-            "" // data
+            false, // isInterceptor
+            address(0), // objectAddress
+            NFT_LOCK_ADDRESS,// initialOwner
+            ""
         );
-
-        $._info[protocolNftid] = protocolInfo;
     }
 
     /// @dev registry registration
     /// might also register the global registry when not on mainnet
-    function _registerRegistry() 
-        virtual 
+    function _registerRegistry(address registryOwner) 
         internal
-        onlyInitializing 
-        returns (NftId registryNftId) 
     {
-        StorageV1 storage $ = _getStorage();
+        uint256 registryId = _chainNftInternal.calculateTokenId(2);
+        NftId registryNftId = toNftId(registryId);
 
-        uint256 registryId = $._chainNftInternal.calculateTokenId(2);
-        registryNftId = toNftId(registryId);
+        NftId parentNftId;
 
-        // we're not the global registry
-        if(registryId != $._chainNftInternal.GLOBAL_REGISTRY_ID()) {
+        if(registryId != _chainNftInternal.GLOBAL_REGISTRY_ID()) 
+        {// we're not the global registry
             _registerGlobalRegistry();
+            parentNftId = toNftId(_chainNftInternal.GLOBAL_REGISTRY_ID());
+        }
+        else 
+        {// we are global registry
+            parentNftId = toNftId(_chainNftInternal.PROTOCOL_NFT_ID());
         }
 
-        $._chainNftInternal.mint($._protocolOwner, registryId);
+        _chainNftInternal.mint(registryOwner, registryId);
 
-        NftId parentNftId;
-        // we're the global registry
-        if(block.chainid == 1) {
-            parentNftId = toNftId($._chainNftInternal.PROTOCOL_NFT_ID());
-        }
-        else {
-            parentNftId = toNftId($._chainNftInternal.GLOBAL_REGISTRY_ID());
-        }
-        ObjectInfo memory registryInfo = ObjectInfo(
+        _info[registryNftId] = ObjectInfo(
             registryNftId,
             parentNftId,
             REGISTRY(),
-            address(this),  // proxy address
-            $._protocolOwner, // registry owner is different from proxy owner 
-            ""
+            false, // isInterceptor
+            address(this), 
+            registryOwner,
+            "" 
         );
-
-        $._info[registryNftId] = registryInfo;
-        $._nftIdByAddress[address(this)] = registryNftId;
-
-        // add logging
+        _nftIdByAddress[address(this)] = registryNftId;
+        _registryNftId = registryNftId;
     }
 
 
     /// @dev global registry registration for non mainnet registries
     function _registerGlobalRegistry() 
-        virtual 
         internal
-        onlyInitializing
     {
-        StorageV1 storage $ = _getStorage();
+        uint256 globalRegistryId = _chainNftInternal.GLOBAL_REGISTRY_ID();
 
-        uint256 globalRegistryId = $._chainNftInternal.GLOBAL_REGISTRY_ID();
-        $._chainNftInternal.mint($._protocolOwner, globalRegistryId);
+        _chainNftInternal.mint(NFT_LOCK_ADDRESS, globalRegistryId);
 
         NftId globalRegistryNftId = toNftId(globalRegistryId);
-        ObjectInfo memory globalRegistryInfo = ObjectInfo(
+
+        _info[globalRegistryNftId] = ObjectInfo(
             globalRegistryNftId,
-            toNftId($._chainNftInternal.PROTOCOL_NFT_ID()),
+            toNftId(_chainNftInternal.PROTOCOL_NFT_ID()), // parent
             REGISTRY(),
-            address(0), // contract address
-            $._protocolOwner,
+            false, // isInterceptor
+            address(0), // objectAddress
+            NFT_LOCK_ADDRESS, // initialOwner
             "" // data
         );
+    }
+
+    function _registerRegistryService()
+        internal
+    {
+        uint256 serviceId = _chainNftInternal.calculateTokenId(3);
+        NftId serviceNftId = toNftId(serviceId);        
+
+        _chainNftInternal.mint(NFT_LOCK_ADDRESS, serviceId);
+
+        _info[serviceNftId] = ObjectInfo(
+            serviceNftId,
+            _registryNftId,
+            SERVICE(),
+            false, // isInterceptor
+            msg.sender, // service deploys registry
+            NFT_LOCK_ADDRESS, // initialOwner,
+            "" 
+        );
 
-        $._info[globalRegistryNftId] = globalRegistryInfo;
+        _nftIdByAddress[msg.sender] = serviceNftId;
+
+        string memory serviceName = "RegistryService";
+        bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
+        _service[serviceNameHash][VersionLib.toVersionPart(MAJOR_VERSION_MIN)] = msg.sender;
+        _string[serviceNftId] = serviceName;
+        _serviceNftId = serviceNftId;
     }
 
-    function _registerObjectInfo(
-        IRegisterable registerable,
-        NftId nftId
-    ) 
+    /// @dev obtain interceptor address for this nft if applicable, address(0) otherwise
+    function _getInterceptor(
+        bool isInterceptor, 
+        address objectAddress,
+        bool parentIsInterceptor,
+        address parentObjectAddress
+    )
         internal 
-        virtual
+        view 
+        returns (address interceptor) 
     {
-        address objectAddress = address(registerable);
-        ObjectInfo memory info = ObjectInfo(
-            nftId,
-            registerable.getParentNftId(), 
-            registerable.getType(),
-            objectAddress,
-            registerable.getOwner(),
-            registerable.getData()
-        );
+        if (objectAddress == address(0)) {
+            if (parentIsInterceptor) {
+                return parentObjectAddress;
+            } else {
+                return address(0);
+            }
+        }
+
+        if (isInterceptor) {
+            return objectAddress;
+        }
+
+        return address(0);
+    }
+
+    /// @dev defines which object - parent types relations are allowed to register
+    // IMPORTANT: 
+    // 1) EACH object type MUST have only one parent type across ALL mappings
+    // 2) DO NOT use object type (e.g. POLCY, BUNDLE, STAKE) as parent type
+    // 3) DO NOT use REGISTRY as object type
+    // 2) DO NOT use PROTOCOL and "zeroObjectType"
+    function _setupValidObjectParentCombinations() 
+        internal 
+    {
+        // registry as parent, ONLY registry owner
+        _isValidContractCombination[TOKEN()][REGISTRY()] = true;
+        _isValidContractCombination[SERVICE()][REGISTRY()] = true;
+
+        // registry as parent, ONLY approved
+        _isValidContractCombination[INSTANCE()][REGISTRY()] = true;
+
+        // instance as parent, ONLY approved
+        _isValidContractCombination[PRODUCT()][INSTANCE()] = true;
+        _isValidContractCombination[DISTRIBUTION()][INSTANCE()] = true;
+        _isValidContractCombination[ORACLE()][INSTANCE()] = true;
+        _isValidContractCombination[POOL()][INSTANCE()] = true;
 
-        StorageV1 storage $ = _getStorage();
-        $._info[nftId] = info;
-        $._nftIdByAddress[objectAddress] = nftId;
+        // product as parent, ONLY approved
+        _isValidObjectCombination[POLICY()][PRODUCT()] = true;
 
-        // add logging
+        // pool as parent, ONLY approved
+        _isValidObjectCombination[BUNDLE()][POOL()] = true;
+        _isValidObjectCombination[STAKE()][POOL()] = true;
     }
+}
 
-}
+// use to deploy with hardhat
+contract RegistryCreationCode {
+    bytes constant public registryCreationCode = type(Registry).creationCode;
+}