@etherisc/gif-next 0.0.2-e769e2e-077 → 0.0.2-e802d97-713

package/contracts/registry/RegistryAdmin.sol

@@ -0,0 +1,237 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.20;
+
+import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
+import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
+import {AuthorityUtils} from "@openzeppelin/contracts/access/manager/AuthorityUtils.sol";
+
+import {RoleId, RoleIdLib, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE} from "../type/RoleId.sol";
+
+import {AccessManagerExtendedInitializeable} from "../shared/AccessManagerExtendedInitializeable.sol";
+import {InitializableCustom} from "../shared/InitializableCustom.sol";
+
+import {IRegistry} from "./IRegistry.sol";
+import {ReleaseManager} from "./ReleaseManager.sol";
+import {TokenRegistry} from "./TokenRegistry.sol";
+
+/*
+    1) GIF_MANAGER_ROLE
+        - can have arbitrary number of members
+        - responsible for services registrations
+        - responsible for token registration and activation
+
+    2) 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 creation and activation of releases
+*/
+
+// !!! USE BUILDER PATTERN FOR CONFIG 
+// introduce class - config
+// create instance of this class in admin initializer function
+// call it "add"/"push" function for each entry in config (provide entry parameneters)
+// each call will configure access manager for given parameneters
+// in the end you have fully configured access manager and config object
+
+// grants GIF_ADMIN_ROLE to registry owner as registryOwner is transaction sender
+// grants GIF_MANAGER_ROLE to registry owner via contructor argument
+contract RegistryAdmin is
+    AccessManaged,
+    InitializableCustom
+{
+    error ErrorRegistryAdminReleaseManagerAuthorityMismatch();
+    error ErrorRegistryAdminTokenRegistryAuthorityMismatch();
+    error ErrorRegistryAdminStakingAuthorityMismatch();
+
+    string public constant GIF_ADMIN_ROLE_NAME = "GifAdminRole";
+    string public constant GIF_MANAGER_ROLE_NAME = "GifManagerRole";
+
+    string public constant RELEASE_MANAGER_TARGET_NAME = "ReleaseManager";
+    string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
+    string public constant STAKING_TARGET_NAME = "Staking";
+    
+    address private _releaseManager;
+    address private _tokenRegistry;
+    address private _staking;
+
+    constructor()
+        AccessManaged(msg.sender)
+        InitializableCustom()
+    {
+        AccessManagerExtendedInitializeable accessManager = new AccessManagerExtendedInitializeable();
+        accessManager.initialize(address(this));
+        setAuthority(address(accessManager));
+    }
+
+    function initialize(
+        IRegistry registry,
+        address gifAdmin, 
+        address gifManager
+    )
+        external
+        initializer
+    {
+        // validate input
+        address releaseManagerAddress = registry.getReleaseManagerAddress();
+        if(IAccessManaged(releaseManagerAddress).authority() != authority()) {
+            revert ErrorRegistryAdminReleaseManagerAuthorityMismatch();
+        }
+
+        address tokenRegistryAddress = registry.getTokenRegistryAddress();
+        if(IAccessManaged(tokenRegistryAddress).authority() != authority()) {
+            revert ErrorRegistryAdminTokenRegistryAuthorityMismatch();
+        }
+
+        address stakingAddress = registry.getStakingAddress();
+        if(IAccessManaged(stakingAddress).authority() != authority()) {
+            revert ErrorRegistryAdminStakingAuthorityMismatch();
+        }
+
+        _releaseManager = releaseManagerAddress;
+        _tokenRegistry = tokenRegistryAddress;
+        _staking = stakingAddress;
+
+        // at this moment all registry contracts are deployed and fully intialized
+        _createRole(GIF_ADMIN_ROLE(), GIF_ADMIN_ROLE_NAME);
+        _createRole(GIF_MANAGER_ROLE(), GIF_MANAGER_ROLE_NAME);
+
+        _createTarget(_releaseManager, RELEASE_MANAGER_TARGET_NAME);
+        _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME);
+        _createTarget(_staking, STAKING_TARGET_NAME);
+
+        _setGifAdminRole();
+        _setGifManagerRole();
+
+        _grantRole(GIF_ADMIN_ROLE(), gifAdmin, 0);
+        _grantRole(GIF_MANAGER_ROLE(), gifManager, 0);
+
+        // set gif manager role admin
+        _setRoleAdmin(GIF_MANAGER_ROLE(), GIF_ADMIN_ROLE());
+    }
+
+    // TODO makes sense to do this in intialize() function
+    // it is a single contract
+    // but if many token registries a possible...
+    /*function setTokenRegistry(
+        address tokenRegistry
+    )
+        external
+        restricted() // GIF_ADMIN_ROLE
+    {
+        // for TokenRegistry
+        bytes4[] memory functionSelector = new bytes4[](5);
+        functionSelector[0] = TokenRegistry.registerToken.selector;
+        functionSelector[1] = TokenRegistry.registerRemoteToken.selector;
+        functionSelector[2] = TokenRegistry.setActive.selector;
+        functionSelector[3] = TokenRegistry.setActiveForVersion.selector;
+
+        // only needed for testing TODO find a better way
+        functionSelector[4] = TokenRegistry.setActiveWithVersionCheck.selector;
+        _setTargetFunctionRole(address(tokenRegistry), functionSelector, GIF_MANAGER_ROLE());
+    }*/
+
+
+    function setTargetFunctionRole(
+        address target, 
+        bytes4[] memory selector,
+        RoleId roleId
+    )
+        external
+        restricted // RELEASE_MANAGER_ROLE -> TODO create this role
+    {
+        _setTargetFunctionRole(target, selector, roleId);
+    }
+
+    /*function transferAdmin(address to)
+        external
+        restricted // only with GIF_ADMIN_ROLE or nft owner
+    {
+        _accessManager.revoke(GIF_ADMIN_ROLE, );
+        _accesssManager.grant(GIF_ADMIN_ROLE, to, 0);
+    }*/
+
+    //--- view functions ----------------------------------------------------//
+
+    function hasRole(address account, RoleId roleId) external view returns(bool) {
+        (bool isMember,) =  AccessManagerExtendedInitializeable(authority()).hasRole(roleId.toInt(), account);
+        return isMember;
+    }
+
+
+    function canCall(
+        address account,
+        address target,
+        bytes4 functionSelector
+    )
+        external
+        view
+        returns(bool)
+    {
+        (bool immediate,) = AuthorityUtils.canCallWithDelay(
+            authority(),
+            account,
+            target,
+            functionSelector);
+
+        return immediate;
+    }
+
+    //--- private functions -------------------------------------------------//
+
+    function _setGifAdminRole() private
+    {
+        // for ReleaseManager
+        bytes4[] memory functionSelector2 = new bytes4[](2);
+        //functionSelector2[0] = ReleaseManager.registerStaking.selector;
+        functionSelector2[0] = ReleaseManager.createNextRelease.selector;
+        functionSelector2[1] = ReleaseManager.activateNextRelease.selector;
+
+        _setTargetFunctionRole(_releaseManager, functionSelector2, GIF_ADMIN_ROLE());
+
+        // for Staking
+    }
+    
+    function _setGifManagerRole() private 
+    {
+        // for TokenRegistry
+        bytes4[] memory functionSelectorTr = new bytes4[](5);
+        functionSelectorTr[0] = TokenRegistry.registerToken.selector;
+        functionSelectorTr[1] = TokenRegistry.registerRemoteToken.selector;
+        functionSelectorTr[2] = TokenRegistry.setActive.selector;
+        functionSelectorTr[3] = TokenRegistry.setActiveForVersion.selector;
+
+        // only needed for testing TODO find a better way
+        functionSelectorTr[4] = TokenRegistry.setActiveWithVersionCheck.selector;
+        _setTargetFunctionRole(_tokenRegistry, functionSelectorTr, GIF_MANAGER_ROLE());
+
+        // for ReleaseManager
+        bytes4[] memory functionSelectorRm = new bytes4[](2);
+        functionSelectorRm[0] = ReleaseManager.registerService.selector;
+        functionSelectorRm[1] = ReleaseManager.prepareNextRelease.selector;
+        _setTargetFunctionRole(_releaseManager, functionSelectorRm, GIF_MANAGER_ROLE());
+
+        // for Staking
+    }
+
+
+    function _setTargetFunctionRole(address target, bytes4[] memory selectors, RoleId roleId) private {
+        AccessManagerExtendedInitializeable(authority()).setTargetFunctionRole(target, selectors, roleId.toInt());        
+    }
+
+    function _setRoleAdmin(RoleId roleId, RoleId adminRoleId) private {
+        AccessManagerExtendedInitializeable(authority()).setRoleAdmin(roleId.toInt(), adminRoleId.toInt());
+    }
+
+    function _grantRole(RoleId roleId, address account, uint32 executionDelay) private {
+        AccessManagerExtendedInitializeable(authority()).grantRole(roleId.toInt(), account, executionDelay);
+    }
+
+    function _createRole(RoleId roleId, string memory roleName) private {
+        AccessManagerExtendedInitializeable(authority()).createRole(roleId.toInt(), roleName);
+    }
+
+    function _createTarget(address target, string memory targetName) private {
+        AccessManagerExtendedInitializeable(authority()).createTarget(target, targetName);
+    }
+}

package/contracts/registry/RegistryService.sol

@@ -15,7 +15,6 @@ import {IDistributionComponent} from "../../contracts/distribution/IDistribution
 import {IVersionable} from "../../contracts/shared/IVersionable.sol";
 import {Versionable} from "../../contracts/shared/Versionable.sol";
 import {IRegisterable} from "../../contracts/shared/IRegisterable.sol";
-import {Registerable} from "../../contracts/shared/Registerable.sol";
 
 import {RoleId, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE, ORACLE_OWNER_ROLE} from "../../contracts/type/RoleId.sol";
 import {ObjectType, REGISTRY, SERVICE, PRODUCT, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, APPLICATION, POLICY, CLAIM, BUNDLE, STAKE, STAKING, PRICE} from "../../contracts/type/ObjectType.sol";
@@ -67,7 +66,7 @@ contract RegistryService is
     function registerStaking(IRegisterable staking, address owner)
         external
         virtual
-        restricted
+        restricted()
         returns(
             IRegistry.ObjectInfo memory info
         )
@@ -86,7 +85,7 @@ contract RegistryService is
         ) 
     {
         if(!instance.supportsInterface(type(IInstance).interfaceId)) {
-            revert NotInstance();
+            revert ErrorRegistryServiceNotInstance(address(instance));
         }
 
         info = _getAndVerifyContractInfo(instance, INSTANCE(), owner);
@@ -104,7 +103,7 @@ contract RegistryService is
     {
         // CAN revert if no ERC165 support -> will revert with empty message 
         if(!product.supportsInterface(type(IProductComponent).interfaceId)) {
-            revert NotProduct();
+            revert ErrorRegistryServiceNotProduct(address(product));
         }
 
         info = _getAndVerifyContractInfo(product, PRODUCT(), owner);
@@ -124,7 +123,7 @@ contract RegistryService is
     {
         // CAN revert if no ERC165 support -> will revert with empty message 
         if(!component.supportsInterface(type(IComponent).interfaceId)) {
-            revert NotComponent();
+            revert ErrorRegistryServiceNotComponent(address(component));
         }
 
         info = _getAndVerifyContractInfo(component, objectType, initialOwner);
@@ -139,7 +138,7 @@ contract RegistryService is
         ) 
     {
         if(!pool.supportsInterface(type(IPoolComponent).interfaceId)) {
-            revert NotPool();
+            revert ErrorRegistryServiceNotPool(address(pool));
         }
 
         info = _getAndVerifyContractInfo(pool, POOL(), owner);
@@ -154,7 +153,7 @@ contract RegistryService is
         ) 
     {
         if(!distribution.supportsInterface(type(IDistributionComponent).interfaceId)) {
-            revert NotDistribution();
+            revert ErrorRegistryServiceNotDistribution(address(distribution));
         }
 
         info = _getAndVerifyContractInfo(distribution, DISTRIBUTION(), owner);
@@ -176,7 +175,6 @@ contract RegistryService is
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, POLICY());
-
         nftId = getRegistry().register(info);
     }
 
@@ -186,7 +184,6 @@ contract RegistryService is
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, BUNDLE());
-
         nftId = getRegistry().register(info);
     }
 
@@ -196,71 +193,9 @@ contract RegistryService is
         returns(NftId nftId) 
     {
         _verifyObjectInfo(info, STAKE());
-
         nftId = getRegistry().register(info);
     }
 
-    // from IRegisterable
-
-    function getFunctionConfigs()
-        external
-        pure
-        returns(
-            FunctionConfig[] memory config
-        )
-    {
-        config = new FunctionConfig[](11);
-
-        // order of service registrations MUST be reverse to this array 
-        /*config[-1].serviceDomain = STAKE();
-        config[-1].selector = RegistryService.registerStake.selector;*/
-
-        config[0].serviceDomain = POLICY();
-        config[0].authorizedSelectors = new bytes4[](0);
-
-        config[1].serviceDomain = APPLICATION();
-        config[1].authorizedSelectors = new bytes4[](1);
-        config[1].authorizedSelectors[0] = RegistryService.registerPolicy.selector;
-
-        config[2].serviceDomain = CLAIM();
-        config[2].authorizedSelectors = new bytes4[](0);
-
-        config[3].serviceDomain = PRODUCT();
-        config[3].authorizedSelectors = new bytes4[](1);
-        config[3].authorizedSelectors[0] = RegistryService.registerProduct.selector;
-
-        config[4].serviceDomain = POOL();
-        config[4].authorizedSelectors = new bytes4[](1);
-        config[4].authorizedSelectors[0] = RegistryService.registerPool.selector;
-
-        // registration of bundle service must preceed registration of pool service
-        config[5].serviceDomain = BUNDLE();
-        config[5].authorizedSelectors = new bytes4[](1);
-        config[5].authorizedSelectors[0] = RegistryService.registerBundle.selector;
-
-        // registration of pricing service must preceed registration of application service
-        config[6].serviceDomain = PRICE();
-        config[6].authorizedSelectors = new bytes4[](0);
-
-        // registration of distribution service must preceed registration of pricing service
-        config[7].serviceDomain = DISTRIBUTION();
-        config[7].authorizedSelectors = new bytes4[](2);
-        config[7].authorizedSelectors[0] = RegistryService.registerDistribution.selector;
-        config[7].authorizedSelectors[1] = RegistryService.registerDistributor.selector;
-
-        config[8].serviceDomain = COMPONENT();
-        config[8].authorizedSelectors = new bytes4[](1);
-        config[8].authorizedSelectors[0] = RegistryService.registerComponent.selector;
-
-        config[9].serviceDomain = INSTANCE();
-        config[9].authorizedSelectors = new bytes4[](1);
-        config[9].authorizedSelectors[0] = RegistryService.registerInstance.selector;
-
-        config[10].serviceDomain = STAKING();
-        config[10].authorizedSelectors = new bytes4[](1);
-        config[10].authorizedSelectors[0] = RegistryService.registerStaking.selector;
-    }
-
     // Internal
 
     function _getAndVerifyContractInfo(
@@ -269,34 +204,37 @@ contract RegistryService is
         address expectedOwner // assume can be 0 when given by other service
     )
         internal
