@etherisc/gif-next 0.0.2-d96b9e1-825 → 0.0.2-da09ec0-359

package/artifacts/contracts/types/Fee.sol/FeeLib.json

@@ -5,11 +5,6 @@
   "abi": [
     {
       "inputs": [
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        },
         {
           "components": [
             {
@@ -26,19 +21,55 @@
           "internalType": "struct Fee",
           "name": "fee",
           "type": "tuple"
+        },
+        {
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
         }
       ],
       "name": "calculateFee",
       "outputs": [
         {
-          "internalType": "uint256",
+          "internalType": "Amount",
           "name": "feeAmount",
-          "type": "uint256"
+          "type": "uint96"
         },
         {
-          "internalType": "uint256",
+          "internalType": "Amount",
           "name": "netAmount",
-          "type": "uint256"
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "UFixed",
+              "name": "fractionalFee",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "fixedFee",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct Fee",
+          "name": "fee",
+          "type": "tuple"
+        }
+      ],
+      "name": "eqz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
         }
       ],
       "stateMutability": "pure",
@@ -112,7 +143,7 @@
           "type": "tuple"
         }
       ],
-      "name": "feeIsZero",
+      "name": "gtz",
       "outputs": [
         {
           "internalType": "bool",
@@ -123,6 +154,37 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint8",
+          "name": "percent",
+          "type": "uint8"
+        }
+      ],
+      "name": "percentageFee",
+      "outputs": [
+        {
+          "components": [
+            {
+              "internalType": "UFixed",
+              "name": "fractionalFee",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "fixedFee",
+              "type": "uint256"
+            }
+          ],
+          "internalType": "struct Fee",
+          "name": "fee",
+          "type": "tuple"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -185,32 +247,64 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6109e2610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100615760003560e01c80632bd182d3146100665780638de0a4c21461008457806395248868146100b4578063c66fb3ae146100e4578063c7010dfa14610115575b600080fd5b61006e610145565b60405161007b91906104e2565b60405180910390f35b61009e60048036038101906100999190610645565b610169565b6040516100ab919061068d565b60405180910390f35b6100ce60048036038101906100c991906106a8565b610189565b6040516100db919061068d565b60405180910390f35b6100fe60048036038101906100f991906106e8565b6101b8565b60405161010c929190610737565b60405180910390f35b61012f600480360381019061012a9190610760565b6102e5565b60405161013c91906104e2565b60405180910390f35b61014d610445565b6040518060400160405280600081526020016000815250905090565b6000808260200151148015610182575060008260000151145b9050919050565b6000816020015183602001511480156101b057506101af8360000151836000015161030a565b5b905092915050565b600080600061024273__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__6345ebb61e876040518263ffffffff1660e01b81526004016101f791906107a0565b602060405180830381865af4158015610214573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023891906107d0565b8560000151610317565b905083602001518173__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__6344aa683690916040518263ffffffff1660e01b8152600401610282919061080c565b602060405180830381865af415801561029f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102c3919061083c565b6102cd9190610898565b925082856102db91906108cc565b9150509250929050565b6102ed610445565b604051806040016040528084815260200183815250905092915050565b6000818314905092915050565b600061032c8383670de0b6b3a7640000610334565b905092915050565b600080600080198587098587029250828110838203039150506000810361036f5783828161036557610364610900565b5b049250505061043e565b8084116103b1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103a89061098c565b60405180910390fd5b60008486880990508281118203915080830392506000600186190186169050808604955080840493506001818260000304019050808302841793506000600287600302189050808702600203810290508087026002038102905080870260020381029050808702600203810290508087026002038102905080870260020381029050808502955050505050505b9392505050565b604051806040016040528060008152602001600081525090565b6000819050919050565b6000819050919050565b600061048e6104896104848461045f565b610469565b61045f565b9050919050565b61049e81610473565b82525050565b6104ad8161045f565b82525050565b6040820160008201516104c96000850182610495565b5060208201516104dc60208501826104a4565b50505050565b60006040820190506104f760008301846104b3565b92915050565b6000604051905090565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61055a82610511565b810181811067ffffffffffffffff8211171561057957610578610522565b5b80604052505050565b600061058c6104fd565b90506105988282610551565b919050565b6105a68161045f565b81146105b157600080fd5b50565b6000813590506105c38161059d565b92915050565b6105d28161045f565b81146105dd57600080fd5b50565b6000813590506105ef816105c9565b92915050565b60006040828403121561060b5761060a61050c565b5b6106156040610582565b90506000610625848285016105b4565b6000830152506020610639848285016105e0565b60208301525092915050565b60006040828403121561065b5761065a610507565b5b6000610669848285016105f5565b91505092915050565b60008115159050919050565b61068781610672565b82525050565b60006020820190506106a2600083018461067e565b92915050565b600080608083850312156106bf576106be610507565b5b60006106cd858286016105f5565b92505060406106de858286016105f5565b9150509250929050565b600080606083850312156106ff576106fe610507565b5b600061070d858286016105e0565b925050602061071e858286016105f5565b9150509250929050565b6107318161045f565b82525050565b600060408201905061074c6000830185610728565b6107596020830184610728565b9392505050565b6000806040838503121561077757610776610507565b5b6000610785858286016105b4565b9250506020610796858286016105e0565b9150509250929050565b60006020820190506107b56000830184610728565b92915050565b6000815190506107ca8161059d565b92915050565b6000602082840312156107e6576107e5610507565b5b60006107f4848285016107bb565b91505092915050565b61080681610473565b82525050565b600060208201905061082160008301846107fd565b92915050565b600081519050610836816105c9565b92915050565b60006020828403121561085257610851610507565b5b600061086084828501610827565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006108a38261045f565b91506108ae8361045f565b92508282019050808211156108c6576108c5610869565b5b92915050565b60006108d78261045f565b91506108e28361045f565b92508282039050818111156108fa576108f9610869565b5b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600082825260208201905092915050565b7f4d6174683a206d756c446976206f766572666c6f770000000000000000000000600082015250565b600061097660158361092f565b915061098182610940565b602082019050919050565b600060208201905081810360008301526109a581610969565b905091905056fea26469706673582212205803ef57433457e2d4f2b6a903a086e0dc38d0c20358c0cebc688f4c49590c7864736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100615760003560e01c80632bd182d3146100665780638de0a4c21461008457806395248868146100b4578063c66fb3ae146100e4578063c7010dfa14610115575b600080fd5b61006e610145565b60405161007b91906104e2565b60405180910390f35b61009e60048036038101906100999190610645565b610169565b6040516100ab919061068d565b60405180910390f35b6100ce60048036038101906100c991906106a8565b610189565b6040516100db919061068d565b60405180910390f35b6100fe60048036038101906100f991906106e8565b6101b8565b60405161010c929190610737565b60405180910390f35b61012f600480360381019061012a9190610760565b6102e5565b60405161013c91906104e2565b60405180910390f35b61014d610445565b6040518060400160405280600081526020016000815250905090565b6000808260200151148015610182575060008260000151145b9050919050565b6000816020015183602001511480156101b057506101af8360000151836000015161030a565b5b905092915050565b600080600061024273__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__6345ebb61e876040518263ffffffff1660e01b81526004016101f791906107a0565b602060405180830381865af4158015610214573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023891906107d0565b8560000151610317565b905083602001518173__$fa7f345063a1bf0cf2bd14a32ccc1b6018$__6344aa683690916040518263ffffffff1660e01b8152600401610282919061080c565b602060405180830381865af415801561029f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102c3919061083c565b6102cd9190610898565b925082856102db91906108cc565b9150509250929050565b6102ed610445565b604051806040016040528084815260200183815250905092915050565b6000818314905092915050565b600061032c8383670de0b6b3a7640000610334565b905092915050565b600080600080198587098587029250828110838203039150506000810361036f5783828161036557610364610900565b5b049250505061043e565b8084116103b1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103a89061098c565b60405180910390fd5b60008486880990508281118203915080830392506000600186190186169050808604955080840493506001818260000304019050808302841793506000600287600302189050808702600203810290508087026002038102905080870260020381029050808702600203810290508087026002038102905080870260020381029050808502955050505050505b9392505050565b604051806040016040528060008152602001600081525090565b6000819050919050565b6000819050919050565b600061048e6104896104848461045f565b610469565b61045f565b9050919050565b61049e81610473565b82525050565b6104ad8161045f565b82525050565b6040820160008201516104c96000850182610495565b5060208201516104dc60208501826104a4565b50505050565b60006040820190506104f760008301846104b3565b92915050565b6000604051905090565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b61055a82610511565b810181811067ffffffffffffffff8211171561057957610578610522565b5b80604052505050565b600061058c6104fd565b90506105988282610551565b919050565b6105a68161045f565b81146105b157600080fd5b50565b6000813590506105c38161059d565b92915050565b6105d28161045f565b81146105dd57600080fd5b50565b6000813590506105ef816105c9565b92915050565b60006040828403121561060b5761060a61050c565b5b6106156040610582565b90506000610625848285016105b4565b6000830152506020610639848285016105e0565b60208301525092915050565b60006040828403121561065b5761065a610507565b5b6000610669848285016105f5565b91505092915050565b60008115159050919050565b61068781610672565b82525050565b60006020820190506106a2600083018461067e565b92915050565b600080608083850312156106bf576106be610507565b5b60006106cd858286016105f5565b92505060406106de858286016105f5565b9150509250929050565b600080606083850312156106ff576106fe610507565b5b600061070d858286016105e0565b925050602061071e858286016105f5565b9150509250929050565b6107318161045f565b82525050565b600060408201905061074c6000830185610728565b6107596020830184610728565b9392505050565b6000806040838503121561077757610776610507565b5b6000610785858286016105b4565b9250506020610796858286016105e0565b9150509250929050565b60006020820190506107b56000830184610728565b92915050565b6000815190506107ca8161059d565b92915050565b6000602082840312156107e6576107e5610507565b5b60006107f4848285016107bb565b91505092915050565b61080681610473565b82525050565b600060208201905061082160008301846107fd565b92915050565b600081519050610836816105c9565b92915050565b60006020828403121561085257610851610507565b5b600061086084828501610827565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006108a38261045f565b91506108ae8361045f565b92508282019050808211156108c6576108c5610869565b5b92915050565b60006108d78261045f565b91506108e28361045f565b92508282039050818111156108fa576108f9610869565b5b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600082825260208201905092915050565b7f4d6174683a206d756c446976206f766572666c6f770000000000000000000000600082015250565b600061097660158361092f565b915061098182610940565b602082019050919050565b600060208201905081810360008301526109a581610969565b905091905056fea26469706673582212205803ef57433457e2d4f2b6a903a086e0dc38d0c20358c0cebc688f4c49590c7864736f6c63430008140033",
+  "bytecode": "0x6107b561003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c8063952488681161006557806395248868146101085780639ed246ea1461011b578063c7010dfa1461014e578063d0e149f71461018257600080fd5b806305deb8b71461008c5780632bd182d3146100b45780635faa955b146100f5575b600080fd5b61009f61009a36600461062c565b610195565b60405190151581526020015b60405180910390f35b604080518082018252600080825260209182018190528251808401909352808352908201525b604080518251815260209283015192810192909252016100ab565b6100da610103366004610648565b6101b1565b61009f61011636600461066b565b61025a565b61012e6101293660046106b8565b61027b565b604080516001600160601b039384168152929091166020830152016100ab565b6100da61015c3660046106f0565b604080518082018252600080825260209182015281518083019092529281529182015290565b61009f61019036600461062c565b61042f565b80516000901515806101ab575060008260200151115b92915050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$5ac3274b8cf1e01ea223bf093142af05b0$__631488c84560848301602060405180830381865af4158015610226573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061024a9190610712565b8152600060209091015292915050565b600081602001518360200151148015610274575082518251145b9392505050565b60008161028784610195565b15610428576040516355205f0f60e01b81526001600160601b03841660048201526000906103169073__$ea4dcf94bcd4a5d2e83a2341ef616bff8d$__906355205f0f90602401602060405180830381865af41580156102eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030f9190610712565b8651610446565b6020860151604051632255341b60e11b81526004810183905291925073__$ea4dcf94bcd4a5d2e83a2341ef616bff8d$__91634c41dd96919073__$5ac3274b8cf1e01ea223bf093142af05b0$__906344aa683690602401602060405180830381865af415801561038b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103af9190610712565b6103b9919061072b565b6040518263ffffffff1660e01b81526004016103d791815260200190565b602060405180830381865af41580156103f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610418919061074c565b9250610424828461045b565b9150505b9250929050565b6000816020015160001480156101ab575050511590565b60006102748383670de0b6b3a76400006104e2565b6040516363cf551160e11b81526001600160601b0380841660048301528216602482015260009073__$ea4dcf94bcd4a5d2e83a2341ef616bff8d$__9063c79eaa2290604401602060405180830381865af41580156104be573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610274919061074c565b600080806000198587098587029250828110838203039150508060000361051c5783828161051257610512610769565b0492505050610274565b8084116105675760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156105e157600080fd5b6040516040810181811067ffffffffffffffff8211171561061257634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561063e57600080fd5b61027483836105cf565b60006020828403121561065a57600080fd5b813560ff8116811461027457600080fd5b6000806080838503121561067e57600080fd5b61068884846105cf565b915061069784604085016105cf565b90509250929050565b6001600160601b03811681146106b557600080fd5b50565b600080606083850312156106cb57600080fd5b6106d584846105cf565b915060408301356106e5816106a0565b809150509250929050565b6000806040838503121561070357600080fd5b50508035926020909101359150565b60006020828403121561072457600080fd5b5051919050565b808201808211156101ab57634e487b7160e01b600052601160045260246000fd5b60006020828403121561075e57600080fd5b8151610274816106a0565b634e487b7160e01b600052601260045260246000fdfea26469706673582212203fc3c04977b356cda886f696e2ddaab2b1e150ce908f03e25a169f0805220b0f64736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c8063952488681161006557806395248868146101085780639ed246ea1461011b578063c7010dfa1461014e578063d0e149f71461018257600080fd5b806305deb8b71461008c5780632bd182d3146100b45780635faa955b146100f5575b600080fd5b61009f61009a36600461062c565b610195565b60405190151581526020015b60405180910390f35b604080518082018252600080825260209182018190528251808401909352808352908201525b604080518251815260209283015192810192909252016100ab565b6100da610103366004610648565b6101b1565b61009f61011636600461066b565b61025a565b61012e6101293660046106b8565b61027b565b604080516001600160601b039384168152929091166020830152016100ab565b6100da61015c3660046106f0565b604080518082018252600080825260209182015281518083019092529281529182015290565b61009f61019036600461062c565b61042f565b80516000901515806101ab575060008260200151115b92915050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$5ac3274b8cf1e01ea223bf093142af05b0$__631488c84560848301602060405180830381865af4158015610226573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061024a9190610712565b8152600060209091015292915050565b600081602001518360200151148015610274575082518251145b9392505050565b60008161028784610195565b15610428576040516355205f0f60e01b81526001600160601b03841660048201526000906103169073__$ea4dcf94bcd4a5d2e83a2341ef616bff8d$__906355205f0f90602401602060405180830381865af41580156102eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030f9190610712565b8651610446565b6020860151604051632255341b60e11b81526004810183905291925073__$ea4dcf94bcd4a5d2e83a2341ef616bff8d$__91634c41dd96919073__$5ac3274b8cf1e01ea223bf093142af05b0$__906344aa683690602401602060405180830381865af415801561038b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103af9190610712565b6103b9919061072b565b6040518263ffffffff1660e01b81526004016103d791815260200190565b602060405180830381865af41580156103f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610418919061074c565b9250610424828461045b565b9150505b9250929050565b6000816020015160001480156101ab575050511590565b60006102748383670de0b6b3a76400006104e2565b6040516363cf551160e11b81526001600160601b0380841660048301528216602482015260009073__$ea4dcf94bcd4a5d2e83a2341ef616bff8d$__9063c79eaa2290604401602060405180830381865af41580156104be573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610274919061074c565b600080806000198587098587029250828110838203039150508060000361051c5783828161051257610512610769565b0492505050610274565b8084116105675760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156105e157600080fd5b6040516040810181811067ffffffffffffffff8211171561061257634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561063e57600080fd5b61027483836105cf565b60006020828403121561065a57600080fd5b813560ff8116811461027457600080fd5b6000806080838503121561067e57600080fd5b61068884846105cf565b915061069784604085016105cf565b90509250929050565b6001600160601b03811681146106b557600080fd5b50565b600080606083850312156106cb57600080fd5b6106d584846105cf565b915060408301356106e5816106a0565b809150509250929050565b6000806040838503121561070357600080fd5b50508035926020909101359150565b60006020828403121561072457600080fd5b5051919050565b808201808211156101ab57634e487b7160e01b600052601160045260246000fd5b60006020828403121561075e57600080fd5b8151610274816106a0565b634e487b7160e01b600052601260045260246000fdfea26469706673582212203fc3c04977b356cda886f696e2ddaab2b1e150ce908f03e25a169f0805220b0f64736f6c63430008140033",
   "linkReferences": {
+    "contracts/types/Amount.sol": {
+      "AmountLib": [
+        {
+          "length": 20,
+          "start": 747
+        },
+        {
+          "length": 20,
+          "start": 878
+        },
+        {
+          "length": 20,
+          "start": 1214
+        }
+      ]
+    },
     "contracts/types/UFixed.sol": {
-      "UFixedMathLib": [
+      "UFixedLib": [
         {
           "length": 20,
-          "start": 533
+          "start": 551
         },
         {
           "length": 20,
-          "start": 671
+          "start": 907
         }
       ]
     }
   },
   "deployedLinkReferences": {
+    "contracts/types/Amount.sol": {
+      "AmountLib": [
+        {
+          "length": 20,
+          "start": 689
+        },
+        {
+          "length": 20,
+          "start": 820
+        },
+        {
+          "length": 20,
+          "start": 1156
+        }
+      ]
+    },
     "contracts/types/UFixed.sol": {
-      "UFixedMathLib": [
+      "UFixedLib": [
         {
           "length": 20,
-          "start": 450
+          "start": 493
         },
         {
           "length": 20,
-          "start": 588
+          "start": 849
         }
       ]
     }

package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/746f2ad7b0d888e05db828a61f6d5e10.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/Key32.sol/Key32Lib.json

@@ -57,14 +57,6 @@
     },
     {
       "inputs": [
-        {
-          "internalType": "Key32",
-          "name": "key",
-          "type": "bytes32"
-        }
-      ],
-      "name": "toKey",
-      "outputs": [
         {
           "internalType": "ObjectType",
           "name": "objectType",
@@ -76,36 +68,58 @@
           "type": "bytes31"
         }
       ],
+      "name": "toKey32",
+      "outputs": [
+        {
+          "internalType": "Key32",
+          "name": "",
+          "type": "bytes32"
+        }
+      ],
       "stateMutability": "pure",
       "type": "function"
     },
     {
       "inputs": [
         {
-          "internalType": "ObjectType",
-          "name": "objectType",
-          "type": "uint8"
-        },
+          "internalType": "Key32",
+          "name": "key",
+          "type": "bytes32"
+        }
+      ],
+      "name": "toKeyId",
+      "outputs": [
         {
           "internalType": "KeyId",
           "name": "id",
           "type": "bytes31"
         }
       ],
-      "name": "toKey32",
-      "outputs": [
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
         {
           "internalType": "Key32",
-          "name": "",
+          "name": "key",
           "type": "bytes32"
         }
       ],
+      "name": "toObjectType",
+      "outputs": [
+        {
+          "internalType": "ObjectType",
+          "name": "objectType",
+          "type": "uint8"
+        }
+      ],
       "stateMutability": "pure",
       "type": "function"
     }
   ],
-  "bytecode": "0x6105cc610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80630f94cc501461007157806329e9b2261461008f578063a4dc7d86146100ad578063d92bb60d146100de578063da3fe412146100fc578063f48016ce1461011a575b600080fd5b61007961014a565b60405161008691906102b0565b60405180910390f35b610097610174565b6040516100a491906102e7565b60405180910390f35b6100c760048036038101906100c29190610333565b610179565b6040516100d59291906103e8565b60405180910390f35b6100e66101ff565b6040516100f391906102b0565b60405180910390f35b61010461022a565b60405161011191906102e7565b60405180910390f35b610134600480360381019061012f9190610469565b61023f565b60405161014191906104ca565b60405180910390f35b60ff60f81b7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191681565b60f881565b600080600083905060f860ff1660ff60f81b7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916821660001c901c925060f860ff166101006101c89190610522565b60ff1660ff60f81b7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916198216901b915050915091565b60ff60f81b7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19161981565b60f860ff1661010061023c9190610522565b81565b6000808360ff16905060008360081c7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16905060008160f860ff1684901b6102869190610562565b90508060001b935050505092915050565b6000819050919050565b6102aa81610297565b82525050565b60006020820190506102c560008301846102a1565b92915050565b600060ff82169050919050565b6102e1816102cb565b82525050565b60006020820190506102fc60008301846102d8565b92915050565b600080fd5b61031081610297565b811461031b57600080fd5b50565b60008135905061032d81610307565b92915050565b60006020828403121561034957610348610302565b5b60006103578482850161031e565b91505092915050565b6000819050919050565b600061038561038061037b846102cb565b610360565b6102cb565b9050919050565b6103958161036a565b82525050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0082169050919050565b60006103d28261039b565b9050919050565b6103e2816103c7565b82525050565b60006040820190506103fd600083018561038c565b61040a60208301846103d9565b9392505050565b61041a816102cb565b811461042557600080fd5b50565b60008135905061043781610411565b92915050565b6104468161039b565b811461045157600080fd5b50565b6000813590506104638161043d565b92915050565b600080604083850312156104805761047f610302565b5b600061048e85828601610428565b925050602061049f85828601610454565b9150509250929050565b60006104b482610297565b9050919050565b6104c4816104a9565b82525050565b60006020820190506104df60008301846104bb565b92915050565b600061ffff82169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061052d826104e5565b9150610538836104e5565b9250828203905061ffff811115610552576105516104f3565b5b92915050565b6000819050919050565b600061056d82610558565b915061057883610558565b92508282019050808211156105905761058f6104f3565b5b9291505056fea264697066735822122015c089ac91547935a32ea5c13920c6c01e4ab99450eb5a453e3d3ffbb1297e3b64736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80630f94cc501461007157806329e9b2261461008f578063a4dc7d86146100ad578063d92bb60d146100de578063da3fe412146100fc578063f48016ce1461011a575b600080fd5b61007961014a565b60405161008691906102b0565b60405180910390f35b610097610174565b6040516100a491906102e7565b60405180910390f35b6100c760048036038101906100c29190610333565b610179565b6040516100d59291906103e8565b60405180910390f35b6100e66101ff565b6040516100f391906102b0565b60405180910390f35b61010461022a565b60405161011191906102e7565b60405180910390f35b610134600480360381019061012f9190610469565b61023f565b60405161014191906104ca565b60405180910390f35b60ff60f81b7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff191681565b60f881565b600080600083905060f860ff1660ff60f81b7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916821660001c901c925060f860ff166101006101c89190610522565b60ff1660ff60f81b7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916198216901b915050915091565b60ff60f81b7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff19161981565b60f860ff1661010061023c9190610522565b81565b6000808360ff16905060008360081c7effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff16905060008160f860ff1684901b6102869190610562565b90508060001b935050505092915050565b6000819050919050565b6102aa81610297565b82525050565b60006020820190506102c560008301846102a1565b92915050565b600060ff82169050919050565b6102e1816102cb565b82525050565b60006020820190506102fc60008301846102d8565b92915050565b600080fd5b61031081610297565b811461031b57600080fd5b50565b60008135905061032d81610307565b92915050565b60006020828403121561034957610348610302565b5b60006103578482850161031e565b91505092915050565b6000819050919050565b600061038561038061037b846102cb565b610360565b6102cb565b9050919050565b6103958161036a565b82525050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0082169050919050565b60006103d28261039b565b9050919050565b6103e2816103c7565b82525050565b60006040820190506103fd600083018561038c565b61040a60208301846103d9565b9392505050565b61041a816102cb565b811461042557600080fd5b50565b60008135905061043781610411565b92915050565b6104468161039b565b811461045157600080fd5b50565b6000813590506104638161043d565b92915050565b600080604083850312156104805761047f610302565b5b600061048e85828601610428565b925050602061049f85828601610454565b9150509250929050565b60006104b482610297565b9050919050565b6104c4816104a9565b82525050565b60006020820190506104df60008301846104bb565b92915050565b600061ffff82169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061052d826104e5565b9150610538836104e5565b9250828203905061ffff811115610552576105516104f3565b5b92915050565b6000819050919050565b600061056d82610558565b915061057883610558565b92508282019050808211156105905761058f6104f3565b5b9291505056fea264697066735822122015c089ac91547935a32ea5c13920c6c01e4ab99450eb5a453e3d3ffbb1297e3b64736f6c63430008140033",
+  "bytecode": "0x61027361003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639601d31e116100655780639601d31e146100ee578063d92bb60d14610102578063da3fe41214610110578063f48016ce1461011857600080fd5b80630f94cc501461008c57806329e9b226146100ae578063389e7d68146100c8575b600080fd5b61009b6001600160f81b031981565b6040519081526020015b60405180910390f35b6100b660f881565b60405160ff90911681526020016100a5565b6100db6100d6366004610193565b61012b565b60405160ff1990911681526020016100a5565b6100b66100fc366004610193565b60f81c90565b61009b6001600160f81b0381565b6100b6610153565b61009b6101263660046101ac565b610163565b60008161013b60f8610100610208565b6001600160f81b039190911660ff9091161b92915050565b61016060f8610100610208565b81565b600060ff8316600883901c82610187826001600160f81b031960f889901b1661022a565b93505050505b92915050565b6000602082840312156101a557600080fd5b5035919050565b600080604083850312156101bf57600080fd5b823560ff811681146101d057600080fd5b9150602083013560ff19811681146101e757600080fd5b809150509250929050565b634e487b7160e01b600052601160045260246000fd5b61ffff828116828216039080821115610223576102236101f2565b5092915050565b8082018082111561018d5761018d6101f256fea26469706673582212205ec8c3d53f9e2825c63d0c62f7e16c8b237796b36198656469bddd8475385ffd64736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639601d31e116100655780639601d31e146100ee578063d92bb60d14610102578063da3fe41214610110578063f48016ce1461011857600080fd5b80630f94cc501461008c57806329e9b226146100ae578063389e7d68146100c8575b600080fd5b61009b6001600160f81b031981565b6040519081526020015b60405180910390f35b6100b660f881565b60405160ff90911681526020016100a5565b6100db6100d6366004610193565b61012b565b60405160ff1990911681526020016100a5565b6100b66100fc366004610193565b60f81c90565b61009b6001600160f81b0381565b6100b6610153565b61009b6101263660046101ac565b610163565b60008161013b60f8610100610208565b6001600160f81b039190911660ff9091161b92915050565b61016060f8610100610208565b81565b600060ff8316600883901c82610187826001600160f81b031960f889901b1661022a565b93505050505b92915050565b6000602082840312156101a557600080fd5b5035919050565b600080604083850312156101bf57600080fd5b823560ff811681146101d057600080fd5b9150602083013560ff19811681146101e757600080fd5b809150509250929050565b634e487b7160e01b600052601160045260246000fd5b61ffff828116828216039080821115610223576102236101f2565b5092915050565b8082018082111561018d5761018d6101f256fea26469706673582212205ec8c3d53f9e2825c63d0c62f7e16c8b237796b36198656469bddd8475385ffd64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/746f2ad7b0d888e05db828a61f6d5e10.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/NftId.sol/NftIdLib.json

@@ -126,16 +126,29 @@
       ],
       "stateMutability": "pure",
       "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "zero",
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
     }
   ],
