@etherisc/gif-next 0.0.2-da06f3b-803 → 0.0.2-da0f894-204

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

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

package/artifacts/contracts/instance/ObjectManager.sol/ObjectManager.json

@@ -254,8 +254,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50600080546001600160a01b03191690556105f0806100306000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80638fb360371161005b5780638fb36037146100d4578063bf7e214f146100f5578063c0c53b8b14610113578063de7b5d141461012657600080fd5b8063485cc955146100825780635ab1bd53146100975780637a9e5e4b146100c1575b600080fd5b610095610090366004610502565b610137565b005b6000546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100956100cf366004610535565b6102de565b6100dc61037c565b6040516001600160e01b031990911681526020016100b8565b60008051602061059b833981519152546001600160a01b03166100a4565b610095610121366004610557565b6103b5565b6003546001600160a01b03166100a4565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff1660008115801561017d5750825b905060008267ffffffffffffffff16600114801561019a5750303b155b9050811580156101a8575080155b156101c65760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156101f057845460ff60401b1916600160401b1785555b6101f987610415565b856001600160a01b03163b6000036102345760405163071669cf60e21b81526001600160a01b03871660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0388811691821790925560408051928a16835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd127224412910160405180910390a183156102d557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b336102fe60008051602061059b833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146103395760405162d1953b60e31b81526001600160a01b038216600482015260240161022b565b816001600160a01b03163b60000361036f576040516361798f2f60e11b81526001600160a01b038316600482015260240161022b565b61037882610429565b5050565b60008051602061059b833981519152805460009190600160a01b900460ff166103a65760006103af565b638fb3603760e01b5b91505090565b6103bf8383610137565b600380546001600160a01b0319166001600160a01b0383169081179091556040519081527fe89455dcb69bf4efd41cbb10c8064808f360b87b03ae8c96349c71f4934ffa0f9060200160405180910390a1505050565b61041d61048a565b610426816104d5565b50565b60008051602061059b83398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166104d357604051631afcd79f60e31b815260040160405180910390fd5b565b6104dd61048a565b61042681610429565b80356001600160a01b03811681146104fd57600080fd5b919050565b6000806040838503121561051557600080fd5b61051e836104e6565b915061052c602084016104e6565b90509250929050565b60006020828403121561054757600080fd5b610550826104e6565b9392505050565b60008060006060848603121561056c57600080fd5b610575846104e6565b9250610583602085016104e6565b9150610591604085016104e6565b9050925092509256fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a26469706673582212202c4f28149d338257a0f7e14bbac035b0bef6876a69915fb10d05e939320e4b7964736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80638fb360371161005b5780638fb36037146100d4578063bf7e214f146100f5578063c0c53b8b14610113578063de7b5d141461012657600080fd5b8063485cc955146100825780635ab1bd53146100975780637a9e5e4b146100c1575b600080fd5b610095610090366004610502565b610137565b005b6000546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100956100cf366004610535565b6102de565b6100dc61037c565b6040516001600160e01b031990911681526020016100b8565b60008051602061059b833981519152546001600160a01b03166100a4565b610095610121366004610557565b6103b5565b6003546001600160a01b03166100a4565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff1660008115801561017d5750825b905060008267ffffffffffffffff16600114801561019a5750303b155b9050811580156101a8575080155b156101c65760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156101f057845460ff60401b1916600160401b1785555b6101f987610415565b856001600160a01b03163b6000036102345760405163071669cf60e21b81526001600160a01b03871660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0388811691821790925560408051928a16835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd127224412910160405180910390a183156102d557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b336102fe60008051602061059b833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146103395760405162d1953b60e31b81526001600160a01b038216600482015260240161022b565b816001600160a01b03163b60000361036f576040516361798f2f60e11b81526001600160a01b038316600482015260240161022b565b61037882610429565b5050565b60008051602061059b833981519152805460009190600160a01b900460ff166103a65760006103af565b638fb3603760e01b5b91505090565b6103bf8383610137565b600380546001600160a01b0319166001600160a01b0383169081179091556040519081527fe89455dcb69bf4efd41cbb10c8064808f360b87b03ae8c96349c71f4934ffa0f9060200160405180910390a1505050565b61041d61048a565b610426816104d5565b50565b60008051602061059b83398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166104d357604051631afcd79f60e31b815260040160405180910390fd5b565b6104dd61048a565b61042681610429565b80356001600160a01b03811681146104fd57600080fd5b919050565b6000806040838503121561051557600080fd5b61051e836104e6565b915061052c602084016104e6565b90509250929050565b60006020828403121561054757600080fd5b610550826104e6565b9392505050565b60008060006060848603121561056c57600080fd5b610575846104e6565b9250610583602085016104e6565b9150610591604085016104e6565b9050925092509256fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a26469706673582212202c4f28149d338257a0f7e14bbac035b0bef6876a69915fb10d05e939320e4b7964736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50600080546001600160a01b03191690556105f0806100306000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80638fb360371161005b5780638fb36037146100d4578063bf7e214f146100f5578063c0c53b8b14610113578063de7b5d141461012657600080fd5b8063485cc955146100825780635ab1bd53146100975780637a9e5e4b146100c1575b600080fd5b610095610090366004610502565b610137565b005b6000546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100956100cf366004610535565b6102de565b6100dc61037c565b6040516001600160e01b031990911681526020016100b8565b60008051602061059b833981519152546001600160a01b03166100a4565b610095610121366004610557565b6103b5565b6003546001600160a01b03166100a4565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff1660008115801561017d5750825b905060008267ffffffffffffffff16600114801561019a5750303b155b9050811580156101a8575080155b156101c65760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156101f057845460ff60401b1916600160401b1785555b6101f987610415565b856001600160a01b03163b6000036102345760405163071669cf60e21b81526001600160a01b03871660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0388811691821790925560408051928a16835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd127224412910160405180910390a183156102d557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b336102fe60008051602061059b833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146103395760405162d1953b60e31b81526001600160a01b038216600482015260240161022b565b816001600160a01b03163b60000361036f576040516361798f2f60e11b81526001600160a01b038316600482015260240161022b565b61037882610429565b5050565b60008051602061059b833981519152805460009190600160a01b900460ff166103a65760006103af565b638fb3603760e01b5b91505090565b6103bf8383610137565b600380546001600160a01b0319166001600160a01b0383169081179091556040519081527fe89455dcb69bf4efd41cbb10c8064808f360b87b03ae8c96349c71f4934ffa0f9060200160405180910390a1505050565b61041d61048a565b610426816104d5565b50565b60008051602061059b83398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166104d357604051631afcd79f60e31b815260040160405180910390fd5b565b6104dd61048a565b61042681610429565b80356001600160a01b03811681146104fd57600080fd5b919050565b6000806040838503121561051557600080fd5b61051e836104e6565b915061052c602084016104e6565b90509250929050565b60006020828403121561054757600080fd5b610550826104e6565b9392505050565b60008060006060848603121561056c57600080fd5b610575846104e6565b9250610583602085016104e6565b9150610591604085016104e6565b9050925092509256fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a2646970667358221220f2186ab008ce48e77e816ca5b2bd0480012e768991d751d006dff1269d2d0b6d64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80638fb360371161005b5780638fb36037146100d4578063bf7e214f146100f5578063c0c53b8b14610113578063de7b5d141461012657600080fd5b8063485cc955146100825780635ab1bd53146100975780637a9e5e4b146100c1575b600080fd5b610095610090366004610502565b610137565b005b6000546001600160a01b03165b6040516001600160a01b0390911681526020015b60405180910390f35b6100956100cf366004610535565b6102de565b6100dc61037c565b6040516001600160e01b031990911681526020016100b8565b60008051602061059b833981519152546001600160a01b03166100a4565b610095610121366004610557565b6103b5565b6003546001600160a01b03166100a4565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a008054600160401b810460ff16159067ffffffffffffffff1660008115801561017d5750825b905060008267ffffffffffffffff16600114801561019a5750303b155b9050811580156101a8575080155b156101c65760405163f92ee8a960e01b815260040160405180910390fd5b845467ffffffffffffffff1916600117855583156101f057845460ff60401b1916600160401b1785555b6101f987610415565b856001600160a01b03163b6000036102345760405163071669cf60e21b81526001600160a01b03871660048201526024015b60405180910390fd5b600080546001600160a01b0319166001600160a01b0388811691821790925560408051928a16835260208301919091527fa6804c76412ae2d729353ed187a48b0b95177ee5c111049b80878fd127224412910160405180910390a183156102d557845460ff60401b19168555604051600181527fc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d29060200160405180910390a15b50505050505050565b336102fe60008051602061059b833981519152546001600160a01b031690565b6001600160a01b0316816001600160a01b0316146103395760405162d1953b60e31b81526001600160a01b038216600482015260240161022b565b816001600160a01b03163b60000361036f576040516361798f2f60e11b81526001600160a01b038316600482015260240161022b565b61037882610429565b5050565b60008051602061059b833981519152805460009190600160a01b900460ff166103a65760006103af565b638fb3603760e01b5b91505090565b6103bf8383610137565b600380546001600160a01b0319166001600160a01b0383169081179091556040519081527fe89455dcb69bf4efd41cbb10c8064808f360b87b03ae8c96349c71f4934ffa0f9060200160405180910390a1505050565b61041d61048a565b610426816104d5565b50565b60008051602061059b83398151915280546001600160a01b0383166001600160a01b03199091168117825560408051918252517f2f658b440c35314f52658ea8a740e05b284cdc84dc9ae01e891f21b8933e7cad9181900360200190a15050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a0054600160401b900460ff166104d357604051631afcd79f60e31b815260040160405180910390fd5b565b6104dd61048a565b61042681610429565b80356001600160a01b03811681146104fd57600080fd5b919050565b6000806040838503121561051557600080fd5b61051e836104e6565b915061052c602084016104e6565b90509250929050565b60006020828403121561054757600080fd5b610550826104e6565b9392505050565b60008060006060848603121561056c57600080fd5b610575846104e6565b9250610583602085016104e6565b9150610591604085016104e6565b9050925092509256fef3177357ab46d8af007ab3fdb9af81da189e1068fefdc0073dca88a2cab40a00a2646970667358221220f2186ab008ce48e77e816ca5b2bd0480012e768991d751d006dff1269d2d0b6d64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.dbg.json

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

