@etherisc/gif-next 0.0.2-c6d46bb-892 → 0.0.2-c75d1c9-837

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

@@ -3,6 +3,11 @@
   "contractName": "FeeLib",
   "sourceName": "contracts/type/Fee.sol",
   "abi": [
+    {
+      "inputs": [],
+      "name": "MathOverflowedMulDiv",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -10,12 +15,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -51,24 +56,41 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
-          "name": "fee",
+          "name": "a",
+          "type": "tuple"
+        },
+        {
+          "components": [
+            {
+              "internalType": "UFixed",
+              "name": "fractionalFee",
+              "type": "uint160"
+            },
+            {
+              "internalType": "Amount",
+              "name": "fixedFee",
+              "type": "uint96"
+            }
+          ],
+          "internalType": "struct Fee",
+          "name": "b",
           "type": "tuple"
         }
       ],
-      "name": "eqz",
+      "name": "eq",
       "outputs": [
         {
           "internalType": "bool",
-          "name": "",
+          "name": "isSame",
           "type": "bool"
         }
       ],
@@ -82,41 +104,24 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
-          "name": "a",
-          "type": "tuple"
-        },
-        {
-          "components": [
-            {
-              "internalType": "UFixed",
-              "name": "fractionalFee",
-              "type": "uint256"
-            },
-            {
-              "internalType": "uint256",
-              "name": "fixedFee",
-              "type": "uint256"
-            }
-          ],
-          "internalType": "struct Fee",
-          "name": "b",
+          "name": "fee",
           "type": "tuple"
         }
       ],
-      "name": "feeIsSame",
+      "name": "eqz",
       "outputs": [
         {
           "internalType": "bool",
-          "name": "isSame",
+          "name": "",
           "type": "bool"
         }
       ],
