@etherisc/gif-next 0.0.2-7b53731-256 → 0.0.2-7b86057-523

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

@@ -3,6 +3,29 @@
   "contractName": "Versionable",
   "sourceName": "contracts/shared/Versionable.sol",
   "abi": [
+    {
+      "inputs": [],
+      "name": "InvalidInitialization",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "NotInitializing",
+      "type": "error"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "uint64",
+          "name": "version",
+          "type": "uint64"
+        }
+      ],
+      "name": "Initialized",
+      "type": "event"
+    },
     {
       "anonymous": false,
       "inputs": [
@@ -25,25 +48,20 @@
           "type": "address"
         }
       ],
-      "name": "LogVersionableActivated",
+      "name": "LogVersionableInitialized",
       "type": "event"
     },
     {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "implementation",
-          "type": "address"
-        },
+      "inputs": [],
+      "name": "getInitializedVersion",
+      "outputs": [
         {
-          "internalType": "address",
-          "name": "activatedBy",
-          "type": "address"
+          "internalType": "uint64",
+          "name": "",
+          "type": "uint64"
         }
       ],
-      "name": "activate",
-      "outputs": [],
-      "stateMutability": "nonpayable",
+      "stateMutability": "view",
       "type": "function"
     },
     {
@@ -137,6 +155,29 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "implementation",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "activatedBy",
+          "type": "address"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
+        }
+      ],
+      "name": "initialize",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -145,7 +186,7 @@
           "type": "uint24"
         }
       ],
-      "name": "isActivated",
+      "name": "isInitialized",
       "outputs": [
         {
           "internalType": "bool",
@@ -155,6 +196,29 @@
       ],
       "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",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
     }
   ],
   "bytecode": "0x",

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b8e75668b58474a6a687a98630e0e3af.json"
+  "buildInfo": "../../../build-info/5f4be50e15a31148fa72330342fd3a7d.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$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea264697066735822122041aa15510fb37657a6c552e37f03f0eaede74e53f7efbffea09948301a33eef864736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006d575b600080fd5b61004e610049366004610217565b610075565b6040805182518152602092830151928101929092520160405180910390f35b61004e610192565b6040805180820190915260008082526020820152604051631488c84560e01b815260048101859052600084900b602482015273__$a23651848365a6a5ca15f07b4331037f48$__9063c7010dfa9073__$5ac3274b8cf1e01ea223bf093142af05b0$__90631488c84590604401602060405180830381865af41580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610255565b846040518363ffffffff1660e01b815260040161014a929190918252602082015260400190565b6040805180830381865af4158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a919061026e565b949350505050565b604080518082019091526000808252602082015273__$a23651848365a6a5ca15f07b4331037f48$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea264697066735822122041aa15510fb37657a6c552e37f03f0eaede74e53f7efbffea09948301a33eef864736f6c63430008140033",
   "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/b8e75668b58474a6a687a98630e0e3af.json"
+  "buildInfo": "../../../build-info/5f4be50e15a31148fa72330342fd3a7d.json"
 }

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

@@ -14,19 +14,138 @@
           "internalType": "NftId",
           "name": "registryNftId",
           "type": "uint96"
+        },
+        {
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
+        },
+        {
+          "internalType": "bool",
+          "name": "isInterceptor",
+          "type": "bool"
+        },
+        {
+          "internalType": "address",
+          "name": "initialOwner",
+          "type": "address"
         }
       ],
       "stateMutability": "nonpayable",
       "type": "constructor"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        },
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "ErrorAlreadyLinked",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "contractAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorContractNotRegistered",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNotOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNotRegistry",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorRegisterableNotRegistry",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorRegistryAddressZero",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorRegistryAlreadyInitialized",
+      "type": "error"
+    },
     {
       "inputs": [],
-      "name": "getData",
+      "name": "ErrorRegistryNotInitialized",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "InvalidInitialization",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "NotInitializing",
+      "type": "error"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": false,
+          "internalType": "uint64",
+          "name": "version",
+          "type": "uint64"
+        }
+      ],
+      "name": "Initialized",
+      "type": "event"
+    },
+    {
+      "inputs": [],
+      "name": "REGISTERABLE_LOCATION_V1",
       "outputs": [
         {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
         }
       ],
       "stateMutability": "view",
@@ -34,12 +153,49 @@
     },
     {
       "inputs": [],
-      "name": "getNftId",
+      "name": "getInitialInfo",
       "outputs": [
         {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
+          "components": [
+            {
+              "internalType": "NftId",
+              "name": "nftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "NftId",
+              "name": "parentNftId",
+              "type": "uint96"
+            },
+            {
+              "internalType": "ObjectType",
+              "name": "objectType",
+              "type": "uint8"
+            },
+            {
+              "internalType": "bool",
+              "name": "isInterceptor",
+              "type": "bool"
+            },
+            {
+              "internalType": "address",
+              "name": "objectAddress",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "initialOwner",
+              "type": "address"
+            },
+            {
+              "internalType": "bytes",
+              "name": "data",
+              "type": "bytes"
+            }
+          ],
+          "internalType": "struct IRegistry.ObjectInfo",
+          "name": "info",
+          "type": "tuple"
         }
       ],
       "stateMutability": "view",
@@ -47,11 +203,11 @@
     },
     {
       "inputs": [],
-      "name": "getOwner",
+      "name": "getInitialOwner",
       "outputs": [
         {
           "internalType": "address",
-          "name": "owner",
+          "name": "",
           "type": "address"
         }
       ],
@@ -60,11 +216,11 @@
     },
     {
       "inputs": [],
-      "name": "getParentNftId",
+      "name": "getNftId",
       "outputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "",
           "type": "uint96"
         }
       ],
@@ -73,11 +229,11 @@
     },
     {
       "inputs": [],
-      "name": "getRegistry",
+      "name": "getOwner",
       "outputs": [
         {
-          "internalType": "contract IRegistry",
-          "name": "registry",
+          "internalType": "address",
+          "name": "",
           "type": "address"
         }
       ],
@@ -86,27 +242,21 @@
     },
     {
       "inputs": [],
-      "name": "getType",
+      "name": "getRegistry",
       "outputs": [
         {
-          "internalType": "ObjectType",
+          "internalType": "contract IRegistry",
           "name": "",
-          "type": "uint8"
+          "type": "address"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "register",
-      "outputs": [
-        {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
-        }
-      ],
+      "name": "linkToRegisteredNftId",
+      "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     },
@@ -130,8 +280,34 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60e060405234801561001057600080fd5b506040516108b73803806108b783398101604081905261002f916102a3565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff1916600117905581816001600160a01b0382166100c85760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a5247422d3031303a52454749535452595f5a45524f000000000060448201526064015b60405180910390fd5b6001600160a01b03821660808190526040516301ffc9a760e01b81526306ecd8ef60e01b60048201526301ffc9a790602401602060405180830381865afa158015610117573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061013b91906102f5565b6101875760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a5247422d3031313a4e4f545f524547495354525900000000000060448201526064016100bf565b6001600160601b03811660a081905260805160405163e74d052f60e01b815260048101929092526001600160a01b03169063e74d052f90602401602060405180830381865afa1580156101de573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061020291906102f5565b61025a5760405162461bcd60e51b815260206004820152602360248201527f4552524f523a5247422d3031323a504152454e545f4e4f545f5245474953544560448201526214915160ea1b60648201526084016100bf565b3360c052631dfba64760e11b60009081526020527f95e5a2564f7af40498dc043c6da135e06324c5edb1f60c2bf4dcdf2da207fa45805460ff191660011790555050505061031e565b600080604083850312156102b657600080fd5b82516001600160a01b03811681146102cd57600080fd5b60208401519092506001600160601b03811681146102ea57600080fd5b809150509250929050565b60006020828403121561030757600080fd5b8151801515811461031757600080fd5b9392505050565b60805160a05160c05161054e610369600039600061038b01526000610100015260008181610140015281816102100152818161029d0152818161030e01526103ce015261054e6000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80633bc5de301161005b5780633bc5de30146101245780635ab1bd531461013e578063644c45e014610178578063893d20e81461018057600080fd5b806301ffc9a71461008d57806315dae03e146100cf5780631aa3a008146100de57806331b62a3b146100fe575b600080fd5b6100ba61009b366004610447565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b604051601e81526020016100c6565b6100e661018d565b6040516001600160601b0390911681526020016100c6565b7f00000000000000000000000000000000000000000000000000000000000000006100e6565b604080516020810182526000815290516100c69190610478565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b0390911681526020016100c6565b6100e6610285565b6101606102ec565b905090565b60006101976102ec565b6001600160a01b0316336001600160a01b0316146101fb5760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000604482015260640160405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af1158015610261573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018891906104c6565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610261573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa158015610355573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037991906104c6565b90506001600160601b0381166103b0577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa15801561041d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061044191906104ef565b91505090565b60006020828403121561045957600080fd5b81356001600160e01b03198116811461047157600080fd5b9392505050565b600060208083528351808285015260005b818110156104a557858101830151858201604001528201610489565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156104d857600080fd5b81516001600160601b038116811461047157600080fd5b60006020828403121561050157600080fd5b81516001600160a01b038116811461047157600080fdfea2646970667358221220df7825fcde10597671f728b438dfe0ab26ab726da08c860f90dce99a5dcf2c5564736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c80633bc5de301161005b5780633bc5de30146101245780635ab1bd531461013e578063644c45e014610178578063893d20e81461018057600080fd5b806301ffc9a71461008d57806315dae03e146100cf5780631aa3a008146100de57806331b62a3b146100fe575b600080fd5b6100ba61009b366004610447565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b604051601e81526020016100c6565b6100e661018d565b6040516001600160601b0390911681526020016100c6565b7f00000000000000000000000000000000000000000000000000000000000000006100e6565b604080516020810182526000815290516100c69190610478565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b0390911681526020016100c6565b6100e6610285565b6101606102ec565b905090565b60006101976102ec565b6001600160a01b0316336001600160a01b0316146101fb5760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000604482015260640160405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af1158015610261573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018891906104c6565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610261573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa158015610355573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037991906104c6565b90506001600160601b0381166103b0577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa15801561041d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061044191906104ef565b91505090565b60006020828403121561045957600080fd5b81356001600160e01b03198116811461047157600080fd5b9392505050565b600060208083528351808285015260005b818110156104a557858101830151858201604001528201610489565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156104d857600080fd5b81516001600160601b038116811461047157600080fd5b60006020828403121561050157600080fd5b81516001600160a01b038116811461047157600080fdfea2646970667358221220df7825fcde10597671f728b438dfe0ab26ab726da08c860f90dce99a5dcf2c5564736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
+  "bytecode": "0x60806040523480156200001157600080fd5b5060405162000e7c38038062000e7c8339810160408190526200003491620003c5565b620000656301ffc9a760e01b600090815260205260008051602062000e5c833981519152805460ff19166001179055565b600280546001600160a01b0319163317905560408051602081019091526000815262000096868686868686620000a2565b505050505050620005e1565b620000d36301ffc9a760e01b600090815260205260008051602062000e5c833981519152805460ff19166001179055565b620000df8287620001a4565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d0100000000000000000000000000861515021781559050600181016200015e8382620004f0565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b6001600160a01b038216620002005760405162461bcd60e51b815260206004820152601e60248201527f4e66744f776e61626c653a20696e697469616c206f776e65722069732030000060448201526064015b60405180910390fd5b600280546001600160a01b0319166001600160a01b03841617905562000226816200022a565b5050565b6001546001600160a01b031615620002655760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620001f7565b6001600160a01b0381166200028d5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620002c55760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001f7565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b81526316c8f9ff60e01b60048201526301ffc9a790602401602060405180830381865afa92505050801562000342575060408051601f3d908101601f191682019092526200033f91810190620005bc565b60015b6200036c5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001f7565b80620002265760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001f7565b80516001600160a01b0381168114620003af57600080fd5b919050565b80518015158114620003af57600080fd5b600080600080600060a08688031215620003de57600080fd5b620003e98662000397565b60208701519095506001600160601b03811681146200040757600080fd5b604087015190945060ff811681146200041f57600080fd5b92506200042f60608701620003b4565b91506200043f6080870162000397565b90509295509295909350565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200047657607f821691505b6020821081036200049757634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620004eb57600081815260208120601f850160051c81016020861015620004c65750805b601f850160051c820191505b81811015620004e757828155600101620004d2565b5050505b505050565b81516001600160401b038111156200050c576200050c6200044b565b62000524816200051d845462000461565b846200049d565b602080601f8311600181146200055c5760008415620005435750858301515b600019600386901b1c1916600185901b178555620004e7565b600085815260208120601f198616915b828110156200058d578886015182559484019460019091019084016200056c565b5085821015620005ac5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215620005cf57600080fd5b620005da82620003b4565b9392505050565b61086b80620005f16000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80635ab1bd531161005b5780635ab1bd5314610123578063644c45e014610148578063893d20e814610173578063fb2cb1011461017b57600080fd5b806301ffc9a71461008d5780630fec111c146100cf578063138461e0146100e45780631eff4b22146100ee575b600080fd5b6100ba61009b366004610685565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100d761018c565b6040516100c691906106fc565b6100ec610345565b005b6101157f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100c6565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100c6565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100c6565b610130610567565b6002546001600160a01b0316610130565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b9091041615159181019190915260018201805491929160608401919061023790610787565b80601f016020809104026020016040519081016040528092919081815260200182805461026390610787565b80156102b05780601f10610285576101008083540402835291602001916102b0565b820191906000526020600020905b81548152906001019060200180831161029357829003601f168201915b50505050508152505090506040518060e001604052806102ce600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b031681526020016103296002546001600160a01b031690565b6001600160a01b03168152602001826060015181525091505090565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156103a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103cb91906107c1565b15610412576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b031661043b5760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610484573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104a891906107c1565b6104d0576040516372657a5160e01b81526001600160a01b0382166004820152602401610409565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa15801561051a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061053e91906107e3565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156105cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105f091906107c1565b1561067557600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa15801561064c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610670919061080c565b905090565b506002546001600160a01b031690565b60006020828403121561069757600080fd5b81356001600160e01b0319811681146106af57600080fd5b9392505050565b6000815180845260005b818110156106dc576020818501810151868301820152016106c0565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a083015161076560c08401826001600160a01b03169052565b5060c083015160e08084015261077f6101008401826106b6565b949350505050565b600181811c9082168061079b57607f821691505b6020821081036107bb57634e487b7160e01b600052602260045260246000fd5b50919050565b6000602082840312156107d357600080fd5b815180151581146106af57600080fd5b6000602082840312156107f557600080fd5b81516001600160601b03811681146106af57600080fd5b60006020828403121561081e57600080fd5b81516001600160a01b03811681146106af57600080fdfea2646970667358221220ad3d887ebdea85787b0d21c89ee89e4067579d0cbb19f3227174e75c567ec21764736f6c6343000814003367be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c80635ab1bd531161005b5780635ab1bd5314610123578063644c45e014610148578063893d20e814610173578063fb2cb1011461017b57600080fd5b806301ffc9a71461008d5780630fec111c146100cf578063138461e0146100e45780631eff4b22146100ee575b600080fd5b6100ba61009b366004610685565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100d761018c565b6040516100c691906106fc565b6100ec610345565b005b6101157f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100c6565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100c6565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100c6565b610130610567565b6002546001600160a01b0316610130565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b9091041615159181019190915260018201805491929160608401919061023790610787565b80601f016020809104026020016040519081016040528092919081815260200182805461026390610787565b80156102b05780601f10610285576101008083540402835291602001916102b0565b820191906000526020600020905b81548152906001019060200180831161029357829003601f168201915b50505050508152505090506040518060e001604052806102ce600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b031681526020016103296002546001600160a01b031690565b6001600160a01b03168152602001826060015181525091505090565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156103a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103cb91906107c1565b15610412576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b031661043b5760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610484573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104a891906107c1565b6104d0576040516372657a5160e01b81526001600160a01b0382166004820152602401610409565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa15801561051a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061053e91906107e3565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af41580156105cc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105f091906107c1565b1561067557600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa15801561064c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610670919061080c565b905090565b506002546001600160a01b031690565b60006020828403121561069757600080fd5b81356001600160e01b0319811681146106af57600080fd5b9392505050565b6000815180845260005b818110156106dc576020818501810151868301820152016106c0565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a083015161076560c08401826001600160a01b03169052565b5060c083015160e08084015261077f6101008401826106b6565b949350505050565b600181811c9082168061079b57607f821691505b6020821081036107bb57634e487b7160e01b600052602260045260246000fd5b50919050565b6000602082840312156107d357600080fd5b815180151581146106af57600080fd5b6000602082840312156107f557600080fd5b81516001600160601b03811681146106af57600080fd5b60006020828403121561081e57600080fd5b81516001600160a01b03811681146106af57600080fdfea2646970667358221220ad3d887ebdea85787b0d21c89ee89e4067579d0cbb19f3227174e75c567ec21764736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 2398
+        },
+        {
+          "length": 20,
+          "start": 2947
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 877
+        },
+        {
+          "length": 20,
+          "start": 1426
+        }
+      ]
+    }
+  }
 }

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

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

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

