@etherisc/gif-next 0.0.2-e769e2e-077 → 0.0.2-e7a5428-226

package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.json

@@ -3,6 +3,30 @@
   "contractName": "ClaimIdLib",
   "sourceName": "contracts/type/ClaimId.sol",
   "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "ClaimId",
+          "name": "a",
+          "type": "uint16"
+        },
+        {
+          "internalType": "ClaimId",
+          "name": "b",
+          "type": "uint16"
+        }
+      ],
+      "name": "eq",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -154,14 +178,14 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61034e61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c8063b9c6c93011610065578063b9c6c930146100fc578063bc1b392d14610123578063f3ac7cb51461012a578063faac2b221461014057600080fd5b80635d21681c146100975780636ac5db19146100c0578063904da217146100c85780639cc45a36146100ee575b600080fd5b6100a86100a5366004610258565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100a8565b6100db6100d6366004610273565b610161565b60405160ff1990911681526020016100b7565b6100a86100a53660046102b6565b61011361010a366004610258565b61ffff16151590565b60405190151581526020016100b7565b60006100a8565b610113610138366004610258565b61ffff161590565b61015361014e366004610273565b6101a7565b6040519081526020016100b7565b600061016e8360106102cf565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff1916905092915050565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60d46101cf8686610161565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610216573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023a91906102ff565b9392505050565b803561ffff8116811461025357600080fd5b919050565b60006020828403121561026a57600080fd5b61023a82610241565b6000806040838503121561028657600080fd5b61028f83610241565b915060208301356001600160601b03811681146102ab57600080fd5b809150509250929050565b6000602082840312156102c857600080fd5b5035919050565b61ffff8181168382160190808211156102f857634e487b7160e01b600052601160045260246000fd5b5092915050565b60006020828403121561031157600080fd5b505191905056fea264697066735822122098a2a3c5d290f55d78b0b3c57e4fd6b817737e62f946044b711215b28fc837e364736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c8063b9c6c93011610065578063b9c6c930146100fc578063bc1b392d14610123578063f3ac7cb51461012a578063faac2b221461014057600080fd5b80635d21681c146100975780636ac5db19146100c0578063904da217146100c85780639cc45a36146100ee575b600080fd5b6100a86100a5366004610258565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100a8565b6100db6100d6366004610273565b610161565b60405160ff1990911681526020016100b7565b6100a86100a53660046102b6565b61011361010a366004610258565b61ffff16151590565b60405190151581526020016100b7565b60006100a8565b610113610138366004610258565b61ffff161590565b61015361014e366004610273565b6101a7565b6040519081526020016100b7565b600061016e8360106102cf565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff1916905092915050565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60d46101cf8686610161565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610216573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023a91906102ff565b9392505050565b803561ffff8116811461025357600080fd5b919050565b60006020828403121561026a57600080fd5b61023a82610241565b6000806040838503121561028657600080fd5b61028f83610241565b915060208301356001600160601b03811681146102ab57600080fd5b809150509250929050565b6000602082840312156102c857600080fd5b5035919050565b61ffff8181168382160190808211156102f857634e487b7160e01b600052601160045260246000fd5b5092915050565b60006020828403121561031157600080fd5b505191905056fea264697066735822122098a2a3c5d290f55d78b0b3c57e4fd6b817737e62f946044b711215b28fc837e364736f6c63430008140033",
+  "bytecode": "0x610389610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c8063b9c6c9301161006e578063b9c6c93014610104578063bc1b392d1461012b578063dfc00be914610131578063f3ac7cb51461014b578063faac2b2214610161575f80fd5b80635d21681c1461009f5780636ac5db19146100c8578063904da217146100d05780639cc45a36146100f6575b5f80fd5b6100b06100ad366004610275565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100b0565b6100e36100de36600461028e565b610182565b60405160ff1990911681526020016100bf565b6100b06100ad3660046102ce565b61011b610112366004610275565b61ffff16151590565b60405190151581526020016100bf565b5f6100b0565b61011b61013f3660046102e5565b61ffff90811691161490565b61011b610159366004610275565b61ffff161590565b61017461016f36600461028e565b6101c8565b6040519081526020016100bf565b5f61018e836010610316565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff191690505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce602d6101ef8686610182565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610234573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610258919061033c565b9392505050565b803561ffff81168114610270575f80fd5b919050565b5f60208284031215610285575f80fd5b6102588261025f565b5f806040838503121561029f575f80fd5b6102a88361025f565b915060208301356001600160601b03811681146102c3575f80fd5b809150509250929050565b5f602082840312156102de575f80fd5b5035919050565b5f80604083850312156102f6575f80fd5b6102ff8361025f565b915061030d6020840161025f565b90509250929050565b61ffff81811683821601908111156101c257634e487b7160e01b5f52601160045260245ffd5b5f6020828403121561034c575f80fd5b505191905056fea26469706673582212200ea64effa01dfbbc48afd0b8d69e2bc2f00c4a877e9d99703e87e0ed1e0c465964736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c8063b9c6c9301161006e578063b9c6c93014610104578063bc1b392d1461012b578063dfc00be914610131578063f3ac7cb51461014b578063faac2b2214610161575f80fd5b80635d21681c1461009f5780636ac5db19146100c8578063904da217146100d05780639cc45a36146100f6575b5f80fd5b6100b06100ad366004610275565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100b0565b6100e36100de36600461028e565b610182565b60405160ff1990911681526020016100bf565b6100b06100ad3660046102ce565b61011b610112366004610275565b61ffff16151590565b60405190151581526020016100bf565b5f6100b0565b61011b61013f3660046102e5565b61ffff90811691161490565b61011b610159366004610275565b61ffff161590565b61017461016f36600461028e565b6101c8565b6040519081526020016100bf565b5f61018e836010610316565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff191690505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce602d6101ef8686610182565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610234573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610258919061033c565b9392505050565b803561ffff81168114610270575f80fd5b919050565b5f60208284031215610285575f80fd5b6102588261025f565b5f806040838503121561029f575f80fd5b6102a88361025f565b915060208301356001600160601b03811681146102c3575f80fd5b809150509250929050565b5f602082840312156102de575f80fd5b5035919050565b5f80604083850312156102f6575f80fd5b6102ff8361025f565b915061030d6020840161025f565b90509250929050565b61ffff81811683821601908111156101c257634e487b7160e01b5f52601160045260245ffd5b5f6020828403121561034c575f80fd5b505191905056fea26469706673582212200ea64effa01dfbbc48afd0b8d69e2bc2f00c4a877e9d99703e87e0ed1e0c465964736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [
         {
           "length": 20,
-          "start": 485
+          "start": 511
         }
       ]
     }
