@etherisc/gif-next 0.0.2-790d44b-698 → 0.0.2-79292f9-089

package/contracts/registry/Registry.sol

@@ -1,458 +1,705 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IRegisterable} from "../shared/IRegisterable.sol";
-import {IService} from "../instance/base/IService.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
+import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+
+import {NftId, NftIdLib} from "../type/NftId.sol";
+import {VersionPart, VersionPartLib} from "../type/Version.sol";
+import {ObjectType, ObjectTypeLib, PROTOCOL, REGISTRY, SERVICE, INSTANCE, STAKE, STAKING, PRODUCT, DISTRIBUTION, DISTRIBUTOR, ORACLE, POOL, POLICY, BUNDLE} from "../type/ObjectType.sol";
 
-import {IChainNft} from "./IChainNft.sol";
 import {ChainNft} from "./ChainNft.sol";
 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 {Versionable} from "../shared/Versionable.sol";
-
-
+import {IRegisterable} from "../shared/IRegisterable.sol";
+import {ReleaseRegistry} from "./ReleaseRegistry.sol";
+import {TokenRegistry} from "./TokenRegistry.sol";
+import {RegistryAdmin} from "./RegistryAdmin.sol";
+
+/// @dev IMPORTANT
+// Each NFT minted by registry is accosiated with:
+// 1) NFT owner
+// 2) registred contract OR object stored in registered (parent) contract
+// Five registration flows:
+// 1) registerService() -> registers IService address by ReleaseRegistry (ReleaseRegistry is set at deployment time)
+// 2) register() -> registers IRegisterable address by IService (INSTANCE, PRODUCT, POOL, DISTRIBUTION, ORACLE)
+// 3)            -> registers object by IService (POLICY, BUNDLE, STAKE)
+// 4) registerWithCustomType() -> registers IRegisterable address with custom type by IService
+// 5) registerRegistry() -> registers IRegistry address (from different chain) by GifAdmin. Works ONLY on mainnet. 
+//                          Note: getters by address MUST not be used with this address (will return 0 or data related to different object or even revert)
+
+/// @dev Chain Registry contract implementing IRegistry.
+/// IRegistry for method details.
 contract Registry is
