@etherisc/gif-next 0.0.2-7c8d286-020 → 0.0.2-7d488b3-675

package/contracts/product/PolicyServiceLib.sol

@@ -10,67 +10,13 @@ import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
 
 library PolicyServiceLib {
 
-    function activate(
-        NftId policyNftId, 
-        IPolicy.PolicyInfo memory policyInfo,
-        Timestamp activateAt
-    )
-        external
-        pure 
-        returns (IPolicy.PolicyInfo memory)
-    {
-        // fail if policy has already been activated and activateAt is different
-        if(! policyInfo.activatedAt.eqz() && activateAt != policyInfo.activatedAt) {
-            revert IPolicyService.ErrorPolicyServicePolicyAlreadyActivated(policyNftId);
-        }
-
-        // ignore if policy has already been activated and activateAt is the same
-        if (policyInfo.activatedAt == activateAt) {
-            return policyInfo;
-        }
-
-        policyInfo.activatedAt = activateAt;
-        policyInfo.expiredAt = activateAt.addSeconds(policyInfo.lifetime);
-
-        return policyInfo;
-    }
-
-    function expire(
-        InstanceReader instanceReader,
-        NftId policyNftId,
-        IPolicy.PolicyInfo memory policyInfo,
-        Timestamp expireAt
-    )
-        external
-        view
-        returns (IPolicy.PolicyInfo memory)
-    {
-        StateId policyState = instanceReader.getPolicyState(policyNftId);
-
-        checkExpiration(
-            expireAt,
-            policyNftId,
-            policyState,
-            policyInfo);
-
-        // effects
-        // update policyInfo with new expiredAt timestamp
-        if (expireAt.gtz()) {
-            policyInfo.expiredAt = expireAt;
-        } else {
-            policyInfo.expiredAt = TimestampLib.blockTimestamp();
-        }
-
-        return policyInfo;
-    }
-
     function checkExpiration(
         Timestamp newExpiredAt,
         NftId policyNftId,
         StateId policyState,
         IPolicy.PolicyInfo memory policyInfo
     )
-        public 
+        external 
         view
     {
         if (policyState != COLLATERALIZED()) { 

package/contracts/product/PricingService.sol

@@ -87,11 +87,6 @@ contract PricingService is
             // get instance reader from local instance variable
             reader = instance.getInstanceReader();
 
-            NftId riskProductNftId = reader.getRiskInfo(riskId).productNftId;
-            if (productNftId != riskProductNftId) {
-                revert ErrorPricingServiceRiskProductMismatch(riskId, riskProductNftId, productNftId);
-            }
-
             // calculate net premium
             netPremiumAmount = IProductComponent(registryInfo.objectAddress).calculateNetPremium(
                 sumInsuredAmount,

package/contracts/product/RiskService.sol

@@ -82,11 +82,6 @@ contract RiskService is
         // effects
         InstanceReader instanceReader = instance.getInstanceReader();
         IRisk.RiskInfo memory riskInfo = instanceReader.getRiskInfo(riskId);
-
-        if (riskInfo.productNftId != productNftId) {
-            revert ErrorRiskServiceRiskProductMismatch(riskId, riskInfo.productNftId, productNftId);
-        }
-
         riskInfo.data = data;
         instance.getInstanceStore().updateRisk(riskId, riskInfo, KEEP_STATE());
     }
@@ -102,11 +97,6 @@ contract RiskService is
         // checks
         (NftId productNftId, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
 
-        NftId riskProductNftId = instance.getInstanceReader().getRiskInfo(riskId).productNftId;
-        if (riskProductNftId != productNftId) {
-            revert ErrorRiskServiceRiskProductMismatch(riskId, riskProductNftId, productNftId);
-        }
-
         // effects
         instance.getInstanceStore().updateRiskState(riskId, state);
 

package/contracts/registry/RegistryAdmin.sol

@@ -1,21 +1,18 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.20;
 
-import {IAuthorization} from "../authorization/IAuthorization.sol";
+import {AccessAdmin} from "../authorization/AccessAdmin.sol";
+import {AccessManagerCloneable} from "../authorization/AccessManagerCloneable.sol";
+import {IAccess} from "../authorization/IAccess.sol";
 import {IComponent} from "../shared/IComponent.sol";
 import {IRegistry} from "./IRegistry.sol";
 import {IService} from "../shared/IService.sol";
+import {IServiceAuthorization} from "../authorization/IServiceAuthorization.sol";
 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 {ObjectType, ObjectTypeLib, ALL, COMPONENT, 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";
@@ -63,8 +60,7 @@ contract RegistryAdmin is
     string public constant TOKEN_REGISTRY_TARGET_NAME = "TokenRegistry";
     string public constant TOKEN_HANDLER_TARGET_NAME = "TokenHandler";
 
-    // completeSetup
-    error ErrorRegistryAdminNotRegistry(address registry);
+    uint8 public constant MAX_NUM_RELEASES = 99;
 
     address internal _registry;
     address private _releaseRegistry;
@@ -73,15 +69,11 @@ contract RegistryAdmin is
     address private _stakingStore;
 
     constructor() {
-        initialize(
-            address(new AccessManagerCloneable()),
-            "RegistryAdmin");
+        initialize(new AccessManagerCloneable());
     }
 
-
     function completeSetup(
-        address registry,
-        address authorization,
+        IRegistry registry,
         address gifAdmin, 
         address gifManager
     )
@@ -90,47 +82,37 @@ contract RegistryAdmin is
         reinitializer(type(uint8).max)
         onlyDeployer()
     {
-        // checks
-        _checkRegistry(registry);
-
-        VersionPart release = VersionPartLib.toVersionPart(3);
-        AccessManagerCloneable(
-            authority()).completeSetup(
-                registry, 
-                release); 
-
-        _checkAuthorization(authorization, REGISTRY(), release, true);
-
-        _registry = registry;
-        _authorization = IAuthorization(authorization);
-
-        IRegistry registryContract = IRegistry(registry);
-        _releaseRegistry = registryContract.getReleaseRegistryAddress();
-        _tokenRegistry = registryContract.getTokenRegistryAddress();
-        _staking = registryContract.getStakingAddress();
+        AccessManagerCloneable accessManager = AccessManagerCloneable(authority());
+        accessManager.completeSetup(
+            address(registry), 
+            VersionPartLib.toVersionPart(type(uint8).max),
+            false); 
+
+        _registry = address(registry);
+        _releaseRegistry = registry.getReleaseRegistryAddress();
+        _tokenRegistry = registry.getTokenRegistryAddress();
+        _staking = registry.getStakingAddress();
         _stakingStore = address(
             IStaking(_staking).getStakingStore());
 
-        // link nft ownability to registry
-        _linkToNftOwnable(_registry);
+        _createTargets();
 
-        _setupRegistry(_registry);
-
-        // setup authorization for registry and supporting contracts
-        _createRoles(_authorization);
-        _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
-        _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
+        _setupGifAdminRole(gifAdmin);
+        _setupGifManagerRole(gifManager);
 
-        _createTargets(_authorization);
-        _createTargetAuthorizations(_authorization);
+        _setupRegistryRoles();
+        _setupStakingRoles();
     }
 
+    /*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);
+    }*/
 
-
-    function grantServiceRoleForAllVersions(
-        IService service, 
-        ObjectType domain
-    )
+    function grantServiceRoleForAllVersions(IService service, ObjectType domain)
         external
         restricted()
     {
@@ -151,108 +133,222 @@ contract RegistryAdmin is
 
     //--- private initialization functions -------------------------------------------//
 
-    // create registry role and target
-    function _setupRegistry(address registry) internal {
-
-        // create registry role
-        RoleId roleId = _authorization.getTargetRole(
-            _authorization.getMainTarget());
+    function _createTargets()
+        private 
+        onlyInitializing()
+    {
+        IStaking staking = IStaking(_staking);
+        address tokenHandler = address(staking.getTokenHandler());
 
-        _createRole(
-            roleId,
-            _authorization.getRoleInfo(roleId));
-
-        // create registry target
-        _createTarget(
-            registry, 
-            _authorization.getMainTargetName(), 
-            true, // checkAuthority
-            false); // custom
-
-        // assign registry role to registry
-        _grantRoleToAccount(
-            roleId, 
-            registry);
+        _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);
     }
 
-
-    function _createRoles(IAuthorization authorization)
-        internal
+    function _setupGifAdminRole(address gifAdmin) 
+        private 
+        onlyInitializing()
     {
-        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];
+        // create gif admin role
+        _createRole(
+            GIF_ADMIN_ROLE(), 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Gif,
+                maxMemberCount: 2, // TODO decide on max member count
+                name: GIF_ADMIN_ROLE_NAME}));
+
+        // grant permissions to the gif admin role for registry contract
+        FunctionInfo[] memory functions;
+        functions = new FunctionInfo[](1);
+        functions[0] = toFunction(IRegistry.registerRegistry.selector, "registerRegistry");
+        _authorizeTargetFunctions(_registry, GIF_ADMIN_ROLE(), functions);
+
+        // grant permissions to the gif admin role for release registry contract
+        functions = new FunctionInfo[](3);
+        functions[0] = toFunction(ReleaseRegistry.createNextRelease.selector, "createNextRelease");
+        functions[1] = toFunction(ReleaseRegistry.activateNextRelease.selector, "activateNextRelease");
+        functions[2] = toFunction(ReleaseRegistry.setActive.selector, "setActive");
+        _authorizeTargetFunctions(_releaseRegistry, GIF_ADMIN_ROLE(), functions);
 
-            // skip main target role, create role if not exists
-            if (roleId != mainTargetRoleId && !roleExists(roleId)) {
-                _createRole(
-                    roleId,
-                    authorization.getRoleInfo(roleId));
-            }
-        }
+        _grantRoleToAccount(GIF_ADMIN_ROLE(), gifAdmin);
     }
-
-
-    function _createTargets(IAuthorization authorization)
-        internal
+    
+    function _setupGifManagerRole(address gifManager)
+        private 
+        onlyInitializing()
     {
-        // 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)));
+        // create gif manager role
+        _createRole(
+            GIF_MANAGER_ROLE(), 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Gif,
+                maxMemberCount: 1, // TODO decide on max member count
+                name: GIF_MANAGER_ROLE_NAME}));
+
+        // grant permissions to the gif manager role for token registry contract
+        FunctionInfo[] memory functions;
+        functions = new FunctionInfo[](5);
+        functions[0] = toFunction(TokenRegistry.registerToken.selector, "registerToken");
+        functions[1] = toFunction(TokenRegistry.registerRemoteToken.selector, "registerRemoteToken");
+        functions[2] = toFunction(TokenRegistry.setActive.selector, "setActive");
+        functions[3] = toFunction(TokenRegistry.setActiveForVersion.selector, "setActiveForVersion");
+        // TODO find a better way (only needed for testing)
+        functions[4] = toFunction(TokenRegistry.setActiveWithVersionCheck.selector, "setActiveWithVersionCheck");
+        _authorizeTargetFunctions(_tokenRegistry, GIF_MANAGER_ROLE(), functions);
+
+        // grant permissions to the gif manager role for release registry contract
+        functions = new FunctionInfo[](2);
+        functions[0] = toFunction(ReleaseRegistry.prepareNextRelease.selector, "prepareNextRelease");
+        functions[1] = toFunction(ReleaseRegistry.registerService.selector, "registerService");
+        _authorizeTargetFunctions(_releaseRegistry, GIF_MANAGER_ROLE(), functions);
 
-        // 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);
+        _grantRoleToAccount(GIF_MANAGER_ROLE(), gifManager);
     }
 