-        // view
+        view
         returns(
             IRegistry.ObjectInfo memory info 
         )
     {
         info = registerable.getInitialInfo();
-        info.objectAddress = address(registerable);
+
+        if(info.objectAddress != address(registerable)) {
+            revert ErrorRegistryServiceRegisterableAddressInvalid(registerable, info.objectAddress);
+        }
 
         if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
-            revert UnexpectedRegisterableType(expectedType, info.objectType);
+            revert ErrorRegistryServiceRegisterableTypeInvalid(registerable, expectedType, info.objectType);
         }
 
         address owner = info.initialOwner;
 
         if(owner != expectedOwner) { // registerable owner protection
-            revert NotRegisterableOwner(expectedOwner);
+            revert ErrorRegistryServiceRegisterableOwnerInvalid(registerable, expectedOwner, owner);
         }
 
         if(owner == address(registerable)) {
-            revert SelfRegistration();
+            revert ErrorRegistryServiceRegisterableSelfRegistration(registerable);
         }
 
         if(owner == address(0)) {
-            revert RegisterableOwnerIsZero();
+            revert ErrorRegistryServiceRegisterableOwnerZero(registerable);
         }
         
         if(getRegistry().isRegistered(owner)) { 
-            revert RegisterableOwnerIsRegistered();
+            revert ErrorRegistryServiceRegisterableOwnerRegistered(registerable, owner);
         }
     }
 
