@etherisc/gif-next 0.0.2-e5a2253-213 → 0.0.2-e69072e-892

package/artifacts/contracts/shared/Service.sol/Service.json

@@ -7,81 +7,60 @@
       "inputs": [
         {
           "internalType": "address",
-          "name": "registry",
+          "name": "caller",
           "type": "address"
-        },
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
         }
       ],
-      "name": "ErrorAlreadyLinked",
+      "name": "ErrorIServiceCallerUnknown",
       "type": "error"
     },
     {
       "inputs": [
         {
-          "internalType": "address",
-          "name": "contractAddress",
-          "type": "address"
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
         }
       ],
-      "name": "ErrorContractNotRegistered",
+      "name": "ErrorNftOwnableAlreadyLinked",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "account",
+          "name": "contractAddress",
           "type": "address"
         }
       ],
-      "name": "ErrorNotOwner",
+      "name": "ErrorNftOwnableContractNotRegistered",
       "type": "error"
     },
     {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "registryAddress",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorNotRegistry",
+      "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"
     },
     {
@@ -108,29 +87,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": [],
@@ -201,26 +168,8 @@
             }
           ],
           "internalType": "struct IRegistry.ObjectInfo",
-          "name": "",
+          "name": "info",
           "type": "tuple"
-        },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getInitializedVersion",
-      "outputs": [
-        {
-          "internalType": "uint64",
-          "name": "",
-          "type": "uint64"
         }
       ],
       "stateMutability": "view",
