@etherisc/gif-next 0.0.2-a4b0112-987 → 0.0.2-a6f9f86-582

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/ddbd31d07c8880f0f0a18b3f2b9bcc56.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

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

@@ -98,8 +98,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50602a60008190555061040f806100286000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806342bf62e0146100465780638db581aa1461007657806394977ddd146100a6575b600080fd5b610060600480360381019061005b91906101fb565b6100d6565b60405161006d9190610243565b60405180910390f35b610090600480360381019061008b91906101fb565b610124565b60405161009d9190610243565b60405180910390f35b6100c060048036038101906100bb91906101fb565b610172565b6040516100cd9190610243565b60405180910390f35b60008054821161011b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610112906102bb565b60405180910390fd5b60019050919050565b600080548211610169576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161016090610327565b60405180910390fd5b60019050919050565b6000805482116101b7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101ae906103b9565b60405180910390fd5b60019050919050565b600080fd5b6000819050919050565b6101d8816101c5565b81146101e357600080fd5b50565b6000813590506101f5816101cf565b92915050565b600060208284031215610211576102106101c0565b5b600061021f848285016101e6565b91505092915050565b60008115159050919050565b61023d81610228565b82525050565b60006020820190506102586000830184610234565b92915050565b600082825260208201905092915050565b7f4552524f523a4142432d3030323a415f49535f534d414c4c4552000000000000600082015250565b60006102a5601a8361025e565b91506102b08261026f565b602082019050919050565b600060208201905081810360008301526102d481610298565b9050919050565b7f4552524f523a4142432d30303100000000000000000000000000000000000000600082015250565b6000610311600d8361025e565b915061031c826102db565b602082019050919050565b6000602082019050818103600083015261034081610304565b9050919050565b7f4552524f523a4142432d3030333a415f49535f534d414c4c45525f5448414e5f60008201527f4200000000000000000000000000000000000000000000000000000000000000602082015250565b60006103a360218361025e565b91506103ae82610347565b604082019050919050565b600060208201905081810360008301526103d281610396565b905091905056fea26469706673582212207f10bf5c332235128519fa30412afeef48946f8606b398b2fed02edcd66fa75164736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806342bf62e0146100465780638db581aa1461007657806394977ddd146100a6575b600080fd5b610060600480360381019061005b91906101fb565b6100d6565b60405161006d9190610243565b60405180910390f35b610090600480360381019061008b91906101fb565b610124565b60405161009d9190610243565b60405180910390f35b6100c060048036038101906100bb91906101fb565b610172565b6040516100cd9190610243565b60405180910390f35b60008054821161011b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610112906102bb565b60405180910390fd5b60019050919050565b600080548211610169576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161016090610327565b60405180910390fd5b60019050919050565b6000805482116101b7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101ae906103b9565b60405180910390fd5b60019050919050565b600080fd5b6000819050919050565b6101d8816101c5565b81146101e357600080fd5b50565b6000813590506101f5816101cf565b92915050565b600060208284031215610211576102106101c0565b5b600061021f848285016101e6565b91505092915050565b60008115159050919050565b61023d81610228565b82525050565b60006020820190506102586000830184610234565b92915050565b600082825260208201905092915050565b7f4552524f523a4142432d3030323a415f49535f534d414c4c4552000000000000600082015250565b60006102a5601a8361025e565b91506102b08261026f565b602082019050919050565b600060208201905081810360008301526102d481610298565b9050919050565b7f4552524f523a4142432d30303100000000000000000000000000000000000000600082015250565b6000610311600d8361025e565b915061031c826102db565b602082019050919050565b6000602082019050818103600083015261034081610304565b9050919050565b7f4552524f523a4142432d3030333a415f49535f534d414c4c45525f5448414e5f60008201527f4200000000000000000000000000000000000000000000000000000000000000602082015250565b60006103a360218361025e565b91506103ae82610347565b604082019050919050565b600060208201905081810360008301526103d281610396565b905091905056fea26469706673582212207f10bf5c332235128519fa30412afeef48946f8606b398b2fed02edcd66fa75164736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50602a6000556101df806100256000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806342bf62e0146100465780638db581aa1461006d57806394977ddd14610080575b600080fd5b610059610054366004610190565b610093565b604051901515815260200160405180910390f35b61005961007b366004610190565b6100f2565b61005961008e366004610190565b610134565b6000805482116100ea5760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a4142432d3030323a415f49535f534d414c4c455200000000000060448201526064015b60405180910390fd5b506001919050565b6000805482116100ea5760405162461bcd60e51b815260206004820152600d60248201526c4552524f523a4142432d30303160981b60448201526064016100e1565b6000805482116100ea5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a4142432d3030333a415f49535f534d414c4c45525f5448414e5f6044820152602160f91b60648201526084016100e1565b6000602082840312156101a257600080fd5b503591905056fea2646970667358221220572bbc4b1e30046ddb065771b03fa96e34255214cd346e350172d87d56991ba064736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806342bf62e0146100465780638db581aa1461006d57806394977ddd14610080575b600080fd5b610059610054366004610190565b610093565b604051901515815260200160405180910390f35b61005961007b366004610190565b6100f2565b61005961008e366004610190565b610134565b6000805482116100ea5760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a4142432d3030323a415f49535f534d414c4c455200000000000060448201526064015b60405180910390fd5b506001919050565b6000805482116100ea5760405162461bcd60e51b815260206004820152600d60248201526c4552524f523a4142432d30303160981b60448201526064016100e1565b6000805482116100ea5760405162461bcd60e51b815260206004820152602160248201527f4552524f523a4142432d3030333a415f49535f534d414c4c45525f5448414e5f6044820152602160f91b60648201526084016100e1565b6000602082840312156101a257600080fd5b503591905056fea2646970667358221220572bbc4b1e30046ddb065771b03fa96e34255214cd346e350172d87d56991ba064736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

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