@@ -307,21 +245,22 @@ contract RegistryService is
         internal
         view
     {
-        // enforce instead of check
-        info.objectAddress = address(0);
+        if(info.objectAddress > address(0)) {
+            revert ErrorRegistryServiceObjectAddressNotZero(info.objectType);
+        }
 
         if(info.objectType != expectedType) {// type is checked in registry anyway...but service logic may depend on expected value
-            revert UnexpectedRegisterableType(expectedType, info.objectType);
+            revert ErrorRegistryServiceObjectTypeInvalid(expectedType, info.objectType);
         }
 
         address owner = info.initialOwner;
 
         if(owner == address(0)) {
-            revert RegisterableOwnerIsZero();
+            revert ErrorRegistryServiceObjectOwnerZero(info.objectType);
         }
 
         if(getRegistry().isRegistered(owner)) { 
-            revert RegisterableOwnerIsRegistered();
+            revert ErrorRegistryServiceObjectOwnerRegistered(info.objectType, owner);
         }
     }
 }

package/contracts/registry/RegistryServiceManager.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
 import {AccessManager} from "@openzeppelin/contracts/access/manager/AccessManager.sol";
@@ -13,39 +13,37 @@ import {TokenRegistry} from "./TokenRegistry.sol";
 contract RegistryServiceManager is
     ProxyManager
 {
+    error ErrorRegistryAccessManagerAuthorityZero();
+    error ErrorRegistryAccessManagerRegistryZero();
+
     bytes32 constant public ACCESS_MANAGER_CREATION_CODE_HASH = 0x0;
 
     RegistryService private immutable _registryService;
 
     /// @dev initializes proxy manager with registry service implementation and deploys registry
     constructor(
-        address initialAuthority, // used by implementation 
-        address registryAddress) // used by implementation 
-        ProxyManager(registryAddress)
+        address authority, // used by implementation 
+        address registry, // used by implementation 
+        bytes32 salt
+    ) 
+        ProxyManager(registry)
     {
-        require(initialAuthority > address(0), "RegistryServiceManager: initial authority is 0");
-        require(registryAddress > address(0), "RegistryServiceManager: registry is 0");
+        if(authority == address(0)) {
+            revert ErrorRegistryAccessManagerAuthorityZero();
+        }
+
+        if(registry == address(0)) {
+            revert ErrorRegistryAccessManagerRegistryZero();
+        }
         
-        // implementation's initializer func `data` argument
-        RegistryService srv = new RegistryService();
-        bytes memory data = abi.encode(registryAddress, initialAuthority);
-        IVersionable versionable = deploy(
+        RegistryService srv = new RegistryService{ salt: salt }();
+        bytes memory data = abi.encode(registry, authority);
+        IVersionable versionable = deployDetermenistic(
             address(srv), 
-            data);
+            data,
+            salt);
 
         _registryService = RegistryService(address(versionable));
-
-//        _linkToNftOwnable(address(_registryService));
-    }
-
-    // // from IRegisterable
-
-    // // IMPORTANT: registry here and in constructor MUST be the same
-    function linkOwnershipToServiceNft()
-        public
-        onlyOwner
-    {
-        _linkToNftOwnable(address(_registryService));
     }
 
     //--- view functions ----------------------------------------------------//