@etherisc/gif-next 0.0.2-f12cf4d-104 → 0.0.2-f13fd28-503

package/contracts/registry/ServiceAuthorizationV3.sol

@@ -2,16 +2,19 @@
 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 {IClaimService} from "../product/IClaimService.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";
+import {IRiskService} from "../product/IRiskService.sol";
 import {ServiceAuthorization} from "../authorization/ServiceAuthorization.sol";
 
 
@@ -30,16 +33,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,7 +54,11 @@ contract ServiceAuthorizationV3
           _setupIRegistryServiceAuthorization();
           _setupStakingServiceAuthorization();
           _setupInstanceServiceAuthorization();
+          _setupInstanceServiceAuthorization();
+          _setupAccountingServiceAuthorization();
           _setupComponentServiceAuthorization();
+          _setupClaimServiceAuthorization();
+          _setupRiskServiceAuthorization();
           _setupDistributionServiceAuthorization();
           _setupPoolServiceAuthorization();
           _setupBundleServiceAuthorization();
@@ -113,11 +121,49 @@ contract ServiceAuthorizationV3
      function _setupInstanceServiceAuthorization()
           internal
      {
-          // TODO cleanup
-          // IAccess.FunctionInfo[] storage functions;
+          IAccess.FunctionInfo[] storage functions;
+          functions = _authorizeForService(INSTANCE(), ALL());
+          _authorize(functions, IInstanceService.createInstance.selector, "createInstance");
+          _authorize(functions, IInstanceService.upgradeInstanceReader.selector, "upgradeInstanceReader");
+          _authorize(functions, IInstanceService.upgradeMasterInstanceReader.selector, "upgradeMasterInstanceReader");
+
+          _authorize(functions, IInstanceService.setStakingLockingPeriod.selector, "setStakingLockingPeriod");
+          _authorize(functions, IInstanceService.setStakingRewardRate.selector, "setStakingRewardRate");
+          _authorize(functions, IInstanceService.refillStakingRewardReserves.selector, "refillStakingRewardReserves");
+          _authorize(functions, IInstanceService.withdrawStakingRewardReserves.selector, "withdrawStakingRewardReserves");
+     }
+
+     /// @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(), POOL());
+          _authorize(functions, IAccountingService.decreaseBundleBalanceForPool.selector, "decreaseBundleBalanceForPool");
+
+          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,36 +171,33 @@ 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.
-     function _setupDistributionServiceAuthorization()
+     function _setupRiskServiceAuthorization()
           internal
      {
           IAccess.FunctionInfo[] storage functions;
+          functions = _authorizeForService(RISK(), ALL());
+          _authorize(functions, IRiskService.createRisk.selector, "createRisk");
+          _authorize(functions, IRiskService.updateRisk.selector, "updateRisk");
+          _authorize(functions, IRiskService.updateRiskState.selector, "updateRiskState");
+     }
+
+     /// @dev Distribution service function authorization.
+     function _setupClaimServiceAuthorization()
+          internal
+     {
+          IAccess.FunctionInfo[] storage functions;
+          functions = _authorizeForService(CLAIM(), ALL());
+          _authorize(functions, IClaimService.submit.selector, "submit");
+     }
 
+     /// @dev Distribution service function authorization.
+     function _setupDistributionServiceAuthorization()
+          internal
+     {
+          IAccess.FunctionInfo[] storage functions;
           functions = _authorizeForService(DISTRIBUTION(), POLICY());
           _authorize(functions, IDistributionService.processSale.selector, "processSale");
           _authorize(functions, IDistributionService.processReferral.selector, "processReferral");
@@ -174,6 +217,9 @@ contract ServiceAuthorizationV3
 
           functions = _authorizeForService(POOL(), CLAIM());
           _authorize(functions, IPoolService.processPayout.selector, "processPayout");
+
+          functions = _authorizeForService(POOL(), ALL());
+          _authorize(functions, IPoolService.withdrawBundleFees.selector, "withdrawBundleFees");
      }
 
 
@@ -189,7 +235,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");
@@ -197,7 +242,6 @@ contract ServiceAuthorizationV3
           _authorize(functions, IBundleService.lock.selector, "lock");
           _authorize(functions, IBundleService.unlock.selector, "unlock");
           _authorize(functions, IBundleService.setFee.selector, "setFee");
-          _authorize(functions, IBundleService.withdrawBundleFees.selector, "withdrawBundleFees");
      }
 }
 

package/contracts/registry/TokenRegistry.sol

@@ -8,15 +8,13 @@ import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165C
 import {REGISTRY} from "../type/ObjectType.sol";
 import {VersionPart} from "../type/Version.sol";
 
-import {IRegisterable} from "../shared/IRegisterable.sol";
-
 import {IRegistry} from "./IRegistry.sol";
 import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
 import {ReleaseRegistry} from "./ReleaseRegistry.sol";
 import {RegistryAdmin} from "./RegistryAdmin.sol";
 
-
-/// @title contract to register token per GIF major release.
+/// @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.
 contract TokenRegistry is
     AccessManaged,
     IRegistryLinked
