@etherisc/gif-next 0.0.2-b2910e7-757 → 0.0.2-b312c9a-831

package/contracts/product/RiskService.sol

@@ -9,11 +9,12 @@ import {IRegistryService} from "../registry/IRegistryService.sol";
 import {IRisk} from "../instance/module/IRisk.sol";
 
 import {InstanceReader} from "../instance/InstanceReader.sol";
-import {ObjectType, INSTANCE, PRODUCT, POOL, POLICY, REGISTRY} from "../type/ObjectType.sol";
-import {KEEP_STATE} from "../type/StateId.sol";
+import {ObjectType, INSTANCE, PRODUCT, POOL, POLICY, REGISTRY, RISK} from "../type/ObjectType.sol";
+import {ACTIVE, PAUSED, KEEP_STATE} from "../type/StateId.sol";
 import {NftId} from "../type/NftId.sol";
 import {RiskId} from "../type/RiskId.sol";
 import {StateId} from "../type/StateId.sol";
+import {RiskSet} from "../instance/RiskSet.sol";
 import {ComponentVerifyingService} from "../shared/ComponentVerifyingService.sol";
 
 contract RiskService is
@@ -61,6 +62,10 @@ contract RiskService is
             riskId,
             riskInfo
         );
+
+        // add risk to RiskSet
+        RiskSet riskSet = instance.getRiskSet();
+        riskSet.add(riskId);
     }
 
 
@@ -87,10 +92,16 @@ contract RiskService is
     {
         (,, IInstance instance) = _getAndVerifyActiveComponent(PRODUCT());
         instance.getInstanceStore().updateRiskState(riskId, state);
+
+        if (state == ACTIVE()) {
+            instance.getRiskSet().activate(riskId);
+        } else if (state == PAUSED()) {
+            instance.getRiskSet().pause(riskId);
+        }
     }
 
 
     function _getDomain() internal pure override returns(ObjectType) {
-        return PRODUCT();
+        return RISK();
     }
 }

package/contracts/registry/RegistryAdmin.sol

@@ -10,6 +10,7 @@ import {IStaking} from "../staking/IStaking.sol";
 import {ObjectType, ObjectTypeLib, ALL, 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 {StakingStore} from "../staking/StakingStore.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {TokenRegistry} from "./TokenRegistry.sol";
@@ -367,6 +368,12 @@ contract RegistryAdmin is
         _createTarget(address(IStaking(_staking).getTokenHandler()), STAKING_TH_TARGET_NAME, true, false);
         _createTarget(_stakingStore, STAKING_STORE_TARGET_NAME, true, false);
 
+        // staking function authorization for public role
+        FunctionInfo[] memory functions;
+        functions = new FunctionInfo[](1);
+        functions[0] = toFunction(Staking.approveTokenHandler.selector, "approveTokenHandler");
+        _authorizeTargetFunctions(_staking, PUBLIC_ROLE(), functions); // only owner protected
+
         // staking function authorization for staking service
         RoleId stakingServiceRoleId = RoleIdLib.roleForTypeAndAllVersions(STAKING());
         _createRole(
@@ -377,7 +384,6 @@ contract RegistryAdmin is
                 maxMemberCount: MAX_NUM_RELEASES,
                 name: STAKING_SERVICE_ROLE_NAME}));
 
-        FunctionInfo[] memory functions;
         functions = new FunctionInfo[](12);
         functions[0] = toFunction(IStaking.registerTarget.selector, "registerTarget");
         functions[1] = toFunction(IStaking.setLockingPeriod.selector, "setLockingPeriod");
@@ -390,9 +396,6 @@ contract RegistryAdmin is
         functions[8] = toFunction(IStaking.restake.selector, "restake");
         functions[9] = toFunction(IStaking.updateRewards.selector, "updateRewards");
         functions[10] = toFunction(IStaking.claimRewards.selector, "claimRewards");
-        // TODO cleanup
-        // functions[11] = toFunction(IStaking.collectDipAmount.selector, "collectDipAmount");
-        // functions[11] = toFunction(IStaking.transferDipAmount.selector, "transferDipAmount");
         _authorizeTargetFunctions(_staking, stakingServiceRoleId, functions);
     
         // grant token handler authorizations
