@etherisc/gif-next 0.0.2-f0d86c2-077 → 0.0.2-f72939c-683

package/artifacts/contracts/types/RiskId.sol/RiskIdLib.json

@@ -0,0 +1,86 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "RiskIdLib",
+  "sourceName": "contracts/types/RiskId.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "RiskId",
+          "name": "id",
+          "type": "bytes8"
+        }
+      ],
+      "name": "toKey32",
+      "outputs": [
+        {
+          "internalType": "Key32",
+          "name": "key",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "RiskId",
+          "name": "id",
+          "type": "bytes8"
+        }
+      ],
+      "name": "toKeyId",
+      "outputs": [
+        {
+          "internalType": "KeyId",
+          "name": "keyId",
+          "type": "bytes31"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "string",
+          "name": "risk",
+          "type": "string"
+        }
+      ],
+      "name": "toRiskId",
+      "outputs": [
+        {
+          "internalType": "RiskId",
+          "name": "",
+          "type": "bytes8"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x61032f61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c80632cf96bf9146100505780634a7485ba1461008357806355ee6275146100af575b600080fd5b61006b61005e36600461019a565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100966100913660046101e1565b6100d0565b6040516001600160c01b0319909116815260200161007a565b6100c26100bd36600461019a565b610100565b60405190815260200161007a565b6000816040516020016100e39190610292565b604051602081830303815290604052805190602001209050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60c86001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610170573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019491906102e0565b92915050565b6000602082840312156101ac57600080fd5b81356001600160c01b0319811681146101c457600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f357600080fd5b813567ffffffffffffffff8082111561020b57600080fd5b818401915084601f83011261021f57600080fd5b813581811115610231576102316101cb565b604051601f8201601f19908116603f01168101908382118183101715610259576102596101cb565b8160405282815287602084870101111561027257600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102bf578581018301518582016040015282016102a3565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102f257600080fd5b505191905056fea264697066735822122069f4e6edc9ea69a4eaafc3119fcaaf2bfb13257d0e2b18f8c55816c118a572a664736f6c63430008140033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061004b5760003560e01c80632cf96bf9146100505780634a7485ba1461008357806355ee6275146100af575b600080fd5b61006b61005e36600461019a565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100966100913660046101e1565b6100d0565b6040516001600160c01b0319909116815260200161007a565b6100c26100bd36600461019a565b610100565b60405190815260200161007a565b6000816040516020016100e39190610292565b604051602081830303815290604052805190602001209050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce60c86001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610170573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019491906102e0565b92915050565b6000602082840312156101ac57600080fd5b81356001600160c01b0319811681146101c457600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f357600080fd5b813567ffffffffffffffff8082111561020b57600080fd5b818401915084601f83011261021f57600080fd5b813581811115610231576102316101cb565b604051601f8201601f19908116603f01168101908382118183101715610259576102596101cb565b8160405282815287602084870101111561027257600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102bf578581018301518582016040015282016102a3565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102f257600080fd5b505191905056fea264697066735822122069f4e6edc9ea69a4eaafc3119fcaaf2bfb13257d0e2b18f8c55816c118a572a664736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/Key32.sol": {
+      "Key32Lib": [
+        {
+          "length": 20,
+          "start": 318
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/Key32.sol": {
+      "Key32Lib": [
+        {
+          "length": 20,
+          "start": 260
+        }
+      ]
+    }
+  }
+}

package/artifacts/contracts/types/RoleId.sol/RoleIdLib.dbg.json

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

package/artifacts/contracts/types/StateId.sol/StateIdLib.dbg.json

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

package/artifacts/contracts/types/Timestamp.sol/TimestampLib.dbg.json

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

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

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

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/01797c1a22420f170e92428a4c013a0c.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/01797c1a22420f170e92428a4c013a0c.json"
 }

package/contracts/components/BaseComponent.sol