package/artifacts/contracts/instance/base/ComponentService.sol/ComponentService.json

@@ -3,22 +3,6 @@
   "contractName": "ComponentService",
   "sourceName": "contracts/instance/base/ComponentService.sol",
   "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "registry",
-          "type": "address"
-        },
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "ErrorAlreadyLinked",
-      "type": "error"
-    },
     {
       "inputs": [
         {
@@ -124,65 +108,60 @@
       "inputs": [
         {
           "internalType": "address",
-          "name": "contractAddress",
+          "name": "caller",
           "type": "address"
         }
       ],
-      "name": "ErrorContractNotRegistered",
+      "name": "ErrorIServiceCallerUnknown",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
         }
       ],
-      "name": "ErrorNotOwner",
+      "name": "ErrorNftOwnableAlreadyLinked",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registryAddress",
+          "name": "contractAddress",
           "type": "address"
         }
       ],
-      "name": "ErrorNotRegistry",
+      "name": "ErrorNftOwnableContractNotRegistered",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorNftOwnableInitialOwnerZero",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registryAddress",
+          "name": "account",
           "type": "address"
         }
       ],
-      "name": "ErrorRegisterableNotRegistry",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "ErrorRegistryAddressZero",
+      "name": "ErrorNftOwnableNotOwner",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registry",
+          "name": "registryAddress",
           "type": "address"
         }
       ],
-      "name": "ErrorRegistryAlreadyInitialized",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "ErrorRegistryNotInitialized",
+      "name": "ErrorNotRegistry",
       "type": "error"
     },
     {
@@ -209,29 +188,17 @@
       "type": "event"
     },
     {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
+      "inputs": [],
+      "name": "NFT_OWNABLE_STORAGE_LOCATION_V1",
+      "outputs": [
         {
-          "indexed": false,
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
         }
       ],
-      "name": "LogVersionableInitialized",
-      "type": "event"
+      "stateMutability": "view",
+      "type": "function"
     },
     {
       "inputs": [],
@@ -309,32 +276,6 @@
       "stateMutability": "view",
       "type": "function"
     },