@@ -98,8 +98,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50602a6000819055506102e6806100286000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806312eee592146100465780638997f3ee14610076578063d0e7624f146100a6575b600080fd5b610060600480360381019061005b91906101fa565b6100d6565b60405161006d9190610242565b60405180910390f35b610090600480360381019061008b91906101fa565b61012a565b60405161009d9190610242565b60405180910390f35b6100c060048036038101906100bb91906101fa565b61017a565b6040516100cd9190610242565b60405180910390f35b60008054821161012157816000546040517fb0d3ec1d00000000000000000000000000000000000000000000000000000000815260040161011892919061026c565b60405180910390fd5b60019050919050565b60008054821161017157816040517f27e078bc0000000000000000000000000000000000000000000000000000000081526004016101689190610295565b60405180910390fd5b60019050919050565b6000805482116101b6576040517f359a43a800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60019050919050565b600080fd5b6000819050919050565b6101d7816101c4565b81146101e257600080fd5b50565b6000813590506101f4816101ce565b92915050565b6000602082840312156102105761020f6101bf565b5b600061021e848285016101e5565b91505092915050565b60008115159050919050565b61023c81610227565b82525050565b60006020820190506102576000830184610233565b92915050565b610266816101c4565b82525050565b6000604082019050610281600083018561025d565b61028e602083018461025d565b9392505050565b60006020820190506102aa600083018461025d565b9291505056fea2646970667358221220a7128053515b503c86f1b60e9db1d8c60a71200b780d3d24fb0040141e911bbe64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806312eee592146100465780638997f3ee14610076578063d0e7624f146100a6575b600080fd5b610060600480360381019061005b91906101fa565b6100d6565b60405161006d9190610242565b60405180910390f35b610090600480360381019061008b91906101fa565b61012a565b60405161009d9190610242565b60405180910390f35b6100c060048036038101906100bb91906101fa565b61017a565b6040516100cd9190610242565b60405180910390f35b60008054821161012157816000546040517fb0d3ec1d00000000000000000000000000000000000000000000000000000000815260040161011892919061026c565b60405180910390fd5b60019050919050565b60008054821161017157816040517f27e078bc0000000000000000000000000000000000000000000000000000000081526004016101689190610295565b60405180910390fd5b60019050919050565b6000805482116101b6576040517f359a43a800000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60019050919050565b600080fd5b6000819050919050565b6101d7816101c4565b81146101e257600080fd5b50565b6000813590506101f4816101ce565b92915050565b6000602082840312156102105761020f6101bf565b5b600061021e848285016101e5565b91505092915050565b60008115159050919050565b61023c81610227565b82525050565b60006020820190506102576000830184610233565b92915050565b610266816101c4565b82525050565b6000604082019050610281600083018561025d565b61028e602083018461025d565b9392505050565b60006020820190506102aa600083018461025d565b9291505056fea2646970667358221220a7128053515b503c86f1b60e9db1d8c60a71200b780d3d24fb0040141e911bbe64736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50602a60005561016d806100256000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806312eee592146100465780638997f3ee1461006d578063d0e7624f14610080575b600080fd5b61005961005436600461011e565b610093565b604051901515815260200160405180910390f35b61005961007b36600461011e565b6100d5565b61005961008e36600461011e565b6100fb565b6000805482116100cd5760005460405163b0d3ec1d60e01b81526100c4918491600401918252602082015260400190565b60405180910390fd5b506001919050565b6000805482116100cd576040516309f81e2f60e21b8152600481018390526024016100c4565b6000805482116100cd576040516306b3487560e31b815260040160405180910390fd5b60006020828403121561013057600080fd5b503591905056fea2646970667358221220971ee831490ff41fe8f688c6304beb1d7f3abc7460ef1bce5fe4620a30a6068364736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c806312eee592146100465780638997f3ee1461006d578063d0e7624f14610080575b600080fd5b61005961005436600461011e565b610093565b604051901515815260200160405180910390f35b61005961007b36600461011e565b6100d5565b61005961008e36600461011e565b6100fb565b6000805482116100cd5760005460405163b0d3ec1d60e01b81526100c4918491600401918252602082015260400190565b60405180910390fd5b506001919050565b6000805482116100cd576040516309f81e2f60e21b8152600481018390526024016100c4565b6000805482116100cd576040516306b3487560e31b815260040160405180910390fd5b60006020828403121561013057600080fd5b503591905056fea2646970667358221220971ee831490ff41fe8f688c6304beb1d7f3abc7460ef1bce5fe4620a30a6068364736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

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

