@etherisc/gif-next 0.0.2-b9e43cf-870 → 0.0.2-bb1081a-994

package/contracts/registry/Registry.sol

@@ -30,21 +30,23 @@ contract Registry is
     uint256 public constant REGISTRY_TOKEN_SEQUENCE_ID = 2;
     string public constant EMPTY_URI = "";
 
-    mapping(NftId nftId => ObjectInfo info) internal _info;
-    mapping(address object => NftId nftId) internal _nftIdByAddress;
+    mapping(NftId nftId => ObjectInfo info) private _info;
+    mapping(address object => NftId nftId) private _nftIdByAddress;
 
-    mapping(VersionPart version => mapping(ObjectType serviceDomain => address)) _service;
+    mapping(VersionPart version => mapping(ObjectType serviceDomain => address)) private _service;
+
+    mapping(ObjectType objectType => bool) private _coreTypes;
 
     mapping(ObjectType objectType => mapping(
-            ObjectType parentType => bool)) internal _isValidContractCombination;
+            ObjectType parentType => bool)) private _coreContractCombinations;
 
     mapping(ObjectType objectType => mapping(
-            ObjectType parentType => bool)) internal _isValidObjectCombination;
+            ObjectType parentType => bool)) private _coreObjectCombinations;
 
-    NftId internal _registryNftId;
-    ChainNft internal _chainNft;
+    NftId private _registryNftId;
+    ChainNft private _chainNft;
 