@@ -10,7 +10,7 @@
         {
           "internalType": "RoleId",
           "name": "",
-          "type": "bytes8"
+          "type": "uint64"
         }
       ],
       "stateMutability": "pure",
@@ -36,7 +36,7 @@
         {
           "internalType": "RoleId",
           "name": "",
-          "type": "bytes8"
+          "type": "uint64"
         }
       ],
       "stateMutability": "pure",
@@ -58,9 +58,9 @@
     {
       "inputs": [
         {
-          "internalType": "string",
-          "name": "roleName",
-          "type": "string"
+          "internalType": "uint256",
+          "name": "roleNum",
+          "type": "uint256"
         }
       ],
       "name": "getRole",
@@ -68,29 +68,29 @@
         {
           "internalType": "RoleId",
           "name": "",
-          "type": "bytes8"
+          "type": "uint64"
         }
       ],
       "stateMutability": "pure",
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610426806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780636e9067fb14610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b6040516001600160c01b031990911681526020015b60405180910390f35b6100646100903660046102b5565b6100c9565b61006461014a565b6100a5610154565b60405161007991906103ac565b6100a5610183565b60006100c46101af565b905090565b60405163e14787cb60e01b815260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906101039085906004016103ac565b602060405180830381865af4158015610120573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014491906103c6565b92915050565b60006100c4610244565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b60405163e14787cb60e01b815260206004820152600d60248201526c506f6f6c4f776e6572526f6c6560981b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906064015b602060405180830381865af4158015610220573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906103c6565b60405163e14787cb60e01b815260206004820152601060248201526f50726f647563744f776e6572526f6c6560801b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb90606401610203565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156102c757600080fd5b813567ffffffffffffffff808211156102df57600080fd5b818401915084601f8301126102f357600080fd5b8135818111156103055761030561029f565b604051601f8201601f19908116603f0116810190838211818310171561032d5761032d61029f565b8160405282815287602084870101111561034657600080fd5b826020860160208301376000928101602001929092525095945050505050565b6000815180845260005b8181101561038c57602081850181015186830182015201610370565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103bf6020830184610366565b9392505050565b6000602082840312156103d857600080fd5b81516001600160c01b0319811681146103bf57600080fdfea2646970667358221220215d18f2eda7fe060a8b074c78e459bff44c3e6d00123d1f5a01db4e533e5aa364736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780636e9067fb14610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b6040516001600160c01b031990911681526020015b60405180910390f35b6100646100903660046102b5565b6100c9565b61006461014a565b6100a5610154565b60405161007991906103ac565b6100a5610183565b60006100c46101af565b905090565b60405163e14787cb60e01b815260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906101039085906004016103ac565b602060405180830381865af4158015610120573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014491906103c6565b92915050565b60006100c4610244565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b60405163e14787cb60e01b815260206004820152600d60248201526c506f6f6c4f776e6572526f6c6560981b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb906064015b602060405180830381865af4158015610220573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906103c6565b60405163e14787cb60e01b815260206004820152601060248201526f50726f647563744f776e6572526f6c6560801b604482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__9063e14787cb90606401610203565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156102c757600080fd5b813567ffffffffffffffff808211156102df57600080fd5b818401915084601f8301126102f357600080fd5b8135818111156103055761030561029f565b604051601f8201601f19908116603f0116810190838211818310171561032d5761032d61029f565b8160405282815287602084870101111561034657600080fd5b826020860160208301376000928101602001929092525095945050505050565b6000815180845260005b8181101561038c57602081850181015186830182015201610370565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006103bf6020830184610366565b9392505050565b6000602082840312156103d857600080fd5b81516001600160c01b0319811681146103bf57600080fdfea2646970667358221220215d18f2eda7fe060a8b074c78e459bff44c3e6d00123d1f5a01db4e533e5aa364736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b5061032e806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780635312fdc214610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b60405167ffffffffffffffff90911681526020015b60405180910390f35b610064610090366004610260565b6100c9565b610064610146565b6100a5610150565b6040516100799190610279565b6100a561017f565b60006100c46101ab565b905090565b6040516368aebf7b60e01b81526004810182905260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b90602401602060405180830381865af415801561011c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014091906102c7565b92915050565b60006100c4610224565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b6040516368aebf7b60e01b815261012c600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024015b602060405180830381865af4158015610200573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906102c7565b6040516368aebf7b60e01b8152610190600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024016101e3565b60006020828403121561027257600080fd5b5035919050565b600060208083528351808285015260005b818110156102a65785810183015185820160400152820161028a565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102d957600080fd5b815167ffffffffffffffff811681146102f157600080fd5b939250505056fea26469706673582212205bc136b4579637c4d35be56f157955ae6026455810a72ac7b3bde08b718983f564736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780635312fdc214610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b60405167ffffffffffffffff90911681526020015b60405180910390f35b610064610090366004610260565b6100c9565b610064610146565b6100a5610150565b6040516100799190610279565b6100a561017f565b60006100c46101ab565b905090565b6040516368aebf7b60e01b81526004810182905260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b90602401602060405180830381865af415801561011c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014091906102c7565b92915050565b60006100c4610224565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b6040516368aebf7b60e01b815261012c600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024015b602060405180830381865af4158015610200573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906102c7565b6040516368aebf7b60e01b8152610190600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024016101e3565b60006020828403121561027257600080fd5b5035919050565b600060208083528351808285015260005b818110156102a65785810183015185820160400152820161028a565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102d957600080fd5b815167ffffffffffffffff811681146102f157600080fd5b939250505056fea26469706673582212205bc136b4579637c4d35be56f157955ae6026455810a72ac7b3bde08b718983f564736f6c63430008140033",
   "linkReferences": {
     "contracts/types/RoleId.sol": {
       "RoleIdLib": [
         {
           "length": 20,
-          "start": 251
+          "start": 258
         },
         {
           "length": 20,
-          "start": 517
+          "start": 485
         },
         {
           "length": 20,
-          "start": 669
+          "start": 606
         }
       ]
     }
@@ -100,15 +100,15 @@
       "RoleIdLib": [
         {
           "length": 20,
-          "start": 219
+          "start": 226
         },
         {
           "length": 20,
-          "start": 485
+          "start": 453
         },
         {
           "length": 20,
-          "start": 637
+          "start": 574
         }
       ]
     }

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

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