@@ -171,7 +195,7 @@
       "Key32Lib": [
         {
           "length": 20,
-          "start": 427
+          "start": 459
         }
       ]
     }

package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.dbg.json

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

package/artifacts/contracts/type/DistributorType.sol/DistributorTypeLib.json

@@ -79,14 +79,14 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61037e61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632cf96bf91461005b57806355ee62751461008e578063578c3039146100af578063bc1b392d146100db575b600080fd5b6100766100693660046101af565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100a161009c3660046101af565b6100e2565b604051908152602001610085565b6100c26100bd3660046101f6565b61017c565b6040516001600160c01b03199091168152602001610085565b60006100c2565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60796001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610152573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017691906102cb565b92915050565b600082826040516020016101919291906102e4565b60405160208183030381529060405280519060200120905092915050565b6000602082840312156101c157600080fd5b81356001600160c01b0319811681146101d957600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561020957600080fd5b82356bffffffffffffffffffffffff8116811461022557600080fd5b9150602083013567ffffffffffffffff8082111561024257600080fd5b818501915085601f83011261025657600080fd5b813581811115610268576102686101e0565b604051601f8201601f19908116603f01168101908382118183101715610290576102906101e0565b816040528281528860208487010111156102a957600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b818110156103265785810183015185820160600152820161030a565b506000606082860101526060601f19601f83011685010192505050939250505056fea2646970667358221220562bbc4a49b4fe045b53b200ba7b1ada0e8a228d1f49caab15654207ee1932de64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632cf96bf91461005b57806355ee62751461008e578063578c3039146100af578063bc1b392d146100db575b600080fd5b6100766100693660046101af565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100a161009c3660046101af565b6100e2565b604051908152602001610085565b6100c26100bd3660046101f6565b61017c565b6040516001600160c01b03199091168152602001610085565b60006100c2565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60796001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610152573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017691906102cb565b92915050565b600082826040516020016101919291906102e4565b60405160208183030381529060405280519060200120905092915050565b6000602082840312156101c157600080fd5b81356001600160c01b0319811681146101d957600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561020957600080fd5b82356bffffffffffffffffffffffff8116811461022557600080fd5b9150602083013567ffffffffffffffff8082111561024257600080fd5b818501915085601f83011261025657600080fd5b813581811115610268576102686101e0565b604051601f8201601f19908116603f01168101908382118183101715610290576102906101e0565b816040528281528860208487010111156102a957600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b818110156103265785810183015185820160600152820161030a565b506000606082860101526060601f19601f83011685010192505050939250505056fea2646970667358221220562bbc4a49b4fe045b53b200ba7b1ada0e8a228d1f49caab15654207ee1932de64736f6c63430008140033",
+  "bytecode": "0x610357610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610055575f3560e01c80632cf96bf91461005957806355ee62751461008c578063578c3039146100ad578063bc1b392d146100d9575b5f80fd5b6100746100673660046101a8565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b61009f61009a3660046101a8565b6100df565b604051908152602001610083565b6100c06100bb3660046101ea565b610176565b6040516001600160c01b03199091168152602001610083565b5f6100c0565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60306001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561014c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061017091906102c0565b92915050565b5f828260405160200161018a9291906102d7565b60405160208183030381529060405280519060200120905092915050565b5f602082840312156101b8575f80fd5b81356001600160c01b0319811681146101cf575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156101fb575f80fd5b82356bffffffffffffffffffffffff81168114610216575f80fd5b9150602083013567ffffffffffffffff811115610231575f80fd5b8301601f81018513610241575f80fd5b803567ffffffffffffffff81111561025b5761025b6101d6565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561028a5761028a6101d6565b6040528181528282016020018710156102a1575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f602082840312156102d0575f80fd5b5051919050565b6bffffffffffffffffffffffff83168152604060208201525f82518060408401528060208501606085015e5f606082850101526060601f19601f830116840101915050939250505056fea2646970667358221220bd7f69aec5356a63faaad51a6a618a7e756e8fa9d91ee2d102003241e740ea6c64736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610055575f3560e01c80632cf96bf91461005957806355ee62751461008c578063578c3039146100ad578063bc1b392d146100d9575b5f80fd5b6100746100673660046101a8565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b61009f61009a3660046101a8565b6100df565b604051908152602001610083565b6100c06100bb3660046101ea565b610176565b6040516001600160c01b03199091168152602001610083565b5f6100c0565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60306001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561014c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061017091906102c0565b92915050565b5f828260405160200161018a9291906102d7565b60405160208183030381529060405280519060200120905092915050565b5f602082840312156101b8575f80fd5b81356001600160c01b0319811681146101cf575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156101fb575f80fd5b82356bffffffffffffffffffffffff81168114610216575f80fd5b9150602083013567ffffffffffffffff811115610231575f80fd5b8301601f81018513610241575f80fd5b803567ffffffffffffffff81111561025b5761025b6101d6565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561028a5761028a6101d6565b6040528181528282016020018710156102a1575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f602082840312156102d0575f80fd5b5051919050565b6bffffffffffffffffffffffff83168152604060208201525f82518060408401528060208501606085015e5f606082850101526060601f19601f830116840101915050939250505056fea2646970667358221220bd7f69aec5356a63faaad51a6a618a7e756e8fa9d91ee2d102003241e740ea6c64736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [
         {
           "length": 20,
-          "start": 288
+          "start": 278
         }
       ]
     }
