@etherisc/gif-next 0.0.2-c8acbd3-764 → 0.0.2-ce2fc91-485

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

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

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

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

package/contracts/instance/IInstance.sol

@@ -44,7 +44,7 @@ interface IInstance is
 
     function hasRole(RoleId role, address member) external view override (IAccessModule, IComponentModule) returns (bool hasRole);    
 
-    function getKeyValueStore() external view override (IBundleModule, IInstanceBase) returns (IKeyValueStore keyValueStore);
+    function getKeyValueStore() external view override (IBundleModule, IComponentModule, IInstanceBase) returns (IKeyValueStore keyValueStore);
     function getComponentOwnerService() external view override (IInstanceBase, IComponentModule) returns(IComponentOwnerService);
     function getProductService() external view override (IInstanceBase, IBundleModule, IPolicyModule) returns(IProductService);
     function getPoolService() external view override (IInstanceBase, IBundleModule, IPoolModule) returns(IPoolService);

package/contracts/instance/Instance.sol

@@ -56,7 +56,7 @@ contract Instance is
     }
 
     function getRegistry() public view override (Registerable, IBundleModule, IComponentModule, IPolicyModule) returns (IRegistry registry) { return super.getRegistry(); }
-    function getKeyValueStore() public view override (InstanceBase, IBundleModule) returns (IKeyValueStore keyValueStore) { return super.getKeyValueStore(); }
+    function getKeyValueStore() public view override (InstanceBase, IComponentModule, IBundleModule) returns (IKeyValueStore keyValueStore) { return super.getKeyValueStore(); }
 
     function hasRole(RoleId role, address member) public view override (AccessModule, IComponentModule) returns (bool) { return super.hasRole(role, member); }
 

package/contracts/instance/module/component/ComponentModule.sol

@@ -4,25 +4,30 @@ pragma solidity ^0.8.19;
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IRegistry} from "../../../registry/IRegistry.sol";
-import {IInstance} from "../../IInstance.sol";
 
-import {IComponent, IComponentModule} from "./IComponent.sol";
-import {IComponentOwnerService} from "../../service/IComponentOwnerService.sol";
-import {ObjectType, PRODUCT, ORACLE, POOL} from "../../../types/ObjectType.sol";
-import {StateId, ACTIVE, PAUSED} from "../../../types/StateId.sol";
-import {NftId, NftIdLib, zeroNftId} from "../../../types/NftId.sol";
-import {Fee} from "../../../types/Fee.sol";
+import {IProductService} from "../../service/IProductService.sol";
+import {IPoolService} from "../../service/IPoolService.sol";
 