@@ -130,12 +135,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -169,12 +174,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -190,7 +195,7 @@
         {
           "internalType": "UFixed",
           "name": "fractionalFee",
-          "type": "uint256"
+          "type": "uint160"
         },
         {
           "internalType": "uint256",
@@ -205,12 +210,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -223,19 +228,19 @@
     },
     {
       "inputs": [],
-      "name": "zeroFee",
+      "name": "zero",
       "outputs": [
         {
           "components": [
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -247,22 +252,50 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6107b561003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c8063952488681161006557806395248868146101085780639ed246ea1461011b578063c7010dfa1461014e578063d0e149f71461018257600080fd5b806305deb8b71461008c5780632bd182d3146100b45780635faa955b146100f5575b600080fd5b61009f61009a36600461062c565b610195565b60405190151581526020015b60405180910390f35b604080518082018252600080825260209182018190528251808401909352808352908201525b604080518251815260209283015192810192909252016100ab565b6100da610103366004610648565b6101b1565b61009f61011636600461066b565b61025a565b61012e6101293660046106b8565b61027b565b604080516001600160601b039384168152929091166020830152016100ab565b6100da61015c3660046106f0565b604080518082018252600080825260209182015281518083019092529281529182015290565b61009f61019036600461062c565b61042f565b80516000901515806101ab575060008260200151115b92915050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af4158015610226573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061024a9190610712565b8152600060209091015292915050565b600081602001518360200151148015610274575082518251145b9392505050565b60008161028784610195565b15610428576040516355205f0f60e01b81526001600160601b03841660048201526000906103169073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156102eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030f9190610712565b8651610446565b6020860151604051632255341b60e11b81526004810183905291925073__$3bac17678db7ae928afa209f2f44deec9c$__91634c41dd96919073__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561038b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103af9190610712565b6103b9919061072b565b6040518263ffffffff1660e01b81526004016103d791815260200190565b602060405180830381865af41580156103f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610418919061074c565b9250610424828461045b565b9150505b9250929050565b6000816020015160001480156101ab575050511590565b60006102748383670de0b6b3a76400006104e2565b6040516363cf551160e11b81526001600160601b0380841660048301528216602482015260009073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa2290604401602060405180830381865af41580156104be573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610274919061074c565b600080806000198587098587029250828110838203039150508060000361051c5783828161051257610512610769565b0492505050610274565b8084116105675760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156105e157600080fd5b6040516040810181811067ffffffffffffffff8211171561061257634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561063e57600080fd5b61027483836105cf565b60006020828403121561065a57600080fd5b813560ff8116811461027457600080fd5b6000806080838503121561067e57600080fd5b61068884846105cf565b915061069784604085016105cf565b90509250929050565b6001600160601b03811681146106b557600080fd5b50565b600080606083850312156106cb57600080fd5b6106d584846105cf565b915060408301356106e5816106a0565b809150509250929050565b6000806040838503121561070357600080fd5b50508035926020909101359150565b60006020828403121561072457600080fd5b5051919050565b808201808211156101ab57634e487b7160e01b600052601160045260246000fd5b60006020828403121561075e57600080fd5b8151610274816106a0565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220f1c63ddb106c59a6988b206abfdd2d360566ae5522dd850c0626b225e16f1be364736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c8063952488681161006557806395248868146101085780639ed246ea1461011b578063c7010dfa1461014e578063d0e149f71461018257600080fd5b806305deb8b71461008c5780632bd182d3146100b45780635faa955b146100f5575b600080fd5b61009f61009a36600461062c565b610195565b60405190151581526020015b60405180910390f35b604080518082018252600080825260209182018190528251808401909352808352908201525b604080518251815260209283015192810192909252016100ab565b6100da610103366004610648565b6101b1565b61009f61011636600461066b565b61025a565b61012e6101293660046106b8565b61027b565b604080516001600160601b039384168152929091166020830152016100ab565b6100da61015c3660046106f0565b604080518082018252600080825260209182015281518083019092529281529182015290565b61009f61019036600461062c565b61042f565b80516000901515806101ab575060008260200151115b92915050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af4158015610226573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061024a9190610712565b8152600060209091015292915050565b600081602001518360200151148015610274575082518251145b9392505050565b60008161028784610195565b15610428576040516355205f0f60e01b81526001600160601b03841660048201526000906103169073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156102eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030f9190610712565b8651610446565b6020860151604051632255341b60e11b81526004810183905291925073__$3bac17678db7ae928afa209f2f44deec9c$__91634c41dd96919073__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561038b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103af9190610712565b6103b9919061072b565b6040518263ffffffff1660e01b81526004016103d791815260200190565b602060405180830381865af41580156103f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610418919061074c565b9250610424828461045b565b9150505b9250929050565b6000816020015160001480156101ab575050511590565b60006102748383670de0b6b3a76400006104e2565b6040516363cf551160e11b81526001600160601b0380841660048301528216602482015260009073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa2290604401602060405180830381865af41580156104be573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610274919061074c565b600080806000198587098587029250828110838203039150508060000361051c5783828161051257610512610769565b0492505050610274565b8084116105675760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156105e157600080fd5b6040516040810181811067ffffffffffffffff8211171561061257634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561063e57600080fd5b61027483836105cf565b60006020828403121561065a57600080fd5b813560ff8116811461027457600080fd5b6000806080838503121561067e57600080fd5b61068884846105cf565b915061069784604085016105cf565b90509250929050565b6001600160601b03811681146106b557600080fd5b50565b600080606083850312156106cb57600080fd5b6106d584846105cf565b915060408301356106e5816106a0565b809150509250929050565b6000806040838503121561070357600080fd5b50508035926020909101359150565b60006020828403121561072457600080fd5b5051919050565b808201808211156101ab57634e487b7160e01b600052601160045260246000fd5b60006020828403121561075e57600080fd5b8151610274816106a0565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220f1c63ddb106c59a6988b206abfdd2d360566ae5522dd850c0626b225e16f1be364736f6c63430008140033",
+  "bytecode": "0x610b4a610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610085575f3560e01c80639ed246ea116100635780639ed246ea14610104578063bc1b392d14610137578063c8f806b51461013f578063d0e149f714610152575f80fd5b806305deb8b7146100895780632b324dc0146100b15780635faa955b146100c4575b5f80fd5b61009c6100973660046109c7565b610165565b60405190151581526020015b60405180910390f35b61009c6100bf3660046109e1565b610200565b6100d76100d2366004610a14565b610234565b6040805182516001600160a01b031681526020928301516001600160601b031692810192909252016100a8565b610117610112366004610a34565b610356565b604080516001600160601b039384168152929091166020830152016100a8565b6100d7610508565b6100d761014d366004610a6a565b6105b0565b61009c6101603660046109c7565b610660565b80515f906001600160a01b03161515806101fa575060208201516040516330b8415f60e01b81526001600160601b03909116600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156101d6573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101fa9190610a94565b92915050565b5f610213836020015183602001516106f8565b801561022d5750825182516001600160a01b039182169116145b9392505050565b604080518082019091525f80825260208201526040805180820191829052631488c84560e01b90915260ff8316604482015260011960648201528073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af41580156102a8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102cc9190610ab3565b6001600160a01b0316815260200173__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af4158015610321573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103459190610ace565b6001600160601b0316905292915050565b5f8161036184610165565b15610501576040516355205f0f60e01b81526001600160601b03841660048201525f906103ed9073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156103c2573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103e69190610ab3565b865161077c565b60405163e2eb023b60e01b81526001600160a01b03821660048201529091506104f19073__$3bac17678db7ae928afa209f2f44deec9c$__90634c41dd969073__$bf7bc340cbb9229ef1de2c568356e67902$__9063e2eb023b90602401602060405180830381865af4158015610466573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061048a9190610ae9565b6040518263ffffffff1660e01b81526004016104a891815260200190565b602060405180830381865af41580156104c3573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104e79190610ace565b86602001516107a1565b92506104fd8284610826565b9150505b9250929050565b604080518082019091525f808252602082015260405180604001604052805f6001600160a01b0316815260200173__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af415801561057c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105a09190610ace565b6001600160601b03169052919050565b604080518082019091525f80825260208201526040805180820182526001600160a01b03851681529051632620eecb60e11b815260048101849052602082019073__$3bac17678db7ae928afa209f2f44deec9c$__90634c41dd9690602401602060405180830381865af415801561062a573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061064e9190610ace565b6001600160601b031690529392505050565b6020810151604051630a4d29dd60e31b81526001600160601b0390911660048201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__906352694ee890602401602060405180830381865af41580156106be573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106e29190610a94565b80156101fa575050516001600160a01b03161590565b60405163c4cade9d60e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063c4cade9d90604401602060405180830381865af4158015610758573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061022d9190610a94565b5f61022d836001600160a01b0316836001600160a01b031666038d7ea4c68000610870565b60405163274acb3560e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063274acb35906044015b602060405180830381865af4158015610802573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061022d9190610ace565b6040516363cf551160e11b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa22906044016107e7565b5f838302815f1985870982811083820303915050805f036108a45783828161089a5761089a610b00565b049250505061022d565b8084116108c45760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b6001600160a01b0381168114610943575f80fd5b50565b6001600160601b0381168114610943575f80fd5b5f6040828403121561096a575f80fd5b6040516040810181811067ffffffffffffffff8211171561099957634e487b7160e01b5f52604160045260245ffd5b60405290508082356109aa8161092f565b815260208301356109ba81610946565b6020919091015292915050565b5f604082840312156109d7575f80fd5b61022d838361095a565b5f80608083850312156109f2575f80fd5b6109fc848461095a565b9150610a0b846040850161095a565b90509250929050565b5f60208284031215610a24575f80fd5b813560ff8116811461022d575f80fd5b5f8060608385031215610a45575f80fd5b610a4f848461095a565b91506040830135610a5f81610946565b809150509250929050565b5f8060408385031215610a7b575f80fd5b8235610a868161092f565b946020939093013593505050565b5f60208284031215610aa4575f80fd5b8151801515811461022d575f80fd5b5f60208284031215610ac3575f80fd5b815161022d8161092f565b5f60208284031215610ade575f80fd5b815161022d81610946565b5f60208284031215610af9575f80fd5b5051919050565b634e487b7160e01b5f52601260045260245ffdfea2646970667358221220cf8d3d423d47e7846e63a1f2d8744a31e6dd394411ed89b98a791eed6d32b69264736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610085575f3560e01c80639ed246ea116100635780639ed246ea14610104578063bc1b392d14610137578063c8f806b51461013f578063d0e149f714610152575f80fd5b806305deb8b7146100895780632b324dc0146100b15780635faa955b146100c4575b5f80fd5b61009c6100973660046109c7565b610165565b60405190151581526020015b60405180910390f35b61009c6100bf3660046109e1565b610200565b6100d76100d2366004610a14565b610234565b6040805182516001600160a01b031681526020928301516001600160601b031692810192909252016100a8565b610117610112366004610a34565b610356565b604080516001600160601b039384168152929091166020830152016100a8565b6100d7610508565b6100d761014d366004610a6a565b6105b0565b61009c6101603660046109c7565b610660565b80515f906001600160a01b03161515806101fa575060208201516040516330b8415f60e01b81526001600160601b03909116600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156101d6573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101fa9190610a94565b92915050565b5f610213836020015183602001516106f8565b801561022d5750825182516001600160a01b039182169116145b9392505050565b604080518082019091525f80825260208201526040805180820191829052631488c84560e01b90915260ff8316604482015260011960648201528073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af41580156102a8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102cc9190610ab3565b6001600160a01b0316815260200173__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af4158015610321573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103459190610ace565b6001600160601b0316905292915050565b5f8161036184610165565b15610501576040516355205f0f60e01b81526001600160601b03841660048201525f906103ed9073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156103c2573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103e69190610ab3565b865161077c565b60405163e2eb023b60e01b81526001600160a01b03821660048201529091506104f19073__$3bac17678db7ae928afa209f2f44deec9c$__90634c41dd969073__$bf7bc340cbb9229ef1de2c568356e67902$__9063e2eb023b90602401602060405180830381865af4158015610466573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061048a9190610ae9565b6040518263ffffffff1660e01b81526004016104a891815260200190565b602060405180830381865af41580156104c3573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104e79190610ace565b86602001516107a1565b92506104fd8284610826565b9150505b9250929050565b604080518082019091525f808252602082015260405180604001604052805f6001600160a01b0316815260200173__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af415801561057c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105a09190610ace565b6001600160601b03169052919050565b604080518082019091525f80825260208201526040805180820182526001600160a01b03851681529051632620eecb60e11b815260048101849052602082019073__$3bac17678db7ae928afa209f2f44deec9c$__90634c41dd9690602401602060405180830381865af415801561062a573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061064e9190610ace565b6001600160601b031690529392505050565b6020810151604051630a4d29dd60e31b81526001600160601b0390911660048201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__906352694ee890602401602060405180830381865af41580156106be573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106e29190610a94565b80156101fa575050516001600160a01b03161590565b60405163c4cade9d60e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063c4cade9d90604401602060405180830381865af4158015610758573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061022d9190610a94565b5f61022d836001600160a01b0316836001600160a01b031666038d7ea4c68000610870565b60405163274acb3560e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063274acb35906044015b602060405180830381865af4158015610802573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061022d9190610ace565b6040516363cf551160e11b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa22906044016107e7565b5f838302815f1985870982811083820303915050805f036108a45783828161089a5761089a610b00565b049250505061022d565b8084116108c45760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b6001600160a01b0381168114610943575f80fd5b50565b6001600160601b0381168114610943575f80fd5b5f6040828403121561096a575f80fd5b6040516040810181811067ffffffffffffffff8211171561099957634e487b7160e01b5f52604160045260245ffd5b60405290508082356109aa8161092f565b815260208301356109ba81610946565b6020919091015292915050565b5f604082840312156109d7575f80fd5b61022d838361095a565b5f80608083850312156109f2575f80fd5b6109fc848461095a565b9150610a0b846040850161095a565b90509250929050565b5f60208284031215610a24575f80fd5b813560ff8116811461022d575f80fd5b5f8060608385031215610a45575f80fd5b610a4f848461095a565b91506040830135610a5f81610946565b809150509250929050565b5f8060408385031215610a7b575f80fd5b8235610a868161092f565b946020939093013593505050565b5f60208284031215610aa4575f80fd5b8151801515811461022d575f80fd5b5f60208284031215610ac3575f80fd5b815161022d8161092f565b5f60208284031215610ade575f80fd5b815161022d81610946565b5f60208284031215610af9575f80fd5b5051919050565b634e487b7160e01b5f52601260045260245ffdfea2646970667358221220cf8d3d423d47e7846e63a1f2d8744a31e6dd394411ed89b98a791eed6d32b69264736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Amount.sol": {
       "AmountLib": [
         {
           "length": 20,
-          "start": 747
+          "start": 466
         },
         {
           "length": 20,
-          "start": 878
+          "start": 784
         },
         {
           "length": 20,
-          "start": 1214
+          "start": 958
+        },
+        {
+          "length": 20,
+          "start": 1094
+        },
+        {
+          "length": 20,
+          "start": 1387
+        },
+        {
+          "length": 20,
+          "start": 1574
+        },
+        {
+          "length": 20,
+          "start": 1722
+        },
+        {
+          "length": 20,
+          "start": 1876
+        },
+        {
+          "length": 20,
+          "start": 2045
+        },
+        {
+          "length": 20,
+          "start": 2178
         }
       ]
     },
@@ -270,11 +303,11 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 551
+          "start": 677
         },
         {
           "length": 20,
-          "start": 907
+          "start": 1122
         }
       ]
     }
@@ -284,15 +317,43 @@
       "AmountLib": [
         {
           "length": 20,
-          "start": 689
+          "start": 414
+        },
+        {
+          "length": 20,
+          "start": 732
+        },
+        {
+          "length": 20,
+          "start": 906
+        },
+        {
+          "length": 20,
+          "start": 1042
+        },
+        {
+          "length": 20,
+          "start": 1335
+        },
+        {
+          "length": 20,
+          "start": 1522
+        },
+        {
+          "length": 20,
+          "start": 1670
+        },
+        {
+          "length": 20,
+          "start": 1824
         },
         {
           "length": 20,
-          "start": 820
+          "start": 1993
         },
         {
           "length": 20,
-          "start": 1156
+          "start": 2126
         }
       ]
     },
@@ -300,11 +361,11 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 493
+          "start": 625
         },
         {
           "length": 20,
-          "start": 849
+          "start": 1070
         }
       ]
     }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/b689777f78f778a26644746a0f816cbb.json"
 }

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

@@ -118,8 +118,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61027361003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639601d31e116100655780639601d31e146100ee578063d92bb60d14610102578063da3fe41214610110578063f48016ce1461011857600080fd5b80630f94cc501461008c57806329e9b226146100ae578063389e7d68146100c8575b600080fd5b61009b6001600160f81b031981565b6040519081526020015b60405180910390f35b6100b660f881565b60405160ff90911681526020016100a5565b6100db6100d6366004610193565b61012b565b60405160ff1990911681526020016100a5565b6100b66100fc366004610193565b60f81c90565b61009b6001600160f81b0381565b6100b6610153565b61009b6101263660046101ac565b610163565b60008161013b60f8610100610208565b6001600160f81b039190911660ff9091161b92915050565b61016060f8610100610208565b81565b600060ff8316600883901c82610187826001600160f81b031960f889901b1661022a565b93505050505b92915050565b6000602082840312156101a557600080fd5b5035919050565b600080604083850312156101bf57600080fd5b823560ff811681146101d057600080fd5b9150602083013560ff19811681146101e757600080fd5b809150509250929050565b634e487b7160e01b600052601160045260246000fd5b61ffff828116828216039080821115610223576102236101f2565b5092915050565b8082018082111561018d5761018d6101f256fea264697066735822122019d793e31904c71c9ccf3474fa2cc3ebac84896d6b551c78c839b70f85c6f87a64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639601d31e116100655780639601d31e146100ee578063d92bb60d14610102578063da3fe41214610110578063f48016ce1461011857600080fd5b80630f94cc501461008c57806329e9b226146100ae578063389e7d68146100c8575b600080fd5b61009b6001600160f81b031981565b6040519081526020015b60405180910390f35b6100b660f881565b60405160ff90911681526020016100a5565b6100db6100d6366004610193565b61012b565b60405160ff1990911681526020016100a5565b6100b66100fc366004610193565b60f81c90565b61009b6001600160f81b0381565b6100b6610153565b61009b6101263660046101ac565b610163565b60008161013b60f8610100610208565b6001600160f81b039190911660ff9091161b92915050565b61016060f8610100610208565b81565b600060ff8316600883901c82610187826001600160f81b031960f889901b1661022a565b93505050505b92915050565b6000602082840312156101a557600080fd5b5035919050565b600080604083850312156101bf57600080fd5b823560ff811681146101d057600080fd5b9150602083013560ff19811681146101e757600080fd5b809150509250929050565b634e487b7160e01b600052601160045260246000fd5b61ffff828116828216039080821115610223576102236101f2565b5092915050565b8082018082111561018d5761018d6101f256fea264697066735822122019d793e31904c71c9ccf3474fa2cc3ebac84896d6b551c78c839b70f85c6f87a64736f6c63430008140033",
+  "bytecode": "0x61025e610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610085575f3560e01c80639601d31e116100635780639601d31e146100eb578063d92bb60d146100ff578063da3fe4121461010d578063f48016ce14610115575f80fd5b80630f94cc501461008957806329e9b226146100ab578063389e7d68146100c5575b5f80fd5b6100986001600160f81b031981565b6040519081526020015b60405180910390f35b6100b360f881565b60405160ff90911681526020016100a2565b6100d86100d336600461018e565b610128565b60405160ff1990911681526020016100a2565b6100b36100f936600461018e565b60f81c90565b6100986001600160f81b0381565b6100b361014f565b6100986101233660046101a5565b61015f565b5f8161013760f86101006101fb565b6001600160f81b039190911660ff9091161b92915050565b61015c60f86101006101fb565b81565b5f60ff8316600883901c82610182826001600160f81b031960f889901b16610215565b93505050505b92915050565b5f6020828403121561019e575f80fd5b5035919050565b5f80604083850312156101b6575f80fd5b823560ff811681146101c6575f80fd5b9150602083013560ff19811681146101dc575f80fd5b809150509250929050565b634e487b7160e01b5f52601160045260245ffd5b61ffff8281168282160390811115610188576101886101e7565b80820180821115610188576101886101e756fea2646970667358221220ed5ed619133e71dacced2e1ac1702e69b94fee71284c1cb0a3e4868f3bf6eaa464736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610085575f3560e01c80639601d31e116100635780639601d31e146100eb578063d92bb60d146100ff578063da3fe4121461010d578063f48016ce14610115575f80fd5b80630f94cc501461008957806329e9b226146100ab578063389e7d68146100c5575b5f80fd5b6100986001600160f81b031981565b6040519081526020015b60405180910390f35b6100b360f881565b60405160ff90911681526020016100a2565b6100d86100d336600461018e565b610128565b60405160ff1990911681526020016100a2565b6100b36100f936600461018e565b60f81c90565b6100986001600160f81b0381565b6100b361014f565b6100986101233660046101a5565b61015f565b5f8161013760f86101006101fb565b6001600160f81b039190911660ff9091161b92915050565b61015c60f86101006101fb565b81565b5f60ff8316600883901c82610182826001600160f81b031960f889901b16610215565b93505050505b92915050565b5f6020828403121561019e575f80fd5b5035919050565b5f80604083850312156101b6575f80fd5b823560ff811681146101c6575f80fd5b9150602083013560ff19811681146101dc575f80fd5b809150509250929050565b634e487b7160e01b5f52601160045260245ffd5b61ffff8281168282160390811115610188576101886101e7565b80820180821115610188576101886101e756fea2646970667358221220ed5ed619133e71dacced2e1ac1702e69b94fee71284c1cb0a3e4868f3bf6eaa464736f6c634300081a0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.dbg.json

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

