@etherisc/gif-next 0.0.2-e2d8c7d-942 → 0.0.2-e38b7e6-931

package/contracts/components/BaseComponent.sol

@@ -1,23 +1,31 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IBaseComponent} from "./IBaseComponent.sol";
-import {IComponentOwnerService} from "../instance/service/IComponentOwnerService.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+
+import {IBaseComponent} from "./IBaseComponent.sol";
+import {IProductService} from "../instance/service/IProductService.sol";
+import {IInstanceService} from "../instance/IInstanceService.sol";
 import {IInstance} from "../instance/IInstance.sol";
+import {InstanceAccessManager} from "../instance/InstanceAccessManager.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
-import {ObjectType} from "../types/ObjectType.sol";
+import {ObjectType, INSTANCE, PRODUCT} from "../types/ObjectType.sol";
+import {VersionLib} from "../types/Version.sol";
 import {Registerable} from "../shared/Registerable.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {RoleId, RoleIdLib} from "../types/RoleId.sol";
+import {IAccess} from "../instance/module/IAccess.sol";
 
+// TODO also inherit oz accessmanaged
 abstract contract BaseComponent is
     Registerable,
     IBaseComponent
 {
     using NftIdLib for NftId;
 
-    IComponentOwnerService internal _componentOwnerService;
+    IInstanceService internal _instanceService;
+    IProductService internal _productService;
 
     address internal _deployer;
     address internal _wallet;
@@ -25,6 +33,31 @@ abstract contract BaseComponent is
     IInstance internal _instance;
     NftId internal _productNftId;
 
+    modifier onlyProductService() {
+        if(msg.sender != address(_productService)) {
+            revert ErrorBaseComponentNotProductService(msg.sender);
+        }
+        _;
+    }
+
+    modifier onlyInstanceRole(uint64 roleIdNum) {
+        RoleId roleId = RoleIdLib.toRoleId(roleIdNum);
+        InstanceAccessManager accessManager = InstanceAccessManager(_instance.authority());
+        if( !accessManager.hasRole(roleId, msg.sender)) {
+            revert ErrorBaseComponentUnauthorized(msg.sender, roleIdNum);
+        }
+        _;
+    }
+
+    // TODO move to oz accessmanaged locked (which is included in restricted modifier)
+    modifier isNotLocked() {
+        InstanceAccessManager accessManager = InstanceAccessManager(_instance.authority());
+        if (accessManager.isTargetLocked(address(this))) {
+            revert IAccess.ErrorIAccessTargetLocked(address(this));
+        }
+        _;
+    }
+
     constructor(
         address registry,
         NftId instanceNftId,
@@ -37,29 +70,32 @@ abstract contract BaseComponent is
         bytes memory data = "";
         _initializeRegisterable(registry, instanceNftId, componentType, isInterceptor, initialOwner, data);
 
-        IRegistry.ObjectInfo memory instanceInfo = getRegistry().getObjectInfo(instanceNftId);
+        IRegistry.ObjectInfo memory instanceInfo = _registry.getObjectInfo(instanceNftId);
         _instance = IInstance(instanceInfo.objectAddress);
         require(
             _instance.supportsInterface(type(IInstance).interfaceId),
             ""
         );
 
-        _componentOwnerService = _instance.getComponentOwnerService();
+        _instanceService = IInstanceService(_registry.getServiceAddress(INSTANCE(), VersionLib.toVersion(3, 0, 0).toMajorPart()));
+        _productService = IProductService(_registry.getServiceAddress(PRODUCT(), VersionLib.toVersion(3, 0, 0).toMajorPart()));
         _wallet = address(this);
         _token = IERC20Metadata(token);
 
         _registerInterface(type(IBaseComponent).interfaceId);
     }
 
+    function getName() public pure virtual returns (string memory name);
+
     // from component contract
-    // TODO consider to remove/replace with access manager contract locking
+    // TODO only owner and instance owner 
     function lock() external onlyOwner override {
-        _componentOwnerService.lock(this);
+        _instanceService.setTargetLocked(getName(), true);
     }
-
-    // TODO consider to remove/replace with access manager contract locking
+    
+    // TODO only owner and instance owner 
     function unlock() external onlyOwner override {
-        _componentOwnerService.unlock(this);
+        _instanceService.setTargetLocked(getName(), false);
     }
 
     function getWallet()

package/contracts/components/Distribution.sol

@@ -16,7 +16,7 @@ import {Registerable} from "../shared/Registerable.sol";
 import {TokenHandler} from "../shared/TokenHandler.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 
-contract Distribution is
+abstract contract Distribution is
     BaseComponent,
     IDistributionComponent
 {
@@ -28,14 +28,6 @@ contract Distribution is
     TokenHandler internal _tokenHandler;
 
     IDistributionService private _distributionService;
-    IProductService private _productService;
-
-    modifier onlyProductService() {
-        require(
-            msg.sender == address(_productService), 
-            "ERROR:POL-002:NOT_PRODUCT_SERVICE");
-        _;
-    }
 
     constructor(
         address registry,
@@ -52,9 +44,7 @@ contract Distribution is
         _initialDistributionFee = distributionFee;
 
         _tokenHandler = TokenHandler(token);
-
         _distributionService = _instance.getDistributionService();
-        _productService = _instance.getProductService();
 
         _registerInterface(type(IDistributionComponent).interfaceId);
     }
@@ -150,6 +140,7 @@ contract Distribution is
         return (
             info,
             abi.encode(
+                getName(),
                 ISetup.DistributionSetupInfo(
                     _productNftId,
                     _tokenHandler,

package/contracts/components/IBaseComponent.sol

@@ -10,12 +10,16 @@ import {NftId} from "../types/NftId.sol";
 interface IBaseComponent is IRegisterable {
     error ErrorBaseComponentWalletAddressIsSameAsCurrent(address newWallet);
     error ErrorBaseComponentWalletAllowanceTooSmall(address oldWallet, address newWallet, uint256 allowance, uint256 balance);
+    error ErrorBaseComponentUnauthorized(address caller, uint64 requiredRoleIdNum);
+    error ErrorBaseComponentNotProductService(address caller);
 
     event LogBaseComponentWalletAddressChanged(address newWallet);
     event LogBaseComponentWalletTokensTransferred(address from, address to, uint256 amount);
 
-    function lock() external;
+    function getName() external pure returns (string memory name);
 
+    // TODO remove and replace with accessmanaged target locking mechanism
+    function lock() external;
     function unlock() external;
 
     function getToken() external view returns (IERC20Metadata token);

package/contracts/components/IProductComponent.sol

@@ -18,8 +18,8 @@ interface IProductComponent {
         RiskId riskId,
         uint256 lifetime,
         bytes memory applicationData,
-        ReferralId referralId,
-        NftId bundleNftId
+        NftId bundleNftId,
+        ReferralId referralId
     ) external view returns (uint256 premiumAmount);
 
     function calculateNetPremium(

package/contracts/components/Pool.sol

@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {ObjectType, POOL} from "../types/ObjectType.sol";
-import {IProductService} from "../instance/service/IProductService.sol";
+import {POOL} from "../types/ObjectType.sol";
 import {IPoolService} from "../instance/service/IPoolService.sol";
 import {IBundleService} from "../instance/service/IBundleService.sol";
-import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
+import {NftId, NftIdLib} from "../types/NftId.sol";
 import {Fee} from "../types/Fee.sol";
 import {UFixed} from "../types/UFixed.sol";
 import {IPoolComponent} from "./IPoolComponent.sol";
@@ -15,15 +14,13 @@ import {ISetup} from "../instance/module/ISetup.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
 
-// import {IPool} from "../instance/module/pool/IPoolModule.sol";
-import {ITreasury} from "../instance/module/ITreasury.sol";
 import {ISetup} from "../instance/module/ISetup.sol";
 import {InstanceReader} from "../instance/InstanceReader.sol";
 
 import {IRegisterable} from "../shared/IRegisterable.sol";
 import {Registerable} from "../shared/Registerable.sol";
 
-contract Pool is BaseComponent, IPoolComponent {
+abstract contract Pool is BaseComponent, IPoolComponent {
     using NftIdLib for NftId;
 
     bool internal _isConfirmingApplication;
@@ -37,10 +34,6 @@ contract Pool is BaseComponent, IPoolComponent {
 
     // may be used to interact with instance by derived contracts
     IPoolService internal _poolService;
-
-    // only relevant to protect callback functions for "active" pools
-    IProductService private _productService;
-
     IBundleService private _bundleService;
 
     modifier onlyPoolService() {
@@ -50,13 +43,6 @@ contract Pool is BaseComponent, IPoolComponent {
         _;
     }
 
-    modifier onlyProductService() {
-        require(
-            msg.sender == address(_productService), 
-            "ERROR:POL-002:NOT_PRODUCT_SERVICE");
-        _;
-    }
-
     constructor(
         address registry,
         NftId instanceNftId,
@@ -82,7 +68,7 @@ contract Pool is BaseComponent, IPoolComponent {
         _tokenHandler = new TokenHandler(token);
 
         _poolService = _instance.getPoolService();
-        _productService = _instance.getProductService();
+        // _productService = _instance.getProductService();
         _bundleService = _instance.getBundleService();
 
         _registerInterface(type(IPoolComponent).interfaceId);
@@ -217,6 +203,7 @@ contract Pool is BaseComponent, IPoolComponent {
         return (
             info,
             abi.encode(
+                getName(),
                 ISetup.PoolSetupInfo(
                     _productNftId,
                     _tokenHandler,

package/contracts/components/Product.sol

@@ -4,17 +4,15 @@ pragma solidity ^0.8.19;
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IRisk} from "../instance/module/IRisk.sol";
-import {ITreasury} from "../instance/module/ITreasury.sol";
-import {IProductService} from "../instance/service/IProductService.sol";
 import {IPolicyService} from "../instance/service/IPolicyService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
-import {NftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
-import {ObjectType, PRODUCT} from "../types/ObjectType.sol";
+import {NftId, NftIdLib} from "../types/NftId.sol";
+import {PRODUCT} from "../types/ObjectType.sol";
 import {ReferralId} from "../types/Referral.sol";
 import {RiskId, RiskIdLib} from "../types/RiskId.sol";
 import {StateId} from "../types/StateId.sol";
 import {Timestamp} from "../types/Timestamp.sol";
-import {Fee, FeeLib} from "../types/Fee.sol";
+import {Fee} from "../types/Fee.sol";
 import {BaseComponent} from "./BaseComponent.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
@@ -27,12 +25,9 @@ import {ISetup} from "../instance/module/ISetup.sol";
 import {Pool} from "../components/Pool.sol";
 import {Distribution} from "../components/Distribution.sol";
 
-import {zeroNftId} from "../types/NftId.sol";
-
-contract Product is BaseComponent, IProductComponent {
+abstract contract Product is BaseComponent, IProductComponent {
     using NftIdLib for NftId;
 
-    IProductService internal _productService;
     IPolicyService internal _policyService;
     Pool internal _pool;
     Distribution internal _distribution;
@@ -55,7 +50,6 @@ contract Product is BaseComponent, IProductComponent {
         address initialOwner
     ) BaseComponent(registry, instanceNftid, token, PRODUCT(), isInterceptor, initialOwner) {
         // TODO add validation
-        _productService = _instance.getProductService();
         _policyService = _instance.getPolicyService(); 
         _pool = Pool(pool);
         _distribution = Distribution(distribution);
@@ -76,8 +70,8 @@ contract Product is BaseComponent, IProductComponent {
         RiskId riskId,
         uint256 lifetime,
         bytes memory applicationData,
-        ReferralId referralId,
-        NftId bundleNftId
+        NftId bundleNftId,
+        ReferralId referralId
     )
         external 
         view 
@@ -203,6 +197,14 @@ contract Product is BaseComponent, IProductComponent {
             activateAt);
     }
 
+    function _close(
+        NftId policyNftId
+    )
+        internal
+    {
+        _policyService.close(policyNftId);
+    }
+
     function getPoolNftId() external view override returns (NftId poolNftId) {
         return getRegistry().getNftId(address(_pool));
     }
@@ -256,8 +258,8 @@ contract Product is BaseComponent, IProductComponent {
         ) = _pool.getInitialInfo();
         
         (
-            ISetup.PoolSetupInfo memory poolSetupInfo
-        )  = abi.decode(poolData, (ISetup.PoolSetupInfo));
+            , ISetup.PoolSetupInfo memory poolSetupInfo
+        )  = abi.decode(poolData, (string, ISetup.PoolSetupInfo));
 
         // from DistributionComponent
         (
@@ -266,12 +268,13 @@ contract Product is BaseComponent, IProductComponent {
         ) = _distribution.getInitialInfo();
 
         (
-            ISetup.DistributionSetupInfo memory distributionSetupInfo
-        )  = abi.decode(distributionData, (ISetup.DistributionSetupInfo));
+            , ISetup.DistributionSetupInfo memory distributionSetupInfo
+        )  = abi.decode(distributionData, (string, ISetup.DistributionSetupInfo));
 
         return (
             productInfo,
             abi.encode(
+                getName(),
                 ISetup.ProductSetupInfo(
                     _token,
                     _tokenHandler,

package/contracts/instance/IInstance.sol

@@ -2,11 +2,12 @@
 pragma solidity ^0.8.20;
 
 import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 
 import {BundleManager} from "./BundleManager.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 
-import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
+import {InstanceAccessManager} from "./InstanceAccessManager.sol";
 import {IDistributionService} from "./service/IDistributionService.sol";
 import {IPoolService} from "./service/IPoolService.sol";
 import {IProductService} from "./service/IProductService.sol";
@@ -22,9 +23,8 @@ import {IPolicy} from "./module/IPolicy.sol";
 import {IKeyValueStore} from "./base/IKeyValueStore.sol";
 
 
-interface IInstance is IERC165, IKeyValueStore {
+interface IInstance is IERC165, IKeyValueStore, IAccessManaged {
 
-    function getComponentOwnerService() external view returns (IComponentOwnerService);
     function getDistributionService() external view returns (IDistributionService);
     function getProductService() external view returns (IProductService);
     function getPoolService() external view returns (IPoolService);

package/contracts/instance/IInstanceBase.sol

@@ -6,7 +6,6 @@ import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {BundleManager} from "./BundleManager.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 
-import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
 import {IDistributionService} from "./service/IDistributionService.sol";
 import {IPoolService} from "./service/IPoolService.sol";
 import {IProductService} from "./service/IProductService.sol";

package/contracts/instance/IInstanceService.sol

@@ -10,7 +10,7 @@ import {IRegistry} from "../registry/IRegistry.sol";
 import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IBaseComponent} from "../components/IBaseComponent.sol";
 
-import {AccessManagerUpgradeableInitializeable} from "./AccessManagerUpgradeableInitializeable.sol";
+import {InstanceAccessManager} from "./InstanceAccessManager.sol";
 import {Instance} from "./Instance.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 import {BundleManager} from "./BundleManager.sol";
@@ -18,17 +18,23 @@ import {BundleManager} from "./BundleManager.sol";
 interface IInstanceService is IService {
 
     error ErrorInstanceServiceRequestUnauhorized(address caller);
-
+    error ErrorInstanceServiceNotInstanceOwner(address caller, NftId instanceNftId);
+    error ErrorInstanceServiceComponentNotRegistered(address componentAddress);
+    
     event LogInstanceCloned(address clonedAccessManagerAddress, address clonedInstanceAddress, address clonedInstanceReaderAddress, NftId clonedInstanceNftId);
 
     function createInstanceClone()
         external 
         returns (
-            AccessManagerUpgradeableInitializeable clonedAccessManager, 
+            InstanceAccessManager clonedAccessManager, 
             Instance clonedInstance,
             NftId instanceNftId,
             InstanceReader clonedInstanceReader,
             BundleManager clonedBundleManager
         );
+
+    function hasRole(address account, RoleId role, address instanceAddress) external returns (bool);
+    function setTargetLocked(string memory targetName, bool locked) external;
+
 }