@@ -13,6 +13,7 @@ import {IInstance} from "../instance/IInstance.sol";
 import {IComponent, IComponentModule} from "../instance/module/component/IComponent.sol";
 import {IComponentOwnerService} from "../instance/service/IComponentOwnerService.sol";
 import {IBaseComponent} from "./IBaseComponent.sol";
+import {Fee, FeeLib} from "../types/Fee.sol";
 import {NftId} from "../types/NftId.sol";
 
 abstract contract BaseComponent is
@@ -25,6 +26,8 @@ abstract contract BaseComponent is
     address internal _wallet;
     IERC20Metadata internal _token;
     IInstance internal _instance;
+    bool internal _isRegistered;
+    Fee internal _zeroFee;
 
     constructor(
         address registry,
@@ -43,6 +46,8 @@ abstract contract BaseComponent is
         _componentOwnerService = _instance.getComponentOwnerService();
         _wallet = address(this);
         _token = IERC20Metadata(token);
+        _isRegistered = false;
+        _zeroFee = FeeLib.zeroFee();
     }
 
     // from registerable
@@ -57,7 +62,8 @@ abstract contract BaseComponent is
             "ERROR:COB:INSTANCE_NOT_REGISTERED"
         );
 
-        componentId = _componentOwnerService.register(this);
+        _isRegistered = true;
+        return _componentOwnerService.register(this);
     }
 
     // from component contract

package/contracts/components/Pool.sol

