@etherisc/gif-next 0.0.2-96853ac-143 → 0.0.2-9b434da-265

package/README.md

@@ -1,5 +1,24 @@
 # gif-next (Generic Insurance Framework next version)
 
+## Add OpenZeppelin V5 Dependencies
+
+```shell
+forge install openzeppelin-contracts-500=OpenZeppelin/openzeppelin-contracts@v5.0.0
+cd cd lib/openzeppelin-contracts-500
+git checkout tags/v5.0.0
+cd ../..
+```
+
+See `remappings.txt` to see how to work with different OpenZeppelin versions in parallel
+
+```
+cat remappings.txt 
+@openzeppelin5/contracts/=lib/openzeppelin-contracts-500/contracts/
+@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
+@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
+```
+
+
 ## Submodules checkout
 
 This repository uses submodules. To checkout or update to the latest submodules, run the following command after updating to any revision (or checking out the repository)
@@ -23,15 +42,33 @@ npm run coverage
 
 ### Deployment 
 
+Install the dependencies before running the script below for the first time.
+
+```bash
+npm install
 ```
-hh run --network <networkname> scripts/deploy.ts
+
+The deploy script will deploy all required contracts and create a test instance with a test product and a test pool. 
+
+```bash
+# run deployment on a locally created ganache instance
+export SKIP_VERIFICATION=true
+hh run scripts/deploy_all.ts
 ```
 
-Networks:
-- hardhat (dynamically created network - https://hardhat.org/hardhat-network/docs/overview)
-- anvil (anvsil chain running in container next when using devcontainer)
-- mumbai (polygon testnet, requires WEB3_INFURA_PROJECT_ID)
-- mainnet (polygon mainnet, requires WEB3_INFURA_PROJECT_ID)
+```bash
+# set appropriate values vor env variables (see below)
+
+# run deployment on another network
+hh run --network <networkname> scripts/deploy_all.ts
+```
+
+Environment variables:
+
+- `SKIP_VERIFICATION` set to `true` to skip etherscan verification (required for ganacht and anvil)
+- `WEB3_INFURA_PROJECT_ID` set to infura project id (required for mumbai and mainnet)
+- `WALLET_MNEMONIC` the mnemonic of the wallet to use for deployment (required for mumbai and mainnet)
+- `ETHERSCAN_API_KEY` `POLYGONSCAN_API_KEY` the api key for etherscan/polygonscan (required for mumbai and mainnet)
 
 
 ### Console
@@ -56,6 +93,9 @@ https://hardhat.org/hardhat-runner/docs/guides/compile-contracts
 ```shell
 forge build
 
+# contract sizes
+forge build --sizes | grep Instance
+
 forge test
 
 # run single test case
@@ -127,7 +167,17 @@ uint256 lifetime =365*24*3600;
 uint256 policyNftId = ps.createApplicationForBundle(customer, bundleNftId, sumInsuredAmount, premiumAmount, lifetime);
 
 ```
+### Library Linking
+
+https://ethereum.stackexchange.com/questions/153411/does-foundry-support-dynamical-library-linking-in-solidity
 
+```toml
+# foundry.toml
+
+[profile.default]
+  # expected format(example below): libraries = ["<path>:<lib name>:<address>"]
+  libraries = ["src/libraries/MyLibrary.sol:MyLibrary:0x..."]
+```
 
 ### Documentation
 
@@ -158,3 +208,107 @@ To execute formatting run `npm run styleFix`.
 
 We use solhint to lint the code.
 To execute linting run `npm run lint`.
+
+
+### Adding Brownie (Legacy)
+
+python3 is already installed
+
+```bash
+npm install -g ganache
+sudo apt update
+sudo apt install python3-pip
+pip install eth-brownie
+brownie pm install OpenZeppelin/openzeppelin-contracts@4.9.3
+brownie pm install OpenZeppelin/openzeppelin-contracts@5.0.0
+```
+
+```bash
+brownie compile --all
+brownie console
+```
+
+```python
+registry_owner = accounts[0]
+instance_owner = accounts[1]
+product_owner = accounts[2]
+
+# deploy libs and helper contracts
+nft_id_lib = NftIdLib.deploy({'from': registry_owner})
+ufixed_math_lib = UFixedMathLib.deploy({'from': registry_owner})
+test_fee = TestFee.deploy({'from': registry_owner})
+
+# deploy registry and a token
+registry = Registry.deploy({'from': registry_owner})
+nft = ChainNft.deploy(registry, {'from': registry_owner})
+registry.initialize(nft,  {'from': registry_owner})
+token = TestUsdc.deploy({'from': registry_owner})
+
+# deploy services
+component_owner_service = ComponentOwnerService.deploy(registry, {'from': registry_owner})
+product_service = ProductService.deploy(registry, {'from': registry_owner})
+
+# deploy an instance
+instance = Instance.deploy(registry, component_owner_service, product_service, {'from': instance_owner})
+
+# deploy product
+pool = TestPool.deploy(registry, instance, token, {'from': product_owner})
+policy_fee = test_fee.createFee(1, -1, 0)
+product = TestProduct.deploy(registry, instance, token, pool, policy_fee, {'from': product_owner})
+
+# grant roles
+pool_owner_role = instance.getRoleForName("PoolOwner")
+product_owner_role = instance.getRoleForName("ProductOwner")
+instance.grantRole(pool_owner_role, product_owner, {'from': instance_owner})
+instance.grantRole(product_owner_role, product_owner, {'from': instance_owner})
+
+# register objects
+instance.register()
+component_owner_service.register(pool, {'from': product_owner})
+component_owner_service.register(product, {'from': product_owner})
+
+instance_id = instance.getNftId()
+pool_id = pool.getNftId()
+product_id = product.getNftId()
+```
+
+## Registry and Services
+
+### Principles
+
+- 1 service per object type and major version
+- registry service guards write access to registry
+- all other objects registered via registry service
+- root object for the complete tree is the protocol object
+- under the root object a single registry object is registered (= global registry/ethereum mainnet)
+
+
+### Service Responsibilities
+
+Registry Service
+
+- deployed and registered during bootstrapping of registry
+- used to register tokens and other services by registry owner
+- an object may only be registered by the service designated by the type of the object
+- to register an object the parent object needs already be registered
+- the type of the object to be registered needs to match a valid child type/parent type combination
+
+Instance Service
+
+- deploys master instance during its own bootstrapping (if allowed by contract size)
+- registered via registry service by registry owner
+- registeres master instance during its own registration by regsitry owner
+- deploys and registeres new instances (= instance factory) by instance owner (instance owner is a permissionless role, anybody may creates a new instance)
+- provides upgrade functionality to instance owners
+
+Product Service
+
+- registered via registry service by registry owner
+- registers products for registered instances via registry service by product owner (product owner role is permissend by the product's instance)
+- registers applications/policies for registered products via registry service
+
+Distribution Service
+
+- registered via registry service by registry owner
+- registers distribution components for registered products via registry service by distribution owner (distribution owner role is permissend by the product's instance)
+- registers distributors for registered distribution components via registry service

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

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

package/artifacts/contracts/components/{IPool.sol/IPoolComponent.json → IBaseComponent.sol/IBaseComponent.json}

@@ -1,131 +1,128 @@
 {
   "_format": "hh-sol-artifact-1",
-  "contractName": "IPoolComponent",
-  "sourceName": "contracts/components/IPool.sol",
+  "contractName": "IBaseComponent",
+  "sourceName": "contracts/components/IBaseComponent.sol",
   "abi": [
     {
-      "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        },
-        {
-          "indexed": false,
           "internalType": "address",
-          "name": "module",
+          "name": "registry",
           "type": "address"
         },
         {
-          "indexed": false,
-          "internalType": "string",
-          "name": "comment",
-          "type": "string"
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
         }
       ],
-      "name": "LogDebug",
-      "type": "event"
+      "name": "ErrorAlreadyLinked",
+      "type": "error"
     },
     {
-      "inputs": [],
-      "name": "getData",
-      "outputs": [
+      "inputs": [
         {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
+          "internalType": "address",
+          "name": "contractAddress",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorContractNotRegistered",
+      "type": "error"
     },
     {
-      "inputs": [],
-      "name": "getInitialOwner",
-      "outputs": [
+      "inputs": [
         {
           "internalType": "address",
-          "name": "initialOwner",
+          "name": "account",
           "type": "address"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorNotOwner",
+      "type": "error"
     },
     {
-      "inputs": [],
-      "name": "getInstance",
-      "outputs": [
+      "inputs": [
         {
-          "internalType": "contract IInstance",
-          "name": "instance",
+          "internalType": "address",
+          "name": "registryAddress",
           "type": "address"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorNotRegistry",
+      "type": "error"
     },
     {
       "inputs": [],
-      "name": "getNftId",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorRegistryAddressZero",
+      "type": "error"
     },
     {
-      "inputs": [],
-      "name": "getOwner",
-      "outputs": [
+      "inputs": [
         {
           "internalType": "address",
-          "name": "owner",
+          "name": "registry",
           "type": "address"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorRegistryAlreadyInitialized",
+      "type": "error"
     },
     {
       "inputs": [],
-      "name": "getParentNftId",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "parentNftId",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorRegistryNotInitialized",
+      "type": "error"
     },
     {
       "inputs": [],
-      "name": "getPerformanceFee",
+      "name": "getInitialInfo",
       "outputs": [
         {
           "components": [
             {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
+              "internalType": "NftId",
+              "name": "nftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "NftId",
+              "name": "parentNftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "ObjectType",
+              "name": "objectType",
+              "type": "uint8"
+            },
+            {
+              "internalType": "bool",
+              "name": "isInterceptor",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "objectAddress",
+              "type": "address"
             },
             {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
+              "internalType": "address",
+              "name": "initialOwner",
+              "type": "address"
+            },
+            {
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
             }
           ],
-          "internalType": "struct Fee",
-          "name": "performanceFee",
+          "internalType": "struct IRegistry.ObjectInfo",
+          "name": "",
           "type": "tuple"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
         }
       ],
       "stateMutability": "view",
@@ -133,12 +130,12 @@
     },
     {
       "inputs": [],
-      "name": "getRegistry",
+      "name": "getNftId",
       "outputs": [
         {
-          "internalType": "contract IRegistry",
-          "name": "registry",
-          "type": "address"
+          "internalType": "NftId",
+          "name": "",
+          "type": "uint96"
         }
       ],
       "stateMutability": "view",
@@ -146,24 +143,12 @@
     },
     {
       "inputs": [],
-      "name": "getStakingFee",
+      "name": "getOwner",
       "outputs": [
         {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "stakingFee",
-          "type": "tuple"
+          "internalType": "address",
+          "name": "",
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -171,11 +156,11 @@
     },
     {
       "inputs": [],
-      "name": "getToken",
+      "name": "getRegistry",
       "outputs": [
         {
-          "internalType": "contract IERC20Metadata",
-          "name": "token",
+          "internalType": "contract IRegistry",
+          "name": "",
           "type": "address"
         }
       ],
@@ -184,12 +169,12 @@
     },
     {
       "inputs": [],
-      "name": "getType",
+      "name": "getToken",
       "outputs": [
         {
-          "internalType": "ObjectType",
-          "name": "objectType",
-          "type": "uint8"
+          "internalType": "contract IERC20Metadata",
+          "name": "token",
+          "type": "address"
         }
       ],
       "stateMutability": "view",
@@ -210,20 +195,27 @@
     },
     {
       "inputs": [],
-      "name": "isRegisterable",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "pure",
+      "name": "linkToRegisteredNftId",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "isRegistered",
+      "name": "lock",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
+        }
+      ],
+      "name": "supportsInterface",
       "outputs": [
         {
           "internalType": "bool",
@@ -236,14 +228,8 @@
     },
     {
       "inputs": [],
-      "name": "register",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
+      "name": "unlock",
+      "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     }

package/artifacts/contracts/experiment/errors/Require.sol/Require.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/errors/Revert.sol/Revert.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/inheritance/A.sol/A.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/inheritance/A.sol/AShared.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/inheritance/B.sol/B.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/inheritance/C.sol/C.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/inheritance/IA.sol/IA.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/inheritance/IA.sol/ISharedA.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/inheritance/IB.sol/IB.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/inheritance/IC.sol/IC.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/statemachine/Dummy.sol/LifeCycleModule.json

@@ -52,8 +52,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5061017d806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80630d3581811461003b578063e9e96c7014610078575b600080fd5b6100616100493660046100d8565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100b66100863660046100fc565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b604051901515815260200161006f565b60ff811681146100d557600080fd5b50565b6000602082840312156100ea57600080fd5b81356100f5816100c6565b9392505050565b60008060006060848603121561011157600080fd5b833561011c816100c6565b9250602084013561012c816100c6565b9150604084013561013c816100c6565b80915050925092509256fea2646970667358221220114e4022de0c5b9e5bf7c8cc9ef601c69169a67052f43ab5c4cc86981fd4e17864736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80630d3581811461003b578063e9e96c7014610078575b600080fd5b6100616100493660046100d8565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100b66100863660046100fc565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b604051901515815260200161006f565b60ff811681146100d557600080fd5b50565b6000602082840312156100ea57600080fd5b81356100f5816100c6565b9392505050565b60008060006060848603121561011157600080fd5b833561011c816100c6565b9250602084013561012c816100c6565b9150604084013561013c816100c6565b80915050925092509256fea2646970667358221220114e4022de0c5b9e5bf7c8cc9ef601c69169a67052f43ab5c4cc86981fd4e17864736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b5061017d806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80630d3581811461003b578063e9e96c7014610078575b600080fd5b6100616100493660046100d8565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100b66100863660046100fc565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b604051901515815260200161006f565b60ff811681146100d557600080fd5b50565b6000602082840312156100ea57600080fd5b81356100f5816100c6565b9392505050565b60008060006060848603121561011157600080fd5b833561011c816100c6565b9250602084013561012c816100c6565b9150604084013561013c816100c6565b80915050925092509256fea264697066735822122062ef0aa4d5e2eb1c904112844cb41fccb5ebdae3ba5778f8135b583691bf97e864736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80630d3581811461003b578063e9e96c7014610078575b600080fd5b6100616100493660046100d8565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100b66100863660046100fc565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b604051901515815260200161006f565b60ff811681146100d557600080fd5b50565b6000602082840312156100ea57600080fd5b81356100f5816100c6565b9392505050565b60008060006060848603121561011157600080fd5b833561011c816100c6565b9250602084013561012c816100c6565b9150604084013561013c816100c6565b80915050925092509256fea264697066735822122062ef0aa4d5e2eb1c904112844cb41fccb5ebdae3ba5778f8135b583691bf97e864736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/experiment/statemachine/ISM.sol/ISM.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/statemachine/ISM.sol/ISMEE.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

package/artifacts/contracts/experiment/statemachine/SM.sol/SM.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../../build-info/51da3314bcd43783ab6075e6d9cf96f5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }