@etherisc/gif-next 0.0.2-fc8b370-882 → 0.0.2-fe34d97-357

package/contracts/instance/module/bundle/BundleModule.sol

@@ -55,7 +55,7 @@ abstract contract BundleModule is
     }
 
     function initializeBundleModule(IKeyValueStore keyValueStore) internal {
-        _initialize(keyValueStore, BUNDLE());
+        _initialize(keyValueStore);
     }
 
     function createBundleInfo(
@@ -69,8 +69,7 @@ abstract contract BundleModule is
         onlyBundlePoolService
         override
     {
-        BundleInfo memory bundleInfo = BundleInfo(
-            bundleNftId,
+        BundleInfo memory info = BundleInfo(
             poolNftId,
             filter,
             amount, // capital
@@ -80,15 +79,15 @@ abstract contract BundleModule is
             zeroTimestamp() // closedAt
         );
 
-        _create(bundleNftId, abi.encode(bundleInfo));
+        _create(BUNDLE(), bundleNftId, abi.encode(info));
     }
 
-    function setBundleInfo(BundleInfo memory bundleInfo)
+    function setBundleInfo(NftId bundleNftId, BundleInfo memory info)
         external
         override
         onlyPoolOrProductService
     {
-        _updateData(bundleInfo.nftId, abi.encode(bundleInfo));
+        _updateData(BUNDLE(), bundleNftId, abi.encode(info));
     }
 
     function updateBundleState(NftId bundleNftId, StateId state)
@@ -96,7 +95,7 @@ abstract contract BundleModule is
         override
         onlyBundlePoolService
     {
-        _updateState(bundleNftId, state);
+        _updateState(BUNDLE(), bundleNftId, state);
     }
 
     function collateralizePolicy(
@@ -127,10 +126,10 @@ abstract contract BundleModule is
     }
 
     function getBundleInfo(NftId bundleNftId) external view override returns(BundleInfo memory bundleInfo) {
-        return abi.decode(_getData(bundleNftId), (BundleInfo));
+        return abi.decode(_getData(BUNDLE(), bundleNftId), (BundleInfo));
     }
 
-    function toBundleKey32(NftId bundleNftId) external view override returns (Key32 key32) {
-        return _toKey32(bundleNftId);
-    } 
+    function getBundleState(NftId bundleNftId) external view override returns(StateId state) {
+        return _getState(BUNDLE(), bundleNftId);
+    }
 }

package/contracts/instance/module/bundle/IBundle.sol

@@ -16,7 +16,6 @@ import {IPoolService} from "../../service/IPoolService.sol";
 interface IBundle {
 
     struct BundleInfo {
-        NftId nftId;
         NftId poolNftId;
         bytes filter; // required conditions for applications to be considered for collateralization by this bundle
         uint256 capitalAmount; // net investment capital amount (<= balance)
@@ -37,20 +36,14 @@ interface IBundleModule is IBundle {
         bytes calldata filter
     ) external;
 
-    function setBundleInfo(BundleInfo memory bundleInfo) external;
-    function updateBundleState(NftId bundleNftId, StateId state) external;
+    function setBundleInfo(NftId nftId, BundleInfo memory bundleInfo) external;
+    function updateBundleState(NftId nftId, StateId state) external;
 
     function collateralizePolicy(NftId bundleNftId, NftId policyNftId, uint256 amount) external;
     function releasePolicy(NftId bundleNftId, NftId policyNftId) external returns(uint256 collateralAmount);
 
-    function getBundleInfo(NftId bundleNftId) external view returns(BundleInfo memory bundleInfo);
-    function toBundleKey32(NftId bundleNftId) 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);
+    function getBundleInfo(NftId nftId) external view returns(BundleInfo memory bundleInfo);
+    function getBundleState(NftId nftId) external view returns(StateId state);
 
     // repeat service linked signatures to avoid linearization issues
     function getProductService() external returns(IProductService);

package/contracts/instance/module/compensation/CompensationModule.sol

@@ -2,7 +2,16 @@
 pragma solidity ^0.8.19;
 
 import {ICompensationModule} from "./ICompensation.sol";
+import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
+import {ModuleBase} from "../../base/ModuleBase.sol";
+
+contract CompensationModule is
+    ModuleBase,
+    ICompensationModule
+{
+
+    function initializeCompensationModule(IKeyValueStore keyValueStore) internal {
+        _initialize(keyValueStore);
+    }
 
-contract CompensationModule is ICompensationModule {
-    
 }

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

@@ -2,27 +2,21 @@
 pragma solidity ^0.8.19;
 
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
+import {IComponentModule} from "./IComponent.sol";
 
-import {IRegistry} from "../../../registry/IRegistry.sol";
-import {IInstance} from "../../IInstance.sol";
+import {NftId} from "../../../types/NftId.sol";
+import {ObjectType, COMPONENT} from "../../../types/ObjectType.sol";
+import {StateId} from "../../../types/StateId.sol";
+import {ModuleBase} from "../../base/ModuleBase.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";
-
-abstract contract ComponentModule is
+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 +25,43 @@ abstract contract ComponentModule is
         _;
     }
 
+    function initializeComponentModule(IKeyValueStore keyValueStore) internal {
+        _initialize(keyValueStore);
+    }
+
     function registerComponent(
         NftId nftId,
-        ObjectType objectType,
-        IERC20Metadata token
-    ) external override onlyComponentOwnerService {
-
-        // create component info
-        _componentInfo[nftId] = ComponentInfo(
-            nftId,
-            // _lifecycleModule.getInitialState(objectType),
-            ACTIVE(),
-            token
-        );
-
+        IERC20Metadata token,
+        address wallet
+    )
+        external
+        onlyComponentOwnerService
+        override
+    {
+        ComponentInfo memory info = ComponentInfo(token, wallet);
         _nftIds.push(nftId);
+        _create(COMPONENT(), nftId, abi.encode(info));
+    }
 
-        // TODO add logging
+    function getComponentState(
+        NftId nftId
+    ) 
+        external 
+        view 
+        override
+        returns (StateId state)
+    {
+        return _getState(COMPONENT(), nftId);
     }
 
-    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 getComponentToken(NftId nftId) external view override returns(IERC20Metadata token) {
+        ComponentInfo memory info = abi.decode(_getData(COMPONENT(), nftId), (ComponentInfo));
+        return info.token;
+    }
 
-        // 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 getComponentWallet(NftId nftId) external view override returns (address wallet) {
+        ComponentInfo memory info = abi.decode(_getData(COMPONENT(), nftId), (ComponentInfo));
+        return info.wallet;
     }
 
     function getComponentCount()
@@ -86,10 +78,4 @@ abstract contract ComponentModule is
     ) external view override returns (NftId componentNftId) {
         return _nftIds[idx];
     }