@@ -15,6 +15,9 @@ contract Pool is BaseComponent, IPoolComponent {
     bool internal _isVerifying;
     UFixed internal _collateralizationLevel;
 
+    Fee internal _initialStakingFee;
+    Fee internal _initialPerformanceFee;
+
     // may be used to interact with instance by derived contracts
     IPoolService internal _poolService;
 
@@ -41,13 +44,17 @@ contract Pool is BaseComponent, IPoolComponent {
         // TODO refactor into tokenNftId
         address token,
         bool verifying,
-        UFixed collateralizationLevel
+        UFixed collateralizationLevel,
+        Fee memory stakingFee,
+        Fee memory performanceFee
     )
         BaseComponent(registry, instanceNftId, token)
     {
         _isVerifying = verifying;
         // TODO add validation
         _collateralizationLevel = collateralizationLevel;
+        _initialStakingFee = stakingFee;
+        _initialPerformanceFee = performanceFee;
 
         _poolService = _instance.getPoolService();
         _productService = _instance.getProductService();
@@ -155,7 +162,12 @@ contract Pool is BaseComponent, IPoolComponent {
         override
         returns (Fee memory stakingFee)
     {
-        return _instance.getPoolSetup(getNftId()).stakingFee;
+        NftId productNftId = _instance.getProductNftId(getNftId());
+        if (productNftId.gtz()) {
+            return _instance.getTreasuryInfo(productNftId).stakingFee;
+        } else {
+            return _initialStakingFee;
+        }
     }
 
     function getPerformanceFee()
@@ -164,7 +176,12 @@ contract Pool is BaseComponent, IPoolComponent {
         override
         returns (Fee memory performanceFee)
     {
-        return _instance.getPoolSetup(getNftId()).performanceFee;
+        NftId productNftId = _instance.getProductNftId(getNftId());
+        if (productNftId.gtz()) {
+            return _instance.getTreasuryInfo(productNftId).performanceFee;
+        } else {
+            return _initialPerformanceFee;
+        }
     }
 
     // from registerable

package/contracts/components/Product.sol

@@ -1,31 +1,84 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
+import {IRisk} from "../instance/module/risk/IRisk.sol";
+import {ITreasury} from "../instance/module/treasury/ITreasury.sol";
 import {IProductService} from "../instance/service/IProductService.sol";
 import {IProductComponent} from "./IProductComponent.sol";
 import {NftId} from "../types/NftId.sol";
 import {ObjectType, PRODUCT} from "../types/ObjectType.sol";
+import {RiskId, RiskIdLib} from "../types/RiskId.sol";
+import {StateId} from "../types/StateId.sol";
 import {Timestamp} from "../types/Timestamp.sol";
 import {Fee} from "../types/Fee.sol";
 import {BaseComponent} from "./BaseComponent.sol";
 
 contract Product is BaseComponent, IProductComponent {
-    IProductService private _productService;
-    address private _pool;
+    IProductService internal _productService;
+    address internal _pool;
+    Fee internal _initialPolicyFee;
+    Fee internal _initialProcessingFee;
 
     constructor(
         address registry,
         NftId instanceNftid,
         address token,
-        address pool
+        address pool,
+        Fee memory policyFee,
+        Fee memory processingFee
     ) BaseComponent(registry, instanceNftid, token) {
         // TODO add validation
         _productService = _instance.getProductService();
         _pool = pool;
+        _initialPolicyFee = policyFee;
+        _initialProcessingFee = processingFee;        
+    }
+
+    function _toRiskId(string memory riskName) internal pure returns (RiskId riskId) {
+        return RiskIdLib.toRiskId(riskName);
+    }
+
+    function _createRisk(
+        RiskId id,
+        bytes memory data
+    ) internal {
+        _productService.createRisk(
+            id,
+            data
+        );
+    }
+
+    function _setRiskInfo(
+        RiskId id,
+        IRisk.RiskInfo memory info
+    ) internal {
+        _productService.setRiskInfo(
+            id,
+            info
+        );
+    }
+
+    function _updateRiskState(
+        RiskId id,
+        StateId state
+    ) internal {
+        _productService.updateRiskState(
+            id,
+            state
+        );
+    }
+
+    function _getRiskInfo(RiskId id) internal view returns (IRisk.RiskInfo memory info) {
+        return _instance.getRiskInfo(id);
+    }
+
+    function _getRiskState(RiskId id) internal view returns (StateId state) {
+        return _instance.getRiskState(id);
     }
 
     function _createApplication(
         address applicationOwner,
+        RiskId riskId,
         uint256 sumInsuredAmount,
         uint256 premiumAmount,
         uint256 lifetime,
@@ -33,6 +86,7 @@ contract Product is BaseComponent, IProductComponent {
     ) internal returns (NftId nftId) {
         nftId = _productService.createApplication(
             applicationOwner,
+            riskId,
             sumInsuredAmount,
             premiumAmount,
             lifetime,
@@ -98,7 +152,12 @@ contract Product is BaseComponent, IProductComponent {
         override
         returns (Fee memory policyFee)
     {
-        return _instance.getProductSetup(getNftId()).policyFee;
+        NftId productNftId = getNftId();
+        if (address(_instance.getTokenHandler(productNftId)) != address(0)) {
+            return _instance.getTreasuryInfo(productNftId).policyFee;
+        } else {
+            return _initialPolicyFee;
+        }
     }
 
     function getProcessingFee()
@@ -107,7 +166,12 @@ contract Product is BaseComponent, IProductComponent {
         override
         returns (Fee memory processingFee)
     {
-        return _instance.getProductSetup(getNftId()).processingFee;
+        NftId productNftId = getNftId();
+        if (address(_instance.getTokenHandler(productNftId)) != address(0)) {
+            return _instance.getTreasuryInfo(productNftId).processingFee;
+        } else {
+            return _initialProcessingFee;
+        }
     }
 
     // from registerable

package/contracts/instance/IInstance.sol

@@ -33,18 +33,17 @@ interface IInstance is
     IAccessModule,
     IPolicyModule,
     IPoolModule,
+    IRiskModule,
     IBundleModule,
     IComponentModule,
     ITreasuryModule,
     ICompensationModule,
     IInstanceBase
 {
-    function getRegistry() external view override (IBundleModule, IComponentModule, IPolicyModule, IRegisterable) returns (IRegistry registry);
+    function getRegistry() external view override (IPolicyModule, IRegisterable) returns (IRegistry registry);
     function getOwner() external view override (IOwnable, IAccessModule) returns(address owner);
 
-    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 (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

@@ -53,12 +53,15 @@ contract Instance is
         TreasuryModule()
     {
         initializeBundleModule(_keyValueStore);
+        initializeCompensationModule(_keyValueStore);
+        initializeComponentModule(_keyValueStore);
+        initializePolicyModule(_keyValueStore);
+        initializePoolModule(_keyValueStore);
+        initializeRiskModule(_keyValueStore);
     }
 
-    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 hasRole(RoleId role, address member) public view override (AccessModule, IComponentModule) returns (bool) { return super.hasRole(role, member); }
+    function getRegistry() public view override (Registerable, IPolicyModule) returns (IRegistry registry) { return super.getRegistry(); }
+    function getKeyValueStore() public view override (InstanceBase) returns (IKeyValueStore keyValueStore) { return super.getKeyValueStore(); }
 
     function getComponentOwnerService() external view override (IComponentModule, IInstanceBase) returns(IComponentOwnerService service) { return _componentOwnerService; }
     function getProductService() external view override (IBundleModule, IPolicyModule, IInstanceBase) returns(IProductService service) { return _productService; }

package/contracts/instance/base/IInstanceBase.sol

@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
+import {Key32} from "../../types/Key32.sol";
+import {StateId} from "../../types/StateId.sol";
+
 import {IKeyValueStore} from "./IKeyValueStore.sol";
 import {IComponentOwnerService} from "../service/IComponentOwnerService.sol";
 import {IProductService} from "../service/IProductService.sol";
@@ -8,6 +11,8 @@ import {IPoolService} from "../service/IPoolService.sol";
 
 interface IInstanceBase {
     function getKeyValueStore() external view returns (IKeyValueStore keyValueStore);
+    function updateState(Key32 key, StateId state) external;
+
     function getComponentOwnerService() external view returns(IComponentOwnerService service);
     function getProductService() external view returns(IProductService service);
     function getPoolService() external view returns(IPoolService service);

package/contracts/instance/base/IKeyValueStore.sol

@@ -29,9 +29,9 @@ interface IKeyValueStore is ILifecycle {
         Blocknumber createdIn;
     }
 
-    event LogInfoCreated(Key key, StateId state, address createdBy);
-    event LogInfoUpdated(Key key, StateId state, address updatedBy, Blocknumber lastUpdatedIn);
-    event LogStateUpdated(Key key, StateId stateOld, StateId stateNew, address updatedBy, Blocknumber lastUpdatedIn);
+    event LogInfoCreated(Key key, StateId state, address createdBy, address txOrigin);
+    event LogInfoUpdated(Key key, StateId state, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
+    event LogStateUpdated(Key key, StateId stateOld, StateId stateNew, address updatedBy, address txOrigin, Blocknumber lastUpdatedIn);
 
     // generic state changing functions
     function create(Key32 key, ObjectType objectType, bytes memory data) external;
@@ -46,4 +46,5 @@ interface IKeyValueStore is ILifecycle {
     function getState(Key32 key) external view returns (StateId state);
 
     function toKey32(ObjectType objectType, KeyId id) external pure returns(Key32);
+    function toKey(Key32 key32) external pure returns(Key memory key);
 }

package/contracts/instance/base/InstanceBase.sol

@@ -3,11 +3,11 @@ pragma solidity ^0.8.19;
 
 import {Versionable} from "../../shared/Versionable.sol";
 import {Registerable} from "../../shared/Registerable.sol";
-// import {IRegistry} from "../registry/IRegistry.sol";
 
-// import {IInstance} from "./IInstance.sol";
 import {ObjectType, INSTANCE} from "../../types/ObjectType.sol";
+import {Key32} from "../../types/Key32.sol";
 import {NftId} from "../../types/NftId.sol";
+import {StateId} from "../../types/StateId.sol";
 import {Version, VersionPart, VersionLib} from "../../types/Version.sol";
 
 import {IComponentOwnerService} from "../service/IComponentOwnerService.sol";
@@ -46,6 +46,10 @@ abstract contract InstanceBase is
 
     function getKeyValueStore() public view virtual override returns (IKeyValueStore keyValueStore) { return _keyValueStore; }
 
+    function updateState(Key32 key, StateId state) external override {
+        _keyValueStore.updateState(key, state);
+    }
+
     // from versionable
     function getVersion()
         public 

package/contracts/instance/base/KeyValueStore.sol

@@ -54,7 +54,8 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
         // set data
         _value[key32].data = data;
 
-        emit LogInfoCreated(toKey(key32), initialState, createdBy);
+        // solhint-disable-next-line avoid-tx-origin
+        emit LogInfoCreated(toKey(key32), initialState, createdBy, tx.origin);
     }
 
     function update(Key32 key32, StateId state, bytes memory data) 
@@ -78,8 +79,10 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
 
         // create log entries
         Key memory key = toKey(key32);
-        emit LogStateUpdated(key, state, stateOld, updatedBy, lastUpdatedIn);
-        emit LogInfoUpdated(key, state, updatedBy, lastUpdatedIn);
+        // solhint-disable-next-line avoid-tx-origin
+        emit LogStateUpdated(key, state, stateOld, updatedBy, tx.origin, lastUpdatedIn);
+        // solhint-disable-next-line avoid-tx-origin
+        emit LogInfoUpdated(key, state, updatedBy, tx.origin, lastUpdatedIn);
     }
 
     function updateData(Key32 key32, bytes memory data) 
@@ -101,7 +104,8 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
 
         // create log entry
         Key memory key = toKey(key32);
-        emit LogInfoUpdated(key, state, updatedBy, lastUpdatedIn);
+        // solhint-disable-next-line avoid-tx-origin
+        emit LogInfoUpdated(key, state, updatedBy, tx.origin, lastUpdatedIn);
     }
 
     function updateState(Key32 key32, StateId state)
@@ -122,7 +126,8 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
 
         // create log entry
         Key memory key = toKey(key32);
-        emit LogStateUpdated(key, state, stateOld, updatedBy, lastUpdatedIn);
+        // solhint-disable-next-line avoid-tx-origin
+        emit LogStateUpdated(key, state, stateOld, updatedBy, tx.origin, lastUpdatedIn);
     }
 
     function exists(Key32 key32) public view returns (bool) {
@@ -145,11 +150,11 @@ contract KeyValueStore is Lifecycle, IKeyValueStore {
         return _value[key32].metadata.state;
     }
 
-    function toKey32(ObjectType objectType, KeyId id) external pure returns(Key32) {
+    function toKey32(ObjectType objectType, KeyId id) external pure override returns(Key32) {
         return Key32Lib.toKey32(objectType, id);
     }
 
-    function toKey(Key32 key32) public pure returns (Key memory key) {
+    function toKey(Key32 key32) public pure override returns (Key memory key) {
         (ObjectType objectType, KeyId id) = key32.toKey();
         return Key(objectType, id);
     }

package/contracts/instance/base/Lifecycle.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.19;
 
 import {NftId} from "../../types/NftId.sol";
-import {ObjectType, PRODUCT, ORACLE, POOL, BUNDLE, POLICY} from "../../types/ObjectType.sol";
+import {ObjectType, COMPONENT, BUNDLE, POLICY, RISK} from "../../types/ObjectType.sol";
 import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, UNDERWRITTEN, REVOKED, DECLINED} from "../../types/StateId.sol";
 import {ILifecycle} from "./ILifecycle.sol";
 
@@ -14,12 +14,10 @@ contract Lifecycle is ILifecycle {
         private _isValidTransition;
 
     constructor() {
-        _setupComponentLifecycle(PRODUCT());
-        _setupComponentLifecycle(ORACLE());
-        _setupComponentLifecycle(POOL());
-
         _setupBundleLifecycle();
+        _setupComponentLifecycle();
         _setupPolicyLifecycle();
+        _setupRiskLifecycle();
     }
 
     function hasLifecycle(
@@ -70,11 +68,11 @@ contract Lifecycle is ILifecycle {
         return _isValidTransition[objectType][fromId][toId];
     }
 
-    function _setupComponentLifecycle(ObjectType objectType) internal {
-        _initialState[objectType] = ACTIVE();
-        _isValidTransition[objectType][ACTIVE()][PAUSED()] = true;
-        _isValidTransition[objectType][PAUSED()][ACTIVE()] = true;
-        _isValidTransition[objectType][PAUSED()][ARCHIVED()] = true;
+    function _setupComponentLifecycle() internal {
+        _initialState[COMPONENT()] = ACTIVE();
+        _isValidTransition[COMPONENT()][ACTIVE()][PAUSED()] = true;
+        _isValidTransition[COMPONENT()][PAUSED()][ACTIVE()] = true;
+        _isValidTransition[COMPONENT()][PAUSED()][ARCHIVED()] = true;
     }
 
     function _setupBundleLifecycle() internal {
@@ -92,4 +90,11 @@ contract Lifecycle is ILifecycle {
         _isValidTransition[POLICY()][UNDERWRITTEN()][ACTIVE()] = true;
         _isValidTransition[POLICY()][ACTIVE()][CLOSED()] = true;
     }
+
+    function _setupRiskLifecycle() internal {
+        _initialState[RISK()] = ACTIVE();
+        _isValidTransition[RISK()][ACTIVE()][PAUSED()] = true;
+        _isValidTransition[RISK()][PAUSED()][ACTIVE()] = true;
+        _isValidTransition[RISK()][PAUSED()][ARCHIVED()] = true;
+    }
 }

package/contracts/instance/base/ModuleBase.sol

@@ -16,37 +16,38 @@ import {IKeyValueStore} from "./IKeyValueStore.sol";
 abstract contract ModuleBase {
 
     IKeyValueStore private _store;
-    ObjectType private _type;
 
-    function _initialize(IKeyValueStore keyValueStore, ObjectType objectType) internal {
+    function _initialize(IKeyValueStore keyValueStore) internal {
         _store = keyValueStore;
-        _type = objectType;
     }
 
-    function _create(NftId nftId, bytes memory data) internal {
+    function _create(ObjectType objectType, Key32 key, bytes memory data) internal {
         _store.create(
-            _toKey32(nftId), 
-            _type,
+            key, 
+            objectType,
             data);
     }
 
-    function _updateData(NftId nftId, bytes memory data) internal {
-        _store.updateData(_toKey32(nftId), data);
+    function _create(ObjectType objectType, NftId nftId, bytes memory data) internal {
+        _store.create(
+            nftId.toKey32(objectType), 
+            objectType,
+            data);
     }
 
-    function _updateState(NftId nftId, StateId state) internal {
-        _store.updateState(_toKey32(nftId), state);
+    function _updateData(ObjectType objectType, NftId nftId, bytes memory data) internal {
+        _store.updateData(nftId.toKey32(objectType), data);
     }
 
-    function _getData(NftId nftId) internal view returns(bytes memory data) {
-        return _store.getData(_toKey32(nftId));
+    function _updateState(ObjectType objectType, NftId nftId, StateId state) internal {
+        _store.updateState(nftId.toKey32(objectType), state);
     }
 
-    function _getState(NftId nftId) internal view returns(StateId) {
-        return _store.getState(_toKey32(nftId));
+    function _getData(ObjectType objectType, NftId nftId) internal view returns(bytes memory data) {
+        return _store.getData(nftId.toKey32(objectType));
     }
 
-    function _toKey32(NftId nftId) internal view returns (Key32 key32) {
-        return nftId.toKey32(_type);
-    } 
+    function _getState(ObjectType objectType, NftId nftId) internal view returns(StateId) {
+        return _store.getState(nftId.toKey32(objectType));
+    }
 }