-
-    function _createTargetAuthorizations(IAuthorization authorization)
-        internal
+    function _setupRegistryRoles()
+        private
+        onlyInitializing()
     {
-        Str[] memory targets = authorization.getTargets();
-        Str target;
-
-        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));
-            }
-        }
+        // TODO use RELEASE_REGISTRY_ROLE instead
+        // create and grant release registry role
+        RoleId releaseRegistryRoleId = RoleIdLib.roleForType(RELEASE());
+        _createRole(
+            releaseRegistryRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: 1,
+                name: RELEASE_REGISTRY_ROLE_NAME}));
+        _grantRoleToAccount(releaseRegistryRoleId, _releaseRegistry);
+
+        // grant permissions to the release registry role for release admin contract
+        FunctionInfo[] memory functions;
+        functions = new FunctionInfo[](1);
+        functions[0] = toFunction(RegistryAdmin.grantServiceRoleForAllVersions.selector, "grantServiceRoleForAllVersions");
+        _authorizeTargetFunctions(address(this), releaseRegistryRoleId, functions);
+
+        // grant permissions to the release registry role for registry contract
+        functions = new FunctionInfo[](1);
+        functions[0] = toFunction(IRegistry.registerService.selector, "registerService");
+        _authorizeTargetFunctions(_registry, releaseRegistryRoleId, functions);
+
+        // create registry service role
+        RoleId registryServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(REGISTRY());
+        _createRole(
+            registryServiceRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: MAX_NUM_RELEASES,
+                name: REGISTRY_SERVICE_ROLE_NAME}));
+
+        // grant permissions to the registry service role for registry contract
+        functions = new FunctionInfo[](2);
+        functions[0] = toFunction(IRegistry.register.selector, "register");
+        functions[1] = toFunction(IRegistry.registerWithCustomType.selector, "registerWithCustomType");
+        _authorizeTargetFunctions(_registry, registryServiceRoleId, functions);
     }
 
 
-    function _createTargets(address authorization)
+    function _setupStakingRoles()
         private 
         onlyInitializing()
     {
+        // create and grant staking contract role
+        RoleId stakingRoleId = RoleIdLib.roleForType(STAKING());
+        _createRole(
+            stakingRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: 1,
+                name: STAKING_ROLE_NAME}));
+        _grantRoleToAccount(stakingRoleId, _staking);
+
+        // grant permissions to the staking role for staking store contract
+        FunctionInfo[] memory functions;
+        functions = new FunctionInfo[](14);
+        functions[0] = toFunction(StakingStore.setStakingRate.selector, "setStakingRate");
+        functions[1] = toFunction(StakingStore.createTarget.selector, "createTarget");
+        functions[2] = toFunction(StakingStore.updateTarget.selector, "updateTarget");
+        functions[3] = toFunction(StakingStore.increaseReserves.selector, "increaseReserves");
+        functions[4] = toFunction(StakingStore.decreaseReserves.selector, "decreaseReserves");
+        functions[5] = toFunction(StakingStore.increaseTotalValueLocked.selector, "increaseTotalValueLocked");
+        functions[6] = toFunction(StakingStore.decreaseTotalValueLocked.selector, "decreaseTotalValueLocked");
+        functions[7] = toFunction(StakingStore.create.selector, "create");
+        functions[8] = toFunction(StakingStore.update.selector, "update");
+        functions[9] = toFunction(StakingStore.increaseStake.selector, "increaseStake");
+        functions[10] = toFunction(StakingStore.restakeRewards.selector, "restakeRewards");
+        functions[11] = toFunction(StakingStore.updateRewards.selector, "updateRewards");
+        functions[12] = toFunction(StakingStore.claimUpTo.selector, "claimUpTo");
+        functions[13] = toFunction(StakingStore.unstakeUpTo.selector, "unstakeUpTo");
+        _authorizeTargetFunctions(_stakingStore, stakingRoleId, functions);
+    
+        // grant permissions to the staking role for token handler contract
         IStaking staking = IStaking(_staking);