-    ReleaseManager internal _releaseManager;
+    ReleaseManager private _releaseManager;
 
     modifier onlyRegistryService() {
         if(!_releaseManager.isActiveRegistryService(msg.sender)) {
@@ -65,14 +67,14 @@ contract Registry is
         _releaseManager = ReleaseManager(msg.sender);
 
         // deploy NFT 
-        _chainNft = new ChainNft(address(this));// adds 10kb to deployment size
+        _chainNft = new ChainNft(address(this));
 
         // initial registry setup
         _registerProtocol();
         _registerRegistry();
 
-        // set object parent relations
-        _setupValidObjectParentCombinations();
+        // set object types and object parent relations
+        _setupValidCoreTypesAndCombinations();
 
         _registerInterface(type(IRegistry).interfaceId);
     }
@@ -90,7 +92,10 @@ contract Registry is
         if(info.objectType != SERVICE()) {
             revert();
         }
-        info.initialOwner = NFT_LOCK_ADDRESS <- if services are access managed
+        if(info.parentType != REGISTRY()) {
+            revert();
+        }        
+        info.initialOwner == NFT_LOCK_ADDRESS <- if services are access managed
         */
 
         if(_service[version][domain] > address(0)) {
@@ -109,16 +114,59 @@ contract Registry is
         onlyRegistryService
         returns(NftId nftId)
     {
+        ObjectType objectType = info.objectType;
+        ObjectType parentType = _info[info.parentNftId].objectType;
+
+        // TODO do not need it here -> SERVICE is no longer part of _coreContractCombinations
         // no service registrations
-        if(info.objectType == SERVICE()) {
+        if(objectType == SERVICE()) {
             revert ServiceRegistration();
         }
 
+        // only valid core types combinations
+        if(info.objectAddress == address(0)) 
+        {
+            if(_coreObjectCombinations[objectType][parentType] == false) {
+                revert InvalidTypesCombination(objectType, parentType);
+            }
+        }
+        else
+        {
+            if(_coreContractCombinations[objectType][parentType] == false) {
+                revert InvalidTypesCombination(objectType, parentType);
+            }
+        }
+
         nftId = _register(info);
     }
 
+    function registerWithCustomType(ObjectInfo memory info)
+        external
+        onlyRegistryService
+        returns(NftId nftId)
+    {
+        ObjectType objectType = info.objectType;
+        ObjectType parentType = _info[info.parentNftId].objectType;
+
+        if(_coreTypes[objectType]) {
+            revert CoreTypeRegistration();
+        }
+
+        if(
+
+            parentType == PROTOCOL() ||
+            parentType == REGISTRY() ||
+            parentType == SERVICE()
+        ) {
+            revert InvalidTypesCombination(objectType, parentType);
+        }
+
+        _register(info);
+    }
+
+
     /// @dev earliest GIF major version 
-    function getMajorVersionMin() external view returns (VersionPart) {
+    function getInitialVersion() external view returns (VersionPart) {
         return _releaseManager.getInitialVersion();
     }
 
@@ -129,17 +177,16 @@ contract Registry is
     // 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) {
+    function getNextVersion() external view returns (VersionPart) {
         return _releaseManager.getNextVersion();
     }
 
     /// @dev latest active GIF release version 
-    function getMajorVersion() external view returns (VersionPart) { 
+    function getLatestVersion() external view returns (VersionPart) { 
         return _releaseManager.getLatestVersion();
     }
 
-    function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory)
-    {
+    function getReleaseInfo(VersionPart version) external view returns (ReleaseInfo memory) {
         return _releaseManager.getReleaseInfo(version);
     }
 
@@ -180,15 +227,23 @@ contract Registry is
     }
 
     function isRegisteredService(address object) external view override returns (bool) {
-        return _nftIdByAddress[object].gtz() && _info[_nftIdByAddress[object]].objectType == SERVICE();
+        return _info[_nftIdByAddress[object]].objectType == SERVICE();
+    }
+
+    function isValidRelease(VersionPart version) external view returns (bool)
+    {
+        return _releaseManager.isValidRelease(version);
     }
 
     function getServiceAddress(
         ObjectType serviceDomain, 
         VersionPart releaseVersion
-    ) external view returns (address)
+    ) external view returns (address service)
     {
-        return _service[releaseVersion][serviceDomain];
+        // TODO how can I get service address while release is not validated/activated ?!! -> user will check validity of release on its own
+        //if(_releaseManager.isValidRelease(releaseVersion)) { 
+            service =  _service[releaseVersion][serviceDomain]; 
+        //}
     }
 
     function getChainNft() external view override returns (ChainNft) {
@@ -239,11 +294,6 @@ contract Registry is
 
         if(info.objectAddress > address(0)) 
         {
-            // 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()) { 
@@ -252,12 +302,6 @@ contract Registry is
 
             _nftIdByAddress[contractAddress] = nftId;
         }
-        else
-        {
-            if(_isValidObjectCombination[objectType][parentType] == false) {
-                revert InvalidTypesCombination(objectType, parentType);
-            }
-        }
 
         emit LogRegistration(nftId, parentNftId, objectType, info.isInterceptor, info.objectAddress, info.initialOwner);
     }
@@ -370,27 +414,39 @@ contract Registry is
     // 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() 
+    function _setupValidCoreTypesAndCombinations() 
         private 
     {
+        _coreTypes[REGISTRY()] = true;
+        _coreTypes[SERVICE()] = true;
+        _coreTypes[TOKEN()] = true;
+        _coreTypes[INSTANCE()] = true;
+        _coreTypes[PRODUCT()] = true;
+        _coreTypes[POOL()] = true;
+        _coreTypes[DISTRIBUTION()] = true;
+        _coreTypes[POLICY()] = true;
+        _coreTypes[BUNDLE()] = true;
+        _coreTypes[STAKE()] = true;
+        
         // registry as parent, ONLY registry owner
-        _isValidContractCombination[TOKEN()][REGISTRY()] = true;
-        _isValidContractCombination[SERVICE()][REGISTRY()] = true;
+        //_coreContractCombinations[REGISTRY()][REGISTRY()] = true; // only for global regstry
+        _coreContractCombinations[TOKEN()][REGISTRY()] = true;
+        //_coreContractCombinations[SERVICE()][REGISTRY()] = true;// do not need it here -> registerService() registers exactly this combination
 
         // registry as parent, ONLY approved
-        _isValidContractCombination[INSTANCE()][REGISTRY()] = true;
+        _coreContractCombinations[INSTANCE()][REGISTRY()] = true;
 
         // instance as parent, ONLY approved
-        _isValidContractCombination[PRODUCT()][INSTANCE()] = true;
-        _isValidContractCombination[DISTRIBUTION()][INSTANCE()] = true;
-        _isValidContractCombination[ORACLE()][INSTANCE()] = true;
-        _isValidContractCombination[POOL()][INSTANCE()] = true;
+        _coreContractCombinations[PRODUCT()][INSTANCE()] = true;
+        _coreContractCombinations[DISTRIBUTION()][INSTANCE()] = true;
+        _coreContractCombinations[ORACLE()][INSTANCE()] = true;
+        _coreContractCombinations[POOL()][INSTANCE()] = true;
 
         // product as parent, ONLY approved
-        _isValidObjectCombination[POLICY()][PRODUCT()] = true;
+        _coreObjectCombinations[POLICY()][PRODUCT()] = true;
 
         // pool as parent, ONLY approved
-        _isValidObjectCombination[BUNDLE()][POOL()] = true;
-        _isValidObjectCombination[STAKE()][POOL()] = true;
+        _coreObjectCombinations[BUNDLE()][POOL()] = true;
+        _coreObjectCombinations[STAKE()][POOL()] = true;
     }
-}
+}

package/contracts/registry/RegistryAccessManager.sol

@@ -5,29 +5,31 @@ import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManage
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
 
 import {RoleId, RoleIdLib,
-        REGISTRY_SERVICE_MANAGER_ROLE,
-        REGISTRY_SERVICE_ADMIN_ROLE,
+        GIF_MANAGER_ROLE,
+        GIF_ADMIN_ROLE,
         RELEASE_MANAGER_ROLE} from "../types/RoleId.sol";
 
 import {TokenRegistry} from "./TokenRegistry.sol";
 import {ReleaseManager} from "./ReleaseManager.sol";
 
 /*
-    3 types of roles: 
-    1) REGISTRAR roles 
-        - each one is unique
-        - always have 1 member
-        - one role is set for each function of each version of registry service
-    2) REGISTRY_SERVICE_MANAGER_ROLE aka GIF_MANAGER_ROLE
+    4 types of roles:
+    1) RELEASE_MANAGER_ROLE
+        - has only ReleaseManager as member
+        - responsible for setting and granting of REGISTRAR roles
+    1) REGISTRAR roles
+        - set and granted by RELEASE_MANAGER_ROLE
+        - each has 1 unique member (regular service ver.X) (subject to change)
+        - each set to 1 target (registry service ver.X) and 1 selector (function of registry service ver.X) (subject to change)
+    2) GIF_MANAGER_ROLE
         - can have arbitrary number of members
         - responsible for services registrations
         - responsible for token registration and activation
-    3) REGISTRY_SERVICE_ADMIN_ROLE aka GIF_ADMIN_ROLE
-        - admin of REGISTRY_SERVICE_MANAGER_ROLE
+    3) GIF_ADMIN_ROLE
+        - admin of GIF_MANAGER_ROLE
         - MUST have 1 member at any time
         - granted/revoked ONLY in transferAdminRole() -> consider lock out situations!!!
-        - responsible for release manager initialization
-        - responsible for creation and activation of each release
+        - responsible for creation and activation of releases
 
 */
 
@@ -71,8 +73,8 @@ contract RegistryAccessManager is AccessManaged
         _configureAdminRoleInitial();
 
         address admin = msg.sender;
-        _grantRole(REGISTRY_SERVICE_ADMIN_ROLE(), admin, 0);
-        _grantRole(REGISTRY_SERVICE_MANAGER_ROLE(), manager, 0);
+        _grantRole(GIF_ADMIN_ROLE(), admin, 0);
+        _grantRole(GIF_MANAGER_ROLE(), manager, 0);
     }
 
     function initialize(address releaseManager, address tokenRegistry)