-
-    function getComponentInfo(
-        NftId nftId
-    ) external view override returns (ComponentInfo memory) {
-        return _componentInfo[nftId];
-    }
-}
+}

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

@@ -2,52 +2,28 @@
 pragma solidity ^0.8.19;
 
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IComponentOwnerService} from "../../service/IComponentOwnerService.sol";
 
-
-import {IRegistry} from "../../../registry/IRegistry.sol";
-import {IInstance} from "../../IInstance.sol";
 import {StateId} from "../../../types/StateId.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 {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;
+        address wallet;
     }
 }
 
 interface IComponentModule is IComponent {
-    function getRegistry() external view returns (IRegistry registry);
 
-    function registerComponent(
-        NftId nftId,
-        ObjectType objectType,
-        IERC20Metadata token
-    ) external;
-
-    function setComponentInfo(
-        ComponentInfo memory info
-    ) external returns (NftId componentNftId);
-
-    function getComponentInfo(
-        NftId nftId
-    ) external view returns (ComponentInfo memory info);
+    function registerComponent(NftId nftId, IERC20Metadata token, address wallet) external;
+    function getComponentState(NftId nftId) external view returns (StateId state);
+    function getComponentToken(NftId nftId) external view returns (IERC20Metadata token);
+    function getComponentWallet(NftId nftId) external view returns (address wallet);
 
     function getComponentCount() external view returns (uint256 numberOfCompnents);
-
     function getComponentId(uint256 idx) external view returns (NftId nftId);
 
     // 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

@@ -5,42 +5,42 @@ import {IRegistry} from "../../../registry/IRegistry.sol";
 import {IInstance} from "../../IInstance.sol";
 import {IProductService} from "../../service/IProductService.sol";
 import {NftId} from "../../../types/NftId.sol";
+import {RiskId} from "../../../types/RiskId.sol";
 import {StateId} from "../../../types/StateId.sol";
 import {Timestamp} from "../../../types/Timestamp.sol";
-import {Blocknumber} from "../../../types/Blocknumber.sol";
 
 // TODO check if there is value to introuce IContract and let IPolicy derive from IContract
 interface IPolicy {
     struct PolicyInfo {
-        NftId nftId;
         NftId productNftId;
         NftId bundleNftId;
         address beneficiary;
-        StateId state; // applied, withdrawn, rejected, active, closed
+        RiskId riskId;
         uint256 sumInsuredAmount;
         uint256 premiumAmount;
         uint256 premiumPaidAmount;
         uint256 lifetime;
-        bytes data;
-        Timestamp createdAt;
+        bytes applicationData;
+        bytes policyData;
         Timestamp activatedAt; // time of underwriting
         Timestamp expiredAt; // no new claims (activatedAt + lifetime)
         Timestamp closedAt; // no locked capital
-        Blocknumber updatedIn; // write log entries in a way to support backtracking of all state changes
     }
 }
 
 interface IPolicyModule is IPolicy {
-    function createApplication(
-        NftId productNftId,
+    function createPolicyInfo(
         NftId policyNftId,
+        NftId productNftId,
+        RiskId riskId,
         uint256 sumInsuredAmount,
         uint256 premiumAmount,
         uint256 lifetime,
         NftId bundleNftId
     ) external;
 
-    function setPolicyInfo(PolicyInfo memory policyInfo) external;
+    function setPolicyInfo(NftId policyNftId, PolicyInfo memory info) external;
+    function updatePolicyState(NftId nftId, StateId state) external;
 
     // function underwrite(NftId nftId) external;
 
@@ -52,6 +52,8 @@ interface IPolicyModule is IPolicy {
         NftId nftId
     ) external view returns (PolicyInfo memory info);
 
+    function getPolicyState(NftId nftId) external view returns (StateId state);
+
     // repeat registry linked signature
     function getRegistry() external view returns (IRegistry registry);
 

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

@@ -6,15 +6,18 @@ import {IRegistry} from "../../../registry/IRegistry.sol";
 import {IProductService} from "../../service/IProductService.sol";
 import {IPolicy, IPolicyModule} from "./IPolicy.sol";
 import {ObjectType, POLICY} from "../../../types/ObjectType.sol";
-import {APPLIED, ACTIVE, UNDERWRITTEN} from "../../../types/StateId.sol";
 import {NftId, NftIdLib} from "../../../types/NftId.sol";
+import {RiskId} from "../../../types/RiskId.sol";
+import {StateId} from "../../../types/StateId.sol";
 import {Timestamp, blockTimestamp, zeroTimestamp} from "../../../types/Timestamp.sol";
-import {Blocknumber, blockNumber} from "../../../types/Blocknumber.sol";
 
-abstract contract PolicyModule is IPolicyModule {
-    using NftIdLib for NftId;
+import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
+import {ModuleBase} from "../../base/ModuleBase.sol";
 
-    mapping(NftId nftId => PolicyInfo info) private _policyInfo;
+abstract contract PolicyModule is
+    ModuleBase,
+    IPolicyModule
+{
 
     // TODO find a better place to avoid dupliation
     modifier onlyProductService2() {
@@ -25,9 +28,14 @@ abstract contract PolicyModule is IPolicyModule {
         _;
     }
 
-    function createApplication(
-        NftId productNftId,
+    function initializePolicyModule(IKeyValueStore keyValueStore) internal {
+        _initialize(keyValueStore);
+    }
+
+    function createPolicyInfo(
         NftId policyNftId,
+        NftId productNftId,
+        RiskId riskId,
         uint256 sumInsuredAmount,
         uint256 premiumAmount,
         uint256 lifetime,
@@ -37,40 +45,48 @@ abstract contract PolicyModule is IPolicyModule {
         onlyProductService2
         override
     {
-        _policyInfo[policyNftId] = PolicyInfo(
-            policyNftId,
+        PolicyInfo memory info = PolicyInfo(
             productNftId,
             bundleNftId,
             address(0), // beneficiary = policy nft holder
-            // _lifecycleModule.getInitialState(POLICY()),
-            APPLIED(),
+            riskId,
             sumInsuredAmount,
             premiumAmount,
             0, // premium paid amount
             lifetime, 
-            "", // data
-            blockTimestamp(), // createdAt
+            "", // applicationData
+            "", // policyData
             zeroTimestamp(), // activatedAt
             zeroTimestamp(), // expiredAt
-            zeroTimestamp(), // closedAt
-            blockNumber() // updatedIn
+            zeroTimestamp() // closedAt
         );
 
-        // TODO add logging
+        _create(POLICY(), policyNftId, abi.encode(info));
     }
 
-    function setPolicyInfo(PolicyInfo memory policyInfo)
+    function setPolicyInfo(NftId policyNftId, PolicyInfo memory info)
         external
         override
         onlyProductService2
     {
-        _policyInfo[policyInfo.nftId] = policyInfo;
+        _updateData(POLICY(), policyNftId, abi.encode(info));
+    }
+
+    function updatePolicyState(NftId bundleNftId, StateId state)
+        external
+        override
+        onlyProductService2
+    {
+        _updateState(POLICY(), bundleNftId, state);
     }
 
     function getPolicyInfo(
         NftId nftId
     ) external view returns (PolicyInfo memory info) {
-        return _policyInfo[nftId];
+        return abi.decode(_getData(POLICY(), nftId), (PolicyInfo));
     }
 
+    function getPolicyState(NftId nftId) external view override returns(StateId state) {
+        return _getState(POLICY(), nftId);
+    }
 }

package/contracts/instance/module/pool/IPoolModule.sol

@@ -9,7 +9,6 @@ import {IPoolService} from "../../service/IPoolService.sol";
 
 interface IPool {
     struct PoolInfo {
-        NftId nftId;
         bool isVerifying;
         UFixed collateralizationLevel;
     }

package/contracts/instance/module/pool/PoolModule.sol

@@ -8,18 +8,22 @@ import {IPolicy, IPolicyModule} from "../../module/policy/IPolicy.sol";
 import {ITreasuryModule} from "../../module/treasury/ITreasury.sol";
 
 import {NftId} from "../../../types/NftId.sol";
+import {POOL} from "../../../types/ObjectType.sol";
 import {LibNftIdSet} from "../../../types/NftIdSet.sol";
 import {StateId, APPLIED} from "../../../types/StateId.sol";
 import {UFixed} from "../../../types/UFixed.sol";
 
+import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
 import {IPoolModule} from "./IPoolModule.sol";
+import {ModuleBase} from "../../base/ModuleBase.sol";
 
 abstract contract PoolModule is
+    ModuleBase,
     IPoolModule
 {
     using LibNftIdSet for LibNftIdSet.Set;
 
-    mapping(NftId poolNftId => PoolInfo info) private _poolInfo;
+    // mapping(NftId poolNftId => PoolInfo info) private _poolInfo;
     mapping(NftId poolNftId => LibNftIdSet.Set bundles) private _bundlesForPool;
 
     modifier poolServiceCallingPool() {
@@ -30,6 +34,10 @@ abstract contract PoolModule is
         _;
     }
 
+    function initializePoolModule(IKeyValueStore keyValueStore) internal {
+        _initialize(keyValueStore);
+    }
+
     function registerPool(
         NftId nftId, 
         bool isVerifying,
@@ -38,17 +46,12 @@ abstract contract PoolModule is
         public
         override
     {
-        require(
-            _poolInfo[nftId].nftId.eqz(), 
-            "ERROR:PL-010:ALREADY_CREATED");
-
-        _poolInfo[nftId] = PoolInfo(
-            nftId,
+        PoolInfo memory info  = PoolInfo(
             isVerifying,
             collateralizationRate
         );
 
-        // TODO add logging
+        _create(POOL(), nftId, abi.encode(info));
     }
 
     function addBundleToPool(
@@ -71,7 +74,7 @@ abstract contract PoolModule is
     function getPoolInfo(
         NftId nftId
     ) external view override returns (PoolInfo memory info) {
-        info = _poolInfo[nftId];
+        return abi.decode(_getData(POOL(), nftId), (PoolInfo));
     }
 
 

package/contracts/instance/module/risk/IRisk.sol

@@ -1,10 +1,27 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-interface IRisk {
+import {NftId} from "../../../types/NftId.sol";
+import {RiskId} from "../../../types/RiskId.sol";
+import {StateId} from "../../../types/StateId.sol";
 
+interface IRisk {
+    struct RiskInfo {
+        NftId productNftId;
+        bytes data;
+    }
 }
 
 interface IRiskModule is IRisk {
-    
+    function createRisk(
+        RiskId riskId,
+        NftId productNftId,
+        bytes memory data
+    ) external;
+
+    function setRiskInfo(RiskId riskId, RiskInfo memory info) external;
+    function updateRiskState(RiskId riskId, StateId state) external;
+
+    function getRiskInfo(RiskId riskId) external view returns (RiskInfo memory info);
+    function getRiskState(RiskId riskId) external view returns (StateId state);
 }

package/contracts/instance/module/risk/RiskModule.sol

@@ -1,8 +1,70 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
+import {NftId} from "../../../types/NftId.sol";
+import {RISK} from "../../../types/ObjectType.sol";
+import {RiskId} from "../../../types/RiskId.sol";
+import {StateId} from "../../../types/StateId.sol";
+
+import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
 import {IRiskModule} from "./IRisk.sol";
+import {ModuleBase} from "../../base/ModuleBase.sol";
+
+contract RiskModule is
+    ModuleBase,
+    IRiskModule
+{
+    function initializeRiskModule(IKeyValueStore keyValueStore) internal {
+        _initialize(keyValueStore);
+    }
+
+    function createRisk(
+        RiskId riskId,
+        NftId productNftId,
+        bytes memory data
+    ) external override {
+        RiskInfo memory info = RiskInfo(
+            productNftId,
+            data
+        );
+
+        _create(RISK(), riskId.toKey32(), abi.encode(info));
+    }
+
+    function setRiskInfo(
+        RiskId riskId, 
+        RiskInfo memory info
+    )
+        external
+        override
+    {
+
+    }
+
+    function updateRiskState(
+        RiskId riskId, 
+        StateId state
+    )
+        external
+        override
+    {
+
+    }
+
+    function getRiskInfo(RiskId riskId)
+        external
+        view
+        override
+        returns (RiskInfo memory info)
+    {
+
+    }
+
+    function getRiskState(RiskId riskId)
+        external
+        view
+        returns (StateId state)
+    {
 
-contract RiskModule is IRiskModule {
-    
+    }
 }