@etherisc/gif-next 0.0.2-9e6b423-414 → 0.0.2-9f51324-299

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {
-     ALL, RELEASE, ACCOUNTING, REGISTRY, RISK, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION, POLICY, CLAIM, BUNDLE, STAKING, PRICE
+     ALL, ACCOUNTING, REGISTRY, RISK, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, APPLICATION, POLICY, CLAIM, BUNDLE, STAKING, PRICE
 } from "../../contracts/type/ObjectType.sol";
 
 import {IAccess} from "../authorization/IAccess.sol";
@@ -19,7 +19,6 @@ import {IPoolService} from "../pool/IPoolService.sol";
 import {IStakingService} from "../staking/IStakingService.sol";
 import {IRegistryService} from "./IRegistryService.sol";
 import {IRiskService} from "../product/IRiskService.sol";
-
 import {ServiceAuthorization} from "../authorization/ServiceAuthorization.sol";
 
 
@@ -28,31 +27,27 @@ contract ServiceAuthorizationV3
 {
 
      constructor(string memory commitHash)
-          ServiceAuthorization(
-               "ReleaseAdmin",
-               RELEASE(),
-               3,
-               commitHash)
+          ServiceAuthorization(commitHash, 3)
      {}
 
      function _setupDomains()
           internal
           override
      {
-          _authorizeServiceDomain(REGISTRY(), address(1));
-          _authorizeServiceDomain(STAKING(), address(2));
-          _authorizeServiceDomain(INSTANCE(), address(3));
-          _authorizeServiceDomain(ACCOUNTING(), address(4));
-          _authorizeServiceDomain(COMPONENT(), address(5));
-          _authorizeServiceDomain(DISTRIBUTION(), address(6));
-          _authorizeServiceDomain(PRICE(), address(7));
-          _authorizeServiceDomain(BUNDLE(), address(8));
-          _authorizeServiceDomain(POOL(), address(9));
-          _authorizeServiceDomain(ORACLE(), address(10));
-          _authorizeServiceDomain(RISK(), address(11));
-          _authorizeServiceDomain(POLICY(), address(12));
-          _authorizeServiceDomain(CLAIM(), address(13));
-          _authorizeServiceDomain(APPLICATION(), address(14));
+          _authorizeDomain(REGISTRY(), address(1));
+          _authorizeDomain(STAKING(), address(2));
+          _authorizeDomain(INSTANCE(), address(3));
+          _authorizeDomain(ACCOUNTING(), address(4));
+          _authorizeDomain(COMPONENT(), address(5));
+          _authorizeDomain(DISTRIBUTION(), address(6));
+          _authorizeDomain(PRICE(), address(7));
+          _authorizeDomain(BUNDLE(), address(8));
+          _authorizeDomain(POOL(), address(9));
+          _authorizeDomain(ORACLE(), address(10));
+          _authorizeDomain(RISK(), address(11));
+          _authorizeDomain(POLICY(), address(12));
+          _authorizeDomain(CLAIM(), address(13));
+          _authorizeDomain(APPLICATION(), address(14));
      }
 
 
@@ -60,9 +55,10 @@ contract ServiceAuthorizationV3
           internal
           override
      {
-          _setupRegistryServiceAuthorization();
+          _setupIRegistryServiceAuthorization();
           _setupStakingServiceAuthorization();
           _setupInstanceServiceAuthorization();
+          _setupInstanceServiceAuthorization();
           _setupAccountingServiceAuthorization();
           _setupComponentServiceAuthorization();
           _setupClaimServiceAuthorization();
@@ -78,7 +74,7 @@ contract ServiceAuthorizationV3
 
      /// @dev registry service authorization.
      /// authorized functions MUST be implemented with a restricted modifier
-     function _setupRegistryServiceAuthorization()
+     function _setupIRegistryServiceAuthorization()
           internal
      {
           IAccess.FunctionInfo[] storage functions;
@@ -135,16 +131,8 @@ contract ServiceAuthorizationV3
      {
           IAccess.FunctionInfo[] storage functions;
           functions = _authorizeForService(INSTANCE(), ALL());
-          _authorize(functions, IInstanceService.createRole.selector, "createRole");
-          _authorize(functions, IInstanceService.setRoleActive.selector, "setRoleActive");
-          _authorize(functions, IInstanceService.grantRole.selector, "grantRole");
-          _authorize(functions, IInstanceService.revokeRole.selector, "revokeRole");
-
-          _authorize(functions, IInstanceService.createTarget.selector, "createTarget");
-          _authorize(functions, IInstanceService.authorizeFunctions.selector, "authorizeFunctions");
-          _authorize(functions, IInstanceService.unauthorizeFunctions.selector, "unauthorizeFunctions");
-          _authorize(functions, IInstanceService.setTargetLocked.selector, "setTargetLocked");
           _authorize(functions, IInstanceService.setInstanceLocked.selector, "setInstanceLocked");
+          _authorize(functions, IInstanceService.setTargetLocked.selector, "setTargetLocked");
 
           _authorize(functions, IInstanceService.createInstance.selector, "createInstance");
           _authorize(functions, IInstanceService.upgradeInstanceReader.selector, "upgradeInstanceReader");

package/contracts/registry/TokenRegistry.sol

@@ -3,13 +3,15 @@ pragma solidity ^0.8.20;
 
 import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
+
+import {REGISTRY} from "../type/ObjectType.sol";
+import {VersionPart} from "../type/Version.sol";
 
 import {IRegistry} from "./IRegistry.sol";
 import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
-
 import {ReleaseRegistry} from "./ReleaseRegistry.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
-import {VersionPart} from "../type/Version.sol";
 
 /// @dev The TokenRegistry contract is used to whitelist/manage ERC-20 of tokens per major release.
 /// Only whitelisted tokens can be used as default tokens for products, distribution and pools components.

package/contracts/shared/ComponentService.sol

@@ -79,7 +79,7 @@ contract ComponentService is
         }
 
         // check provided address is product contract
-        if (!_isInstanceLinkedComponent(componentAddress)) {
+        if (!ContractLib.isInstanceLinkedComponent(address(registry), componentAddress)) {
             revert ErrorComponentServiceNotComponent(componentAddress);
         }
 
@@ -214,7 +214,7 @@ contract ComponentService is
         }
 
         // check provided address is product contract
-        if (!_isProduct(productAddress)) {
+        if (!ContractLib.isProduct(address(registry), productAddress)) {
             revert ErrorComponentServiceNotProduct(productAddress);
         }
 
@@ -227,24 +227,6 @@ contract ComponentService is
     }
 
 
-    function _isProduct(address target) internal view virtual returns (bool) {
-        if (!_isInstanceLinkedComponent(target)) {
-            return false;
-        }
-
-        return IInstanceLinkedComponent(target).getInitialInfo().objectType == PRODUCT();
-    }
-
-
-    function _isInstanceLinkedComponent(address target) internal view virtual returns (bool) {
-        if (!ContractLib.isContract(target)) {
-            return false;
-        }
-
-        return ContractLib.supportsInterface(target, type(IInstanceLinkedComponent).interfaceId);
-    }
-
-
     /// @inheritdoc IComponentService
     function setProductFees(
         Fee memory productFee, // product fee on net premium
@@ -283,7 +265,8 @@ contract ComponentService is
     function _createProduct(
         InstanceStore instanceStore,
         NftId productNftId,
-        address productAddress
+        address productAddress,
+        address token
     )
         internal
         virtual
@@ -496,7 +479,7 @@ contract ComponentService is
                 objectInfo.initialOwner).nftId;
 
             // create product info in instance store
-            _createProduct(instanceStore, componentNftId, componentAddress);
+            _createProduct(instanceStore, componentNftId, componentAddress, token);
         } else {
             // register non product component with registry
             componentNftId = _registryService.registerProductLinkedComponent(

package/contracts/shared/ContractLib.sol

@@ -5,12 +5,12 @@ import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165C
 import {IAccessManager} from "@openzeppelin/contracts/access/manager/IAccessManager.sol";
 import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 
+import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IPolicyHolder} from "../shared/IPolicyHolder.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
-import {IService} from "../shared/IService.sol";
 
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, INSTANCE, PRODUCT, DISTRIBUTION, ORACLE, POOL} from "../type/ObjectType.sol";
+import {ObjectType, INSTANCE, PRODUCT, DISTRIBUTION, ORACLE, POOL, STAKING} from "../type/ObjectType.sol";
 import {VersionPart} from "../type/Version.sol";
 
 interface ITargetHelper {
@@ -98,6 +98,25 @@ library ContractLib {
     }
 
 
+    // TODO cleanup
+    // function getAndVerifyStaking(
+    //     IRegistry registry, 
+    //     address target
+    // )
+    //     external
+    //     view
+    //     returns (IRegistry.ObjectInfo memory info)
+    // {
+    //     // check target is component
+    //     info = _getAndVerifyObjectInfo(registry, target);
+    //     if(info.objectType != STAKING()) {
+    //         revert ErrorContractLibNotStaking(
+    //             info.nftId,
+    //             info.objectType);
+    //     }
+    // }
+
+
     function getInstanceForComponent(
         IRegistry registry, 
         NftId componentNftId
@@ -159,22 +178,39 @@ library ContractLib {
     }
 
 
-    function isRegistered(address registry, address caller, ObjectType expectedType) public view returns (bool) {
-        NftId nftId = IRegistry(registry).getNftIdForAddress(caller);
-        if (nftId.eqz()) {
+    function isProduct(address registry, address target)
+        public
+        view
+        returns (bool)
+    {
+        if (!isInstanceLinkedComponent(registry, target)) {
             return false;
         }
 
-        return IRegistry(registry).getObjectInfo(nftId).objectType == expectedType;
+        return IInstanceLinkedComponent(target).getInitialInfo().objectType == PRODUCT();
     }
 
 
-    function isService(address service) public view returns (bool) {
-        if (!isContract(service)) {
+    function isInstanceLinkedComponent(address registry, address target)
+        public
+        view
+        returns (bool)
+    {
+        if (!isContract(target)) {
+            return false;
+        }
+
+        return supportsInterface(target, type(IInstanceLinkedComponent).interfaceId);
+    }
+
+
+    function isRegistered(address registry, address caller, ObjectType expectedType) public view returns (bool) {
+        NftId nftId = IRegistry(registry).getNftIdForAddress(caller);
+        if (nftId.eqz()) {
             return false;
         }
 
-        return supportsInterface(service, type(IService).interfaceId);
+        return IRegistry(registry).getObjectInfo(nftId).objectType == expectedType;
     }
 
 

package/contracts/shared/IRegisterable.sol

@@ -6,6 +6,7 @@ import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessMana
 import {INftOwnable} from "./INftOwnable.sol";
 import {IRelease} from "../registry/IRelease.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
+import {VersionPart} from "../type/Version.sol";
 
 /// @title IRegisterable
 /// @dev Marks contracts that are intended to be registered in the registry.

package/contracts/shared/Service.sol

@@ -1,15 +1,16 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
+import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IService} from "./IService.sol";
 import {IVersionable} from "../upgradeability/IVersionable.sol";
-import {ObjectType, SERVICE} from "../type/ObjectType.sol";
+import {ObjectType, REGISTRY, SERVICE} from "../type/ObjectType.sol";
 import {Registerable} from "./Registerable.sol";
 import {RoleId, RoleIdLib} from "../type/RoleId.sol";
-import {Version, VersionLib} from "../type/Version.sol";
+import {Version, VersionLib, VersionPartLib} from "../type/Version.sol";
 import {Versionable} from "../upgradeability/Versionable.sol";
 
 
@@ -52,15 +53,12 @@ abstract contract Service is
         return VersionLib.toVersion(3, 0, 0);
     }
 
-
     function getRoleId() external virtual view returns(RoleId serviceRoleId) {
-        return RoleIdLib.toServiceRoleId(_getDomain(), getRelease());
+        return RoleIdLib.roleForTypeAndVersion(_getDomain(), getRelease());
     }
 
-    //--- internal functions --------------------------------------------------------//
     function _getDomain() internal virtual pure returns (ObjectType);
 
-
     function _getServiceAddress(ObjectType domain) internal view returns (address) {
         return getRegistry().getServiceAddress(domain, getRelease());
     }

package/contracts/staking/Staking.sol

@@ -243,7 +243,7 @@ contract Staking is
         returns (Amount newBalance)
     {
         StakingStorage storage $ = _getStakingStorage();
-        uint256 chainId = $._reader.getTargetInfo(targetNftId).chainId;
+        uint chainId = $._reader.getTargetInfo(targetNftId).chainId;
         UFixed stakingRate = $._reader.getStakingRate(chainId, token);
         newBalance = $._store.increaseTotalValueLocked(targetNftId, stakingRate, token, amount);
     }
@@ -256,7 +256,7 @@ contract Staking is
         returns (Amount newBalance)
     {
         StakingStorage storage $ = _getStakingStorage();
-        uint256 chainId = $._reader.getTargetInfo(targetNftId).chainId;
+        uint chainId = $._reader.getTargetInfo(targetNftId).chainId;
         UFixed stakingRate = $._reader.getStakingRate(chainId, token);
         newBalance = $._store.decreaseTotalValueLocked(targetNftId, stakingRate, token, amount);
     }
@@ -495,9 +495,8 @@ contract Staking is
     }
 
 
-    /// @dev top level initializer (upgradable contract)
     function _initialize(
-        address, 
+        address owner, 
         bytes memory data
     )
         internal
@@ -514,6 +513,8 @@ contract Staking is
         // only admin(authority) and dip token address are set in registry at this point
         IRegistry registry = IRegistry(registryAddress);
         address authority = registry.getAuthority();
+        TokenRegistry tokenRegistry = TokenRegistry(tokenRegistryAddress);
+        address dipTokenAddress = tokenRegistry.getDipTokenAddress();
 
         // wiring to external contracts
         StakingStorage storage $ = _getStakingStorage();

package/contracts/staking/TargetManagerLib.sol

@@ -160,7 +160,7 @@ library TargetManagerLib {
         UFixed stakingRate
     )
         public
-        pure
+        view
         returns (Amount dipAmount)
     {
         dipAmount = tokenAmount.multiplyWith(stakingRate);

package/contracts/type/ObjectType.sol

@@ -10,7 +10,6 @@ using {
     eqObjectType as ==,
     neObjectType as !=,
     ObjectTypeLib.toInt,
-    ObjectTypeLib.toName,
     ObjectTypeLib.eqz,
     ObjectTypeLib.eq,
     ObjectTypeLib.gtz
@@ -144,16 +143,7 @@ function REFERRAL() pure returns (ObjectType) {
     return ObjectType.wrap(49);
 }
 
-/// @dev Object type for GIF core target roles.
-function CORE() pure returns (ObjectType) {
-    return ObjectType.wrap(97);
-}
 
-/// @dev Object type for target roles of contracts outside the GIF framework.
-/// Example: Custom supporting contracts for a product component.
-function CUSTOM() pure returns (ObjectType) {
-    return ObjectType.wrap(98);
-}
 
 /// @dev Object type that includes any other object type.
 /// Note that eq()/'==' does not take this property into account.
@@ -213,8 +203,6 @@ library ObjectTypeLib {
             return "Registry";
         } else if (objectType == STAKING()) {
             return "Staking";
-        } else if (objectType == RELEASE()) {
-            return "Release";
         } else if (objectType == INSTANCE()) {
             return "Instance";
         } else if (objectType == COMPONENT()) {
@@ -251,7 +239,6 @@ library ObjectTypeLib {
                     toInt(objectType))));
     }
 
-    // TODO move to IService
     function toVersionedName(
         string memory name, 
         string memory suffix, 
@@ -261,10 +248,10 @@ library ObjectTypeLib {
         pure
         returns (string memory versionedName)
     {
-        string memory versionName = "V0";
+        string memory versionName = "_v0";
 
         if (release.toInt() >= 10) {
-            versionName = "V";
+            versionName = "_v";
         }
 
         versionedName = string(
@@ -290,7 +277,7 @@ library ObjectTypeLib {
         }
 
         bytes memory buffer = new bytes(digits);
-        uint256 index = digits - 1;
+        uint index = digits - 1;
 
         temp = value;
         while (temp != 0) {

package/contracts/type/RoleId.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
 
 import {Key32, KeyId, Key32Lib} from "./Key32.sol";
 import {ObjectType, ROLE} from "./ObjectType.sol";
-import {VersionPart, VersionPartLib} from "./Version.sol";
+import {VersionPart} from "./Version.sol";
 
 type RoleId is uint64;
 
@@ -12,9 +12,11 @@ using {
     eqRoleId as ==, 
     neRoleId as !=,
     RoleIdLib.toInt,
-    RoleIdLib.isServiceRole,
     RoleIdLib.eqz,
-    RoleIdLib.gtz
+    RoleIdLib.gtz,
+    RoleIdLib.isComponentRole,
+    RoleIdLib.isCustomRole
+    // RoleIdLib.toKey32
 } for RoleId global;
 
 // general pure free functions
@@ -54,14 +56,9 @@ function GIF_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2)
 /// @dev role for registering remote staking targets and reporting remote total value locked amounts.
 function GIF_REMOTE_MANAGER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(3); } 
 
-// TODO check if/where this is really needed
 /// @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); }  
-
-// TODO upate role id ranges
 //--- 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
@@ -100,72 +97,56 @@ function CUSTOM_ROLE_MIN() pure returns (RoleId) { return RoleIdLib.toRoleId(100
 
 library RoleIdLib {
 
-    error ErrorRoleIdTooBig(uint256 roleId);
-
-    // constant values need to match with AccessAdminLib.SERVICE_ROLE_*
-    uint64 public constant SERVICE_ROLE_MIN =  1000;
-    uint64 public constant SERVICE_ROLE_MAX = 99099; // 99 (max object type) * 1000 + 99
-
-    uint64 public constant SERVICE_ROLE_FACTOR = 1000;
+    uint64 public constant ALL_VERSIONS = 99;
+    uint64 public constant SERVICE_DOMAIN_ROLE_FACTOR = 100;
+    uint64 public constant COMPONENT_ROLE_FACTOR = 1000;
+    uint64 public constant COMPONENT_ROLE_MIN_INT = 12000;
+    uint64 public constant COMPONENT_ROLE_MAX_INT = 19000;
+    uint64 public constant CUSTOM_ROLE_MIN_INT = 1000000;
 
     /// @dev Converts the RoleId to a uint.
     function zero() public pure returns (RoleId) {
         return RoleId.wrap(0);
     }
 
-
     /// @dev Converts an uint into a role id.
-    function toRoleId(uint256 a) public pure returns (RoleId) {
-        if (a > type(uint64).max) {
-            revert ErrorRoleIdTooBig(a);
-        }
-
-        return RoleId.wrap(uint64(a));
+    function toRoleId(uint64 a) public pure returns (RoleId) {
+        return RoleId.wrap(a);
     }
 
-
-    function isServiceRole(RoleId roleId)
-        public
-        pure
-        returns (bool)
-    {
-        uint256 roleIdInt = RoleId.unwrap(roleId);
-        return roleIdInt >= SERVICE_ROLE_MIN && roleIdInt <= SERVICE_ROLE_MAX;
+    /// @dev Converts an uint into a component role id.
+    function toComponentRoleId(ObjectType objectType, uint64 index) public pure returns (RoleId) {
+        return toRoleId(COMPONENT_ROLE_FACTOR * uint64(objectType.toInt()) + index);
     }
 
+    /// @dev Converts an uint into a custom role id.
+    function toCustomRoleId(uint64 index) public pure returns (RoleId) {
+        return toRoleId(CUSTOM_ROLE_MIN_INT + index);
+    }
 
-    function toGenericServiceRoleId(
-        ObjectType objectType
-    )
-        public 
-        pure 
-        returns (RoleId)
-    {
-        return toServiceRoleId(
-            objectType, 
-            VersionPartLib.releaseMax());
+    /// @dev Converts the role id to a uint.
+    function toInt(RoleId a) public pure returns (uint64) {
+        return uint64(RoleId.unwrap(a));
     }
 
+    /// @dev Converts an uint into a role id.
+    /// Used for GIF core contracts.
+    function roleForType(ObjectType objectType) public pure returns (RoleId) {
+        return RoleId.wrap(SERVICE_DOMAIN_ROLE_FACTOR * uint64(objectType.toInt()));
+    }
 
-    function toServiceRoleId(
-        ObjectType serviceDomain, 
-        VersionPart release
-    )
-        public 
-        pure 
-        returns (RoleId serviceRoleId)
-    {
-        uint256 serviceRoleIdInt = 
-            SERVICE_ROLE_MIN 
-            + SERVICE_ROLE_FACTOR * (serviceDomain.toInt() - 1)
-            + release.toInt();
-
-        return toRoleId(serviceRoleIdInt);
+    /// @dev Converts an uint into a RoleId.
+    /// Used for GIF core contracts.
+    function roleForTypeAndVersion(ObjectType objectType, VersionPart majorVersion) public pure returns (RoleId) {
+        return RoleId.wrap(
+            uint64(SERVICE_DOMAIN_ROLE_FACTOR * objectType.toInt() + majorVersion.toInt()));
     }
 
-    /// @dev Converts the role id to a uint.
-    function toInt(RoleId a) public pure returns (uint64) {
-        return uint64(RoleId.unwrap(a));
+    /// @dev Converts an uint into a RoleId.
+    /// Used for GIF core contracts.
+    function roleForTypeAndAllVersions(ObjectType objectType) public pure returns (RoleId) {
+        return RoleId.wrap(
+            uint64(SERVICE_DOMAIN_ROLE_FACTOR * objectType.toInt() + ALL_VERSIONS));
     }
 
     /// @dev Returns true if the value is non-zero (> 0).
@@ -177,4 +158,25 @@ library RoleIdLib {
     function eqz(RoleId a) public pure returns (bool) {
         return RoleId.unwrap(a) == 0;
     }
+
+    /// @dev Returns true iff the role id is a component role.
+    function isComponentRole(RoleId roleId) public pure returns (bool) {
+        uint64 roleIdInt = RoleId.unwrap(roleId);
+        return roleIdInt >= COMPONENT_ROLE_MIN_INT && roleIdInt <= COMPONENT_ROLE_MAX_INT;
+    }
+
+    /// @dev Returns true iff the role id is a custom role.
+    function isCustomRole(RoleId roleId) public pure returns (bool) {
+        return RoleId.unwrap(roleId) >= CUSTOM_ROLE_MIN_INT;
+    }
+
+    /// @dev Returns the key32 value for the specified id and object type.
+    function toKey32(RoleId a) public pure returns (Key32 key) {
+        return Key32Lib.toKey32(ROLE(), toKeyId(a));
+    }
+
+    /// @dev Returns the key id value for the specified id
+    function toKeyId(RoleId a) public pure returns (KeyId keyId) {
+        return KeyId.wrap(bytes31(uint248(RoleId.unwrap(a))));
+    }
 }

package/contracts/type/String.sol

@@ -12,12 +12,10 @@ using {
     StrLib.length
 } for Str global;
 
-// pure free function needed for the operator overloading
 function StrEq(Str s1, Str s2) pure returns (bool) {
     return StrLib.eq(s1, s2);
 }
 
-// pure free function needed for the operator overloading
 function StrNe(Str s1, Str s2) pure returns (bool) {
     return StrLib.ne(s1, s2);
 }
@@ -41,16 +39,6 @@ library StrLib {
         return Str.unwrap(s1) != Str.unwrap(s2);
     }
 
-    /// @dev return true iff s1 equals from s2
-    function eq(string memory s1, string memory s2) public pure returns (bool) {
-        return keccak256(bytes(s1)) == keccak256(bytes(s2));
-    }
-
-    /// @dev return true iff s1 differs s2
-    function ne(string memory s1, string memory s2) public pure returns (bool) {
-        return !eq(s1, s2);
-    }
-
     /// @dev converts the provided short string into a string.
     /// uses ShortStrings.toString
     function toString(Str str) public pure returns (string memory) {

package/contracts/upgradeability/ProxyManager.sol

@@ -39,8 +39,8 @@ contract ProxyManager is
     UpgradableProxyWithAdmin internal _proxy;
 
     // state to keep version history
-    mapping(Version version => VersionInfo info) internal _versionHistory;
-    Version [] internal _versions;
+    mapping(Version version => VersionInfo info) _versionHistory;
+    Version [] _versions;
 
     /// @dev convencience initializer
     function initialize(

package/contracts/upgradeability/Versionable.sol

@@ -39,10 +39,7 @@ abstract contract Versionable is
     // IMPORTANT each version must implement this function 
     // each implementation MUST use onlyInitialising modifier
     // each implementation MUST call intializers of all base contracts...
-    function _initialize(
-        address, // owner
-        bytes memory // data
-    ) 
+    function _initialize(address owner, bytes memory data) 
         internal
         onlyInitializing()
         virtual 

package/package.json

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