@@ -96,7 +96,7 @@
       "Key32Lib": [
         {
           "length": 20,
-          "start": 230
+          "start": 226
         }
       ]
     }

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

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

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,12 +56,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -68,12 +73,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -99,12 +104,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -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",
@@ -230,12 +235,12 @@
             {
               "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": "0x6107b961003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639ed246ea116100655780639ed246ea146100f5578063bc1b392d14610128578063c7010dfa14610152578063d0e149f71461018657600080fd5b806305deb8b71461008c5780632b324dc0146100b45780635faa955b146100c7575b600080fd5b61009f61009a366004610630565b610199565b60405190151581526020015b60405180910390f35b61009f6100c236600461064c565b6101b5565b6100da6100d5366004610681565b6101d6565b604080518251815260209283015192810192909252016100ab565b6101086101033660046106bc565b61027f565b604080516001600160601b039384168152929091166020830152016100ab565b604080518082018252600080825260209182018190528251808401909352808352908201526100da565b6100da6101603660046106f4565b604080518082018252600080825260209182015281518083019092529281529182015290565b61009f610194366004610630565b610433565b80516000901515806101af575060008260200151115b92915050565b6000816020015183602001511480156101cf575082518251145b9392505050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af415801561024b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026f9190610716565b8152600060209091015292915050565b60008161028b84610199565b1561042c576040516355205f0f60e01b81526001600160601b038416600482015260009061031a9073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156102ef573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103139190610716565b865161044a565b6020860151604051632255341b60e11b81526004810183905291925073__$3bac17678db7ae928afa209f2f44deec9c$__91634c41dd96919073__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561038f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103b39190610716565b6103bd919061072f565b6040518263ffffffff1660e01b81526004016103db91815260200190565b602060405180830381865af41580156103f8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061041c9190610750565b9250610428828461045f565b9150505b9250929050565b6000816020015160001480156101af575050511590565b60006101cf8383670de0b6b3a76400006104e6565b6040516363cf551160e11b81526001600160601b0380841660048301528216602482015260009073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa2290604401602060405180830381865af41580156104c2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cf9190610750565b6000808060001985870985870292508281108382030391505080600003610520578382816105165761051661076d565b04925050506101cf565b80841161056b5760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156105e557600080fd5b6040516040810181811067ffffffffffffffff8211171561061657634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561064257600080fd5b6101cf83836105d3565b6000806080838503121561065f57600080fd5b61066984846105d3565b915061067884604085016105d3565b90509250929050565b60006020828403121561069357600080fd5b813560ff811681146101cf57600080fd5b6001600160601b03811681146106b957600080fd5b50565b600080606083850312156106cf57600080fd5b6106d984846105d3565b915060408301356106e9816106a4565b809150509250929050565b6000806040838503121561070757600080fd5b50508035926020909101359150565b60006020828403121561072857600080fd5b5051919050565b808201808211156101af57634e487b7160e01b600052601160045260246000fd5b60006020828403121561076257600080fd5b81516101cf816106a4565b634e487b7160e01b600052601260045260246000fdfea264697066735822122095b1b07e623be4ff47f13438271d721bab7b02cd4ef03ce13c62158afe11b33e64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639ed246ea116100655780639ed246ea146100f5578063bc1b392d14610128578063c7010dfa14610152578063d0e149f71461018657600080fd5b806305deb8b71461008c5780632b324dc0146100b45780635faa955b146100c7575b600080fd5b61009f61009a366004610630565b610199565b60405190151581526020015b60405180910390f35b61009f6100c236600461064c565b6101b5565b6100da6100d5366004610681565b6101d6565b604080518251815260209283015192810192909252016100ab565b6101086101033660046106bc565b61027f565b604080516001600160601b039384168152929091166020830152016100ab565b604080518082018252600080825260209182018190528251808401909352808352908201526100da565b6100da6101603660046106f4565b604080518082018252600080825260209182015281518083019092529281529182015290565b61009f610194366004610630565b610433565b80516000901515806101af575060008260200151115b92915050565b6000816020015183602001511480156101cf575082518251145b9392505050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af415801561024b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026f9190610716565b8152600060209091015292915050565b60008161028b84610199565b1561042c576040516355205f0f60e01b81526001600160601b038416600482015260009061031a9073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156102ef573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103139190610716565b865161044a565b6020860151604051632255341b60e11b81526004810183905291925073__$3bac17678db7ae928afa209f2f44deec9c$__91634c41dd96919073__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561038f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103b39190610716565b6103bd919061072f565b6040518263ffffffff1660e01b81526004016103db91815260200190565b602060405180830381865af41580156103f8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061041c9190610750565b9250610428828461045f565b9150505b9250929050565b6000816020015160001480156101af575050511590565b60006101cf8383670de0b6b3a76400006104e6565b6040516363cf551160e11b81526001600160601b0380841660048301528216602482015260009073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa2290604401602060405180830381865af41580156104c2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cf9190610750565b6000808060001985870985870292508281108382030391505080600003610520578382816105165761051661076d565b04925050506101cf565b80841161056b5760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156105e557600080fd5b6040516040810181811067ffffffffffffffff8211171561061657634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561064257600080fd5b6101cf83836105d3565b6000806080838503121561065f57600080fd5b61066984846105d3565b915061067884604085016105d3565b90509250929050565b60006020828403121561069357600080fd5b813560ff811681146101cf57600080fd5b6001600160601b03811681146106b957600080fd5b50565b600080606083850312156106cf57600080fd5b6106d984846105d3565b915060408301356106e9816106a4565b809150509250929050565b6000806040838503121561070757600080fd5b50508035926020909101359150565b60006020828403121561072857600080fd5b5051919050565b808201808211156101af57634e487b7160e01b600052601160045260246000fd5b60006020828403121561076257600080fd5b81516101cf816106a4565b634e487b7160e01b600052601260045260246000fdfea264697066735822122095b1b07e623be4ff47f13438271d721bab7b02cd4ef03ce13c62158afe11b33e64736f6c63430008140033",
+  "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$__9063c79eaa22906044016107e7565b5f838302815f1985870982811083820303915050805f036108a45783828161089a5761089a610b00565b049250505061022d565b8084116108c45760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b6001600160a01b0381168114610943575f80fd5b50565b6001600160601b0381168114610943575f80fd5b5f6040828403121561096a575f80fd5b6040516040810181811067ffffffffffffffff8211171561099957634e487b7160e01b5f52604160045260245ffd5b60405290508082356109aa8161092f565b815260208301356109ba81610946565b6020919091015292915050565b5f604082840312156109d7575f80fd5b61022d838361095a565b5f80608083850312156109f2575f80fd5b6109fc848461095a565b9150610a0b846040850161095a565b90509250929050565b5f60208284031215610a24575f80fd5b813560ff8116811461022d575f80fd5b5f8060608385031215610a45575f80fd5b610a4f848461095a565b91506040830135610a5f81610946565b809150509250929050565b5f8060408385031215610a7b575f80fd5b8235610a868161092f565b946020939093013593505050565b5f60208284031215610aa4575f80fd5b8151801515811461022d575f80fd5b5f60208284031215610ac3575f80fd5b815161022d8161092f565b5f60208284031215610ade575f80fd5b815161022d81610946565b5f60208284031215610af9575f80fd5b5051919050565b634e487b7160e01b5f52601260045260245ffdfea2646970667358221220102e0c9be579af917e6037db76ef52b049eb42049022021e59696f286cac976564736f6c634300081a0033",
+  "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$__9063c79eaa22906044016107e7565b5f838302815f1985870982811083820303915050805f036108a45783828161089a5761089a610b00565b049250505061022d565b8084116108c45760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b6001600160a01b0381168114610943575f80fd5b50565b6001600160601b0381168114610943575f80fd5b5f6040828403121561096a575f80fd5b6040516040810181811067ffffffffffffffff8211171561099957634e487b7160e01b5f52604160045260245ffd5b60405290508082356109aa8161092f565b815260208301356109ba81610946565b6020919091015292915050565b5f604082840312156109d7575f80fd5b61022d838361095a565b5f80608083850312156109f2575f80fd5b6109fc848461095a565b9150610a0b846040850161095a565b90509250929050565b5f60208284031215610a24575f80fd5b813560ff8116811461022d575f80fd5b5f8060608385031215610a45575f80fd5b610a4f848461095a565b91506040830135610a5f81610946565b809150509250929050565b5f8060408385031215610a7b575f80fd5b8235610a868161092f565b946020939093013593505050565b5f60208284031215610aa4575f80fd5b8151801515811461022d575f80fd5b5f60208284031215610ac3575f80fd5b815161022d8161092f565b5f60208284031215610ade575f80fd5b815161022d81610946565b5f60208284031215610af9575f80fd5b5051919050565b634e487b7160e01b5f52601260045260245ffdfea2646970667358221220102e0c9be579af917e6037db76ef52b049eb42049022021e59696f286cac976564736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Amount.sol": {
       "AmountLib": [
         {
           "length": 20,
-          "start": 751
+          "start": 466
+        },
+        {
+          "length": 20,
+          "start": 784
+        },
+        {
+          "length": 20,
+          "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": 882
+          "start": 2045
         },
         {
           "length": 20,
-          "start": 1218
+          "start": 2178
         }
       ]
     },
@@ -270,11 +303,11 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 588
+          "start": 677
         },
         {
           "length": 20,
-          "start": 911
+          "start": 1122
         }
       ]
     }
