@etherisc/gif-next 0.0.2-ce87da3-250 → 0.0.2-ceb30b2-601

package/README.md

@@ -1,18 +1,6 @@
 # GIF-Next (Generic Insurance Framework, next version)
 
 
-```mermaid
-  graph TD
-      IPoolComponent --> IComponent
-      IComponent --> IRegisterable
-      IComponent --> ITransferInterceptor
-      IRegistryService --> IService
-      IService-->IRegisterable
-      IService-->IVersionable
-      IRegisterable-->INftOwnable
-      INftOwnable-->IERC165
-```
-
 ## Add OpenZeppelin V5 Dependencies
 
 ```shell
@@ -40,6 +28,10 @@ This repository uses submodules. To checkout or update to the latest submodules,
 git submodule update --recursive
 ```
 
+## Example components
+
+A (very early) example of a product and a pool can be found in the [gif-next-sandbox repository](https://github.com/etherisc/gif-next-sandbox). 
+
 ## Hardhat 
 
 ### NPM Commands
@@ -232,17 +224,7 @@ https://book.getfoundry.sh/reference/
 
 ## Style Guide
 
-Solidity code is to be written according to the [Solidity Style Guide](https://docs.soliditylang.org/en/latest/style-guide.html).
-
-Documentation of the code should be written inline using [NatSpec](https://docs.soliditylang.org/en/latest/natspec-format.html).
-
-### Naming conventions
-
-Additionally, we use the following naming conventions:
-
-- Function arguments and return types: If using custom data types, make the name include the type by appending the Type to the argument name, e.g. `function getInfo(NftId bundleNftId)` instead of `function getInfo(NftId bundleId)`. Background: Custom data types are lost when using the ABI or Typescript binding classes (e.g. instead of `NftID` a `uint96` is used), so the type needs to be included in the name to make it clear what the argument is without having to look at the documentation or checking the solidity source code. 
-- When naming a field or an attribute `id` and the context is not clear, call it `nftId` instead so its clear what type if id it is as there will be multiple ids for different kind of objects. Example: if you the function has a bundle nft id and a policy nft id as arguments, call them `bundleNftId` and `policyNftId` instead of `id` and `policyId`. In case of doubt, be a bit more verbose for the sake of clarity. 
-- When naming things, remember that the code will likely be used in Javascript/Typescript as well, so avoid names that are reserved in Javascript/Typescript. A list of reserved words in Javascript can be found [here](https://www.w3schools.com/js/js_reserved.asp) and a list of reserved words in Typescript can be found [here](https://www.tektutorialshub.com/typescript/identifiers-keywords-in-typescript/). 
+Please see https://docs.etherisc.com/gif-next/3.x/ for style guide and general coding rules. 
 
 ### Automatic code formatting
 
@@ -257,7 +239,7 @@ We use solhint to lint the code.
 To execute linting run `npm run lint`.
 
 
-### Adding Brownie (Legacy)
+### Adding Brownie (Legacy - don't do that :wink: )
 
 python3 is already installed
 
@@ -405,65 +387,6 @@ Intercepting property
 
 ### Product
 
-### Payout Handling
-
-Pool specifies **retention level**.
-Retention level defines up to which percentage of the sum insured the pool is payout out using its own/current funds.
-Depending on the amount of a new payout the poolService decides to either execute the payout directly or to add the payout as a pending payout with a notification of the pool.
-
-The sequence below sketches the small payout flow (payout < retention amount)
-- retention level: 30%
-- sum insured: 1000
-- payout: 200
-
-```mermaid
-sequenceDiagram
-  participant customer
-  participant product
-  participant claimService
-  participant poolService
-  participant pool
-  product->>claimService: createPayout()
-  claimService ->> poolService: requestPayout()
-  poolService -->> pool: verifyPayout() *
-  poolService ->> poolService: processPayout()
-  poolService ->> customer: transfer token for payout
-  poolService ->> claimService: payoutExecuted()
-  poolService -->> customer: payoutExecutedCallback() **
-```
-
-*: if pool is configured to verify payouts before execution
-
-**: callback only if customer is contract (IPolicyHolder)
-
-The sequence below sketches the call flow for payouts larger than the retention amount
-- retention level: 30%
-- sum insured: 1000
-- payout: 500
-  * locally available: 300
-  * via policy (re-insurance): 200
-
-```mermaid
-sequenceDiagram 
-  participant customer
-  participant product
-  participant claimService
-  participant poolService
-  participant pool
-  pool ->> reinsuranceProduct: applyForPolicy()
-  product->>claimService: createPayout()
-  claimService ->> poolService: requestPayout()
-  poolService ->> pool: pendingPayoutAdded()
-  pool ->> pool: getReinsurancePolicy()
-  pool ->> reinsuranceProduct: claim()
-  reinsuranceProduct -->> reinsurancePool: createPayout
-  reinsurancePool ->> pool: transfer token for payout
-  reinsurancePool ->> pool: payoutExecutedCallback()
-  pool ->> poolService: processPendingPayout()
-  poolService ->> customer: transfer token for payout
-  poolService ->> claimService: payoutExecuted()
-```
-
 ### Pool
 
 ### Distribution

package/artifacts/contracts/components/Component.sol/Component.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/411935aa5ced2268e7cc8aae71d3a605.json"
+  "buildInfo": "../../../build-info/37452893015e5bf83358929bf7a72a5c.json"
 }

package/artifacts/contracts/components/Component.sol/Component.json

@@ -80,11 +80,6 @@
           "internalType": "NftId",
           "name": "instanceNftId",
           "type": "uint96"
-        },
-        {
-          "internalType": "address",
-          "name": "instance",
-          "type": "address"
         }
       ],
       "name": "ErrorComponentNotInstance",
@@ -107,29 +102,7 @@
       "type": "error"
     },
     {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "caller",
-          "type": "address"
-        },
-        {
-          "internalType": "uint64",
-          "name": "requiredRoleIdNum",
-          "type": "uint64"
-        }
-      ],
-      "name": "ErrorComponentUnauthorized",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "newWallet",
-          "type": "address"
-        }
-      ],
+      "inputs": [],
       "name": "ErrorComponentWalletAddressIsSameAsCurrent",
       "type": "error"
     },
@@ -268,6 +241,12 @@
     {
       "anonymous": false,
       "inputs": [
+        {
+          "indexed": false,
+          "internalType": "address",
+          "name": "oldWallet",
+          "type": "address"
+        },
         {
           "indexed": false,
           "internalType": "address",
@@ -305,7 +284,7 @@
     },
     {
       "inputs": [],
-      "name": "CONTRACT_LOCATION_V1",
+      "name": "COMPONENT_LOCATION_V1",
       "outputs": [
         {
           "internalType": "bytes32",
@@ -355,6 +334,56 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "getComponentInfo",
+      "outputs": [
+        {
+          "components": [
+            {
+              "internalType": "string",
+              "name": "name",
+              "type": "string"
+            },
+            {
+              "internalType": "contract IERC20Metadata",
+              "name": "token",
+              "type": "address"
+            },
+            {
+              "internalType": "contract TokenHandler",
+              "name": "tokenHandler",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "wallet",
+              "type": "address"
+            },
+            {
+              "internalType": "Amount",
+              "name": "balanceAmount",
+              "type": "uint96"
+            },
+            {
+              "internalType": "Amount",
+              "name": "feeAmount",
+              "type": "uint96"
+            },
+            {
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct IComponents.ComponentInfo",
+          "name": "info",
+          "type": "tuple"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getInitialInfo",
@@ -418,32 +447,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "getInstanceReader",
-      "outputs": [
-        {
-          "internalType": "contract InstanceReader",
-          "name": "reader",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getInstanceService",
-      "outputs": [
-        {
-          "internalType": "contract IInstanceService",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getName",
@@ -496,19 +499,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "getProductService",
-      "outputs": [
-        {
-          "internalType": "contract IProductService",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getRegistry",
@@ -522,38 +512,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "getRegistryAddress",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "ObjectType",
-          "name": "domain",
-          "type": "uint8"
-        }
-      ],
-      "name": "getServiceAddress",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "service",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getToken",
@@ -619,7 +577,7 @@
         },
         {
           "internalType": "bytes",
-          "name": "data",
+          "name": "registryData",
           "type": "bytes"
         }
       ],
@@ -682,7 +640,7 @@
         },
         {
           "internalType": "bytes",
-          "name": "data",
+          "name": "registryData",
           "type": "bytes"
         }
       ],
@@ -744,6 +702,24 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "tokenId",
+          "type": "uint256"
+        }
+      ],
+      "name": "nftMint",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {

package/artifacts/contracts/components/Distribution.sol/Distribution.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/411935aa5ced2268e7cc8aae71d3a605.json"
+  "buildInfo": "../../../build-info/37452893015e5bf83358929bf7a72a5c.json"
 }