@etherisc/gif-next 0.0.2-da77c50-824 → 0.0.2-de220d6-949

package/contracts/types/Version.sol

@@ -12,7 +12,6 @@ using {
 
 function versionPartGt(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) > VersionPart.unwrap(b); }
 function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) == VersionPart.unwrap(b); }
-function toVersionPart(uint8 versionPart) pure returns(VersionPart) { return VersionPart.wrap(versionPart); }
 
 library VersionPartLib {
     function toInt(VersionPart x) external pure returns(uint) { return VersionPart.unwrap(x); }
@@ -32,27 +31,6 @@ using {
 function versionGt(Version a, Version b) pure returns(bool isGreaterThan) { return Version.unwrap(a) > Version.unwrap(b); }
 function versionEq(Version a, Version b) pure returns(bool isSame) { return Version.unwrap(a) == Version.unwrap(b); }
 
-function toVersion(
-    VersionPart major,
-    VersionPart minor,
-    VersionPart patch
-)
-    pure
-    returns(Version)
-{
-    uint majorInt = major.toInt();
-    uint minorInt = minor.toInt();
-    uint patchInt = patch.toInt();
-
-    return Version.wrap(
-        uint24(
-            (majorInt << 16) + (minorInt << 8) + patchInt));
-}
-
-function zeroVersion() pure returns(Version) {
-    return toVersion(toVersionPart(0), toVersionPart(0), toVersionPart(0));
-}
-
 library VersionLib {
     function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
 
@@ -83,9 +61,35 @@ library VersionLib {
         uint8 patchInt = uint8(versionInt - (minorInt << 8));
 
         return (
-            toVersionPart(majorInt),
-            toVersionPart(minorInt),
-            toVersionPart(patchInt)
+            VersionPart.wrap(majorInt),
+            VersionPart.wrap(minorInt),
+            VersionPart.wrap(patchInt)
         );
     }
+
+    function toVersionPart(uint256 versionPart) external pure returns(VersionPart) { 
+        return VersionPart.wrap(uint8(versionPart)); 
+    }
+
+    function toVersion(
+        uint256 major,
+        uint256 minor,
+        uint256 patch
+    )
+        external
+        pure
+        returns(Version)
+    {
+        require(
+            major < 256 && minor < 256 && patch < 256,
+            "ERROR:VRS-010:VERSION_PART_TOO_BIG");
+
+        return Version.wrap(
+            uint24(
+                (major << 16) + (minor << 8) + patch));
+    }
+
+    function zeroVersion() external pure returns(Version) {
+        return Version.wrap(0);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-da77c50-824",
+  "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/73036ef8d3587a4d497b53a8e5f6bc33.json"
-}

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

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

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

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../../build-info/73036ef8d3587a4d497b53a8e5f6bc33.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/73036ef8d3587a4d497b53a8e5f6bc33.json"
-}

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

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

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

@@ -1,221 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "LifecycleModule",
-  "sourceName": "contracts/instance/module/lifecycle/LifecycleModule.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    },
-    {
-      "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"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "ObjectType",
-          "name": "objectType",
-          "type": "uint8"
-        },
-        {
-          "internalType": "StateId",
-          "name": "fromId",
-          "type": "uint8"
-        },
-        {
-          "internalType": "StateId",
-          "name": "toId",
-          "type": "uint8"
-        }
-      ],
-      "name": "checkAndLogTransition",
-      "outputs": [
-        {
-          "internalType": "StateId",
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "ObjectType",
-          "name": "objectType",
-          "type": "uint8"
-        }
-      ],
-      "name": "getInitialState",
-      "outputs": [
-        {
-          "internalType": "StateId",
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "ObjectType",
-          "name": "objectType",
-          "type": "uint8"
-        },
-        {
-          "internalType": "StateId",
-          "name": "fromId",
-          "type": "uint8"
-        },
-        {
-          "internalType": "StateId",
-          "name": "toId",
-          "type": "uint8"
-        }
-      ],
-      "name": "isValidTransition",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x608060405234801561001057600080fd5b5061001b6064610049565b6100256078610049565b61002f6082610049565b610037610170565b61003f610315565b610589565b606490565b60ff8116600090815260208181526040808320805460ff191660649081179091556001808452828520918552925282209091610083606e90565b60ff908116825260208083019390935260409182016000908120805460ff19169515159590951790945584168352600191829052822090916100c3606e90565b60ff1660ff16815260200190815260200160002060006100e761004460201b60201c565b60ff908116825260208083019390935260409182016000908120805460ff1916951515959095179094558416835260019182905282209091610127606e90565b60ff1660ff168152602001908152602001600020600061014b61056b60201b60201c565b60ff1681526020810191909152604001600020805460ff191691151591909117905550565b60d2600090815260208190527fc0d27dadfcf8ee0186a0f6fe9b5805a51e99869050491e4a3040efec012a214f805460ff1916606417905560019081906101b560d290565b60ff1660ff16815260200190815260200160002060006101d961004460201b60201c565b60ff1660ff16815260200190815260200160002060006101fd61056660201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061022f60d290565b60ff1660ff168152602001908152602001600020600061025361056660201b60201c565b60ff1660ff168152602001908152602001600020600061027761004460201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906102a960d290565b60ff1660ff16815260200190815260200160002060006102cd61056660201b60201c565b60ff1660ff16815260200190815260200160002060006102f161057060201b60201c565b60ff1681526020810191909152604001600020805460ff1916911515919091179055565b60c8600090815260208190527fc5f2c791ab4e0b1a0b6c600884b07e98575b00ebd7c3166c4272a53bebf71403805460ff1916600a179055600190819061035a60c890565b60ff1660ff168152602001908152602001600020600061037e61057560201b60201c565b60ff1660ff16815260200190815260200160002060006103a261057a60201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906103d460c890565b60ff1660ff16815260200190815260200160002060006103f861057560201b60201c565b60ff1660ff168152602001908152602001600020600061041c61057f60201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061044e60c890565b60ff1660ff168152602001908152602001600020600061047261057560201b60201c565b60ff1660ff168152602001908152602001600020600061049661058460201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906104c860c890565b60ff1660ff16815260200190815260200160002060006104ec61058460201b60201c565b60ff1660ff168152602001908152602001600020600061051061004460201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061054260c890565b60ff1660ff16815260200190815260200160002060006102cd61004460201b60201c565b606e90565b60d290565b60c890565b600a90565b601490565b601e90565b602890565b6103fe806105986000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80630d35818114610046578063a7f3669b14610083578063e9e96c7014610096575b600080fd5b61006c6100543660046102f1565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b61006c610091366004610315565b6100e4565b6100d46100a436600461037d565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b604051901515815260200161007a565b60ff808416600090815260016020908152604080832086851684528252808320858516845290915281205490911661015857604051630cdd837760e21b81526001600160601b038616600482015260ff80861660248301528085166044830152831660648201526084015b60405180910390fd5b61016a8460c85b60ff90811691161490565b156101c557604080516001600160601b038716815260ff80861660208301528416918101919091527f3453c320908f5844705a0f2acbb230412df911a60544eca9236d16f5f9f1f6f6906060015b60405180910390a16102d7565b6101d08460d261015f565b1561022257604080516001600160601b038716815260ff80861660208301528416918101919091527f92e25bf636cb4bfa6edf8b4fa57c0d64b6d959e3c6376d17c9bcc168fe36be19906060016101b8565b61022d84606461015f565b8061023e575061023e84607861015f565b8061024f575061024f84608261015f565b156102aa57604080516001600160601b038716815260ff80871660208301528086169282019290925290831660608201527fcc75054af33cdb7ef0c6dd9d4cb6f22e1dc2d22204db49d769d5da19579fb84e906080016101b8565b60405163024acc7560e21b81526001600160601b038616600482015260ff8516602482015260440161014f565b509392505050565b60ff811681146102ee57600080fd5b50565b60006020828403121561030357600080fd5b813561030e816102df565b9392505050565b6000806000806080858703121561032b57600080fd5b84356001600160601b038116811461034257600080fd5b93506020850135610352816102df565b92506040850135610362816102df565b91506060850135610372816102df565b939692955090935050565b60008060006060848603121561039257600080fd5b833561039d816102df565b925060208401356103ad816102df565b915060408401356103bd816102df565b80915050925092509256fea264697066735822122060dfd5954b95aeca34250b0a85e5d3360807c0d29bb02b37a1414720c566117464736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80630d35818114610046578063a7f3669b14610083578063e9e96c7014610096575b600080fd5b61006c6100543660046102f1565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b61006c610091366004610315565b6100e4565b6100d46100a436600461037d565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b604051901515815260200161007a565b60ff808416600090815260016020908152604080832086851684528252808320858516845290915281205490911661015857604051630cdd837760e21b81526001600160601b038616600482015260ff80861660248301528085166044830152831660648201526084015b60405180910390fd5b61016a8460c85b60ff90811691161490565b156101c557604080516001600160601b038716815260ff80861660208301528416918101919091527f3453c320908f5844705a0f2acbb230412df911a60544eca9236d16f5f9f1f6f6906060015b60405180910390a16102d7565b6101d08460d261015f565b1561022257604080516001600160601b038716815260ff80861660208301528416918101919091527f92e25bf636cb4bfa6edf8b4fa57c0d64b6d959e3c6376d17c9bcc168fe36be19906060016101b8565b61022d84606461015f565b8061023e575061023e84607861015f565b8061024f575061024f84608261015f565b156102aa57604080516001600160601b038716815260ff80871660208301528086169282019290925290831660608201527fcc75054af33cdb7ef0c6dd9d4cb6f22e1dc2d22204db49d769d5da19579fb84e906080016101b8565b60405163024acc7560e21b81526001600160601b038616600482015260ff8516602482015260440161014f565b509392505050565b60ff811681146102ee57600080fd5b50565b60006020828403121561030357600080fd5b813561030e816102df565b9392505050565b6000806000806080858703121561032b57600080fd5b84356001600160601b038116811461034257600080fd5b93506020850135610352816102df565b92506040850135610362816102df565b91506060850135610372816102df565b939692955090935050565b60008060006060848603121561039257600080fd5b833561039d816102df565b925060208401356103ad816102df565b915060408401356103bd816102df565b80915050925092509256fea264697066735822122060dfd5954b95aeca34250b0a85e5d3360807c0d29bb02b37a1414720c566117464736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/artifacts/contracts/instance/module/product/IProductModule.sol/IProductModule.dbg.json

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

package/artifacts/contracts/instance/module/product/ProductModule.sol/ProductModule.dbg.json

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

package/artifacts/contracts/instance/service/ComponentServiceBase.sol/ComponentServiceBase.dbg.json

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

package/artifacts/contracts/instance/service/IService.sol/IService.dbg.json

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

package/artifacts/contracts/instance/service/ServiceBase.sol/ServiceBase.dbg.json

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

package/contracts/instance/IServiceLinked.sol

@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IComponentOwnerService} from "./service/IComponentOwnerService.sol";
-import {IProductService} from "./service/IProductService.sol";
-import {IPoolService} from "./service/IPoolService.sol";
-
-interface IServiceLinked {
-    function getComponentOwnerService() external view returns(IComponentOwnerService service);
-    function getProductService() external view returns(IProductService service);
-    function getPoolService() external view returns(IPoolService service);
-}

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

