@etherisc/gif-next 0.0.2-9a053fa-993 → 0.0.2-9b434da-265

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"
     },
     {
@@ -118,15 +136,15 @@
               "name": "activatedBy",
               "type": "address"
             },
-            {
-              "internalType": "Blocknumber",
-              "name": "activatedIn",
-              "type": "uint32"
-            },
             {
               "internalType": "Timestamp",
               "name": "activatedAt",
               "type": "uint40"
+            },
+            {
+              "internalType": "Blocknumber",
+              "name": "activatedIn",
+              "type": "uint32"
             }
           ],
           "internalType": "struct IVersionable.VersionInfo",
@@ -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/7f20a1c1335663e2e20eb70fbac6fce5.json"
+  "buildInfo": "../../../build-info/b0463691af8f7fdd39ae65ce29b66f86.json"
 }

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

@@ -70,24 +70,48 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b506103c6806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006b575b600080fd5b61005560048036038101906100509190610209565b610089565b60405161006291906102d5565b60405180910390f35b61007361011d565b60405161008091906102d5565b60405180910390f35b61009161017b565b61011473__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__631488c84586866040518363ffffffff1660e01b81526004016100cd92919061030e565b602060405180830381865af41580156100ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010e9190610363565b83610132565b90509392505050565b61012561017b565b61012d610157565b905090565b61013a61017b565b604051806040016040528084815260200183815250905092915050565b61015f61017b565b6040518060400160405280600081526020016000815250905090565b604051806040016040528060008152602001600081525090565b600080fd5b6000819050919050565b6101ad8161019a565b81146101b857600080fd5b50565b6000813590506101ca816101a4565b92915050565b60008160000b9050919050565b6101e6816101d0565b81146101f157600080fd5b50565b600081359050610203816101dd565b92915050565b60008060006060848603121561022257610221610195565b5b6000610230868287016101bb565b9350506020610241868287016101f4565b9250506040610252868287016101bb565b9150509250925092565b6000819050919050565b600061028161027c6102778461019a565b61025c565b61019a565b9050919050565b61029181610266565b82525050565b6102a08161019a565b82525050565b6040820160008201516102bc6000850182610288565b5060208201516102cf6020850182610297565b50505050565b60006040820190506102ea60008301846102a6565b92915050565b6102f98161019a565b82525050565b610308816101d0565b82525050565b600060408201905061032360008301856102f0565b61033060208301846102ff565b9392505050565b6103408161019a565b811461034b57600080fd5b50565b60008151905061035d81610337565b92915050565b60006020828403121561037957610378610195565b5b60006103878482850161034e565b9150509291505056fea26469706673582212204b8c7b2d1da62dd9a7ac1a260585d62f05555ce69da033d7a20eddb2c51dba5964736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006b575b600080fd5b61005560048036038101906100509190610209565b610089565b60405161006291906102d5565b60405180910390f35b61007361011d565b60405161008091906102d5565b60405180910390f35b61009161017b565b61011473__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__631488c84586866040518363ffffffff1660e01b81526004016100cd92919061030e565b602060405180830381865af41580156100ea573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061010e9190610363565b83610132565b90509392505050565b61012561017b565b61012d610157565b905090565b61013a61017b565b604051806040016040528084815260200183815250905092915050565b61015f61017b565b6040518060400160405280600081526020016000815250905090565b604051806040016040528060008152602001600081525090565b600080fd5b6000819050919050565b6101ad8161019a565b81146101b857600080fd5b50565b6000813590506101ca816101a4565b92915050565b60008160000b9050919050565b6101e6816101d0565b81146101f157600080fd5b50565b600081359050610203816101dd565b92915050565b60008060006060848603121561022257610221610195565b5b6000610230868287016101bb565b9350506020610241868287016101f4565b9250506040610252868287016101bb565b9150509250925092565b6000819050919050565b600061028161027c6102778461019a565b61025c565b61019a565b9050919050565b61029181610266565b82525050565b6102a08161019a565b82525050565b6040820160008201516102bc6000850182610288565b5060208201516102cf6020850182610297565b50505050565b60006040820190506102ea60008301846102a6565b92915050565b6102f98161019a565b82525050565b610308816101d0565b82525050565b600060408201905061032360008301856102f0565b61033060208301846102ff565b9392505050565b6103408161019a565b811461034b57600080fd5b50565b60008151905061035d81610337565b92915050565b60006020828403121561037957610378610195565b5b60006103878482850161034e565b9150509291505056fea26469706673582212204b8c7b2d1da62dd9a7ac1a260585d62f05555ce69da033d7a20eddb2c51dba5964736f6c63430008140033",
+  "bytecode": "0x608060405234801561001057600080fd5b50610301806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006d575b600080fd5b61004e610049366004610217565b610075565b6040805182518152602092830151928101929092520160405180910390f35b61004e610192565b6040805180820190915260008082526020820152604051631488c84560e01b815260048101859052600084900b602482015273__$a23651848365a6a5ca15f07b4331037f48$__9063c7010dfa9073__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__90631488c84590604401602060405180830381865af41580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610255565b846040518363ffffffff1660e01b815260040161014a929190918252602082015260400190565b6040805180830381865af4158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a919061026e565b949350505050565b604080518082019091526000808252602082015273__$a23651848365a6a5ca15f07b4331037f48$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea26469706673582212209bfce5af9619ec4b682783c86a4a759179e4f7d10da372b502c45afa25ab2e8864736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80634e3dca121461003b57806387c565861461006d575b600080fd5b61004e610049366004610217565b610075565b6040805182518152602092830151928101929092520160405180910390f35b61004e610192565b6040805180820190915260008082526020820152604051631488c84560e01b815260048101859052600084900b602482015273__$a23651848365a6a5ca15f07b4331037f48$__9063c7010dfa9073__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__90631488c84590604401602060405180830381865af41580156100ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101239190610255565b846040518363ffffffff1660e01b815260040161014a929190918252602082015260400190565b6040805180830381865af4158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a919061026e565b949350505050565b604080518082019091526000808252602082015273__$a23651848365a6a5ca15f07b4331037f48$__632bd182d36040518163ffffffff1660e01b81526004016040805180830381865af41580156101ee573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610212919061026e565b905090565b60008060006060848603121561022c57600080fd5b8335925060208401358060000b811461024457600080fd5b929592945050506040919091013590565b60006020828403121561026757600080fd5b5051919050565b60006040828403121561028057600080fd5b6040516040810181811067ffffffffffffffff821117156102b157634e487b7160e01b600052604160045260246000fd5b60405282518152602092830151928101929092525091905056fea26469706673582212209bfce5af9619ec4b682783c86a4a759179e4f7d10da372b502c45afa25ab2e8864736f6c63430008140033",
   "linkReferences": {
+    "contracts/types/Fee.sol": {
+      "FeeLib": [
+        {
+          "length": 20,
+          "start": 201
+        },
+        {
+          "length": 20,
+          "start": 456
+        }
+      ]
+    },
     "contracts/types/UFixed.sol": {
       "UFixedMathLib": [
         {
           "length": 20,
-          "start": 182
+          "start": 229
         }
       ]
     }
   },
   "deployedLinkReferences": {
+    "contracts/types/Fee.sol": {
+      "FeeLib": [
+        {
+          "length": 20,
+          "start": 169
+        },
+        {
+          "length": 20,
+          "start": 424
+        }
+      ]
+    },
     "contracts/types/UFixed.sol": {
       "UFixedMathLib": [
         {
           "length": 20,
-          "start": 150
+          "start": 197
         }
       ]
     }

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

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

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

@@ -14,32 +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": "getData",
-      "outputs": [
+      "name": "ErrorRegistryAddressZero",
+      "type": "error"
+    },
+    {
+      "inputs": [
         {
-          "internalType": "bytes",
-          "name": "data",
-          "type": "bytes"
+          "internalType": "address",
+          "name": "registry",
+          "type": "address"
         }
       ],
-      "stateMutability": "view",
-      "type": "function"
+      "name": "ErrorRegistryAlreadyInitialized",
+      "type": "error"
     },
     {
       "inputs": [],
-      "name": "getNftId",
+      "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": "NftId",
-          "name": "nftId",
-          "type": "uint96"
+          "internalType": "bytes32",
+          "name": "",
+          "type": "bytes32"
         }
       ],
       "stateMutability": "view",