@@ -284,15 +317,43 @@
       "AmountLib": [
         {
           "length": 20,
-          "start": 693
+          "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": 824
+          "start": 1993
         },
         {
           "length": 20,
-          "start": 1160
+          "start": 2126
         }
       ]
     },
@@ -300,11 +361,11 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 530
+          "start": 625
         },
         {
           "length": 20,
-          "start": 853
+          "start": 1070
         }
       ]
     }

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

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

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

@@ -118,8 +118,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61027361003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639601d31e116100655780639601d31e146100ee578063d92bb60d14610102578063da3fe41214610110578063f48016ce1461011857600080fd5b80630f94cc501461008c57806329e9b226146100ae578063389e7d68146100c8575b600080fd5b61009b6001600160f81b031981565b6040519081526020015b60405180910390f35b6100b660f881565b60405160ff90911681526020016100a5565b6100db6100d6366004610193565b61012b565b60405160ff1990911681526020016100a5565b6100b66100fc366004610193565b60f81c90565b61009b6001600160f81b0381565b6100b6610153565b61009b6101263660046101ac565b610163565b60008161013b60f8610100610208565b6001600160f81b039190911660ff9091161b92915050565b61016060f8610100610208565b81565b600060ff8316600883901c82610187826001600160f81b031960f889901b1661022a565b93505050505b92915050565b6000602082840312156101a557600080fd5b5035919050565b600080604083850312156101bf57600080fd5b823560ff811681146101d057600080fd5b9150602083013560ff19811681146101e757600080fd5b809150509250929050565b634e487b7160e01b600052601160045260246000fd5b61ffff828116828216039080821115610223576102236101f2565b5092915050565b8082018082111561018d5761018d6101f256fea2646970667358221220dff97e0bfdf483dd9e5b8f323a5bcfdd237ee5452d6397d351ebc6ded83e942364736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639601d31e116100655780639601d31e146100ee578063d92bb60d14610102578063da3fe41214610110578063f48016ce1461011857600080fd5b80630f94cc501461008c57806329e9b226146100ae578063389e7d68146100c8575b600080fd5b61009b6001600160f81b031981565b6040519081526020015b60405180910390f35b6100b660f881565b60405160ff90911681526020016100a5565b6100db6100d6366004610193565b61012b565b60405160ff1990911681526020016100a5565b6100b66100fc366004610193565b60f81c90565b61009b6001600160f81b0381565b6100b6610153565b61009b6101263660046101ac565b610163565b60008161013b60f8610100610208565b6001600160f81b039190911660ff9091161b92915050565b61016060f8610100610208565b81565b600060ff8316600883901c82610187826001600160f81b031960f889901b1661022a565b93505050505b92915050565b6000602082840312156101a557600080fd5b5035919050565b600080604083850312156101bf57600080fd5b823560ff811681146101d057600080fd5b9150602083013560ff19811681146101e757600080fd5b809150509250929050565b634e487b7160e01b600052601160045260246000fd5b61ffff828116828216039080821115610223576102236101f2565b5092915050565b8082018082111561018d5761018d6101f256fea2646970667358221220dff97e0bfdf483dd9e5b8f323a5bcfdd237ee5452d6397d351ebc6ded83e942364736f6c63430008140033",
+  "bytecode": "0x61025e610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610085575f3560e01c80639601d31e116100635780639601d31e146100eb578063d92bb60d146100ff578063da3fe4121461010d578063f48016ce14610115575f80fd5b80630f94cc501461008957806329e9b226146100ab578063389e7d68146100c5575b5f80fd5b6100986001600160f81b031981565b6040519081526020015b60405180910390f35b6100b360f881565b60405160ff90911681526020016100a2565b6100d86100d336600461018e565b610128565b60405160ff1990911681526020016100a2565b6100b36100f936600461018e565b60f81c90565b6100986001600160f81b0381565b6100b361014f565b6100986101233660046101a5565b61015f565b5f8161013760f86101006101fb565b6001600160f81b039190911660ff9091161b92915050565b61015c60f86101006101fb565b81565b5f60ff8316600883901c82610182826001600160f81b031960f889901b16610215565b93505050505b92915050565b5f6020828403121561019e575f80fd5b5035919050565b5f80604083850312156101b6575f80fd5b823560ff811681146101c6575f80fd5b9150602083013560ff19811681146101dc575f80fd5b809150509250929050565b634e487b7160e01b5f52601160045260245ffd5b61ffff8281168282160390811115610188576101886101e7565b80820180821115610188576101886101e756fea2646970667358221220a65390838aefafc92cbfa7f66c5f9e7bae60626728170e9dc2c65aabf5428a4664736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610085575f3560e01c80639601d31e116100635780639601d31e146100eb578063d92bb60d146100ff578063da3fe4121461010d578063f48016ce14610115575f80fd5b80630f94cc501461008957806329e9b226146100ab578063389e7d68146100c5575b5f80fd5b6100986001600160f81b031981565b6040519081526020015b60405180910390f35b6100b360f881565b60405160ff90911681526020016100a2565b6100d86100d336600461018e565b610128565b60405160ff1990911681526020016100a2565b6100b36100f936600461018e565b60f81c90565b6100986001600160f81b0381565b6100b361014f565b6100986101233660046101a5565b61015f565b5f8161013760f86101006101fb565b6001600160f81b039190911660ff9091161b92915050565b61015c60f86101006101fb565b81565b5f60ff8316600883901c82610182826001600160f81b031960f889901b16610215565b93505050505b92915050565b5f6020828403121561019e575f80fd5b5035919050565b5f80604083850312156101b6575f80fd5b823560ff811681146101c6575f80fd5b9150602083013560ff19811681146101dc575f80fd5b809150509250929050565b634e487b7160e01b5f52601160045260245ffd5b61ffff8281168282160390811115610188576101886101e7565b80820180821115610188576101886101e756fea2646970667358221220a65390838aefafc92cbfa7f66c5f9e7bae60626728170e9dc2c65aabf5428a4664736f6c634300081a0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

