@etherisc/gif-next 0.0.2-b3a8633-027 → 0.0.2-b3a9c97-695

package/contracts/registry/RegistryAdmin.sol

@@ -7,13 +7,13 @@ import {IRegistry} from "./IRegistry.sol";
 import {IService} from "../shared/IService.sol";
 import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
 import {IStaking} from "../staking/IStaking.sol";
-import {ObjectType, ObjectTypeLib, ALL, REGISTRY, STAKING, POOL, RELEASE} from "../type/ObjectType.sol";
+import {ObjectType, ObjectTypeLib, ALL, POOL, RELEASE} from "../type/ObjectType.sol";
 import {ReleaseRegistry} from "./ReleaseRegistry.sol";
 import {RoleId, RoleIdLib, ADMIN_ROLE, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
 import {StakingStore} from "../staking/StakingStore.sol";
+import {STAKING} from "../type/ObjectType.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
 import {VersionPart} from "../type/Version.sol";
-import {SidenetContract} from "../shared/MainnetId.sol";
 
 /*
     1) GIF_MANAGER_ROLE
@@ -26,34 +26,37 @@ import {SidenetContract} from "../shared/MainnetId.sol";
         - MUST have 1 member at any time
         - granted/revoked ONLY in transferAdminRole() -> consider lock out situations!!!
         - responsible for creation and activation of releases
+
+    createServiceTarget(type, release)
+    createServiceRole(type,release)
+    getServiceRole(type, release)
 */
 contract RegistryAdmin is
-    SidenetContract,
     AccessAdmin
 {
+    error ErrorRegistryAdminIsAlreadySetUp();
+
     string public constant GIF_ADMIN_ROLE_NAME = "GifAdminRole";
     string public constant GIF_MANAGER_ROLE_NAME = "GifManagerRole";
     string public constant POOL_SERVICE_ROLE_NAME = "PoolServiceRole";
     string public constant RELEASE_REGISTRY_ROLE_NAME = "ReleaseRegistryRole";
-    string public constant REGISTRY_SERVICE_ROLE_NAME = "RegistryServiceRole";
     string public constant STAKING_SERVICE_ROLE_NAME = "StakingServiceRole";
     string public constant STAKING_ROLE_NAME = "StakingRole";
 
-    string public constant REGISTRY_TARGET_NAME = "Registry";
     string public constant RELEASE_REGISTRY_TARGET_NAME = "ReleaseRegistry";
     string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
     string public constant STAKING_TARGET_NAME = "Staking";
     string public constant STAKING_STORE_TARGET_NAME = "StakingStore";
 
     uint8 public constant MAX_NUM_RELEASES = 99;
-    // TODO consider deleting this
+
     mapping(address service => VersionPart majorVersion) private _ServiceRelease;
 
-    address internal _registry;
     address private _releaseRegistry;
     address private _tokenRegistry;
     address private _staking;
     address private _stakingStore;
+    bool private _setupCompleted;
 
     constructor() AccessAdmin() { }
 
@@ -63,10 +66,11 @@ contract RegistryAdmin is
         address gifManager
     )
         external
-        initializer
         onlyDeployer()
     {
-        _registry = address(registry);
+        if (_setupCompleted) { revert ErrorRegistryAdminIsAlreadySetUp(); } 
+        else { _setupCompleted = true; }
+
         _releaseRegistry = registry.getReleaseRegistryAddress();
         _tokenRegistry = registry.getTokenRegistryAddress();
         _staking = registry.getStakingAddress();
@@ -79,7 +83,6 @@ contract RegistryAdmin is
         _setupGifAdminRole(gifAdmin);
         _setupGifManagerRole(gifManager);
 
-        _setupRegistry();
         _setupReleaseRegistry();
         _setupStaking();
     }
@@ -90,46 +93,15 @@ contract RegistryAdmin is
     /// Permissioned function: Access is restricted to release manager.
     function authorizeService(
         IServiceAuthorization serviceAuthorization,
-        IService service,
-        ObjectType serviceDomain,
-        VersionPart releaseVersion
+        IService service
     )
         external
         restricted()
     {
-        _createServiceTargetAndRole(service, serviceDomain, releaseVersion);
-        _authorizeServiceFunctions(serviceAuthorization, service, serviceDomain, releaseVersion);
+        _createServiceTargetAndRole(service);
+        _authorizeServiceFunctions(serviceAuthorization, service);
     }
 
-    function grantServiceRole(
-        IService service,
-        ObjectType domain, 
-        VersionPart version
-    )
-        external
-        restricted()
-    {
-        _grantRoleToAccount( 
-            RoleIdLib.roleForTypeAndVersion(
-                domain, 
-                version),
-            address(service)); 
-    }
-
-    function revokeServiceRole(
-        IService service,
-        ObjectType domain, 
-        VersionPart version
-    )
-        external
-        restricted()
-    {
-        _revokeRoleFromAccount(
-            RoleIdLib.roleForTypeAndVersion(
-                domain, 
-                version), 
-            address(service));
-    }
 
     function grantServiceRoleForAllVersions(IService service, ObjectType domain)
         external
@@ -140,44 +112,14 @@ contract RegistryAdmin is
             address(service)); 
     }
 