package/artifacts/contracts/type/Key32Set.sol/LibKey32Set.json

@@ -0,0 +1,33 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "LibKey32Set",
+  "sourceName": "contracts/type/Key32Set.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "Key32",
+          "name": "key",
+          "type": "bytes32"
+        }
+      ],
+      "name": "ErrorKey32SetAlreadyAdded",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Key32",
+          "name": "key",
+          "type": "bytes32"
+        }
+      ],
+      "name": "ErrorKey32SetNotInSet",
+      "type": "error"
+    }
+  ],
+  "bytecode": "0x610362610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80630f08c1c21461006f5780634af170b014610097578063640acb3e146100b85780639df0f55e146100cb578063c54bd26f146100eb578063e9c54d311461010a575b5f80fd5b61008261007d3660046102ae565b541590565b60405190151581526020015b60405180910390f35b8180156100a2575f80fd5b506100b66100b13660046102c5565b61011d565b005b6100826100c63660046102c5565b61017c565b6100dd6100d93660046102ae565b5490565b60405190815260200161008e565b8180156100f6575f80fd5b506100b66101053660046102c5565b610195565b6100dd6101183660046102c5565b610288565b5f8181526001830160205260409020541561015357604051632d32fd9f60e21b8152600481018290526024015b60405180910390fd5b8154600181810184555f8481526020808220909301849055845493815293019052604090912055565b5f81815260018301602052604090205415155b92915050565b5f818152600183016020526040812054908190036101c95760405163156dc78160e21b81526004810183905260240161014a565b5f6101d56001836102e5565b84549091505f906101e8906001906102e5565b9050818114610247575f855f01828154811061020657610206610304565b905f5260205f200154905080865f01848154811061022657610226610304565b5f918252602080832090910192909255918252600187019052604090208390555b845485908061025857610258610318565b600190038181905f5260205f20015f90559055846001015f8581526020019081526020015f205f90555050505050565b5f825f01828154811061029d5761029d610304565b905f5260205f200154905092915050565b5f602082840312156102be575f80fd5b5035919050565b5f80604083850312156102d6575f80fd5b50508035926020909101359150565b8181038181111561018f57634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea2646970667358221220851bf80e2e2735ce76a13ddf7136f632f81b9e1b9ab54cae2500ec5441722ec864736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80630f08c1c21461006f5780634af170b014610097578063640acb3e146100b85780639df0f55e146100cb578063c54bd26f146100eb578063e9c54d311461010a575b5f80fd5b61008261007d3660046102ae565b541590565b60405190151581526020015b60405180910390f35b8180156100a2575f80fd5b506100b66100b13660046102c5565b61011d565b005b6100826100c63660046102c5565b61017c565b6100dd6100d93660046102ae565b5490565b60405190815260200161008e565b8180156100f6575f80fd5b506100b66101053660046102c5565b610195565b6100dd6101183660046102c5565b610288565b5f8181526001830160205260409020541561015357604051632d32fd9f60e21b8152600481018290526024015b60405180910390fd5b8154600181810184555f8481526020808220909301849055845493815293019052604090912055565b5f81815260018301602052604090205415155b92915050565b5f818152600183016020526040812054908190036101c95760405163156dc78160e21b81526004810183905260240161014a565b5f6101d56001836102e5565b84549091505f906101e8906001906102e5565b9050818114610247575f855f01828154811061020657610206610304565b905f5260205f200154905080865f01848154811061022657610226610304565b5f918252602080832090910192909255918252600187019052604090208390555b845485908061025857610258610318565b600190038181905f5260205f20015f90559055846001015f8581526020019081526020015f205f90555050505050565b5f825f01828154811061029d5761029d610304565b905f5260205f200154905092915050565b5f602082840312156102be575f80fd5b5035919050565b5f80604083850312156102d6575f80fd5b50508035926020909101359150565b8181038181111561018f57634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea2646970667358221220851bf80e2e2735ce76a13ddf7136f632f81b9e1b9ab54cae2500ec5441722ec864736f6c634300081a0033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/b689777f78f778a26644746a0f816cbb.json"
 }

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

