@etherisc/gif-next 0.0.2-b9e43cf-870 → 0.0.2-bb7b80e-316

package/artifacts/contracts/types/UFixed.sol/MathLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e5530b5c57be84d76caaa584abf46dd1.json"
+  "buildInfo": "../../../build-info/2ed28d37f387338e4c50355843a72c1f.json"
 }

package/artifacts/contracts/types/UFixed.sol/UFixedLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e5530b5c57be84d76caaa584abf46dd1.json"
+  "buildInfo": "../../../build-info/2ed28d37f387338e4c50355843a72c1f.json"
 }

package/artifacts/contracts/types/Version.sol/VersionLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e5530b5c57be84d76caaa584abf46dd1.json"
+  "buildInfo": "../../../build-info/2ed28d37f387338e4c50355843a72c1f.json"
 }

package/artifacts/contracts/types/Version.sol/VersionPartLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/e5530b5c57be84d76caaa584abf46dd1.json"
+  "buildInfo": "../../../build-info/2ed28d37f387338e4c50355843a72c1f.json"
 }

package/contracts/components/BaseComponent.sol

@@ -5,26 +5,27 @@ 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 {IComponentOwnerService} from "../instance/service/IComponentOwnerService.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, INSTANCE} 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 {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;
@@ -32,6 +33,13 @@ 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());
@@ -41,6 +49,7 @@ abstract contract BaseComponent is
         _;
     }
 
+    // TODO move to oz accessmanaged locked (which is included in restricted modifier)
     modifier isNotLocked() {
         InstanceAccessManager accessManager = InstanceAccessManager(_instance.authority());
         if (accessManager.isTargetLocked(address(this))) {
@@ -61,15 +70,15 @@ 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(getRegistry().getServiceAddress(INSTANCE(), VersionLib.toVersion(3, 0, 0).toMajorPart()));
+        _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);
 

package/contracts/components/Distribution.sol

@@ -28,14 +28,6 @@ abstract 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 @@ abstract contract Distribution is
         _initialDistributionFee = distributionFee;
 
         _tokenHandler = TokenHandler(token);
-
         _distributionService = _instance.getDistributionService();
-        _productService = _instance.getProductService();
 
         _registerInterface(type(IDistributionComponent).interfaceId);
     }

package/contracts/components/IBaseComponent.sol

@@ -11,14 +11,15 @@ 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 getName() external pure virtual returns (string memory name);
+    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,8 +14,6 @@ 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";
 
@@ -37,10 +34,6 @@ abstract 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 @@ abstract 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 @@ abstract 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);

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";
-
 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 @@ abstract 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 @@ abstract contract Product is BaseComponent, IProductComponent {
         RiskId riskId,
         uint256 lifetime,
         bytes memory applicationData,
-        ReferralId referralId,
-        NftId bundleNftId
+        NftId bundleNftId,
+        ReferralId referralId
     )
         external 
         view 

package/contracts/instance/IInstance.sol

@@ -8,7 +8,6 @@ import {BundleManager} from "./BundleManager.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 
 import {InstanceAccessManager} from "./InstanceAccessManager.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";
@@ -26,7 +25,6 @@ import {IKeyValueStore} from "./base/IKeyValueStore.sol";
 
 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/Instance.sol

@@ -20,14 +20,8 @@ import {BundleManager} from "./BundleManager.sol";
 import {NftId} from "../types/NftId.sol";
 import {NumberId} from "../types/NumberId.sol";
 import {ObjectType, BUNDLE, DISTRIBUTION, INSTANCE, POLICY, POOL, ROLE, PRODUCT, TARGET, COMPONENT} from "../types/ObjectType.sol";
-import {RiskId, RiskIdLib} from "../types/RiskId.sol";
-import {RoleId, RoleIdLib} from "../types/RoleId.sol";
-import {StateId, ACTIVE} from "../types/StateId.sol";
-import {TimestampLib} from "../types/Timestamp.sol";
-import {ERC165} from "../shared/ERC165.sol";
-import {Registerable} from "../shared/Registerable.sol";
-import {ComponentOwnerService} from "./service/ComponentOwnerService.sol";
-import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
+import {RiskId} from "../types/RiskId.sol";
+import {StateId} from "../types/StateId.sol";
 import {IDistributionService} from "./service/IDistributionService.sol";
 import {IPoolService} from "./service/IPoolService.sol";
 import {IProductService} from "./service/IProductService.sol";
@@ -227,10 +221,6 @@ contract Instance is
         return policyNftId.toKey32(POLICY());
     }
 
-    function getComponentOwnerService() external view returns (IComponentOwnerService) {
-        return ComponentOwnerService(_registry.getServiceAddress(COMPONENT(), VersionPart.wrap(3)));
-    }
-
     function getDistributionService() external view returns (IDistributionService) {
         return IDistributionService(_registry.getServiceAddress(DISTRIBUTION(), VersionPart.wrap(3)));
     }

package/contracts/instance/InstanceBase.sol

@@ -22,8 +22,6 @@ import {RoleId, RoleIdLib} from "../types/RoleId.sol";
 import {StateId, ACTIVE} from "../types/StateId.sol";
 import {ERC165} from "../shared/ERC165.sol";
 import {Registerable} from "../shared/Registerable.sol";
-import {ComponentOwnerService} from "./service/ComponentOwnerService.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/base/IInstanceBase.sol

@@ -6,7 +6,6 @@ import {StateId} from "../../types/StateId.sol";
 
 import {IKeyValueStore} from "./IKeyValueStore.sol";
 
-import {IComponentOwnerService} from "../service/IComponentOwnerService.sol";
 import {IDistributionService} from "../service/IDistributionService.sol";
 import {IProductService} from "../service/IProductService.sol";
 import {IPoolService} from "../service/IPoolService.sol";
@@ -16,7 +15,6 @@ interface IInstanceBase {
     function updateState(Key32 key, StateId state) external;
     function getState(Key32 key) external view returns (StateId state);
 
-    function getComponentOwnerService() external view returns(IComponentOwnerService);
     function getDistributionService() external view returns(IDistributionService);
     function getProductService() external view returns(IProductService service);
     function getPoolService() external view returns(IPoolService service);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-b9e43cf-870",
+  "version": "0.0.2-bb7b80e-316",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {

package/artifacts/contracts/instance/service/ComponentOwnerService.sol/ComponentOwnerService.dbg.json

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