-  "bytecode": "0x6105e3610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806308dc895e1461007157806330b8415f146100a15780633889a4c8146100d157806340a8cd9e1461010157806352694ee814610131578063c4cade9d14610161575b600080fd5b61008b600480360381019061008691906102fc565b610191565b6040516100989190610338565b60405180910390f35b6100bb60048036038101906100b691906102fc565b61019b565b6040516100c8919061036e565b60405180910390f35b6100eb60048036038101906100e691906103c2565b6101b5565b6040516100f8919061042d565b60405180910390f35b61011b600480360381019061011691906102fc565b610241565b6040516101289190610495565b60405180910390f35b61014b600480360381019061014691906102fc565b61025c565b604051610158919061036e565b60405180910390f35b61017b600480360381019061017691906104b0565b610276565b604051610188919061036e565b60405180910390f35b6000819050919050565b600080826bffffffffffffffffffffffff16119050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce836101db86610241565b6040518363ffffffff1660e01b81526004016101f892919061052b565b602060405180830381865af4158015610215573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102399190610580565b905092915050565b6000816bffffffffffffffffffffffff1660081b9050919050565b600080826bffffffffffffffffffffffff16149050919050565b6000610282838361028a565b905092915050565b6000816bffffffffffffffffffffffff16836bffffffffffffffffffffffff1614905092915050565b600080fd5b60006bffffffffffffffffffffffff82169050919050565b6102d9816102b8565b81146102e457600080fd5b50565b6000813590506102f6816102d0565b92915050565b600060208284031215610312576103116102b3565b5b6000610320848285016102e7565b91505092915050565b610332816102b8565b82525050565b600060208201905061034d6000830184610329565b92915050565b60008115159050919050565b61036881610353565b82525050565b6000602082019050610383600083018461035f565b92915050565b600060ff82169050919050565b61039f81610389565b81146103aa57600080fd5b50565b6000813590506103bc81610396565b92915050565b600080604083850312156103d9576103d86102b3565b5b60006103e7858286016102e7565b92505060206103f8858286016103ad565b9150509250929050565b6000819050919050565b600061041782610402565b9050919050565b6104278161040c565b82525050565b6000602082019050610442600083018461041e565b92915050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0082169050919050565b600061047f82610448565b9050919050565b61048f81610474565b82525050565b60006020820190506104aa6000830184610486565b92915050565b600080604083850312156104c7576104c66102b3565b5b60006104d5858286016102e7565b92505060206104e6858286016102e7565b9150509250929050565b6000819050919050565b600061051561051061050b84610389565b6104f0565b610389565b9050919050565b610525816104fa565b82525050565b6000604082019050610540600083018561051c565b61054d6020830184610486565b9392505050565b61055d81610402565b811461056857600080fd5b50565b60008151905061057a81610554565b92915050565b600060208284031215610596576105956102b3565b5b60006105a48482850161056b565b9150509291505056fea26469706673582212207d716f98f6a7f53a1e3b3b9186369103d05a2c3783045946ebebf5361ea67d0564736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806308dc895e1461007157806330b8415f146100a15780633889a4c8146100d157806340a8cd9e1461010157806352694ee814610131578063c4cade9d14610161575b600080fd5b61008b600480360381019061008691906102fc565b610191565b6040516100989190610338565b60405180910390f35b6100bb60048036038101906100b691906102fc565b61019b565b6040516100c8919061036e565b60405180910390f35b6100eb60048036038101906100e691906103c2565b6101b5565b6040516100f8919061042d565b60405180910390f35b61011b600480360381019061011691906102fc565b610241565b6040516101289190610495565b60405180910390f35b61014b600480360381019061014691906102fc565b61025c565b604051610158919061036e565b60405180910390f35b61017b600480360381019061017691906104b0565b610276565b604051610188919061036e565b60405180910390f35b6000819050919050565b600080826bffffffffffffffffffffffff16119050919050565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce836101db86610241565b6040518363ffffffff1660e01b81526004016101f892919061052b565b602060405180830381865af4158015610215573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102399190610580565b905092915050565b6000816bffffffffffffffffffffffff1660081b9050919050565b600080826bffffffffffffffffffffffff16149050919050565b6000610282838361028a565b905092915050565b6000816bffffffffffffffffffffffff16836bffffffffffffffffffffffff1614905092915050565b600080fd5b60006bffffffffffffffffffffffff82169050919050565b6102d9816102b8565b81146102e457600080fd5b50565b6000813590506102f6816102d0565b92915050565b600060208284031215610312576103116102b3565b5b6000610320848285016102e7565b91505092915050565b610332816102b8565b82525050565b600060208201905061034d6000830184610329565b92915050565b60008115159050919050565b61036881610353565b82525050565b6000602082019050610383600083018461035f565b92915050565b600060ff82169050919050565b61039f81610389565b81146103aa57600080fd5b50565b6000813590506103bc81610396565b92915050565b600080604083850312156103d9576103d86102b3565b5b60006103e7858286016102e7565b92505060206103f8858286016103ad565b9150509250929050565b6000819050919050565b600061041782610402565b9050919050565b6104278161040c565b82525050565b6000602082019050610442600083018461041e565b92915050565b60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0082169050919050565b600061047f82610448565b9050919050565b61048f81610474565b82525050565b60006020820190506104aa6000830184610486565b92915050565b600080604083850312156104c7576104c66102b3565b5b60006104d5858286016102e7565b92505060206104e6858286016102e7565b9150509250929050565b6000819050919050565b600061051561051061050b84610389565b6104f0565b610389565b9050919050565b610525816104fa565b82525050565b6000604082019050610540600083018561051c565b61054d6020830184610486565b9392505050565b61055d81610402565b811461056857600080fd5b50565b60008151905061057a81610554565b92915050565b600060208284031215610596576105956102b3565b5b60006105a48482850161056b565b9150509291505056fea26469706673582212207d716f98f6a7f53a1e3b3b9186369103d05a2c3783045946ebebf5361ea67d0564736f6c63430008140033",
+  "bytecode": "0x61031c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806340a8cd9e1161006557806340a8cd9e1461010757806352694ee81461013d578063bc1b392d14610158578063c4cade9d1461015f57600080fd5b806308dc895e1461008c57806330b8415f146100ba5780633889a4c8146100e6575b600080fd5b61009d61009a366004610242565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100d66100c8366004610242565b6001600160601b0316151590565b60405190151581526020016100b1565b6100f96100f436600461025d565b610183565b6040519081526020016100b1565b61012a610115366004610242565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100b1565b6100d661014b366004610242565b6001600160601b03161590565b600061009d565b6100d661016d36600461029a565b60006001600160601b038084169083161461021f565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021f91906102cd565b9392505050565b80356001600160601b038116811461023d57600080fd5b919050565b60006020828403121561025457600080fd5b61021f82610226565b6000806040838503121561027057600080fd5b61027983610226565b9150602083013560ff8116811461028f57600080fd5b809150509250929050565b600080604083850312156102ad57600080fd5b6102b683610226565b91506102c460208401610226565b90509250929050565b6000602082840312156102df57600080fd5b505191905056fea264697066735822122079f3c69b4b2df08ead6ff0a86b2076405ff488efec7e0791d0ec36c248aa472464736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806340a8cd9e1161006557806340a8cd9e1461010757806352694ee81461013d578063bc1b392d14610158578063c4cade9d1461015f57600080fd5b806308dc895e1461008c57806330b8415f146100ba5780633889a4c8146100e6575b600080fd5b61009d61009a366004610242565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100d66100c8366004610242565b6001600160601b0316151590565b60405190151581526020016100b1565b6100f96100f436600461025d565b610183565b6040519081526020016100b1565b61012a610115366004610242565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100b1565b6100d661014b366004610242565b6001600160601b03161590565b600061009d565b6100d661016d36600461029a565b60006001600160601b038084169083161461021f565b600073__$c8f743efd2b4f0c9300f2558c784479d3e$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021f91906102cd565b9392505050565b80356001600160601b038116811461023d57600080fd5b919050565b60006020828403121561025457600080fd5b61021f82610226565b6000806040838503121561027057600080fd5b61027983610226565b9150602083013560ff8116811461028f57600080fd5b809150509250929050565b600080604083850312156102ad57600080fd5b6102b683610226565b91506102c460208401610226565b90509250929050565b6000602082840312156102df57600080fd5b505191905056fea264697066735822122079f3c69b4b2df08ead6ff0a86b2076405ff488efec7e0791d0ec36c248aa472464736f6c63430008140033",
   "linkReferences": {
     "contracts/types/Key32.sol": {
       "Key32Lib": [
         {
           "length": 20,
-          "start": 524
+          "start": 449
         }
       ]
     }
@@ -145,7 +158,7 @@
       "Key32Lib": [
         {
           "length": 20,
-          "start": 441
+          "start": 391
         }
       ]
     }

