@etherisc/gif-next 0.0.2-dc7e4cb-141 → 0.0.2-de220d6-949

package/contracts/instance/base/KeyValueStore.sol

@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {Blocknumber, blockBlocknumber, zeroBlocknumber} from "../../types/Blocknumber.sol";
+import {Key32, KeyId, Key32Lib} from "../../types/Key32.sol";
+import {NftId} from "../../types/NftId.sol";
+import {ObjectType} from "../../types/ObjectType.sol";
+import {StateId, ACTIVE} from "../../types/StateId.sol";
+import {Timestamp, blockTimestamp, zeroTimestamp} from "../../types/Timestamp.sol";
+
+import {Lifecycle} from "./Lifecycle.sol";
+import {IKeyValueStore} from "./IKeyValueStore.sol";
+
+contract KeyValueStore is Lifecycle, IKeyValueStore {
+
+    mapping(Key32 key32 => Value value) private _value;
+    address private _owner;
+
+    modifier onlyOwner() {
+        require(
+            msg.sender == _owner,
+            "ERROR:KVS-001:NOT_OWNER");
+        _;
+    }
+
+    constructor() {
+        _owner = msg.sender;
+    }
+
+    function create(
+        Key32 key32, 
+        ObjectType objectType, 
+        bytes memory data
+    )
+        public
+        onlyOwner
+    {
+        require(objectType.gtz(), "ERROR:KVS-010:TYPE_UNDEFINED");
+
+        Metadata storage metadata = _value[key32].metadata;
+        require(metadata.state.eqz(), "ERROR:KVS-012:ALREADY_CREATED");
+
+        address createdBy = msg.sender;
+        Blocknumber blocknumber = blockBlocknumber();
+        StateId initialState = hasLifecycle(objectType) ? getInitialState(objectType) : ACTIVE();
+
+        // set metadata
+        metadata.objectType = objectType;
+        metadata.state = initialState;
+        metadata.updatedBy = createdBy;
+        metadata.updatedIn = blocknumber;
+        metadata.createdIn = blocknumber;
+
+        // set data
+        _value[key32].data = data;
+
+        emit LogInfoCreated(toKey(key32), initialState, createdBy);
+    }
+
+    function update(Key32 key32, StateId state, bytes memory data) 
+        public
+        onlyOwner
+    {
+        require(state.gtz(), "ERROR:KVS-020:STATE_UNDEFINED");
+        Metadata storage metadata = _value[key32].metadata;
+        StateId stateOld = metadata.state;
+        require(stateOld.gtz(), "ERROR:KVS-021:NOT_EXISTING");
+
+        // update data
+        _value[key32].data = data;
+
+        // update metadata (and state)
+        address updatedBy = msg.sender;
+        Blocknumber lastUpdatedIn = metadata.updatedIn;
+        metadata.state = state;
+        metadata.updatedBy = updatedBy;
+        metadata.updatedIn = blockBlocknumber();
+
+        // create log entries
+        Key memory key = toKey(key32);
+        emit LogStateUpdated(key, state, stateOld, updatedBy, lastUpdatedIn);
+        emit LogInfoUpdated(key, state, updatedBy, lastUpdatedIn);
+    }
+
+    function updateData(Key32 key32, bytes memory data) 
+        public
+        onlyOwner
+    {
+        Metadata storage metadata = _value[key32].metadata;
+        StateId state = metadata.state;
+        require(state.gtz(), "ERROR:KVS-030:NOT_EXISTING");
+
+        // update data
+        _value[key32].data = data;
+
+        // update metadata
+        address updatedBy = msg.sender;
+        Blocknumber lastUpdatedIn = metadata.updatedIn;
+        metadata.updatedBy = updatedBy;
+        metadata.updatedIn = blockBlocknumber();
+
+        // create log entry
+        Key memory key = toKey(key32);
+        emit LogInfoUpdated(key, state, updatedBy, lastUpdatedIn);
+    }
+
+    function updateState(Key32 key32, StateId state)
+        public
+        onlyOwner
+    {
+        require(state.gtz(), "ERROR:KVS-040:STATE_UNDEFINED");
+        Metadata storage metadata = _value[key32].metadata;
+        StateId stateOld = metadata.state;
+        require(stateOld.gtz(), "ERROR:KVS-041:NOT_EXISTING");
+
+        // update metadata (and state)
+        address updatedBy = msg.sender;
+        Blocknumber lastUpdatedIn = metadata.updatedIn;
+        metadata.state = state;
+        metadata.updatedBy = updatedBy;
+        metadata.updatedIn = blockBlocknumber();
+
+        // create log entry
+        Key memory key = toKey(key32);
+        emit LogStateUpdated(key, state, stateOld, updatedBy, lastUpdatedIn);
+    }
+
+    function exists(Key32 key32) public view returns (bool) {
+        return _value[key32].metadata.state.gtz();
+    }
+
+    function get(Key32 key32) public view returns (Value memory value) {
+        return _value[key32];
+    }
+
+    function getMetadata(Key32 key32) public view returns (Metadata memory metadata) {
+        return _value[key32].metadata;
+    }
+
+    function getData(Key32 key32) public view returns (bytes memory data) {
+        return _value[key32].data;
+    }
+
+    function getState(Key32 key32) public view returns (StateId state) {
+        return _value[key32].metadata.state;
+    }
+
+    function toKey32(ObjectType objectType, KeyId id) external pure returns(Key32) {
+        return Key32Lib.toKey32(objectType, id);
+    }
+
+    function toKey(Key32 key32) public pure returns (Key memory key) {
+        (ObjectType objectType, KeyId id) = key32.toKey();
+        return Key(objectType, id);
+    }
+}

package/contracts/instance/{module/lifecycle/LifecycleModule.sol → base/Lifecycle.sol}

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-import {NftId} from "../../../types/NftId.sol";
-import {ObjectType, PRODUCT, ORACLE, POOL, BUNDLE, POLICY} from "../../../types/ObjectType.sol";
-import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, UNDERWRITTEN, REVOKED, DECLINED} from "../../../types/StateId.sol";
-import {ILifecycleModule} from "./ILifecycle.sol";
+import {NftId} from "../../types/NftId.sol";
+import {ObjectType, PRODUCT, ORACLE, POOL, BUNDLE, POLICY} from "../../types/ObjectType.sol";
+import {StateId, ACTIVE, PAUSED, ARCHIVED, CLOSED, APPLIED, UNDERWRITTEN, REVOKED, DECLINED} from "../../types/StateId.sol";
+import {ILifecycle} from "./ILifecycle.sol";
 
-contract LifecycleModule is ILifecycleModule {
+contract Lifecycle is ILifecycle {
     mapping(ObjectType objectType => StateId initialState)
         private _initialState;
 
@@ -22,38 +22,44 @@ contract LifecycleModule is ILifecycleModule {
         _setupPolicyLifecycle();
     }
 
-    function checkAndLogTransition(
-        NftId nftId,
+    function hasLifecycle(
+        ObjectType objectType
+    )
+        public
+        view
+        override
+        returns (bool)
+    {
+        return _initialState[objectType].gtz();
+    }
+
+    function getInitialState(
+        ObjectType objectType
+    )
+        public
+        view
+        returns (StateId)
+    {
+        return _initialState[objectType];
+    }
+
+    function checkTransition(
         ObjectType objectType,
         StateId fromId,
         StateId toId
-    ) public returns (StateId) // add only currentcontract? would that work?
+    )
+        public
+        view
     {
-        if (!_isValidTransition[objectType][fromId][toId]) {
-            revert ErrorInvalidStateTransition(nftId, objectType, fromId, toId);
+        // return if no life cycle support
+        if (_initialState[objectType].eqz()) {
+            return;
         }
 
-        if (objectType == POLICY()) {
-            emit LogPolicyStateChanged(nftId, fromId, toId);
-        } else if (objectType == BUNDLE()) {
-            emit LogBundleStateChanged(nftId, fromId, toId);
-        } else if (
-            objectType == PRODUCT() ||
-            objectType == ORACLE() ||
-            objectType == POOL()
-        ) {
-            emit LogComponentStateChanged(nftId, objectType, fromId, toId);
-        } else {
-            revert ErrorNoLifecycle(nftId, objectType);
+        // enforce valid state transition
+        if (!_isValidTransition[objectType][fromId][toId]) {
+            revert ErrorInvalidStateTransition(objectType, fromId, toId);
         }
-
-        return toId;
-    }
-
-    function getInitialState(
-        ObjectType objectType
-    ) public view returns (StateId) {
-        return _initialState[objectType];
     }
 
     function isValidTransition(

package/contracts/instance/base/ModuleBase.sol

@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {IRegistry} from "../../registry/IRegistry.sol";
+
+import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
+import {Key32, KeyId} from "../../types/Key32.sol";
+import {LibNftIdSet} from "../../types/NftIdSet.sol";
+import {NftId} from "../../types/NftId.sol";
+import {ObjectType, 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 {IKeyValueStore} from "./IKeyValueStore.sol";
+
+abstract contract ModuleBase {
+
+    IKeyValueStore private _store;
+    ObjectType private _type;
+
+    function _initialize(IKeyValueStore keyValueStore, ObjectType objectType) internal {
+        _store = keyValueStore;
+        _type = objectType;
+    }
+
+    function _create(NftId nftId, bytes memory data) internal {
+        _store.create(
+            _toKey32(nftId), 
+            _type,
+            data);
+    }
+
+    function _updateData(NftId nftId, bytes memory data) internal {
+        _store.updateData(_toKey32(nftId), data);
+    }
+
+    function _updateState(NftId nftId, StateId state) internal {
+        _store.updateState(_toKey32(nftId), state);
+    }
+
+    function _getData(NftId nftId) internal view returns(bytes memory data) {
+        return _store.getData(_toKey32(nftId));
+    }
+
+    function _getState(NftId nftId) internal view returns(StateId) {
+        return _store.getState(_toKey32(nftId));
+    }
+
+    function _toKey32(NftId nftId) internal view returns (Key32 key32) {
+        return nftId.toKey32(_type);
+    } 
+}

package/contracts/instance/{service → base}/ServiceBase.sol

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-// import {IRegistry} from "../../registry/IRegistry.sol";
-// import {ITreasury, ITreasuryModule, TokenHandler} from "../../instance/module/treasury/ITreasury.sol";
 import {NftId, zeroNftId} from "../../types/NftId.sol";
 import {ObjectType, SERVICE} from "../../types/ObjectType.sol";
 import {Version, VersionPart} from "../../types/Version.sol";

package/contracts/instance/module/access/Access.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.19;
 // import {AccessControlEnumerable} from "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 
-import {RoleId, toRoleId} from "../../../types/RoleId.sol";
+import {RoleId, RoleIdLib} from "../../../types/RoleId.sol";
 import {DISTRIBUTOR_OWNER_ROLE, ORACLE_OWNER_ROLE, POOL_OWNER_ROLE, PRODUCT_OWNER_ROLE} from "../../../types/RoleId.sol";
 import {DISTRIBUTOR_OWNER_ROLE_NAME, ORACLE_OWNER_ROLE_NAME, POOL_OWNER_ROLE_NAME, PRODUCT_OWNER_ROLE_NAME} from "../../../types/RoleId.sol";
 import {IAccessModule} from "./IAccess.sol";
@@ -45,7 +45,7 @@ abstract contract AccessModule is IAccessModule {
     function createRole(
         string memory roleName
     ) public override onlyAccessOwner returns (RoleId role) {
-        role = toRoleId(roleName);
+        role = RoleIdLib.toRoleId(roleName);
         require(
             !roleExists(role),
             "ERROR:ACS-010:ROLE_ALREADY_EXISTS");
@@ -95,7 +95,7 @@ abstract contract AccessModule is IAccessModule {
     }
 
     function getRoleId(string memory roleName) external pure override returns (RoleId role) {
-        return toRoleId(roleName);
+        return RoleIdLib.toRoleId(roleName);
     }
 
     function getRoleInfo(

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

@@ -3,32 +3,32 @@ pragma solidity ^0.8.19;
 
 import {IRegistry} from "../../../registry/IRegistry.sol";
 
-import {LifecycleModule} from "../lifecycle/LifecycleModule.sol";
 import {IProductService} from "../../service/IProductService.sol";
 import {IPoolService} from "../../service/IPoolService.sol";
 
 import {NftId} from "../../../types/NftId.sol";
+import {Key32, KeyId} from "../../../types/Key32.sol";
 import {LibNftIdSet} from "../../../types/NftIdSet.sol";
 import {ObjectType, 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 {ILifecycleModule} from "../lifecycle/ILifecycle.sol";
+import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
+import {ModuleBase} from "../../base/ModuleBase.sol";
+
 import {IBundleModule} from "./IBundle.sol";
 
-abstract contract BundleModule is
+abstract contract BundleModule is 
+    ModuleBase,
     IBundleModule
 {
 
     using LibNftIdSet for LibNftIdSet.Set;
 
-    mapping(NftId bundleNftId => BundleInfo info) private _bundleInfo;
     mapping(NftId bundleNftId => LibNftIdSet.Set policies) private _collateralizedPolicies;
     mapping(NftId bundleNftId => mapping(NftId policyNftId => uint256 amount)) private _collateralizationAmount;
 
-    LifecycleModule private _lifecycleModule;
-
     modifier onlyBundlePoolService() {
         require(
             msg.sender == address(this.getPoolService()),
@@ -54,8 +54,8 @@ abstract contract BundleModule is
         _;
     }
 
-    constructor() {
-        _lifecycleModule = LifecycleModule(address(this));
+    function initializeBundleModule(IKeyValueStore keyValueStore) internal {
+        _initialize(keyValueStore, BUNDLE());
     }
 
     function createBundleInfo(
@@ -69,22 +69,18 @@ abstract contract BundleModule is
         onlyBundlePoolService
         override
     {
-
-        _bundleInfo[bundleNftId] = BundleInfo(
+        BundleInfo memory bundleInfo = BundleInfo(
             bundleNftId,
             poolNftId,
-            _lifecycleModule.getInitialState(BUNDLE()),
             filter,
             amount, // capital
             0, // locked capital
             amount, // balance
-            blockTimestamp(), // createdAt
             blockTimestamp().addSeconds(lifetime), // expiredAt
-            zeroTimestamp(), // closedAt
-            blockNumber() // updatedIn
+            zeroTimestamp() // closedAt
         );
 
-        // TODO add logging
+        _create(bundleNftId, abi.encode(bundleInfo));
     }
 
     function setBundleInfo(BundleInfo memory bundleInfo)
@@ -92,78 +88,16 @@ abstract contract BundleModule is
         override
         onlyPoolOrProductService
     {
-        _bundleInfo[bundleInfo.nftId] = bundleInfo;
+        _updateData(bundleInfo.nftId, abi.encode(bundleInfo));
     }
 
-    // function updateBundleState(
-    //     NftId bundleNftId,
-    //     StateId newState
-    // )
-    //     external    
-    //     // add authz (both product and pool service)
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.state = newState;
-    //     info.updatedIn = blockNumber();
-    // }
-
-    // function extendBundle(
-    //     NftId bundleNftId,
-    //     uint256 lifetimeExtension
-    // )
-    //     external
-    //     onlyBundlePoolService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.expiredAt = info.expiredAt.addSeconds(lifetimeExtension);
-    //     info.updatedIn = blockNumber();
-    // }
-
-    // function closeBundle(
-    //     NftId bundleNftId
-    // )
-    //     external
-    //     onlyBundlePoolService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.state = CLOSED();
-    //     info.closedAt = blockTimestamp();
-    //     info.updatedIn = blockNumber();
-    // }
-
-    // function processStake(
-    //     NftId nftId,
-    //     uint256 amount
-    // )
-    //     external
-    //     onlyBundlePoolService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[nftId];
-    //     info.capitalAmount += amount;
-    //     info.balanceAmount += amount;
-    //     info.updatedIn = blockNumber();
-    // }
-
-    // function processUnstake(
-    //     NftId nftId,
-    //     uint256 amount
-    // )
-    //     external
-    //     onlyBundlePoolService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[nftId];
-    //     // TODO fix book keeping in a way that provides
-    //     // continuous infor regarding profitability
-    //     // this is needed to properly apply performance fees
-    //     info.capitalAmount -= amount;
-    //     info.balanceAmount -= amount;
-    //     info.updatedIn = blockNumber();
-    // }
+    function updateBundleState(NftId bundleNftId, StateId state)
+        external
+        override
+        onlyBundlePoolService
+    {
+        _updateState(bundleNftId, state);
+    }
 
     function collateralizePolicy(
         NftId bundleNftId, 
@@ -187,42 +121,16 @@ abstract contract BundleModule is
         override 
         returns(uint256 collateralAmount)
     {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.lockedAmount -= collateralAmount;
-    //     info.updatedIn = blockNumber();
-
         collateralAmount = _collateralizationAmount[bundleNftId][policyNftId];
         delete _collateralizationAmount[bundleNftId][policyNftId];
         _collateralizedPolicies[bundleNftId].remove(policyNftId);
     }
 
-    // function addPremium(NftId bundleNftId, uint256 amount)
-    //     external
-    //     onlyBundleProductService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.capitalAmount += amount;
-    //     info.balanceAmount += amount;
-    //     info.updatedIn = blockNumber();
-    // }
-
-    // function subtractPayout(NftId bundleNftId, NftId policyNftId, uint256 amount)
-    //     external
-    //     onlyBundleProductService
-    //     override
-    // {
-    //     BundleInfo storage info = _bundleInfo[bundleNftId];
-    //     info.capitalAmount -= amount;
-    //     info.lockedAmount -= amount;
-    //     info.balanceAmount -= amount;
-    //     info.updatedIn = blockNumber();
-
-    //     // deduct amount from sum insured for this policy
-    //     _collateralizationAmount[bundleNftId][policyNftId] -= amount;
-    // }
-
     function getBundleInfo(NftId bundleNftId) external view override returns(BundleInfo memory bundleInfo) {
-        return _bundleInfo[bundleNftId];
+        return abi.decode(_getData(bundleNftId), (BundleInfo));
     }
+
+    function toBundleKey32(NftId bundleNftId) external view override returns (Key32 key32) {
+        return _toKey32(bundleNftId);
+    } 
 }

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

@@ -3,11 +3,13 @@ pragma solidity ^0.8.19;
 
 import {IRegistry} from "../../../registry/IRegistry.sol";
 import {IInstance} from "../../IInstance.sol";
+import {Key32} from "../../../types/Key32.sol";
 import {NftId} from "../../../types/NftId.sol";
 import {StateId} from "../../../types/StateId.sol";
 import {Timestamp} from "../../../types/Timestamp.sol";
 import {Blocknumber} from "../../../types/Blocknumber.sol";
 
+import {IKeyValueStore} from "../../base/IKeyValueStore.sol";
 import {IProductService} from "../../service/IProductService.sol";
 import {IPoolService} from "../../service/IPoolService.sol";
 
@@ -16,15 +18,12 @@ interface IBundle {
     struct BundleInfo {
         NftId nftId;
         NftId poolNftId;
-        StateId state; // active, paused, closed (expriy only implicit)
         bytes filter; // required conditions for applications to be considered for collateralization by this bundle
         uint256 capitalAmount; // net investment capital amount (<= balance)
         uint256 lockedAmount; // capital amount linked to collateralizaion of non-closed policies (<= balance)
         uint256 balanceAmount; // total amount of funds: net investment capital + net premiums - payouts
-        Timestamp createdAt;
         Timestamp expiredAt; // no new policies
         Timestamp closedAt;
-        Blocknumber updatedIn;
     }
 }
 
@@ -39,14 +38,20 @@ interface IBundleModule is IBundle {
     ) external;
 
     function setBundleInfo(BundleInfo memory bundleInfo) external;
+    function updateBundleState(NftId bundleNftId, 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);
+
     // repeat service linked signatures to avoid linearization issues
     function getProductService() external returns(IProductService);
     function getPoolService() external returns(IPoolService);

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

@@ -6,7 +6,6 @@ import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IER
 import {IRegistry} from "../../../registry/IRegistry.sol";
 import {IInstance} from "../../IInstance.sol";
 
-import {LifecycleModule} from "../lifecycle/LifecycleModule.sol";
 import {IComponent, IComponentModule} from "./IComponent.sol";
 import {IComponentOwnerService} from "../../service/IComponentOwnerService.sol";
 import {ObjectType, PRODUCT, ORACLE, POOL} from "../../../types/ObjectType.sol";
@@ -24,9 +23,6 @@ abstract contract ComponentModule is
 
     mapping(ObjectType cType => bytes32 role) private _componentOwnerRole;
 
-    // TODO maybe move this to Instance contract as internal variable?
-    LifecycleModule private _lifecycleModule;
-
     modifier onlyComponentOwnerService() {
         require(
             msg.sender == address(this.getComponentOwnerService()),
@@ -35,21 +31,17 @@ abstract contract ComponentModule is
         _;
     }
 
-    constructor() {
-        address componentAddress = address(this);
-        _lifecycleModule = LifecycleModule(componentAddress);
-    }
-
     function registerComponent(
         NftId nftId,
-        ObjectType objectType,
+        ObjectType, // objectType,
         IERC20Metadata token
     ) external override onlyComponentOwnerService {
 
         // create component info
         _componentInfo[nftId] = ComponentInfo(
             nftId,
-            _lifecycleModule.getInitialState(objectType),
+            // _lifecycleModule.getInitialState(objectType),
+            ACTIVE(),
             token
         );
 
@@ -70,13 +62,13 @@ abstract contract ComponentModule is
         // 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
-        );
+        // ObjectType objectType = this.getRegistry().getObjectInfo(nftId).objectType;
+        // _lifecycleModule.checkAndLogTransition(
+        //     nftId,
+        //     objectType,
+        //     _componentInfo[nftId].state,
+        //     info.state
+        // );
         _componentInfo[nftId] = info;
     }
 

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)