-    function revokeServiceRoleForAllVersions(IService service, ObjectType domain)
-        external
-        restricted()
-    {
-        _revokeRoleFromAccount(
-            RoleIdLib.roleForTypeAndAllVersions(domain), 
-            address(service));
-    }
-
-    /*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 getGifAdminRole() external view returns (RoleId) {
-        return GIF_ADMIN_ROLE();
-    }
-
-    function getGifManagerRole() external view returns (RoleId) {
-        return GIF_MANAGER_ROLE();
-    }
-
-    //--- private functions -------------------------------------------------//
 
-    function _createServiceTargetAndRole(
-        IService service, 
-        ObjectType serviceDomain, 
-        VersionPart releaseVersion
-    )
+    function _createServiceTargetAndRole(IService service)
         private
     {
+        ObjectType serviceDomain = service.getDomain();
         string memory baseName = ObjectTypeLib.toName(serviceDomain);
-        uint256 versionInt = releaseVersion.toInt();
+        VersionPart version = service.getVersion().toMajorPart();
+        uint256 versionInt = version.toInt();
 
         // create service target
         string memory serviceTargetName = ObjectTypeLib.toVersionedName(
@@ -192,7 +134,7 @@ contract RegistryAdmin is
         // create service role
         RoleId serviceRoleId = RoleIdLib.roleForTypeAndVersion(
             serviceDomain, 
-            releaseVersion);
+            version);
 
         _createRole(
             serviceRoleId, 
@@ -213,15 +155,15 @@ contract RegistryAdmin is
 
     function _authorizeServiceFunctions(
         IServiceAuthorization serviceAuthorization,
-        IService service,
-        ObjectType serviceDomain, 
-        VersionPart releaseVersion
+        IService service
     )
         private
     {
+        ObjectType serviceDomain = service.getDomain();
         ObjectType authorizedDomain;
         RoleId authorizedRoleId;
 
+        VersionPart release = service.getVersion().toMajorPart();
         ObjectType[] memory authorizedDomains = serviceAuthorization.getAuthorizedDomains(serviceDomain);
 
         for (uint256 i = 0; i < authorizedDomains.length; i++) {
@@ -233,7 +175,7 @@ contract RegistryAdmin is
             } else {
                 authorizedRoleId = RoleIdLib.roleForTypeAndVersion(
                 authorizedDomain, 
-                releaseVersion);
+                release);
             }
 
             // get authorized functions for authorized domain
@@ -248,12 +190,27 @@ contract RegistryAdmin is
         }
     }
 
-    //--- private initialization functions -------------------------------------------//
-
-    function _setupGifAdminRole(address gifAdmin) 
-        private 
-        onlyInitializing()
+    /*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 getGifAdminRole() external view returns (RoleId) {
+        return GIF_ADMIN_ROLE();
+    }
+
+    function getGifManagerRole() external view returns (RoleId) {
+        return GIF_MANAGER_ROLE();
+    }
+
+    //--- private functions -------------------------------------------------//
+
+    function _setupGifAdminRole(address gifAdmin) private {
         
         _createRole(
             GIF_ADMIN_ROLE(), 
@@ -275,10 +232,7 @@ contract RegistryAdmin is
         _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
     }
     
-    function _setupGifManagerRole(address gifManager)
-        private 
-        onlyInitializing()
-    {
+    function _setupGifManagerRole(address gifManager) private {
 
         _createRole(
             GIF_MANAGER_ROLE(), 
@@ -308,37 +262,8 @@ contract RegistryAdmin is
         _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
     }
 
-    function _setupRegistry()
-        internal
-        virtual
-        onlyInitializing()
-    {
-        _createTarget(_registry, REGISTRY_TARGET_NAME, true, false);
-
-        // registry function authorization for registry service
-        RoleId registryServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(REGISTRY());
-        _createRole(
-            registryServiceRoleId, 
-            toRole({
-                adminRoleId: ADMIN_ROLE(),
-                roleType: RoleType.Contract,
-                maxMemberCount: MAX_NUM_RELEASES,
-                name: REGISTRY_SERVICE_ROLE_NAME}));
-
-        FunctionInfo[] memory functions;
-        functions = new FunctionInfo[](2);
-        functions[0] = toFunction(IRegistry.register.selector, "register");
-        functions[1] = toFunction(IRegistry.registerWithCustomType.selector, "registerWithCustomType");
-        // TODO add registerChainRegistry()
-
-        _authorizeTargetFunctions(_registry, registryServiceRoleId, functions);
-    }
-
 
-    function _setupReleaseRegistry()
-        private 
-        onlyInitializing()
-    {
+    function _setupReleaseRegistry() private {
 
         _createTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, true, false);
 
@@ -352,23 +277,16 @@ contract RegistryAdmin is
                 name: RELEASE_REGISTRY_ROLE_NAME}));
 
         FunctionInfo[] memory functions;
-        functions = new FunctionInfo[](5);
+        functions = new FunctionInfo[](2);
         functions[0] = toFunction(RegistryAdmin.authorizeService.selector, "authorizeService");
         functions[1] = toFunction(RegistryAdmin.grantServiceRoleForAllVersions.selector, "grantServiceRoleForAllVersions");
-        functions[2] = toFunction(RegistryAdmin.revokeServiceRoleForAllVersions.selector, "revokeServiceRoleForAllVersions");
-        functions[3] = toFunction(RegistryAdmin.grantServiceRole.selector, "grantServiceRole");
-        functions[4] = toFunction(RegistryAdmin.revokeServiceRole.selector, "revokeServiceRole");
-
         _authorizeTargetFunctions(address(this), releaseRegistryRoleId, functions);
 
         _grantRoleToAccount(releaseRegistryRoleId, _releaseRegistry);
     }
 
 
-    function _setupStaking()
-        private 
-        onlyInitializing()
-    {
+    function _setupStaking() private {
         _createTarget(_staking, STAKING_TARGET_NAME, true, false);
         _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, true, false);
 

package/contracts/registry/ReleaseRegistry.sol

@@ -9,7 +9,7 @@ import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManage
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
 import {NftId} from "../type/NftId.sol";
-import {RoleId, RoleIdLib, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
+import {RoleId, ADMIN_ROLE, PUBLIC_ROLE} from "../type/RoleId.sol";
 import {ObjectType, ObjectTypeLib, POOL, RELEASE, REGISTRY, SERVICE, STAKING} from "../type/ObjectType.sol";
 import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
 import {Timestamp, TimestampLib, zeroTimestamp, ltTimestamp} from "../type/Timestamp.sol";
@@ -32,8 +32,6 @@ import {Registry} from "./Registry.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
 import {ReleaseLifecycle} from "./ReleaseLifecycle.sol";
 
-// TODO rename to something that does not end with 'Manager' 
-// everywhere else *Manager points to an upgradeable contract
 contract ReleaseRegistry is 
     AccessManaged,
     ReleaseLifecycle, 
@@ -99,6 +97,9 @@ contract ReleaseRegistry is
     mapping(VersionPart version => IRegistry.ReleaseInfo info) internal _releaseInfo;
     mapping(VersionPart version => IServiceAuthorization authz) internal _serviceAuthorization;
 
+    // TODO check where/why this is used
+    mapping(address registryService => VersionPart version) _releaseVersionByAddress;
+
     VersionPart private _initial;// first active version    
     VersionPart internal _latest; // latest active version
     VersionPart internal _next; // version to create and activate 
@@ -228,29 +229,22 @@ contract ReleaseRegistry is
             revert ErrorReleaseRegistryServiceDomainMismatch(expectedDomain, serviceDomain);
         }
 
-        // TODO: service address matches defined in release config
+        // register service with registry
+        nftId = _registry.registerService(info, serviceVersion, serviceDomain);
+        service.linkToRegisteredNftId();
+        _registeredServices++;
 
         // setup service authorization
         _admin.authorizeService(
             _serviceAuthorization[releaseVersion], 
-            service,
-            serviceDomain,
-            releaseVersion);
+            service);
 
+        // TODO consider to extend this to REGISTRY
         // special roles for registry/staking/pool service
-        if (
-            serviceDomain == REGISTRY() ||
-            serviceDomain == STAKING() ||
-            serviceDomain == POOL()) 
-        {
+        if (serviceDomain == STAKING() || serviceDomain == POOL()) {
+            // TODO rename to grantServiceDomainRole()
             _admin.grantServiceRoleForAllVersions(service, serviceDomain);
         }
-
-        _registeredServices++;
-
-        // register service with registry
-        nftId = _registry.registerService(info, serviceVersion, serviceDomain);
-        service.linkToRegisteredNftId();
     }
 
 
@@ -281,6 +275,7 @@ contract ReleaseRegistry is
         _latest = version;
         _state[version] = newState;
 
+        _releaseVersionByAddress[service] = version;
         _releaseInfo[version].activatedAt = TimestampLib.blockTimestamp();
 
         emit LogReleaseActivation(version);
@@ -299,7 +294,8 @@ contract ReleaseRegistry is
             revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
         }
 
-        _revokeReleaseRoles(version);
+        // TODO come up with a substitute
+        //_releaseAccessManager[version].disable();
 
         _state[version] = newState;
         _releaseInfo[version].disabledAt = TimestampLib.blockTimestamp();
@@ -321,7 +317,8 @@ contract ReleaseRegistry is
             revert ErrorReleaseRegistryReleaseActivationDisallowed(version, state);
         }
 
-        _grantReleaseRoles(version);
+        // TODO come up with a substitute
+        // _releaseAccessManager[version].enable();
         
         _state[version] = newState;
         _releaseInfo[version].disabledAt = zeroTimestamp();
@@ -339,6 +336,11 @@ contract ReleaseRegistry is
         return Clones.predictDeterministicAddress(implementation, salt, deployer);
     }
 
+    function isActiveRegistryService(address service) external view returns(bool) {
+        VersionPart version = _releaseVersionByAddress[service];
+        return isActiveRelease(version);
+    }
+
     function isActiveRelease(VersionPart version) public view returns(bool) {
         return _state[version] == ACTIVE();
     }
@@ -387,57 +389,6 @@ contract ReleaseRegistry is
 
     //--- private functions ----------------------------------------------------//
 
-    function _revokeReleaseRoles(VersionPart version)
-        private
-    {
-        address service;
-        ObjectType domain;
-
-        ObjectType[] memory domains = _serviceAuthorization[version].getServiceDomains();
-        for(uint idx = 0; idx < domains.length; idx++)
-        {
-            domain = domains[idx];
-            service = _registry.getServiceAddress(domain, version);
-            _admin.revokeServiceRole(IService(service), domain, version);
-
-            // special roles for registry/staking/pool service
-            if(
-                domain == REGISTRY() ||
-                domain == STAKING() ||
-                domain == POOL()
-            )
-            {
-                _admin.revokeServiceRoleForAllVersions(IService(service), domain);
-            }
-        }
-    }
-
-    function _grantReleaseRoles(VersionPart version)
-        private
-    {
-        address service;
-        ObjectType domain;
-
-        // TODO consider getting domains from local store
-        ObjectType[] memory domains = _serviceAuthorization[version].getServiceDomains();
-        for(uint idx = 0; idx < domains.length; idx++)
-        {
-            domain = domains[idx];
-            service = _registry.getServiceAddress(domain, version);
-            _admin.grantServiceRole(IService(service), domain, version);
-
-            // special roles for registry/staking/pool service
-            if(
-                domain == REGISTRY() ||
-                domain == STAKING() ||
-                domain == POOL()
-            )
-            {
-                _admin.grantServiceRoleForAllVersions(IService(service), domain);
-            }
-        }
-    }
-
     function _verifyService(IService service)
         internal
         view
@@ -521,7 +472,8 @@ contract ReleaseRegistry is
         if (registryAddress == address(0)) {
             return false;
         }
-        // TODO try catch and return false in case of revert or just panic
+        // TODO try catch and return false in case of revert
+        // or just panic
         // check if contract returns a zero nft id for its own address
         if (IRegistry(registryAddress).getNftId(registryAddress).eqz()) {
             return false;

package/contracts/shared/Component.sol

@@ -6,7 +6,7 @@ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessMana
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import {Amount} from "../type/Amount.sol";
+import {Amount, AmountLib} from "../type/Amount.sol";
 import {IComponent} from "./IComponent.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
@@ -26,7 +26,6 @@ abstract contract Component is
     struct ComponentStorage {
         string _name; // unique (per instance) component name
         IERC20Metadata _token; // token for this component
-        TokenHandler _tokenHandler;
         address _wallet;
         bool _isInterceptor;
         bytes _data;
@@ -40,6 +39,12 @@ abstract contract Component is
         _;
     }
 
+    modifier onlyNftOwner(NftId nftId) {
+        if(msg.sender != getRegistry().ownerOf(nftId)) {
+            revert ErrorNftOwnableNotOwner(msg.sender);
+        }
+        _;
+    }
 
     function _getComponentStorage() private pure returns (ComponentStorage storage $) {
         assembly {
@@ -78,7 +83,6 @@ abstract contract Component is
         ComponentStorage storage $ = _getComponentStorage();
         $._name = name;
         $._token = IERC20Metadata(token);
-        $._tokenHandler = TokenHandler(address(0));
         $._wallet = address(this);
         $._isInterceptor = isInterceptor;
         $._data = componentData;
@@ -105,11 +109,11 @@ abstract contract Component is
             revert ErrorComponentWalletNotComponent();
         }
 
+        emit LogComponentTokenHandlerApproved(address(getTokenHandler()), spendingLimitAmount);
+
         IERC20Metadata(token).approve(
             address(getTokenHandler()),
             spendingLimitAmount.toInt());
-
-        emit LogComponentTokenHandlerApproved(address(getTokenHandler()), spendingLimitAmount);
     }
 
     function setWallet(address newWallet)
@@ -128,7 +132,7 @@ abstract contract Component is
                 // move tokens from component smart contract to external wallet
             } else {
                 // move tokens from external wallet to component smart contract or another external wallet
-                uint256 allowance = token.allowance(currentWallet, address(this));
+                uint256 allowance = token.allowance(currentWallet, address(getTokenHandler()));
                 if (allowance < currentBalance) {
                     revert ErrorComponentWalletAllowanceTooSmall(currentWallet, newWallet, allowance, currentBalance);
                 }
@@ -140,14 +144,15 @@ abstract contract Component is
 
         // interactions
         if (currentBalance > 0) {
+            emit LogComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
+
             // transfer tokens from current wallet to new wallet
             if (currentWallet == address(this)) {
                 // transferFrom requires self allowance too
-                token.approve(address(this), currentBalance);
+                token.approve(address(getTokenHandler()), currentBalance);
             }
             
-            SafeERC20.safeTransferFrom(token, currentWallet, newWallet, currentBalance);
-            emit LogComponentWalletTokensTransferred(currentWallet, newWallet, currentBalance);
+            getTokenHandler().transfer(currentWallet, newWallet, AmountLib.toAmount(currentBalance));
         }
     }
 
@@ -253,29 +258,24 @@ abstract contract Component is
     }
 
 
-    /// @dev for component contracts that hold its own component information 
-    /// this function creates and sets a token hanlder for the components tokens
-    function _createAndSetTokenHandler()
-        internal
-    {
-        ComponentStorage storage $ = _getComponentStorage();
-        $._tokenHandler = new TokenHandler(address($._token));
-    }
-
-
     /// @dev depending on the source of the component information this function needs to be overwritten. 
     /// eg for instance linked components that externally store this information with the instance store contract
     function _getComponentInfo() internal virtual view returns (IComponents.ComponentInfo memory info) {
         ComponentStorage storage $ = _getComponentStorage();
-
+        
         return IComponents.ComponentInfo({
             name: $._name,
             productNftId: NftIdLib.zero(),
             token: $._token,
-            tokenHandler: $._tokenHandler,
+            tokenHandler: TokenHandler(address(0)),
             wallet: $._wallet, // initial wallet address
             data: $._data // user specific component data
         });
     }
 
+    function _approveTokenHandler(uint256 amount) internal {
+        ComponentStorage storage $ = _getComponentStorage();
+        $._token.approve(address(getComponentInfo().tokenHandler), amount);
+    }
+
 }