-        address tokenHandler = address(staking.getTokenHandler());
+        functions = new FunctionInfo[](2);
+        functions[0] = toFunction(TokenHandler.pullToken.selector, "pullToken");
+        functions[1] = toFunction(TokenHandler.pushToken.selector, "pushToken");
+        _authorizeTargetFunctions(address(staking.getTokenHandler()), stakingRoleId, functions);
 
-        _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);
+        // create staking service role
+        RoleId stakingServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(STAKING());
+        _createRole(
+            stakingServiceRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: MAX_NUM_RELEASES,
+                name: STAKING_SERVICE_ROLE_NAME}));
+
+        // grant permissions to the staking service role for staking contract
+        functions = new FunctionInfo[](11);
+        functions[0] = toFunction(IStaking.registerTarget.selector, "registerTarget");
+        functions[1] = toFunction(IStaking.setLockingPeriod.selector, "setLockingPeriod");
+        functions[2] = toFunction(IStaking.setRewardRate.selector, "setRewardRate");
+        functions[3] = toFunction(IStaking.refillRewardReserves.selector, "refillRewardReserves");
+        functions[4] = toFunction(IStaking.withdrawRewardReserves.selector, "withdrawRewardReserves");
+        functions[5] = toFunction(IStaking.createStake.selector, "createStake");
+        functions[6] = toFunction(IStaking.stake.selector, "stake");
+        functions[7] = toFunction(IStaking.unstake.selector, "unstake");
+        functions[8] = toFunction(IStaking.restake.selector, "restake");
+        functions[9] = toFunction(IStaking.updateRewards.selector, "updateRewards");
+        functions[10] = toFunction(IStaking.claimRewards.selector, "claimRewards");
+        _authorizeTargetFunctions(_staking, stakingServiceRoleId, functions);
+
+        // grant permissions to the staking service role for staking token handler
+        functions = new FunctionInfo[](3);
+        functions[0] = toFunction(TokenHandler.approve.selector, "approve");
+        functions[1] = toFunction(TokenHandler.pullToken.selector, "pullToken");
+        functions[2] = toFunction(TokenHandler.pushToken.selector, "pushToken");
+        _authorizeTargetFunctions(
+            address(IComponent(_staking).getTokenHandler()), stakingServiceRoleId, functions);
+
+        // create pool service role
+        RoleId poolServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(POOL());
+        _createRole(
+            poolServiceRoleId, 
+            toRole({
+                adminRoleId: ADMIN_ROLE(),
+                roleType: RoleType.Contract,
+                maxMemberCount: MAX_NUM_RELEASES,
+                name: POOL_SERVICE_ROLE_NAME}));
+
+        // grant permissions to the pool service role for staking contract
+        functions = new FunctionInfo[](2);
+        functions[0] = toFunction(IStaking.increaseTotalValueLocked.selector, "increaseTotalValueLocked");
+        functions[1] = toFunction(IStaking.decreaseTotalValueLocked.selector, "decreaseTotalValueLocked");
+        _authorizeTargetFunctions(_staking, poolServiceRoleId, functions);
+
+        // grant permissions to public role for staking contract
+        functions = new FunctionInfo[](1);
+        functions[0] = toFunction(Staking.approveTokenHandler.selector, "approveTokenHandler");
+        _authorizeTargetFunctions(_staking, PUBLIC_ROLE(), functions);
     }
 }