@etherisc/gif-next 0.0.2-ce8407f-016 → 0.0.2-ceb30b2-601

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"

package/artifacts/contracts/test/TestFee.sol/TestFee.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/513944a18d93e005314a3ed93f91d5cd.json"
+  "buildInfo": "../../../build-info/37452893015e5bf83358929bf7a72a5c.json"
 }

package/artifacts/contracts/test/TestFee.sol/TestFee.json

@@ -70,8 +70,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610301806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006d575b600080fd5b61004e610049366004610217565b610075565b6040805182518152602092830151928101929092520160405180910390f35b61004e610192565b6040805180820190915260008082526020820152604051631488c84560e01b815260048101859052600084900b602482015273__$a23651848365a6a5ca15f07b4331037f48$__9063c7010dfa9073__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__90631488c84590604401602060405180830381865af41580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610255565b846040518363ffffffff1660e01b815260040161014a929190918252602082015260400190565b6040805180830381865af4158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a919061026e565b949350505050565b604080518082019091526000808252602082015273__$a23651848365a6a5ca15f07b4331037f48$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea26469706673582212209bfce5af9619ec4b682783c86a4a759179e4f7d10da372b502c45afa25ab2e8864736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006d575b600080fd5b61004e610049366004610217565b610075565b6040805182518152602092830151928101929092520160405180910390f35b61004e610192565b6040805180820190915260008082526020820152604051631488c84560e01b815260048101859052600084900b602482015273__$a23651848365a6a5ca15f07b4331037f48$__9063c7010dfa9073__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__90631488c84590604401602060405180830381865af41580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610255565b846040518363ffffffff1660e01b815260040161014a929190918252602082015260400190565b6040805180830381865af4158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a919061026e565b949350505050565b604080518082019091526000808252602082015273__$a23651848365a6a5ca15f07b4331037f48$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea26469706673582212209bfce5af9619ec4b682783c86a4a759179e4f7d10da372b502c45afa25ab2e8864736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50610301806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006d575b600080fd5b61004e610049366004610217565b610075565b6040805182518152602092830151928101929092520160405180910390f35b61004e610192565b6040805180820190915260008082526020820152604051631488c84560e01b815260048101859052600084900b602482015273__$a23651848365a6a5ca15f07b4331037f48$__9063c7010dfa9073__$5ac3274b8cf1e01ea223bf093142af05b0$__90631488c84590604401602060405180830381865af41580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610255565b846040518363ffffffff1660e01b815260040161014a929190918252602082015260400190565b6040805180830381865af4158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a919061026e565b949350505050565b604080518082019091526000808252602082015273__$a23651848365a6a5ca15f07b4331037f48$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea2646970667358221220ad51c418f1e0543178527833e1b8039839cf316f063cea581690404c9cc9725164736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006d575b600080fd5b61004e610049366004610217565b610075565b6040805182518152602092830151928101929092520160405180910390f35b61004e610192565b6040805180820190915260008082526020820152604051631488c84560e01b815260048101859052600084900b602482015273__$a23651848365a6a5ca15f07b4331037f48$__9063c7010dfa9073__$5ac3274b8cf1e01ea223bf093142af05b0$__90631488c84590604401602060405180830381865af41580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610255565b846040518363ffffffff1660e01b815260040161014a929190918252602082015260400190565b6040805180830381865af4158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a919061026e565b949350505050565b604080518082019091526000808252602082015273__$a23651848365a6a5ca15f07b4331037f48$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea2646970667358221220ad51c418f1e0543178527833e1b8039839cf316f063cea581690404c9cc9725164736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Fee.sol": {
       "FeeLib": [
@@ -86,7 +86,7 @@
       ]
     },
     "contracts/types/UFixed.sol": {
-      "UFixedMathLib": [
+      "UFixedLib": [
         {
           "length": 20,
           "start": 229
@@ -108,7 +108,7 @@
       ]
     },
     "contracts/types/UFixed.sol": {
-      "UFixedMathLib": [
+      "UFixedLib": [
         {
           "length": 20,
           "start": 197

package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/513944a18d93e005314a3ed93f91d5cd.json"
+  "buildInfo": "../../../build-info/37452893015e5bf83358929bf7a72a5c.json"
 }

package/artifacts/contracts/test/TestRegisterable.sol/TestRegisterable.json

@@ -36,18 +36,13 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "address",
-          "name": "registry",
-          "type": "address"
-        },
         {
           "internalType": "NftId",
           "name": "nftId",
           "type": "uint96"
         }
       ],
-      "name": "ErrorAlreadyLinked",
+      "name": "ErrorNftOwnableAlreadyLinked",
       "type": "error"
     },
     {
@@ -58,29 +53,23 @@
           "type": "address"
         }
       ],
-      "name": "ErrorContractNotRegistered",
+      "name": "ErrorNftOwnableContractNotRegistered",
       "type": "error"
     },
     {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorNotOwner",
+      "inputs": [],
+      "name": "ErrorNftOwnableInitialOwnerZero",
       "type": "error"
     },
     {
       "inputs": [
         {
           "internalType": "address",
-          "name": "registryAddress",
+          "name": "account",
           "type": "address"
         }
       ],
-      "name": "ErrorNotRegistry",
+      "name": "ErrorNftOwnableNotOwner",
       "type": "error"
     },
     {
@@ -91,28 +80,7 @@
           "type": "address"
         }
       ],