-abstract contract ComponentModule is
+import {NftId} from "../../../types/NftId.sol";
+import {Key32, KeyId} from "../../../types/Key32.sol";
+import {LibNftIdSet} from "../../../types/NftIdSet.sol";
+import {ObjectType, COMPONENT, PRODUCT, ORACLE, POOL, BUNDLE, POLICY} from "../../../types/ObjectType.sol";
+import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, REVOKED, DECLINED} from "../../../types/StateId.sol";
+import {Timestamp, blockTimestamp, zeroTimestamp} from "../../../types/Timestamp.sol";
+import {Blocknumber, blockNumber} from "../../../types/Blocknumber.sol";
+
+import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
+import {ModuleBase} from "../../base/ModuleBase.sol";
+
+import {IComponentModule} from "./IComponent.sol";
+
+abstract contract ComponentModule is 
+    ModuleBase,
     IComponentModule
 {
-    using NftIdLib for NftId;
 
-    mapping(NftId nftId => ComponentInfo info) private _componentInfo;
     NftId[] private _nftIds;
 
-    mapping(ObjectType cType => bytes32 role) private _componentOwnerRole;
-
     modifier onlyComponentOwnerService() {
         require(
             msg.sender == address(this.getComponentOwnerService()),
@@ -31,45 +36,43 @@ abstract contract ComponentModule is
         _;
     }
 
+    function initializeComponentModule(IKeyValueStore keyValueStore) internal {
+        _initialize(keyValueStore, COMPONENT());
+    }
+
     function registerComponent(
         NftId nftId,
-        ObjectType objectType,
+        ObjectType, // objectType,
         IERC20Metadata token
-    ) external override onlyComponentOwnerService {
-
-        // create component info
-        _componentInfo[nftId] = ComponentInfo(
+    )
+        external
+        onlyComponentOwnerService
+        override
+    {
+        ComponentInfo memory info = ComponentInfo(
             nftId,
-            // _lifecycleModule.getInitialState(objectType),
-            ACTIVE(),
             token
         );
 
         _nftIds.push(nftId);
 
-        // TODO add logging
+        _create(nftId, abi.encode(info));
     }
 
-    function setComponentInfo(
-        ComponentInfo memory info
-    ) external onlyComponentOwnerService returns (NftId nftId) {
-        nftId = info.nftId;
-        require(
-            nftId.gtz() && _componentInfo[nftId].nftId.eq(nftId),
-            "ERROR:CMP-006:COMPONENT_UNKNOWN"
-        );
+    function setComponentInfo(ComponentInfo memory info)
+        external
+        override
+        onlyComponentOwnerService
+    {
+        _updateData(info.nftId, abi.encode(info));
+    }
 
-        // TODO decide if state changes should have explicit functions and not
-        // just a generic setXYZInfo and implicit state transitions
-        // when in doubt go for the explicit approach ...
-        // ObjectType objectType = this.getRegistry().getObjectInfo(nftId).objectType;
-        // _lifecycleModule.checkAndLogTransition(
-        //     nftId,
-        //     objectType,
-        //     _componentInfo[nftId].state,
-        //     info.state
-        // );
-        _componentInfo[nftId] = info;
+    function updateComponentState(NftId nftId, StateId state)
+        external
+        override
+        onlyComponentOwnerService
+    {
+        _updateState(nftId, state);
     }
 
     function getComponentCount()
@@ -87,9 +90,15 @@ abstract contract ComponentModule is
         return _nftIds[idx];
     }
 
-    function getComponentInfo(
-        NftId nftId
-    ) external view override returns (ComponentInfo memory) {
-        return _componentInfo[nftId];
+    function getComponentInfo(NftId nftId) external view override returns(ComponentInfo memory info) {
+        return abi.decode(_getData(nftId), (ComponentInfo));
     }
-}
+
+    function getComponentState(NftId nftId) external view returns (StateId state) {
+        return _getState(nftId);
+    }
+
+    function toComponentKey32(NftId nftId) external view override returns (Key32 key32) {
+        return _toKey32(nftId);
+    } 
+}

package/contracts/instance/module/component/IComponent.sol

@@ -7,26 +7,24 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 import {IRegistry} from "../../../registry/IRegistry.sol";
 import {IInstance} from "../../IInstance.sol";
 import {StateId} from "../../../types/StateId.sol";
+import {Key32} from "../../../types/Key32.sol";
 import {NftId} from "../../../types/NftId.sol";
 import {ObjectType} from "../../../types/ObjectType.sol";
 import {RoleId} from "../../../types/RoleId.sol";
 import {Fee} from "../../../types/Fee.sol";
 import {UFixed} from "../../../types/UFixed.sol";
 
+import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
 import {IComponentOwnerService} from "../../service/IComponentOwnerService.sol";
-// import {IComponentBase} from "../../../components/IComponentBase.sol";
 
 interface IComponent {
-    // component dynamic info (static info kept in registry)
     struct ComponentInfo {
         NftId nftId;
-        StateId state;
         IERC20Metadata token;
     }
 }
 
 interface IComponentModule is IComponent {
-    function getRegistry() external view returns (IRegistry registry);
 
     function registerComponent(
         NftId nftId,
@@ -36,18 +34,30 @@ interface IComponentModule is IComponent {
 
     function setComponentInfo(
         ComponentInfo memory info
-    ) external returns (NftId componentNftId);
+    ) external;
+
+    function updateComponentState(NftId nftId, StateId state) external;
 
     function getComponentInfo(
         NftId nftId
     ) external view returns (ComponentInfo memory info);
 
+    function getComponentState(NftId nftId) external view returns (StateId state);
+
     function getComponentCount() external view returns (uint256 numberOfCompnents);
 
     function getComponentId(uint256 idx) external view returns (NftId nftId);
 
+    function hasRole(RoleId role, address member) external view returns (bool);
+
+    function toComponentKey32(NftId nftId) external view returns (Key32 key32);
+
+    // repeat registry linked signature
+    function getRegistry() external view returns (IRegistry registry);
+
+    // repeat instance base signature
+    function getKeyValueStore() external view returns (IKeyValueStore keyValueStore);
+
     // repeat service linked signaturea to avoid linearization issues
     function getComponentOwnerService() external view returns(IComponentOwnerService);
-
-    function hasRole(RoleId role, address member) external view returns (bool);
 }

package/contracts/instance/module/policy/IPolicy.sol

@@ -21,7 +21,8 @@ interface IPolicy {
         uint256 premiumAmount;
         uint256 premiumPaidAmount;
         uint256 lifetime;
-        bytes data;
+        bytes applicationData;
+        bytes policyData;
         Timestamp createdAt;
         Timestamp activatedAt; // time of underwriting
         Timestamp expiredAt; // no new claims (activatedAt + lifetime)

package/contracts/instance/module/policy/PolicyModule.sol

@@ -48,7 +48,8 @@ abstract contract PolicyModule is IPolicyModule {
             premiumAmount,
             0, // premium paid amount
             lifetime, 
-            "", // data
+            "", // applicationData
+            "", // policyData
             blockTimestamp(), // createdAt
             zeroTimestamp(), // activatedAt
             zeroTimestamp(), // expiredAt

package/contracts/instance/service/ComponentOwnerService.sol

@@ -143,28 +143,34 @@ contract ComponentOwnerService is
     function lock(
         IBaseComponent component
     ) external override onlyRegisteredComponent(component) {
+        // TODO use msg.sender to get component and get instance via registered parent nft id
         IInstance instance = component.getInstance();
-        IComponent.ComponentInfo memory info = instance.getComponentInfo(
-            component.getNftId()
-        );
-        require(info.nftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
-
-        info.state = PAUSED();
-        // setComponentInfo checks for valid state changes
-        instance.setComponentInfo(info);
+        instance.updateComponentState(component.getNftId(), PAUSED());
+        // IInstance instance = component.getInstance();
+        // IComponent.ComponentInfo memory info = instance.getComponentInfo(
+        //     component.getNftId()
+        // );
+        // require(info.nftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
+
+        // info.state = PAUSED();
+        // // setComponentInfo checks for valid state changes
+        // instance.setComponentInfo(info);
     }
 
     function unlock(
         IBaseComponent component
     ) external override onlyRegisteredComponent(component) {
+        // TODO use msg.sender to get component and get instance via registered parent nft id
         IInstance instance = component.getInstance();
-        IComponent.ComponentInfo memory info = instance.getComponentInfo(
-            component.getNftId()
-        );
-        require(info.nftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
-
-        info.state = ACTIVE();
-        // setComponentInfo checks for valid state changes
-        instance.setComponentInfo(info);
+        instance.updateComponentState(component.getNftId(), ACTIVE());
+        // IInstance instance = component.getInstance();
+        // IComponent.ComponentInfo memory info = instance.getComponentInfo(
+        //     component.getNftId()
+        // );
+        // require(info.nftId.gtz(), "ERROR_COMPONENT_UNKNOWN");
+
+        // info.state = ACTIVE();
+        // // setComponentInfo checks for valid state changes
+        // instance.setComponentInfo(info);
     }
 }

package/contracts/instance/service/ProductService.sol

@@ -150,7 +150,7 @@ contract ProductService is ComponentServiceBase, IProductService {
         IPoolComponent pool = IPoolComponent(poolAddress);
         pool.underwrite(
             policyInfo.nftId, 
-            policyInfo.data, 
+            policyInfo.applicationData, 
             bundleFilter,
             collateralAmount);
     }

package/contracts/registry/Registry.sol

@@ -9,7 +9,7 @@ import {ChainNft} from "./ChainNft.sol";
 import {IRegistry} from "./IRegistry.sol";
 import {NftId, toNftId, zeroNftId, NftIdLib} from "../types/NftId.sol";
 import {VersionPart} from "../types/Version.sol";
-import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, DISTRIBUTOR, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
+import {ObjectType, PROTOCOL, REGISTRY, TOKEN, SERVICE, INSTANCE, STAKE, PRODUCT, COMPENSATION, ORACLE, POOL, POLICY, BUNDLE} from "../types/ObjectType.sol";
 
 // TODO make registry upgradable
 contract Registry is
@@ -293,7 +293,7 @@ contract Registry is
 
         // instance as parent
         _isValidParentType[PRODUCT()][INSTANCE()] = true;
-        _isValidParentType[DISTRIBUTOR()][INSTANCE()] = true;
+        _isValidParentType[COMPENSATION()][INSTANCE()] = true;
         _isValidParentType[ORACLE()][INSTANCE()] = true;
         _isValidParentType[POOL()][INSTANCE()] = true;
 

package/contracts/types/ObjectType.sol

@@ -37,22 +37,26 @@ function STAKE() pure returns (ObjectType) {
     return toObjectType(60);
 }
 
-function PRODUCT() pure returns (ObjectType) {
+function COMPONENT() pure returns (ObjectType) {
     return toObjectType(100);
 }
 
-function DISTRIBUTOR() pure returns (ObjectType) {
+function PRODUCT() pure returns (ObjectType) {
     return toObjectType(110);
 }
 
-function ORACLE() pure returns (ObjectType) {
+function COMPENSATION() pure returns (ObjectType) {
     return toObjectType(120);
 }
 
-function POOL() pure returns (ObjectType) {
+function ORACLE() pure returns (ObjectType) {
     return toObjectType(130);
 }
 
+function POOL() pure returns (ObjectType) {
+    return toObjectType(140);
+}
+
 function POLICY() pure returns (ObjectType) {
     return toObjectType(200);
 }

package/package.json

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