@@ -124,10 +126,10 @@ contract RegistryAccessManager is AccessManaged
 
     /*function transferAdmin(address to)
         external
-        restricted // only with REGISTRY_SERVICE_ADMIN_ROLE or nft owner
+        restricted // only with GIF_ADMIN_ROLE or nft owner
     {
-        _accessManager.revoke(REGISTRY_SERVICE_ADMIN_ROLE, );
-        _accesssManager.grant(REGISTRY_SERVICE_ADMIN_ROLE, to, 0);
+        _accessManager.revoke(GIF_ADMIN_ROLE, );
+        _accesssManager.grant(GIF_ADMIN_ROLE, to, 0);
     }*/
 
     //--- view functions ----------------------------------------------------//
@@ -147,7 +149,7 @@ contract RegistryAccessManager is AccessManaged
         bytes4[] memory functionSelector = new bytes4[](1);
 
         functionSelector[0] = RegistryAccessManager.initialize.selector;
-        _setTargetFunctionRole(address(this), functionSelector, REGISTRY_SERVICE_ADMIN_ROLE());
+        _setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
     }
 
     function _configureAdminRole() private
@@ -157,15 +159,16 @@ contract RegistryAccessManager is AccessManaged
         // for RegistryServiceProxyManager
         // TODO upgrading with releaseManager.upgrade()->proxy.upgrade()???
         //functionSelector[0] = RegistryServiceManager.upgrade.selector;