-    {
-      "inputs": [],
-      "name": "getInitialOwner",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getInitializedVersion",
-      "outputs": [
-        {
-          "internalType": "uint64",
-          "name": "",
-          "type": "uint64"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getInstanceService",
@@ -402,10 +343,10 @@
     },
     {
       "inputs": [],
-      "name": "getRegistryService",
+      "name": "getRegistryAddress",
       "outputs": [
         {
-          "internalType": "contract IRegistryService",
+          "internalType": "address",
           "name": "",
           "type": "address"
         }
@@ -415,25 +356,19 @@
     },
     {
       "inputs": [],
-      "name": "getVersion",
+      "name": "getRegistryService",
       "outputs": [
         {
-          "internalType": "Version",
+          "internalType": "contract IRegistryService",
           "name": "",
-          "type": "uint24"
+          "type": "address"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
+      "inputs": [],
       "name": "getVersion",
       "outputs": [
         {
@@ -442,87 +377,68 @@
           "type": "uint24"
         }
       ],
-      "stateMutability": "view",
+      "stateMutability": "pure",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "getVersionCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
+      "name": "initializeERC165",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
-        }
-      ],
-      "name": "getVersionInfo",
-      "outputs": [
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
+        },
         {
-          "components": [
-            {
-              "internalType": "Version",
-              "name": "version",
-              "type": "uint24"
-            },
-            {
-              "internalType": "address",
-              "name": "implementation",
-              "type": "address"
-            },
-            {
-              "internalType": "address",
-              "name": "activatedBy",
-              "type": "address"
-            },
-            {
-              "internalType": "Timestamp",
-              "name": "activatedAt",
-              "type": "uint40"
-            },
-            {
-              "internalType": "Blocknumber",
-              "name": "activatedIn",
-              "type": "uint32"
-            }
-          ],
-          "internalType": "struct IVersionable.VersionInfo",
-          "name": "",
-          "type": "tuple"
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
+      "name": "initializeNftOwnable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "implementation",
+          "name": "registryAddress",
           "type": "address"
         },
+        {
+          "internalType": "NftId",
+          "name": "parentNftId",
+          "type": "uint96"
+        },
+        {
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
+        },
+        {
+          "internalType": "bool",
+          "name": "isInterceptor",
+          "type": "bool"
+        },
         {
           "internalType": "address",
-          "name": "activatedBy",
+          "name": "initialOwner",
           "type": "address"
         },
         {
           "internalType": "bytes",
-          "name": "data",
+          "name": "registryData",
           "type": "bytes"
         }
       ],
-      "name": "initialize",
+      "name": "initializeRegisterable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
@@ -530,20 +446,50 @@
     {
       "inputs": [
         {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
         }
       ],
-      "name": "isInitialized",
-      "outputs": [
+      "name": "initializeRegistryLinked",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
         {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
+      "name": "initializeService",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "activatedBy",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        }
+      ],
+      "name": "initializeVersionable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
       "type": "function"
     },
     {
@@ -553,6 +499,19 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
+        }
+      ],
+      "name": "registerInterface",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -574,23 +533,13 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        },
         {
           "internalType": "bytes",
           "name": "data",
           "type": "bytes"
         }
       ],
-      "name": "upgrade",
+      "name": "upgradeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"

package/artifacts/contracts/instance/base/IKeyValueStore.sol/IKeyValueStore.dbg.json

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

package/artifacts/contracts/instance/base/ILifecycle.sol/ILifecycle.dbg.json

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

package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.dbg.json

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

package/artifacts/contracts/instance/base/KeyValueStore.sol/KeyValueStore.json

