@etherisc/gif-next 0.0.2-dc7e4cb-141 → 0.0.2-dc95063-418

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

@@ -14,19 +14,106 @@
           "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": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "ErrorNftOwnableAlreadyLinked",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "contractAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNftOwnableContractNotRegistered",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "ErrorNftOwnableInitialOwnerZero",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNftOwnableNotOwner",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "registryAddress",
+          "type": "address"
+        }
+      ],
+      "name": "ErrorNotRegistry",
+      "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": "getData",
+      "name": "NFT_OWNABLE_STORAGE_LOCATION_V1",
       "outputs": [
         {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
         }
       ],
       "stateMutability": "view",
@@ -34,12 +121,12 @@
     },
     {
       "inputs": [],
-      "name": "getNftId",
+      "name": "REGISTERABLE_LOCATION_V1",
       "outputs": [
         {
-          "internalType": "NftId",
-          "name": "nftId",
-          "type": "uint96"
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
         }
       ],
       "stateMutability": "view",
@@ -47,12 +134,49 @@
     },
     {
       "inputs": [],
-      "name": "getOwner",
+      "name": "getInitialInfo",
       "outputs": [
         {
-          "internalType": "address",
-          "name": "owner",
-          "type": "address"
+          "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",
@@ -60,24 +184,37 @@
     },
     {
       "inputs": [],
-      "name": "getParentNftId",
+      "name": "getNftId",
       "outputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "",
           "type": "uint96"
         }
       ],
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "getOwner",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "getRegistry",
       "outputs": [
         {
           "internalType": "contract IRegistry",
-          "name": "registry",
+          "name": "",
           "type": "address"
         }
       ],
@@ -86,27 +223,110 @@
     },
     {
       "inputs": [],
-      "name": "getType",
+      "name": "getRegistryAddress",
       "outputs": [
         {
-          "internalType": "ObjectType",
+          "internalType": "address",
           "name": "",
-          "type": "uint8"
+          "type": "address"
         }
       ],
-      "stateMutability": "pure",
+      "stateMutability": "view",
       "type": "function"
     },
     {
       "inputs": [],
-      "name": "register",
-      "outputs": [
+      "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": "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",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
         }
       ],
+      "name": "registerInterface",
+      "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     },
@@ -130,8 +350,34 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60e060405234801561001057600080fd5b506040516108b73803806108b783398101604081905261002f916102a3565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff1916600117905581816001600160a01b0382166100c85760405162461bcd60e51b815260206004820152601b60248201527f4552524f523a5247422d3031303a52454749535452595f5a45524f000000000060448201526064015b60405180910390fd5b6001600160a01b03821660808190526040516301ffc9a760e01b81526306ecd8ef60e01b60048201526301ffc9a790602401602060405180830381865afa158015610117573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061013b91906102f5565b6101875760405162461bcd60e51b815260206004820152601a60248201527f4552524f523a5247422d3031313a4e4f545f524547495354525900000000000060448201526064016100bf565b6001600160601b03811660a081905260805160405163e74d052f60e01b815260048101929092526001600160a01b03169063e74d052f90602401602060405180830381865afa1580156101de573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061020291906102f5565b61025a5760405162461bcd60e51b815260206004820152602360248201527f4552524f523a5247422d3031323a504152454e545f4e4f545f5245474953544560448201526214915160ea1b60648201526084016100bf565b3360c052631dfba64760e11b60009081526020527f95e5a2564f7af40498dc043c6da135e06324c5edb1f60c2bf4dcdf2da207fa45805460ff191660011790555050505061031e565b600080604083850312156102b657600080fd5b82516001600160a01b03811681146102cd57600080fd5b60208401519092506001600160601b03811681146102ea57600080fd5b809150509250929050565b60006020828403121561030757600080fd5b8151801515811461031757600080fd5b9392505050565b60805160a05160c05161054e610369600039600061038b01526000610100015260008181610140015281816102100152818161029d0152818161030e01526103ce015261054e6000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80633bc5de301161005b5780633bc5de30146101245780635ab1bd531461013e578063644c45e014610178578063893d20e81461018057600080fd5b806301ffc9a71461008d57806315dae03e146100cf5780631aa3a008146100de57806331b62a3b146100fe575b600080fd5b6100ba61009b366004610447565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b604051601e81526020016100c6565b6100e661018d565b6040516001600160601b0390911681526020016100c6565b7f00000000000000000000000000000000000000000000000000000000000000006100e6565b604080516020810182526000815290516100c69190610478565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b0390911681526020016100c6565b6100e6610285565b6101606102ec565b905090565b60006101976102ec565b6001600160a01b0316336001600160a01b0316146101fb5760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000604482015260640160405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af1158015610261573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018891906104c6565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610261573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa158015610355573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037991906104c6565b90506001600160601b0381166103b0577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa15801561041d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061044191906104ef565b91505090565b60006020828403121561045957600080fd5b81356001600160e01b03198116811461047157600080fd5b9392505050565b600060208083528351808285015260005b818110156104a557858101830151858201604001528201610489565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156104d857600080fd5b81516001600160601b038116811461047157600080fd5b60006020828403121561050157600080fd5b81516001600160a01b038116811461047157600080fdfea264697066735822122078d866885c1287822b2bf7a6a544ea6c3f31abbdce7fe98c4128bdc77b201b3a64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c80633bc5de301161005b5780633bc5de30146101245780635ab1bd531461013e578063644c45e014610178578063893d20e81461018057600080fd5b806301ffc9a71461008d57806315dae03e146100cf5780631aa3a008146100de57806331b62a3b146100fe575b600080fd5b6100ba61009b366004610447565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b604051601e81526020016100c6565b6100e661018d565b6040516001600160601b0390911681526020016100c6565b7f00000000000000000000000000000000000000000000000000000000000000006100e6565b604080516020810182526000815290516100c69190610478565b7f00000000000000000000000000000000000000000000000000000000000000005b6040516001600160a01b0390911681526020016100c6565b6100e6610285565b6101606102ec565b905090565b60006101976102ec565b6001600160a01b0316336001600160a01b0316146101fb5760405162461bcd60e51b815260206004820152601760248201527f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000604482015260640160405180910390fd5b604051632210724360e11b81523060048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690634420e486906024016020604051808303816000875af1158015610261573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018891906104c6565b604051636939560f60e11b81523060048201526000907f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063d272ac1e90602401602060405180830381865afa158015610261573d6000803e3d6000fd5b604051636939560f60e11b815230600482015260009081906001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063d272ac1e90602401602060405180830381865afa158015610355573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061037991906104c6565b90506001600160601b0381166103b0577f000000000000000000000000000000000000000000000000000000000000000091505090565b60405163df33330b60e01b81526001600160601b03821660048201527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169063df33330b90602401602060405180830381865afa15801561041d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061044191906104ef565b91505090565b60006020828403121561045957600080fd5b81356001600160e01b03198116811461047157600080fd5b9392505050565b600060208083528351808285015260005b818110156104a557858101830151858201604001528201610489565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156104d857600080fd5b81516001600160601b038116811461047157600080fd5b60006020828403121561050157600080fd5b81516001600160a01b038116811461047157600080fdfea264697066735822122078d866885c1287822b2bf7a6a544ea6c3f31abbdce7fe98c4128bdc77b201b3a64736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
+  "bytecode": "0x60806040523480156200001157600080fd5b50604051620014593803806200145983398101604081905262000034916200037a565b604080516020810190915260008152620000538686868686866200005f565b50505050505062000596565b62000069620000fe565b6200007582876200014f565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d010000000000000000000000000086151502178155905060018101620000f48382620004a5565b5050505050505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff166200014d57604051631afcd79f60e31b815260040160405180910390fd5b565b62000159620000fe565b6200016481620001e8565b6200016e62000304565b6001600160a01b038216620001965760405163f17ef42d60e01b815260040160405180910390fd5b507f07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f0080546001600160601b03166c010000000000000000000000006001600160a01b0390931692909202919091179055565b620001f2620000fe565b806001600160a01b03163b6000036200022e5760405163fdeac91f60e01b81526001600160a01b03821660048201526024015b60405180910390fd5b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152630a3888e560e31b60048201526301ffc9a790602401602060405180830381865afa925050508015620002ab575060408051601f3d908101601f19168201909252620002a89181019062000571565b60015b620002d55760405163fdeac91f60e01b81526001600160a01b038216600482015260240162000225565b80620003005760405163fdeac91f60e01b81526001600160a01b038316600482015260240162000225565b5050565b6200030e620000fe565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b80516001600160a01b03811681146200036457600080fd5b919050565b805180151581146200036457600080fd5b600080600080600060a086880312156200039357600080fd5b6200039e866200034c565b60208701519095506001600160601b0381168114620003bc57600080fd5b604087015190945060ff81168114620003d457600080fd5b9250620003e46060870162000369565b9150620003f4608087016200034c565b90509295509295909350565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200042b57607f821691505b6020821081036200044c57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620004a057600081815260208120601f850160051c810160208610156200047b5750805b601f850160051c820191505b818110156200049c5782815560010162000487565b5050505b505050565b81516001600160401b03811115620004c157620004c162000400565b620004d981620004d2845462000416565b8462000452565b602080601f831160018114620005115760008415620004f85750858301515b600019600386901b1c1916600185901b1785556200049c565b600085815260208120601f198616915b82811015620005425788860151825594840194600190910190840162000521565b5085821015620005615787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000602082840312156200058457600080fd5b6200058f8262000369565b9392505050565b610eb380620005a66000396000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c80635ab1bd531161008c578063893d20e811610066578063893d20e814610213578063ada9652e1461021b578063f21de1e8146101b3578063f7c34ee01461023057600080fd5b80635ab1bd53146101b3578063644c45e0146101d8578063675393bf1461020057600080fd5b80631eff4b22116100c85780631eff4b2214610150578063214cdb801461018557806327bb7a331461019857806336fc697e146101ab57600080fd5b806301ffc9a7146100ef5780630fec111c14610131578063138461e014610146575b600080fd5b61011c6100fd366004610a04565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610139610243565b6040516101289190610a7b565b61014e6103f2565b005b6101777f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610128565b61014e610193366004610a04565b6105f9565b61014e6101a6366004610b54565b610626565b61014e6106b2565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610128565b600080516020610e5e833981519152546040516001600160601b039091168152602001610128565b61014e61020e366004610c67565b6106f8565b6101c0610806565b610177600080516020610e5e83398151915281565b61014e61023e366004610c84565b61093d565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b909104161515918101919091526001820180549192916060840191906102ee90610cbd565b80601f016020809104026020016040519081016040528092919081815260200182805461031a90610cbd565b80156103675780601f1061033c57610100808354040283529160200191610367565b820191906000526020600020905b81548152906001019060200180831161034a57829003601f168201915b50505050508152505090506040518060e00160405280610385600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b031681526020016103d6610806565b6001600160a01b03168152602001826060015181525091505090565b6000600080516020610e5e83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610461573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104859190610cf7565b156104b65780546040516301ab8b6760e21b81526001600160601b0390911660048201526024015b60405180910390fd5b306104c96001546001600160a01b031690565b60405163c3c5a54760e01b81526001600160a01b038381166004830152919091169063c3c5a54790602401602060405180830381865afa158015610511573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105359190610cf7565b61055d5760405163b9304b0d60e01b81526001600160a01b03821660048201526024016104ad565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038381166004830152919091169063d272ac1e90602401602060405180830381865afa1580156105b1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d59190610d14565b82546bffffffffffffffffffffffff19166001600160601b03919091161790915550565b6106016109b4565b6001600160e01b0319166000908152602081905260409020805460ff19166001179055565b61062e6109b4565b610638828761093d565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166cffffffffffffffffffffffffff1990911617600160601b60ff8816021760ff60681b1916600160681b861515021781559050600181016106a88382610d80565b5050505050505050565b6106ba6109b4565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b6107006109b4565b806001600160a01b03163b6000036107365760405163fdeac91f60e01b81526001600160a01b03821660048201526024016104ad565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152630a3888e560e31b60048201526301ffc9a790602401602060405180830381865afa9250505080156107b0575060408051601f3d908101601f191682019092526107ad91810190610cf7565b60015b6107d85760405163fdeac91f60e01b81526001600160a01b03821660048201526024016104ad565b806108015760405163fdeac91f60e01b81526001600160a01b03831660048201526024016104ad565b505b50565b600080600080516020610e5e83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610876573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061089a9190610cf7565b15610927576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa1580156108fd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109219190610e40565b91505090565b54600160601b90046001600160a01b0316919050565b6109456109b4565b61094e816106f8565b6109566106b2565b6001600160a01b03821661097d5760405163f17ef42d60e01b815260040160405180910390fd5b50600080516020610e5e83398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff16610a0257604051631afcd79f60e31b815260040160405180910390fd5b565b600060208284031215610a1657600080fd5b81356001600160e01b031981168114610a2e57600080fd5b9392505050565b6000815180845260005b81811015610a5b57602081850181015186830182015201610a3f565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a0830151610ae460c08401826001600160a01b03169052565b5060c083015160e080840152610afe610100840182610a35565b949350505050565b6001600160a01b038116811461080357600080fd5b6001600160601b038116811461080357600080fd5b801515811461080357600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060008060008060c08789031215610b6d57600080fd5b8635610b7881610b06565b95506020870135610b8881610b1b565b9450604087013560ff81168114610b9e57600080fd5b93506060870135610bae81610b30565b92506080870135610bbe81610b06565b915060a087013567ffffffffffffffff80821115610bdb57600080fd5b818901915089601f830112610bef57600080fd5b813581811115610c0157610c01610b3e565b604051601f8201601f19908116603f01168101908382118183101715610c2957610c29610b3e565b816040528281528c6020848701011115610c4257600080fd5b8260208601602083013760006020848301015280955050505050509295509295509295565b600060208284031215610c7957600080fd5b8135610a2e81610b06565b60008060408385031215610c9757600080fd5b8235610ca281610b06565b91506020830135610cb281610b06565b809150509250929050565b600181811c90821680610cd157607f821691505b602082108103610cf157634e487b7160e01b600052602260045260246000fd5b50919050565b600060208284031215610d0957600080fd5b8151610a2e81610b30565b600060208284031215610d2657600080fd5b8151610a2e81610b1b565b601f821115610d7b57600081815260208120601f850160051c81016020861015610d585750805b601f850160051c820191505b81811015610d7757828155600101610d64565b5050505b505050565b815167ffffffffffffffff811115610d9a57610d9a610b3e565b610dae81610da88454610cbd565b84610d31565b602080601f831160018114610de35760008415610dcb5750858301515b600019600386901b1c1916600185901b178555610d77565b600085815260208120601f198616915b82811015610e1257888601518255948401946001909101908401610df3565b5085821015610e305787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215610e5257600080fd5b8151610a2e81610b0656fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220ef454772a0359a1ad8d69ea59c18fc2041acc1c7554c99128ddf69ed818ae0f364736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100ea5760003560e01c80635ab1bd531161008c578063893d20e811610066578063893d20e814610213578063ada9652e1461021b578063f21de1e8146101b3578063f7c34ee01461023057600080fd5b80635ab1bd53146101b3578063644c45e0146101d8578063675393bf1461020057600080fd5b80631eff4b22116100c85780631eff4b2214610150578063214cdb801461018557806327bb7a331461019857806336fc697e146101ab57600080fd5b806301ffc9a7146100ef5780630fec111c14610131578063138461e014610146575b600080fd5b61011c6100fd366004610a04565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610139610243565b6040516101289190610a7b565b61014e6103f2565b005b6101777f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610128565b61014e610193366004610a04565b6105f9565b61014e6101a6366004610b54565b610626565b61014e6106b2565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610128565b600080516020610e5e833981519152546040516001600160601b039091168152602001610128565b61014e61020e366004610c67565b6106f8565b6101c0610806565b610177600080516020610e5e83398151915281565b61014e61023e366004610c84565b61093d565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b909104161515918101919091526001820180549192916060840191906102ee90610cbd565b80601f016020809104026020016040519081016040528092919081815260200182805461031a90610cbd565b80156103675780601f1061033c57610100808354040283529160200191610367565b820191906000526020600020905b81548152906001019060200180831161034a57829003601f168201915b50505050508152505090506040518060e00160405280610385600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b031681526020016103d6610806565b6001600160a01b03168152602001826060015181525091505090565b6000600080516020610e5e83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610461573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104859190610cf7565b156104b65780546040516301ab8b6760e21b81526001600160601b0390911660048201526024015b60405180910390fd5b306104c96001546001600160a01b031690565b60405163c3c5a54760e01b81526001600160a01b038381166004830152919091169063c3c5a54790602401602060405180830381865afa158015610511573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105359190610cf7565b61055d5760405163b9304b0d60e01b81526001600160a01b03821660048201526024016104ad565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038381166004830152919091169063d272ac1e90602401602060405180830381865afa1580156105b1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d59190610d14565b82546bffffffffffffffffffffffff19166001600160601b03919091161790915550565b6106016109b4565b6001600160e01b0319166000908152602081905260409020805460ff19166001179055565b61062e6109b4565b610638828761093d565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166cffffffffffffffffffffffffff1990911617600160601b60ff8816021760ff60681b1916600160681b861515021781559050600181016106a88382610d80565b5050505050505050565b6106ba6109b4565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b6107006109b4565b806001600160a01b03163b6000036107365760405163fdeac91f60e01b81526001600160a01b03821660048201526024016104ad565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152630a3888e560e31b60048201526301ffc9a790602401602060405180830381865afa9250505080156107b0575060408051601f3d908101601f191682019092526107ad91810190610cf7565b60015b6107d85760405163fdeac91f60e01b81526001600160a01b03821660048201526024016104ad565b806108015760405163fdeac91f60e01b81526001600160a01b03831660048201526024016104ad565b505b50565b600080600080516020610e5e83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610876573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061089a9190610cf7565b15610927576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa1580156108fd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109219190610e40565b91505090565b54600160601b90046001600160a01b0316919050565b6109456109b4565b61094e816106f8565b6109566106b2565b6001600160a01b03821661097d5760405163f17ef42d60e01b815260040160405180910390fd5b50600080516020610e5e83398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff16610a0257604051631afcd79f60e31b815260040160405180910390fd5b565b600060208284031215610a1657600080fd5b81356001600160e01b031981168114610a2e57600080fd5b9392505050565b6000815180845260005b81811015610a5b57602081850181015186830182015201610a3f565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a0830151610ae460c08401826001600160a01b03169052565b5060c083015160e080840152610afe610100840182610a35565b949350505050565b6001600160a01b038116811461080357600080fd5b6001600160601b038116811461080357600080fd5b801515811461080357600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060008060008060c08789031215610b6d57600080fd5b8635610b7881610b06565b95506020870135610b8881610b1b565b9450604087013560ff81168114610b9e57600080fd5b93506060870135610bae81610b30565b92506080870135610bbe81610b06565b915060a087013567ffffffffffffffff80821115610bdb57600080fd5b818901915089601f830112610bef57600080fd5b813581811115610c0157610c01610b3e565b604051601f8201601f19908116603f01168101908382118183101715610c2957610c29610b3e565b816040528281528c6020848701011115610c4257600080fd5b8260208601602083013760006020848301015280955050505050509295509295509295565b600060208284031215610c7957600080fd5b8135610a2e81610b06565b60008060408385031215610c9757600080fd5b8235610ca281610b06565b91506020830135610cb281610b06565b809150509250929050565b600181811c90821680610cd157607f821691505b602082108103610cf157634e487b7160e01b600052602260045260246000fd5b50919050565b600060208284031215610d0957600080fd5b8151610a2e81610b30565b600060208284031215610d2657600080fd5b8151610a2e81610b1b565b601f821115610d7b57600081815260208120601f850160051c81016020861015610d585750805b601f850160051c820191505b81811015610d7757828155600101610d64565b5050505b505050565b815167ffffffffffffffff811115610d9a57610d9a610b3e565b610dae81610da88454610cbd565b84610d31565b602080601f831160018114610de35760008415610dcb5750858301515b600019600386901b1c1916600185901b178555610d77565b600085815260208120601f198616915b82811015610e1257888601518255948401946001909101908401610df3565b5085821015610e305787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215610e5257600080fd5b8151610a2e81610b0656fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220ef454772a0359a1ad8d69ea59c18fc2041acc1c7554c99128ddf69ed818ae0f364736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 2509
+        },
+        {
+          "length": 20,
+          "start": 3554
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 1063
+        },
+        {
+          "length": 20,
+          "start": 2108
+        }
+      ]
+    }
+  }
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/7f4061414c08959ccea0f1ff89c2ba75.json"
+  "buildInfo": "../../../build-info/95371df5f28c49f1193e96df62dcfc87.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,15 +68,49 @@
         {
           "internalType": "RoleId",
           "name": "",
-          "type": "bytes8"
+          "type": "uint64"
         }
       ],
       "stateMutability": "pure",
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b50610319806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780636e9067fb14610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b6040516001600160c01b031990911681526020015b60405180910390f35b6100646100903660046101e4565b6100c9565b6100646100da565b6100a56100e4565b6040516100799190610295565b6100a5610113565b60006100c461013f565b905090565b60006100d48261016b565b92915050565b60006100c461019b565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b60006100c46040518060400160405280600d81526020016c506f6f6c4f776e6572526f6c6560981b8152505b60008160405160200161017e9190610295565b604051602081830303815290604052805190602001209050919050565b60006100c46040518060400160405280601081526020016f50726f647563744f776e6572526f6c6560801b81525061016b565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f657600080fd5b813567ffffffffffffffff8082111561020e57600080fd5b818401915084601f83011261022257600080fd5b813581811115610234576102346101ce565b604051601f8201601f19908116603f0116810190838211818310171561025c5761025c6101ce565b8160405282815287602084870101111561027557600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102c2578581018301518582016040015282016102a6565b506000604082860101526040601f19601f830116850101925050509291505056fea26469706673582212208e11ea22383900714d73888742cf4daf68809c7b8306f93d2a739af6de499a7e64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780636e9067fb14610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b6040516001600160c01b031990911681526020015b60405180910390f35b6100646100903660046101e4565b6100c9565b6100646100da565b6100a56100e4565b6040516100799190610295565b6100a5610113565b60006100c461013f565b905090565b60006100d48261016b565b92915050565b60006100c461019b565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b60006100c46040518060400160405280600d81526020016c506f6f6c4f776e6572526f6c6560981b8152505b60008160405160200161017e9190610295565b604051602081830303815290604052805190602001209050919050565b60006100c46040518060400160405280601081526020016f50726f647563744f776e6572526f6c6560801b81525061016b565b634e487b7160e01b600052604160045260246000fd5b6000602082840312156101f657600080fd5b813567ffffffffffffffff8082111561020e57600080fd5b818401915084601f83011261022257600080fd5b813581811115610234576102346101ce565b604051601f8201601f19908116603f0116810190838211818310171561025c5761025c6101ce565b8160405282815287602084870101111561027557600080fd5b826020860160208301376000928101602001929092525095945050505050565b600060208083528351808285015260005b818110156102c2578581018301518582016040015282016102a6565b506000604082860101526040601f19601f830116850101925050509291505056fea26469706673582212208e11ea22383900714d73888742cf4daf68809c7b8306f93d2a739af6de499a7e64736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
+  "bytecode": "0x608060405234801561001057600080fd5b5061032b806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780635312fdc214610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b60405167ffffffffffffffff90911681526020015b60405180910390f35b61006461009036600461025d565b6100c9565b610064610146565b6100a5610150565b6040516100799190610276565b6100a561017f565b60006100c46101ab565b905090565b6040516368aebf7b60e01b81526004810182905260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b90602401602060405180830381865af415801561011c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014091906102c4565b92915050565b60006100c4610222565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b6040516368aebf7b60e01b815260048082015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024015b602060405180830381865af41580156101fe573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906102c4565b6040516368aebf7b60e01b81526005600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024016101e1565b60006020828403121561026f57600080fd5b5035919050565b600060208083528351808285015260005b818110156102a357858101830151858201604001528201610287565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102d657600080fd5b815167ffffffffffffffff811681146102ee57600080fd5b939250505056fea2646970667358221220d96828bbeecc4d4cb81d861ab2ef50b9360b39122abc3eb333c3368040996e3564736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780635312fdc214610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b60405167ffffffffffffffff90911681526020015b60405180910390f35b61006461009036600461025d565b6100c9565b610064610146565b6100a5610150565b6040516100799190610276565b6100a561017f565b60006100c46101ab565b905090565b6040516368aebf7b60e01b81526004810182905260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b90602401602060405180830381865af415801561011c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014091906102c4565b92915050565b60006100c4610222565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b6040516368aebf7b60e01b815260048082015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024015b602060405180830381865af41580156101fe573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906102c4565b6040516368aebf7b60e01b81526005600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024016101e1565b60006020828403121561026f57600080fd5b5035919050565b600060208083528351808285015260005b818110156102a357858101830151858201604001528201610287565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102d657600080fd5b815167ffffffffffffffff811681146102ee57600080fd5b939250505056fea2646970667358221220d96828bbeecc4d4cb81d861ab2ef50b9360b39122abc3eb333c3368040996e3564736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/RoleId.sol": {
+      "RoleIdLib": [
+        {
+          "length": 20,
+          "start": 258
+        },
+        {
+          "length": 20,
+          "start": 483
+        },
+        {
+          "length": 20,
+          "start": 603
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/RoleId.sol": {
+      "RoleIdLib": [
+        {
+          "length": 20,
+          "start": 226
+        },
+        {
+          "length": 20,
+          "start": 451
+        },
+        {
+          "length": 20,
+          "start": 571
+        }
+      ]
+    }
+  }
 }

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

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