-      "name": "ErrorRegisterableNotRegistry",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "ErrorRegistryAddressZero",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "registry",
-          "type": "address"
-        }
-      ],
-      "name": "ErrorRegistryAlreadyInitialized",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "ErrorRegistryNotInitialized",
+      "name": "ErrorNotRegistry",
       "type": "error"
     },
     {
@@ -138,6 +106,19 @@
       "name": "Initialized",
       "type": "event"
     },
+    {
+      "inputs": [],
+      "name": "NFT_OWNABLE_STORAGE_LOCATION_V1",
+      "outputs": [
+        {
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "REGISTERABLE_LOCATION_V1",
@@ -194,13 +175,8 @@
             }
           ],
           "internalType": "struct IRegistry.ObjectInfo",
-          "name": "",
+          "name": "info",
           "type": "tuple"
-        },
-        {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
         }
       ],
       "stateMutability": "view",
@@ -245,6 +221,82 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "initializeERC165",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        }
+      ],
+      "name": "initializeNftOwnable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "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": "initialOwner",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "registryData",
+          "type": "bytes"
+        }
+      ],
+      "name": "initializeRegisterable",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        }
+      ],
+      "name": "initializeRegistryLinked",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "linkToRegisteredNftId",
@@ -252,6 +304,19 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
+        }
+      ],
+      "name": "registerInterface",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -272,18 +337,18 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b5060405162000d9638038062000d96833981016040819052620000349162000347565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055600280546001600160a01b03191633179055604080516020810190915260008152620000a1868686868686620000ad565b50505050505062000563565b620000b982876200017e565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d01000000000000000000000000008615150217815590506001810162000138838262000472565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b600280546001600160a01b0319166001600160a01b038416179055620001a481620001a8565b5050565b6001546001600160a01b031615620001e75760015460405163fcdbf2d960e01b81526001600160a01b0390911660048201526024015b60405180910390fd5b6001600160a01b0381166200020f5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620002475760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152632c1c764b60e11b60048201526301ffc9a790602401602060405180830381865afa925050508015620002c4575060408051601f3d908101601f19168201909252620002c1918101906200053e565b60015b620002ee5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b80620001a45760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001de565b80516001600160a01b03811681146200033157600080fd5b919050565b805180151581146200033157600080fd5b600080600080600060a086880312156200036057600080fd5b6200036b8662000319565b60208701519095506001600160601b03811681146200038957600080fd5b604087015190945060ff81168114620003a157600080fd5b9250620003b16060870162000336565b9150620003c16080870162000319565b90509295509295909350565b634e487b7160e01b600052604160045260246000fd5b600181811c90821680620003f857607f821691505b6020821081036200041957634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200046d57600081815260208120601f850160051c81016020861015620004485750805b601f850160051c820191505b81811015620004695782815560010162000454565b5050505b505050565b81516001600160401b038111156200048e576200048e620003cd565b620004a6816200049f8454620003e3565b846200041f565b602080601f831160018114620004de5760008415620004c55750858301515b600019600386901b1c1916600185901b17855562000469565b600085815260208120601f198616915b828110156200050f57888601518255948401946001909101908401620004ee565b50858210156200052e5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000602082840312156200055157600080fd5b6200055c8262000336565b9392505050565b61082380620005736000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80631eff4b221161005b5780631eff4b22146100e45780635ab1bd5314610119578063644c45e01461013e578063893d20e81461016957600080fd5b806301ffc9a7146100825780630fec111c146100c4578063138461e0146100da575b600080fd5b6100af610090366004610621565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100cc610171565b6040516100bb929190610698565b6100e26102e1565b005b61010b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100bb565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100bb565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100bb565b610126610503565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806101e2600090565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161022a610503565b6001600160a01b031681526020018260010180546102479061073f565b80601f01602080910402602001604051908101604052809291908181526020018280546102739061073f565b80156102c05780601f10610295576101008083540402835291602001916102c0565b820191906000526020600020905b8154815290600101906020018083116102a357829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610343573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103679190610779565b156103ae576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166103d75760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610420573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104449190610779565b61046c576040516372657a5160e01b81526001600160a01b03821660048201526024016103a5565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156104b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104da919061079b565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610568573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058c9190610779565b1561061157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156105e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060c91906107c4565b905090565b506002546001600160a01b031690565b60006020828403121561063357600080fd5b81356001600160e01b03198116811461064b57600080fd5b9392505050565b6000815180845260005b818110156106785760208185018101518683018201520161065c565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516106dc60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610722610120840182610652565b905082810360208401526107368185610652565b95945050505050565b600181811c9082168061075357607f821691505b60208210810361077357634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561078b57600080fd5b8151801515811461064b57600080fd5b6000602082840312156107ad57600080fd5b81516001600160601b038116811461064b57600080fd5b6000602082840312156107d657600080fd5b81516001600160a01b038116811461064b57600080fdfea26469706673582212208d3570e695db74cd77847f8dc7b17f7bb6cd98cb60d270c286a2a52205e4d60264736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80631eff4b221161005b5780631eff4b22146100e45780635ab1bd5314610119578063644c45e01461013e578063893d20e81461016957600080fd5b806301ffc9a7146100825780630fec111c146100c4578063138461e0146100da575b600080fd5b6100af610090366004610621565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100cc610171565b6040516100bb929190610698565b6100e26102e1565b005b61010b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100bb565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100bb565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100bb565b610126610503565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806101e2600090565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161022a610503565b6001600160a01b031681526020018260010180546102479061073f565b80601f01602080910402602001604051908101604052809291908181526020018280546102739061073f565b80156102c05780601f10610295576101008083540402835291602001916102c0565b820191906000526020600020905b8154815290600101906020018083116102a357829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610343573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103679190610779565b156103ae576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166103d75760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610420573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104449190610779565b61046c576040516372657a5160e01b81526001600160a01b03821660048201526024016103a5565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156104b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104da919061079b565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610568573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058c9190610779565b1561061157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156105e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060c91906107c4565b905090565b506002546001600160a01b031690565b60006020828403121561063357600080fd5b81356001600160e01b03198116811461064b57600080fd5b9392505050565b6000815180845260005b818110156106785760208185018101518683018201520161065c565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516106dc60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610722610120840182610652565b905082810360208401526107368185610652565b95945050505050565b600181811c9082168061075357607f821691505b60208210810361077357634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561078b57600080fd5b8151801515811461064b57600080fd5b6000602082840312156107ad57600080fd5b81516001600160601b038116811461064b57600080fd5b6000602082840312156107d657600080fd5b81516001600160a01b038116811461064b57600080fdfea26469706673582212208d3570e695db74cd77847f8dc7b17f7bb6cd98cb60d270c286a2a52205e4d60264736f6c63430008140033",
+  "bytecode": "0x60806040523480156200001157600080fd5b506040516200141438038062001414833981016040819052620000349162000393565b604080516020810190915260008152620000538686868686866200005f565b505050505050620005af565b6200006962000117565b62000075828762000168565b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0387166001600160681b0319909116176c0100000000000000000000000060ff8716021760ff60681b19166d0100000000000000000000000000851515021781557f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3016200010d8382620004be565b5050505050505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff166200016657604051631afcd79f60e31b815260040160405180910390fd5b565b6200017262000117565b6200017d8162000201565b620001876200031d565b6001600160a01b038216620001af5760405163f17ef42d60e01b815260040160405180910390fd5b507f07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f0080546001600160601b03166c010000000000000000000000006001600160a01b0390931692909202919091179055565b6200020b62000117565b806001600160a01b03163b600003620002475760405163fdeac91f60e01b81526001600160a01b03821660048201526024015b60405180910390fd5b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152630a3888e560e31b60048201526301ffc9a790602401602060405180830381865afa925050508015620002c4575060408051601f3d908101601f19168201909252620002c1918101906200058a565b60015b620002ee5760405163fdeac91f60e01b81526001600160a01b03821660048201526024016200023e565b80620003195760405163fdeac91f60e01b81526001600160a01b03831660048201526024016200023e565b5050565b6200032762000117565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b80516001600160a01b03811681146200037d57600080fd5b919050565b805180151581146200037d57600080fd5b600080600080600060a08688031215620003ac57600080fd5b620003b78662000365565b60208701519095506001600160601b0381168114620003d557600080fd5b604087015190945060ff81168114620003ed57600080fd5b9250620003fd6060870162000382565b91506200040d6080870162000365565b90509295509295909350565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200044457607f821691505b6020821081036200046557634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620004b957600081815260208120601f850160051c81016020861015620004945750805b601f850160051c820191505b81811015620004b557828155600101620004a0565b5050505b505050565b81516001600160401b03811115620004da57620004da62000419565b620004f281620004eb84546200042f565b846200046b565b602080601f8311600181146200052a5760008415620005115750858301515b600019600386901b1c1916600185901b178555620004b5565b600085815260208120601f198616915b828110156200055b578886015182559484019460019091019084016200053a565b50858210156200057a5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000602082840312156200059d57600080fd5b620005a88262000382565b9392505050565b610e5580620005bf6000396000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c806336fc697e1161008c578063675393bf11610066578063675393bf146101e5578063893d20e8146101f8578063ada9652e14610200578063f7c34ee01461021557600080fd5b806336fc697e146101905780635ab1bd5314610198578063644c45e0146101bd57600080fd5b806301ffc9a7146100d45780630fec111c14610116578063138461e01461012b5780631eff4b2214610135578063214cdb801461016a57806327bb7a331461017d575b600080fd5b6101016100e23660046109a6565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61011e610228565b60405161010d9190610a1d565b61013361037b565b005b61015c7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b60405190815260200161010d565b6101336101783660046109a6565b610582565b61013361018b366004610af6565b6105af565b610133610654565b6001546001600160a01b03165b6040516001600160a01b03909116815260200161010d565b600080516020610e00833981519152546040516001600160601b03909116815260200161010d565b6101336101f3366004610c09565b61069a565b6101a56107a8565b61015c600080516020610e0083398151915281565b610133610223366004610c26565b6108df565b6040805160e0808201835260008083526020830181905282840181905260608084018290526080840182905260a0840182905260c0840152835191820190935290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300919081906001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a0016102d76107a8565b6001600160a01b031681526020018260010180546102f490610c5f565b80601f016020809104026020016040519081016040528092919081815260200182805461032090610c5f565b801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b505050505081525091505090565b6000600080516020610e0083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156103ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061040e9190610c99565b1561043f5780546040516301ab8b6760e21b81526001600160601b0390911660048201526024015b60405180910390fd5b306104526001546001600160a01b031690565b60405163c3c5a54760e01b81526001600160a01b038381166004830152919091169063c3c5a54790602401602060405180830381865afa15801561049a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104be9190610c99565b6104e65760405163b9304b0d60e01b81526001600160a01b0382166004820152602401610436565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038381166004830152919091169063d272ac1e90602401602060405180830381865afa15801561053a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061055e9190610cb6565b82546bffffffffffffffffffffffff19166001600160601b03919091161790915550565b61058a610956565b6001600160e01b0319166000908152602081905260409020805460ff19166001179055565b6105b7610956565b6105c182876108df565b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0387166cffffffffffffffffffffffffff1990911617600160601b60ff8716021760ff60681b1916600160681b851515021781557f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30161064a8382610d22565b5050505050505050565b61065c610956565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b6106a2610956565b806001600160a01b03163b6000036106d85760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610436565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152630a3888e560e31b60048201526301ffc9a790602401602060405180830381865afa925050508015610752575060408051601f3d908101601f1916820190925261074f91810190610c99565b60015b61077a5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610436565b806107a35760405163fdeac91f60e01b81526001600160a01b0383166004820152602401610436565b505b50565b600080600080516020610e0083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610818573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061083c9190610c99565b156108c9576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa15801561089f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108c39190610de2565b91505090565b54600160601b90046001600160a01b0316919050565b6108e7610956565b6108f08161069a565b6108f8610654565b6001600160a01b03821661091f5760405163f17ef42d60e01b815260040160405180910390fd5b50600080516020610e0083398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff166109a457604051631afcd79f60e31b815260040160405180910390fd5b565b6000602082840312156109b857600080fd5b81356001600160e01b0319811681146109d057600080fd5b9392505050565b6000815180845260005b818110156109fd576020818501810151868301820152016109e1565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a0830151610a8660c08401826001600160a01b03169052565b5060c083015160e080840152610aa06101008401826109d7565b949350505050565b6001600160a01b03811681146107a557600080fd5b6001600160601b03811681146107a557600080fd5b80151581146107a557600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060008060008060c08789031215610b0f57600080fd5b8635610b1a81610aa8565b95506020870135610b2a81610abd565b9450604087013560ff81168114610b4057600080fd5b93506060870135610b5081610ad2565b92506080870135610b6081610aa8565b915060a087013567ffffffffffffffff80821115610b7d57600080fd5b818901915089601f830112610b9157600080fd5b813581811115610ba357610ba3610ae0565b604051601f8201601f19908116603f01168101908382118183101715610bcb57610bcb610ae0565b816040528281528c6020848701011115610be457600080fd5b8260208601602083013760006020848301015280955050505050509295509295509295565b600060208284031215610c1b57600080fd5b81356109d081610aa8565b60008060408385031215610c3957600080fd5b8235610c4481610aa8565b91506020830135610c5481610aa8565b809150509250929050565b600181811c90821680610c7357607f821691505b602082108103610c9357634e487b7160e01b600052602260045260246000fd5b50919050565b600060208284031215610cab57600080fd5b81516109d081610ad2565b600060208284031215610cc857600080fd5b81516109d081610abd565b601f821115610d1d57600081815260208120601f850160051c81016020861015610cfa5750805b601f850160051c820191505b81811015610d1957828155600101610d06565b5050505b505050565b815167ffffffffffffffff811115610d3c57610d3c610ae0565b610d5081610d4a8454610c5f565b84610cd3565b602080601f831160018114610d855760008415610d6d5750858301515b600019600386901b1c1916600185901b178555610d19565b600085815260208120601f198616915b82811015610db457888601518255948401946001909101908401610d95565b5085821015610dd25787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215610df457600080fd5b81516109d081610aa856fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220933e7935fc974fe74dea8986380fc3071da657de7aa397d85be83b8b59ca7eec64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c806336fc697e1161008c578063675393bf11610066578063675393bf146101e5578063893d20e8146101f8578063ada9652e14610200578063f7c34ee01461021557600080fd5b806336fc697e146101905780635ab1bd5314610198578063644c45e0146101bd57600080fd5b806301ffc9a7146100d45780630fec111c14610116578063138461e01461012b5780631eff4b2214610135578063214cdb801461016a57806327bb7a331461017d575b600080fd5b6101016100e23660046109a6565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b61011e610228565b60405161010d9190610a1d565b61013361037b565b005b61015c7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b60405190815260200161010d565b6101336101783660046109a6565b610582565b61013361018b366004610af6565b6105af565b610133610654565b6001546001600160a01b03165b6040516001600160a01b03909116815260200161010d565b600080516020610e00833981519152546040516001600160601b03909116815260200161010d565b6101336101f3366004610c09565b61069a565b6101a56107a8565b61015c600080516020610e0083398151915281565b610133610223366004610c26565b6108df565b6040805160e0808201835260008083526020830181905282840181905260608084018290526080840182905260a0840182905260c0840152835191820190935290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa300919081906001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a0016102d76107a8565b6001600160a01b031681526020018260010180546102f490610c5f565b80601f016020809104026020016040519081016040528092919081815260200182805461032090610c5f565b801561036d5780601f106103425761010080835404028352916020019161036d565b820191906000526020600020905b81548152906001019060200180831161035057829003601f168201915b505050505081525091505090565b6000600080516020610e0083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156103ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061040e9190610c99565b1561043f5780546040516301ab8b6760e21b81526001600160601b0390911660048201526024015b60405180910390fd5b306104526001546001600160a01b031690565b60405163c3c5a54760e01b81526001600160a01b038381166004830152919091169063c3c5a54790602401602060405180830381865afa15801561049a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104be9190610c99565b6104e65760405163b9304b0d60e01b81526001600160a01b0382166004820152602401610436565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038381166004830152919091169063d272ac1e90602401602060405180830381865afa15801561053a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061055e9190610cb6565b82546bffffffffffffffffffffffff19166001600160601b03919091161790915550565b61058a610956565b6001600160e01b0319166000908152602081905260409020805460ff19166001179055565b6105b7610956565b6105c182876108df565b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0387166cffffffffffffffffffffffffff1990911617600160601b60ff8716021760ff60681b1916600160681b851515021781557f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30161064a8382610d22565b5050505050505050565b61065c610956565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b6106a2610956565b806001600160a01b03163b6000036106d85760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610436565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152630a3888e560e31b60048201526301ffc9a790602401602060405180830381865afa925050508015610752575060408051601f3d908101601f1916820190925261074f91810190610c99565b60015b61077a5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401610436565b806107a35760405163fdeac91f60e01b81526001600160a01b0383166004820152602401610436565b505b50565b600080600080516020610e0083398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610818573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061083c9190610c99565b156108c9576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa15801561089f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108c39190610de2565b91505090565b54600160601b90046001600160a01b0316919050565b6108e7610956565b6108f08161069a565b6108f8610654565b6001600160a01b03821661091f5760405163f17ef42d60e01b815260040160405180910390fd5b50600080516020610e0083398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff166109a457604051631afcd79f60e31b815260040160405180910390fd5b565b6000602082840312156109b857600080fd5b81356001600160e01b0319811681146109d057600080fd5b9392505050565b6000815180845260005b818110156109fd576020818501810151868301820152016109e1565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a0830151610a8660c08401826001600160a01b03169052565b5060c083015160e080840152610aa06101008401826109d7565b949350505050565b6001600160a01b03811681146107a557600080fd5b6001600160601b03811681146107a557600080fd5b80151581146107a557600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060008060008060c08789031215610b0f57600080fd5b8635610b1a81610aa8565b95506020870135610b2a81610abd565b9450604087013560ff81168114610b4057600080fd5b93506060870135610b5081610ad2565b92506080870135610b6081610aa8565b915060a087013567ffffffffffffffff80821115610b7d57600080fd5b818901915089601f830112610b9157600080fd5b813581811115610ba357610ba3610ae0565b604051601f8201601f19908116603f01168101908382118183101715610bcb57610bcb610ae0565b816040528281528c6020848701011115610be457600080fd5b8260208601602083013760006020848301015280955050505050509295509295509295565b600060208284031215610c1b57600080fd5b81356109d081610aa8565b60008060408385031215610c3957600080fd5b8235610c4481610aa8565b91506020830135610c5481610aa8565b809150509250929050565b600181811c90821680610c7357607f821691505b602082108103610c9357634e487b7160e01b600052602260045260246000fd5b50919050565b600060208284031215610cab57600080fd5b81516109d081610ad2565b600060208284031215610cc857600080fd5b81516109d081610abd565b601f821115610d1d57600081815260208120601f850160051c81016020861015610cfa5750805b601f850160051c820191505b81811015610d1957828155600101610d06565b5050505b505050565b815167ffffffffffffffff811115610d3c57610d3c610ae0565b610d5081610d4a8454610c5f565b84610cd3565b602080601f831160018114610d855760008415610d6d5750858301515b600019600386901b1c1916600185901b178555610d19565b600085815260208120601f198616915b82811015610db457888601518255948401946001909101908401610d95565b5085821015610dd25787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215610df457600080fd5b81516109d081610aa856fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220933e7935fc974fe74dea8986380fc3071da657de7aa397d85be83b8b59ca7eec64736f6c63430008140033",
   "linkReferences": {
     "contracts/types/NftId.sol": {
       "NftIdLib": [
         {
           "length": 20,
-          "start": 2172
+          "start": 2415
         },
         {
           "length": 20,
-          "start": 2721
+          "start": 3485
         }
       ]
     }
@@ -293,11 +358,11 @@
       "NftIdLib": [
         {
           "length": 20,
-          "start": 777
+          "start": 944
         },
         {
           "length": 20,
-          "start": 1326
+          "start": 2014
         }
       ]
     }

package/artifacts/contracts/test/TestRoleId.sol/TestRoleId.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/513944a18d93e005314a3ed93f91d5cd.json"
+  "buildInfo": "../../../build-info/37452893015e5bf83358929bf7a72a5c.json"
 }