@@ -445,8 +445,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b506200001c62000040565b62000026620001f4565b620000306200032d565b6200003a62000595565b6200070b565b60dc600090815260208190527f5bd290414b404036f9d63146803dd83b59a8e1905062a5bfed8b0154d20a390d805460ff1916606417905560019081906200008660dc90565b60ff1660ff1681526020019081526020016000206000620000ac620006d960201b60201c565b60ff1660ff1681526020019081526020016000206000620000d2620006e360201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906200010560dc90565b60ff1660ff16815260200190815260200160002060006200012b620006e360201b60201c565b60ff1660ff168152602001908152602001600020600062000151620006d960201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906200018460dc90565b60ff1660ff1681526020019081526020016000206000620001aa620006e360201b60201c565b60ff1660ff1681526020019081526020016000206000620001d0620006e860201b60201c565b60ff1681526020810191909152604001600020805460ff1916911515919091179055565b7f9db7038e59677010ca8f72fa448bad1b4f3c53346b666689163ccac31db467728054606460ff1991821681179092557f1a3062e9a24818c8281fcfb58ec4f3083a2f9a1314ac63f80d8d646661fdc5098054909116600190811790915560009182526020819052907f1bd07f61ef326b4de236f5b68f225f46ff76ee2c375ae31a06da201c49c70c129062000288606e90565b60ff1660ff1681526020019081526020016000206000620002ae620006d960201b60201c565b60ff16815260208101919091526040016000908120805460ff1916921515929092179091556001908190620002e1606490565b60ff1660ff168152602001908152602001600020600062000307620006e360201b60201c565b60ff1660ff1681526020019081526020016000206000620001d0620006ed60201b60201c565b60d2600090815260208190527fc0d27dadfcf8ee0186a0f6fe9b5805a51e99869050491e4a3040efec012a214f805460ff1916600a17905560019081906200037360d290565b60ff1660ff168152602001908152602001600020600062000399620006f260201b60201c565b60ff1660ff1681526020019081526020016000206000620003bf620006f760201b60201c565b60ff16815260208101919091526040016000908120805460ff1916921515929092179091556001908190620003f260d290565b60ff1660ff168152602001908152602001600020600062000418620006f260201b60201c565b60ff1660ff16815260200190815260200160002060006200043e620006fc60201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906200047160d290565b60ff1660ff168152602001908152602001600020600062000497620006f260201b60201c565b60ff1660ff1681526020019081526020016000206000620004bd6200070160201b60201c565b60ff16815260208101919091526040016000908120805460ff1916921515929092179091556001908190620004f060d290565b60ff1660ff1681526020019081526020016000206000620005166200070160201b60201c565b60ff1660ff16815260200190815260200160002060006200053c620006d960201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906200056f60d290565b60ff1660ff1681526020019081526020016000206000620001aa620006d960201b60201c565b60c8600090815260208190527fc5f2c791ab4e0b1a0b6c600884b07e98575b00ebd7c3166c4272a53bebf71403805460ff191660641790556001908190620005db60c890565b60ff1660ff168152602001908152602001600020600062000601620006d960201b60201c565b60ff1660ff168152602001908152602001600020600062000627620006e360201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906200065a60c890565b60ff1660ff168152602001908152602001600020600062000680620006e360201b60201c565b60ff1660ff1681526020019081526020016000206000620006a6620006d960201b60201c565b60ff16815260208101919091526040016000908120805460ff1916921515929092179091556001908190620002e160c890565b606490565b905090565b606e90565b60c890565b60d290565b600a90565b601490565b601e90565b60006028620006de565b61094e806200071b6000396000f3fe608060405234801561001057600080fd5b506004361061009e5760003560e01c8063a5961b4c11610066578063a5961b4c1461016b578063a89896751461021c578063bf1db3f914610231578063e9e96c7014610244578063f48016ce1461028257600080fd5b806309648a9d146100a35780630d358181146100e257806338a699a41461010857806354f6127f1461012b5780638eaa6ac01461014b575b600080fd5b6100cb6100b13660046106eb565b600090815260026020526040902054610100900460ff1690565b60405160ff90911681526020015b60405180910390f35b6100cb6100f0366004610716565b60ff9081166000908152602081905260409020541690565b61011b6101163660046106eb565b6102a3565b60405190151581526020016100d9565b61013e6101393660046106eb565b610334565b6040516100d99190610779565b61015e6101593660046106eb565b6103d9565b6040516100d991906107d6565b61020f6101793660046106eb565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915250600090815260026020908152604091829020825160a081018452905460ff8082168352610100820416928201929092526001600160a01b03620100008304169281019290925263ffffffff600160b01b820481166060840152600160d01b90910416608082015290565b6040516100d9919061080a565b61022f61022a366004610818565b61051a565b005b61011b61023f366004610716565b610614565b61011b610252366004610818565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b610295610290366004610863565b610661565b6040519081526020016100d9565b60008181526002602052604080822054905163b2466acf60e01b815261010090910460ff16600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf906024015b602060405180830381865af415801561030a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061032e91906108a3565b92915050565b6000818152600260205260409020600101805460609190610354906108c5565b80601f0160208091040260200160405190810160405280929190818152602001828054610380906108c5565b80156103cd5780601f106103a2576101008083540402835291602001916103cd565b820191906000526020600020905b8154815290600101906020018083116103b057829003601f168201915b50505050509050919050565b6040805160e081018252600091810182815260608083018490526080830184905260a0830184905260c083019390935281526020810191909152600082815260026020908152604091829020825160e081018452815460ff80821695830195865261010082041660608301526001600160a01b0362010000820416608083015263ffffffff600160b01b8204811660a0840152600160d01b9091041660c08201529283526001810180549192840191610491906108c5565b80601f01602080910402602001604051908101604052809291908181526020018280546104bd906108c5565b801561050a5780601f106104df5761010080835404028352916020019161050a565b820191906000526020600020905b8154815290600101906020018083116104ed57829003601f168201915b5050505050815250509050919050565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af415801561057f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105a391906108a3565b156105ad57505050565b60ff80841660009081526001602090815260408083208685168452825280832085851684529091529020541661060f57604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf906024016102ed565b604051637a400b6760e11b815260ff8316600482015260ff198216602482015260009073__$c8f743efd2b4f0c9300f2558c784479d3e$__9063f48016ce90604401602060405180830381865af41580156106c0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e491906108ff565b9392505050565b6000602082840312156106fd57600080fd5b5035919050565b60ff8116811461071357600080fd5b50565b60006020828403121561072857600080fd5b81356106e481610704565b6000815180845260005b818110156107595760208185018101518683018201520161073d565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006106e46020830184610733565b60ff815116825260ff602082015116602083015260018060a01b036040820151166040830152606081015163ffffffff808216606085015280608084015116608085015250505050565b602081526107e860208201835161078c565b6000602083015160c08084015261080260e0840182610733565b949350505050565b60a0810161032e828461078c565b60008060006060848603121561082d57600080fd5b833561083881610704565b9250602084013561084881610704565b9150604084013561085881610704565b809150509250925092565b6000806040838503121561087657600080fd5b823561088181610704565b9150602083013560ff198116811461089857600080fd5b809150509250929050565b6000602082840312156108b557600080fd5b815180151581146106e457600080fd5b600181811c908216806108d957607f821691505b6020821081036108f957634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561091157600080fd5b505191905056fea264697066735822122053814444d3d07fb248ef2efdc4fc08a4ab9a67cba07181c78edd626b42e8483b64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061009e5760003560e01c8063a5961b4c11610066578063a5961b4c1461016b578063a89896751461021c578063bf1db3f914610231578063e9e96c7014610244578063f48016ce1461028257600080fd5b806309648a9d146100a35780630d358181146100e257806338a699a41461010857806354f6127f1461012b5780638eaa6ac01461014b575b600080fd5b6100cb6100b13660046106eb565b600090815260026020526040902054610100900460ff1690565b60405160ff90911681526020015b60405180910390f35b6100cb6100f0366004610716565b60ff9081166000908152602081905260409020541690565b61011b6101163660046106eb565b6102a3565b60405190151581526020016100d9565b61013e6101393660046106eb565b610334565b6040516100d99190610779565b61015e6101593660046106eb565b6103d9565b6040516100d991906107d6565b61020f6101793660046106eb565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915250600090815260026020908152604091829020825160a081018452905460ff8082168352610100820416928201929092526001600160a01b03620100008304169281019290925263ffffffff600160b01b820481166060840152600160d01b90910416608082015290565b6040516100d9919061080a565b61022f61022a366004610818565b61051a565b005b61011b61023f366004610716565b610614565b61011b610252366004610818565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b610295610290366004610863565b610661565b6040519081526020016100d9565b60008181526002602052604080822054905163b2466acf60e01b815261010090910460ff16600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf906024015b602060405180830381865af415801561030a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061032e91906108a3565b92915050565b6000818152600260205260409020600101805460609190610354906108c5565b80601f0160208091040260200160405190810160405280929190818152602001828054610380906108c5565b80156103cd5780601f106103a2576101008083540402835291602001916103cd565b820191906000526020600020905b8154815290600101906020018083116103b057829003601f168201915b50505050509050919050565b6040805160e081018252600091810182815260608083018490526080830184905260a0830184905260c083019390935281526020810191909152600082815260026020908152604091829020825160e081018452815460ff80821695830195865261010082041660608301526001600160a01b0362010000820416608083015263ffffffff600160b01b8204811660a0840152600160d01b9091041660c08201529283526001810180549192840191610491906108c5565b80601f01602080910402602001604051908101604052809291908181526020018280546104bd906108c5565b801561050a5780601f106104df5761010080835404028352916020019161050a565b820191906000526020600020905b8154815290600101906020018083116104ed57829003601f168201915b5050505050815250509050919050565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af415801561057f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105a391906108a3565b156105ad57505050565b60ff80841660009081526001602090815260408083208685168452825280832085851684529091529020541661060f57604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf906024016102ed565b604051637a400b6760e11b815260ff8316600482015260ff198216602482015260009073__$c8f743efd2b4f0c9300f2558c784479d3e$__9063f48016ce90604401602060405180830381865af41580156106c0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e491906108ff565b9392505050565b6000602082840312156106fd57600080fd5b5035919050565b60ff8116811461071357600080fd5b50565b60006020828403121561072857600080fd5b81356106e481610704565b6000815180845260005b818110156107595760208185018101518683018201520161073d565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006106e46020830184610733565b60ff815116825260ff602082015116602083015260018060a01b036040820151166040830152606081015163ffffffff808216606085015280608084015116608085015250505050565b602081526107e860208201835161078c565b6000602083015160c08084015261080260e0840182610733565b949350505050565b60a0810161032e828461078c565b60008060006060848603121561082d57600080fd5b833561083881610704565b9250602084013561084881610704565b9150604084013561085881610704565b809150509250925092565b6000806040838503121561087657600080fd5b823561088181610704565b9150602083013560ff198116811461089857600080fd5b809150509250929050565b6000602082840312156108b557600080fd5b815180151581146106e457600080fd5b600181811c908216806108d957607f821691505b6020821081036108f957634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561091157600080fd5b505191905056fea264697066735822122053814444d3d07fb248ef2efdc4fc08a4ab9a67cba07181c78edd626b42e8483b64736f6c63430008140033",
+  "bytecode": "0x60806040523480156200001157600080fd5b506200001c62000040565b62000026620001f4565b620000306200032d565b6200003a62000595565b6200070b565b60dc600090815260208190527f5bd290414b404036f9d63146803dd83b59a8e1905062a5bfed8b0154d20a390d805460ff1916606417905560019081906200008660dc90565b60ff1660ff1681526020019081526020016000206000620000ac620006d960201b60201c565b60ff1660ff1681526020019081526020016000206000620000d2620006e360201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906200010560dc90565b60ff1660ff16815260200190815260200160002060006200012b620006e360201b60201c565b60ff1660ff168152602001908152602001600020600062000151620006d960201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906200018460dc90565b60ff1660ff1681526020019081526020016000206000620001aa620006e360201b60201c565b60ff1660ff1681526020019081526020016000206000620001d0620006e860201b60201c565b60ff1681526020810191909152604001600020805460ff1916911515919091179055565b7f9db7038e59677010ca8f72fa448bad1b4f3c53346b666689163ccac31db467728054606460ff1991821681179092557f1a3062e9a24818c8281fcfb58ec4f3083a2f9a1314ac63f80d8d646661fdc5098054909116600190811790915560009182526020819052907f1bd07f61ef326b4de236f5b68f225f46ff76ee2c375ae31a06da201c49c70c129062000288606e90565b60ff1660ff1681526020019081526020016000206000620002ae620006d960201b60201c565b60ff16815260208101919091526040016000908120805460ff1916921515929092179091556001908190620002e1606490565b60ff1660ff168152602001908152602001600020600062000307620006e360201b60201c565b60ff1660ff1681526020019081526020016000206000620001d0620006ed60201b60201c565b60d3600090815260208190527fa57aae0b1e878b4cf2d1f237d2c6d245fa2af12f527cffc45e0a81d7b3c46abe805460ff1916600a17905560019081906200037360d390565b60ff1660ff168152602001908152602001600020600062000399620006f260201b60201c565b60ff1660ff1681526020019081526020016000206000620003bf620006f760201b60201c565b60ff16815260208101919091526040016000908120805460ff1916921515929092179091556001908190620003f260d390565b60ff1660ff168152602001908152602001600020600062000418620006f260201b60201c565b60ff1660ff16815260200190815260200160002060006200043e620006fc60201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906200047160d390565b60ff1660ff168152602001908152602001600020600062000497620006f260201b60201c565b60ff1660ff1681526020019081526020016000206000620004bd6200070160201b60201c565b60ff16815260208101919091526040016000908120805460ff1916921515929092179091556001908190620004f060d390565b60ff1660ff1681526020019081526020016000206000620005166200070160201b60201c565b60ff1660ff16815260200190815260200160002060006200053c620006d960201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906200056f60d390565b60ff1660ff1681526020019081526020016000206000620001aa620006d960201b60201c565b60c8600090815260208190527fc5f2c791ab4e0b1a0b6c600884b07e98575b00ebd7c3166c4272a53bebf71403805460ff191660641790556001908190620005db60c890565b60ff1660ff168152602001908152602001600020600062000601620006d960201b60201c565b60ff1660ff168152602001908152602001600020600062000627620006e360201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906200065a60c890565b60ff1660ff168152602001908152602001600020600062000680620006e360201b60201c565b60ff1660ff1681526020019081526020016000206000620006a6620006d960201b60201c565b60ff16815260208101919091526040016000908120805460ff1916921515929092179091556001908190620002e160c890565b606490565b905090565b606e90565b60c890565b60d290565b600a90565b601490565b601e90565b60006028620006de565b61094e806200071b6000396000f3fe608060405234801561001057600080fd5b506004361061009e5760003560e01c8063a5961b4c11610066578063a5961b4c1461016b578063a89896751461021c578063bf1db3f914610231578063e9e96c7014610244578063f48016ce1461028257600080fd5b806309648a9d146100a35780630d358181146100e257806338a699a41461010857806354f6127f1461012b5780638eaa6ac01461014b575b600080fd5b6100cb6100b13660046106eb565b600090815260026020526040902054610100900460ff1690565b60405160ff90911681526020015b60405180910390f35b6100cb6100f0366004610716565b60ff9081166000908152602081905260409020541690565b61011b6101163660046106eb565b6102a3565b60405190151581526020016100d9565b61013e6101393660046106eb565b610334565b6040516100d99190610779565b61015e6101593660046106eb565b6103d9565b6040516100d991906107d6565b61020f6101793660046106eb565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915250600090815260026020908152604091829020825160a081018452905460ff8082168352610100820416928201929092526001600160a01b03620100008304169281019290925263ffffffff600160b01b820481166060840152600160d01b90910416608082015290565b6040516100d9919061080a565b61022f61022a366004610818565b61051a565b005b61011b61023f366004610716565b610614565b61011b610252366004610818565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b610295610290366004610863565b610661565b6040519081526020016100d9565b60008181526002602052604080822054905163b2466acf60e01b815261010090910460ff16600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf906024015b602060405180830381865af415801561030a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061032e91906108a3565b92915050565b6000818152600260205260409020600101805460609190610354906108c5565b80601f0160208091040260200160405190810160405280929190818152602001828054610380906108c5565b80156103cd5780601f106103a2576101008083540402835291602001916103cd565b820191906000526020600020905b8154815290600101906020018083116103b057829003601f168201915b50505050509050919050565b6040805160e081018252600091810182815260608083018490526080830184905260a0830184905260c083019390935281526020810191909152600082815260026020908152604091829020825160e081018452815460ff80821695830195865261010082041660608301526001600160a01b0362010000820416608083015263ffffffff600160b01b8204811660a0840152600160d01b9091041660c08201529283526001810180549192840191610491906108c5565b80601f01602080910402602001604051908101604052809291908181526020018280546104bd906108c5565b801561050a5780601f106104df5761010080835404028352916020019161050a565b820191906000526020600020905b8154815290600101906020018083116104ed57829003601f168201915b5050505050815250509050919050565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af415801561057f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105a391906108a3565b156105ad57505050565b60ff80841660009081526001602090815260408083208685168452825280832085851684529091529020541661060f57604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf906024016102ed565b604051637a400b6760e11b815260ff8316600482015260ff198216602482015260009073__$c8f743efd2b4f0c9300f2558c784479d3e$__9063f48016ce90604401602060405180830381865af41580156106c0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e491906108ff565b9392505050565b6000602082840312156106fd57600080fd5b5035919050565b60ff8116811461071357600080fd5b50565b60006020828403121561072857600080fd5b81356106e481610704565b6000815180845260005b818110156107595760208185018101518683018201520161073d565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006106e46020830184610733565b60ff815116825260ff602082015116602083015260018060a01b036040820151166040830152606081015163ffffffff808216606085015280608084015116608085015250505050565b602081526107e860208201835161078c565b6000602083015160c08084015261080260e0840182610733565b949350505050565b60a0810161032e828461078c565b60008060006060848603121561082d57600080fd5b833561083881610704565b9250602084013561084881610704565b9150604084013561085881610704565b809150509250925092565b6000806040838503121561087657600080fd5b823561088181610704565b9150602083013560ff198116811461089857600080fd5b809150509250929050565b6000602082840312156108b557600080fd5b815180151581146106e457600080fd5b600181811c908216806108d957607f821691505b6020821081036108f957634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561091157600080fd5b505191905056fea26469706673582212206eaf3abf03c8738a8ee907007d8321b0e69730562c085f0529dfd72d3bdc738b64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061009e5760003560e01c8063a5961b4c11610066578063a5961b4c1461016b578063a89896751461021c578063bf1db3f914610231578063e9e96c7014610244578063f48016ce1461028257600080fd5b806309648a9d146100a35780630d358181146100e257806338a699a41461010857806354f6127f1461012b5780638eaa6ac01461014b575b600080fd5b6100cb6100b13660046106eb565b600090815260026020526040902054610100900460ff1690565b60405160ff90911681526020015b60405180910390f35b6100cb6100f0366004610716565b60ff9081166000908152602081905260409020541690565b61011b6101163660046106eb565b6102a3565b60405190151581526020016100d9565b61013e6101393660046106eb565b610334565b6040516100d99190610779565b61015e6101593660046106eb565b6103d9565b6040516100d991906107d6565b61020f6101793660046106eb565b6040805160a08101825260008082526020820181905291810182905260608101829052608081019190915250600090815260026020908152604091829020825160a081018452905460ff8082168352610100820416928201929092526001600160a01b03620100008304169281019290925263ffffffff600160b01b820481166060840152600160d01b90910416608082015290565b6040516100d9919061080a565b61022f61022a366004610818565b61051a565b005b61011b61023f366004610716565b610614565b61011b610252366004610818565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b610295610290366004610863565b610661565b6040519081526020016100d9565b60008181526002602052604080822054905163b2466acf60e01b815261010090910460ff16600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf906024015b602060405180830381865af415801561030a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061032e91906108a3565b92915050565b6000818152600260205260409020600101805460609190610354906108c5565b80601f0160208091040260200160405190810160405280929190818152602001828054610380906108c5565b80156103cd5780601f106103a2576101008083540402835291602001916103cd565b820191906000526020600020905b8154815290600101906020018083116103b057829003601f168201915b50505050509050919050565b6040805160e081018252600091810182815260608083018490526080830184905260a0830184905260c083019390935281526020810191909152600082815260026020908152604091829020825160e081018452815460ff80821695830195865261010082041660608301526001600160a01b0362010000820416608083015263ffffffff600160b01b8204811660a0840152600160d01b9091041660c08201529283526001810180549192840191610491906108c5565b80601f01602080910402602001604051908101604052809291908181526020018280546104bd906108c5565b801561050a5780601f106104df5761010080835404028352916020019161050a565b820191906000526020600020905b8154815290600101906020018083116104ed57829003601f168201915b5050505050815250509050919050565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af415801561057f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105a391906108a3565b156105ad57505050565b60ff80841660009081526001602090815260408083208685168452825280832085851684529091529020541661060f57604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf906024016102ed565b604051637a400b6760e11b815260ff8316600482015260ff198216602482015260009073__$c8f743efd2b4f0c9300f2558c784479d3e$__9063f48016ce90604401602060405180830381865af41580156106c0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e491906108ff565b9392505050565b6000602082840312156106fd57600080fd5b5035919050565b60ff8116811461071357600080fd5b50565b60006020828403121561072857600080fd5b81356106e481610704565b6000815180845260005b818110156107595760208185018101518683018201520161073d565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006106e46020830184610733565b60ff815116825260ff602082015116602083015260018060a01b036040820151166040830152606081015163ffffffff808216606085015280608084015116608085015250505050565b602081526107e860208201835161078c565b6000602083015160c08084015261080260e0840182610733565b949350505050565b60a0810161032e828461078c565b60008060006060848603121561082d57600080fd5b833561083881610704565b9250602084013561084881610704565b9150604084013561085881610704565b809150509250925092565b6000806040838503121561087657600080fd5b823561088181610704565b9150602083013560ff198116811461089857600080fd5b809150509250929050565b6000602082840312156108b557600080fd5b815180151581146106e457600080fd5b600181811c908216806108d957607f821691505b6020821081036108f957634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561091157600080fd5b505191905056fea26469706673582212206eaf3abf03c8738a8ee907007d8321b0e69730562c085f0529dfd72d3bdc738b64736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Key32.sol": {
       "Key32Lib": [

package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.dbg.json

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

package/artifacts/contracts/instance/base/Lifecycle.sol/Lifecycle.json

@@ -136,8 +136,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610019610036565b6100216101db565b61002961030c565b61003161055d565b6106c7565b60dc600090815260208190527f5bd290414b404036f9d63146803dd83b59a8e1905062a5bfed8b0154d20a390d805460ff19166064179055600190819061007b60dc90565b60ff1660ff168152602001908152602001600020600061009f61069660201b60201c565b60ff1660ff16815260200190815260200160002060006100c36106a060201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906100f560dc90565b60ff1660ff16815260200190815260200160002060006101196106a060201b60201c565b60ff1660ff168152602001908152602001600020600061013d61069660201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061016f60dc90565b60ff1660ff16815260200190815260200160002060006101936106a060201b60201c565b60ff1660ff16815260200190815260200160002060006101b76106a560201b60201c565b60ff1681526020810191909152604001600020805460ff1916911515919091179055565b7f9db7038e59677010ca8f72fa448bad1b4f3c53346b666689163ccac31db467728054606460ff1991821681179092557f1a3062e9a24818c8281fcfb58ec4f3083a2f9a1314ac63f80d8d646661fdc5098054909116600190811790915560009182526020819052907f1bd07f61ef326b4de236f5b68f225f46ff76ee2c375ae31a06da201c49c70c129061026e606e90565b60ff1660ff168152602001908152602001600020600061029261069660201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906102c4606490565b60ff1660ff16815260200190815260200160002060006102e86106a060201b60201c565b60ff1660ff16815260200190815260200160002060006101b76106aa60201b60201c565b60d2600090815260208190527fc0d27dadfcf8ee0186a0f6fe9b5805a51e99869050491e4a3040efec012a214f805460ff1916600a179055600190819061035160d290565b60ff1660ff16815260200190815260200160002060006103756106af60201b60201c565b60ff1660ff16815260200190815260200160002060006103996106b460201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906103cb60d290565b60ff1660ff16815260200190815260200160002060006103ef6106af60201b60201c565b60ff1660ff16815260200190815260200160002060006104136106b960201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061044560d290565b60ff1660ff16815260200190815260200160002060006104696106af60201b60201c565b60ff1660ff168152602001908152602001600020600061048d6106be60201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906104bf60d290565b60ff1660ff16815260200190815260200160002060006104e36106be60201b60201c565b60ff1660ff168152602001908152602001600020600061050761069660201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061053960d290565b60ff1660ff168152602001908152602001600020600061019361069660201b60201c565b60c8600090815260208190527fc5f2c791ab4e0b1a0b6c600884b07e98575b00ebd7c3166c4272a53bebf71403805460ff1916606417905560019081906105a260c890565b60ff1660ff16815260200190815260200160002060006105c661069660201b60201c565b60ff1660ff16815260200190815260200160002060006105ea6106a060201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061061c60c890565b60ff1660ff16815260200190815260200160002060006106406106a060201b60201c565b60ff1660ff168152602001908152602001600020600061066461069660201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906102c460c890565b606490565b905090565b606e90565b60c890565b60d290565b600a90565b601490565b601e90565b6000602861069b565b610366806106d66000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80630d35818114610051578063a89896751461008e578063bf1db3f9146100a3578063e9e96c70146100c6575b600080fd5b61007761005f36600461029f565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100a161009c3660046102c3565b610104565b005b6100b66100b136600461029f565b6101fe565b6040519015158152602001610085565b6100b66100d43660046102c3565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af4158015610169573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018d919061030e565b1561019757505050565b60ff8084166000908152600160209081526040808320868516845282528083208585168452909152902054166101f957604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf90602401602060405180830381865af4158015610263573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610287919061030e565b92915050565b60ff8116811461029c57600080fd5b50565b6000602082840312156102b157600080fd5b81356102bc8161028d565b9392505050565b6000806000606084860312156102d857600080fd5b83356102e38161028d565b925060208401356102f38161028d565b915060408401356103038161028d565b809150509250925092565b60006020828403121561032057600080fd5b815180151581146102bc57600080fdfea264697066735822122015146173645dabb331d53caf045a8dd58af059c40e971ad6bcd082e8e0b70c9d64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80630d35818114610051578063a89896751461008e578063bf1db3f9146100a3578063e9e96c70146100c6575b600080fd5b61007761005f36600461029f565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100a161009c3660046102c3565b610104565b005b6100b66100b136600461029f565b6101fe565b6040519015158152602001610085565b6100b66100d43660046102c3565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af4158015610169573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018d919061030e565b1561019757505050565b60ff8084166000908152600160209081526040808320868516845282528083208585168452909152902054166101f957604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf90602401602060405180830381865af4158015610263573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610287919061030e565b92915050565b60ff8116811461029c57600080fd5b50565b6000602082840312156102b157600080fd5b81356102bc8161028d565b9392505050565b6000806000606084860312156102d857600080fd5b83356102e38161028d565b925060208401356102f38161028d565b915060408401356103038161028d565b809150509250925092565b60006020828403121561032057600080fd5b815180151581146102bc57600080fdfea264697066735822122015146173645dabb331d53caf045a8dd58af059c40e971ad6bcd082e8e0b70c9d64736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50610019610036565b6100216101db565b61002961030c565b61003161055d565b6106c7565b60dc600090815260208190527f5bd290414b404036f9d63146803dd83b59a8e1905062a5bfed8b0154d20a390d805460ff19166064179055600190819061007b60dc90565b60ff1660ff168152602001908152602001600020600061009f61069660201b60201c565b60ff1660ff16815260200190815260200160002060006100c36106a060201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906100f560dc90565b60ff1660ff16815260200190815260200160002060006101196106a060201b60201c565b60ff1660ff168152602001908152602001600020600061013d61069660201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061016f60dc90565b60ff1660ff16815260200190815260200160002060006101936106a060201b60201c565b60ff1660ff16815260200190815260200160002060006101b76106a560201b60201c565b60ff1681526020810191909152604001600020805460ff1916911515919091179055565b7f9db7038e59677010ca8f72fa448bad1b4f3c53346b666689163ccac31db467728054606460ff1991821681179092557f1a3062e9a24818c8281fcfb58ec4f3083a2f9a1314ac63f80d8d646661fdc5098054909116600190811790915560009182526020819052907f1bd07f61ef326b4de236f5b68f225f46ff76ee2c375ae31a06da201c49c70c129061026e606e90565b60ff1660ff168152602001908152602001600020600061029261069660201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906102c4606490565b60ff1660ff16815260200190815260200160002060006102e86106a060201b60201c565b60ff1660ff16815260200190815260200160002060006101b76106aa60201b60201c565b60d3600090815260208190527fa57aae0b1e878b4cf2d1f237d2c6d245fa2af12f527cffc45e0a81d7b3c46abe805460ff1916600a179055600190819061035160d390565b60ff1660ff16815260200190815260200160002060006103756106af60201b60201c565b60ff1660ff16815260200190815260200160002060006103996106b460201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906103cb60d390565b60ff1660ff16815260200190815260200160002060006103ef6106af60201b60201c565b60ff1660ff16815260200190815260200160002060006104136106b960201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061044560d390565b60ff1660ff16815260200190815260200160002060006104696106af60201b60201c565b60ff1660ff168152602001908152602001600020600061048d6106be60201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906104bf60d390565b60ff1660ff16815260200190815260200160002060006104e36106be60201b60201c565b60ff1660ff168152602001908152602001600020600061050761069660201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061053960d390565b60ff1660ff168152602001908152602001600020600061019361069660201b60201c565b60c8600090815260208190527fc5f2c791ab4e0b1a0b6c600884b07e98575b00ebd7c3166c4272a53bebf71403805460ff1916606417905560019081906105a260c890565b60ff1660ff16815260200190815260200160002060006105c661069660201b60201c565b60ff1660ff16815260200190815260200160002060006105ea6106a060201b60201c565b60ff16815260208101919091526040016000908120805460ff191692151592909217909155600190819061061c60c890565b60ff1660ff16815260200190815260200160002060006106406106a060201b60201c565b60ff1660ff168152602001908152602001600020600061066461069660201b60201c565b60ff16815260208101919091526040016000908120805460ff19169215159290921790915560019081906102c460c890565b606490565b905090565b606e90565b60c890565b60d290565b600a90565b601490565b601e90565b6000602861069b565b610366806106d66000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80630d35818114610051578063a89896751461008e578063bf1db3f9146100a3578063e9e96c70146100c6575b600080fd5b61007761005f36600461029f565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100a161009c3660046102c3565b610104565b005b6100b66100b136600461029f565b6101fe565b6040519015158152602001610085565b6100b66100d43660046102c3565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af4158015610169573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018d919061030e565b1561019757505050565b60ff8084166000908152600160209081526040808320868516845282528083208585168452909152902054166101f957604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf90602401602060405180830381865af4158015610263573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610287919061030e565b92915050565b60ff8116811461029c57600080fd5b50565b6000602082840312156102b157600080fd5b81356102bc8161028d565b9392505050565b6000806000606084860312156102d857600080fd5b83356102e38161028d565b925060208401356102f38161028d565b915060408401356103038161028d565b809150509250925092565b60006020828403121561032057600080fd5b815180151581146102bc57600080fdfea26469706673582212208e3b53b16d02ee2f2aa655647bf553ceb983d4142c0b95d55b9f619d12cdf04e64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80630d35818114610051578063a89896751461008e578063bf1db3f9146100a3578063e9e96c70146100c6575b600080fd5b61007761005f36600461029f565b60ff9081166000908152602081905260409020541690565b60405160ff90911681526020015b60405180910390f35b6100a161009c3660046102c3565b610104565b005b6100b66100b136600461029f565b6101fe565b6040519015158152602001610085565b6100b66100d43660046102c3565b60ff9283166000908152600160209081526040808320948616835293815283822092851682529190915220541690565b60ff8381166000908152602081905260409081902054905163037c8cb160e51b81529116600482015273__$2a12cf1a40369f689f3a67e70f4b31dadc$__90636f91962090602401602060405180830381865af4158015610169573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018d919061030e565b1561019757505050565b60ff8084166000908152600160209081526040808320868516845282528083208585168452909152902054166101f957604051636bb20ea760e01b815260ff808516600483015280841660248301528216604482015260640160405180910390fd5b505050565b60ff81811660009081526020819052604080822054905163b2466acf60e01b8152921660048301529073__$2a12cf1a40369f689f3a67e70f4b31dadc$__9063b2466acf90602401602060405180830381865af4158015610263573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610287919061030e565b92915050565b60ff8116811461029c57600080fd5b50565b6000602082840312156102b157600080fd5b81356102bc8161028d565b9392505050565b6000806000606084860312156102d857600080fd5b83356102e38161028d565b925060208401356102f38161028d565b915060408401356103038161028d565b809150509250925092565b60006020828403121561032057600080fd5b815180151581146102bc57600080fdfea26469706673582212208e3b53b16d02ee2f2aa655647bf553ceb983d4142c0b95d55b9f619d12cdf04e64736f6c63430008140033",
   "linkReferences": {
     "contracts/types/StateId.sol": {
       "StateIdLib": [

package/artifacts/contracts/instance/module/IAccess.sol/IAccess.dbg.json

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