@@ -47,12 +153,54 @@
     },
     {
       "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": "",
+          "type": "tuple"
+        },
+        {
+          "internalType": "bytes",
+          "name": "data",
+          "type": "bytes"
         }
       ],
       "stateMutability": "view",
@@ -60,11 +208,11 @@
     },
     {
       "inputs": [],
-      "name": "getParentNftId",
+      "name": "getNftId",
       "outputs": [
         {
           "internalType": "NftId",
-          "name": "nftId",
+          "name": "",
           "type": "uint96"
         }
       ],
@@ -73,11 +221,11 @@
     },
     {
       "inputs": [],
-      "name": "getRegistry",
+      "name": "getOwner",
       "outputs": [
         {
-          "internalType": "contract IRegistry",
-          "name": "registry",
+          "internalType": "address",
+          "name": "",
           "type": "address"
         }
       ],
@@ -86,27 +234,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 +272,34 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60e06040523480156200001157600080fd5b506040516200120a3803806200120a83398181016040528101906200003791906200046a565b81816200006a7f01ffc9a7000000000000000000000000000000000000000000000000000000006200034b60201b60201c565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603620000dc576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620000d39062000512565b60405180910390fd5b8173ffffffffffffffffffffffffffffffffffffffff1660808173ffffffffffffffffffffffffffffffffffffffff168152505060805173ffffffffffffffffffffffffffffffffffffffff166301ffc9a77f06ecd8ef000000000000000000000000000000000000000000000000000000006040518263ffffffff1660e01b81526004016200016d919062000571565b602060405180830381865afa1580156200018b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620001b19190620005cb565b620001f3576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620001ea906200064d565b60405180910390fd5b806bffffffffffffffffffffffff1660a0816bffffffffffffffffffffffff168152505060805173ffffffffffffffffffffffffffffffffffffffff1663e74d052f60a0516040518263ffffffff1660e01b8152600401620002569190620006b2565b602060405180830381865afa15801562000274573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200029a9190620005cb565b620002dc576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620002d39062000745565b60405180910390fd5b3373ffffffffffffffffffffffffffffffffffffffff1660c08173ffffffffffffffffffffffffffffffffffffffff1681525050620003417f3bf74c8e000000000000000000000000000000000000000000000000000000006200034b60201b60201c565b5050505062000767565b6001600080837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060006101000a81548160ff02191690831515021790555050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620003e982620003bc565b9050919050565b620003fb81620003dc565b81146200040757600080fd5b50565b6000815190506200041b81620003f0565b92915050565b60006bffffffffffffffffffffffff82169050919050565b620004448162000421565b81146200045057600080fd5b50565b600081519050620004648162000439565b92915050565b60008060408385031215620004845762000483620003b7565b5b600062000494858286016200040a565b9250506020620004a78582860162000453565b9150509250929050565b600082825260208201905092915050565b7f4552524f523a5247422d3031303a52454749535452595f5a45524f0000000000600082015250565b6000620004fa601b83620004b1565b91506200050782620004c2565b602082019050919050565b600060208201905081810360008301526200052d81620004eb565b9050919050565b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b6200056b8162000534565b82525050565b600060208201905062000588600083018462000560565b92915050565b60008115159050919050565b620005a5816200058e565b8114620005b157600080fd5b50565b600081519050620005c5816200059a565b92915050565b600060208284031215620005e457620005e3620003b7565b5b6000620005f484828501620005b4565b91505092915050565b7f4552524f523a5247422d3031313a4e4f545f5245474953545259000000000000600082015250565b600062000635601a83620004b1565b91506200064282620005fd565b602082019050919050565b60006020820190508181036000830152620006688162000626565b9050919050565b6000819050919050565b60006200069a620006946200068e8462000421565b6200066f565b62000421565b9050919050565b620006ac8162000679565b82525050565b6000602082019050620006c96000830184620006a1565b92915050565b7f4552524f523a5247422d3031323a504152454e545f4e4f545f5245474953544560008201527f5245440000000000000000000000000000000000000000000000000000000000602082015250565b60006200072d602383620004b1565b91506200073a82620006cf565b604082019050919050565b6000602082019050818103600083015262000760816200071e565b9050919050565b60805160a05160c051610a57620007b360003960006104dc0152600061032101526000818161027e01528181610360015281816103880152818161042a01526105050152610a576000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c80633bc5de301161005b5780633bc5de30146101175780635ab1bd5314610135578063644c45e014610153578063893d20e81461017157610088565b806301ffc9a71461008d57806315dae03e146100bd5780631aa3a008146100db57806331b62a3b146100f9575b600080fd5b6100a760048036038101906100a2919061064a565b61018f565b6040516100b49190610692565b60405180910390f35b6100c56101f6565b6040516100d291906106f5565b60405180910390f35b6100e3610205565b6040516100f09190610759565b60405180910390f35b61010161031d565b60405161010e9190610759565b60405180910390f35b61011f610345565b60405161012c9190610804565b60405180910390f35b61013d61035c565b60405161014a919061089b565b60405180910390f35b61015b610384565b6040516101689190610759565b60405180910390f35b610179610425565b60405161018691906108d7565b60405180910390f35b6000806000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060009054906101000a900460ff169050919050565b60006102006105a4565b905090565b600061020f610425565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461027c576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102739061094f565b60405180910390fd5b7f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16634420e486306040518263ffffffff1660e01b81526004016102d591906108d7565b6020604051808303816000875af11580156102f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610318919061099b565b905090565b60007f0000000000000000000000000000000000000000000000000000000000000000905090565b606060405180602001604052806000815250905090565b60007f0000000000000000000000000000000000000000000000000000000000000000905090565b60007f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663d272ac1e306040518263ffffffff1660e01b81526004016103df91906108d7565b602060405180830381865afa1580156103fc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610420919061099b565b905090565b6000807f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663d272ac1e306040518263ffffffff1660e01b815260040161048191906108d7565b602060405180830381865afa15801561049e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c2919061099b565b90506104d5816104d06105b5565b6105ba565b15610503577f00000000000000000000000000000000000000000000000000000000000000009150506105a1565b7f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663df33330b826040518263ffffffff1660e01b815260040161055c9190610759565b602060405180830381865afa158015610579573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061059d91906109f4565b9150505b90565b60006105b0601e6105e3565b905090565b600090565b6000816bffffffffffffffffffffffff16836bffffffffffffffffffffffff1614905092915050565b6000819050919050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b610627816105f2565b811461063257600080fd5b50565b6000813590506106448161061e565b92915050565b6000602082840312156106605761065f6105ed565b5b600061066e84828501610635565b91505092915050565b60008115159050919050565b61068c81610677565b82525050565b60006020820190506106a76000830184610683565b92915050565b600060ff82169050919050565b6000819050919050565b60006106df6106da6106d5846106ad565b6106ba565b6106ad565b9050919050565b6106ef816106c4565b82525050565b600060208201905061070a60008301846106e6565b92915050565b60006bffffffffffffffffffffffff82169050919050565b600061074361073e61073984610710565b6106ba565b610710565b9050919050565b61075381610728565b82525050565b600060208201905061076e600083018461074a565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b838110156107ae578082015181840152602081019050610793565b60008484015250505050565b6000601f19601f8301169050919050565b60006107d682610774565b6107e0818561077f565b93506107f0818560208601610790565b6107f9816107ba565b840191505092915050565b6000602082019050818103600083015261081e81846107cb565b905092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061086161085c61085784610826565b6106ba565b610826565b9050919050565b600061087382610846565b9050919050565b600061088582610868565b9050919050565b6108958161087a565b82525050565b60006020820190506108b0600083018461088c565b92915050565b60006108c182610826565b9050919050565b6108d1816108b6565b82525050565b60006020820190506108ec60008301846108c8565b92915050565b600082825260208201905092915050565b7f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000600082015250565b60006109396017836108f2565b915061094482610903565b602082019050919050565b600060208201905081810360008301526109688161092c565b9050919050565b61097881610710565b811461098357600080fd5b50565b6000815190506109958161096f565b92915050565b6000602082840312156109b1576109b06105ed565b5b60006109bf84828501610986565b91505092915050565b6109d1816108b6565b81146109dc57600080fd5b50565b6000815190506109ee816109c8565b92915050565b600060208284031215610a0a57610a096105ed565b5b6000610a18848285016109df565b9150509291505056fea26469706673582212207aaec0571b7d148e3cd3a323961c4d6d29aebc582d6e7cad6c81bad264138d8a64736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100885760003560e01c80633bc5de301161005b5780633bc5de30146101175780635ab1bd5314610135578063644c45e014610153578063893d20e81461017157610088565b806301ffc9a71461008d57806315dae03e146100bd5780631aa3a008146100db57806331b62a3b146100f9575b600080fd5b6100a760048036038101906100a2919061064a565b61018f565b6040516100b49190610692565b60405180910390f35b6100c56101f6565b6040516100d291906106f5565b60405180910390f35b6100e3610205565b6040516100f09190610759565b60405180910390f35b61010161031d565b60405161010e9190610759565b60405180910390f35b61011f610345565b60405161012c9190610804565b60405180910390f35b61013d61035c565b60405161014a919061089b565b60405180910390f35b61015b610384565b6040516101689190610759565b60405180910390f35b610179610425565b60405161018691906108d7565b60405180910390f35b6000806000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060009054906101000a900460ff169050919050565b60006102006105a4565b905090565b600061020f610425565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461027c576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102739061094f565b60405180910390fd5b7f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff16634420e486306040518263ffffffff1660e01b81526004016102d591906108d7565b6020604051808303816000875af11580156102f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610318919061099b565b905090565b60007f0000000000000000000000000000000000000000000000000000000000000000905090565b606060405180602001604052806000815250905090565b60007f0000000000000000000000000000000000000000000000000000000000000000905090565b60007f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663d272ac1e306040518263ffffffff1660e01b81526004016103df91906108d7565b602060405180830381865afa1580156103fc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610420919061099b565b905090565b6000807f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663d272ac1e306040518263ffffffff1660e01b815260040161048191906108d7565b602060405180830381865afa15801561049e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104c2919061099b565b90506104d5816104d06105b5565b6105ba565b15610503577f00000000000000000000000000000000000000000000000000000000000000009150506105a1565b7f000000000000000000000000000000000000000000000000000000000000000073ffffffffffffffffffffffffffffffffffffffff1663df33330b826040518263ffffffff1660e01b815260040161055c9190610759565b602060405180830381865afa158015610579573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061059d91906109f4565b9150505b90565b60006105b0601e6105e3565b905090565b600090565b6000816bffffffffffffffffffffffff16836bffffffffffffffffffffffff1614905092915050565b6000819050919050565b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b610627816105f2565b811461063257600080fd5b50565b6000813590506106448161061e565b92915050565b6000602082840312156106605761065f6105ed565b5b600061066e84828501610635565b91505092915050565b60008115159050919050565b61068c81610677565b82525050565b60006020820190506106a76000830184610683565b92915050565b600060ff82169050919050565b6000819050919050565b60006106df6106da6106d5846106ad565b6106ba565b6106ad565b9050919050565b6106ef816106c4565b82525050565b600060208201905061070a60008301846106e6565b92915050565b60006bffffffffffffffffffffffff82169050919050565b600061074361073e61073984610710565b6106ba565b610710565b9050919050565b61075381610728565b82525050565b600060208201905061076e600083018461074a565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b838110156107ae578082015181840152602081019050610793565b60008484015250505050565b6000601f19601f8301169050919050565b60006107d682610774565b6107e0818561077f565b93506107f0818560208601610790565b6107f9816107ba565b840191505092915050565b6000602082019050818103600083015261081e81846107cb565b905092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061086161085c61085784610826565b6106ba565b610826565b9050919050565b600061087382610846565b9050919050565b600061088582610868565b9050919050565b6108958161087a565b82525050565b60006020820190506108b0600083018461088c565b92915050565b60006108c182610826565b9050919050565b6108d1816108b6565b82525050565b60006020820190506108ec60008301846108c8565b92915050565b600082825260208201905092915050565b7f4552524f523a5247422d3030313a4e4f545f4f574e4552000000000000000000600082015250565b60006109396017836108f2565b915061094482610903565b602082019050919050565b600060208201905081810360008301526109688161092c565b9050919050565b61097881610710565b811461098357600080fd5b50565b6000815190506109958161096f565b92915050565b6000602082840312156109b1576109b06105ed565b5b60006109bf84828501610986565b91505092915050565b6109d1816108b6565b81146109dc57600080fd5b50565b6000815190506109ee816109c8565b92915050565b600060208284031215610a0a57610a096105ed565b5b6000610a18848285016109df565b9150509291505056fea26469706673582212207aaec0571b7d148e3cd3a323961c4d6d29aebc582d6e7cad6c81bad264138d8a64736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
+  "bytecode": "0x60806040523480156200001157600080fd5b5060405162000d9638038062000d96833981016040819052620000349162000347565b6301ffc9a760e01b60009081526020527f67be87c3ff9960ca1e9cfac5cab2ff4747269cf9ed20c9b7306235ac35a491c5805460ff19166001179055600280546001600160a01b03191633179055604080516020810190915260008152620000a1868686868686620000ad565b50505050505062000563565b620000b982876200017e565b60007f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30080546001600160601b0388166001600160681b0319909116176c0100000000000000000000000060ff8816021760ff60681b19166d01000000000000000000000000008615150217815590506001810162000138838262000472565b506303fb044760e21b60009081526020527fb43e4f3791bfcdefa3a0fbe2a5555f8d6490b90e01de0ff40c66f18b49b562c5805460ff1916600117905550505050505050565b600280546001600160a01b0319166001600160a01b038416179055620001a481620001a8565b5050565b6001546001600160a01b031615620001e75760015460405163fcdbf2d960e01b81526001600160a01b0390911660048201526024015b60405180910390fd5b6001600160a01b0381166200020f5760405163f5c4d07d60e01b815260040160405180910390fd5b806001600160a01b03163b600003620002475760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b600180546001600160a01b0319166001600160a01b0383169081179091556040516301ffc9a760e01b8152632c1c764b60e11b60048201526301ffc9a790602401602060405180830381865afa925050508015620002c4575060408051601f3d908101601f19168201909252620002c1918101906200053e565b60015b620002ee5760405163fdeac91f60e01b81526001600160a01b0382166004820152602401620001de565b80620001a45760405163fdeac91f60e01b81526001600160a01b0383166004820152602401620001de565b80516001600160a01b03811681146200033157600080fd5b919050565b805180151581146200033157600080fd5b600080600080600060a086880312156200036057600080fd5b6200036b8662000319565b60208701519095506001600160601b03811681146200038957600080fd5b604087015190945060ff81168114620003a157600080fd5b9250620003b16060870162000336565b9150620003c16080870162000319565b90509295509295909350565b634e487b7160e01b600052604160045260246000fd5b600181811c90821680620003f857607f821691505b6020821081036200041957634e487b7160e01b600052602260045260246000fd5b50919050565b601f8211156200046d57600081815260208120601f850160051c81016020861015620004485750805b601f850160051c820191505b81811015620004695782815560010162000454565b5050505b505050565b81516001600160401b038111156200048e576200048e620003cd565b620004a6816200049f8454620003e3565b846200041f565b602080601f831160018114620004de5760008415620004c55750858301515b600019600386901b1c1916600185901b17855562000469565b600085815260208120601f198616915b828110156200050f57888601518255948401946001909101908401620004ee565b50858210156200052e5787850151600019600388901b60f8161c191681555b5050505050600190811b01905550565b6000602082840312156200055157600080fd5b6200055c8262000336565b9392505050565b61082380620005736000396000f3fe608060405234801561001057600080fd5b506004361061007d5760003560e01c80631eff4b221161005b5780631eff4b22146100e45780635ab1bd5314610119578063644c45e01461013e578063893d20e81461016957600080fd5b806301ffc9a7146100825780630fec111c146100c4578063138461e0146100da575b600080fd5b6100af610090366004610621565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100cc610171565b6040516100bb929190610698565b6100e26102e1565b005b61010b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100bb565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100bb565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100bb565b610126610503565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806101e2600090565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161022a610503565b6001600160a01b031681526020018260010180546102479061073f565b80601f01602080910402602001604051908101604052809291908181526020018280546102739061073f565b80156102c05780601f10610295576101008083540402835291602001916102c0565b820191906000526020600020905b8154815290600101906020018083116102a357829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610343573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103679190610779565b156103ae576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166103d75760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610420573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104449190610779565b61046c576040516372657a5160e01b81526001600160a01b03821660048201526024016103a5565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156104b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104da919061079b565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610568573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058c9190610779565b1561061157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156105e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060c91906107c4565b905090565b506002546001600160a01b031690565b60006020828403121561063357600080fd5b81356001600160e01b03198116811461064b57600080fd5b9392505050565b6000815180845260005b818110156106785760208185018101518683018201520161065c565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516106dc60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610722610120840182610652565b905082810360208401526107368185610652565b95945050505050565b600181811c9082168061075357607f821691505b60208210810361077357634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561078b57600080fd5b8151801515811461064b57600080fd5b6000602082840312156107ad57600080fd5b81516001600160601b038116811461064b57600080fd5b6000602082840312156107d657600080fd5b81516001600160a01b038116811461064b57600080fdfea26469706673582212208d3570e695db74cd77847f8dc7b17f7bb6cd98cb60d270c286a2a52205e4d60264736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061007d5760003560e01c80631eff4b221161005b5780631eff4b22146100e45780635ab1bd5314610119578063644c45e01461013e578063893d20e81461016957600080fd5b806301ffc9a7146100825780630fec111c146100c4578063138461e0146100da575b600080fd5b6100af610090366004610621565b6001600160e01b03191660009081526020819052604090205460ff1690565b60405190151581526020015b60405180910390f35b6100cc610171565b6040516100bb929190610698565b6100e26102e1565b005b61010b7f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30081565b6040519081526020016100bb565b6001546001600160a01b03165b6040516001600160a01b0390911681526020016100bb565b600154600160a01b90046001600160601b03166040516001600160601b0390911681526020016100bb565b610126610503565b6040805160e08101825260008082526020820181905291810182905260608082018390526080820183905260a0820183905260c0820181905290917f6548007c3f4340f82f348c576c0ff69f4f529cadd5ad41f96aae61abceeaa30090506040518060e001604052806101e2600090565b6001600160601b0390811682528354908116602083015260ff600160601b820481166040840152600160681b909104161515606082015230608082015260a00161022a610503565b6001600160a01b031681526020018260010180546102479061073f565b80601f01602080910402602001604051908101604052809291908181526020018280546102739061073f565b80156102c05780601f10610295576101008083540402835291602001916102c0565b820191906000526020600020905b8154815290600101906020018083116102a357829003601f168201915b50505050508152506040518060200160405280600081525092509250509091565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015273__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610343573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103679190610779565b156103ae576001546040516316322c0f60e31b81526001600160a01b0382166004820152600160a01b9091046001600160601b031660248201526044015b60405180910390fd5b6001546001600160a01b03166103d75760405163cf29926160e01b815260040160405180910390fd5b60015460405163c3c5a54760e01b81523060048201819052916001600160a01b03169063c3c5a54790602401602060405180830381865afa158015610420573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104449190610779565b61046c576040516372657a5160e01b81526001600160a01b03821660048201526024016103a5565b600154604051636939560f60e11b81526001600160a01b0383811660048301529091169063d272ac1e90602401602060405180830381865afa1580156104b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104da919061079b565b600160146101000a8154816001600160601b0302191690836001600160601b0316021790555050565b6001546040516330b8415f60e01b8152600160a01b9091046001600160601b0316600482015260009073__$6facc32ab6029a5f5de2a1d5e55ea9da0e$__906330b8415f90602401602060405180830381865af4158015610568573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058c9190610779565b1561061157600154604051631c5da14d60e11b8152600160a01b82046001600160601b031660048201526001600160a01b03909116906338bb429a90602401602060405180830381865afa1580156105e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061060c91906107c4565b905090565b506002546001600160a01b031690565b60006020828403121561063357600080fd5b81356001600160e01b03198116811461064b57600080fd5b9392505050565b6000815180845260005b818110156106785760208185018101518683018201520161065c565b506000602082860101526020601f19601f83011685010191505092915050565b6040815260006001600160601b038085511660408401528060208601511660608401525060ff604085015116608083015260608401516106dc60a084018215159052565b5060808401516001600160a01b03811660c08401525060a08401516001600160a01b03811660e08401525060c084015160e0610100840152610722610120840182610652565b905082810360208401526107368185610652565b95945050505050565b600181811c9082168061075357607f821691505b60208210810361077357634e487b7160e01b600052602260045260246000fd5b50919050565b60006020828403121561078b57600080fd5b8151801515811461064b57600080fd5b6000602082840312156107ad57600080fd5b81516001600160601b038116811461064b57600080fd5b6000602082840312156107d657600080fd5b81516001600160a01b038116811461064b57600080fdfea26469706673582212208d3570e695db74cd77847f8dc7b17f7bb6cd98cb60d270c286a2a52205e4d60264736f6c63430008140033",
+  "linkReferences": {
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 2172
+        },
+        {
+          "length": 20,
+          "start": 2721
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/types/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 777
+        },
+        {
+          "length": 20,
+          "start": 1326
+        }
+      ]
+    }
+  }
 }

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

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