@@ -65,6 +65,30 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "a",
+          "type": "uint96"
+        },
+        {
+          "internalType": "NftId",
+          "name": "b",
+          "type": "uint96"
+        }
+      ],
+      "name": "ne",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "isSame",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -127,6 +151,44 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "KeyId",
+          "name": "keyId",
+          "type": "bytes31"
+        }
+      ],
+      "name": "toNftId",
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "id",
+          "type": "uint256"
+        }
+      ],
+      "name": "toNftId",
+      "outputs": [
+        {
+          "internalType": "NftId",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "zero",
@@ -141,14 +203,14 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61031c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806340a8cd9e1161006557806340a8cd9e1461010757806352694ee81461013d578063bc1b392d14610158578063c4cade9d1461015f57600080fd5b806308dc895e1461008c57806330b8415f146100ba5780633889a4c8146100e6575b600080fd5b61009d61009a366004610242565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100d66100c8366004610242565b6001600160601b0316151590565b60405190151581526020016100b1565b6100f96100f436600461025d565b610183565b6040519081526020016100b1565b61012a610115366004610242565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100b1565b6100d661014b366004610242565b6001600160601b03161590565b600061009d565b6100d661016d36600461029a565b60006001600160601b038084169083161461021f565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021f91906102cd565b9392505050565b80356001600160601b038116811461023d57600080fd5b919050565b60006020828403121561025457600080fd5b61021f82610226565b6000806040838503121561027057600080fd5b61027983610226565b9150602083013560ff8116811461028f57600080fd5b809150509250929050565b600080604083850312156102ad57600080fd5b6102b683610226565b91506102c460208401610226565b90509250929050565b6000602082840312156102df57600080fd5b505191905056fea2646970667358221220aabb88a8004df6c9b7e62e0ec36e204dc93c1ca9b7c79410d0e40998cd88ce5b64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806340a8cd9e1161006557806340a8cd9e1461010757806352694ee81461013d578063bc1b392d14610158578063c4cade9d1461015f57600080fd5b806308dc895e1461008c57806330b8415f146100ba5780633889a4c8146100e6575b600080fd5b61009d61009a366004610242565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100d66100c8366004610242565b6001600160601b0316151590565b60405190151581526020016100b1565b6100f96100f436600461025d565b610183565b6040519081526020016100b1565b61012a610115366004610242565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100b1565b6100d661014b366004610242565b6001600160601b03161590565b600061009d565b6100d661016d36600461029a565b60006001600160601b038084169083161461021f565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061021f91906102cd565b9392505050565b80356001600160601b038116811461023d57600080fd5b919050565b60006020828403121561025457600080fd5b61021f82610226565b6000806040838503121561027057600080fd5b61027983610226565b9150602083013560ff8116811461028f57600080fd5b809150509250929050565b600080604083850312156102ad57600080fd5b6102b683610226565b91506102c460208401610226565b90509250929050565b6000602082840312156102df57600080fd5b505191905056fea2646970667358221220aabb88a8004df6c9b7e62e0ec36e204dc93c1ca9b7c79410d0e40998cd88ce5b64736f6c63430008140033",
+  "bytecode": "0x6103d6610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100a6575f3560e01c80637054cbd21161006e5780637054cbd21461017657806399009c5114610189578063bc1b392d146101a9578063c4cade9d146101af578063efac97cf146101ce575f80fd5b806308dc895e146100aa57806330b8415f146100d85780633889a4c81461010457806340a8cd9e1461012557806352694ee81461015b575b5f80fd5b6100bb6100b83660046102b9565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100f46100e63660046102b9565b6001600160601b0316151590565b60405190151581526020016100cf565b6101176101123660046102d2565b6101dc565b6040519081526020016100cf565b6101486101333660046102b9565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100cf565b6100f46101693660046102b9565b6001600160601b03161590565b6100bb61018436600461030c565b61027c565b6100f461019736600461032d565b6001600160601b039081169116141590565b5f6100bb565b6100f46101bd36600461032d565b6001600160601b0390811691161490565b6100bb6100b836600461035e565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610251573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102759190610375565b9392505050565b5f600882901c6001600160601b0381106102985761029861038c565b92915050565b80356001600160601b03811681146102b4575f80fd5b919050565b5f602082840312156102c9575f80fd5b6102758261029e565b5f80604083850312156102e3575f80fd5b6102ec8361029e565b9150602083013560ff81168114610301575f80fd5b809150509250929050565b5f6020828403121561031c575f80fd5b813560ff1981168114610275575f80fd5b5f806040838503121561033e575f80fd5b6103478361029e565b91506103556020840161029e565b90509250929050565b5f6020828403121561036e575f80fd5b5035919050565b5f60208284031215610385575f80fd5b5051919050565b634e487b7160e01b5f52600160045260245ffdfea2646970667358221220ede25f7ae008c14eebb8f00c8f78817559a4155c6b130f55a7dce7beff79dd6b64736f6c634300081a0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100a6575f3560e01c80637054cbd21161006e5780637054cbd21461017657806399009c5114610189578063bc1b392d146101a9578063c4cade9d146101af578063efac97cf146101ce575f80fd5b806308dc895e146100aa57806330b8415f146100d85780633889a4c81461010457806340a8cd9e1461012557806352694ee81461015b575b5f80fd5b6100bb6100b83660046102b9565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100f46100e63660046102b9565b6001600160601b0316151590565b60405190151581526020016100cf565b6101176101123660046102d2565b6101dc565b6040519081526020016100cf565b6101486101333660046102b9565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100cf565b6100f46101693660046102b9565b6001600160601b03161590565b6100bb61018436600461030c565b61027c565b6100f461019736600461032d565b6001600160601b039081169116141590565b5f6100bb565b6100f46101bd36600461032d565b6001600160601b0390811691161490565b6100bb6100b836600461035e565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610251573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102759190610375565b9392505050565b5f600882901c6001600160601b0381106102985761029861038c565b92915050565b80356001600160601b03811681146102b4575f80fd5b919050565b5f602082840312156102c9575f80fd5b6102758261029e565b5f80604083850312156102e3575f80fd5b6102ec8361029e565b9150602083013560ff81168114610301575f80fd5b809150509250929050565b5f6020828403121561031c575f80fd5b813560ff1981168114610275575f80fd5b5f806040838503121561033e575f80fd5b6103478361029e565b91506103556020840161029e565b90509250929050565b5f6020828403121561036e575f80fd5b5035919050565b5f60208284031215610385575f80fd5b5051919050565b634e487b7160e01b5f52600160045260245ffdfea2646970667358221220ede25f7ae008c14eebb8f00c8f78817559a4155c6b130f55a7dce7beff79dd6b64736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [
         {
           "length": 20,
-          "start": 449
+          "start": 531
         }
       ]
     }
