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

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

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

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2d0d5ac9f3af33498ef492a7caeac063.json"
+  "buildInfo": "../../../build-info/a8e58e3e317904030d8bf765133d5722.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,95 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "getRegistryAddress",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "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 +317,19 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "bytes4",
+          "name": "interfaceId",
+          "type": "bytes4"
+        }
+      ],
+      "name": "registerInterface",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -272,18 +350,18 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b5060405162000e4638038062000e468339810160408190526200003491620003c5565b620000656301ffc9a760e01b600090815260205260008051602062000e26833981519152805460ff19166001179055565b600280546001600160a01b0319163317905560408051602081019091526000815262000096868686868686620000a2565b505050505050620005e1565b620000d36301ffc9a760e01b600090815260205260008051602062000e26833981519152805460ff19166001179055565b620000df8287620001a4565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d0100000000000000000000000000861515021781559050600181016200015e8382620004f0565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b6001600160a01b038216620002005760405162461bcd60e51b815260206004820152601e60248201527f4e66744f776e61626c653a20696e697469616c206f776e65722069732030000060448201526064015b60405180910390fd5b600280546001600160a01b0319166001600160a01b03841617905562000226816200022a565b5050565b6001546001600160a01b031615620002655760015460405163fcdbf2d960e01b81526001600160a01b039091166004820152602401620001f7565b6001600160a01b0381166200028d5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620002c55760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001f7565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263102da10360e01b60048201526301ffc9a790602401602060405180830381865afa92505050801562000342575060408051601f3d908101601f191682019092526200033f91810190620005bc565b60015b6200036c5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001f7565b80620002265760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001f7565b80516001600160a01b0381168114620003af57600080fd5b919050565b80518015158114620003af57600080fd5b600080600080600060a08688031215620003de57600080fd5b620003e98662000397565b60208701519095506001600160601b03811681146200040757600080fd5b604087015190945060ff811681146200041f57600080fd5b92506200042f60608701620003b4565b91506200043f6080870162000397565b90509295509295909350565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200047657607f821691505b6020821081036200049757634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620004eb57600081815260208120601f850160051c81016020861015620004c65750805b601f850160051c820191505b81811015620004e757828155600101620004d2565b5050505b505050565b81516001600160401b038111156200050c576200050c6200044b565b62000524816200051d845462000461565b846200049d565b602080601f8311600181146200055c5760008415620005435750858301515b600019600386901b1c1916600185901b178555620004e7565b600085815260208120601f198616915b828110156200058d578886015182559484019460019091019084016200056c565b5085821015620005ac5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215620005cf57600080fd5b620005da82620003b4565b9392505050565b61083580620005f16000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80631eff4b221161005b5780631eff4b22146100e45780635ab1bd5314610119578063644c45e01461013e578063893d20e81461016957600080fd5b806301ffc9a7146100825780630fec111c146100c4578063138461e0146100da575b600080fd5b6100af610090366004610633565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100cc610171565b6040516100bb9291906106aa565b6100e26102f3565b005b61010b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100bb565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100bb565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100bb565b610126610515565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806101f46001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161023c610515565b6001600160a01b0316815260200182600101805461025990610751565b80601f016020809104026020016040519081016040528092919081815260200182805461028590610751565b80156102d25780601f106102a7576101008083540402835291602001916102d2565b820191906000526020600020905b8154815290600101906020018083116102b557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610355573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610379919061078b565b156103c0576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166103e95760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610432573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610456919061078b565b61047e576040516372657a5160e01b81526001600160a01b03821660048201526024016103b7565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156104c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ec91906107ad565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561057a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061059e919061078b565b1561062357600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156105fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061061e91906107d6565b905090565b506002546001600160a01b031690565b60006020828403121561064557600080fd5b81356001600160e01b03198116811461065d57600080fd5b9392505050565b6000815180845260005b8181101561068a5760208185018101518683018201520161066e565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516106ee60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610734610120840182610664565b905082810360208401526107488185610664565b95945050505050565b600181811c9082168061076557607f821691505b60208210810361078557634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561079d57600080fd5b8151801515811461065d57600080fd5b6000602082840312156107bf57600080fd5b81516001600160601b038116811461065d57600080fd5b6000602082840312156107e857600080fd5b81516001600160a01b038116811461065d57600080fdfea2646970667358221220893f420d2c3bf7a727aa28eb94ee9b58cd6232d9f02b7c0daca8b68d5d98a23664736f6c6343000814003367be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80631eff4b221161005b5780631eff4b22146100e45780635ab1bd5314610119578063644c45e01461013e578063893d20e81461016957600080fd5b806301ffc9a7146100825780630fec111c146100c4578063138461e0146100da575b600080fd5b6100af610090366004610633565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100cc610171565b6040516100bb9291906106aa565b6100e26102f3565b005b61010b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100bb565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100bb565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100bb565b610126610515565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806101f46001546001600160601b03600160a01b9091041690565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161023c610515565b6001600160a01b0316815260200182600101805461025990610751565b80601f016020809104026020016040519081016040528092919081815260200182805461028590610751565b80156102d25780601f106102a7576101008083540402835291602001916102d2565b820191906000526020600020905b8154815290600101906020018083116102b557829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610355573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610379919061078b565b156103c0576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166103e95760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610432573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610456919061078b565b61047e576040516372657a5160e01b81526001600160a01b03821660048201526024016103b7565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156104c8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ec91906107ad565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af415801561057a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061059e919061078b565b1561062357600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156105fa573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061061e91906107d6565b905090565b506002546001600160a01b031690565b60006020828403121561064557600080fd5b81356001600160e01b03198116811461065d57600080fd5b9392505050565b6000815180845260005b8181101561068a5760208185018101518683018201520161066e565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516106ee60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610734610120840182610664565b905082810360208401526107488185610664565b95945050505050565b600181811c9082168061076557607f821691505b60208210810361078557634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561079d57600080fd5b8151801515811461065d57600080fd5b6000602082840312156107bf57600080fd5b81516001600160601b038116811461065d57600080fd5b6000602082840312156107e857600080fd5b81516001600160a01b038116811461065d57600080fdfea2646970667358221220893f420d2c3bf7a727aa28eb94ee9b58cd6232d9f02b7c0daca8b68d5d98a23664736f6c63430008140033",
+  "bytecode": "0x60806040523480156200001157600080fd5b50604051620014593803806200145983398101604081905262000034916200037a565b604080516020810190915260008152620000538686868686866200005f565b50505050505062000596565b62000069620000fe565b6200007582876200014f565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d010000000000000000000000000086151502178155905060018101620000f48382620004a5565b5050505050505050565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff166200014d57604051631afcd79f60e31b815260040160405180910390fd5b565b62000159620000fe565b6200016481620001e8565b6200016e62000304565b6001600160a01b038216620001965760405163f17ef42d60e01b815260040160405180910390fd5b507f07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f0080546001600160601b03166c010000000000000000000000006001600160a01b0390931692909202919091179055565b620001f2620000fe565b806001600160a01b03163b6000036200022e5760405163fdeac91f60e01b81526001600160a01b03821660048201526024015b60405180910390fd5b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263230c0c8160e11b60048201526301ffc9a790602401602060405180830381865afa925050508015620002ab575060408051601f3d908101601f19168201909252620002a89181019062000571565b60015b620002d55760405163fdeac91f60e01b81526001600160a01b038216600482015260240162000225565b80620003005760405163fdeac91f60e01b81526001600160a01b038316600482015260240162000225565b5050565b6200030e620000fe565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b80516001600160a01b03811681146200036457600080fd5b919050565b805180151581146200036457600080fd5b600080600080600060a086880312156200039357600080fd5b6200039e866200034c565b60208701519095506001600160601b0381168114620003bc57600080fd5b604087015190945060ff81168114620003d457600080fd5b9250620003e46060870162000369565b9150620003f4608087016200034c565b90509295509295909350565b634e487b7160e01b600052604160045260246000fd5b600181811c908216806200042b57607f821691505b6020821081036200044c57634e487b7160e01b600052602260045260246000fd5b50919050565b601f821115620004a057600081815260208120601f850160051c810160208610156200047b5750805b601f850160051c820191505b818110156200049c5782815560010162000487565b5050505b505050565b81516001600160401b03811115620004c157620004c162000400565b620004d981620004d2845462000416565b8462000452565b602080601f831160018114620005115760008415620004f85750858301515b600019600386901b1c1916600185901b1785556200049c565b600085815260208120601f198616915b82811015620005425788860151825594840194600190910190840162000521565b5085821015620005615787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000602082840312156200058457600080fd5b6200058f8262000369565b9392505050565b610eb380620005a66000396000f3fe608060405234801561001057600080fd5b50600436106100ea5760003560e01c80635ab1bd531161008c578063893d20e811610066578063893d20e814610213578063ada9652e1461021b578063f21de1e8146101b3578063f7c34ee01461023057600080fd5b80635ab1bd53146101b3578063644c45e0146101d8578063675393bf1461020057600080fd5b80631eff4b22116100c85780631eff4b2214610150578063214cdb801461018557806327bb7a331461019857806336fc697e146101ab57600080fd5b806301ffc9a7146100ef5780630fec111c14610131578063138461e014610146575b600080fd5b61011c6100fd366004610a04565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610139610243565b6040516101289190610a7b565b61014e6103f2565b005b6101777f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610128565b61014e610193366004610a04565b6105f9565b61014e6101a6366004610b54565b610626565b61014e6106b2565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610128565b600080516020610e5e833981519152546040516001600160601b039091168152602001610128565b61014e61020e366004610c67565b6106f8565b6101c0610806565b610177600080516020610e5e83398151915281565b61014e61023e366004610c84565b61093d565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b909104161515918101919091526001820180549192916060840191906102ee90610cbd565b80601f016020809104026020016040519081016040528092919081815260200182805461031a90610cbd565b80156103675780601f1061033c57610100808354040283529160200191610367565b820191906000526020600020905b81548152906001019060200180831161034a57829003601f168201915b50505050508152505090506040518060e00160405280610385600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b031681526020016103d6610806565b6001600160a01b03168152602001826060015181525091505090565b6000600080516020610e5e83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610461573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104859190610cf7565b156104b65780546040516301ab8b6760e21b81526001600160601b0390911660048201526024015b60405180910390fd5b306104c96001546001600160a01b031690565b60405163c3c5a54760e01b81526001600160a01b038381166004830152919091169063c3c5a54790602401602060405180830381865afa158015610511573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105359190610cf7565b61055d5760405163b9304b0d60e01b81526001600160a01b03821660048201526024016104ad565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038381166004830152919091169063d272ac1e90602401602060405180830381865afa1580156105b1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d59190610d14565b82546bffffffffffffffffffffffff19166001600160601b03919091161790915550565b6106016109b4565b6001600160e01b0319166000908152602081905260409020805460ff19166001179055565b61062e6109b4565b610638828761093d565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166cffffffffffffffffffffffffff1990911617600160601b60ff8816021760ff60681b1916600160681b861515021781559050600181016106a88382610d80565b5050505050505050565b6106ba6109b4565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b6107006109b4565b806001600160a01b03163b6000036107365760405163fdeac91f60e01b81526001600160a01b03821660048201526024016104ad565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263230c0c8160e11b60048201526301ffc9a790602401602060405180830381865afa9250505080156107b0575060408051601f3d908101601f191682019092526107ad91810190610cf7565b60015b6107d85760405163fdeac91f60e01b81526001600160a01b03821660048201526024016104ad565b806108015760405163fdeac91f60e01b81526001600160a01b03831660048201526024016104ad565b505b50565b600080600080516020610e5e83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610876573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061089a9190610cf7565b15610927576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa1580156108fd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109219190610e40565b91505090565b54600160601b90046001600160a01b0316919050565b6109456109b4565b61094e816106f8565b6109566106b2565b6001600160a01b03821661097d5760405163f17ef42d60e01b815260040160405180910390fd5b50600080516020610e5e83398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff16610a0257604051631afcd79f60e31b815260040160405180910390fd5b565b600060208284031215610a1657600080fd5b81356001600160e01b031981168114610a2e57600080fd5b9392505050565b6000815180845260005b81811015610a5b57602081850181015186830182015201610a3f565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a0830151610ae460c08401826001600160a01b03169052565b5060c083015160e080840152610afe610100840182610a35565b949350505050565b6001600160a01b038116811461080357600080fd5b6001600160601b038116811461080357600080fd5b801515811461080357600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060008060008060c08789031215610b6d57600080fd5b8635610b7881610b06565b95506020870135610b8881610b1b565b9450604087013560ff81168114610b9e57600080fd5b93506060870135610bae81610b30565b92506080870135610bbe81610b06565b915060a087013567ffffffffffffffff80821115610bdb57600080fd5b818901915089601f830112610bef57600080fd5b813581811115610c0157610c01610b3e565b604051601f8201601f19908116603f01168101908382118183101715610c2957610c29610b3e565b816040528281528c6020848701011115610c4257600080fd5b8260208601602083013760006020848301015280955050505050509295509295509295565b600060208284031215610c7957600080fd5b8135610a2e81610b06565b60008060408385031215610c9757600080fd5b8235610ca281610b06565b91506020830135610cb281610b06565b809150509250929050565b600181811c90821680610cd157607f821691505b602082108103610cf157634e487b7160e01b600052602260045260246000fd5b50919050565b600060208284031215610d0957600080fd5b8151610a2e81610b30565b600060208284031215610d2657600080fd5b8151610a2e81610b1b565b601f821115610d7b57600081815260208120601f850160051c81016020861015610d585750805b601f850160051c820191505b81811015610d7757828155600101610d64565b5050505b505050565b815167ffffffffffffffff811115610d9a57610d9a610b3e565b610dae81610da88454610cbd565b84610d31565b602080601f831160018114610de35760008415610dcb5750858301515b600019600386901b1c1916600185901b178555610d77565b600085815260208120601f198616915b82811015610e1257888601518255948401946001909101908401610df3565b5085821015610e305787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215610e5257600080fd5b8151610a2e81610b0656fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220c8d16299789d8c78a58d09ca7e13502e2dcb60392865def84ac186ac253dd6ab64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100ea5760003560e01c80635ab1bd531161008c578063893d20e811610066578063893d20e814610213578063ada9652e1461021b578063f21de1e8146101b3578063f7c34ee01461023057600080fd5b80635ab1bd53146101b3578063644c45e0146101d8578063675393bf1461020057600080fd5b80631eff4b22116100c85780631eff4b2214610150578063214cdb801461018557806327bb7a331461019857806336fc697e146101ab57600080fd5b806301ffc9a7146100ef5780630fec111c14610131578063138461e014610146575b600080fd5b61011c6100fd366004610a04565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b610139610243565b6040516101289190610a7b565b61014e6103f2565b005b6101777f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b604051908152602001610128565b61014e610193366004610a04565b6105f9565b61014e6101a6366004610b54565b610626565b61014e6106b2565b6001546001600160a01b03165b6040516001600160a01b039091168152602001610128565b600080516020610e5e833981519152546040516001600160601b039091168152602001610128565b61014e61020e366004610c67565b6106f8565b6101c0610806565b610177600080516020610e5e83398151915281565b61014e61023e366004610c84565b61093d565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820152907f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa3006040805160808101825282546001600160601b038116825260ff600160601b820481166020840152600160681b909104161515918101919091526001820180549192916060840191906102ee90610cbd565b80601f016020809104026020016040519081016040528092919081815260200182805461031a90610cbd565b80156103675780601f1061033c57610100808354040283529160200191610367565b820191906000526020600020905b81548152906001019060200180831161034a57829003601f168201915b50505050508152505090506040518060e00160405280610385600090565b6001600160601b0316815260200182600001516001600160601b03168152602001826020015160ff168152602001826040015115158152602001306001600160a01b031681526020016103d6610806565b6001600160a01b03168152602001826060015181525091505090565b6000600080516020610e5e83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610461573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104859190610cf7565b156104b65780546040516301ab8b6760e21b81526001600160601b0390911660048201526024015b60405180910390fd5b306104c96001546001600160a01b031690565b60405163c3c5a54760e01b81526001600160a01b038381166004830152919091169063c3c5a54790602401602060405180830381865afa158015610511573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105359190610cf7565b61055d5760405163b9304b0d60e01b81526001600160a01b03821660048201526024016104ad565b6001546001600160a01b0316604051636939560f60e11b81526001600160a01b038381166004830152919091169063d272ac1e90602401602060405180830381865afa1580156105b1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105d59190610d14565b82546bffffffffffffffffffffffff19166001600160601b03919091161790915550565b6106016109b4565b6001600160e01b0319166000908152602081905260409020805460ff19166001179055565b61062e6109b4565b610638828761093d565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166cffffffffffffffffffffffffff1990911617600160601b60ff8816021760ff60681b1916600160681b861515021781559050600181016106a88382610d80565b5050505050505050565b6106ba6109b4565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055565b6107006109b4565b806001600160a01b03163b6000036107365760405163fdeac91f60e01b81526001600160a01b03821660048201526024016104ad565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b815263230c0c8160e11b60048201526301ffc9a790602401602060405180830381865afa9250505080156107b0575060408051601f3d908101601f191682019092526107ad91810190610cf7565b60015b6107d85760405163fdeac91f60e01b81526001600160a01b03821660048201526024016104ad565b806108015760405163fdeac91f60e01b81526001600160a01b03831660048201526024016104ad565b505b50565b600080600080516020610e5e83398151915280546040516330b8415f60e01b81526001600160601b03909116600482015290915073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610876573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061089a9190610cf7565b15610927576001546001600160a01b03168154604051631c5da14d60e11b81526001600160601b0390911660048201526001600160a01b0391909116906338bb429a90602401602060405180830381865afa1580156108fd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109219190610e40565b91505090565b54600160601b90046001600160a01b0316919050565b6109456109b4565b61094e816106f8565b6109566106b2565b6001600160a01b03821661097d5760405163f17ef42d60e01b815260040160405180910390fd5b50600080516020610e5e83398151915280546001600160601b0316600160601b6001600160a01b0390931692909202919091179055565b7ff0c57e16840df040f15088dc2f81fe391c3923bec73e23a9662efc9c229c6a005468010000000000000000900460ff16610a0257604051631afcd79f60e31b815260040160405180910390fd5b565b600060208284031215610a1657600080fd5b81356001600160e01b031981168114610a2e57600080fd5b9392505050565b6000815180845260005b81811015610a5b57602081850181015186830182015201610a3f565b506000602082860101526020601f19601f83011685010191505092915050565b6020815260006001600160601b038084511660208401528060208501511660408401525060ff604084015116606083015260608301511515608083015260018060a01b0360808401511660a083015260a0830151610ae460c08401826001600160a01b03169052565b5060c083015160e080840152610afe610100840182610a35565b949350505050565b6001600160a01b038116811461080357600080fd5b6001600160601b038116811461080357600080fd5b801515811461080357600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060008060008060c08789031215610b6d57600080fd5b8635610b7881610b06565b95506020870135610b8881610b1b565b9450604087013560ff81168114610b9e57600080fd5b93506060870135610bae81610b30565b92506080870135610bbe81610b06565b915060a087013567ffffffffffffffff80821115610bdb57600080fd5b818901915089601f830112610bef57600080fd5b813581811115610c0157610c01610b3e565b604051601f8201601f19908116603f01168101908382118183101715610c2957610c29610b3e565b816040528281528c6020848701011115610c4257600080fd5b8260208601602083013760006020848301015280955050505050509295509295509295565b600060208284031215610c7957600080fd5b8135610a2e81610b06565b60008060408385031215610c9757600080fd5b8235610ca281610b06565b91506020830135610cb281610b06565b809150509250929050565b600181811c90821680610cd157607f821691505b602082108103610cf157634e487b7160e01b600052602260045260246000fd5b50919050565b600060208284031215610d0957600080fd5b8151610a2e81610b30565b600060208284031215610d2657600080fd5b8151610a2e81610b1b565b601f821115610d7b57600081815260208120601f850160051c81016020861015610d585750805b601f850160051c820191505b81811015610d7757828155600101610d64565b5050505b505050565b815167ffffffffffffffff811115610d9a57610d9a610b3e565b610dae81610da88454610cbd565b84610d31565b602080601f831160018114610de35760008415610dcb5750858301515b600019600386901b1c1916600185901b178555610d77565b600085815260208120601f198616915b82811015610e1257888601518255948401946001909101908401610df3565b5085821015610e305787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b600060208284031215610e5257600080fd5b8151610a2e81610b0656fe07ebcf49758b6ed3af50fa146bec0abe157c0218fe65dc0874c286e9d5da4f00a2646970667358221220c8d16299789d8c78a58d09ca7e13502e2dcb60392865def84ac186ac253dd6ab64736f6c63430008140033",
   "linkReferences": {
     "contracts/types/NftId.sol": {
       "NftIdLib": [
         {
           "length": 20,
-          "start": 2316
+          "start": 2509
         },
         {
           "length": 20,
-          "start": 2865
+          "start": 3554
         }
       ]
     }
@@ -293,11 +371,11 @@
       "NftIdLib": [
         {
           "length": 20,
-          "start": 795
+          "start": 1063
         },
         {
           "length": 20,
-          "start": 1344
+          "start": 2108
         }
       ]
     }

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

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

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

@@ -75,8 +75,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5061032e806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780635312fdc214610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b60405167ffffffffffffffff90911681526020015b60405180910390f35b610064610090366004610260565b6100c9565b610064610146565b6100a5610150565b6040516100799190610279565b6100a561017f565b60006100c46101ab565b905090565b6040516368aebf7b60e01b81526004810182905260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b90602401602060405180830381865af415801561011c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014091906102c7565b92915050565b60006100c4610224565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b6040516368aebf7b60e01b815261012c600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024015b602060405180830381865af4158015610200573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906102c7565b6040516368aebf7b60e01b8152610190600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024016101e3565b60006020828403121561027257600080fd5b5035919050565b600060208083528351808285015260005b818110156102a65785810183015185820160400152820161028a565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102d957600080fd5b815167ffffffffffffffff811681146102f157600080fd5b939250505056fea264697066735822122070aa986ac072957f1c326903a602728dfefa89d60b76bd349e8ddd1e0617ac7e64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780635312fdc214610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b60405167ffffffffffffffff90911681526020015b60405180910390f35b610064610090366004610260565b6100c9565b610064610146565b6100a5610150565b6040516100799190610279565b6100a561017f565b60006100c46101ab565b905090565b6040516368aebf7b60e01b81526004810182905260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b90602401602060405180830381865af415801561011c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014091906102c7565b92915050565b60006100c4610224565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b6040516368aebf7b60e01b815261012c600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024015b602060405180830381865af4158015610200573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906102c7565b6040516368aebf7b60e01b8152610190600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024016101e3565b60006020828403121561027257600080fd5b5035919050565b600060208083528351808285015260005b818110156102a65785810183015185820160400152820161028a565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102d957600080fd5b815167ffffffffffffffff811681146102f157600080fd5b939250505056fea264697066735822122070aa986ac072957f1c326903a602728dfefa89d60b76bd349e8ddd1e0617ac7e64736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b5061032e806100206000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780635312fdc214610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b60405167ffffffffffffffff90911681526020015b60405180910390f35b610064610090366004610260565b6100c9565b610064610146565b6100a5610150565b6040516100799190610279565b6100a561017f565b60006100c46101ab565b905090565b6040516368aebf7b60e01b81526004810182905260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b90602401602060405180830381865af415801561011c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014091906102c7565b92915050565b60006100c4610224565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b6040516368aebf7b60e01b815261012c600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024015b602060405180830381865af4158015610200573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906102c7565b6040516368aebf7b60e01b8152610190600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024016101e3565b60006020828403121561027257600080fd5b5035919050565b600060208083528351808285015260005b818110156102a65785810183015185820160400152820161028a565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102d957600080fd5b815167ffffffffffffffff811681146102f157600080fd5b939250505056fea264697066735822122002606735f1504d2afdda3834a08af6a4e1ec7c2f49ae620f6c3c1baa9ad40c5564736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80631fa8a7301461005c5780635312fdc214610082578063775a404814610095578063b844f20e1461009d578063c4ce6e5b146100b2575b600080fd5b6100646100ba565b60405167ffffffffffffffff90911681526020015b60405180910390f35b610064610090366004610260565b6100c9565b610064610146565b6100a5610150565b6040516100799190610279565b6100a561017f565b60006100c46101ab565b905090565b6040516368aebf7b60e01b81526004810182905260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b90602401602060405180830381865af415801561011c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061014091906102c7565b92915050565b60006100c4610224565b60606100c460408051808201909152601081526f50726f647563744f776e6572526f6c6560801b602082015290565b60606100c460408051808201909152600d81526c506f6f6c4f776e6572526f6c6560981b602082015290565b6040516368aebf7b60e01b815261012c600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024015b602060405180830381865af4158015610200573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100c491906102c7565b6040516368aebf7b60e01b8152610190600482015260009073__$cd131c2b3ba46b9dbe046aaf4458b9777d$__906368aebf7b906024016101e3565b60006020828403121561027257600080fd5b5035919050565b600060208083528351808285015260005b818110156102a65785810183015185820160400152820161028a565b506000604082860101526040601f19601f8301168501019250505092915050565b6000602082840312156102d957600080fd5b815167ffffffffffffffff811681146102f157600080fd5b939250505056fea264697066735822122002606735f1504d2afdda3834a08af6a4e1ec7c2f49ae620f6c3c1baa9ad40c5564736f6c63430008140033",
   "linkReferences": {
     "contracts/types/RoleId.sol": {
       "RoleIdLib": [

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

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