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

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

@@ -3,7 +3,6 @@ pragma solidity ^0.8.19;
 
 import {IRegistry} from "../../../registry/IRegistry.sol";
 
-import {LifecycleModule} from "../../module/lifecycle/LifecycleModule.sol";
 import {IProductService} from "../../service/IProductService.sol";
 import {IPolicy, IPolicyModule} from "./IPolicy.sol";
 import {ObjectType, POLICY} from "../../../types/ObjectType.sol";
@@ -12,15 +11,11 @@ import {NftId, NftIdLib} from "../../../types/NftId.sol";
 import {Timestamp, blockTimestamp, zeroTimestamp} from "../../../types/Timestamp.sol";
 import {Blocknumber, blockNumber} from "../../../types/Blocknumber.sol";
 
-import {LifecycleModule} from "../../module/lifecycle/LifecycleModule.sol";
-
 abstract contract PolicyModule is IPolicyModule {
     using NftIdLib for NftId;
 
     mapping(NftId nftId => PolicyInfo info) private _policyInfo;
 
-    LifecycleModule private _lifecycleModule;
-
     // TODO find a better place to avoid dupliation
     modifier onlyProductService2() {
         require(
@@ -30,10 +25,6 @@ abstract contract PolicyModule is IPolicyModule {
         _;
     }
 
-    constructor() {
-        _lifecycleModule = LifecycleModule(address(this));
-    }
-
     function createApplication(
         NftId productNftId,
         NftId policyNftId,
@@ -51,12 +42,14 @@ abstract contract PolicyModule is IPolicyModule {
             productNftId,
             bundleNftId,
             address(0), // beneficiary = policy nft holder
-            _lifecycleModule.getInitialState(POLICY()),
+            // _lifecycleModule.getInitialState(POLICY()),
+            APPLIED(),
             sumInsuredAmount,
             premiumAmount,
             0, // premium paid amount
             lifetime, 
-            "", // data
+            "", // applicationData
+            "", // policyData
             blockTimestamp(), // createdAt
             zeroTimestamp(), // activatedAt
             zeroTimestamp(), // expiredAt

package/contracts/instance/service/ComponentOwnerService.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 "../module/lifecycle/LifecycleModule.sol";
 import {ITreasuryModule} from "../module/treasury/ITreasury.sol";
 import {TreasuryModule} from "../module/treasury/TreasuryModule.sol";
 import {IComponent, IComponentModule} from "../module/component/IComponent.sol";
@@ -24,7 +23,7 @@ import {Fee} from "../../types/Fee.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
 
 import {IProductComponent} from "../../components/IProductComponent.sol";
-import {ServiceBase} from "./ServiceBase.sol";
+import {ServiceBase} from "../base/ServiceBase.sol";
 import {IComponentOwnerService} from "./IComponentOwnerService.sol";
 
 contract ComponentOwnerService is

package/contracts/instance/service/IComponentOwnerService.sol

@@ -5,7 +5,7 @@ import {NftId} from "../../types/NftId.sol";
 import {ObjectType} from "../../types/ObjectType.sol";
 import {RoleId} from "../../types/RoleId.sol";
 import {IBaseComponent} from "../../components/IBaseComponent.sol";
-import {IService} from "./IService.sol";
+import {IService} from "../base/IService.sol";
 
 // TODO rename to registry service
 interface IComponentOwnerService is IService {

package/contracts/instance/service/IPoolService.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import {NftId} from "../../types/NftId.sol";
 import {Fee} from "../../types/Fee.sol";
-import {IService} from "./IService.sol";
+import {IService} from "../base/IService.sol";
 
 interface IPoolService is IService {
     function setFees(

package/contracts/instance/service/IProductService.sol

@@ -5,7 +5,7 @@ import {NftId} from "../../types/NftId.sol";
 import {Timestamp} from "../../types/Timestamp.sol";
 import {UFixed} from "../../types/UFixed.sol";
 import {Fee} from "../../types/Fee.sol";
-import {IService} from "./IService.sol";
+import {IService} from "../base/IService.sol";
 
 interface IProductService is IService {
     function setFees(

package/contracts/instance/service/PoolService.sol

@@ -13,7 +13,7 @@ import {POOL, BUNDLE} from "../../types/ObjectType.sol";
 import {Fee} from "../../types/Fee.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
 
-import {ComponentServiceBase} from "./ComponentServiceBase.sol";
+import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
 import {IPoolService} from "./IPoolService.sol";
 
 

package/contracts/instance/service/ProductService.sol

@@ -22,7 +22,7 @@ import {Blocknumber, blockNumber} from "../../types/Blocknumber.sol";
 import {Fee, FeeLib} from "../../types/Fee.sol";
 import {Version, VersionLib} from "../../types/Version.sol";
 
-import {ComponentServiceBase} from "./ComponentServiceBase.sol";
+import {ComponentServiceBase} from "../base/ComponentServiceBase.sol";
 import {IProductService} from "./IProductService.sol";
 
 // TODO or name this ProtectionService to have Product be something more generic (loan, savings account, ...)
@@ -134,7 +134,6 @@ contract ProductService is ComponentServiceBase, IProductService {
         returns (IBundle.BundleInfo memory)
     {
         bundleInfo.lockedAmount += collateralAmount;
-        bundleInfo.updatedIn = blockNumber();
         instance.collateralizePolicy(bundleInfo.nftId, policyNftId, collateralAmount);
         return bundleInfo;
     }
@@ -151,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

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.19;
 
 import {IRegisterable} from "../shared/IRegisterable.sol";
-import {IService} from "../instance/service/IService.sol";
+import {IService} from "../instance/base/IService.sol";
 
 import {IChainNft} from "./IChainNft.sol";
 import {ChainNft} from "./ChainNft.sol";

package/contracts/test/TestRoleId.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
-import {RoleId, toRoleId, PRODUCT_OWNER_ROLE_NAME, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE_NAME, POOL_OWNER_ROLE} from "../../contracts/types/RoleId.sol";
+import {RoleId, RoleIdLib, PRODUCT_OWNER_ROLE_NAME, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE_NAME, POOL_OWNER_ROLE} from "../../contracts/types/RoleId.sol";
 
 contract TestRoleId {
-    function getRole(string memory roleName) external pure returns (RoleId) { return toRoleId(roleName); }
+    function getRole(string memory roleName) external pure returns (RoleId) { return RoleIdLib.toRoleId(roleName); }
 
     function getProductOwnerRoleName() external pure returns (string memory) { return PRODUCT_OWNER_ROLE_NAME(); }
     function getProductOwnerRole() external pure returns (RoleId) { return PRODUCT_OWNER_ROLE(); } 

package/contracts/test/TestService.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import {NftId} from "../../contracts/types/NftId.sol";
 import {Version, VersionLib} from "../../contracts/types/Version.sol";
-import {ServiceBase} from "../../contracts/instance/service/ServiceBase.sol";
+import {ServiceBase} from "../../contracts/instance/base/ServiceBase.sol";
 
 import {IVersionable} from "../../contracts/shared/IVersionable.sol";
 import {Versionable} from "../../contracts/shared/Versionable.sol";

package/contracts/types/Key32.sol

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {ObjectType} from "./ObjectType.sol";
+
+type Key32 is bytes32;
+type KeyId is bytes31;
+
+// type bindings
+using {
+    eqKey32 as ==, 
+    neKey32 as !=,
+    Key32Lib.toKey
+} for Key32 global;
+
+// @dev Returns true iff keys are identical
+function eqKey32(Key32 a, Key32 b) pure returns (bool isSame) {
+    return Key32.unwrap(a) == Key32.unwrap(b);
+}
+
+// @dev Returns true iff keys are different
+function neKey32(Key32 a, Key32 b) pure returns (bool isDifferent) {
+    return Key32.unwrap(a) != Key32.unwrap(b);
+}
+
+library Key32Lib {
+
+    uint8 public constant TYPE_SHIFT = 31 * 8;
+    uint8 public constant ID_SHIFT = uint8(32 * 8 - TYPE_SHIFT);
+    bytes32 public constant TYPE_MASK = bytes32(bytes1(type(uint8).max)); // first byte in bytes32
+    bytes32 public constant ID_MASK = bytes32(~TYPE_MASK); // remaining bytes in bytes32
+
+    function toKey32(ObjectType objectType, KeyId id) public pure returns (Key32) {
+        uint256 uintObjectType = ObjectType.unwrap(objectType);
+        uint256 uintId = uint248(KeyId.unwrap(id));
+        uint256 uintKey = (uintObjectType << TYPE_SHIFT) + uintId;
+        return Key32.wrap(bytes32(uintKey));
+    }
+
+    function toKey(Key32 key) public pure returns (ObjectType objectType, KeyId id) {
+        bytes32 key32 = Key32.unwrap(key);
+        objectType = ObjectType.wrap(uint8(uint256(key32 & TYPE_MASK) >> TYPE_SHIFT));
+        id = KeyId.wrap(bytes31((key32 & ID_MASK) << ID_SHIFT));
+    }
+}

package/contracts/types/NftId.sol

@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
 
+import {Key32, KeyId, Key32Lib} from "./Key32.sol";
+import {ObjectType} from "./ObjectType.sol";
+
 // uint96 allows for chain ids up to 13 digits
 type NftId is uint96;
 
@@ -10,7 +13,9 @@ using {
     neNftId as !=, 
     NftIdLib.toInt,
     NftIdLib.gtz,
-    NftIdLib.eqz
+    NftIdLib.eqz,
+    NftIdLib.toKeyId,
+    NftIdLib.toKey32
 } for NftId global;
 
 // general pure free functions
@@ -54,4 +59,14 @@ library NftIdLib {
     function eq(NftId a, NftId b) public pure returns (bool isSame) {
         return eqNftId(a, b);
     }
+
+    /// @dev Returns the key32 value for the specified nft id and object type.
+    function toKey32(NftId id, ObjectType objectType) public pure returns (Key32 key) {
+        return Key32Lib.toKey32(objectType, toKeyId(id));
+    }
+
+    /// @dev Returns the key id value for the specified nft id
+    function toKeyId(NftId id) public pure returns (KeyId keyId) {
+        return KeyId.wrap(bytes31(uint248(NftId.unwrap(id))));
+    }
 }

package/contracts/types/RoleId.sol

@@ -15,15 +15,10 @@ function ORACLE_OWNER_ROLE_NAME() pure returns (string memory) { return "OracleO
 function POOL_OWNER_ROLE_NAME() pure returns (string memory) { return "PoolOwnerRole"; }
 function PRODUCT_OWNER_ROLE_NAME() pure returns (string memory) { return "ProductOwnerRole"; }
 
-function DISTRIBUTOR_OWNER_ROLE() pure returns (RoleId) { return toRoleId("DistributorOwnerRole"); }
-function ORACLE_OWNER_ROLE() pure returns (RoleId) { return toRoleId("OracleOwnerRole"); }
-function POOL_OWNER_ROLE() pure returns (RoleId) { return toRoleId("PoolOwnerRole"); }
-function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return toRoleId("ProductOwnerRole"); }
-
-// @dev Converts a role string into a role id.
-function toRoleId(string memory role) pure returns (RoleId) {
-    return RoleId.wrap(bytes8(keccak256(abi.encode(role))));
-}
+function DISTRIBUTOR_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("DistributorOwnerRole"); }
+function ORACLE_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("OracleOwnerRole"); }
+function POOL_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("PoolOwnerRole"); }
+function PRODUCT_OWNER_ROLE() pure returns (RoleId) { return RoleIdLib.toRoleId("ProductOwnerRole"); }
 
 // @dev Returns true iff role ids a and b are identical
 function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
@@ -34,3 +29,10 @@ function eqRoleId(RoleId a, RoleId b) pure returns (bool isSame) {
 function neRoleId(RoleId a, RoleId b) pure returns (bool isDifferent) {
     return RoleId.unwrap(a) != RoleId.unwrap(b);
 }
+
+library RoleIdLib {
+    // @dev Converts a role string into a role id.
+    function toRoleId(string memory role) public pure returns (RoleId) {
+        return RoleId.wrap(bytes8(keccak256(abi.encode(role))));
+    }
+}

package/contracts/types/StateId.sol

@@ -5,7 +5,13 @@ pragma solidity ^0.8.19;
 type StateId is uint8;
 
 // type bindings
-using {eqStateId as ==, neStateId as !=, StateIdLib.toInt} for StateId global;
+using {
+    eqStateId as ==, 
+    neStateId as !=, 
+    StateIdLib.eqz,
+    StateIdLib.gtz,
+    StateIdLib.toInt
+} for StateId global;
 
 // general pure free functions
 function APPLIED() pure returns (StateId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-dc7e4cb-141",
+  "version": "0.0.2-de220d6-949",
   "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/IServiceLinked.sol/IServiceLinked.dbg.json

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

package/artifacts/contracts/instance/InstanceBase.sol/InstanceBase.dbg.json

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

package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.dbg.json

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

package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycle.json

@@ -1,134 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "ILifecycle",
-  "sourceName": "contracts/instance/module/lifecycle/ILifecycle.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "ObjectType",
-          "name": "objectType",
-          "type": "uint8"
-        },
-        {
-          "internalType": "StateId",
-          "name": "fromStateId",
-          "type": "uint8"
-        },
-        {
-          "internalType": "StateId",
-          "name": "toStateId",
-          "type": "uint8"
-        }
-      ],
-      "name": "ErrorInvalidStateTransition",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "ObjectType",
-          "name": "objectType",
-          "type": "uint8"
-        }
-      ],
-      "name": "ErrorNoLifecycle",
-      "type": "error"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        },
-        {
-          "indexed": false,
-          "internalType": "StateId",
-          "name": "fromStateId",
-          "type": "uint8"
-        },
-        {
-          "indexed": false,
-          "internalType": "StateId",
-          "name": "toStateId",
-          "type": "uint8"
-        }
-      ],
-      "name": "LogBundleStateChanged",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        },
-        {
-          "indexed": false,
-          "internalType": "ObjectType",
-          "name": "objectType",
-          "type": "uint8"
-        },
-        {
-          "indexed": false,
-          "internalType": "StateId",
-          "name": "fromStateId",
-          "type": "uint8"
-        },
-        {
-          "indexed": false,
-          "internalType": "StateId",
-          "name": "toStateId",
-          "type": "uint8"
-        }
-      ],
-      "name": "LogComponentStateChanged",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        },
-        {
-          "indexed": false,
-          "internalType": "StateId",
-          "name": "fromStateId",
-          "type": "uint8"
-        },
-        {
-          "indexed": false,
-          "internalType": "StateId",
-          "name": "toStateId",
-          "type": "uint8"
-        }
-      ],
-      "name": "LogPolicyStateChanged",
-      "type": "event"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/artifacts/contracts/instance/module/lifecycle/ILifecycle.sol/ILifecycleModule.dbg.json

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

package/artifacts/contracts/instance/module/lifecycle/LifecycleModule.sol/LifecycleModule.dbg.json

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