@@ -68,7 +66,7 @@ contract TokenRegistry is
         setAuthority(authority);
         
         _registry = registry;
-        _dipToken = dipToken;
+        _dipToken = _verifyOnchainToken(address(dipToken));
 
         // register dip token
         uint256 chainId = block.chainid;
@@ -212,13 +210,13 @@ contract TokenRegistry is
         return _tokenInfo[chainId][token].chainId > 0;
     }
 
-    /// @dev returns true iff both the token is active for the specfied version and the global token state is active
-    function isActive(uint256 chainId, address token, VersionPart majorVersion) external view returns (bool) {
+    /// @dev returns true iff both the token is active for the specfied release and the global token state is active
+    function isActive(uint256 chainId, address token, VersionPart release) external view returns (bool) {
         if(!_tokenInfo[chainId][token].active) {
             return false;
         }
 
-        return _active[chainId][token][majorVersion];
+        return _active[chainId][token][release];
     }
 
     function getDipTokenAddress() external view returns (address) {

package/contracts/shared/Component.sol

@@ -1,23 +1,25 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";
 import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
-import {Amount, AmountLib} from "../type/Amount.sol";
 import {IComponent} from "./IComponent.sol";
 import {IComponents} from "../instance/module/IComponents.sol";
 import {IComponentService} from "./IComponentService.sol";
-import {NftId, NftIdLib} from "../type/NftId.sol";
-import {ObjectType, COMPONENT} from "../type/ObjectType.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
+import {IRelease} from "../registry/IRelease.sol";
+
+import {Amount, AmountLib} from "../type/Amount.sol";
+import {ContractLib} from "./ContractLib.sol";
+import {NftId} from "../type/NftId.sol";
+import {ObjectType, COMPONENT, STAKING} from "../type/ObjectType.sol";
 import {Registerable} from "../shared/Registerable.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
-import {VersionPartLib} from "../type/Version.sol";
+import {Version, VersionLib, VersionPart} from "../type/Version.sol";
+
 
 abstract contract Component is
-    AccessManagedUpgradeable,
     Registerable,
     IComponent
 {
@@ -40,12 +42,14 @@ abstract contract Component is
         _;
     }
 
+
     function _getComponentStorage() private pure returns (ComponentStorage storage $) {
         assembly {
             $.slot := COMPONENT_LOCATION_V1
         }
     }
 
+
     function _initializeComponent(
         address authority,
         address registry,
@@ -62,15 +66,26 @@ abstract contract Component is
         virtual
         onlyInitializing()
     {
-        if (token == address(0)) {
-            revert ErrorComponentTokenAddressZero();
+        address tokenRegistry = IRegistry(registry).getTokenRegistryAddress();
+        VersionPart release = IRelease(authority).getRelease();
+
+        // special case for staking: component intitialization happens before
+        // GIF core contract setup is complete. at that time token registry 
+        // is not yet available. therefore we skip the check for staking.
+        if (componentType != STAKING()) {
+
+            // check if provided token is whitelisted and active
+            if (!ContractLib.isActiveToken(tokenRegistry, token, block.chainid, release)) {
+                revert ErrorComponentTokenInvalid(token);
+            }
         }
 
         if (bytes(name).length == 0) {
             revert ErrorComponentNameLengthZero();
         }
 
-        _initializeRegisterable(
+        __Registerable_init(
+            authority,
             registry, 
             parentNftId, 
             componentType, 
@@ -78,8 +93,6 @@ abstract contract Component is
             initialOwner, 
             registryData);
 
-        __AccessManaged_init(authority);
-
         // set component state
         ComponentStorage storage $ = _getComponentStorage();
         $._name = name;
@@ -93,41 +106,12 @@ 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
-    //     override
-    //     onlyOwner
-    // {
-    //     _setWallet(newWallet);
-    // }
-
     /// @dev callback function for nft transfers
     /// may only be called by chain nft contract.
     /// override internal function _nftTransferFrom to implement custom behaviour
     function nftTransferFrom(address from, address to, uint256 tokenId, address operator)
         external
-        onlyChainNft
+        onlyChainNft()
     {
         _nftTransferFrom(from, to, tokenId, operator);
     }
@@ -149,6 +133,10 @@ abstract contract Component is
         return getComponentInfo().name;
     }
 
+    function getVersion() public view virtual returns (Version version) {
+        return VersionLib.toVersion(1, 0, 0);
+    }
+
     function getComponentInfo() public virtual view returns (IComponents.ComponentInfo memory info) {
         if (isRegistered()) {
             return _getComponentInfo();
@@ -178,6 +166,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
@@ -207,6 +198,13 @@ abstract contract Component is
         _getComponentStorage()._componentService.setWallet(newWallet);
     }
 
+    function _setLocked(bool locked)
+        internal
+        virtual
+    {
+        _getComponentStorage()._componentService.setLockedFromComponent(address(this), locked);
+    }
+
 
     /// @dev depending on the source of the component information this function needs to be overwritten. 
     /// eg for instance linked components that externally store this information with the instance store contract