-        //_setTargetFunctionRole(address(this), functionSelector, REGISTRY_SERVICE_ADMIN_ROLE());
+        //_setTargetFunctionRole(address(this), functionSelector, GIF_ADMIN_ROLE());
 
         // for TokenRegistry
 
         // for ReleaseManager
         functionSelector[0] = ReleaseManager.createNextRelease.selector;
-        _setTargetFunctionRole(_releaseManager, functionSelector, REGISTRY_SERVICE_ADMIN_ROLE());
-        //functionSelector[0] = ReleaseManager.activateNextRelease.selector;
-        //_setTargetFunctionRole(_releaseManager, functionSelector, REGISTRY_SERVICE_ADMIN_ROLE());
+        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
+
+        functionSelector[0] = ReleaseManager.activateNextRelease.selector;
+        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_ADMIN_ROLE());
     }
     
     function _configureManagerRole() private 
@@ -174,14 +177,17 @@ contract RegistryAccessManager is AccessManaged
 
         // for TokenRegistry
         functionSelector[0] = TokenRegistry.setActive.selector;
-        _setTargetFunctionRole(address(_tokenRegistry), functionSelector, REGISTRY_SERVICE_MANAGER_ROLE());
+        _setTargetFunctionRole(address(_tokenRegistry), functionSelector, GIF_MANAGER_ROLE());
 
         // for ReleaseManager
         functionSelector[0] = ReleaseManager.registerService.selector;
-        _setTargetFunctionRole(_releaseManager, functionSelector, REGISTRY_SERVICE_MANAGER_ROLE());
+        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
+
+        functionSelector[0] = ReleaseManager.registerRegistryService.selector;
+        _setTargetFunctionRole(_releaseManager, functionSelector, GIF_MANAGER_ROLE());
 
         // set admin
-        _setRoleAdmin(REGISTRY_SERVICE_MANAGER_ROLE(), REGISTRY_SERVICE_ADMIN_ROLE());
+        _setRoleAdmin(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE());
     }
 
     function _configureReleaseManagerRole() private

package/contracts/registry/RegistryService.sol

@@ -8,7 +8,7 @@ import {IRegistry} from "./IRegistry.sol";
 import {IInstance} from "../instance/IInstance.sol";
 
 import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
-import {IBaseComponent} from "../../contracts/components/IBaseComponent.sol";
+import {IComponent} from "../../contracts/components/IComponent.sol";
 import {IPoolComponent} from "../../contracts/components/IPoolComponent.sol";
 import {IProductComponent} from "../../contracts/components/IProductComponent.sol";
 import {IDistributionComponent} from "../../contracts/components/IDistributionComponent.sol";
@@ -40,34 +40,28 @@ contract RegistryService is
     // TODO update to real hash when registry is stable
     bytes32 public constant REGISTRY_CREATION_CODE_HASH = bytes32(0);
 
-    address public constant NFT_LOCK_ADDRESS = address(0x1);
-
-
-    function registerInstance(IRegisterable instance)
+    function registerInstance(IRegisterable instance, address owner)
         external
+        restricted
         returns(
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
+            IRegistry.ObjectInfo memory info
         ) 
     {
         if(!instance.supportsInterface(type(IInstance).interfaceId)) {
             revert NotInstance();
         }
 
-        (info, data) = _getAndVerifyContractInfo(instance, INSTANCE(), msg.sender);
-
+        info = _getAndVerifyContractInfo(instance, INSTANCE(), owner);
         info.nftId = _registry.register(info);
+
         instance.linkToRegisteredNftId(); // asume safe
-        
-        return (info, data);
     }
 
-    function registerProduct(IBaseComponent product, address owner)
+    function registerProduct(IComponent product, address owner)
         external
         restricted
         returns(
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
+            IRegistry.ObjectInfo memory info
         ) 
     {
         // CAN revert if no ERC165 support -> will revert with empty message 
@@ -75,49 +69,38 @@ contract RegistryService is
             revert NotProduct();
         }
 
-        (info, data) = _getAndVerifyContractInfo(product, PRODUCT(), owner);
-
+        info = _getAndVerifyContractInfo(product, PRODUCT(), owner);
         info.nftId = _registry.register(info);
-
-        return (info, data);  
     }
 
