@etherisc/gif-next 0.0.2-e8b06c8-540 → 0.0.2-e8ea17d-715

package/contracts/shared/ComponentService.sol

@@ -282,18 +282,6 @@ contract ComponentService is
     {
         address contractAddress = msg.sender;
 
-        // TODO cleanup
-        // RoleId[] memory roles = new RoleId[](2);
-        // bytes4[][] memory selectors = new bytes4[][](2);
-
-        // // authorizaion for pool owner
-        // roles[0] = POOL_OWNER_ROLE();
-        // selectors[0] = _createSelectors(IPoolComponent.setFees.selector);
-
-        // // authorizaion for product service
-        // roles[1] = POLICY_SERVICE_ROLE();
-        // selectors[1] = _createSelectors(IPoolComponent.verifyApplication.selector);
-
         // register/create component setup
         (
             , // instance reader
@@ -476,47 +464,14 @@ contract ComponentService is
 
         IComponents.ComponentInfo memory componentInfo = component.getComponentInfo();
         componentInfo.tokenHandler = new TokenHandler(address(componentInfo.token));
+
         instanceStore.createComponent(
             component.getNftId(), 
             componentInfo);
 
+        // TODO add logging
     }
 
-    // TODO cleanup
-    // /// @dev registers the component represented by the provided address
-    // function _registerOld(
-    //     address componentAddress, // address of component to register
-    //     ObjectType requiredType, // required type for component for registration
-    //     RoleId requiredRole, // role required for comonent owner for registration
-    //     RoleId[] memory roles, // roles with write access to component
-    //     bytes4[][] memory selectors // authorized functions per role with write access
-    // )
-    //     internal
-    //     virtual
-    //     returns (
-    //         InstanceReader instanceReader, 
-    //         InstanceStore instanceStore, 
-    //         NftId componentNftId
-    //     )
-    // {
-    //     (
-    //         instanceReader, 
-    //         instanceStore, 
-    //         componentNftId
-    //     ) = _register(
-    //         componentAddress,
-    //         requiredType,
-    //         requiredRole);
-
-    //     // configure instance authorization
-    //     _instanceService.createComponentTarget(
-    //         instance.getNftId(), 
-    //         componentAddress, 
-    //         component.getName(), 
-    //         selectors, 
-    //         roles);
-    // }
-
 
     /// @dev link the component info corresponding to the componentNftId to the provided productNftId
     function _linkToProduct(

package/contracts/shared/IKeyValueStore.sol

@@ -13,6 +13,7 @@ interface IKeyValueStore is ILifecycle {
 
     error ErrorKeyValueStoreTypeUndefined(ObjectType objectType);
     error ErrorKeyValueStoreAlreadyCreated(Key32 key, ObjectType objectType);
+    error ErrorKeyValueStoreNoLifecycle(ObjectType objectType);
     error ErrorKeyValueStoreStateZero(Key32 key);
     error ErrorKeyValueStoreNotExisting(Key32 key);
 

package/contracts/shared/ILifecycle.sol

@@ -1,13 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {NftId} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {StateId} from "../type/StateId.sol";
 
 interface ILifecycle {
 
-    error ErrorNoLifecycle(NftId nftId, ObjectType objectType);
+    error ErrorNoLifecycle(ObjectType objectType);
     error ErrorInvalidStateTransition(
         ObjectType objectType,
         StateId fromStateId,

package/contracts/shared/InstanceLinkedComponent.sol

@@ -13,7 +13,6 @@ import {IAuthorization} from "../authorization/IAuthorization.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {IInstanceService} from "../instance/IInstanceService.sol";
 import {IInstance} from "../instance/IInstance.sol";
-import {InstanceAdmin} from "../instance/InstanceAdmin.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {NftId} from "../type/NftId.sol";

package/contracts/shared/KeyValueStore.sol

@@ -11,7 +11,7 @@ import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
 import {Lifecycle} from "./Lifecycle.sol";
 import {IKeyValueStore} from "./IKeyValueStore.sol";
 
-contract KeyValueStore is
+abstract contract KeyValueStore is
     Lifecycle, 
     IKeyValueStore
 {
@@ -34,8 +34,12 @@ contract KeyValueStore is
             revert ErrorKeyValueStoreAlreadyCreated(key32, objectType);
         }
 
+        if(!hasLifecycle(objectType)) {
+            revert ErrorKeyValueStoreNoLifecycle(objectType);
+        }
+
         Blocknumber blocknumber = blockBlocknumber();
-        StateId initialState = hasLifecycle(objectType) ? getInitialState(objectType) : ACTIVE();
+        StateId initialState = getInitialState(objectType);
 
         // set metadata
         metadata.objectType = objectType;

package/contracts/shared/Lifecycle.sol

@@ -1,15 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; 
-
-import {NftId} from "../type/NftId.sol";
-import {ObjectType, COMPONENT, BUNDLE, POLICY, REQUEST, RISK, CLAIM, PAYOUT} from "../type/ObjectType.sol";
-import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, COLLATERALIZED, REVOKED, SUBMITTED, CONFIRMED, DECLINED, EXPECTED, PAID, FULFILLED, FAILED, CANCELLED} from "../type/StateId.sol";
+import {ObjectType} from "../type/ObjectType.sol";
+import {StateId, zeroStateId} from "../type/StateId.sol";
 import {ILifecycle} from "./ILifecycle.sol";
 
-contract Lifecycle is
-    Initializable,
+abstract contract Lifecycle is
     ILifecycle
 {
     mapping(ObjectType objectType => StateId initialState)
@@ -18,16 +14,17 @@ contract Lifecycle is
     mapping(ObjectType objectType => mapping(StateId stateFrom => mapping(StateId stateTo => bool isValid)))
         private _isValidTransition;
 
-    function initializeLifecycle()
-        public
-        onlyInitializing
-    {
-        _setupBundleLifecycle();
-        _setupComponentLifecycle();
-        _setupPolicyLifecycle();
-        _setupClaimAndPayoutLifecycle();
-        _setupRiskLifecycle();
-        _setupRequestLifecycle();
+    /// @dev child class must implement and CALL setup func at deployment/initializaton time
+    function _setupLifecycle() internal virtual;
+
+    function setInitialState(ObjectType ttype, StateId state) internal virtual {
+        assert(_initialState[ttype] == zeroStateId());
+        _initialState[ttype] = state;
+    }
+
+    function setStateTransition(ObjectType ttype, StateId oldState, StateId newState) internal virtual {
+        assert(_isValidTransition[ttype][oldState][newState] == false);
+        _isValidTransition[ttype][oldState][newState] = true;
     }
 
     function hasLifecycle(
@@ -59,9 +56,9 @@ contract Lifecycle is
         public
         view
     {
-        // return if no life cycle support
+        // revert if no life cycle support
         if (_initialState[objectType].eqz()) {
-            return;
+            revert ErrorNoLifecycle(objectType);
         }
 
         // enforce valid state transition
@@ -77,54 +74,4 @@ contract Lifecycle is
     ) public view returns (bool) {
         return _isValidTransition[objectType][fromId][toId];
     }
-
-    function _setupComponentLifecycle() internal {
-        _initialState[COMPONENT()] = ACTIVE();
-        _isValidTransition[COMPONENT()][ACTIVE()][PAUSED()] = true;
-        _isValidTransition[COMPONENT()][PAUSED()][ACTIVE()] = true;
-        _isValidTransition[COMPONENT()][PAUSED()][ARCHIVED()] = true;
-    }
-
-    function _setupBundleLifecycle() internal {
-        _initialState[BUNDLE()] = ACTIVE();
-        _isValidTransition[BUNDLE()][ACTIVE()][PAUSED()] = true;
-        _isValidTransition[BUNDLE()][ACTIVE()][CLOSED()] = true;
-        _isValidTransition[BUNDLE()][PAUSED()][ACTIVE()] = true;
-        _isValidTransition[BUNDLE()][PAUSED()][CLOSED()] = true;
-    }
-
-    function _setupPolicyLifecycle() internal {
-        _initialState[POLICY()] = APPLIED();
-        _isValidTransition[POLICY()][APPLIED()][REVOKED()] = true;
-        _isValidTransition[POLICY()][APPLIED()][DECLINED()] = true;
-        _isValidTransition[POLICY()][APPLIED()][COLLATERALIZED()] = true;
-        _isValidTransition[POLICY()][APPLIED()][ACTIVE()] = true;
-        _isValidTransition[POLICY()][COLLATERALIZED()][ACTIVE()] = true;
-        _isValidTransition[POLICY()][ACTIVE()][CLOSED()] = true;
-    }
-
-    function _setupClaimAndPayoutLifecycle() internal {
-        _initialState[CLAIM()] = SUBMITTED();
-        _isValidTransition[CLAIM()][SUBMITTED()][CONFIRMED()] = true;
-        _isValidTransition[CLAIM()][SUBMITTED()][DECLINED()] = true;
-        _isValidTransition[CLAIM()][CONFIRMED()][CLOSED()] = true;
-
-        _initialState[PAYOUT()] = EXPECTED();
-        _isValidTransition[PAYOUT()][EXPECTED()][PAID()] = true;
-    }
-
-    function _setupRiskLifecycle() internal {
-        _initialState[RISK()] = ACTIVE();
-        _isValidTransition[RISK()][ACTIVE()][PAUSED()] = true;
-        _isValidTransition[RISK()][PAUSED()][ACTIVE()] = true;
-        _isValidTransition[RISK()][PAUSED()][ARCHIVED()] = true;
-    }
-
-    function _setupRequestLifecycle() internal {
-        _initialState[REQUEST()] = ACTIVE();
-        _isValidTransition[REQUEST()][ACTIVE()][FULFILLED()] = true;
-        _isValidTransition[REQUEST()][ACTIVE()][FAILED()] = true;
-        _isValidTransition[REQUEST()][FAILED()][FULFILLED()] = true;
-        _isValidTransition[REQUEST()][ACTIVE()][CANCELLED()] = true;
-    }
 }

package/contracts/shared/{NftIdSetManager.sol → NftIdSet.sol}

@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 import {LibNftIdSet} from "../type/NftIdSet.sol";
 import {NftId} from "../type/NftId.sol";
 
-contract NftIdSetManager {
+contract NftIdSet {
 
     error ErrorNftIdSetManagerNotOwner(address owner, address sender);
     error ErrorNftIdSetManagerOwnerAlreadySet(address owner);

package/contracts/staking/IStaking.sol

@@ -5,7 +5,6 @@ import {Amount} from "../type/Amount.sol";
 import {IComponent} from "../shared/IComponent.sol";
 import {IVersionable} from "../shared/IVersionable.sol";
 import {NftId} from "../type/NftId.sol";
-import {NftIdSetManager} from "../shared/NftIdSetManager.sol";
 import {ObjectType} from "../type/ObjectType.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {StakingReader} from "./StakingReader.sol";

package/contracts/staking/IStakingService.sol

@@ -44,6 +44,13 @@ interface IStakingService is IService
     error ErrorStakingServiceDipBalanceInsufficient(NftId targetNftId, uint256 amount, uint256 balance);
     error ErrorStakingServiceDipAllowanceInsufficient(NftId targetNftId, address tokenHandler, uint256 amount, uint256 allowance);
 
+    /// @dev Set the protocol reward rate stake locking period to the specified duration.
+    /// Permissioned: only staking owner
+    // TODO implement
+    // function setProtocolRewardRate(UFixed rewardRate) external;
+    // function setProtocolLockingPeriod(Seconds lockingPeriod) external;
+    // TODO also make sure that protocol rewards can be refilled and withdrawn
+
     /// @dev creates/registers an on-chain instance staking target.
     /// function granted to instance service
     function createInstanceTarget(
@@ -53,11 +60,11 @@ interface IStakingService is IService
     ) external;
 
     /// @dev Set the instance stake locking period to the specified duration.
-    /// permissioned: only the owner of the specified target may set the locking period
+    /// Permissioned: Only owner of the specified target.
     function setInstanceLockingPeriod(NftId instanceNftId, Seconds lockingPeriod) external;
 
-    /// @dev Set the instance reward rate to the specified value
-    /// permissioned: only the owner of the specified target may set the locking period
+    /// @dev Set the instance reward rate to the specified value.
+    /// Permissioned: Only owner of the specified target.
     function setInstanceRewardRate(NftId instanceNftId, UFixed rewardRate) external;
 
     /// @dev (Re)fills the staking reward reserves for the specified target using the dips provided by the reward provider.
@@ -68,8 +75,8 @@ interface IStakingService is IService
     /// unpermissioned: anybody may fill up staking reward reserves
     function refillRewardReservesBySender(NftId targetNftId, Amount dipAmount) external returns (Amount newBalance);
 
-    /// @dev defunds the staking reward reserves for the specified target
-    /// permissioned: only the target owner may call this function
+    /// @dev Defunds the staking reward reserves for the specified target
+    /// Permissioned: only the target owner may call this function
     function withdrawInstanceRewardReserves(NftId instanceNftId, Amount dipAmount) external returns (Amount newBalance);
 
     /// @dev create a new stake with amount DIP to the specified target

package/contracts/staking/Staking.sol

@@ -9,9 +9,7 @@ import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IStaking} from "./IStaking.sol";
 import {IVersionable} from "../shared/IVersionable.sol";
 import {Key32} from "../type/Key32.sol";
-import {LibNftIdSet} from "../type/NftIdSet.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
-import {NftIdSetManager} from "../shared/NftIdSetManager.sol";
 import {ObjectType, INSTANCE, PROTOCOL, STAKE, STAKING, TARGET} from "../type/ObjectType.sol";
 import {Seconds, SecondsLib} from "../type/Seconds.sol";
 import {StakeManagerLib} from "./StakeManagerLib.sol";
@@ -54,7 +52,7 @@ contract Staking is
 
 
     modifier onlyTarget(NftId targetNftId) {
-        if (!_getStakingStorage()._store.getTargetManager().exists(targetNftId)) {
+        if (!_getStakingStorage()._store.getTargetNftIdSet().exists(targetNftId)) {
             revert ErrorStakingNotTarget(targetNftId);
         }
         _;

package/contracts/staking/StakingLifecycle.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {TARGET, COMPONENT, STAKE} from "../type/ObjectType.sol";
+import {INITIAL} from "../type/StateId.sol";
+import {Lifecycle} from "../shared/Lifecycle.sol";
+
+contract StakingLifecycle is
+    Lifecycle
+{
+    constructor() {
+        _setupLifecycle();
+    }
+
+    function _setupLifecycle()
+        internal
+        override
+    {
+        setInitialState(TARGET(), INITIAL());
+        setInitialState(COMPONENT(), INITIAL());
+        setInitialState(STAKE(), INITIAL());
+    }
+}

package/contracts/staking/StakingManager.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.20;
 
 import {IVersionable} from "../shared/IVersionable.sol";
 import {ProxyManager} from "../shared/ProxyManager.sol";
-import {ReleaseManager} from "../registry/ReleaseManager.sol";
 import {Staking} from "./Staking.sol";
 import {StakingReader} from "./StakingReader.sol";
 import {StakingStore} from "./StakingStore.sol";

package/contracts/staking/StakingReader.sol

@@ -11,7 +11,6 @@ import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
 import {IStaking} from "../staking/IStaking.sol";
 import {IVersionable} from "../shared/IVersionable.sol";
 import {NftId} from "../type/NftId.sol";
-import {NftIdSetManager} from "../shared/NftIdSetManager.sol";
 import {ObjectType, STAKE, TARGET} from "../type/ObjectType.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {StakingStore} from "./StakingStore.sol";
@@ -60,32 +59,32 @@ contract StakingReader is
 
 
     function isTarget(NftId targetNftId) external view returns (bool) {
-        return _store.getTargetManager().exists(targetNftId);
+        return _store.getTargetNftIdSet().exists(targetNftId);
     }
 
 
     function targets() external view returns (uint256) {
-        return _store.getTargetManager().nftIds();
+        return _store.getTargetNftIdSet().nftIds();
     }
 
 
     function getTargetNftId(uint256 idx) external view returns (NftId) {
-        return _store.getTargetManager().getNftId(idx);
+        return _store.getTargetNftIdSet().getNftId(idx);
     }
 
 
     function isActive(NftId targetNftId) external view returns (bool) {
-        return _store.getTargetManager().isActive(targetNftId);
+        return _store.getTargetNftIdSet().isActive(targetNftId);
     }
 
 
     function activeTargets() external view returns (uint256) {
-        return _store.getTargetManager().activeNftIds();
+        return _store.getTargetNftIdSet().activeNftIds();
     }
 
 
     function getActiveTargetNftId(uint256 idx) external view returns (NftId) {
-        return _store.getTargetManager().getActiveNftId(idx);
+        return _store.getTargetNftIdSet().getActiveNftId(idx);
     }
 
 

package/contracts/staking/StakingStore.sol

@@ -14,9 +14,8 @@ import {IVersionable} from "../shared/IVersionable.sol";
 import {Key32} from "../type/Key32.sol";
 import {KeyValueStore} from "../shared/KeyValueStore.sol";
 import {KEEP_STATE} from "../type/StateId.sol";
-import {LibNftIdSet} from "../type/NftIdSet.sol";
 import {NftId, NftIdLib} from "../type/NftId.sol";
-import {NftIdSetManager} from "../shared/NftIdSetManager.sol";
+import {NftIdSet} from "../shared/NftIdSet.sol";
 import {ObjectType, INSTANCE, PROTOCOL, STAKE, STAKING, TARGET} from "../type/ObjectType.sol";
 import {Seconds, SecondsLib} from "../type/Seconds.sol";
 import {StakingReader} from "./StakingReader.sol";
@@ -28,11 +27,13 @@ import {Version, VersionLib} from "../type/Version.sol";
 import {Versionable} from "../shared/Versionable.sol";
 
 import {RegistryAdmin} from "../registry/RegistryAdmin.sol";
+import {StakingLifecycle} from "./StakingLifecycle.sol";
 
 
 contract StakingStore is 
     AccessManaged,
-    KeyValueStore
+    KeyValueStore,
+    StakingLifecycle
 {
 
     event LogStakingStoreReserveBalanceIncreased(NftId targetNftId, Amount dipAmount, Amount reserveBalance, Blocknumber lastUpdatedIn);
@@ -61,7 +62,7 @@ contract StakingStore is
     error ErrorStakingStoreTvlBalanceNotInitialized(NftId nftId);
 
     IRegistry private _registry;
-    NftIdSetManager private _targetManager;
+    NftIdSet private _targetNftIdSet;
     StakingReader private _reader;
 
     // staking rate
@@ -91,7 +92,7 @@ contract StakingStore is
         // set internal variables
         _registry = registry; //TODO if keeps registry -> RegistryLinked and checks registry address
         _reader = reader;
-        _targetManager = new NftIdSetManager();
+        _targetNftIdSet = new NftIdSet();
 
         // register protocol target
         _createTarget(
@@ -426,8 +427,9 @@ contract StakingStore is
         return _reader;
     }
 
-    function getTargetManager() external view returns (NftIdSetManager targetManager){
-        return _targetManager;
+    // TODO rename
+    function getTargetNftIdSet() external view returns (NftIdSet targetNftIdSet){
+        return _targetNftIdSet;
     }
 
     function getStakingRate(uint256 chainId, address token) external view returns (UFixed stakingRate) { return _stakingRate[chainId][token]; }
@@ -491,7 +493,7 @@ contract StakingStore is
         _tvlLastUpdatedIn[targetNftId]= BlocknumberLib.currentBlocknumber();
         _createTargetBalance(targetNftId);
 
-        _targetManager.add(targetNftId);
+        _targetNftIdSet.add(targetNftId);
     }
 
     function _updateReserves(

package/contracts/type/ObjectType.sol

@@ -27,20 +27,16 @@ function STAKING() pure returns (ObjectType) {
     return ObjectType.wrap(3);
 }
 
-function TOKEN() pure returns (ObjectType) {
-    return ObjectType.wrap(6);
-}
-
 function RELEASE() pure returns (ObjectType) {
-    return ObjectType.wrap(7);
+    return ObjectType.wrap(6);
 }
 
 function ROLE() pure returns (ObjectType) {
-    return ObjectType.wrap(8);
+    return ObjectType.wrap(7);
 }
 
 function SERVICE() pure returns (ObjectType) {
-    return ObjectType.wrap(9);
+    return ObjectType.wrap(8);
 }
 
 function INSTANCE() pure returns (ObjectType) {

package/contracts/type/RoleId.sol

@@ -19,6 +19,16 @@ using {
 
 // general pure free functions
 
+// @dev Returns true iff role ids a and b are identical
+function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
+    return RoleId.unwrap(a) == RoleId.unwrap(b);
+}
+
+// @dev Returns true iff role ids a and b are different
+function neRoleId(RoleId a, RoleId b) pure returns (bool isDifferent) {
+    return RoleId.unwrap(a) != RoleId.unwrap(b);
+}
+
 //--- OpenZeppelin provided roles -------------------------------------------//
 
 /// @dev Role ID needs to match with oz AccessManager.ADMIN_ROLE
@@ -90,44 +100,6 @@ function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(14)
 
 function CUSTOM_ROLE_MIN() pure returns (RoleId) { return RoleIdLib.toRoleId(1000000); }
 
-// TODO cleanup
-/// @dev role associated with the staking contract
-// function REGISTRY_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(1800); }
-// /// @dev instance specific role for instance service
-// function INSTANCE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2000); }
-// /// @dev role for registering gif components
-// function COMPONENT_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2001); }
-// /// @dev instance specific role for distribution service
-// function DISTRIBUTION_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2100); }
-// /// @dev instance specific role for oracle service
-// function ORACLE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2150); }
-// /// @dev instance specific role for pool service
-// function POOL_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2200); }
-// /// @dev instance specific role for product service
-// function PRODUCT_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2300); }
-// /// @dev instance specific role for application service
-// function APPLICATION_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2400); }
-// /// @dev instance specific role for policy service
-// function POLICY_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2410); }
-// /// @dev instance specific role for claim service
-// function CLAIM_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2420); }
-// /// @dev instance specific role for bundle service
-// function BUNDLE_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2500); }
-// /// @dev instance specific role for pricing service
-// function PRICING_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2800); }
-// /// @dev instance specific role for staking service
-
-// function STAKING_SERVICE_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId(2900); 
-// @dev Returns true iff role ids a and b are identical
-function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
-    return RoleId.unwrap(a) == RoleId.unwrap(b);
-}
-
-// @dev Returns true iff role ids a and b are different
-function neRoleId(RoleId a, RoleId b) pure returns (bool isDifferent) {
-    return RoleId.unwrap(a) != RoleId.unwrap(b);
-}
-
 library RoleIdLib {
 
     uint64 public constant ALL_VERSIONS = 99;

package/contracts/type/Version.sol

@@ -7,6 +7,7 @@ using {
     versionPartGt as >,
     versionPartEq as ==,
     versionPartNe as !=,
+    VersionPartLib.eqz,
     VersionPartLib.toInt
 }
     for VersionPart global;
@@ -16,7 +17,8 @@ function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) {
 function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
 
 library VersionPartLib {
-    function toInt(VersionPart a) external pure returns(uint) { return VersionPart.unwrap(a); }
+    function eqz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) == 0; }
+    function toInt(VersionPart a) external pure returns(uint256) { return VersionPart.unwrap(a); }
     function toVersionPart(uint256 a) external pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-e8b06c8-540",
+  "version": "0.0.2-e8ea17d-715",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
@@ -43,8 +43,8 @@
     "typescript": "^5"
   },
   "dependencies": {
-    "@openzeppelin/contracts": "5.0.0",
-    "@openzeppelin/contracts-upgradeable": "5.0.0",
+    "@openzeppelin/contracts": "5.0.2",
+    "@openzeppelin/contracts-upgradeable": "5.0.2",
     "@openzeppelin/upgrades-core": "^1.34.1",
     "abi-coder": "^5.0.0",
     "antlr4ng": "^3.0.4",

package/artifacts/contracts/authorization/InstanceAdmin.sol/InstanceAdmin.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/738273943de8559a18576d572e141a51.json"
-}