@@ -121,8 +121,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50602a600081905550600180819055506002808190555061044c806100366000396000f3fe608060405234801561001057600080fd5b50600436106100935760003560e01c8063d46300fd11610066578063d46300fd1461010e578063d4febc861461012c578063e2c11f201461014a578063ee919d5014610168578063eeb4914e1461018457610093565b806309cdcf9b14610098578063a1c51915146100b4578063a2375d1e146100d2578063b9c23ae9146100f0575b600080fd5b6100b260048036038101906100ad919061037d565b6101a0565b005b6100bc6101aa565b6040516100c991906103b9565b60405180910390f35b6100da6101b4565b6040516100e791906103b9565b60405180910390f35b6100f86101be565b60405161010591906103b9565b60405180910390f35b610116610239565b60405161012391906103b9565b60405180910390f35b610134610242565b60405161014191906103b9565b60405180910390f35b6101526102b8565b60405161015f91906103b9565b60405180910390f35b610182600480360381019061017d919061037d565b61032e565b005b61019e6004803603810190610199919061037d565b610338565b005b8060018190555050565b6000600154905090565b6000600254905090565b6000803090508073ffffffffffffffffffffffffffffffffffffffff1663a1c519156040518163ffffffff1660e01b8152600401602060405180830381865afa15801561020f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023391906103e9565b91505090565b60008054905090565b60003073ffffffffffffffffffffffffffffffffffffffff1663d46300fd6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561028f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102b391906103e9565b905090565b60003073ffffffffffffffffffffffffffffffffffffffff1663d46300fd6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610305573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061032991906103e9565b905090565b8060008190555050565b8060028190555050565b600080fd5b6000819050919050565b61035a81610347565b811461036557600080fd5b50565b60008135905061037781610351565b92915050565b60006020828403121561039357610392610342565b5b60006103a184828501610368565b91505092915050565b6103b381610347565b82525050565b60006020820190506103ce60008301846103aa565b92915050565b6000815190506103e381610351565b92915050565b6000602082840312156103ff576103fe610342565b5b600061040d848285016103d4565b9150509291505056fea26469706673582212200822a5cd261bc2a17ee561c10fa83cacacfba7e669da775b3aa60003d8f9ffb764736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100935760003560e01c8063d46300fd11610066578063d46300fd1461010e578063d4febc861461012c578063e2c11f201461014a578063ee919d5014610168578063eeb4914e1461018457610093565b806309cdcf9b14610098578063a1c51915146100b4578063a2375d1e146100d2578063b9c23ae9146100f0575b600080fd5b6100b260048036038101906100ad919061037d565b6101a0565b005b6100bc6101aa565b6040516100c991906103b9565b60405180910390f35b6100da6101b4565b6040516100e791906103b9565b60405180910390f35b6100f86101be565b60405161010591906103b9565b60405180910390f35b610116610239565b60405161012391906103b9565b60405180910390f35b610134610242565b60405161014191906103b9565b60405180910390f35b6101526102b8565b60405161015f91906103b9565b60405180910390f35b610182600480360381019061017d919061037d565b61032e565b005b61019e6004803603810190610199919061037d565b610338565b005b8060018190555050565b6000600154905090565b6000600254905090565b6000803090508073ffffffffffffffffffffffffffffffffffffffff1663a1c519156040518163ffffffff1660e01b8152600401602060405180830381865afa15801561020f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023391906103e9565b91505090565b60008054905090565b60003073ffffffffffffffffffffffffffffffffffffffff1663d46300fd6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561028f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102b391906103e9565b905090565b60003073ffffffffffffffffffffffffffffffffffffffff1663d46300fd6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610305573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061032991906103e9565b905090565b8060008190555050565b8060028190555050565b600080fd5b6000819050919050565b61035a81610347565b811461036557600080fd5b50565b60008135905061037781610351565b92915050565b60006020828403121561039357610392610342565b5b60006103a184828501610368565b91505092915050565b6103b381610347565b82525050565b60006020820190506103ce60008301846103aa565b92915050565b6000815190506103e381610351565b92915050565b6000602082840312156103ff576103fe610342565b5b600061040d848285016103d4565b9150509291505056fea26469706673582212200822a5cd261bc2a17ee561c10fa83cacacfba7e669da775b3aa60003d8f9ffb764736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50602a60005560018055600280556102488061002d6000396000f3fe608060405234801561001057600080fd5b50600436106100935760003560e01c8063d46300fd11610066578063d46300fd146100d3578063d4febc86146100db578063e2c11f20146100db578063ee919d50146100e3578063eeb4914e146100f657600080fd5b806309cdcf9b14610098578063a1c51915146100ad578063a2375d1e146100c3578063b9c23ae9146100cb575b600080fd5b6100ab6100a63660046101e0565b600155565b005b6001545b60405190815260200160405180910390f35b6002546100b1565b6100b1610109565b6000546100b1565b6100b1610177565b6100ab6100f13660046101e0565b600055565b6100ab6101043660046101e0565b600255565b600080309050806001600160a01b031663a1c519156040518163ffffffff1660e01b8152600401602060405180830381865afa15801561014d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017191906101f9565b91505090565b6000306001600160a01b031663d46300fd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156101b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101db91906101f9565b905090565b6000602082840312156101f257600080fd5b5035919050565b60006020828403121561020b57600080fd5b505191905056fea26469706673582212209f0222d418abde01d04d1e182c58ee620abbe0d402c527a3397b73f7c260f81b64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100935760003560e01c8063d46300fd11610066578063d46300fd146100d3578063d4febc86146100db578063e2c11f20146100db578063ee919d50146100e3578063eeb4914e146100f657600080fd5b806309cdcf9b14610098578063a1c51915146100ad578063a2375d1e146100c3578063b9c23ae9146100cb575b600080fd5b6100ab6100a63660046101e0565b600155565b005b6001545b60405190815260200160405180910390f35b6002546100b1565b6100b1610109565b6000546100b1565b6100b1610177565b6100ab6100f13660046101e0565b600055565b6100ab6101043660046101e0565b600255565b600080309050806001600160a01b031663a1c519156040518163ffffffff1660e01b8152600401602060405180830381865afa15801561014d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017191906101f9565b91505090565b6000306001600160a01b031663d46300fd6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156101b7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101db91906101f9565b905090565b6000602082840312156101f257600080fd5b5035919050565b60006020828403121561020b57600080fd5b505191905056fea26469706673582212209f0222d418abde01d04d1e182c58ee620abbe0d402c527a3397b73f7c260f81b64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

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

@@ -35,8 +35,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50602a600081905550610150806100286000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063d46300fd1461003b578063ee919d5014610059575b600080fd5b610043610075565b60405161005091906100a1565b60405180910390f35b610073600480360381019061006e91906100ed565b61007e565b005b60008054905090565b8060008190555050565b6000819050919050565b61009b81610088565b82525050565b60006020820190506100b66000830184610092565b92915050565b600080fd5b6100ca81610088565b81146100d557600080fd5b50565b6000813590506100e7816100c1565b92915050565b600060208284031215610103576101026100bc565b5b6000610111848285016100d8565b9150509291505056fea26469706673582212206d56c21d2bb9d2dbb8aa9d25a622dbf82b94db280f0ced2200cafed7178c913764736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c8063d46300fd1461003b578063ee919d5014610059575b600080fd5b610043610075565b60405161005091906100a1565b60405180910390f35b610073600480360381019061006e91906100ed565b61007e565b005b60008054905090565b8060008190555050565b6000819050919050565b61009b81610088565b82525050565b60006020820190506100b66000830184610092565b92915050565b600080fd5b6100ca81610088565b81146100d557600080fd5b50565b6000813590506100e7816100c1565b92915050565b600060208284031215610103576101026100bc565b5b6000610111848285016100d8565b9150509291505056fea26469706673582212206d56c21d2bb9d2dbb8aa9d25a622dbf82b94db280f0ced2200cafed7178c913764736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50602a60005560ac806100246000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c8063d46300fd146037578063ee919d5014604c575b600080fd5b60005460405190815260200160405180910390f35b605c6057366004605e565b600055565b005b600060208284031215606f57600080fd5b503591905056fea26469706673582212205368bc3fa78bd92d791aba3d469035cccfe59767c9c43ee03454d08de90a6d5264736f6c63430008140033",
+  "deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060325760003560e01c8063d46300fd146037578063ee919d5014604c575b600080fd5b60005460405190815260200160405180910390f35b605c6057366004605e565b600055565b005b600060208284031215606f57600080fd5b503591905056fea26469706673582212205368bc3fa78bd92d791aba3d469035cccfe59767c9c43ee03454d08de90a6d5264736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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