@etherisc/gif-next 0.0.2-9a053fa-993 → 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
@@ -183,6 +220,7 @@ 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
@@ -234,3 +272,43 @@ 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

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

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

@@ -4,64 +4,137 @@
   "sourceName": "contracts/components/IBaseComponent.sol",
   "abi": [
     {
-      "inputs": [],
-      "name": "getData",
-      "outputs": [
+      "inputs": [
         {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        },
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorAlreadyLinked",
+      "type": "error"
     },
     {
-      "inputs": [],
-      "name": "getInstance",
-      "outputs": [
+      "inputs": [
         {
-          "internalType": "contract IInstance",
-          "name": "instance",
+          "internalType": "address",
+          "name": "contractAddress",
           "type": "address"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorContractNotRegistered",
+      "type": "error"
     },
     {
-      "inputs": [],
-      "name": "getNftId",
-      "outputs": [
+      "inputs": [
         {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorNotOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNotRegistry",
+      "type": "error"
     },
     {
       "inputs": [],
-      "name": "getOwner",
-      "outputs": [
+      "name": "ErrorRegistryAddressZero",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
           "internalType": "address",
-          "name": "owner",
+          "name": "registry",
           "type": "address"
         }
       ],
+      "name": "ErrorRegistryAlreadyInitialized",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorRegistryNotInitialized",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "getInitialInfo",
+      "outputs": [
+        {
+          "components": [
+            {
+              "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": "address",
+              "name": "initialOwner",
+              "type": "address"
+            },
+            {
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct IRegistry.ObjectInfo",
+          "name": "",
+          "type": "tuple"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        }
+      ],
       "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "getParentNftId",
+      "name": "getNftId",
       "outputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "",
           "type": "uint96"
         }
       ],
@@ -70,11 +143,11 @@
     },
     {
       "inputs": [],
-      "name": "getRegistry",
+      "name": "getOwner",
       "outputs": [
         {
-          "internalType": "contract IRegistry",
-          "name": "registry",
+          "internalType": "address",
+          "name": "",
           "type": "address"
         }
       ],
@@ -83,11 +156,11 @@
     },
     {
       "inputs": [],
-      "name": "getToken",
+      "name": "getRegistry",
       "outputs": [
         {
-          "internalType": "contract IERC20Metadata",
-          "name": "token",
+          "internalType": "contract IRegistry",
+          "name": "",
           "type": "address"
         }
       ],
@@ -96,15 +169,15 @@
     },
     {
       "inputs": [],
-      "name": "getType",
+      "name": "getToken",
       "outputs": [
         {
-          "internalType": "ObjectType",
-          "name": "objectType",
-          "type": "uint8"
+          "internalType": "contract IERC20Metadata",
+          "name": "token",
+          "type": "address"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
@@ -122,21 +195,15 @@
     },
     {
       "inputs": [],
-      "name": "lock",
+      "name": "linkToRegisteredNftId",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "register",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
+      "name": "lock",
+      "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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

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

@@ -52,8 +52,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b506102d6806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80630d3581811461003b578063e9e96c701461006b575b600080fd5b61005560048036038101906100509190610168565b61009b565b60405161006291906101d0565b60405180910390f35b61008560048036038101906100809190610217565b6100ca565b6040516100929190610285565b60405180910390f35b60008060008360ff1660ff16815260200190815260200160002060009054906101000a900460ff169050919050565b6000600160008560ff1660ff16815260200190815260200160002060008460ff1660ff16815260200190815260200160002060008360ff1660ff16815260200190815260200160002060009054906101000a900460ff1690509392505050565b600080fd5b600060ff82169050919050565b6101458161012f565b811461015057600080fd5b50565b6000813590506101628161013c565b92915050565b60006020828403121561017e5761017d61012a565b5b600061018c84828501610153565b91505092915050565b6000819050919050565b60006101ba6101b56101b08461012f565b610195565b61012f565b9050919050565b6101ca8161019f565b82525050565b60006020820190506101e560008301846101c1565b92915050565b6101f48161012f565b81146101ff57600080fd5b50565b600081359050610211816101eb565b92915050565b6000806000606084860312156102305761022f61012a565b5b600061023e86828701610153565b935050602061024f86828701610202565b925050604061026086828701610202565b9150509250925092565b60008115159050919050565b61027f8161026a565b82525050565b600060208201905061029a6000830184610276565b9291505056fea2646970667358221220db4cd2cc9ff450f63fa80c20bf81dd796ceac0b618976dd0b332ceec06b7ae0464736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80630d3581811461003b578063e9e96c701461006b575b600080fd5b61005560048036038101906100509190610168565b61009b565b60405161006291906101d0565b60405180910390f35b61008560048036038101906100809190610217565b6100ca565b6040516100929190610285565b60405180910390f35b60008060008360ff1660ff16815260200190815260200160002060009054906101000a900460ff169050919050565b6000600160008560ff1660ff16815260200190815260200160002060008460ff1660ff16815260200190815260200160002060008360ff1660ff16815260200190815260200160002060009054906101000a900460ff1690509392505050565b600080fd5b600060ff82169050919050565b6101458161012f565b811461015057600080fd5b50565b6000813590506101628161013c565b92915050565b60006020828403121561017e5761017d61012a565b5b600061018c84828501610153565b91505092915050565b6000819050919050565b60006101ba6101b56101b08461012f565b610195565b61012f565b9050919050565b6101ca8161019f565b82525050565b60006020820190506101e560008301846101c1565b92915050565b6101f48161012f565b81146101ff57600080fd5b50565b600081359050610211816101eb565b92915050565b6000806000606084860312156102305761022f61012a565b5b600061023e86828701610153565b935050602061024f86828701610202565b925050604061026086828701610202565b9150509250925092565b60008115159050919050565b61027f8161026a565b82525050565b600060208201905061029a6000830184610276565b9291505056fea2646970667358221220db4cd2cc9ff450f63fa80c20bf81dd796ceac0b618976dd0b332ceec06b7ae0464736f6c63430008140033",
+  "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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.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/7f20a1c1335663e2e20eb70fbac6fce5.json"
+  "buildInfo": "../../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

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

@@ -117,8 +117,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b506103bd806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80631865c57d1461004657806357c26a351461006457806379412d2814610080575b600080fd5b61004e6100b0565b60405161005b919061026f565b60405180910390f35b61007e600480360381019061007991906102bb565b6100c7565b005b61009a600480360381019061009591906102e8565b6101e0565b6040516100a79190610343565b60405180910390f35b6000600160009054906101000a900460ff16905090565b600080600160009054906101000a900460ff1660ff1660ff16815260200190815260200160002060008260ff1660ff16815260200190815260200160002060009054906101000a900460ff1661016557600160009054906101000a900460ff16816040517f5d7cbd3d00000000000000000000000000000000000000000000000000000000815260040161015c92919061035e565b60405180910390fd5b6000600160009054906101000a900460ff16905081600160006101000a81548160ff021916908360ff1602179055507fddbd36f3979db212a01f1175ab2c9205f870d98acf5f28bac835ab5e8333781281600160009054906101000a900460ff166040516101d492919061035e565b60405180910390a15050565b60008060008460ff1660ff16815260200190815260200160002060008360ff1660ff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600060ff82169050919050565b6000819050919050565b600061025961025461024f84610227565b610234565b610227565b9050919050565b6102698161023e565b82525050565b60006020820190506102846000830184610260565b92915050565b600080fd5b61029881610227565b81146102a357600080fd5b50565b6000813590506102b58161028f565b92915050565b6000602082840312156102d1576102d061028a565b5b60006102df848285016102a6565b91505092915050565b600080604083850312156102ff576102fe61028a565b5b600061030d858286016102a6565b925050602061031e858286016102a6565b9150509250929050565b60008115159050919050565b61033d81610328565b82525050565b60006020820190506103586000830184610334565b92915050565b60006040820190506103736000830185610260565b6103806020830184610260565b939250505056fea264697066735822122020b604c332515bf6ecb65d1a88882f8e347dbef47531e6269a873afab1d43c6164736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80631865c57d1461004657806357c26a351461006457806379412d2814610080575b600080fd5b61004e6100b0565b60405161005b919061026f565b60405180910390f35b61007e600480360381019061007991906102bb565b6100c7565b005b61009a600480360381019061009591906102e8565b6101e0565b6040516100a79190610343565b60405180910390f35b6000600160009054906101000a900460ff16905090565b600080600160009054906101000a900460ff1660ff1660ff16815260200190815260200160002060008260ff1660ff16815260200190815260200160002060009054906101000a900460ff1661016557600160009054906101000a900460ff16816040517f5d7cbd3d00000000000000000000000000000000000000000000000000000000815260040161015c92919061035e565b60405180910390fd5b6000600160009054906101000a900460ff16905081600160006101000a81548160ff021916908360ff1602179055507fddbd36f3979db212a01f1175ab2c9205f870d98acf5f28bac835ab5e8333781281600160009054906101000a900460ff166040516101d492919061035e565b60405180910390a15050565b60008060008460ff1660ff16815260200190815260200160002060008360ff1660ff16815260200190815260200160002060009054906101000a900460ff16905092915050565b600060ff82169050919050565b6000819050919050565b600061025961025461024f84610227565b610234565b610227565b9050919050565b6102698161023e565b82525050565b60006020820190506102846000830184610260565b92915050565b600080fd5b61029881610227565b81146102a357600080fd5b50565b6000813590506102b58161028f565b92915050565b6000602082840312156102d1576102d061028a565b5b60006102df848285016102a6565b91505092915050565b600080604083850312156102ff576102fe61028a565b5b600061030d858286016102a6565b925050602061031e858286016102a6565b9150509250929050565b60008115159050919050565b61033d81610328565b82525050565b60006020820190506103586000830184610334565b92915050565b60006040820190506103736000830185610260565b6103806020830184610260565b939250505056fea264697066735822122020b604c332515bf6ecb65d1a88882f8e347dbef47531e6269a873afab1d43c6164736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50610200806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80631865c57d1461004657806357c26a351461006057806379412d2814610075575b600080fd5b60015460405160ff90911681526020015b60405180910390f35b61007361006e366004610175565b6100b5565b005b6100a5610083366004610197565b60ff918216600090815260208181526040808320938516835292905220541690565b6040519015158152602001610057565b60015460ff90811660009081526020818152604080832085851684529091529020541661010a57600154604051635d7cbd3d60e01b815260ff9182166004820152908216602482015260440160405180910390fd5b6001805460ff83811660ff1983168117909355604080519190921680825260208201939093527fddbd36f3979db212a01f1175ab2c9205f870d98acf5f28bac835ab5e83337812910160405180910390a15050565b803560ff8116811461017057600080fd5b919050565b60006020828403121561018757600080fd5b6101908261015f565b9392505050565b600080604083850312156101aa57600080fd5b6101b38361015f565b91506101c16020840161015f565b9050925092905056fea2646970667358221220a1160530bd716923faa541e762882cad9a3ab8076ac106ad83484b997c829e5664736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80631865c57d1461004657806357c26a351461006057806379412d2814610075575b600080fd5b60015460405160ff90911681526020015b60405180910390f35b61007361006e366004610175565b6100b5565b005b6100a5610083366004610197565b60ff918216600090815260208181526040808320938516835292905220541690565b6040519015158152602001610057565b60015460ff90811660009081526020818152604080832085851684529091529020541661010a57600154604051635d7cbd3d60e01b815260ff9182166004820152908216602482015260440160405180910390fd5b6001805460ff83811660ff1983168117909355604080519190921680825260208201939093527fddbd36f3979db212a01f1175ab2c9205f870d98acf5f28bac835ab5e83337812910160405180910390a15050565b803560ff8116811461017057600080fd5b919050565b60006020828403121561018757600080fd5b6101908261015f565b9392505050565b600080604083850312156101aa57600080fd5b6101b38361015f565b91506101c16020840161015f565b9050925092905056fea2646970667358221220a1160530bd716923faa541e762882cad9a3ab8076ac106ad83484b997c829e5664736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

package/artifacts/contracts/experiment/statemachine/SimpleStateMachine.sol/SimpleStateMachine.json

@@ -200,8 +200,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5061003b6100226100b060201b60201c565b6100306100ca60201b60201c565b6100e460201b60201c565b61006561004c6100ca60201b60201c565b61005a6100b060201b60201c565b6100e460201b60201c565b61008f6100766100ca60201b60201c565b6100846101cc60201b60201c565b6100e460201b60201c565b6100ab6100a06100b060201b60201c565b6101e660201b60201c565b610274565b60006100c5600a60ff1661025260201b60201c565b905090565b60006100df601460ff1661025260201b60201c565b905090565b6100fb826100f661025c60201b60201c565b610261565b15610132576040517fb5f9d83700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6101498161014461025c60201b60201c565b610261565b15610180576040517fe9c8e0f300000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60016000808460ff1660ff16815260200190815260200160002060008360ff1660ff16815260200190815260200160002060006101000a81548160ff0219169083151502179055505050565b60006101e1601e60ff1661025260201b60201c565b905090565b6101fd816101f861025c60201b60201c565b610261565b15610234576040517f9475eccc00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b80600160006101000a81548160ff021916908360ff16021790555050565b6000819050919050565b600090565b60008160ff168360ff1614905092915050565b610541806102836000396000f3fe608060405234801561001057600080fd5b50600436106100925760003560e01c806360cb89b91161006657806360cb89b91461010d57806379412d281461012b578063a9aad58c1461015b578063c80c073814610179578063c90bd0471461019757610092565b80622f211a146100975780630c06bb31146100b55780631865c57d146100d357806357c26a35146100f1575b600080fd5b61009f6101b5565b6040516100ac919061039d565b60405180910390f35b6100bd6101ba565b6040516100ca919061039d565b60405180910390f35b6100db6101bf565b6040516100e891906103f3565b60405180910390f35b61010b6004803603810190610106919061043f565b6101d6565b005b6101156102ef565b60405161012291906103f3565b60405180910390f35b6101456004803603810190610140919061046c565b610303565b60405161015291906104c7565b60405180910390f35b61016361034a565b60405161017091906103f3565b60405180910390f35b61018161035e565b60405161018e919061039d565b60405180910390f35b61019f610363565b6040516101ac91906103f3565b60405180910390f35b601e81565b601481565b6000600160009054906101000a900460ff16905090565b600080600160009054906101000a900460ff1660ff1660ff16815260200190815260200160002060008260ff1660ff16815260200190815260200160002060009054906101000a900460ff1661027457600160009054906101000a900460ff16816040517f5d7cbd3d00000000000000000000000000000000000000000000000000000000815260040161026b9291906104e2565b60405180910390fd5b6000600160009054906101000a900460ff16905081600160006101000a81548160ff021916908360ff1602179055507fddbd36f3979db212a01f1175ab2c9205f870d98acf5f28bac835ab5e8333781281600160009054906101000a900460ff166040516102e39291906104e2565b60405180910390a15050565b60006102fe601e60ff16610377565b905090565b60008060008460ff1660ff16815260200190815260200160002060008360ff1660ff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000610359601460ff16610377565b905090565b600a81565b6000610372600a60ff16610377565b905090565b6000819050919050565b600060ff82169050919050565b61039781610381565b82525050565b60006020820190506103b2600083018461038e565b92915050565b6000819050919050565b60006103dd6103d86103d384610381565b6103b8565b610381565b9050919050565b6103ed816103c2565b82525050565b600060208201905061040860008301846103e4565b92915050565b600080fd5b61041c81610381565b811461042757600080fd5b50565b60008135905061043981610413565b92915050565b6000602082840312156104555761045461040e565b5b60006104638482850161042a565b91505092915050565b600080604083850312156104835761048261040e565b5b60006104918582860161042a565b92505060206104a28582860161042a565b9150509250929050565b60008115159050919050565b6104c1816104ac565b82525050565b60006020820190506104dc60008301846104b8565b92915050565b60006040820190506104f760008301856103e4565b61050460208301846103e4565b939250505056fea264697066735822122054710cc44a2a183473ea6f4183635803c6271dd53221ea253690d86b99b3cd7564736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100925760003560e01c806360cb89b91161006657806360cb89b91461010d57806379412d281461012b578063a9aad58c1461015b578063c80c073814610179578063c90bd0471461019757610092565b80622f211a146100975780630c06bb31146100b55780631865c57d146100d357806357c26a35146100f1575b600080fd5b61009f6101b5565b6040516100ac919061039d565b60405180910390f35b6100bd6101ba565b6040516100ca919061039d565b60405180910390f35b6100db6101bf565b6040516100e891906103f3565b60405180910390f35b61010b6004803603810190610106919061043f565b6101d6565b005b6101156102ef565b60405161012291906103f3565b60405180910390f35b6101456004803603810190610140919061046c565b610303565b60405161015291906104c7565b60405180910390f35b61016361034a565b60405161017091906103f3565b60405180910390f35b61018161035e565b60405161018e919061039d565b60405180910390f35b61019f610363565b6040516101ac91906103f3565b60405180910390f35b601e81565b601481565b6000600160009054906101000a900460ff16905090565b600080600160009054906101000a900460ff1660ff1660ff16815260200190815260200160002060008260ff1660ff16815260200190815260200160002060009054906101000a900460ff1661027457600160009054906101000a900460ff16816040517f5d7cbd3d00000000000000000000000000000000000000000000000000000000815260040161026b9291906104e2565b60405180910390fd5b6000600160009054906101000a900460ff16905081600160006101000a81548160ff021916908360ff1602179055507fddbd36f3979db212a01f1175ab2c9205f870d98acf5f28bac835ab5e8333781281600160009054906101000a900460ff166040516102e39291906104e2565b60405180910390a15050565b60006102fe601e60ff16610377565b905090565b60008060008460ff1660ff16815260200190815260200160002060008360ff1660ff16815260200190815260200160002060009054906101000a900460ff16905092915050565b6000610359601460ff16610377565b905090565b600a81565b6000610372600a60ff16610377565b905090565b6000819050919050565b600060ff82169050919050565b61039781610381565b82525050565b60006020820190506103b2600083018461038e565b92915050565b6000819050919050565b60006103dd6103d86103d384610381565b6103b8565b610381565b9050919050565b6103ed816103c2565b82525050565b600060208201905061040860008301846103e4565b92915050565b600080fd5b61041c81610381565b811461042757600080fd5b50565b60008135905061043981610413565b92915050565b6000602082840312156104555761045461040e565b5b60006104638482850161042a565b91505092915050565b600080604083850312156104835761048261040e565b5b60006104918582860161042a565b92505060206104a28582860161042a565b9150509250929050565b60008115159050919050565b6104c1816104ac565b82525050565b60006020820190506104dc60008301846104b8565b92915050565b60006040820190506104f760008301856103e4565b61050460208301846103e4565b939250505056fea264697066735822122054710cc44a2a183473ea6f4183635803c6271dd53221ea253690d86b99b3cd7564736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b5061001d600a6014610044565b6100296014600a610044565b6100356014601e610044565b61003f600a6100c9565b610108565b6100568260005b60ff90811691161490565b156100745760405163b5f9d83760e01b815260040160405180910390fd5b61007f81600061004b565b1561009d5760405163e9c8e0f360e01b815260040160405180910390fd5b60ff9182166000908152602081815260408083209390941682529190915220805460ff19166001179055565b6100d481600061004b565b156100f25760405163251d7b3360e21b815260040160405180910390fd5b6001805460ff191660ff92909216919091179055565b610286806101176000396000f3fe608060405234801561001057600080fd5b50600436106100925760003560e01c806360cb89b91161006657806360cb89b9146100de57806379412d28146100e5578063a9aad58c14610125578063c80c07381461012c578063c90bd0471461013457600080fd5b80622f211a146100975780630c06bb31146100b65780631865c57d146100be57806357c26a35146100c9575b600080fd5b61009f601e81565b60405160ff90911681526020015b60405180910390f35b61009f601481565b60015460ff1661009f565b6100dc6100d73660046101fb565b61013b565b005b601e61009f565b6101156100f336600461021d565b60ff918216600090815260208181526040808320938516835292905220541690565b60405190151581526020016100ad565b601461009f565b61009f600a81565b600a61009f565b60015460ff90811660009081526020818152604080832085851684529091529020541661019057600154604051635d7cbd3d60e01b815260ff9182166004820152908216602482015260440160405180910390fd5b6001805460ff83811660ff1983168117909355604080519190921680825260208201939093527fddbd36f3979db212a01f1175ab2c9205f870d98acf5f28bac835ab5e83337812910160405180910390a15050565b803560ff811681146101f657600080fd5b919050565b60006020828403121561020d57600080fd5b610216826101e5565b9392505050565b6000806040838503121561023057600080fd5b610239836101e5565b9150610247602084016101e5565b9050925092905056fea2646970667358221220f0be773bc1b3b8a415c7a72f0d1dfd316a0c113db417f1beaeddc36ffa778f3464736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100925760003560e01c806360cb89b91161006657806360cb89b9146100de57806379412d28146100e5578063a9aad58c14610125578063c80c07381461012c578063c90bd0471461013457600080fd5b80622f211a146100975780630c06bb31146100b65780631865c57d146100be57806357c26a35146100c9575b600080fd5b61009f601e81565b60405160ff90911681526020015b60405180910390f35b61009f601481565b60015460ff1661009f565b6100dc6100d73660046101fb565b61013b565b005b601e61009f565b6101156100f336600461021d565b60ff918216600090815260208181526040808320938516835292905220541690565b60405190151581526020016100ad565b601461009f565b61009f600a81565b600a61009f565b60015460ff90811660009081526020818152604080832085851684529091529020541661019057600154604051635d7cbd3d60e01b815260ff9182166004820152908216602482015260440160405180910390fd5b6001805460ff83811660ff1983168117909355604080519190921680825260208201939093527fddbd36f3979db212a01f1175ab2c9205f870d98acf5f28bac835ab5e83337812910160405180910390a15050565b803560ff811681146101f657600080fd5b919050565b60006020828403121561020d57600080fd5b610216826101e5565b9392505050565b6000806040838503121561023057600080fd5b610239836101e5565b9150610247602084016101e5565b9050925092905056fea2646970667358221220f0be773bc1b3b8a415c7a72f0d1dfd316a0c113db417f1beaeddc36ffa778f3464736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }