@etherisc/gif-next 0.0.2-ef2f083-203 → 0.0.2-ef82317-831

package/contracts/registry/Registry.sol

@@ -1,341 +1,511 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IRegisterable} from "../shared/IRegisterable.sol";
-import {IService} from "../shared/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 {ChainNft} from "./ChainNft.sol";
 import {IRegistry} from "./IRegistry.sol";
-import {NftId, toNftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
-import {Version, VersionPart, VersionLib, VersionPartLib} 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 {ERC165} from "../shared/ERC165.sol";
-
+import {IRegisterable} from "../shared/IRegisterable.sol";
+import {ReleaseRegistry} from "./ReleaseRegistry.sol";
+import {TokenRegistry} from "./TokenRegistry.sol";
+import {RegistryAdmin} from "./RegistryAdmin.sol";
 
-// IMPORTANT
+/// @dev 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)
-
+// 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
-    ERC165,
+    Initializable,
+    AccessManaged,
     IRegistry
 {
-    uint256 public constant GIF_MAJOR_VERSION_AT_DEPLOYMENT = 3;
+    /// @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_SERVICE_TOKEN_SEQUENCE_ID = 3;
+    uint256 public constant REGISTRY_TOKEN_SEQUENCE_ID = 2;
+    uint256 public constant STAKING_TOKEN_SEQUENCE_ID = 3;
     string public constant EMPTY_URI = "";
 
-    VersionPart internal _majorVersion;
+    /// @dev keep track of different registries on different chains
+    mapping(uint256 chainId => NftId registryNftId) private _registryNftIdByChainId;
+    uint256[] private _chainId;
 
-    mapping(NftId nftId => ObjectInfo info) internal _info;
-    mapping(address object => NftId nftId) internal _nftIdByAddress;
+    /// @dev keep track of object info and address reverse lookup
+    mapping(NftId nftId => ObjectInfo info) private _info;
+    mapping(address object => NftId nftId) private _nftIdByAddress;
 
-    mapping(NftId registrator => mapping(
-            ObjectType objectType => bool)) internal _isApproved;
+    /// @dev keep track of service addresses by version and domain
+    mapping(VersionPart version => mapping(ObjectType serviceDomain => address)) private _service;
 
-    mapping(ObjectType objectType => mapping(
-            ObjectType parentType => bool)) internal _isValidContractCombination;
+    mapping(ObjectType objectType => bool) private _coreTypes;
 
     mapping(ObjectType objectType => mapping(
-            ObjectType parentType => bool)) internal _isValidObjectCombination;
+            ObjectType parentType => bool)) private _coreContractCombinations;
 
-    mapping(address token => mapping(
-            VersionPart majorVersion => bool isActive)) internal _tokenIsActive;
-
-    mapping(NftId nftId => string name) internal _string;
-    mapping(bytes32 serviceNameHash => mapping(
-            VersionPart majorVersion => address service)) internal _service;
-
-    NftId internal _registryNftId;
-    NftId internal _serviceNftId; // set in stone upon registry creation
-    ChainNft internal _chainNft;
+    mapping(ObjectType objectType => mapping(
+            ObjectType parentType => bool)) private _coreObjectCombinations;
 
+    NftId private _stakingNftId;
 
-    modifier onlyOwner() {
-        if(msg.sender != getOwner()) {
-            revert NotOwner(msg.sender);
-        }
-        _;
-    }
+    ReleaseRegistry private _releaseRegistry;
+    address private _tokenRegistryAddress;
+    address private _stakingAddress;
 
