@etherisc/gif-next 0.0.2-ba4eef0-232 → 0.0.2-ba5b255-091

package/contracts/instance/InstanceReader.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.20;
 
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
+import {IAccess} from "../authorization/IAccess.sol";
 import {IBundle} from "../instance/module/IBundle.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {IDistribution} from "../instance/module/IDistribution.sol";
@@ -28,7 +29,7 @@ import {ReferralId, ReferralStatus, ReferralLib, REFERRAL_OK, REFERRAL_ERROR_UNK
 import {RequestId} from "../type/RequestId.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {RiskSet} from "./RiskSet.sol";
-import {RoleId} from "../type/RoleId.sol";
+import {RoleId, INSTANCE_OWNER_ROLE} from "../type/RoleId.sol";
 import {StateId} from "../type/StateId.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {UFixed, UFixedLib} from "../type/UFixed.sol";
@@ -576,6 +577,26 @@ contract InstanceReader {
     }
 
 
+    function roles() public view returns (uint256) {
+        return _instance.getInstanceAdmin().roles();
+    }
+
+
+    function getInstanceOwnerRole() public view returns (RoleId roleId) {
+        return INSTANCE_OWNER_ROLE();
+    }
+
+
+    function getRoleId(uint256 idx) public view returns (RoleId roleId) {
+        return _instance.getInstanceAdmin().getRoleId(uint64(idx));
+    }
+
+
+    function getRoleInfo(RoleId roleId) public view returns (IAccess.RoleInfo memory roleInfo) { 
+        return _instance.getInstanceAdmin().getRoleInfo(roleId);
+    }
+
+
     function hasRole(address account, RoleId roleId) public view returns (bool isMember) {
         return _instance.getInstanceAdmin().hasRole(account, roleId);
     }

package/contracts/instance/InstanceService.sol

@@ -72,6 +72,44 @@ contract InstanceService is
         _;
     }
 
+    /// @inheritdoc IInstanceService
+    function createRole(
+        string memory roleName, 
+        RoleId adminRoleId,
+        uint32 maxMemberCount
+    )
+        external
+        restricted()
+        onlyInstance()
+        returns (RoleId roleId)
+    {
+        IInstance instance = IInstance(msg.sender);
+        roleId = instance.getInstanceAdmin().createRole(
+            roleName, 
+            adminRoleId, 
+            maxMemberCount);
+    }
+
+    /// @inheritdoc IInstanceService
+    function grantRole(RoleId roleId, address account)
+        external
+        restricted()
+        onlyInstance()
+    {
+        IInstance instance = IInstance(msg.sender);
+        instance.getInstanceAdmin().grantRole(roleId, account);
+    }
+
+    /// @inheritdoc IInstanceService
+    function revokeRole(RoleId roleId, address account) 
+        external 
+        restricted()
+        onlyInstance()
+    {
+        IInstance instance = IInstance(msg.sender);
+        instance.getInstanceAdmin().revokeRole(roleId, account);
+    }
+
     /// @inheritdoc IInstanceService
     function setInstanceLocked(bool locked)
         external

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -58,7 +58,6 @@ contract ServiceAuthorizationV3
           _setupIRegistryServiceAuthorization();
           _setupStakingServiceAuthorization();
           _setupInstanceServiceAuthorization();
-          _setupInstanceServiceAuthorization();
           _setupAccountingServiceAuthorization();
           _setupComponentServiceAuthorization();
           _setupClaimServiceAuthorization();
@@ -131,6 +130,10 @@ contract ServiceAuthorizationV3
      {
           IAccess.FunctionInfo[] storage functions;
           functions = _authorizeForService(INSTANCE(), ALL());
+          _authorize(functions, IInstanceService.createRole.selector, "createRole");
+          _authorize(functions, IInstanceService.grantRole.selector, "grantRole");
+          _authorize(functions, IInstanceService.revokeRole.selector, "revokeRole");
+
           _authorize(functions, IInstanceService.setInstanceLocked.selector, "setInstanceLocked");
           _authorize(functions, IInstanceService.setTargetLocked.selector, "setTargetLocked");
 

package/contracts/type/RoleId.sol

@@ -59,6 +59,9 @@ function GIF_REMOTE_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRo
 /// @dev role assigned to release registry, release specfic to lock/unlock a release
 function RELEASE_REGISTRY_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(4); }
 
+/// @dev role assigned to every instance owner
+function INSTANCE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(5); }  
+
 //--- GIF core contract roles (range: 200 - 9'900) --------------------------//
 // created and assigned during initial deployment for registry and staking
 // granting for instances and components in instance service

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-ba4eef0-232",
+  "version": "0.0.2-ba5b255-091",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {