@etherisc/gif-next 0.0.2-f1b01e0-214 → 0.0.2-f1e6957-384

package/contracts/product/RiskService.sol

@@ -9,10 +9,9 @@ import {IRiskService} from "./IRiskService.sol";
 import {ContractLib} from "../shared/ContractLib.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {ObjectType, COMPONENT, PRODUCT, RISK} from "../type/ObjectType.sol";
-import {ACTIVE, PAUSED, KEEP_STATE} from "../type/StateId.sol";
+import {ACTIVE, KEEP_STATE, CLOSED} from "../type/StateId.sol";
 import {NftId} from "../type/NftId.sol";
 import {RiskId, RiskIdLib} from "../type/RiskId.sol";
-import {StateId} from "../type/StateId.sol";
 import {RiskSet} from "../instance/RiskSet.sol";
 import {Service} from "../shared/Service.sol";
 import {TimestampLib} from "../type/Timestamp.sol";
@@ -45,6 +44,7 @@ contract RiskService is
         bytes memory data
     )
         external 
+        virtual
         restricted()
         returns (RiskId riskId)
     {
@@ -55,10 +55,10 @@ contract RiskService is
         riskId = RiskIdLib.toRiskId(productNftId, id);
         IRisk.RiskInfo memory riskInfo = IRisk.RiskInfo({
             productNftId: productNftId, 
-            createdAt: TimestampLib.blockTimestamp(),
+            createdAt: TimestampLib.current(),
             data: data});
 
-        instance.getInstanceStore().createRisk(
+        instance.getProductStore().createRisk(
             riskId,
             riskInfo
         );
@@ -66,6 +66,8 @@ contract RiskService is
         // add risk to RiskSet
         RiskSet riskSet = instance.getRiskSet();
         riskSet.add(riskId);
+
+        emit LogRiskServiceRiskCreated(productNftId, riskId);
     }
 
 
@@ -74,6 +76,7 @@ contract RiskService is
         bytes memory data
     )
         external 
+        virtual
         restricted()
     {
         // checks
@@ -88,33 +91,65 @@ contract RiskService is
         }
 
         riskInfo.data = data;
-        instance.getInstanceStore().updateRisk(riskId, riskInfo, KEEP_STATE());
+        instance.getProductStore().updateRisk(riskId, riskInfo, KEEP_STATE());
+
+        emit LogRiskServiceRiskUpdated(productNftId, riskId);
     }
 
 