@@ -158,7 +220,7 @@
       "Key32Lib": [
         {
           "length": 20,
-          "start": 391
+          "start": 479
         }
       ]
     }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/b689777f78f778a26644746a0f816cbb.json"
 }

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

@@ -26,8 +26,8 @@
       "type": "error"
     }
   ],
-  "bytecode": "0x6104c261003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632bfdd6b91461007157806331a97de2146100995780638b6233dd146100ac578063a3082a18146100cc578063a73d5756146100ee578063e797d8991461010e575b600080fd5b61008461007f3660046103c8565b610139565b60405190151581526020015b60405180910390f35b6100846100a7366004610404565b541590565b6100be6100ba366004610404565b5490565b604051908152602001610090565b8180156100d857600080fd5b506100ec6100e73660046103c8565b61015d565b005b8180156100fa57600080fd5b506100ec6101093660046103c8565b6101f8565b61012161011c36600461041d565b610380565b6040516001600160601b039091168152602001610090565b6001600160601b038116600090815260018301602052604090205415155b92915050565b6001600160601b0381166000908152600183016020526040902054156101a6576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b81546001818101845560008481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b03811660009081526001830160205260408120549081900361023f5760405163482084f160e01b81526001600160601b038316600482015260240161019d565b600061024c60018361043f565b84549091506000906102609060019061043f565b905081811461030a57600085600001828154811061028057610280610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b03169050808660000184815481106102c1576102c1610460565b60009182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061031b5761031b610476565b6001900381819060005260206000209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001016000856001600160601b03166001600160601b03168152602001908152602001600020600090555050505050565b600082600001828154811061039757610397610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b600080604083850312156103db57600080fd5b8235915060208301356001600160601b03811681146103f957600080fd5b809150509250929050565b60006020828403121561041657600080fd5b5035919050565b6000806040838503121561043057600080fd5b50508035926020909101359150565b8181038181111561015757634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea26469706673582212209702d77f3b15be8be8b710b2ca4dde4016b404647c9dc9a9faa324349e81639f64736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c80632bfdd6b91461007157806331a97de2146100995780638b6233dd146100ac578063a3082a18146100cc578063a73d5756146100ee578063e797d8991461010e575b600080fd5b61008461007f3660046103c8565b610139565b60405190151581526020015b60405180910390f35b6100846100a7366004610404565b541590565b6100be6100ba366004610404565b5490565b604051908152602001610090565b8180156100d857600080fd5b506100ec6100e73660046103c8565b61015d565b005b8180156100fa57600080fd5b506100ec6101093660046103c8565b6101f8565b61012161011c36600461041d565b610380565b6040516001600160601b039091168152602001610090565b6001600160601b038116600090815260018301602052604090205415155b92915050565b6001600160601b0381166000908152600183016020526040902054156101a6576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b81546001818101845560008481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b03811660009081526001830160205260408120549081900361023f5760405163482084f160e01b81526001600160601b038316600482015260240161019d565b600061024c60018361043f565b84549091506000906102609060019061043f565b905081811461030a57600085600001828154811061028057610280610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b03169050808660000184815481106102c1576102c1610460565b60009182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061031b5761031b610476565b6001900381819060005260206000209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001016000856001600160601b03166001600160601b03168152602001908152602001600020600090555050505050565b600082600001828154811061039757610397610460565b9060005260206000209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b600080604083850312156103db57600080fd5b8235915060208301356001600160601b03811681146103f957600080fd5b809150509250929050565b60006020828403121561041657600080fd5b5035919050565b6000806040838503121561043057600080fd5b50508035926020909101359150565b8181038181111561015757634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea26469706673582212209702d77f3b15be8be8b710b2ca4dde4016b404647c9dc9a9faa324349e81639f64736f6c63430008140033",
+  "bytecode": "0x61049c610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80632bfdd6b91461006f57806331a97de2146100975780638b6233dd146100aa578063a3082a18146100ca578063a73d5756146100eb578063e797d8991461010a575b5f80fd5b61008261007d3660046103af565b610135565b60405190151581526020015b60405180910390f35b6100826100a53660046103e8565b541590565b6100bc6100b83660046103e8565b5490565b60405190815260200161008e565b8180156100d5575f80fd5b506100e96100e43660046103af565b610158565b005b8180156100f6575f80fd5b506100e96101053660046103af565b6101f1565b61011d6101183660046103ff565b61036b565b6040516001600160601b03909116815260200161008e565b6001600160601b0381165f90815260018301602052604090205415155b92915050565b6001600160601b0381165f908152600183016020526040902054156101a0576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b8154600181810184555f8481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b0381165f908152600183016020526040812054908190036102375760405163482084f160e01b81526001600160601b0383166004820152602401610197565b5f61024360018361041f565b84549091505f906102569060019061041f565b90508181146102fa575f855f0182815481106102745761027461043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905080865f0184815481106102b2576102b261043e565b5f9182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061030b5761030b610452565b600190038181905f5260205f209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001015f856001600160601b03166001600160601b031681526020019081526020015f205f90555050505050565b5f825f0182815481106103805761038061043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b5f80604083850312156103c0575f80fd5b8235915060208301356001600160601b03811681146103dd575f80fd5b809150509250929050565b5f602082840312156103f8575f80fd5b5035919050565b5f8060408385031215610410575f80fd5b50508035926020909101359150565b8181038181111561015257634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea264697066735822122034d5f48f0c22bd22ec6221791f5de7c1fd09279d1c269fbd681e934faa03ee7064736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80632bfdd6b91461006f57806331a97de2146100975780638b6233dd146100aa578063a3082a18146100ca578063a73d5756146100eb578063e797d8991461010a575b5f80fd5b61008261007d3660046103af565b610135565b60405190151581526020015b60405180910390f35b6100826100a53660046103e8565b541590565b6100bc6100b83660046103e8565b5490565b60405190815260200161008e565b8180156100d5575f80fd5b506100e96100e43660046103af565b610158565b005b8180156100f6575f80fd5b506100e96101053660046103af565b6101f1565b61011d6101183660046103ff565b61036b565b6040516001600160601b03909116815260200161008e565b6001600160601b0381165f90815260018301602052604090205415155b92915050565b6001600160601b0381165f908152600183016020526040902054156101a0576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b8154600181810184555f8481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b0381165f908152600183016020526040812054908190036102375760405163482084f160e01b81526001600160601b0383166004820152602401610197565b5f61024360018361041f565b84549091505f906102569060019061041f565b90508181146102fa575f855f0182815481106102745761027461043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905080865f0184815481106102b2576102b261043e565b5f9182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061030b5761030b610452565b600190038181905f5260205f209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001015f856001600160601b03166001600160601b031681526020019081526020015f205f90555050505050565b5f825f0182815481106103805761038061043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b5f80604083850312156103c0575f80fd5b8235915060208301356001600160601b03811681146103dd575f80fd5b809150509250929050565b5f602082840312156103f8575f80fd5b5035919050565b5f8060408385031215610410575f80fd5b50508035926020909101359150565b8181038181111561015257634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea264697066735822122034d5f48f0c22bd22ec6221791f5de7c1fd09279d1c269fbd681e934faa03ee7064736f6c634300081a0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/b689777f78f778a26644746a0f816cbb.json"
 }