package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/746f2ad7b0d888e05db828a61f6d5e10.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.json

@@ -2,9 +2,32 @@
   "_format": "hh-sol-artifact-1",
   "contractName": "LibNftIdSet",
   "sourceName": "contracts/types/NftIdSet.sol",
-  "abi": [],
-  "bytecode": "0x610838610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632bfdd6b91461007157806331a97de2146100a1578063a3082a18146100d1578063a73d57561461010e578063d2fa1e361461014b578063e797d8991461017b575b600080fd5b61008b600480360381019061008691906105a8565b6101ab565b6040516100989190610603565b60405180910390f35b6100bb60048036038101906100b6919061061e565b6101e9565b6040516100c89190610603565b60405180910390f35b8180156100dd57600080fd5b506100f860048036038101906100f391906105a8565b6101fc565b6040516101059190610603565b60405180910390f35b81801561011a57600080fd5b50610135600480360381019061013091906105a8565b6102e7565b6040516101429190610603565b60405180910390f35b6101656004803603810190610160919061061e565b6104ca565b6040516101729190610664565b60405180910390f35b610195600480360381019061019091906106ab565b6104db565b6040516101a29190610726565b60405180910390f35b600080836001016000846bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020019081526020016000205411905092915050565b6000808260000180549050149050919050565b600080836001016000846bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200190815260200160002054036102dc5782600001829080600181540180825580915050600190039060005260206000209060029182820401919006600c029091909190916101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508260000180549050836001016000846bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200190815260200160002081905550600190506102e1565b600090505b92915050565b600080836001016000846bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200190815260200160002054905060008111156104be5760006001826103369190610770565b905060006001866000018054905061034e9190610770565b905081811461043157600086600001828154811061036f5761036e6107a4565b5b9060005260206000209060029182820401919006600c029054906101000a90046bffffffffffffffffffffffff169050808760000184815481106103b6576103b56107a4565b5b9060005260206000209060029182820401919006600c026101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555083876001016000836bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200190815260200160002081905550505b85600001805480610445576104446107d3565b5b6001900381819060005260206000209060029182820401919006600c026101000a8154906bffffffffffffffffffffffff02191690559055856001016000866bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200190815260200160002060009055600193505050506104c4565b60009150505b92915050565b600081600001805490509050919050565b60008260000182815481106104f3576104f26107a4565b5b9060005260206000209060029182820401919006600c029054906101000a90046bffffffffffffffffffffffff16905092915050565b600080fd5b6000819050919050565b6105418161052e565b811461054c57600080fd5b50565b60008135905061055e81610538565b92915050565b60006bffffffffffffffffffffffff82169050919050565b61058581610564565b811461059057600080fd5b50565b6000813590506105a28161057c565b92915050565b600080604083850312156105bf576105be610529565b5b60006105cd8582860161054f565b92505060206105de85828601610593565b9150509250929050565b60008115159050919050565b6105fd816105e8565b82525050565b600060208201905061061860008301846105f4565b92915050565b60006020828403121561063457610633610529565b5b60006106428482850161054f565b91505092915050565b6000819050919050565b61065e8161064b565b82525050565b60006020820190506106796000830184610655565b92915050565b6106888161064b565b811461069357600080fd5b50565b6000813590506106a58161067f565b92915050565b600080604083850312156106c2576106c1610529565b5b60006106d08582860161054f565b92505060206106e185828601610696565b9150509250929050565b6000819050919050565b600061071061070b61070684610564565b6106eb565b610564565b9050919050565b610720816106f5565b82525050565b600060208201905061073b6000830184610717565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061077b8261064b565b91506107868361064b565b925082820390508181111561079e5761079d610741565b5b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fdfea2646970667358221220b9807fed6dad0bfe1b1e1c6ca92c60c83c9238d756782f500fcc32d3bffd456d64736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632bfdd6b91461007157806331a97de2146100a1578063a3082a18146100d1578063a73d57561461010e578063d2fa1e361461014b578063e797d8991461017b575b600080fd5b61008b600480360381019061008691906105a8565b6101ab565b6040516100989190610603565b60405180910390f35b6100bb60048036038101906100b6919061061e565b6101e9565b6040516100c89190610603565b60405180910390f35b8180156100dd57600080fd5b506100f860048036038101906100f391906105a8565b6101fc565b6040516101059190610603565b60405180910390f35b81801561011a57600080fd5b50610135600480360381019061013091906105a8565b6102e7565b6040516101429190610603565b60405180910390f35b6101656004803603810190610160919061061e565b6104ca565b6040516101729190610664565b60405180910390f35b610195600480360381019061019091906106ab565b6104db565b6040516101a29190610726565b60405180910390f35b600080836001016000846bffffffffffffffffffffffff166bffffffffffffffffffffffff1681526020019081526020016000205411905092915050565b6000808260000180549050149050919050565b600080836001016000846bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200190815260200160002054036102dc5782600001829080600181540180825580915050600190039060005260206000209060029182820401919006600c029091909190916101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508260000180549050836001016000846bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200190815260200160002081905550600190506102e1565b600090505b92915050565b600080836001016000846bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200190815260200160002054905060008111156104be5760006001826103369190610770565b905060006001866000018054905061034e9190610770565b905081811461043157600086600001828154811061036f5761036e6107a4565b5b9060005260206000209060029182820401919006600c029054906101000a90046bffffffffffffffffffffffff169050808760000184815481106103b6576103b56107a4565b5b9060005260206000209060029182820401919006600c026101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff16021790555083876001016000836bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200190815260200160002081905550505b85600001805480610445576104446107d3565b5b6001900381819060005260206000209060029182820401919006600c026101000a8154906bffffffffffffffffffffffff02191690559055856001016000866bffffffffffffffffffffffff166bffffffffffffffffffffffff16815260200190815260200160002060009055600193505050506104c4565b60009150505b92915050565b600081600001805490509050919050565b60008260000182815481106104f3576104f26107a4565b5b9060005260206000209060029182820401919006600c029054906101000a90046bffffffffffffffffffffffff16905092915050565b600080fd5b6000819050919050565b6105418161052e565b811461054c57600080fd5b50565b60008135905061055e81610538565b92915050565b60006bffffffffffffffffffffffff82169050919050565b61058581610564565b811461059057600080fd5b50565b6000813590506105a28161057c565b92915050565b600080604083850312156105bf576105be610529565b5b60006105cd8582860161054f565b92505060206105de85828601610593565b9150509250929050565b60008115159050919050565b6105fd816105e8565b82525050565b600060208201905061061860008301846105f4565b92915050565b60006020828403121561063457610633610529565b5b60006106428482850161054f565b91505092915050565b6000819050919050565b61065e8161064b565b82525050565b60006020820190506106796000830184610655565b92915050565b6106888161064b565b811461069357600080fd5b50565b6000813590506106a58161067f565b92915050565b600080604083850312156106c2576106c1610529565b5b60006106d08582860161054f565b92505060206106e185828601610696565b9150509250929050565b6000819050919050565b600061071061070b61070684610564565b6106eb565b610564565b9050919050565b610720816106f5565b82525050565b600060208201905061073b6000830184610717565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061077b8261064b565b91506107868361064b565b925082820390508181111561079e5761079d610741565b5b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fdfea2646970667358221220b9807fed6dad0bfe1b1e1c6ca92c60c83c9238d756782f500fcc32d3bffd456d64736f6c63430008140033",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "ErrorNftIdSetAlreadyAdded",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "ErrorNftIdSetNotInSet",
+      "type": "error"
+    }
+  ],
+  "bytecode": "0x6104c261003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632bfdd6b91461007157806331a97de2146100995780638b6233dd146100ac578063a3082a18146100cc578063a73d5756146100ee578063e797d8991461010e575b600080fd5b61008461007f3660046103c8565b610139565b60405190151581526020015b60405180910390f35b6100846100a7366004610404565b541590565b6100be6100ba366004610404565b5490565b604051908152602001610090565b8180156100d857600080fd5b506100ec6100e73660046103c8565b61015d565b005b8180156100fa57600080fd5b506100ec6101093660046103c8565b6101f8565b61012161011c36600461041d565b610380565b6040516001600160601b039091168152602001610090565b6001600160601b038116600090815260018301602052604090205415155b92915050565b6001600160601b0381166000908152600183016020526040902054156101a6576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b81546001818101845560008481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b03811660009081526001830160205260408120549081900361023f5760405163482084f160e01b81526001600160601b038316600482015260240161019d565b600061024c60018361043f565b84549091506000906102609060019061043f565b905081811461030a57600085600001828154811061028057610280610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b03169050808660000184815481106102c1576102c1610460565b60009182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061031b5761031b610476565b6001900381819060005260206000209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001016000856001600160601b03166001600160601b03168152602001908152602001600020600090555050505050565b600082600001828154811061039757610397610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b600080604083850312156103db57600080fd5b8235915060208301356001600160601b03811681146103f957600080fd5b809150509250929050565b60006020828403121561041657600080fd5b5035919050565b6000806040838503121561043057600080fd5b50508035926020909101359150565b8181038181111561015757634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea2646970667358221220a77dfba6df8781a1240fd13ee997b0d55bc768bc1587ac066f5922b6be9dec7a64736f6c63430008140033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632bfdd6b91461007157806331a97de2146100995780638b6233dd146100ac578063a3082a18146100cc578063a73d5756146100ee578063e797d8991461010e575b600080fd5b61008461007f3660046103c8565b610139565b60405190151581526020015b60405180910390f35b6100846100a7366004610404565b541590565b6100be6100ba366004610404565b5490565b604051908152602001610090565b8180156100d857600080fd5b506100ec6100e73660046103c8565b61015d565b005b8180156100fa57600080fd5b506100ec6101093660046103c8565b6101f8565b61012161011c36600461041d565b610380565b6040516001600160601b039091168152602001610090565b6001600160601b038116600090815260018301602052604090205415155b92915050565b6001600160601b0381166000908152600183016020526040902054156101a6576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b81546001818101845560008481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b03811660009081526001830160205260408120549081900361023f5760405163482084f160e01b81526001600160601b038316600482015260240161019d565b600061024c60018361043f565b84549091506000906102609060019061043f565b905081811461030a57600085600001828154811061028057610280610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b03169050808660000184815481106102c1576102c1610460565b60009182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061031b5761031b610476565b6001900381819060005260206000209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001016000856001600160601b03166001600160601b03168152602001908152602001600020600090555050505050565b600082600001828154811061039757610397610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b600080604083850312156103db57600080fd5b8235915060208301356001600160601b03811681146103f957600080fd5b809150509250929050565b60006020828403121561041657600080fd5b5035919050565b6000806040838503121561043057600080fd5b50508035926020909101359150565b8181038181111561015757634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea2646970667358221220a77dfba6df8781a1240fd13ee997b0d55bc768bc1587ac066f5922b6be9dec7a64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
+}

package/artifacts/contracts/types/NumberId.sol/NumberIdLib.json

@@ -0,0 +1,100 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "NumberIdLib",
+  "sourceName": "contracts/types/NumberId.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "NumberId",
+          "name": "a",
+          "type": "uint32"
+        }
+      ],
+      "name": "eqz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NumberId",
+          "name": "a",
+          "type": "uint32"
+        }
+      ],
+      "name": "gtz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NumberId",
+          "name": "a",
+          "type": "uint32"
+        }
+      ],
+      "name": "toInt",
+      "outputs": [
+        {
+          "internalType": "uint32",
+          "name": "",
+          "type": "uint32"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "a",
+          "type": "uint256"
+        }
+      ],
+      "name": "toNumberId",
+      "outputs": [
+        {
+          "internalType": "NumberId",
+          "name": "",
+          "type": "uint32"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "zero",
+      "outputs": [
+        {
+          "internalType": "NumberId",
+          "name": "",
+          "type": "uint32"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x61016361003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100615760003560e01c806342f49ac0146100665780636effeac4146100935780637409c40f146100b9578063bc1b392d146100c7578063d15b5893146100ce575b600080fd5b61007e6100743660046100e7565b63ffffffff161590565b60405190151581526020015b60405180910390f35b6100a46100a13660046100e7565b90565b60405163ffffffff909116815260200161008a565b6100a46100a1366004610114565b60006100a4565b61007e6100dc3660046100e7565b63ffffffff16151590565b6000602082840312156100f957600080fd5b813563ffffffff8116811461010d57600080fd5b9392505050565b60006020828403121561012657600080fd5b503591905056fea2646970667358221220d2b815692572b0a06f7afcf6bbb5e7b61423399976164fb7683b5c8a481c863964736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100615760003560e01c806342f49ac0146100665780636effeac4146100935780637409c40f146100b9578063bc1b392d146100c7578063d15b5893146100ce575b600080fd5b61007e6100743660046100e7565b63ffffffff161590565b60405190151581526020015b60405180910390f35b6100a46100a13660046100e7565b90565b60405163ffffffff909116815260200161008a565b6100a46100a1366004610114565b60006100a4565b61007e6100dc3660046100e7565b63ffffffff16151590565b6000602082840312156100f957600080fd5b813563ffffffff8116811461010d57600080fd5b9392505050565b60006020828403121561012657600080fd5b503591905056fea2646970667358221220d2b815692572b0a06f7afcf6bbb5e7b61423399976164fb7683b5c8a481c863964736f6c63430008140033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/746f2ad7b0d888e05db828a61f6d5e10.json"
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
 }

package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.json

@@ -85,8 +85,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6102c6610053600b82828239805160001a607314610046577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f9196201461008b578063ac43d834146100bb578063b2466acf146100eb575b600080fd5b610075600480360381019061007091906101ab565b61011b565b6040516100829190610206565b60405180910390f35b6100a560048036038101906100a09190610221565b61012f565b6040516100b29190610206565b60405180910390f35b6100d560048036038101906100d09190610221565b61013e565b6040516100e29190610275565b60405180910390f35b61010560048036038101906101009190610221565b61014b565b6040516101129190610206565b60405180910390f35b6000610127838361015a565b905092915050565b6000808260ff16149050919050565b60008160ff169050919050565b6000808260ff16119050919050565b60008160ff168360ff1614905092915050565b600080fd5b600060ff82169050919050565b61018881610172565b811461019357600080fd5b50565b6000813590506101a58161017f565b92915050565b600080604083850312156101c2576101c161016d565b5b60006101d085828601610196565b92505060206101e185828601610196565b9150509250929050565b60008115159050919050565b610200816101eb565b82525050565b600060208201905061021b60008301846101f7565b92915050565b6000602082840312156102375761023661016d565b5b600061024584828501610196565b91505092915050565b60006bffffffffffffffffffffffff82169050919050565b61026f8161024e565b82525050565b600060208201905061028a6000830184610266565b9291505056fea264697066735822122052cc6ad67bf4a6cb971b7b44f7561859da74722168fa5d78f849d4135189e83d64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f9196201461008b578063ac43d834146100bb578063b2466acf146100eb575b600080fd5b610075600480360381019061007091906101ab565b61011b565b6040516100829190610206565b60405180910390f35b6100a560048036038101906100a09190610221565b61012f565b6040516100b29190610206565b60405180910390f35b6100d560048036038101906100d09190610221565b61013e565b6040516100e29190610275565b60405180910390f35b61010560048036038101906101009190610221565b61014b565b6040516101129190610206565b60405180910390f35b6000610127838361015a565b905092915050565b6000808260ff16149050919050565b60008160ff169050919050565b6000808260ff16119050919050565b60008160ff168360ff1614905092915050565b600080fd5b600060ff82169050919050565b61018881610172565b811461019357600080fd5b50565b6000813590506101a58161017f565b92915050565b600080604083850312156101c2576101c161016d565b5b60006101d085828601610196565b92505060206101e185828601610196565b9150509250929050565b60008115159050919050565b610200816101eb565b82525050565b600060208201905061021b60008301846101f7565b92915050565b6000602082840312156102375761023661016d565b5b600061024584828501610196565b91505092915050565b60006bffffffffffffffffffffffff82169050919050565b61026f8161024e565b82525050565b600060208201905061028a6000830184610266565b9291505056fea264697066735822122052cc6ad67bf4a6cb971b7b44f7561859da74722168fa5d78f849d4135189e83d64736f6c63430008140033",
+  "bytecode": "0x61018c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea2646970667358221220a05598860810f4a0e7e5f7213578f3d434700569bbd80c6f7d3653667cfd84b764736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632c2f8a671461005b5780636f91962014610083578063ac43d83414610098578063b2466acf146100c9575b600080fd5b61006e610069366004610108565b6100df565b60405190151581526020015b60405180910390f35b61006e61009136600461013b565b60ff161590565b6100ac6100a636600461013b565b60ff1690565b6040516bffffffffffffffffffffffff909116815260200161007a565b61006e6100d736600461013b565b60ff16151590565b600060ff808416908316145b9392505050565b803560ff8116811461010357600080fd5b919050565b6000806040838503121561011b57600080fd5b610124836100f2565b9150610132602084016100f2565b90509250929050565b60006020828403121561014d57600080fd5b6100eb826100f256fea2646970667358221220a05598860810f4a0e7e5f7213578f3d434700569bbd80c6f7d3653667cfd84b764736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/types/PayoutId.sol/PayoutIdLib.dbg.json

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../build-info/85066c6f3c5dc0f34dc544d5ab504181.json"
+}