@@ -280,25 +229,19 @@
     },
     {
       "inputs": [],
-      "name": "getVersion",
+      "name": "getRegistryAddress",
       "outputs": [
         {
-          "internalType": "Version",
+          "internalType": "address",
           "name": "",
-          "type": "uint24"
+          "type": "address"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
+      "inputs": [],
       "name": "getVersion",
       "outputs": [
         {
@@ -307,87 +250,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"
@@ -395,20 +319,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"
     },
     {
@@ -418,6 +372,19 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
+        }
+      ],
+      "name": "registerInterface",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -439,23 +406,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/shared/TokenHandler.sol/TokenHandler.dbg.json

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

package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json

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

package/artifacts/contracts/shared/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.json

@@ -122,8 +122,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60a06040523480156200001157600080fd5b5060405162000f2f38038062000f2f8339810160408190526200003491620003e1565b8282828281620000458282620000b0565b50508160405162000056906200037a565b6001600160a01b039091168152602001604051809103906000f08015801562000083573d6000803e3d6000fd5b506001600160a01b0316608052620000a46200009e60805190565b62000116565b505050505050620004df565b620000bb8262000188565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a2805115620001085762000103828262000208565b505050565b6200011262000285565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6200015860008051602062000f0f833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16200018581620002a7565b50565b806001600160a01b03163b600003620001c457604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b6060600080846001600160a01b031684604051620002279190620004c1565b600060405180830381855af49150503d806000811462000264576040519150601f19603f3d011682016040523d82523d6000602084013e62000269565b606091505b5090925090506200027c858383620002ea565b95945050505050565b3415620002a55760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b038116620002d357604051633173bdd160e11b815260006004820152602401620001bb565b8060008051602062000f0f833981519152620001e7565b6060826200030357620002fd8262000350565b62000349565b81511580156200031b57506001600160a01b0384163b155b156200034657604051639996b31560e01b81526001600160a01b0385166004820152602401620001bb565b50805b9392505050565b805115620003615780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b61052480620009eb83390190565b80516001600160a01b0381168114620003a057600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620003d8578181015183820152602001620003be565b50506000910152565b600080600060608486031215620003f757600080fd5b620004028462000388565b9250620004126020850162000388565b60408501519092506001600160401b03808211156200043057600080fd5b818601915086601f8301126200044557600080fd5b8151818111156200045a576200045a620003a5565b604051601f8201601f19908116603f01168101908382118183101715620004855762000485620003a5565b816040528281528960208487010111156200049f57600080fd5b620004b2836020830160208801620003bb565b80955050505050509250925092565b60008251620004d5818460208701620003bb565b9190910192915050565b6080516104eb620005006000396000818160370152607401526104eb6000f3fe60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea264697066735822122061d21ea0f293a274302e47ad0e30c5fb666a07dc4f8e1cfa79d3064668655aa064736f6c63430008140033608060405234801561001057600080fd5b5060405161052438038061052483398101604081905261002f916100be565b806001600160a01b03811661005e57604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b6100678161006e565b50506100ee565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000602082840312156100d057600080fd5b81516001600160a01b03811681146100e757600080fd5b9392505050565b610427806100fd6000396000f3fe60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea2646970667358221220cb46d8eee562c2068d4d3afab9e2a7f48be119bb61a6a1c3d7ef6ba5a8aff09464736f6c63430008140033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
-  "deployedBytecode": "0x60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea264697066735822122061d21ea0f293a274302e47ad0e30c5fb666a07dc4f8e1cfa79d3064668655aa064736f6c63430008140033",
+  "bytecode": "0x60a06040523480156200001157600080fd5b5060405162000f2f38038062000f2f8339810160408190526200003491620003e1565b8282828281620000458282620000b0565b50508160405162000056906200037a565b6001600160a01b039091168152602001604051809103906000f08015801562000083573d6000803e3d6000fd5b506001600160a01b0316608052620000a46200009e60805190565b62000116565b505050505050620004df565b620000bb8262000188565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a2805115620001085762000103828262000208565b505050565b6200011262000285565b5050565b7f7e644d79422f17c01e4894b5f4f588d331ebfa28653d42ae832dc59e38c9798f6200015860008051602062000f0f833981519152546001600160a01b031690565b604080516001600160a01b03928316815291841660208301520160405180910390a16200018581620002a7565b50565b806001600160a01b03163b600003620001c457604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b807f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5b80546001600160a01b0319166001600160a01b039290921691909117905550565b6060600080846001600160a01b031684604051620002279190620004c1565b600060405180830381855af49150503d806000811462000264576040519150601f19603f3d011682016040523d82523d6000602084013e62000269565b606091505b5090925090506200027c858383620002ea565b95945050505050565b3415620002a55760405163b398979f60e01b815260040160405180910390fd5b565b6001600160a01b038116620002d357604051633173bdd160e11b815260006004820152602401620001bb565b8060008051602062000f0f833981519152620001e7565b6060826200030357620002fd8262000350565b62000349565b81511580156200031b57506001600160a01b0384163b155b156200034657604051639996b31560e01b81526001600160a01b0385166004820152602401620001bb565b50805b9392505050565b805115620003615780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b61052480620009eb83390190565b80516001600160a01b0381168114620003a057600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620003d8578181015183820152602001620003be565b50506000910152565b600080600060608486031215620003f757600080fd5b620004028462000388565b9250620004126020850162000388565b60408501519092506001600160401b03808211156200043057600080fd5b818601915086601f8301126200044557600080fd5b8151818111156200045a576200045a620003a5565b604051601f8201601f19908116603f01168101908382118183101715620004855762000485620003a5565b816040528281528960208487010111156200049f57600080fd5b620004b2836020830160208801620003bb565b80955050505050509250925092565b60008251620004d5818460208701620003bb565b9190910192915050565b6080516104eb620005006000396000818160370152607401526104eb6000f3fe60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea26469706673582212208eec392843ea468857c026e8015385bb30d80269923d8cf4188551b1fb73c5c264736f6c63430008140033608060405234801561001057600080fd5b5060405161052438038061052483398101604081905261002f916100be565b806001600160a01b03811661005e57604051631e4fbdf760e01b81526000600482015260240160405180910390fd5b6100678161006e565b50506100ee565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6000602082840312156100d057600080fd5b81516001600160a01b03811681146100e757600080fd5b9392505050565b610427806100fd6000396000f3fe60806040526004361061004a5760003560e01c8063715018a61461004f5780638da5cb5b146100665780639623609d14610093578063ad3cb1cc146100a6578063f2fde38b146100e4575b600080fd5b34801561005b57600080fd5b50610064610104565b005b34801561007257600080fd5b506000546040516001600160a01b0390911681526020015b60405180910390f35b6100646100a1366004610272565b610118565b3480156100b257600080fd5b506100d7604051806040016040528060058152602001640352e302e360dc1b81525081565b60405161008a919061038e565b3480156100f057600080fd5b506100646100ff3660046103a8565b610187565b61010c6101ca565b61011660006101f7565b565b6101206101ca565b60405163278f794360e11b81526001600160a01b03841690634f1ef28690349061015090869086906004016103c5565b6000604051808303818588803b15801561016957600080fd5b505af115801561017d573d6000803e3d6000fd5b5050505050505050565b61018f6101ca565b6001600160a01b0381166101be57604051631e4fbdf760e01b8152600060048201526024015b60405180910390fd5b6101c7816101f7565b50565b6000546001600160a01b031633146101165760405163118cdaa760e01b81523360048201526024016101b5565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b6001600160a01b03811681146101c757600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060006060848603121561028757600080fd5b833561029281610247565b925060208401356102a281610247565b9150604084013567ffffffffffffffff808211156102bf57600080fd5b818601915086601f8301126102d357600080fd5b8135818111156102e5576102e561025c565b604051601f8201601f19908116603f0116810190838211818310171561030d5761030d61025c565b8160405282815289602084870101111561032657600080fd5b8260208601602083013760006020848301015280955050505050509250925092565b6000815180845260005b8181101561036e57602081850181015186830182015201610352565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103a16020830184610348565b9392505050565b6000602082840312156103ba57600080fd5b81356103a181610247565b6001600160a01b03831681526040602082018190526000906103e990830184610348565b94935050505056fea2646970667358221220cb46d8eee562c2068d4d3afab9e2a7f48be119bb61a6a1c3d7ef6ba5a8aff09464736f6c63430008140033b53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103",
+  "deployedBytecode": "0x60806040526004361061001e5760003560e01c80638b3240a014610028575b610026610072565b005b34801561003457600080fd5b507f00000000000000000000000000000000000000000000000000000000000000006040516001600160a01b03909116815260200160405180910390f35b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031633036100df576000356001600160e01b03191663278f794360e11b146100d5576040516334ad5dbb60e21b815260040160405180910390fd5b6100dd6100ec565b565b6100dd61011b565b905090565b6000806100fc3660048184610376565b81019061010991906103b6565b91509150610117828261012b565b5050565b6100dd610126610186565b6101b9565b610134826101dd565b6040516001600160a01b038316907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a280511561017e576101798282610259565b505050565b6101176102cf565b60006100e77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b3660008037600080366000845af43d6000803e8080156101d8573d6000f35b3d6000fd5b806001600160a01b03163b60000361021857604051634c9c8ce360e01b81526001600160a01b03821660048201526024015b60405180910390fd5b7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc80546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080846001600160a01b0316846040516102769190610486565b600060405180830381855af49150503d80600081146102b1576040519150601f19603f3d011682016040523d82523d6000602084013e6102b6565b606091505b50915091506102c68583836102ee565b95945050505050565b34156100dd5760405163b398979f60e01b815260040160405180910390fd5b606082610303576102fe8261034d565b610346565b815115801561031a57506001600160a01b0384163b155b1561034357604051639996b31560e01b81526001600160a01b038516600482015260240161020f565b50805b9392505050565b80511561035d5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b6000808585111561038657600080fd5b8386111561039357600080fd5b5050820193919092039150565b634e487b7160e01b600052604160045260246000fd5b600080604083850312156103c957600080fd5b82356001600160a01b03811681146103e057600080fd5b9150602083013567ffffffffffffffff808211156103fd57600080fd5b818501915085601f83011261041157600080fd5b813581811115610423576104236103a0565b604051601f8201601f19908116603f0116810190838211818310171561044b5761044b6103a0565b8160405282815288602084870101111561046457600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000825160005b818110156104a7576020818601810151858301520161048d565b50600092019182525091905056fea26469706673582212208eec392843ea468857c026e8015385bb30d80269923d8cf4188551b1fb73c5c264736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/shared/Versionable.sol/Versionable.dbg.json

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

package/artifacts/contracts/shared/Versionable.sol/Versionable.json

@@ -26,44 +26,6 @@
       "name": "Initialized",
       "type": "event"
     },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "Version",
-          "name": "version",
-          "type": "uint24"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
-        }
-      ],
-      "name": "LogVersionableInitialized",
-      "type": "event"
-    },
-    {
-      "inputs": [],
-      "name": "getInitializedVersion",
-      "outputs": [
-        {
-          "internalType": "uint64",
-          "name": "",
-          "type": "uint64"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [],
       "name": "getVersion",
@@ -77,91 +39,8 @@
       "stateMutability": "pure",
       "type": "function"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "idx",
-          "type": "uint256"
-        }
-      ],
-      "name": "getVersion",
-      "outputs": [
-        {
-          "internalType": "Version",
-          "name": "",
-          "type": "uint24"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getVersionCount",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
-        }
-      ],
-      "name": "getVersionInfo",
-      "outputs": [
-        {
-          "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"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
     {
       "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
         {
           "internalType": "address",
           "name": "activatedBy",
@@ -173,49 +52,20 @@
           "type": "bytes"
         }
       ],
-      "name": "initialize",
+      "name": "initializeVersionable",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     },
     {
       "inputs": [
-        {
-          "internalType": "Version",
-          "name": "_version",
-          "type": "uint24"
-        }
-      ],
-      "name": "isInitialized",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "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"