@@ -450,13 +453,5 @@ contract RegistryAdmin is
         _authorizeTargetFunctions(_stakingStore, stakingRoleId, functions);
         
         _grantRoleToAccount(stakingRoleId, _staking);
-    
-        // TODO cleanup
-        // grant token handler authorizations
-        // IStaking staking = IStaking(_staking);
-        // functions = new FunctionInfo[](1);
-        // functions[0] = toFunction(TokenHandler.distributeTokens.selector, "distributeTokens");
-        
-        // _authorizeTargetFunctions(address(staking.getTokenHandler()), stakingRoleId, functions);
     }
 }

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -2,13 +2,13 @@
 pragma solidity ^0.8.20;
 
 import {
-     ALL, REGISTRY, PRODUCT, ORACLE, POOL, INSTANCE, COMPONENT, DISTRIBUTION, DISTRIBUTOR, 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";
+import {IAccountingService} from "../accounting/IAccountingService.sol";
 import {IBundleService} from "../pool/IBundleService.sol";
 import {IDistributionService} from "../distribution/IDistributionService.sol";
-import {IInstanceService} from "../instance/IInstanceService.sol";
 import {IPoolService} from "../pool/IPoolService.sol";
 import {IStakingService} from "../staking/IStakingService.sol";
 import {IRegistryService} from "./IRegistryService.sol";
@@ -30,16 +30,17 @@ contract ServiceAuthorizationV3
           _authorizeDomain(REGISTRY(), address(1));
           _authorizeDomain(STAKING(), address(2));
           _authorizeDomain(INSTANCE(), address(3));
-          _authorizeDomain(COMPONENT(), address(4));
-          _authorizeDomain(DISTRIBUTION(), address(5));
-          _authorizeDomain(PRICE(), address(6));
-          _authorizeDomain(BUNDLE(), address(7));
-          _authorizeDomain(POOL(), address(8));
-          _authorizeDomain(ORACLE(), address(9));
-          _authorizeDomain(PRODUCT(), address(10));
-          _authorizeDomain(POLICY(), address(11));
-          _authorizeDomain(CLAIM(), address(12));
-          _authorizeDomain(APPLICATION(), address(13));
+          _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));
      }
 
 
@@ -50,6 +51,7 @@ contract ServiceAuthorizationV3
           _setupIRegistryServiceAuthorization();
           _setupStakingServiceAuthorization();
           _setupInstanceServiceAuthorization();
+          _setupAccountingServiceAuthorization();
           _setupComponentServiceAuthorization();
           _setupDistributionServiceAuthorization();
           _setupPoolServiceAuthorization();
@@ -113,11 +115,36 @@ contract ServiceAuthorizationV3
      function _setupInstanceServiceAuthorization()
           internal
      {
-          // TODO cleanup
-          // IAccess.FunctionInfo[] storage functions;
+     }
+
+     /// @dev Accounting service function authorization.
+     function _setupAccountingServiceAuthorization()
+          internal
+     {
+          IAccess.FunctionInfo[] storage functions;
+
+          functions = _authorizeForService(ACCOUNTING(), BUNDLE());
+          _authorize(functions, IAccountingService.increaseBundleBalance.selector, "increaseBundleBalance");
+          _authorize(functions, IAccountingService.decreaseBundleBalance.selector, "decreaseBundleBalance");
+
+          functions = _authorizeForService(ACCOUNTING(), COMPONENT());
+          _authorize(functions, IAccountingService.decreaseComponentFees.selector, "decreaseComponentFees");
+
+          functions = _authorizeForService(ACCOUNTING(), DISTRIBUTION());
+          _authorize(functions, IAccountingService.increaseDistributionBalance.selector, "increaseDistributionBalance");
+          _authorize(functions, IAccountingService.decreaseDistributionBalance.selector, "decreaseDistributionBalance");
+          _authorize(functions, IAccountingService.increaseDistributorBalance.selector, "increaseDistributorBalance");
+          _authorize(functions, IAccountingService.decreaseDistributorBalance.selector, "decreaseDistributorBalance");
+
+          functions = _authorizeForService(ACCOUNTING(), POLICY());
+          _authorize(functions, IAccountingService.increaseProductFees.selector, "increaseProductFees");
+          
+          functions = _authorizeForService(ACCOUNTING(), POOL());
+          _authorize(functions, IAccountingService.increasePoolBalance.selector, "increasePoolBalance");
+          _authorize(functions, IAccountingService.decreasePoolBalance.selector, "decreasePoolBalance");
+          _authorize(functions, IAccountingService.increaseBundleBalanceForPool.selector, "increaseBundleBalanceForPool");
+          _authorize(functions, IAccountingService.decreaseBundleBalanceForPool.selector, "decreaseBundleBalanceForPool");
 
-          // functions = _authorizeForService(INSTANCE(), COMPONENT());
-          // _authorize(functions, IInstanceService.initializeAuthorization.selector, "initializeAuthorization");
      }
 
 