-    modifier onlyRegistryService() {
-        
-        if(msg.sender != _info[_serviceNftId].objectAddress) {
-            revert NotRegistryService();
+    modifier onlyDeployer() {
+        if (msg.sender != DEPLOYER) {
+            revert ErrorRegistryCallerNotDeployer();
         }
         _;
     }
 
-    constructor(address registryOwner, VersionPart majorVersion)
+    // 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())
     {
-        require(registryOwner > address(0), "Registry: registry owner is 0");
-
-        // major version at constructor time
-        _majorVersion = VersionLib.toVersionPart(GIF_MAJOR_VERSION_AT_DEPLOYMENT);
-        emit LogInitialMajorVersionSet(_majorVersion);
+        DEPLOYER = msg.sender;
+        ADMIN = admin;
+        GLOBAL_REGISTRY_ADDRESS = _getGlobalRegistryAddress(globalRegistry);
 
         // deploy NFT 
-        _chainNft = new ChainNft(address(this));// adds 10kb to deployment size
+        CHAIN_NFT = new ChainNft(address(this));
+        GLOBAL_REGISTRY_NFT_ID = NftIdLib.toNftId(
+            CHAIN_NFT.GLOBAL_REGISTRY_ID());
 
         // initial registry setup
-        _registerProtocol();
-        _registerRegistry(registryOwner);
-        _registerRegistryService(registryOwner);
+        PROTOCOL_NFT_ID = _registerProtocol();
+        REGISTRY_NFT_ID = _registerRegistry();
 
-        // set object parent relations
-        _setupValidObjectParentCombinations();
-
-        _registerInterface(type(IRegistry).interfaceId);
+        // set object types and object parent relations
+        _setupValidCoreTypesAndCombinations();
     }
 
-    // from IRegistry
 
-    /// @dev latest GIF release version 
-    function setMajorVersion(VersionPart newMajorVersion)
+    /// @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
+    )
+        external
+        initializer()
+        onlyDeployer()
+    {
+        // store links to supporting contracts
+        _releaseRegistry = ReleaseRegistry(releaseRegistry);
+        _tokenRegistryAddress = tokenRegistry;
+        _stakingAddress = staking;
+
+        // register staking contract
+        _stakingNftId = _registerStaking();
+    }
+
+    /// @inheritdoc IRegistry
+    function registerRegistry(
+        NftId nftId,
+        uint256 chainId, 
+        address registryAddress
+    )
         external
-        onlyOwner
+        restricted()
     {
-        // ensure major version increments is one
-        uint256 oldMax = _majorVersion.toInt();
-        uint256 newMax = newMajorVersion.toInt();
-        if (newMax <= oldMax || newMax - oldMax != 1) {
-            revert MajorVersionMaxIncreaseInvalid(newMajorVersion, _majorVersion);
+        // registration of chain registries only allowed on mainnet
+        if (block.chainid != 1) {
+            revert ErrorRegistryNotOnMainnet(block.chainid);
         }
 
-        _majorVersion = newMajorVersion;
-        emit LogMajorVersionSet(_majorVersion);
+        // 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);
+        }
+
+        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
     }
 
-    /// @dev registry protects only against tampering existing records, registering with invalid types pairs and 0 parent address
-    // TODO service registration means its approval for some type?
-    // TODO registration of precompile addresses
-    function register(ObjectInfo memory info)
+    // TODO limit service owner to registry admin?
+    /// @inheritdoc IRegistry
+    function registerService(
+        ObjectInfo memory info, 
+        VersionPart version, 
+        ObjectType domain
+    )
         external
-        onlyRegistryService
+        restricted()
         returns(NftId nftId)
     {
-        ObjectType objectType = info.objectType;
-        NftId parentNftId = info.parentNftId;
-        ObjectInfo memory parentInfo = _info[parentNftId];
-        ObjectType parentType = parentInfo.objectType; // see function header
-        address parentAddress = parentInfo.objectAddress;
+        // service address is defined
+        address service = info.objectAddress;
+        if(service == address(0)) {
+            revert ErrorRegistryServiceAddressZero();
+        }
 
-        // 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();
+        // version is defined
+        if(version.eqz()) {
+            revert ErrorRegistryServiceVersionZero(service);
+        }
+        // service domain is defined
+        if(domain.eqz()) {
+            revert ErrorRegistryServiceDomainZero(service, version);
         }
 
-        address interceptor = _getInterceptor(info.isInterceptor, info.objectAddress, parentInfo.isInterceptor, parentAddress);
+        // service has proper type
+        if(info.objectType != SERVICE()) {
+            revert ErrorRegistryNotService(service, info.objectType);
+        }
 
-        // TODO does external call
-        uint256 mintedTokenId = _chainNft.mint(
-            info.initialOwner,
-            interceptor,
-            EMPTY_URI);
-        nftId = toNftId(mintedTokenId);
+        // service parent has registry type
+        if(info.parentNftId != REGISTRY_NFT_ID) {
+            revert ErrorRegistryServiceParentNotRegistry(service, version, info.parentNftId);
+        }
 
-        // 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;
+        // service has not already been registered
+        if(_service[version][domain] != address(0)) {
+            revert ErrorRegistryServiceDomainAlreadyRegistered(service, version, domain);
+        }
 
-        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);
-            }
+        _service[version][domain] = service;
 