-    Versionable,
-    IRegisterable,
+    Initializable,
+    AccessManaged,
     IRegistry
 {
-    using NftIdLib for NftId;
+    /// @dev Protocol NFT ID
+    NftId public immutable PROTOCOL_NFT_ID;
+
+    /// @dev Gobal registry NFT ID
+    NftId public immutable GLOBAL_REGISTRY_NFT_ID;
+
+    /// @dev Gobal registry address on mainnet.
+    address public immutable GLOBAL_REGISTRY_ADDRESS;
+
+    /// @dev Registry NFT ID
+    NftId public immutable REGISTRY_NFT_ID;
 
+    /// @dev Deployer address that authorizes the initializer of this contract.
+    address public immutable DEPLOYER;
+
+    /// @dev Registry admin contract for this registry.
+    RegistryAdmin public immutable ADMIN;
+
+    /// @dev Chain NFT contract that keeps track of the ownership of all registered objects.
+    ChainNft public immutable CHAIN_NFT;
+
+    address public constant NFT_LOCK_ADDRESS = address(0x1);
+    uint256 public constant REGISTRY_TOKEN_SEQUENCE_ID = 2;
+    uint256 public constant STAKING_TOKEN_SEQUENCE_ID = 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 {
-
-        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(NftId nftId => string stringValue) _string;
-        mapping(bytes32 serviceNameHash => mapping(VersionPart majorVersion => address service)) _service;
-
-        NftId _nftId;
-        IChainNft _chainNft;
-        ChainNft _chainNftInternal;
-        address _initialOwner;
-
-        /// @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
-    }
-
-    // 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
+    /// @dev keep track of different registries on different chains
+    mapping(uint256 chanId => NftId registryNftId) private _registryNftIdByChainId;
+    uint256[] private _chainId;
+
+    /// @dev keep track of object info and address reverse lookup
+    mapping(NftId nftId => ObjectInfo info) private _info;
+    mapping(address object => NftId nftId) private _nftIdByAddress;
+
+    /// @dev keep track of service addresses by version and domain
+    mapping(VersionPart version => mapping(ObjectType serviceDomain => address)) private _service;
+
+    mapping(ObjectType objectType => bool) private _coreTypes;
+
+    mapping(ObjectType objectType => mapping(
+            ObjectType parentType => bool)) private _coreContractCombinations;
+
+    mapping(ObjectType objectType => mapping(
+            ObjectType parentType => bool)) private _coreObjectCombinations;
+
+    NftId private _stakingNftId;
+
+    ReleaseRegistry private _releaseRegistry;
+    address private _tokenRegistryAddress;
+    address private _stakingAddress;
+
+    modifier onlyDeployer() {
+        if (msg.sender != DEPLOYER) {
+            revert ErrorRegistryCallerNotDeployer();
         }
+        _;
     }
 
-    /// @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
+    // TODO when create2 strategy is added to ignition:
+    // 1. move globalRegistry arg out from constructor into initialize()
+    // 2. add testRegistry_deployChainRegistryAtGlobalRegistryAddress
+    /// @dev Creates the registry contract and populates it with the protocol and registry objects.
+    /// Internally deploys the ChainNft contract.
+    constructor(RegistryAdmin admin, address globalRegistry)
+        AccessManaged(admin.authority())
     {
-        address protocolOwner = abi.decode(data, (address));
-        StorageV1 storage $ = _getStorage();
+        DEPLOYER = msg.sender;
+        ADMIN = admin;
+        GLOBAL_REGISTRY_ADDRESS = _getGlobalRegistryAddress(globalRegistry);
 
-         // 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);
-        
+        CHAIN_NFT = new ChainNft(address(this));
+        GLOBAL_REGISTRY_NFT_ID = NftIdLib.toNftId(
+            CHAIN_NFT.GLOBAL_REGISTRY_ID());
+
         // initial registry setup
-        _registerProtocol();
-        $._nftId = _registerRegistry();
+        PROTOCOL_NFT_ID = _registerProtocol();
+        REGISTRY_NFT_ID = _registerRegistry();
 
-        // setup rules for further registrations
-        _setupValidTypes();
-        _setupValidParentTypes();
+        // set object types and object parent relations
+        _setupValidCoreTypesAndCombinations();
     }
 
-    function register(
-        address objectAddress
+
+    /// @dev Wires release registry, token registry and staking contract to this registry.
+    /// MUST be called by release registry.
+    function initialize(
+        address releaseRegistry,
+        address tokenRegistry,
+        address staking
     )
-    // 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
-
-        // nft minting
-        uint256 mintedTokenId = $._chainNft.mint(
-            registerable.getOwner(),
-            EMPTY_URI
-        );
-
-        nftId = toNftId(mintedTokenId);
-
-        // 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;
-        }
+        external
+        initializer()
+        onlyDeployer()
+    {
+        // store links to supporting contracts
+        _releaseRegistry = ReleaseRegistry(releaseRegistry);
+        _tokenRegistryAddress = tokenRegistry;
+        _stakingAddress = staking;
 
-        // create object info and link nft id with it
-        _registerObjectInfo(registerable, nftId);
+        // register staking contract
+        _stakingNftId = _registerStaking();
     }
 
+    /// @inheritdoc IRegistry
+    function registerRegistry(
+        NftId nftId,
+        uint256 chainId, 
+        address registryAddress
+    )
+        external
+        restricted()
+    {
+        // registration of chain registries only allowed on mainnet
+        if (block.chainid != 1) {
+            revert ErrorRegistryNotOnMainnet(block.chainid);
+        }
 
-    function registerObjectForInstance(
-        NftId parentNftId,
-        ObjectType objectType,
-        address initialOwner,
-        bytes memory data
+        // registry chain id is not zero
+        if(chainId == 0) {
+            revert ErrorRegistryChainRegistryChainidZero(nftId);
+        }
+
+        // registry address is not zero
+        if (registryAddress == address(0)) {
+            revert ErrorRegistryChainRegistryAddressZero(nftId, chainId);
+        }
+
+        // registry nft id matches registry chain id
+        uint256 expectedRegistryId = CHAIN_NFT.calculateTokenId(REGISTRY_TOKEN_SEQUENCE_ID, chainId);
+        if (nftId != NftIdLib.toNftId(expectedRegistryId)) {
+            revert ErrorRegistryChainRegistryNftIdInvalid(nftId, chainId);
+        }
+
+        // registry is not already registered
+        if (isRegistered(nftId)) {
+            revert ErrorRegistryChainRegistryAlreadyRegistered(nftId, chainId);
+        }
+
+        emit LogChainRegistryRegistration(nftId, chainId, registryAddress);
+
+        _registerRegistryForNft(
+            chainId,
+            ObjectInfo({
+                nftId: nftId,
+                parentNftId: REGISTRY_NFT_ID,
+                objectType: REGISTRY(),
+                isInterceptor: false,
+                objectAddress: registryAddress,
+                initialOwner: NFT_LOCK_ADDRESS,
+                data: ""  
+            }),
+            false); // do not update address lookup for objects on a different chain
+    }
+
+    // TODO limit service owner to registry admin?
+    /// @inheritdoc IRegistry
+    function registerService(
+        ObjectInfo memory info, 
+        VersionPart version, 
+        ObjectType domain
     )
         external
-        override
-        returns (
-            // TODO add onlyRegisteredInstance
-            NftId nftId
-        )
+        restricted()
+        returns(NftId nftId)
     {
-        StorageV1 storage $ = _getStorage();
+        // service address is defined
+        address service = info.objectAddress;
+        if(service == address(0)) {
+            revert ErrorRegistryServiceAddressZero();
+        }
+
+        // version is defined
+        if(version.eqz()) {
+            revert ErrorRegistryServiceVersionZero(service);
+        }
+        // service domain is defined
+        if(domain.eqz()) {
+            revert ErrorRegistryServiceDomainZero(service, version);
+        }
 
-        // TODO add more validation
-        require(
-            objectType == POLICY() || objectType == BUNDLE(),
-            "ERROR:REG-010:TYPE_INVALID"
-        );
+        // service has proper type
+        if(info.objectType != SERVICE()) {
+            revert ErrorRegistryNotService(service, info.objectType);
+        }
+
+        // service parent has registry type
+        if(info.parentNftId != REGISTRY_NFT_ID) {
+            revert ErrorRegistryServiceParentNotRegistry(service, version, info.parentNftId);
+        }
 
-        uint256 mintedTokenId = $._chainNft.mint(initialOwner, EMPTY_URI);
-        nftId = toNftId(mintedTokenId);
+        // service has not already been registered
+        if(_service[version][domain] != address(0)) {
+            revert ErrorRegistryServiceDomainAlreadyRegistered(service, version, domain);
+        }
 
-        ObjectInfo memory info = ObjectInfo(
-            nftId,
-            parentNftId,
-            objectType,
-            address(0),
-            initialOwner,
-            data
-        );
+        _service[version][domain] = service;
 
-        $._info[nftId] = info;
+        emit LogServiceRegistration(version, domain);
 
-        // add logging
+        nftId = _register(info);
     }
 
-    function getObjectCount() external view override returns (uint256) {
-        return _getStorage()._chainNft.totalSupply();
+
+    /// @inheritdoc IRegistry
+    function register(ObjectInfo memory info)
+        external
+        restricted()
+        returns(NftId nftId)
+    {
+        address objectAddress = info.objectAddress;
+        ObjectType objectType = info.objectType;
+        ObjectType parentType = _info[info.parentNftId].objectType;
+
+        // check type combinations for core objects
+        if(objectAddress == address(0)) {
+            if(_coreObjectCombinations[objectType][parentType] == false) {
+                revert ErrorRegistryTypesCombinationInvalid(objectAddress, objectType, parentType);
+            }
+        }
+        // check type combinations for contract objects
+        else {
+            if(_coreContractCombinations[objectType][parentType] == false) {
+                revert ErrorRegistryTypesCombinationInvalid(objectAddress, objectType, parentType);
+            }
+        }
+
+        nftId = _register(info);
     }
 
-    function getNftId(
-        address object
-    ) external view override returns (NftId id) {
-        return _getStorage()._nftIdByAddress[object];
+
+    /// @inheritdoc IRegistry
+    function registerWithCustomType(ObjectInfo memory info)
+        external
+        restricted()
+        returns(NftId nftId)
+    {
+        ObjectType objectType = info.objectType;
+        ObjectType parentType = _info[info.parentNftId].objectType;
+
+        if(_coreTypes[objectType]) {
+            revert ErrorRegistryCoreTypeRegistration();
+        }
+
+        if(
+            objectType == ObjectTypeLib.zero() ||
+            parentType == ObjectTypeLib.zero() ||
+            parentType == PROTOCOL() ||
+            parentType == SERVICE()
+        ) {
+            revert ErrorRegistryTypesCombinationInvalid(info.objectAddress, objectType, parentType);
+        }
+
+        nftId = _register(info);
     }
 
-    function isRegistered(
-        NftId nftId
-    ) public view override returns (bool) {
-        return _getStorage()._info[nftId].objectType.gtz();
+
+    /// @dev earliest GIF major version 
+    function getInitialVersion() external view returns (VersionPart) {
+        return VersionPartLib.toVersionPart(_releaseRegistry.INITIAL_GIF_VERSION());
     }
 
-    function isRegistered(
-        address object
-    ) external view override returns (bool) {
-        return _getStorage()._nftIdByAddress[object].gtz();
+    /// @dev next GIF release version to be released
+    function getNextVersion() external view returns (VersionPart) {
+        return _releaseRegistry.getNextVersion();
     }
 
-    function getObjectInfo(
-        NftId nftId
-    ) external view override returns (ObjectInfo memory info) {
-        return _getStorage()._info[nftId];
+    /// @dev latest active GIF release version 
+    function getLatestVersion() external view returns (VersionPart) { 
+        return _releaseRegistry.getLatestVersion();
     }
 
-    function getName(
-        NftId nftId
-    ) external view returns (string memory name) {
-        return _getStorage()._string[nftId];
+    function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory) {
+        return _releaseRegistry.getReleaseInfo(version);
     }
 
-    function getOwner(NftId nftId) external view override returns (address) {
-        return _getStorage()._chainNft.ownerOf(nftId.toInt());
+    function chainIds() public view returns (uint256) {
+        return _chainId.length;
     }
 
-    function getChainNft() external view override returns (IChainNft) {
-        return _getStorage()._chainNft;
+    function getChainId(uint256 idx) public view returns (uint256) {
+        return _chainId[idx];
     }
 
-    // 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 getRegistryNftId(uint256 chainId) public view returns (NftId nftId) {
+        return _registryNftIdByChainId[chainId];
     }
 
-    // from IERC165
-    function supportsInterface(bytes4 interfaceId) external pure override returns (bool) {
-        return interfaceId == type(IRegistry).interfaceId;
+    function getObjectCount() external view returns (uint256) {
+        return CHAIN_NFT.totalSupply();
     }
 
-    // from IRegistryLinked
-    function getRegistry() external view override returns (IRegistry registry) {
-        return this;
+    function getNftId() external view returns (NftId nftId) {
+        return REGISTRY_NFT_ID;
     }
 
-    // from IVersionable
-    function getVersion() public pure virtual override returns (Version) {
-        return VersionLib.toVersion(1, 0, 0);
-    } 
+    function getProtocolNftId() external view returns (NftId nftId) {
+        return PROTOCOL_NFT_ID;
+    }
 
-    // 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 getNftId(address object) external view returns (NftId id) {
+        return _nftIdByAddress[object];
     }
 
-    function getType() external pure override returns (ObjectType objectType) {
-        return REGISTRY();
+    function ownerOf(NftId nftId) public view returns (address) {
+        return CHAIN_NFT.ownerOf(nftId.toInt());
     }
 
-    function getOwner() public view override returns (address owner) {
-        StorageV1 storage $ = _getStorage();
-        return $._nftId.gtz() ? this.getOwner($._nftId) : $._initialOwner;
+    function ownerOf(address contractAddress) public view returns (address) {
+        return CHAIN_NFT.ownerOf(_nftIdByAddress[contractAddress].toInt());
     }
 
-    function getNftId() public view override (IRegisterable, IRegistry) returns (NftId nftId) {
-        return _getStorage()._nftId;
+    function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory) {
+        return _info[nftId];
     }
 
-    function getParentNftId() public view returns (NftId nftId) {
-        StorageV1 storage $ = _getStorage();
-        nftId = $._info[$._nftId].parentNftId;
+    function getObjectInfo(address object) external view returns (ObjectInfo memory) {
+        return _info[_nftIdByAddress[object]];
     }
 
-    function getData() public pure returns (bytes memory data) {
-        return "";
+    function isRegistered(NftId nftId) public view returns (bool) {
+        return _info[nftId].objectType.gtz();
     }
 
-    // registry specific functions
-    function getProtocolOwner() external view override returns (address) {
-        return _getStorage()._protocolOwner;
+    function isRegistered(address object) external view returns (bool) {
+        return _nftIdByAddress[object].gtz();
     }
 
-    /// @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;
+    function isRegisteredService(address object) external view returns (bool) {
+        return _info[_nftIdByAddress[object]].objectType == SERVICE();
     }
 
-    /// @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;
+    function isRegisteredComponent(address object) external view returns (bool) {
+        NftId objectParentNftId = _info[_nftIdByAddress[object]].parentNftId;
+        return _info[objectParentNftId].objectType == INSTANCE();
+    }
 
-        // instance as parent
-        $._isValidParentType[PRODUCT()][INSTANCE()] = true;
-        $._isValidParentType[DISTRIBUTION()][INSTANCE()] = true;
-        $._isValidParentType[ORACLE()][INSTANCE()] = true;
-        $._isValidParentType[POOL()][INSTANCE()] = true;
+    function isActiveRelease(VersionPart version) external view returns (bool)
+    {
+        return _releaseRegistry.isActiveRelease(version);
+    }
 
-        // product as parent
-        $._isValidParentType[POLICY()][PRODUCT()] = true;
+    function getStakingAddress() external view returns (address staking) {
+        //return getObjectInfo(_stakingNftId).objectAddress;
+        //return _info[_stakingNftId].objectAddress;
+        return _stakingAddress;
+    }
 
-        // pool as parent
-        $._isValidParentType[BUNDLE()][POOL()] = true;
-        $._isValidParentType[STAKE()][POOL()] = true;
+    function getTokenRegistryAddress() external view returns (address tokenRegistry) {
+        return _tokenRegistryAddress;
     }
 
-    /// @dev protocol registration used to anchor the dip ecosystem relations
-    function _registerProtocol() 
-        virtual 
-        internal
-        onlyInitializing 
+    function getServiceAddress(
+        ObjectType serviceDomain, 
+        VersionPart releaseVersion
+    ) external view returns (address service)
     {
-        StorageV1 storage $ = _getStorage();
+        service =  _service[releaseVersion][serviceDomain]; 
+    }
 
-        uint256 protocolId = $._chainNftInternal.PROTOCOL_NFT_ID();
-        $._chainNftInternal.mint($._protocolOwner, protocolId);
+    function getReleaseRegistryAddress() external view returns (address) {
+        return address(_releaseRegistry);
+    }
 
-        NftId protocolNftid = toNftId(protocolId);
-        ObjectInfo memory protocolInfo = ObjectInfo(
-            protocolNftid,
-            zeroNftId(), // parent nft id
-            PROTOCOL(),
-            address(0), // contract address
-            $._protocolOwner,
-            "" // data
-        );
+    function getChainNftAddress() external view override returns (address) {
+        return address(CHAIN_NFT);
+    }
 
-        $._info[protocolNftid] = protocolInfo;
+    function getRegistryAdminAddress() external view returns (address) {
+        return address(ADMIN);
     }
 
-    /// @dev registry registration
-    /// might also register the global registry when not on mainnet
-    function _registerRegistry() 
-        virtual 
+    function getAuthority() external view returns (address) {
+        return ADMIN.authority();
+    }
+
+    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
+    function _register(ObjectInfo memory info)
         internal
-        onlyInitializing 
-        returns (NftId registryNftId) 
+        returns(NftId nftId)
     {
-        StorageV1 storage $ = _getStorage();
+        ObjectType objectType = info.objectType; // do not care here, never PROTOCOL(), REGISTRY()
+        bool isInterceptor = info.isInterceptor;
+        address objectAddress = info.objectAddress; // do not care here, can be 0
+        address owner = info.initialOwner; // do not care here, can be 0, can be equal info.objectAddress
+
+        NftId parentNftId = info.parentNftId; // do not care here, can not be 0
+        ObjectInfo memory parentInfo = _info[parentNftId];
+        address parentAddress = parentInfo.objectAddress; // can be 0
+
+        // parent is contract -> need to check? -> check before minting
+        // special case: staking: to protocol possible as well
+        // NO LONGER TRUE: special case: global registry nft as parent when not on mainnet -> global registry address is 0
+        // special case: when parentNftId == CHAIN_NFT.mint(), check for zero parent address before mint
+        // special case: when parentNftId == CHAIN_NFT.mint() && objectAddress == initialOwner
+        // Parent can have 0 address in case of STAKE for PROTOCOL / CUSTOM_TYPE for POLICY
+        // But it MUST be registered -> parentType != 0 && parentNftId != 0
+        /*if(objectType != STAKE()) {
+            if(parentAddress == address(0)) {
+                revert ErrorRegistryParentAddressZero();
+            }
+        }*/
+    
+        // global registry is never parent when not on mainnet
+        if(block.chainid != 1) {
+            if(parentNftId == GLOBAL_REGISTRY_NFT_ID) {
+                revert ErrorRegistryGlobalRegistryAsParent(objectAddress, objectType);
+            }
+        }
+
+        address interceptorAddress = _getInterceptor(
+            isInterceptor, 
+            objectType, 
+            objectAddress, 
+            parentInfo.isInterceptor, 
+            parentAddress);
+
+        uint256 tokenId = CHAIN_NFT.getNextTokenId();
+        nftId = NftIdLib.toNftId(tokenId);
+        info.nftId = nftId;
 
-        uint256 registryId = $._chainNftInternal.calculateTokenId(2);
-        registryNftId = toNftId(registryId);
+        _info[nftId] = info;
+        _setAddressForNftId(nftId, objectAddress);
 
-        // we're not the global registry
-        if(registryId != $._chainNftInternal.GLOBAL_REGISTRY_ID()) {
-            _registerGlobalRegistry();
+        emit LogRegistration(nftId, parentNftId, objectType, isInterceptor, objectAddress, owner);
+
+        // calls nft receiver(1) and interceptor(2)
+        uint256 mintedTokenId = CHAIN_NFT.mint(
+            owner,
+            interceptorAddress,
+            EMPTY_URI);
+
+        assert(mintedTokenId == tokenId);        
+    }
+
+    /// @dev obtain interceptor address for this nft if applicable, address(0) otherwise
+    /// special case: STAKES (parent may be any type) -> no intercept call
+    /// default case: 
+    function _getInterceptor(
+        bool isInterceptor, 
+        ObjectType objectType,
+        address objectAddress,
+        bool parentIsInterceptor,
+        address parentObjectAddress
+    )
+        internal 
+        pure 
+        returns (address interceptor) 
+    {
+        // no intercepting calls for stakes
+        if (objectType == STAKE()) {
+            return address(0);
         }
 
-        $._chainNftInternal.mint($._protocolOwner, registryId);
+        if (objectAddress == address(0)) {
+            if (parentIsInterceptor) {
+                return parentObjectAddress;
+            } else {
+                return address(0);
+            }
+        }
 
-        NftId parentNftId;
-        // we're the global registry
-        if(block.chainid == 1) {
-            parentNftId = toNftId($._chainNftInternal.PROTOCOL_NFT_ID());
+        if (isInterceptor) {
+            return objectAddress;
         }
-        else {
-            parentNftId = toNftId($._chainNftInternal.GLOBAL_REGISTRY_ID());
+
+        return address(0);
+    }
+
+    // Internals called only in constructor
+
+    /// @dev protocol registration used to anchor the dip ecosystem relations
+    function _registerProtocol() 
+        private
+        returns (NftId protocolNftId)
+    {
+        uint256 protocolId = CHAIN_NFT.PROTOCOL_NFT_ID();
+        protocolNftId = NftIdLib.toNftId(protocolId);
+
+        _registerForNft(
+            ObjectInfo({
+                nftId: protocolNftId,
+                parentNftId: NftIdLib.zero(),
+                objectType: PROTOCOL(),
+                isInterceptor: false, 
+                objectAddress: address(0),
+                initialOwner: NFT_LOCK_ADDRESS,
+                data: ""}),
+            true);
+    }
+
+    /// @dev register this registry
+    function _registerRegistry() 
+        internal 
+        virtual
+        returns (NftId registryNftId)
+    {
+        // initial assignment
+        registryNftId = GLOBAL_REGISTRY_NFT_ID;
+
+        // register global registry
+        _registerRegistryForNft(
+            1, // mainnet chain id
+            ObjectInfo({
+                nftId: GLOBAL_REGISTRY_NFT_ID,
+                parentNftId: PROTOCOL_NFT_ID,
+                objectType: REGISTRY(),
+                isInterceptor: false,
+                objectAddress: GLOBAL_REGISTRY_ADDRESS, 
+                initialOwner: NFT_LOCK_ADDRESS,
+                data: ""}),
+            block.chainid == 1);// update address lookup for global registry only on mainnet
+
+        // if not on mainnet: register this registry with global registry as parent
+        if (block.chainid != 1) {
+
+            // modify registry nft id to local registry when not on mainnet
+            registryNftId = NftIdLib.toNftId(
+                CHAIN_NFT.calculateTokenId(REGISTRY_TOKEN_SEQUENCE_ID));
+
+            _registerRegistryForNft(
+                block.chainid, 
+                ObjectInfo({
+                    nftId: registryNftId,
+                    parentNftId: GLOBAL_REGISTRY_NFT_ID,
+                    objectType: REGISTRY(),
+                    isInterceptor: false,
+                    objectAddress: address(this),
+                    initialOwner: NFT_LOCK_ADDRESS,
+                    data: ""}),
+                true);
         }
-        ObjectInfo memory registryInfo = ObjectInfo(
-            registryNftId,
-            parentNftId,
-            REGISTRY(),
-            address(this),  // proxy address
-            $._protocolOwner, // registry owner is different from proxy owner 
-            ""
-        );
+    }
 
-        $._info[registryNftId] = registryInfo;
-        $._nftIdByAddress[address(this)] = registryNftId;
+    /// @dev staking registration
+    function _registerRegistryForNft(
+        uint256 chainId,
+        ObjectInfo memory info,
+        bool updateAddressLookup
+    )
+        private
+    {
+        assert(_registryNftIdByChainId[chainId].eqz());
 
-        // add logging
+        // update registry lookup variables
+        _registryNftIdByChainId[chainId] = info.nftId;
+        _chainId.push(chainId);
+
+        // register the registry info
+        _registerForNft(
+            info,
+            updateAddressLookup); 
     }
 
+    /// @dev staking registration
+    function _registerStaking()
+        private
+        returns (NftId stakingNftId)
+    {
+        address stakingOwner = IRegisterable(_stakingAddress).getOwner();
+        uint256 stakingId = CHAIN_NFT.calculateTokenId(STAKING_TOKEN_SEQUENCE_ID);
+        stakingNftId = NftIdLib.toNftId(stakingId);
+
+        _registerForNft( 
+            ObjectInfo({
+                nftId: stakingNftId,
+                parentNftId: REGISTRY_NFT_ID,
+                objectType: STAKING(),
+                isInterceptor: false,
+                objectAddress: _stakingAddress, 
+                initialOwner: stakingOwner,
+                data: ""}),
+            true); 
+    }
 
-    /// @dev global registry registration for non mainnet registries
-    function _registerGlobalRegistry() 
-        virtual 
+    /// @dev Register the provided object info for the specified NFT ID.
+    function _registerForNft(
+        ObjectInfo memory info, 
+        bool updateAddressLookup
+    )
         internal
-        onlyInitializing
     {
-        StorageV1 storage $ = _getStorage();
+        _info[info.nftId] = info;
 
-        uint256 globalRegistryId = $._chainNftInternal.GLOBAL_REGISTRY_ID();
-        $._chainNftInternal.mint($._protocolOwner, globalRegistryId);
-
-        NftId globalRegistryNftId = toNftId(globalRegistryId);
-        ObjectInfo memory globalRegistryInfo = ObjectInfo(
-            globalRegistryNftId,
-            toNftId($._chainNftInternal.PROTOCOL_NFT_ID()),
-            REGISTRY(),
-            address(0), // contract address
-            $._protocolOwner,
-            "" // data
-        );
+        if (updateAddressLookup) {
+            _setAddressForNftId(info.nftId, info.objectAddress);
+        }
 
-        $._info[globalRegistryNftId] = globalRegistryInfo;
+        // calls nft receiver
+        CHAIN_NFT.mint(info.initialOwner, info.nftId.toInt());
     }
 
-    function _registerObjectInfo(
-        IRegisterable registerable,
-        NftId nftId
-    ) 
-        internal 
-        virtual
+    function _setAddressForNftId(NftId nftId, address objectAddress)
+        internal
     {
-        address objectAddress = address(registerable);
-        ObjectInfo memory info = ObjectInfo(
-            nftId,
-            registerable.getParentNftId(), 
-            registerable.getType(),
-            objectAddress,
-            registerable.getOwner(),
-            registerable.getData()
-        );
+        if (objectAddress != address(0)) {
+            if (_nftIdByAddress[objectAddress].gtz()) { 
+                revert ErrorRegistryContractAlreadyRegistered(objectAddress);
+            }
 
-        StorageV1 storage $ = _getStorage();
-        $._info[nftId] = info;
-        $._nftIdByAddress[objectAddress] = nftId;
+            _nftIdByAddress[objectAddress] = nftId;
+        }
+    }
 
-        // add logging
+    function _getGlobalRegistryAddress(address globalRegistry) internal view returns (address) {
+        if (block.chainid == 1) {
+            return address(this);
+        } else {
+            return globalRegistry;
+        }
     }
 
-}
+    /// @dev defines which object - parent types relations are allowed to register
+    /// EACH object type MUST have only one parent type across ALL mappings
+    // the only EXCEPTION is STAKE, can have any number of parent types
+    function _setupValidCoreTypesAndCombinations() 
+        private
+    {
+        _coreTypes[PROTOCOL()] = true;
+        _coreTypes[REGISTRY()] = true;
+        _coreTypes[SERVICE()] = true;
+        _coreTypes[INSTANCE()] = true;
+        _coreTypes[PRODUCT()] = true;
+        _coreTypes[POOL()] = true;
+        _coreTypes[DISTRIBUTION()] = true;
+        _coreTypes[DISTRIBUTOR()] = true;
+        _coreTypes[ORACLE()] = true;
+        _coreTypes[POLICY()] = true;
+        _coreTypes[BUNDLE()] = true;
+        _coreTypes[STAKING()] = true;
+        _coreTypes[STAKE()] = true;
+
+        // types combinations allowed to use with register() function ONLY
+        _coreContractCombinations[INSTANCE()][REGISTRY()] = true;
+
+        // components with instance parent
+        _coreContractCombinations[PRODUCT()][INSTANCE()] = true;
+        _coreContractCombinations[DISTRIBUTION()][INSTANCE()] = true;
+        _coreContractCombinations[ORACLE()][INSTANCE()] = true;
+        _coreContractCombinations[POOL()][INSTANCE()] = true;
+
+        // objects with component parents
+        _coreObjectCombinations[DISTRIBUTOR()][DISTRIBUTION()] = true;
+        _coreObjectCombinations[POLICY()][PRODUCT()] = true;
+        _coreObjectCombinations[BUNDLE()][POOL()] = true;
+
+        // staking
+        _coreObjectCombinations[STAKE()][PROTOCOL()] = true;
+        _coreObjectCombinations[STAKE()][INSTANCE()] = true;
+    }
+}