@@ -125,28 +152,6 @@ contract ServiceAuthorizationV3
      function _setupComponentServiceAuthorization()
           internal
      {
-          // TODO cleanup
-          // authz.authorizations = new DomainAuthorization[](4);
-
-          // authz.authorizations[0].domain = POLICY();
-          // _functions = new IAccessAdmin.Function[](1);
-          // __authorize(ComponentService.increaseProductFees.selector, "increaseProductFees"));
-          // authz.authorizations[0].functions = _functions;
-
-          // authz.authorizations[1].domain = DISTRIBUTION();
-          // _functions = new IAccessAdmin.Function[](1);
-          // __authorize(ComponentService.increaseDistributionBalance.selector, "increaseDistributionBalance"));
-          // authz.authorizations[1].functions = _functions;
-
-          // authz.authorizations[2].domain = POOL();
-          // _functions = new IAccessAdmin.Function[](1);
-          // __authorize(ComponentService.increasePoolBalance.selector, "increasePoolBalance"));
-          // authz.authorizations[2].functions = _functions;
-
-          // authz.authorizations[3].domain = BUNDLE();
-          // _functions = new IAccessAdmin.Function[](1);
-          // __authorize(ComponentService.increaseBundleBalance.selector, "increaseBundleBalance"));
-          // authz.authorizations[3].functions = _functions;
      }
 
      /// @dev Distribution service function authorization.
@@ -189,7 +194,6 @@ contract ServiceAuthorizationV3
           _authorize(functions, IBundleService.close.selector, "close");
           _authorize(functions, IBundleService.lockCollateral.selector, "lockCollateral");
           _authorize(functions, IBundleService.releaseCollateral.selector, "releaseCollateral");
-          _authorize(functions, IBundleService.unlinkPolicy.selector, "unlinkPolicy");
 
           functions = _authorizeForService(BUNDLE(), ALL());
           _authorize(functions, IBundleService.create.selector, "create");

package/contracts/shared/Component.sol

@@ -38,12 +38,14 @@ abstract contract Component is
         _;
     }
 
+
     function _getComponentStorage() private pure returns (ComponentStorage storage $) {
         assembly {
             $.slot := COMPONENT_LOCATION_V1
         }
     }
 
+
     function _initializeComponent(
         address authority,
         address registry,
@@ -91,26 +93,6 @@ abstract contract Component is
     }
 
 
-    function approveTokenHandler(IERC20Metadata token, Amount amount)
-        public
-        onlyOwner()
-    {
-        _approveTokenHandler(token, amount);
-    }
-
-
-    // TODO cleanup
-    // /// @dev Approves the component's token hander to spend tokens up to the specified limit.
-    // /// When the spending limit amount equals AmountLib.max it is set to type(uint256).max.
-    // function approveTokenHandler(address token, Amount spendingLimitAmount)
-    //     public
-    //     virtual
-    //     onlyOwner
-    // {
-    //     _approveTokenHandler(token, spendingLimitAmount);
-    // }
-
-
     // function setWallet(address newWallet)
     //     external
     //     virtual
@@ -176,6 +158,9 @@ abstract contract Component is
     }
 
 
+    /// @dev Approves token hanlder to spend up to the specified amount of tokens.
+    /// Reverts if component wallet is not token handler itself.
+    /// Only component owner (nft holder) is authorizes to call this function.
     function _approveTokenHandler(IERC20Metadata token, Amount amount)
         internal
         virtual