-    function registerPool(IBaseComponent pool, address owner)
+    function registerPool(IComponent pool, address owner)
         external
         restricted
         returns(
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
+            IRegistry.ObjectInfo memory info
         ) 
     {
         if(!pool.supportsInterface(type(IPoolComponent).interfaceId)) {
             revert NotPool();
         }
 
-        (info, data) = _getAndVerifyContractInfo(pool, POOL(), owner);
-
+        info = _getAndVerifyContractInfo(pool, POOL(), owner);
         info.nftId = _registry.register(info);
-
-        return (info, data);  
     }
 
-    function registerDistribution(IBaseComponent distribution, address owner)
+    function registerDistribution(IComponent distribution, address owner)
         external
         restricted
         returns(
-            IRegistry.ObjectInfo memory info,
-            bytes memory data
+            IRegistry.ObjectInfo memory info
         ) 
     {
         if(!distribution.supportsInterface(type(IDistributionComponent).interfaceId)) {
             revert NotDistribution();
         }
 
-        (info, data) = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
-
+        info = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
         info.nftId = _registry.register(info);
-
-        return (info, data);  
     }
 
     function registerPolicy(IRegistry.ObjectInfo memory info)
@@ -180,15 +163,14 @@ contract RegistryService is
 
     // from IRegisterable
 
-    function getInitialInfo() 
-        public 
-        view
-        override(IRegisterable, Registerable)
-        returns (IRegistry.ObjectInfo memory info, bytes memory data)
+    function getFunctionConfigs()
+        external
+        pure
+        returns(
+            FunctionConfig[] memory config
+        )
     {
-        (info , data) = super.getInitialInfo();
-
-        FunctionConfig[] memory config = new FunctionConfig[](6);
+        config = new FunctionConfig[](6);
 
         // order of service registrations MUST be reverse to this array 
         /*config[-1].serviceDomain = STAKE();
@@ -212,8 +194,6 @@ contract RegistryService is
         // registerInstance() have no restriction
         config[5].serviceDomain = INSTANCE();
         config[5].selector = RegistryService.registerInstance.selector;
-
-        data = abi.encode(config);
     }
 
     // Internal
@@ -224,16 +204,12 @@ contract RegistryService is
         address expectedOwner // assume can be 0 when given by other service
     )
         internal
-        view
+        // view
         returns(
-            IRegistry.ObjectInfo memory info, 
-            bytes memory data
+            IRegistry.ObjectInfo memory info 
         )
     {
-        (
-            info, 
-            data
-        ) = registerable.getInitialInfo();
+        info = registerable.getInitialInfo();
         info.objectAddress = address(registerable);
 
         if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
@@ -242,13 +218,8 @@ contract RegistryService is
 
         address owner = info.initialOwner;
 
-        // solhint-disable-next-line 
-        if(expectedType == INSTANCE()) { 
-            // any address may create a new instance via instance service
-        } else {
-            if(owner != expectedOwner) { // registerable owner protection
-                revert NotRegisterableOwner(expectedOwner);
-            }
+        if(owner != expectedOwner) { // registerable owner protection
+            revert NotRegisterableOwner(expectedOwner);
         }
 
         if(owner == address(registerable)) {
@@ -262,15 +233,6 @@ contract RegistryService is
         if(getRegistry().isRegistered(owner)) { 
             revert RegisterableOwnerIsRegistered();
         }
-
-        /*NftId parentNftId = info.parentNftId;
-        IRegistry.ObjectInfo memory parentInfo = getRegistry().getObjectInfo(parentNftId);
-
-        if(parentInfo.objectType != parentType) { // parent registration + type
-            revert InvalidParent(parentNftId);
-        }*/
-
-        return(info, data);
     }
 
     function _verifyObjectInfo(
@@ -296,25 +258,5 @@ contract RegistryService is
         if(getRegistry().isRegistered(owner)) { 
             revert RegisterableOwnerIsRegistered();
         }
-
-        // can catch all 3 if check that initialOwner is not registered
-        /*if(info.initialOwner == msg.sender) {
-            revert InitialOwnerIsParent();
-        }
-
-        if(info.initialOwner == address(this)) {
-            revert InitialOwnerIsService();
-        }
-
-        if(info.initialOwner == address(getRegistry())) {
-            revert InitialOwnerIsRegistry();
-        }*/
-
-        /*NftId parentNftId = info.parentNftId;
-        IRegistry.ObjectInfo memory parentInfo = getRegistry().getObjectInfo(parentNftId);
-
-        if(parentInfo.objectType != parentType) { // parent registration + type
-            revert InvalidParent(parentNftId);
-        }*/        
     }
 }