-    function updateRiskState(
+    /// @inheritdoc IRiskService
+    function setRiskLocked(
         RiskId riskId,
-        StateId state
+        bool locked
     )
         external 
+        virtual
         restricted()
     {
         // checks
         (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
 
-        NftId riskProductNftId = instance.getInstanceReader().getRiskInfo(riskId).productNftId;
-        if (riskProductNftId != productNftId) {
-            revert ErrorRiskServiceRiskProductMismatch(riskId, riskProductNftId, productNftId);
+        if (!instance.getRiskSet().hasRisk(productNftId, riskId)) {
+            revert ErrorRiskServiceUnknownRisk(productNftId, riskId);
         }
 
-        // effects
-        instance.getInstanceStore().updateRiskState(riskId, state);
+        if (instance.getInstanceReader().getRiskState(riskId) != ACTIVE()) {
+            revert ErrorRiskServiceRiskNotActive(productNftId, riskId);
+        }
 
-        if (state == ACTIVE()) {
+        if (locked) {
+            instance.getRiskSet().deactivate(riskId);
+            emit LogRiskServiceRiskLocked(productNftId, riskId);
+        } else {
             instance.getRiskSet().activate(riskId);
-        } else if (state == PAUSED()) {
-            instance.getRiskSet().pause(riskId);
+            emit LogRiskServiceRiskUnlocked(productNftId, riskId);
+        }
+    }
+
+    /// @inheritdoc IRiskService
+    function closeRisk(
+        RiskId riskId
+    )
+        external 
+        virtual
+        restricted()
+    {
+        // checks
+        (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
+        (bool exists, bool active) = instance.getRiskSet().checkRisk(productNftId, riskId);
+
+        if (!exists) {
+            revert ErrorRiskServiceUnknownRisk(productNftId, riskId);
         }
+
+        if (active) {
+            revert ErrorRiskServiceRiskNotLocked(productNftId, riskId);
+        }
+
+        // effects
+        instance.getProductStore().updateRiskState(riskId, CLOSED());
+
+        emit LogRiskServiceRiskClosed(productNftId, riskId);
     }
 
     function _getAndVerifyActiveComponent(ObjectType expectedType) 

package/contracts/registry/IRegistry.sol

@@ -19,13 +19,16 @@ interface IRegistry is
     IERC165
 {
 
-    event LogRegistration(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
-    event LogServiceRegistration(VersionPart majorVersion, ObjectType domain);
-    event LogChainRegistryRegistration(NftId nftId, uint256 chainId, address chainRegistryAddress);
+    event LogRegistryObjectRegistered(NftId nftId, NftId parentNftId, ObjectType objectType, bool isInterceptor, address objectAddress, address initialOwner);
+    event LogRegistryServiceRegistered(VersionPart majorVersion, ObjectType domain);
+    event LogRegistryChainRegistryRegistered(NftId nftId, uint256 chainId, address chainRegistryAddress);
 
     // initialize
     error ErrorRegistryCallerNotDeployer();
 
+    // register()
+    error ErrorRegistryObjectTypeNotSupported(ObjectType objectType);
+
     // registerRegistry()
     error ErrorRegistryNotOnMainnet(uint256 chainId);
     error ErrorRegistryChainRegistryChainIdZero(NftId nftId);
@@ -36,8 +39,7 @@ interface IRegistry is
     // registerService()
     error ErrorRegistryServiceAddressZero(); 
     error ErrorRegistryServiceVersionZero(address service);
-    //error ErrorRegistryServiceVersionMismatch(address service, VersionPart serviceVersion, VersionPart releaseVersion);
-    //error ErrorRegistryServiceVersionNotDeploying(address service, VersionPart version);
+
     error ErrorRegistryServiceDomainZero(address service, VersionPart version);
     error ErrorRegistryNotService(address service, ObjectType objectType);
     error ErrorRegistryServiceParentNotRegistry(address service, VersionPart version, NftId parentNftId);
@@ -48,7 +50,7 @@ interface IRegistry is
 
     // _register()
     error ErrorRegistryGlobalRegistryAsParent(address objectAddress, ObjectType objectType);
-    error ErrorRegistryTypesCombinationInvalid(address objectAddress, ObjectType objectType, ObjectType parentType);
+    error ErrorRegistryTypeCombinationInvalid(address objectAddress, ObjectType objectType, ObjectType parentType);
     error ErrorRegistryContractAlreadyRegistered(address objectAddress);
 
     struct ObjectInfo {
@@ -93,11 +95,11 @@ interface IRegistry is
     /// May not be used to register known core types.
     function registerWithCustomType(ObjectInfo memory info) external returns (NftId nftId);
 
-    function getInitialVersion() external view returns (VersionPart);
+    function getInitialRelease() external view returns (VersionPart);
 
-    function getNextVersion() external view returns (VersionPart);
+    function getNextRelease() external view returns (VersionPart);
 
-    function getLatestVersion() external view returns (VersionPart);
+    function getLatestRelease() external view returns (VersionPart);
 
     function getReleaseInfo(VersionPart release) external view returns (IRelease.ReleaseInfo memory);
 

package/contracts/registry/IRelease.sol

@@ -11,13 +11,16 @@ import {VersionPart} from "../type/Version.sol";
 interface IRelease {
 
     struct ReleaseInfo {
+        // slot 0
+        address releaseAdmin;
         StateId state;
         VersionPart version;
-        bytes32 salt;
-        IServiceAuthorization auth;
-        address releaseAdmin;
         Timestamp activatedAt;
         Timestamp disabledAt;
+        // slot 1
+        IServiceAuthorization auth;
+        // slot 2
+        bytes32 salt;
     }
 
     /// @dev Registers a registry contract for a specified chain.

package/contracts/registry/Registry.sol

@@ -172,7 +172,7 @@ contract Registry is
             revert ErrorRegistryChainRegistryNftIdInvalid(nftId, chainId);
         }
 
-        emit LogChainRegistryRegistration(nftId, chainId, registryAddress);
+        emit LogRegistryChainRegistryRegistered(nftId, chainId, registryAddress);
 
         _registerRegistryForNft(
             chainId,
@@ -231,7 +231,7 @@ contract Registry is
 
         _service[version][domain] = service;
 
-        emit LogServiceRegistration(version, domain);
+        emit LogRegistryServiceRegistered(version, domain);
 
         nftId = _register(info);
     }
@@ -246,6 +246,11 @@ contract Registry is
         address objectAddress = info.objectAddress;
         ObjectType objectType = info.objectType;
 
+        // specialized functions have to be used to register registries and services
+        if(objectType == REGISTRY() || objectType == STAKING() || objectType == SERVICE()) {
+            revert ErrorRegistryObjectTypeNotSupported(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;
@@ -253,13 +258,13 @@ contract Registry is
         // check type combinations for core objects
         if(objectAddress == address(0)) {
             if(_coreObjectCombinations[objectType][parentType] == false) {
-                revert ErrorRegistryTypesCombinationInvalid(objectAddress, objectType, parentType);
+                revert ErrorRegistryTypeCombinationInvalid(objectAddress, objectType, parentType);
             }
         }
         // check type combinations for contract objects
         else {
             if(_coreContractCombinations[objectType][parentType] == false) {
-                revert ErrorRegistryTypesCombinationInvalid(objectAddress, objectType, parentType);
+                revert ErrorRegistryTypeCombinationInvalid(objectAddress, objectType, parentType);
             }
         }
 
@@ -284,9 +289,10 @@ contract Registry is
             objectType == ObjectTypeLib.zero() ||
             parentType == ObjectTypeLib.zero() ||
             parentType == PROTOCOL() ||
+            parentType == STAKING() ||
             parentType == SERVICE()
         ) {
-            revert ErrorRegistryTypesCombinationInvalid(info.objectAddress, objectType, parentType);
+            revert ErrorRegistryTypeCombinationInvalid(info.objectAddress, objectType, parentType);
         }
 
         nftId = _register(info);
@@ -294,17 +300,17 @@ contract Registry is
 
 
     /// @dev earliest GIF major version 
-    function getInitialVersion() external view returns (VersionPart) {
+    function getInitialRelease() external view returns (VersionPart) {
         return VersionPartLib.toVersionPart(_releaseRegistry.INITIAL_GIF_VERSION());
     }
 
     /// @dev next GIF release version to be released
-    function getNextVersion() external view returns (VersionPart) {
+    function getNextRelease() external view returns (VersionPart) {
         return _releaseRegistry.getNextVersion();
     }
 
     /// @dev latest active GIF release version 
-    function getLatestVersion() external view returns (VersionPart) { 
+    function getLatestRelease() external view returns (VersionPart) { 
         return _releaseRegistry.getLatestVersion();
     }
 
@@ -495,7 +501,7 @@ contract Registry is
         _info[nftId] = info;
         _setAddressForNftId(nftId, objectAddress);
 
-        emit LogRegistration(nftId, parentNftId, objectType, isInterceptor, objectAddress, owner);
+        emit LogRegistryObjectRegistered(nftId, parentNftId, objectType, isInterceptor, objectAddress, owner);
 
         // calls nft receiver(1) and interceptor(2)
         uint256 mintedTokenId = CHAIN_NFT.mint(

package/contracts/registry/RegistryAdmin.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.20;
 
 import {IAuthorization} from "../authorization/IAuthorization.sol";
-import {IComponent} from "../shared/IComponent.sol";
 import {IRegistry} from "./IRegistry.sol";
 import {IService} from "../shared/IService.sol";
 import {IStaking} from "../staking/IStaking.sol";
@@ -10,16 +9,10 @@ import {IStaking} from "../staking/IStaking.sol";
 import {AccessAdmin} from "../authorization/AccessAdmin.sol";
 import {AccessAdminLib} from "../authorization/AccessAdminLib.sol";
 import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
-import {ContractLib} from "../shared/ContractLib.sol";
-import {ObjectType, REGISTRY, STAKING, 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 {Staking} from "../staking/Staking.sol";
-import {Str, StrLib} from "../type/String.sol";
-import {StakingStore} from "../staking/StakingStore.sol";
-import {TokenHandler} from "../shared/TokenHandler.sol";
-import {TokenRegistry} from "./TokenRegistry.sol";
-import {VersionPart, VersionPartLib} from "../type/Version.sol";
+import {ObjectType, REGISTRY} from "../type/ObjectType.sol";
+import {RoleId, RoleIdLib, GIF_MANAGER_ROLE, GIF_ADMIN_ROLE} from "../type/RoleId.sol";
+import {Str} from "../type/String.sol";
+import {VersionPart} from "../type/Version.sol";
 
 /*
     1) GIF_MANAGER_ROLE
@@ -44,22 +37,15 @@ contract RegistryAdmin is
     /// @dev gif core roles
     string public constant GIF_ADMIN_ROLE_NAME = "GifAdminRole";
     string public constant GIF_MANAGER_ROLE_NAME = "GifManagerRole";
-    string public constant RELEASE_REGISTRY_ROLE_NAME = "ReleaseRegistryRole";
-    string public constant STAKING_ROLE_NAME = "StakingRole";
-
-    /// @dev gif roles for external contracts
-    string public constant REGISTRY_SERVICE_ROLE_NAME = "RegistryServiceRole";
-    string public constant COMPONENT_SERVICE_ROLE_NAME = "ComponentServiceRole";
-    string public constant POOL_SERVICE_ROLE_NAME = "PoolServiceRole";
-    string public constant STAKING_SERVICE_ROLE_NAME = "StakingServiceRole";
 
     /// @dev gif core targets
     string public constant REGISTRY_ADMIN_TARGET_NAME = "RegistryAdmin";
     string public constant REGISTRY_TARGET_NAME = "Registry";
     string public constant RELEASE_REGISTRY_TARGET_NAME = "ReleaseRegistry";
     string public constant STAKING_TARGET_NAME = "Staking";
-    string public constant STAKING_TH_TARGET_NAME = "StakingTH";
+    string public constant STAKING_TARGET_HANDLER_NAME = "TargetHandler";
     string public constant STAKING_STORE_TARGET_NAME = "StakingStore";
+    string public constant STAKING_TH_TARGET_NAME = "StakingTH";
     string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
     string public constant TOKEN_HANDLER_TARGET_NAME = "TokenHandler";
 
@@ -70,6 +56,7 @@ contract RegistryAdmin is
     address private _releaseRegistry;
     address private _tokenRegistry;
     address private _staking;
+    address private _stakingTargetHandler;
     address private _stakingStore;
 
     constructor() {
@@ -82,24 +69,23 @@ contract RegistryAdmin is
     function completeSetup(
         address registry,
         address authorization,
+        VersionPart release,
         address gifAdmin, 
         address gifManager
     )
         public
         virtual
         reinitializer(type(uint8).max)
-        onlyDeployer()
     {
         // checks
-        _checkRegistry(registry);
+        AccessAdminLib.checkRegistry(registry);
 
-        VersionPart release = VersionPartLib.toVersionPart(3);
         AccessManagerCloneable(
             authority()).completeSetup(
                 registry, 
                 release); 
 
-        _checkAuthorization(authorization, REGISTRY(), release, true);
+        _checkAuthorization(authorization, REGISTRY(), release, false, true);
 
         _registry = registry;
         _authorization = IAuthorization(authorization);
@@ -108,25 +94,26 @@ contract RegistryAdmin is
         _releaseRegistry = registryContract.getReleaseRegistryAddress();
         _tokenRegistry = registryContract.getTokenRegistryAddress();
         _staking = registryContract.getStakingAddress();
-        _stakingStore = address(
-            IStaking(_staking).getStakingStore());
+        _stakingTargetHandler = address(IStaking(_staking).getTargetHandler());
+        _stakingStore = address(IStaking(_staking).getStakingStore());
 
         // link nft ownability to registry
         _linkToNftOwnable(_registry);
 
-        _setupRegistry(_registry);
-
-        // setup authorization for registry and supporting contracts
         _createRoles(_authorization);
+
+        // setup registry core targets
+        _createCoreTargets(_authorization.getMainTargetName());
+
+        // setup non-contract roles
         _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
         _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
 
-        _createTargets(_authorization);
+        // authorize functions of registry and staking contracts
         _createTargetAuthorizations(_authorization);
     }
 
 
-
     function grantServiceRoleForAllVersions(
         IService service, 
         ObjectType domain
@@ -135,83 +122,36 @@ contract RegistryAdmin is
         restricted()
     {
         _grantRoleToAccount( 
-            RoleIdLib.roleForTypeAndAllVersions(domain),
+            RoleIdLib.toGenericServiceRoleId(domain),
             address(service)); 
     }
 
     //--- view functions ----------------------------------------------------//
 
-    function getGifAdminRole() external view returns (RoleId) {
+    function getGifAdminRole() external pure returns (RoleId) {
         return GIF_ADMIN_ROLE();
     }
 
-    function getGifManagerRole() external view returns (RoleId) {
+    function getGifManagerRole() external pure returns (RoleId) {
         return GIF_MANAGER_ROLE();
     }
 
     //--- private initialization functions -------------------------------------------//
 
-    // create registry role and target
-    function _setupRegistry(address registry) internal {
-
-        // create registry role
-        RoleId roleId = _authorization.getTargetRole(
-            _authorization.getMainTarget());
-
-        _createRole(
-            roleId,
-            _authorization.getRoleInfo(roleId));
-
-        // create registry target
-        _createTarget(
-            registry, 
-            _authorization.getMainTargetName(), 
-            true, // checkAuthority
-            false); // custom
-
-        // assign registry role to registry
-        _grantRoleToAccount(
-            roleId, 
-            registry);
-    }
-
-
-    function _createRoles(IAuthorization authorization)
-        internal
-    {
-        RoleId[] memory roles = authorization.getRoles();
-        RoleId mainTargetRoleId = authorization.getTargetRole(
-            authorization.getMainTarget());
-
-        RoleId roleId;
-        RoleInfo memory roleInfo;
-
-        for(uint256 i = 0; i < roles.length; i++) {
-
-            roleId = roles[i];
-
-            // skip main target role, create role if not exists
-            if (roleId != mainTargetRoleId && !roleExists(roleId)) {
-                _createRole(
-                    roleId,
-                    authorization.getRoleInfo(roleId));
-            }
-        }
-    }
 
-
-    function _createTargets(IAuthorization authorization)
+    function _createCoreTargets(string memory registryTargetName)
         internal
     {
-        // registry
-        _createTargetWithRole(address(this), REGISTRY_ADMIN_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(REGISTRY_ADMIN_TARGET_NAME)));
-        _createTargetWithRole(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(RELEASE_REGISTRY_TARGET_NAME)));
-        _createTargetWithRole(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(TOKEN_REGISTRY_TARGET_NAME)));
-
-        // staking
-        _createTargetWithRole(_staking, STAKING_TARGET_NAME, authorization.getTargetRole(StrLib.toStr(STAKING_TARGET_NAME)));
-        _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, true, false);
-        _createTarget(address(IComponent(_staking).getTokenHandler()), STAKING_TH_TARGET_NAME, true, false);
+        // create unchecked registry targets
+        _createTarget(_registry, registryTargetName, TargetType.Core, false);
+        _createTarget(address(this), REGISTRY_ADMIN_TARGET_NAME, TargetType.Core, false);
+        _createTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, TargetType.Core, false);
+        _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, TargetType.Core, false);
+
+        // create unchecked staking targets
+        _createTarget(_staking, STAKING_TARGET_NAME, TargetType.Core, false);
+        _createTarget(_stakingTargetHandler, STAKING_TARGET_HANDLER_NAME, TargetType.Core, false);
+        _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, TargetType.Core, false);
     }
 
 
@@ -224,35 +164,10 @@ contract RegistryAdmin is
         for(uint256 i = 0; i < targets.length; i++) {
             target = targets[i];
             RoleId[] memory authorizedRoles = authorization.getAuthorizedRoles(target);
-            RoleId authorizedRole;
 
             for(uint256 j = 0; j < authorizedRoles.length; j++) {
-                authorizedRole = authorizedRoles[j];
-
-                _authorizeTargetFunctions(
-                    getTargetForName(target),
-                    authorizedRole,
-                    authorization.getAuthorizedFunctions(
-                        target, 
-                        authorizedRole));
+                _authorizeFunctions(authorization, target, authorizedRoles[j]);
             }
         }
     }
-
-
-    function _createTargets(address authorization)
-        private 
-        onlyInitializing()
-    {
-        IStaking staking = IStaking(_staking);
-        address tokenHandler = address(staking.getTokenHandler());
-
-        _createTarget(address(this), REGISTRY_ADMIN_TARGET_NAME, false, false);
-        _createTarget(_registry, REGISTRY_TARGET_NAME, true, false);
-        _createTarget(_releaseRegistry, RELEASE_REGISTRY_TARGET_NAME, true, false);
-        _createTarget(_staking, STAKING_TARGET_NAME, true, false);
-        _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, true, false);
-        _createTarget(_tokenRegistry, TOKEN_REGISTRY_TARGET_NAME, true, false);
-        _createTarget(tokenHandler, TOKEN_HANDLER_TARGET_NAME, true, false);
-    }
 }