-            address contractAddress = info.objectAddress;
+        emit LogServiceRegistration(version, domain);
 
-            if(_nftIdByAddress[contractAddress].gtz()) { 
-                revert ContractAlreadyRegistered(contractAddress);
-            }
+        nftId = _register(info);
+    }
 
-            _nftIdByAddress[contractAddress] = nftId;
 
-            // special case
-            if(objectType == SERVICE()) {
-                _registerService(info);
+    /// @inheritdoc IRegistry
+    function register(ObjectInfo memory info)
+        external
+        restricted()
+        returns(NftId nftId)
+    {
+        address objectAddress = info.objectAddress;
+        ObjectType objectType = info.objectType;
+
+        // this indidirectly enforces that the parent is registered
+        // parentType would be zero for a non-registered parent which is never a valid type combination
+        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);
             }
         }
-        else
-        {
-            if(_isValidObjectCombination[objectType][parentType] == false) {
-                revert InvalidTypesCombination(objectType, parentType);
+        // check type combinations for contract objects
+        else {
+            if(_coreContractCombinations[objectType][parentType] == false) {
+                revert ErrorRegistryTypesCombinationInvalid(objectAddress, objectType, parentType);
             }
         }
 
-        emit LogRegistration(info);
+        nftId = _register(info);
     }
 
-    /// @dev token state is informative, registry have no clue about used tokens
-    // component owner is responsible for token selection and operations
-    // service MUST deny registration of component with inactive token 
-    function setTokenActive(address token, VersionPart majorVersion, bool active)
+
+    /// @inheritdoc IRegistry
+    function registerWithCustomType(ObjectInfo memory info)
         external
-        onlyOwner
+        restricted()
+        returns(NftId nftId)
     {
-        // verify that token is registered
-        ObjectInfo memory info = _info[_nftIdByAddress[token]];
-        if (info.nftId.eqz()) {
-            revert TokenNotRegistered(token);
-        }
+        ObjectType objectType = info.objectType;
+        ObjectType parentType = _info[info.parentNftId].objectType;
 
-        // verify provided address is a registered token
-        if (info.objectType != TOKEN()) {
-            revert NotToken(token);
+        if(_coreTypes[objectType]) {
+            revert ErrorRegistryCoreTypeRegistration();
         }
 
-        // verify valid major version
-        // ensure major version increments is one
-        uint256 version = majorVersion.toInt();
-        uint256 versionNow = _majorVersion.toInt();
-        if (version < GIF_MAJOR_VERSION_AT_DEPLOYMENT || version > versionNow) {
-            revert TokenMajorVersionInvalid(majorVersion);
+        if(
+            objectType == ObjectTypeLib.zero() ||
+            parentType == ObjectTypeLib.zero() ||
+            parentType == PROTOCOL() ||
+            parentType == SERVICE()
+        ) {
+            revert ErrorRegistryTypesCombinationInvalid(info.objectAddress, objectType, parentType);
         }
 
-        _tokenIsActive[token][majorVersion] = active;
-
-        emit LogTokenStateSet(token, majorVersion, active);
+        nftId = _register(info);
     }
 
+
     /// @dev earliest GIF major version 
-    function getMajorVersionMin() external view returns (VersionPart) {
-        return VersionLib.toVersionPart(GIF_MAJOR_VERSION_AT_DEPLOYMENT);
+    function getInitialVersion() external view returns (VersionPart) {
+        return VersionPartLib.toVersionPart(_releaseRegistry.INITIAL_GIF_VERSION());
     }
 
-    // TODO make distinction between active an not yet active version
-    // need to be thought trough, not yet clear if necessary
-    // need to answer question: what is the latest version during the upgrade process?
-    // likely setting up a new gif version does not fit into a single tx
-    // in this case we might want to have a period where the latest version is
-    // in the process of being set up while the latest active version is 1 major release smaller
-    /// @dev latest GIF major version (might not yet be active)
-    function getMajorVersionMax() external view returns (VersionPart) {
-        return _majorVersion;
+    /// @dev next GIF release version to be released
+    function getNextVersion() external view returns (VersionPart) {
+        return _releaseRegistry.getNextVersion();
     }
 
     /// @dev latest active GIF release version 
-    function getMajorVersion() external view returns (VersionPart) { 
-        return _majorVersion;
+    function getLatestVersion() external view returns (VersionPart) { 
+        return _releaseRegistry.getLatestVersion();
+    }
+
+    function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory) {
+        return _releaseRegistry.getReleaseInfo(version);
+    }
+
+    function chainIds() public view returns (uint256) {
+        return _chainId.length;
+    }
+
+    function getChainId(uint256 idx) public view returns (uint256) {
+        return _chainId[idx];
+    }
+
+    function getRegistryNftId(uint256 chainId) public view returns (NftId nftId) {
+        return _registryNftIdByChainId[chainId];
     }
-    
 
-    function getObjectCount() external view override returns (uint256) {
-        return _chainNft.totalSupply();
+    function getObjectCount() external view returns (uint256) {
+        return CHAIN_NFT.totalSupply();
     }
 
     function getNftId() external view returns (NftId nftId) {
-        return _registryNftId;
+        return REGISTRY_NFT_ID;
+    }
+
+    function getProtocolNftId() external view returns (NftId nftId) {
+        return PROTOCOL_NFT_ID;
     }
 
-    function getNftId(address object) external view override returns (NftId id) {
+    function getNftIdForAddress(address object) external view returns (NftId id) {
         return _nftIdByAddress[object];
     }
 
-    function ownerOf(NftId nftId) public view override returns (address) {
-        return _chainNft.ownerOf(nftId.toInt());
+    function ownerOf(NftId nftId) public view returns (address) {
+        return CHAIN_NFT.ownerOf(nftId.toInt());
     }
 
     function ownerOf(address contractAddress) public view returns (address) {
-        
-        return _chainNft.ownerOf(_nftIdByAddress[contractAddress].toInt());
+        return CHAIN_NFT.ownerOf(_nftIdByAddress[contractAddress].toInt());
     }
 
-    function getObjectInfo(NftId nftId) external view override returns (ObjectInfo memory) {
+    function getObjectInfo(NftId nftId) external view returns (ObjectInfo memory) {
         return _info[nftId];
     }
 
-    function getObjectInfo(address object) external view override returns (ObjectInfo memory) {
-        
+    function getObjectAddress(NftId nftId) external view returns (address) {
+        return _info[nftId].objectAddress;
+    }
+
+    function getObjectInfo(address object) external view returns (ObjectInfo memory) {
         return _info[_nftIdByAddress[object]];
     }
 
-    function isRegistered(NftId nftId) public view override returns (bool) {
+    function isRegistered(NftId nftId) public view returns (bool) {
         return _info[nftId].objectType.gtz();
     }
 
-    function isRegistered(address object) external view override returns (bool) {
+    function isRegistered(address object) external view returns (bool) {
         return _nftIdByAddress[object].gtz();
     }
 
-    function isTokenActive(address token, VersionPart majorVersion) external view returns (bool) {
-        return _tokenIsActive[token][majorVersion];
+    function isRegisteredService(address object) external view returns (bool) {
+        return _info[_nftIdByAddress[object]].objectType == SERVICE();
+    }
+
+    function isRegisteredComponent(address object) external view returns (bool) {
+        NftId objectParentNftId = _info[_nftIdByAddress[object]].parentNftId;
+        return _info[objectParentNftId].objectType == INSTANCE();
     }
 
-    function getServiceName(NftId nftId) external view returns (string memory) {
-        return _string[nftId];
+    function isActiveRelease(VersionPart version) external view returns (bool)
+    {
+        return _releaseRegistry.isActiveRelease(version);
+    }
+
+    function getStakingAddress() external view returns (address staking) {
+        return _stakingAddress;
+    }
+
+    function getTokenRegistryAddress() external view returns (address tokenRegistry) {
+        return _tokenRegistryAddress;
     }
 
-    // special case to retrive a gif service
     function getServiceAddress(
-        string memory serviceName, 
-        VersionPart majorVersion
-    ) external view returns (address)
+        ObjectType serviceDomain, 
+        VersionPart releaseVersion
+    ) external view returns (address service)
     {
-        bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
-        return _service[serviceNameHash][majorVersion];
+        service =  _service[releaseVersion][serviceDomain]; 
+    }
+
+    function getReleaseRegistryAddress() external view returns (address) {
+        return address(_releaseRegistry);
+    }
+
+    function getChainNftAddress() external view override returns (address) {
+        return address(CHAIN_NFT);
     }
 
-    function getChainNft() external view override returns (ChainNft) {
-        return _chainNft;
+    function getRegistryAdminAddress() external view returns (address) {
+        return address(ADMIN);
+    }
+
+    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
 
-    function _registerService(ObjectInfo memory info)
+    /// @dev registry protects only against tampering existing records, registering with invalid types pairs and 0 parent address
+    function _register(ObjectInfo memory info)
         internal
+        returns(NftId nftId)
     {
-        (
-            string memory serviceName,
-            VersionPart majorVersion
-        ) = abi.decode(info.data, (string, VersionPart));
-        bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
-
-        // ensures consistency of service.getVersion() and majorVersion here
-        if(majorVersion != _majorVersion) {
-            revert InvalidServiceVersion(majorVersion);
-        }
-        
-        if(_service[serviceNameHash][majorVersion] != address(0)) {
-            revert ServiceNameAlreadyRegistered(serviceName, majorVersion);
+        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);
+            }
         }
 
-        _string[info.nftId] = serviceName;
-        _service[serviceNameHash][majorVersion] = info.objectAddress;
+        address interceptorAddress = _getInterceptor(
+            isInterceptor, 
+            objectType, 
+            objectAddress, 
+            parentInfo.isInterceptor, 
+            parentAddress);
 
-        emit LogServiceNameRegistration(serviceName, majorVersion); 
+        uint256 tokenId = CHAIN_NFT.getNextTokenId();
+        nftId = NftIdLib.toNftId(tokenId);
+        info.nftId = nftId;
+
+        _info[nftId] = info;
+        _setAddressForNftId(nftId, objectAddress);
+
+        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 
-        view 
+        pure 
         returns (address interceptor) 
     {
+        // no intercepting calls for stakes
+        if (objectType == STAKE()) {
+            return address(0);
+        }
+
         if (objectAddress == address(0)) {
             if (parentIsInterceptor) {
                 return parentObjectAddress;
@@ -355,135 +525,183 @@ contract Registry is
 
     /// @dev protocol registration used to anchor the dip ecosystem relations
     function _registerProtocol() 
-        internal
+        private
+        returns (NftId protocolNftId)
     {
-        uint256 protocolId = _chainNft.PROTOCOL_NFT_ID();
-        NftId protocolNftId = toNftId(protocolId);
-
-        _chainNft.mint(NFT_LOCK_ADDRESS, protocolId);
-
-        _info[protocolNftId] = ObjectInfo(
-            protocolNftId,
-            zeroNftId(), // parent
-            PROTOCOL(),
-            false, // isInterceptor
-            address(0), // objectAddress
-            NFT_LOCK_ADDRESS,// initialOwner
-            ""
-        );
+        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 registry registration
-    /// might also register the global registry when not on mainnet
-    function _registerRegistry(address registryOwner) 
-        internal
+    /// @dev register this registry
+    function _registerRegistry() 
+        internal 
+        virtual
+        returns (NftId registryNftId)
     {
-        uint256 registryId = _chainNft.calculateTokenId(2);
-        NftId registryNftId = toNftId(registryId);
-
-        NftId parentNftId;
-
-        if(registryId != _chainNft.GLOBAL_REGISTRY_ID()) 
-        {// we're not the global registry
-            _registerGlobalRegistry();
-            parentNftId = toNftId(_chainNft.GLOBAL_REGISTRY_ID());
+        // 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);
         }
-        else 
-        {// we are global registry
-            parentNftId = toNftId(_chainNft.PROTOCOL_NFT_ID());
+    }
+
+    /// @dev staking registration
+    function _registerRegistryForNft(
+        uint256 chainId,
+        ObjectInfo memory info,
+        bool updateAddressLookup
+    )
+        private
+    {
+        if (!_registryNftIdByChainId[chainId].eqz()) {
+            revert ErrorRegistryChainRegistryAlreadyRegistered(info.nftId, chainId);
         }
 
-        _chainNft.mint(registryOwner, registryId);
+        // update registry lookup variables
+        _registryNftIdByChainId[chainId] = info.nftId;
+        _chainId.push(chainId);
 
-        _info[registryNftId] = ObjectInfo(
-            registryNftId,
-            parentNftId,
-            REGISTRY(),
-            false, // isInterceptor
-            address(this), 
-            registryOwner,
-            "" 
-        );
-        _nftIdByAddress[address(this)] = registryNftId;
-        _registryNftId = registryNftId;
+        // 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() 
+    /// @dev Register the provided object info for the specified NFT ID.
+    function _registerForNft(
+        ObjectInfo memory info, 
+        bool updateAddressLookup
+    )
         internal
     {
-        uint256 globalRegistryId = _chainNft.GLOBAL_REGISTRY_ID();
-
-        _chainNft.mint(NFT_LOCK_ADDRESS, globalRegistryId);
+        _info[info.nftId] = info;
 
-        NftId globalRegistryNftId = toNftId(globalRegistryId);
+        if (updateAddressLookup) {
+            _setAddressForNftId(info.nftId, info.objectAddress);
+        }
 
-        _info[globalRegistryNftId] = ObjectInfo(
-            globalRegistryNftId,
-            toNftId(_chainNft.PROTOCOL_NFT_ID()), // parent
-            REGISTRY(),
-            false, // isInterceptor
-            address(0), // objectAddress
-            NFT_LOCK_ADDRESS, // initialOwner
-            "" // data
-        );
+        // calls nft receiver
+        CHAIN_NFT.mint(info.initialOwner, info.nftId.toInt());
     }
 
-    function _registerRegistryService(address registryOwner)
+    function _setAddressForNftId(NftId nftId, address objectAddress)
         internal
     {
-        uint256 serviceId = _chainNft.calculateTokenId(REGISTRY_SERVICE_TOKEN_SEQUENCE_ID);
-        NftId serviceNftId = toNftId(serviceId);        
-
-        _chainNft.mint(registryOwner, serviceId);
-
-        _info[serviceNftId] = ObjectInfo(
-            serviceNftId,
-            _registryNftId,
-            SERVICE(),
-            false, // isInterceptor
-            msg.sender, // service deploys registry
-            registryOwner, // initialOwner,
-            "" 
-        );
+        if (objectAddress != address(0)) {
+            if (_nftIdByAddress[objectAddress].gtz()) { 
+                revert ErrorRegistryContractAlreadyRegistered(objectAddress);
+            }
 
-        _nftIdByAddress[msg.sender] = serviceNftId;
+            _nftIdByAddress[objectAddress] = nftId;
+        }
+    }
 
-        string memory serviceName = "RegistryService";
-        bytes32 serviceNameHash = keccak256(abi.encode(serviceName));
-        _service[serviceNameHash][VersionLib.toVersionPart(GIF_MAJOR_VERSION_AT_DEPLOYMENT)] = msg.sender;
-        _string[serviceNftId] = serviceName;
-        _serviceNftId = serviceNftId;
+    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
-    // 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 
+    /// 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
     {
-        // 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;
-
-        // product as parent, ONLY approved
-        _isValidObjectCombination[POLICY()][PRODUCT()] = true;
-
-        // pool as parent, ONLY approved
-        _isValidObjectCombination[BUNDLE()][POOL()] = true;
-        _isValidObjectCombination[STAKE()][POOL()] = true;
+        _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;
     }
 }