@@ -0,0 +1,4 @@
+{
+  "_format": "hh-sol-dbg-1",
+  "buildInfo": "../../../build-info/705b5a0c39a5dd813a8127e3769c4fe2.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": "0x610362610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80630f08c1c21461006f5780634af170b014610097578063640acb3e146100b85780639df0f55e146100cb578063c54bd26f146100eb578063e9c54d311461010a575b5f80fd5b61008261007d3660046102ae565b541590565b60405190151581526020015b60405180910390f35b8180156100a2575f80fd5b506100b66100b13660046102c5565b61011d565b005b6100826100c63660046102c5565b61017c565b6100dd6100d93660046102ae565b5490565b60405190815260200161008e565b8180156100f6575f80fd5b506100b66101053660046102c5565b610195565b6100dd6101183660046102c5565b610288565b5f8181526001830160205260409020541561015357604051632d32fd9f60e21b8152600481018290526024015b60405180910390fd5b8154600181810184555f8481526020808220909301849055845493815293019052604090912055565b5f81815260018301602052604090205415155b92915050565b5f818152600183016020526040812054908190036101c95760405163156dc78160e21b81526004810183905260240161014a565b5f6101d56001836102e5565b84549091505f906101e8906001906102e5565b9050818114610247575f855f01828154811061020657610206610304565b905f5260205f200154905080865f01848154811061022657610226610304565b5f918252602080832090910192909255918252600187019052604090208390555b845485908061025857610258610318565b600190038181905f5260205f20015f90559055846001015f8581526020019081526020015f205f90555050505050565b5f825f01828154811061029d5761029d610304565b905f5260205f200154905092915050565b5f602082840312156102be575f80fd5b5035919050565b5f80604083850312156102d6575f80fd5b50508035926020909101359150565b8181038181111561018f57634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea2646970667358221220f3a36660debafe0743f299d424c12ddc98368438a8de370ee83c6c0226c8eb1264736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80630f08c1c21461006f5780634af170b014610097578063640acb3e146100b85780639df0f55e146100cb578063c54bd26f146100eb578063e9c54d311461010a575b5f80fd5b61008261007d3660046102ae565b541590565b60405190151581526020015b60405180910390f35b8180156100a2575f80fd5b506100b66100b13660046102c5565b61011d565b005b6100826100c63660046102c5565b61017c565b6100dd6100d93660046102ae565b5490565b60405190815260200161008e565b8180156100f6575f80fd5b506100b66101053660046102c5565b610195565b6100dd6101183660046102c5565b610288565b5f8181526001830160205260409020541561015357604051632d32fd9f60e21b8152600481018290526024015b60405180910390fd5b8154600181810184555f8481526020808220909301849055845493815293019052604090912055565b5f81815260018301602052604090205415155b92915050565b5f818152600183016020526040812054908190036101c95760405163156dc78160e21b81526004810183905260240161014a565b5f6101d56001836102e5565b84549091505f906101e8906001906102e5565b9050818114610247575f855f01828154811061020657610206610304565b905f5260205f200154905080865f01848154811061022657610226610304565b5f918252602080832090910192909255918252600187019052604090208390555b845485908061025857610258610318565b600190038181905f5260205f20015f90559055846001015f8581526020019081526020015f205f90555050505050565b5f825f01828154811061029d5761029d610304565b905f5260205f200154905092915050565b5f602082840312156102be575f80fd5b5035919050565b5f80604083850312156102d6575f80fd5b50508035926020909101359150565b8181038181111561018f57634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea2646970667358221220f3a36660debafe0743f299d424c12ddc98368438a8de370ee83c6c0226c8eb1264736f6c634300081a0033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/2b22356a28cf77644d8322732b1466b4.json"
+  "buildInfo": "../../../build-info/705b5a0c39a5dd813a8127e3769c4fe2.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,25 @@
       "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": [
         {
@@ -160,14 +203,14 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61034e61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c806352694ee81161006557806352694ee814610148578063bc1b392d14610163578063c4cade9d1461016a578063efac97cf1461018e57600080fd5b806308dc895e1461009757806330b8415f146100c55780633889a4c8146100f157806340a8cd9e14610112575b600080fd5b6100a86100a536600461025b565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100e16100d336600461025b565b6001600160601b0316151590565b60405190151581526020016100bc565b6101046100ff366004610276565b61019c565b6040519081526020016100bc565b61013561012036600461025b565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100bc565b6100e161015636600461025b565b6001600160601b03161590565b60006100a8565b6100e16101783660046102b3565b60006001600160601b0380841690831614610238565b6100a86100a53660046102e6565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610214573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023891906102ff565b9392505050565b80356001600160601b038116811461025657600080fd5b919050565b60006020828403121561026d57600080fd5b6102388261023f565b6000806040838503121561028957600080fd5b6102928361023f565b9150602083013560ff811681146102a857600080fd5b809150509250929050565b600080604083850312156102c657600080fd5b6102cf8361023f565b91506102dd6020840161023f565b90509250929050565b6000602082840312156102f857600080fd5b5035919050565b60006020828403121561031157600080fd5b505191905056fea26469706673582212206df657dc783710ac06b7c5ae38377ed94c65a224db179d564c5a2dfe3048951064736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c806352694ee81161006557806352694ee814610148578063bc1b392d14610163578063c4cade9d1461016a578063efac97cf1461018e57600080fd5b806308dc895e1461009757806330b8415f146100c55780633889a4c8146100f157806340a8cd9e14610112575b600080fd5b6100a86100a536600461025b565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100e16100d336600461025b565b6001600160601b0316151590565b60405190151581526020016100bc565b6101046100ff366004610276565b61019c565b6040519081526020016100bc565b61013561012036600461025b565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100bc565b6100e161015636600461025b565b6001600160601b03161590565b60006100a8565b6100e16101783660046102b3565b60006001600160601b0380841690831614610238565b6100a86100a53660046102e6565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610214573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023891906102ff565b9392505050565b80356001600160601b038116811461025657600080fd5b919050565b60006020828403121561026d57600080fd5b6102388261023f565b6000806040838503121561028957600080fd5b6102928361023f565b9150602083013560ff811681146102a857600080fd5b809150509250929050565b600080604083850312156102c657600080fd5b6102cf8361023f565b91506102dd6020840161023f565b90509250929050565b6000602082840312156102f857600080fd5b5035919050565b60006020828403121561031157600080fd5b505191905056fea26469706673582212206df657dc783710ac06b7c5ae38377ed94c65a224db179d564c5a2dfe3048951064736f6c63430008140033",
+  "bytecode": "0x6103d6610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100a6575f3560e01c80637054cbd21161006e5780637054cbd21461017657806399009c5114610189578063bc1b392d146101a9578063c4cade9d146101af578063efac97cf146101ce575f80fd5b806308dc895e146100aa57806330b8415f146100d85780633889a4c81461010457806340a8cd9e1461012557806352694ee81461015b575b5f80fd5b6100bb6100b83660046102b9565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100f46100e63660046102b9565b6001600160601b0316151590565b60405190151581526020016100cf565b6101176101123660046102d2565b6101dc565b6040519081526020016100cf565b6101486101333660046102b9565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100cf565b6100f46101693660046102b9565b6001600160601b03161590565b6100bb61018436600461030c565b61027c565b6100f461019736600461032d565b6001600160601b039081169116141590565b5f6100bb565b6100f46101bd36600461032d565b6001600160601b0390811691161490565b6100bb6100b836600461035e565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610251573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102759190610375565b9392505050565b5f600882901c6001600160601b0381106102985761029861038c565b92915050565b80356001600160601b03811681146102b4575f80fd5b919050565b5f602082840312156102c9575f80fd5b6102758261029e565b5f80604083850312156102e3575f80fd5b6102ec8361029e565b9150602083013560ff81168114610301575f80fd5b809150509250929050565b5f6020828403121561031c575f80fd5b813560ff1981168114610275575f80fd5b5f806040838503121561033e575f80fd5b6103478361029e565b91506103556020840161029e565b90509250929050565b5f6020828403121561036e575f80fd5b5035919050565b5f60208284031215610385575f80fd5b5051919050565b634e487b7160e01b5f52600160045260245ffdfea2646970667358221220c2e5e2ba6cd72f91812a6511dfb9995afd7d9701b823fb585a37c84ee1779ee264736f6c634300081a0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100a6575f3560e01c80637054cbd21161006e5780637054cbd21461017657806399009c5114610189578063bc1b392d146101a9578063c4cade9d146101af578063efac97cf146101ce575f80fd5b806308dc895e146100aa57806330b8415f146100d85780633889a4c81461010457806340a8cd9e1461012557806352694ee81461015b575b5f80fd5b6100bb6100b83660046102b9565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100f46100e63660046102b9565b6001600160601b0316151590565b60405190151581526020016100cf565b6101176101123660046102d2565b6101dc565b6040519081526020016100cf565b6101486101333660046102b9565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100cf565b6100f46101693660046102b9565b6001600160601b03161590565b6100bb61018436600461030c565b61027c565b6100f461019736600461032d565b6001600160601b039081169116141590565b5f6100bb565b6100f46101bd36600461032d565b6001600160601b0390811691161490565b6100bb6100b836600461035e565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610251573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102759190610375565b9392505050565b5f600882901c6001600160601b0381106102985761029861038c565b92915050565b80356001600160601b03811681146102b4575f80fd5b919050565b5f602082840312156102c9575f80fd5b6102758261029e565b5f80604083850312156102e3575f80fd5b6102ec8361029e565b9150602083013560ff81168114610301575f80fd5b809150509250929050565b5f6020828403121561031c575f80fd5b813560ff1981168114610275575f80fd5b5f806040838503121561033e575f80fd5b6103478361029e565b91506103556020840161029e565b90509250929050565b5f6020828403121561036e575f80fd5b5035919050565b5f60208284031215610385575f80fd5b5051919050565b634e487b7160e01b5f52600160045260245ffdfea2646970667358221220c2e5e2ba6cd72f91812a6511dfb9995afd7d9701b823fb585a37c84ee1779ee264736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [
         {
           "length": 20,
-          "start": 474
+          "start": 531
         }
       ]
     }
@@ -177,7 +220,7 @@
       "Key32Lib": [
         {
           "length": 20,
-          "start": 416
+          "start": 479
         }
       ]
     }

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

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