@@ -1,47 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {ObjectType} from "../../../types/ObjectType.sol";
-import {StateId, toStateId, zeroStateId} from "../../../types/StateId.sol";
-import {NftId} from "../../../types/NftId.sol";
-
-interface ILifecycle {
-    event LogComponentStateChanged(
-        NftId nftId,
-        ObjectType objectType,
-        StateId fromStateId,
-        StateId toStateId
-    );
-    event LogBundleStateChanged(
-        NftId nftId,
-        StateId fromStateId,
-        StateId toStateId
-    );
-    event LogPolicyStateChanged(
-        NftId nftId,
-        StateId fromStateId,
-        StateId toStateId
-    );
-    // event LogClaimStateChanged(NftId nftId, ClaimId claimId, StateId fromStateId, StateId toStateId);
-    // event LogPayoutStateChanged(NftId nftId, ClaimId claimId, PayoutId payoutId, StateId fromStateId, StateId toStateId);
-
-    error ErrorNoLifecycle(NftId nftId, ObjectType objectType);
-    error ErrorInvalidStateTransition(
-        NftId nftId,
-        ObjectType objectType,
-        StateId fromStateId,
-        StateId toStateId
-    );
-}
-
-interface ILifecycleModule is ILifecycle {
-    function getInitialState(
-        ObjectType objectType
-    ) external view returns (StateId);
-
-    function isValidTransition(
-        ObjectType objectType,
-        StateId fromId,
-        StateId toId
-    ) external view returns (bool);
-}

package/contracts/instance/module/product/ProductModule.sol

@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IProductService} from "../../service/IProductService.sol";
-import {IProductModule} from "./IProductModule.sol";
-
-abstract contract ProductModule is IProductModule {
-}