@etherisc/gif-next 0.0.2-cfc7167-648 → 0.0.2-cff7366-494

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": "0x610362610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80630f08c1c21461006f5780634af170b014610097578063640acb3e146100b85780639df0f55e146100cb578063c54bd26f146100eb578063e9c54d311461010a575b5f80fd5b61008261007d3660046102ae565b541590565b60405190151581526020015b60405180910390f35b8180156100a2575f80fd5b506100b66100b13660046102c5565b61011d565b005b6100826100c63660046102c5565b61017c565b6100dd6100d93660046102ae565b5490565b60405190815260200161008e565b8180156100f6575f80fd5b506100b66101053660046102c5565b610195565b6100dd6101183660046102c5565b610288565b5f8181526001830160205260409020541561015357604051632d32fd9f60e21b8152600481018290526024015b60405180910390fd5b8154600181810184555f8481526020808220909301849055845493815293019052604090912055565b5f81815260018301602052604090205415155b92915050565b5f818152600183016020526040812054908190036101c95760405163156dc78160e21b81526004810183905260240161014a565b5f6101d56001836102e5565b84549091505f906101e8906001906102e5565b9050818114610247575f855f01828154811061020657610206610304565b905f5260205f200154905080865f01848154811061022657610226610304565b5f918252602080832090910192909255918252600187019052604090208390555b845485908061025857610258610318565b600190038181905f5260205f20015f90559055846001015f8581526020019081526020015f205f90555050505050565b5f825f01828154811061029d5761029d610304565b905f5260205f200154905092915050565b5f602082840312156102be575f80fd5b5035919050565b5f80604083850312156102d6575f80fd5b50508035926020909101359150565b8181038181111561018f57634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea26469706673582212200b11295bf691850a394497118bca3168bb101b55439c0dc6f39dc69f94d8ad5264736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80630f08c1c21461006f5780634af170b014610097578063640acb3e146100b85780639df0f55e146100cb578063c54bd26f146100eb578063e9c54d311461010a575b5f80fd5b61008261007d3660046102ae565b541590565b60405190151581526020015b60405180910390f35b8180156100a2575f80fd5b506100b66100b13660046102c5565b61011d565b005b6100826100c63660046102c5565b61017c565b6100dd6100d93660046102ae565b5490565b60405190815260200161008e565b8180156100f6575f80fd5b506100b66101053660046102c5565b610195565b6100dd6101183660046102c5565b610288565b5f8181526001830160205260409020541561015357604051632d32fd9f60e21b8152600481018290526024015b60405180910390fd5b8154600181810184555f8481526020808220909301849055845493815293019052604090912055565b5f81815260018301602052604090205415155b92915050565b5f818152600183016020526040812054908190036101c95760405163156dc78160e21b81526004810183905260240161014a565b5f6101d56001836102e5565b84549091505f906101e8906001906102e5565b9050818114610247575f855f01828154811061020657610206610304565b905f5260205f200154905080865f01848154811061022657610226610304565b5f918252602080832090910192909255918252600187019052604090208390555b845485908061025857610258610318565b600190038181905f5260205f20015f90559055846001015f8581526020019081526020015f205f90555050505050565b5f825f01828154811061029d5761029d610304565b905f5260205f200154905092915050565b5f602082840312156102be575f80fd5b5035919050565b5f80604083850312156102d6575f80fd5b50508035926020909101359150565b8181038181111561018f57634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea26469706673582212200b11295bf691850a394497118bca3168bb101b55439c0dc6f39dc69f94d8ad5264736f6c634300081a0033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

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

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

@@ -151,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": [
         {
@@ -184,14 +203,14 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x610361610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c806352694ee81161006e57806352694ee81461015057806399009c511461016b578063bc1b392d1461018b578063c4cade9d14610191578063efac97cf146101b0575f80fd5b806308dc895e1461009f57806330b8415f146100cd5780633889a4c8146100f957806340a8cd9e1461011a575b5f80fd5b6100b06100ad366004610279565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100e96100db366004610279565b6001600160601b0316151590565b60405190151581526020016100c4565b61010c610107366004610292565b6101be565b6040519081526020016100c4565b61013d610128366004610279565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100c4565b6100e961015e366004610279565b6001600160601b03161590565b6100e96101793660046102cc565b6001600160601b039081169116141590565b5f6100b0565b6100e961019f3660046102cc565b6001600160601b0390811691161490565b6100b06100ad3660046102fd565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610233573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102579190610314565b9392505050565b80356001600160601b0381168114610274575f80fd5b919050565b5f60208284031215610289575f80fd5b6102578261025e565b5f80604083850312156102a3575f80fd5b6102ac8361025e565b9150602083013560ff811681146102c1575f80fd5b809150509250929050565b5f80604083850312156102dd575f80fd5b6102e68361025e565b91506102f46020840161025e565b90509250929050565b5f6020828403121561030d575f80fd5b5035919050565b5f60208284031215610324575f80fd5b505191905056fea2646970667358221220ea87ad123b16b3e985a0cd807c968168670037b6e136f162cccb0c550385cbdf64736f6c634300081a0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c806352694ee81161006e57806352694ee81461015057806399009c511461016b578063bc1b392d1461018b578063c4cade9d14610191578063efac97cf146101b0575f80fd5b806308dc895e1461009f57806330b8415f146100cd5780633889a4c8146100f957806340a8cd9e1461011a575b5f80fd5b6100b06100ad366004610279565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100e96100db366004610279565b6001600160601b0316151590565b60405190151581526020016100c4565b61010c610107366004610292565b6101be565b6040519081526020016100c4565b61013d610128366004610279565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100c4565b6100e961015e366004610279565b6001600160601b03161590565b6100e96101793660046102cc565b6001600160601b039081169116141590565b5f6100b0565b6100e961019f3660046102cc565b6001600160601b0390811691161490565b6100b06100ad3660046102fd565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610233573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102579190610314565b9392505050565b80356001600160601b0381168114610274575f80fd5b919050565b5f60208284031215610289575f80fd5b6102578261025e565b5f80604083850312156102a3575f80fd5b6102ac8361025e565b9150602083013560ff811681146102c1575f80fd5b809150509250929050565b5f80604083850312156102dd575f80fd5b6102e68361025e565b91506102f46020840161025e565b90509250929050565b5f6020828403121561030d575f80fd5b5035919050565b5f60208284031215610324575f80fd5b505191905056fea2646970667358221220ea87ad123b16b3e985a0cd807c968168670037b6e136f162cccb0c550385cbdf64736f6c634300081a0033",
+  "bytecode": "0x6103d6610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100a6575f3560e01c80637054cbd21161006e5780637054cbd21461017657806399009c5114610189578063bc1b392d146101a9578063c4cade9d146101af578063efac97cf146101ce575f80fd5b806308dc895e146100aa57806330b8415f146100d85780633889a4c81461010457806340a8cd9e1461012557806352694ee81461015b575b5f80fd5b6100bb6100b83660046102b9565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100f46100e63660046102b9565b6001600160601b0316151590565b60405190151581526020016100cf565b6101176101123660046102d2565b6101dc565b6040519081526020016100cf565b6101486101333660046102b9565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100cf565b6100f46101693660046102b9565b6001600160601b03161590565b6100bb61018436600461030c565b61027c565b6100f461019736600461032d565b6001600160601b039081169116141590565b5f6100bb565b6100f46101bd36600461032d565b6001600160601b0390811691161490565b6100bb6100b836600461035e565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610251573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102759190610375565b9392505050565b5f600882901c6001600160601b0381106102985761029861038c565b92915050565b80356001600160601b03811681146102b4575f80fd5b919050565b5f602082840312156102c9575f80fd5b6102758261029e565b5f80604083850312156102e3575f80fd5b6102ec8361029e565b9150602083013560ff81168114610301575f80fd5b809150509250929050565b5f6020828403121561031c575f80fd5b813560ff1981168114610275575f80fd5b5f806040838503121561033e575f80fd5b6103478361029e565b91506103556020840161029e565b90509250929050565b5f6020828403121561036e575f80fd5b5035919050565b5f60208284031215610385575f80fd5b5051919050565b634e487b7160e01b5f52600160045260245ffdfea26469706673582212201746aba4b03785f5ca85e27fa8b0c9628d04b4fff9eba6ceabd143d62876cd0764736f6c634300081a0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100a6575f3560e01c80637054cbd21161006e5780637054cbd21461017657806399009c5114610189578063bc1b392d146101a9578063c4cade9d146101af578063efac97cf146101ce575f80fd5b806308dc895e146100aa57806330b8415f146100d85780633889a4c81461010457806340a8cd9e1461012557806352694ee81461015b575b5f80fd5b6100bb6100b83660046102b9565b90565b6040516001600160601b0390911681526020015b60405180910390f35b6100f46100e63660046102b9565b6001600160601b0316151590565b60405190151581526020016100cf565b6101176101123660046102d2565b6101dc565b6040519081526020016100cf565b6101486101333660046102b9565b60081b6cffffffffffffffffffffffff001690565b60405160ff1990911681526020016100cf565b6100f46101693660046102b9565b6001600160601b03161590565b6100bb61018436600461030c565b61027c565b6100f461019736600461032d565b6001600160601b039081169116141590565b5f6100bb565b6100f46101bd36600461032d565b6001600160601b0390811691161490565b6100bb6100b836600461035e565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce83600886901b6cffffffffffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610251573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102759190610375565b9392505050565b5f600882901c6001600160601b0381106102985761029861038c565b92915050565b80356001600160601b03811681146102b4575f80fd5b919050565b5f602082840312156102c9575f80fd5b6102758261029e565b5f80604083850312156102e3575f80fd5b6102ec8361029e565b9150602083013560ff81168114610301575f80fd5b809150509250929050565b5f6020828403121561031c575f80fd5b813560ff1981168114610275575f80fd5b5f806040838503121561033e575f80fd5b6103478361029e565b91506103556020840161029e565b90509250929050565b5f6020828403121561036e575f80fd5b5035919050565b5f60208284031215610385575f80fd5b5051919050565b634e487b7160e01b5f52600160045260245ffdfea26469706673582212201746aba4b03785f5ca85e27fa8b0c9628d04b4fff9eba6ceabd143d62876cd0764736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [
         {
           "length": 20,
-          "start": 501
+          "start": 531
         }
       ]
     }
@@ -201,7 +220,7 @@
       "Key32Lib": [
         {
           "length": 20,
-          "start": 449
+          "start": 479
         }
       ]
     }

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

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

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

@@ -26,8 +26,8 @@
       "type": "error"
     }
   ],
-  "bytecode": "0x61049c610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80632bfdd6b91461006f57806331a97de2146100975780638b6233dd146100aa578063a3082a18146100ca578063a73d5756146100eb578063e797d8991461010a575b5f80fd5b61008261007d3660046103af565b610135565b60405190151581526020015b60405180910390f35b6100826100a53660046103e8565b541590565b6100bc6100b83660046103e8565b5490565b60405190815260200161008e565b8180156100d5575f80fd5b506100e96100e43660046103af565b610158565b005b8180156100f6575f80fd5b506100e96101053660046103af565b6101f1565b61011d6101183660046103ff565b61036b565b6040516001600160601b03909116815260200161008e565b6001600160601b0381165f90815260018301602052604090205415155b92915050565b6001600160601b0381165f908152600183016020526040902054156101a0576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b8154600181810184555f8481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b0381165f908152600183016020526040812054908190036102375760405163482084f160e01b81526001600160601b0383166004820152602401610197565b5f61024360018361041f565b84549091505f906102569060019061041f565b90508181146102fa575f855f0182815481106102745761027461043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905080865f0184815481106102b2576102b261043e565b5f9182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061030b5761030b610452565b600190038181905f5260205f209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001015f856001600160601b03166001600160601b031681526020019081526020015f205f90555050505050565b5f825f0182815481106103805761038061043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b5f80604083850312156103c0575f80fd5b8235915060208301356001600160601b03811681146103dd575f80fd5b809150509250929050565b5f602082840312156103f8575f80fd5b5035919050565b5f8060408385031215610410575f80fd5b50508035926020909101359150565b8181038181111561015257634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea26469706673582212206083f512ffd21e48cf4db103590e43132eadddeb0ca9755f0a01432a61a7632264736f6c634300081a0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80632bfdd6b91461006f57806331a97de2146100975780638b6233dd146100aa578063a3082a18146100ca578063a73d5756146100eb578063e797d8991461010a575b5f80fd5b61008261007d3660046103af565b610135565b60405190151581526020015b60405180910390f35b6100826100a53660046103e8565b541590565b6100bc6100b83660046103e8565b5490565b60405190815260200161008e565b8180156100d5575f80fd5b506100e96100e43660046103af565b610158565b005b8180156100f6575f80fd5b506100e96101053660046103af565b6101f1565b61011d6101183660046103ff565b61036b565b6040516001600160601b03909116815260200161008e565b6001600160601b0381165f90815260018301602052604090205415155b92915050565b6001600160601b0381165f908152600183016020526040902054156101a0576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b8154600181810184555f8481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b0381165f908152600183016020526040812054908190036102375760405163482084f160e01b81526001600160601b0383166004820152602401610197565b5f61024360018361041f565b84549091505f906102569060019061041f565b90508181146102fa575f855f0182815481106102745761027461043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905080865f0184815481106102b2576102b261043e565b5f9182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061030b5761030b610452565b600190038181905f5260205f209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001015f856001600160601b03166001600160601b031681526020019081526020015f205f90555050505050565b5f825f0182815481106103805761038061043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b5f80604083850312156103c0575f80fd5b8235915060208301356001600160601b03811681146103dd575f80fd5b809150509250929050565b5f602082840312156103f8575f80fd5b5035919050565b5f8060408385031215610410575f80fd5b50508035926020909101359150565b8181038181111561015257634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea26469706673582212206083f512ffd21e48cf4db103590e43132eadddeb0ca9755f0a01432a61a7632264736f6c634300081a0033",
+  "bytecode": "0x61049c610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80632bfdd6b91461006f57806331a97de2146100975780638b6233dd146100aa578063a3082a18146100ca578063a73d5756146100eb578063e797d8991461010a575b5f80fd5b61008261007d3660046103af565b610135565b60405190151581526020015b60405180910390f35b6100826100a53660046103e8565b541590565b6100bc6100b83660046103e8565b5490565b60405190815260200161008e565b8180156100d5575f80fd5b506100e96100e43660046103af565b610158565b005b8180156100f6575f80fd5b506100e96101053660046103af565b6101f1565b61011d6101183660046103ff565b61036b565b6040516001600160601b03909116815260200161008e565b6001600160601b0381165f90815260018301602052604090205415155b92915050565b6001600160601b0381165f908152600183016020526040902054156101a0576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b8154600181810184555f8481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b0381165f908152600183016020526040812054908190036102375760405163482084f160e01b81526001600160601b0383166004820152602401610197565b5f61024360018361041f565b84549091505f906102569060019061041f565b90508181146102fa575f855f0182815481106102745761027461043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905080865f0184815481106102b2576102b261043e565b5f9182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061030b5761030b610452565b600190038181905f5260205f209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001015f856001600160601b03166001600160601b031681526020019081526020015f205f90555050505050565b5f825f0182815481106103805761038061043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b5f80604083850312156103c0575f80fd5b8235915060208301356001600160601b03811681146103dd575f80fd5b809150509250929050565b5f602082840312156103f8575f80fd5b5035919050565b5f8060408385031215610410575f80fd5b50508035926020909101359150565b8181038181111561015257634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea26469706673582212203e66cfe6426f33c9631f8ba4734744378d7f90ebf9de4a545473135c8021dc0964736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80632bfdd6b91461006f57806331a97de2146100975780638b6233dd146100aa578063a3082a18146100ca578063a73d5756146100eb578063e797d8991461010a575b5f80fd5b61008261007d3660046103af565b610135565b60405190151581526020015b60405180910390f35b6100826100a53660046103e8565b541590565b6100bc6100b83660046103e8565b5490565b60405190815260200161008e565b8180156100d5575f80fd5b506100e96100e43660046103af565b610158565b005b8180156100f6575f80fd5b506100e96101053660046103af565b6101f1565b61011d6101183660046103ff565b61036b565b6040516001600160601b03909116815260200161008e565b6001600160601b0381165f90815260018301602052604090205415155b92915050565b6001600160601b0381165f908152600183016020526040902054156101a0576040516301eae2c560e61b81526001600160601b03821660048201526024015b60405180910390fd5b8154600181810184555f8481526020808220600285040180546001600160601b03968716600c968616969096026101000a868102970219169590951790945584549281529301909152604090912055565b6001600160601b0381165f908152600183016020526040812054908190036102375760405163482084f160e01b81526001600160601b0383166004820152602401610197565b5f61024360018361041f565b84549091505f906102569060019061041f565b90508181146102fa575f855f0182815481106102745761027461043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905080865f0184815481106102b2576102b261043e565b5f9182526020808320600283040180546001600160601b03958616600c6001958616026101000a90810290870219909116179055939092168152908701909152604090208390555b845485908061030b5761030b610452565b600190038181905f5260205f209060029182820401919006600c026101000a8154906001600160601b0302191690559055846001015f856001600160601b03166001600160601b031681526020019081526020015f205f90555050505050565b5f825f0182815481106103805761038061043e565b905f5260205f209060029182820401919006600c029054906101000a90046001600160601b0316905092915050565b5f80604083850312156103c0575f80fd5b8235915060208301356001600160601b03811681146103dd575f80fd5b809150509250929050565b5f602082840312156103f8575f80fd5b5035919050565b5f8060408385031215610410575f80fd5b50508035926020909101359150565b8181038181111561015257634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea26469706673582212203e66cfe6426f33c9631f8ba4734744378d7f90ebf9de4a545473135c8021dc0964736f6c634300081a0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

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

@@ -232,8 +232,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x610970610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100b1575f3560e01c80637adad14f116100795780637adad14f14610138578063ac43d83414610152578063ae574a3c14610183578063b2466acf14610196578063bc1b392d146101ac578063f7fa7a7c146101b2575f80fd5b80632c2f8a67146100b55780636401f182146100dd5780636900a3ae146100f25780636ecac6e8146101125780636f91962014610123575b5f80fd5b6100c86100c3366004610676565b6101c5565b60405190151581526020015b60405180910390f35b60635b60405160ff90911681526020016100d4565b6101056101003660046106a7565b6101d5565b6040516100d491906106be565b6100e06101203660046106a7565b90565b6100c86101313660046106f3565b60ff161590565b6100c8610146366004610676565b60ff9081169116141590565b6101666101603660046106f3565b60ff1690565b6040516bffffffffffffffffffffffff90911681526020016100d4565b6101056101913660046106f3565b6102f3565b6100c86101a43660046106f3565b60ff16151590565b5f6100e0565b6101056101c03660046107b2565b6105c1565b60ff828116908216145b92915050565b6060815f036101fb5750506040805180820190915260018152600360fc1b602082015290565b815f5b8115610224578061020e81610834565b915061021d9050600a83610860565b91506101fe565b5f8167ffffffffffffffff81111561023e5761023e610713565b6040519080825280601f01601f191660200182016040528015610268576020820181803683370190505b5090505f610277600184610873565b90508593505b83156102ea5761028e600a85610886565b610299906030610899565b60f81b8282815181106102ae576102ae6108ac565b60200101906001600160f81b03191690815f1a9053506102cf600a85610860565b935080156102e557806102e1816108c0565b9150505b61027d565b50949350505050565b60606103008260026101c5565b15610329575050604080518082019091526008815267526567697374727960c01b602082015290565b6103348260036101c5565b1561035c5750506040805180820190915260078152665374616b696e6760c81b602082015290565b61036782600a6101c5565b15610390575050604080518082019091526008815267496e7374616e636560c01b602082015290565b61039b82600b6101c5565b156103c557505060408051808201909152600981526810dbdb5c1bdb995b9d60ba1b602082015290565b6103d082600c6101c5565b156103f8575050604080518082019091526007815266141c9bd91d58dd60ca1b602082015290565b61040382600d6101c5565b1561042a5750506040805180820190915260068152654f7261636c6560d01b602082015290565b61043582600e6101c5565b1561046257505060408051808201909152600c81526b2234b9ba3934b13aba34b7b760a11b602082015290565b61046d82600f6101c5565b15610492575050604080518082019091526004815263141bdbdb60e21b602082015290565b61049d8260146101c5565b156104c957505060408051808201909152600b81526a20b8383634b1b0ba34b7b760a91b602082015290565b6104d48260156101c5565b156104fb575050604080518082019091526006815265506f6c69637960d01b602082015290565b6105068260166101c5565b1561052c575050604080518082019091526005815264436c61696d60d81b602082015290565b6105378260196101c5565b1561055d575050604080518082019091526005815264507269636560d81b602082015290565b61056882601e6101c5565b1561058f57505060408051808201909152600681526542756e646c6560d01b602082015290565b61059b60ff83166101d5565b6040516020016105ab91906108ec565b6040516020818303038152906040529050919050565b606060638211156105ec57604051631f535f3160e11b81526004810183905260240160405180910390fd5b60408051808201909152600381526205f76360ec1b6020820152600a831061062957506040805180820190915260028152612fbb60f11b60208201525b848482610635866101d5565b604051602001610648949392919061090a565b6040516020818303038152906040529150509392505050565b803560ff81168114610671575f80fd5b919050565b5f8060408385031215610687575f80fd5b61069083610661565b915061069e60208401610661565b90509250929050565b5f602082840312156106b7575f80fd5b5035919050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b5f60208284031215610703575f80fd5b61070c82610661565b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112610736575f80fd5b813567ffffffffffffffff81111561075057610750610713565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561077f5761077f610713565b604052818152838201602001851015610796575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f606084860312156107c4575f80fd5b833567ffffffffffffffff8111156107da575f80fd5b6107e686828701610727565b935050602084013567ffffffffffffffff811115610802575f80fd5b61080e86828701610727565b93969395505050506040919091013590565b634e487b7160e01b5f52601160045260245ffd5b5f6001820161084557610845610820565b5060010190565b634e487b7160e01b5f52601260045260245ffd5b5f8261086e5761086e61084c565b500490565b818103818111156101cf576101cf610820565b5f826108945761089461084c565b500690565b808201808211156101cf576101cf610820565b634e487b7160e01b5f52603260045260245ffd5b5f816108ce576108ce610820565b505f190190565b5f81518060208401855e5f93019283525090919050565b694f626a6563745479706560b01b81525f61070c600a8301846108d5565b5f61093061092a61092461091e858a6108d5565b886108d5565b866108d5565b846108d5565b969550505050505056fea2646970667358221220f415d3d4704a2ca692b11897aeeeb595f461777fb599ab04af55cc29a341be5964736f6c634300081a0033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100b1575f3560e01c80637adad14f116100795780637adad14f14610138578063ac43d83414610152578063ae574a3c14610183578063b2466acf14610196578063bc1b392d146101ac578063f7fa7a7c146101b2575f80fd5b80632c2f8a67146100b55780636401f182146100dd5780636900a3ae146100f25780636ecac6e8146101125780636f91962014610123575b5f80fd5b6100c86100c3366004610676565b6101c5565b60405190151581526020015b60405180910390f35b60635b60405160ff90911681526020016100d4565b6101056101003660046106a7565b6101d5565b6040516100d491906106be565b6100e06101203660046106a7565b90565b6100c86101313660046106f3565b60ff161590565b6100c8610146366004610676565b60ff9081169116141590565b6101666101603660046106f3565b60ff1690565b6040516bffffffffffffffffffffffff90911681526020016100d4565b6101056101913660046106f3565b6102f3565b6100c86101a43660046106f3565b60ff16151590565b5f6100e0565b6101056101c03660046107b2565b6105c1565b60ff828116908216145b92915050565b6060815f036101fb5750506040805180820190915260018152600360fc1b602082015290565b815f5b8115610224578061020e81610834565b915061021d9050600a83610860565b91506101fe565b5f8167ffffffffffffffff81111561023e5761023e610713565b6040519080825280601f01601f191660200182016040528015610268576020820181803683370190505b5090505f610277600184610873565b90508593505b83156102ea5761028e600a85610886565b610299906030610899565b60f81b8282815181106102ae576102ae6108ac565b60200101906001600160f81b03191690815f1a9053506102cf600a85610860565b935080156102e557806102e1816108c0565b9150505b61027d565b50949350505050565b60606103008260026101c5565b15610329575050604080518082019091526008815267526567697374727960c01b602082015290565b6103348260036101c5565b1561035c5750506040805180820190915260078152665374616b696e6760c81b602082015290565b61036782600a6101c5565b15610390575050604080518082019091526008815267496e7374616e636560c01b602082015290565b61039b82600b6101c5565b156103c557505060408051808201909152600981526810dbdb5c1bdb995b9d60ba1b602082015290565b6103d082600c6101c5565b156103f8575050604080518082019091526007815266141c9bd91d58dd60ca1b602082015290565b61040382600d6101c5565b1561042a5750506040805180820190915260068152654f7261636c6560d01b602082015290565b61043582600e6101c5565b1561046257505060408051808201909152600c81526b2234b9ba3934b13aba34b7b760a11b602082015290565b61046d82600f6101c5565b15610492575050604080518082019091526004815263141bdbdb60e21b602082015290565b61049d8260146101c5565b156104c957505060408051808201909152600b81526a20b8383634b1b0ba34b7b760a91b602082015290565b6104d48260156101c5565b156104fb575050604080518082019091526006815265506f6c69637960d01b602082015290565b6105068260166101c5565b1561052c575050604080518082019091526005815264436c61696d60d81b602082015290565b6105378260196101c5565b1561055d575050604080518082019091526005815264507269636560d81b602082015290565b61056882601e6101c5565b1561058f57505060408051808201909152600681526542756e646c6560d01b602082015290565b61059b60ff83166101d5565b6040516020016105ab91906108ec565b6040516020818303038152906040529050919050565b606060638211156105ec57604051631f535f3160e11b81526004810183905260240160405180910390fd5b60408051808201909152600381526205f76360ec1b6020820152600a831061062957506040805180820190915260028152612fbb60f11b60208201525b848482610635866101d5565b604051602001610648949392919061090a565b6040516020818303038152906040529150509392505050565b803560ff81168114610671575f80fd5b919050565b5f8060408385031215610687575f80fd5b61069083610661565b915061069e60208401610661565b90509250929050565b5f602082840312156106b7575f80fd5b5035919050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b5f60208284031215610703575f80fd5b61070c82610661565b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112610736575f80fd5b813567ffffffffffffffff81111561075057610750610713565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561077f5761077f610713565b604052818152838201602001851015610796575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f606084860312156107c4575f80fd5b833567ffffffffffffffff8111156107da575f80fd5b6107e686828701610727565b935050602084013567ffffffffffffffff811115610802575f80fd5b61080e86828701610727565b93969395505050506040919091013590565b634e487b7160e01b5f52601160045260245ffd5b5f6001820161084557610845610820565b5060010190565b634e487b7160e01b5f52601260045260245ffd5b5f8261086e5761086e61084c565b500490565b818103818111156101cf576101cf610820565b5f826108945761089461084c565b500690565b808201808211156101cf576101cf610820565b634e487b7160e01b5f52603260045260245ffd5b5f816108ce576108ce610820565b505f190190565b5f81518060208401855e5f93019283525090919050565b694f626a6563745479706560b01b81525f61070c600a8301846108d5565b5f61093061092a61092461091e858a6108d5565b886108d5565b866108d5565b846108d5565b969550505050505056fea2646970667358221220f415d3d4704a2ca692b11897aeeeb595f461777fb599ab04af55cc29a341be5964736f6c634300081a0033",
+  "bytecode": "0x6109a0610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100b1575f3560e01c80637adad14f116100795780637adad14f14610138578063ac43d83414610152578063ae574a3c14610183578063b2466acf14610196578063bc1b392d146101ac578063f7fa7a7c146101b2575f80fd5b80632c2f8a67146100b55780636401f182146100dd5780636900a3ae146100f25780636ecac6e8146101125780636f91962014610123575b5f80fd5b6100c86100c33660046106a6565b6101c5565b60405190151581526020015b60405180910390f35b60635b60405160ff90911681526020016100d4565b6101056101003660046106d7565b6101d5565b6040516100d491906106ee565b6100e06101203660046106d7565b90565b6100c8610131366004610723565b60ff161590565b6100c86101463660046106a6565b60ff9081169116141590565b610166610160366004610723565b60ff1690565b6040516bffffffffffffffffffffffff90911681526020016100d4565b610105610191366004610723565b6102f3565b6100c86101a4366004610723565b60ff16151590565b5f6100e0565b6101056101c03660046107e2565b6105f1565b60ff828116908216145b92915050565b6060815f036101fb5750506040805180820190915260018152600360fc1b602082015290565b815f5b8115610224578061020e81610864565b915061021d9050600a83610890565b91506101fe565b5f8167ffffffffffffffff81111561023e5761023e610743565b6040519080825280601f01601f191660200182016040528015610268576020820181803683370190505b5090505f6102776001846108a3565b90508593505b83156102ea5761028e600a856108b6565b6102999060306108c9565b60f81b8282815181106102ae576102ae6108dc565b60200101906001600160f81b03191690815f1a9053506102cf600a85610890565b935080156102e557806102e1816108f0565b9150505b61027d565b50949350505050565b60606103008260026101c5565b15610329575050604080518082019091526008815267526567697374727960c01b602082015290565b6103348260036101c5565b1561035c5750506040805180820190915260078152665374616b696e6760c81b602082015290565b61036782600a6101c5565b15610390575050604080518082019091526008815267496e7374616e636560c01b602082015290565b61039b82600b6101c5565b156103c557505060408051808201909152600981526810dbdb5c1bdb995b9d60ba1b602082015290565b6103d082600c6101c5565b156103f8575050604080518082019091526007815266141c9bd91d58dd60ca1b602082015290565b61040382600d6101c5565b1561042a5750506040805180820190915260068152654f7261636c6560d01b602082015290565b61043582600e6101c5565b1561046257505060408051808201909152600c81526b2234b9ba3934b13aba34b7b760a11b602082015290565b61046d82600f6101c5565b15610492575050604080518082019091526004815263141bdbdb60e21b602082015290565b61049d8260146101c5565b156104c957505060408051808201909152600b81526a20b8383634b1b0ba34b7b760a91b602082015290565b6104d48260156101c5565b156104fb575050604080518082019091526006815265506f6c69637960d01b602082015290565b6105068260176101c5565b1561052c575050604080518082019091526005815264436c61696d60d81b602082015290565b61053782601a6101c5565b1561055d575050604080518082019091526005815264507269636560d81b602082015290565b61056882601f6101c5565b1561058f57505060408051808201909152600681526542756e646c6560d01b602082015290565b61059a8260196101c5565b156105bf5750506040805180820190915260048152635269736b60e01b602082015290565b6105cb60ff83166101d5565b6040516020016105db919061091c565b6040516020818303038152906040529050919050565b6060606382111561061c57604051631f535f3160e11b81526004810183905260240160405180910390fd5b60408051808201909152600381526205f76360ec1b6020820152600a831061065957506040805180820190915260028152612fbb60f11b60208201525b848482610665866101d5565b604051602001610678949392919061093a565b6040516020818303038152906040529150509392505050565b803560ff811681146106a1575f80fd5b919050565b5f80604083850312156106b7575f80fd5b6106c083610691565b91506106ce60208401610691565b90509250929050565b5f602082840312156106e7575f80fd5b5035919050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b5f60208284031215610733575f80fd5b61073c82610691565b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112610766575f80fd5b813567ffffffffffffffff81111561078057610780610743565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156107af576107af610743565b6040528181528382016020018510156107c6575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f606084860312156107f4575f80fd5b833567ffffffffffffffff81111561080a575f80fd5b61081686828701610757565b935050602084013567ffffffffffffffff811115610832575f80fd5b61083e86828701610757565b93969395505050506040919091013590565b634e487b7160e01b5f52601160045260245ffd5b5f6001820161087557610875610850565b5060010190565b634e487b7160e01b5f52601260045260245ffd5b5f8261089e5761089e61087c565b500490565b818103818111156101cf576101cf610850565b5f826108c4576108c461087c565b500690565b808201808211156101cf576101cf610850565b634e487b7160e01b5f52603260045260245ffd5b5f816108fe576108fe610850565b505f190190565b5f81518060208401855e5f93019283525090919050565b694f626a6563745479706560b01b81525f61073c600a830184610905565b5f61096061095a61095461094e858a610905565b88610905565b86610905565b84610905565b969550505050505056fea26469706673582212201014d0ed11953f26d0a32f7d60fa24f9d151e604b66783f2de9f85b5f5ae86b964736f6c634300081a0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100b1575f3560e01c80637adad14f116100795780637adad14f14610138578063ac43d83414610152578063ae574a3c14610183578063b2466acf14610196578063bc1b392d146101ac578063f7fa7a7c146101b2575f80fd5b80632c2f8a67146100b55780636401f182146100dd5780636900a3ae146100f25780636ecac6e8146101125780636f91962014610123575b5f80fd5b6100c86100c33660046106a6565b6101c5565b60405190151581526020015b60405180910390f35b60635b60405160ff90911681526020016100d4565b6101056101003660046106d7565b6101d5565b6040516100d491906106ee565b6100e06101203660046106d7565b90565b6100c8610131366004610723565b60ff161590565b6100c86101463660046106a6565b60ff9081169116141590565b610166610160366004610723565b60ff1690565b6040516bffffffffffffffffffffffff90911681526020016100d4565b610105610191366004610723565b6102f3565b6100c86101a4366004610723565b60ff16151590565b5f6100e0565b6101056101c03660046107e2565b6105f1565b60ff828116908216145b92915050565b6060815f036101fb5750506040805180820190915260018152600360fc1b602082015290565b815f5b8115610224578061020e81610864565b915061021d9050600a83610890565b91506101fe565b5f8167ffffffffffffffff81111561023e5761023e610743565b6040519080825280601f01601f191660200182016040528015610268576020820181803683370190505b5090505f6102776001846108a3565b90508593505b83156102ea5761028e600a856108b6565b6102999060306108c9565b60f81b8282815181106102ae576102ae6108dc565b60200101906001600160f81b03191690815f1a9053506102cf600a85610890565b935080156102e557806102e1816108f0565b9150505b61027d565b50949350505050565b60606103008260026101c5565b15610329575050604080518082019091526008815267526567697374727960c01b602082015290565b6103348260036101c5565b1561035c5750506040805180820190915260078152665374616b696e6760c81b602082015290565b61036782600a6101c5565b15610390575050604080518082019091526008815267496e7374616e636560c01b602082015290565b61039b82600b6101c5565b156103c557505060408051808201909152600981526810dbdb5c1bdb995b9d60ba1b602082015290565b6103d082600c6101c5565b156103f8575050604080518082019091526007815266141c9bd91d58dd60ca1b602082015290565b61040382600d6101c5565b1561042a5750506040805180820190915260068152654f7261636c6560d01b602082015290565b61043582600e6101c5565b1561046257505060408051808201909152600c81526b2234b9ba3934b13aba34b7b760a11b602082015290565b61046d82600f6101c5565b15610492575050604080518082019091526004815263141bdbdb60e21b602082015290565b61049d8260146101c5565b156104c957505060408051808201909152600b81526a20b8383634b1b0ba34b7b760a91b602082015290565b6104d48260156101c5565b156104fb575050604080518082019091526006815265506f6c69637960d01b602082015290565b6105068260176101c5565b1561052c575050604080518082019091526005815264436c61696d60d81b602082015290565b61053782601a6101c5565b1561055d575050604080518082019091526005815264507269636560d81b602082015290565b61056882601f6101c5565b1561058f57505060408051808201909152600681526542756e646c6560d01b602082015290565b61059a8260196101c5565b156105bf5750506040805180820190915260048152635269736b60e01b602082015290565b6105cb60ff83166101d5565b6040516020016105db919061091c565b6040516020818303038152906040529050919050565b6060606382111561061c57604051631f535f3160e11b81526004810183905260240160405180910390fd5b60408051808201909152600381526205f76360ec1b6020820152600a831061065957506040805180820190915260028152612fbb60f11b60208201525b848482610665866101d5565b604051602001610678949392919061093a565b6040516020818303038152906040529150509392505050565b803560ff811681146106a1575f80fd5b919050565b5f80604083850312156106b7575f80fd5b6106c083610691565b91506106ce60208401610691565b90509250929050565b5f602082840312156106e7575f80fd5b5035919050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b5f60208284031215610733575f80fd5b61073c82610691565b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f82601f830112610766575f80fd5b813567ffffffffffffffff81111561078057610780610743565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156107af576107af610743565b6040528181528382016020018510156107c6575f80fd5b816020850160208301375f918101602001919091529392505050565b5f805f606084860312156107f4575f80fd5b833567ffffffffffffffff81111561080a575f80fd5b61081686828701610757565b935050602084013567ffffffffffffffff811115610832575f80fd5b61083e86828701610757565b93969395505050506040919091013590565b634e487b7160e01b5f52601160045260245ffd5b5f6001820161087557610875610850565b5060010190565b634e487b7160e01b5f52601260045260245ffd5b5f8261089e5761089e61087c565b500490565b818103818111156101cf576101cf610850565b5f826108c4576108c461087c565b500690565b808201808211156101cf576101cf610850565b634e487b7160e01b5f52603260045260245ffd5b5f816108fe576108fe610850565b505f190190565b5f81518060208401855e5f93019283525090919050565b694f626a6563745479706560b01b81525f61073c600a830184610905565b5f61096061095a61095461094e858a610905565b88610905565b86610905565b84610905565b969550505050505056fea26469706673582212201014d0ed11953f26d0a32f7d60fa24f9d151e604b66783f2de9f85b5f5ae86b964736f6c634300081a0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.json

@@ -8,7 +8,7 @@
         {
           "internalType": "PayoutId",
           "name": "a",
-          "type": "uint24"
+          "type": "uint40"
         }
       ],
       "name": "eqz",
@@ -27,7 +27,7 @@
         {
           "internalType": "PayoutId",
           "name": "a",
-          "type": "uint24"
+          "type": "uint40"
         }
       ],
       "name": "gtz",
@@ -46,7 +46,7 @@
         {
           "internalType": "PayoutId",
           "name": "payoutId",
-          "type": "uint24"
+          "type": "uint40"
         }
       ],
       "name": "toClaimId",
@@ -65,15 +65,15 @@
         {
           "internalType": "PayoutId",
           "name": "a",
-          "type": "uint24"
+          "type": "uint40"
         }
       ],
       "name": "toInt",
       "outputs": [
         {
-          "internalType": "uint24",
+          "internalType": "uint40",
           "name": "",
-          "type": "uint24"
+          "type": "uint40"
         }
       ],
       "stateMutability": "pure",
@@ -84,7 +84,7 @@
         {
           "internalType": "PayoutId",
           "name": "payoutId",
-          "type": "uint24"
+          "type": "uint40"
         },
         {
           "internalType": "NftId",
@@ -108,7 +108,7 @@
         {
           "internalType": "PayoutId",
           "name": "payoutId",
-          "type": "uint24"
+          "type": "uint40"
         },
         {
           "internalType": "NftId",
@@ -135,9 +135,9 @@
           "type": "uint16"
         },
         {
-          "internalType": "uint8",
+          "internalType": "uint24",
           "name": "payoutNo",
-          "type": "uint8"
+          "type": "uint24"
         }
       ],
       "name": "toPayoutId",
@@ -145,7 +145,7 @@
         {
           "internalType": "PayoutId",
           "name": "",
-          "type": "uint24"
+          "type": "uint40"
         }
       ],
       "stateMutability": "pure",
@@ -156,15 +156,15 @@
         {
           "internalType": "PayoutId",
           "name": "payoutId",
-          "type": "uint24"
+          "type": "uint40"
         }
       ],
       "name": "toPayoutNo",
       "outputs": [
         {
-          "internalType": "uint8",
+          "internalType": "uint24",
           "name": "",
-          "type": "uint8"
+          "type": "uint24"
         }
       ],
       "stateMutability": "pure",
@@ -177,21 +177,21 @@
         {
           "internalType": "PayoutId",
           "name": "",
-          "type": "uint24"
+          "type": "uint40"
         }
       ],
       "stateMutability": "pure",
       "type": "function"
     }
   ],
-  "bytecode": "0x610401610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c8063691d05ec1161006e578063691d05ec146101385780637d464fd41461014f578063bc1b392d14610175578063d5b5ee5d1461017b578063de5f11a21461018e575f80fd5b806302985c611461009f578063455d3483146100cc57806355601007146100f25780635927341114610117575b5f80fd5b6100b76100ad3660046102d7565b62ffffff16151590565b60405190151581526020015b60405180910390f35b6100df6100da3660046102f0565b6101b9565b60405160ff1990911681526020016100c3565b6101036101003660046102d7565b90565b60405162ffffff90911681526020016100c3565b61012a6101253660046102f0565b610207565b6040519081526020016100c3565b6100b76101463660046102d7565b62ffffff161590565b61016361015d3660046102d7565b60ff1690565b60405160ff90911681526020016100c3565b5f610103565b610103610189366004610330565b61029e565b6101a661019c3660046102d7565b60081c61ffff1690565b60405161ffff90911681526020016100c3565b5f6101de62ffffff84166effffffffffffffffffffffff000000601885901b1661037b565b6001600160601b031660881b70ffffffffffffffffffffffffffffffffff191690505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601761022e86866101b9565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610273573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610297919061039a565b9392505050565b5f6102b560ff831662ffff00600886901b166103b1565b61ffff169392505050565b803562ffffff811681146102d2575f80fd5b919050565b5f602082840312156102e7575f80fd5b610297826102c0565b5f8060408385031215610301575f80fd5b61030a836102c0565b915060208301356001600160601b0381168114610325575f80fd5b809150509250929050565b5f8060408385031215610341575f80fd5b823561ffff81168114610352575f80fd5b9150602083013560ff81168114610325575f80fd5b634e487b7160e01b5f52601160045260245ffd5b6001600160601b03818116838216019081111561020157610201610367565b5f602082840312156103aa575f80fd5b5051919050565b61ffff81811683821601908111156102015761020161036756fea264697066735822122014e04bfb1d0000bcda02d95ff89eea0c5c7b888e278698bdd8d9fc536136d2b364736f6c634300081a0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c8063691d05ec1161006e578063691d05ec146101385780637d464fd41461014f578063bc1b392d14610175578063d5b5ee5d1461017b578063de5f11a21461018e575f80fd5b806302985c611461009f578063455d3483146100cc57806355601007146100f25780635927341114610117575b5f80fd5b6100b76100ad3660046102d7565b62ffffff16151590565b60405190151581526020015b60405180910390f35b6100df6100da3660046102f0565b6101b9565b60405160ff1990911681526020016100c3565b6101036101003660046102d7565b90565b60405162ffffff90911681526020016100c3565b61012a6101253660046102f0565b610207565b6040519081526020016100c3565b6100b76101463660046102d7565b62ffffff161590565b61016361015d3660046102d7565b60ff1690565b60405160ff90911681526020016100c3565b5f610103565b610103610189366004610330565b61029e565b6101a661019c3660046102d7565b60081c61ffff1690565b60405161ffff90911681526020016100c3565b5f6101de62ffffff84166effffffffffffffffffffffff000000601885901b1661037b565b6001600160601b031660881b70ffffffffffffffffffffffffffffffffff191690505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601761022e86866101b9565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610273573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610297919061039a565b9392505050565b5f6102b560ff831662ffff00600886901b166103b1565b61ffff169392505050565b803562ffffff811681146102d2575f80fd5b919050565b5f602082840312156102e7575f80fd5b610297826102c0565b5f8060408385031215610301575f80fd5b61030a836102c0565b915060208301356001600160601b0381168114610325575f80fd5b809150509250929050565b5f8060408385031215610341575f80fd5b823561ffff81168114610352575f80fd5b9150602083013560ff81168114610325575f80fd5b634e487b7160e01b5f52601160045260245ffd5b6001600160601b03818116838216019081111561020157610201610367565b5f602082840312156103aa575f80fd5b5051919050565b61ffff81811683821601908111156102015761020161036756fea264697066735822122014e04bfb1d0000bcda02d95ff89eea0c5c7b888e278698bdd8d9fc536136d2b364736f6c634300081a0033",
+  "bytecode": "0x61040d610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c80638d38cd4b1161006e5780638d38cd4b1461014b578063a19edd6414610165578063bc1b392d14610186578063d00780a51461018c578063da09d484146101b2575f80fd5b80635207d68b1461009f57806353d0479c146100cf57806359fad7ca146100f9578063790a38ad14610122575b5f80fd5b6100b76100ad3660046102d4565b60181c61ffff1690565b60405161ffff90911681526020015b60405180910390f35b6100e56100dd3660046102d4565b62ffffff1690565b60405162ffffff90911681526020016100c6565b61010c6101073660046102ed565b6101c3565b60405164ffffffffff90911681526020016100c6565b61013b6101303660046102d4565b64ffffffffff161590565b60405190151581526020016100c6565b61013b6101593660046102d4565b64ffffffffff16151590565b610178610173366004610331565b6101e7565b6040519081526020016100c6565b5f61010c565b61019f61019a366004610331565b610277565b60405160ff1990911681526020016100c6565b61010c6101c03660046102d4565b90565b5f6101de62ffffff831664ffff000000601886901b1661037f565b90505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601861020e8686610277565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610253573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101de919061039c565b5f6102a064ffffffffff841670ffffffffffffffffffffffff0000000000602885901b166103b3565b60881b6bffffffffffffffffffffffff60881b169392505050565b803564ffffffffff811681146102cf575f80fd5b919050565b5f602082840312156102e4575f80fd5b6101de826102bb565b5f80604083850312156102fe575f80fd5b823561ffff8116811461030f575f80fd5b9150602083013562ffffff81168114610326575f80fd5b809150509250929050565b5f8060408385031215610342575f80fd5b61034b836102bb565b915060208301356bffffffffffffffffffffffff81168114610326575f80fd5b634e487b7160e01b5f52601160045260245ffd5b64ffffffffff81811683821601908111156101e1576101e161036b565b5f602082840312156103ac575f80fd5b5051919050565b6bffffffffffffffffffffffff81811683821601908111156101e1576101e161036b56fea2646970667358221220d6a1d1d7028614c766da7891283db3ba3b1b20026277f58d6e21d5682900350464736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c80638d38cd4b1161006e5780638d38cd4b1461014b578063a19edd6414610165578063bc1b392d14610186578063d00780a51461018c578063da09d484146101b2575f80fd5b80635207d68b1461009f57806353d0479c146100cf57806359fad7ca146100f9578063790a38ad14610122575b5f80fd5b6100b76100ad3660046102d4565b60181c61ffff1690565b60405161ffff90911681526020015b60405180910390f35b6100e56100dd3660046102d4565b62ffffff1690565b60405162ffffff90911681526020016100c6565b61010c6101073660046102ed565b6101c3565b60405164ffffffffff90911681526020016100c6565b61013b6101303660046102d4565b64ffffffffff161590565b60405190151581526020016100c6565b61013b6101593660046102d4565b64ffffffffff16151590565b610178610173366004610331565b6101e7565b6040519081526020016100c6565b5f61010c565b61019f61019a366004610331565b610277565b60405160ff1990911681526020016100c6565b61010c6101c03660046102d4565b90565b5f6101de62ffffff831664ffff000000601886901b1661037f565b90505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601861020e8686610277565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610253573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101de919061039c565b5f6102a064ffffffffff841670ffffffffffffffffffffffff0000000000602885901b166103b3565b60881b6bffffffffffffffffffffffff60881b169392505050565b803564ffffffffff811681146102cf575f80fd5b919050565b5f602082840312156102e4575f80fd5b6101de826102bb565b5f80604083850312156102fe575f80fd5b823561ffff8116811461030f575f80fd5b9150602083013562ffffff81168114610326575f80fd5b809150509250929050565b5f8060408385031215610342575f80fd5b61034b836102bb565b915060208301356bffffffffffffffffffffffff81168114610326575f80fd5b634e487b7160e01b5f52601160045260245ffd5b64ffffffffff81811683821601908111156101e1576101e161036b565b5f602082840312156103ac575f80fd5b5051919050565b6bffffffffffffffffffffffff81811683821601908111156101e1576101e161036b56fea2646970667358221220d6a1d1d7028614c766da7891283db3ba3b1b20026277f58d6e21d5682900350464736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [
         {
           "length": 20,
-          "start": 574
+          "start": 542
         }
       ]
     }
@@ -201,7 +201,7 @@
       "Key32Lib": [
         {
           "length": 20,
-          "start": 522
+          "start": 490
         }
       ]
     }

package/artifacts/contracts/type/Referral.sol/ReferralLib.dbg.json

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

package/artifacts/contracts/type/Referral.sol/ReferralLib.json

@@ -117,8 +117,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6103e0610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80632cf96bf91461006f5780633f093cd6146100a257806355ee6275146100ce5780637bc32ecf146100ef578063a420c7871461011f578063bc1b392d14610142575b5f80fd5b61008a61007d366004610211565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100b56100b0366004610253565b610148565b6040516001600160c01b03199091168152602001610099565b6100e16100dc366004610211565b61017a565b604051908152602001610099565b61010f6100fd366004610211565b5f6001600160c01b031982161561020b565b6040519015158152602001610099565b61013061012d366004610329565b90565b60405160ff9091168152602001610099565b5f6100b5565b5f828260405160200161015c929190610349565b60405160208183030381529060405280519060200120905092915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601d6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e7573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061020b9190610393565b92915050565b5f60208284031215610221575f80fd5b81356001600160c01b031981168114610238575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f8060408385031215610264575f80fd5b82356bffffffffffffffffffffffff8116811461027f575f80fd5b9150602083013567ffffffffffffffff81111561029a575f80fd5b8301601f810185136102aa575f80fd5b803567ffffffffffffffff8111156102c4576102c461023f565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156102f3576102f361023f565b60405281815282820160200187101561030a575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f60208284031215610339575f80fd5b813560ff81168114610238575f80fd5b6bffffffffffffffffffffffff83168152604060208201525f82518060408401528060208501606085015e5f606082850101526060601f19601f8301168401019150509392505050565b5f602082840312156103a3575f80fd5b505191905056fea2646970667358221220c767affb37b06ea14a0869186bef6fe1272ab4fabc3aa4455b51b267c2edd7cb64736f6c634300081a0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80632cf96bf91461006f5780633f093cd6146100a257806355ee6275146100ce5780637bc32ecf146100ef578063a420c7871461011f578063bc1b392d14610142575b5f80fd5b61008a61007d366004610211565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100b56100b0366004610253565b610148565b6040516001600160c01b03199091168152602001610099565b6100e16100dc366004610211565b61017a565b604051908152602001610099565b61010f6100fd366004610211565b5f6001600160c01b031982161561020b565b6040519015158152602001610099565b61013061012d366004610329565b90565b60405160ff9091168152602001610099565b5f6100b5565b5f828260405160200161015c929190610349565b60405160208183030381529060405280519060200120905092915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601d6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e7573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061020b9190610393565b92915050565b5f60208284031215610221575f80fd5b81356001600160c01b031981168114610238575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f8060408385031215610264575f80fd5b82356bffffffffffffffffffffffff8116811461027f575f80fd5b9150602083013567ffffffffffffffff81111561029a575f80fd5b8301601f810185136102aa575f80fd5b803567ffffffffffffffff8111156102c4576102c461023f565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156102f3576102f361023f565b60405281815282820160200187101561030a575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f60208284031215610339575f80fd5b813560ff81168114610238575f80fd5b6bffffffffffffffffffffffff83168152604060208201525f82518060408401528060208501606085015e5f606082850101526060601f19601f8301168401019150509392505050565b5f602082840312156103a3575f80fd5b505191905056fea2646970667358221220c767affb37b06ea14a0869186bef6fe1272ab4fabc3aa4455b51b267c2edd7cb64736f6c634300081a0033",
+  "bytecode": "0x6103e0610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80632cf96bf91461006f5780633f093cd6146100a257806355ee6275146100ce5780637bc32ecf146100ef578063a420c7871461011f578063bc1b392d14610142575b5f80fd5b61008a61007d366004610211565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100b56100b0366004610253565b610148565b6040516001600160c01b03199091168152602001610099565b6100e16100dc366004610211565b61017a565b604051908152602001610099565b61010f6100fd366004610211565b5f6001600160c01b031982161561020b565b6040519015158152602001610099565b61013061012d366004610329565b90565b60405160ff9091168152602001610099565b5f6100b5565b5f828260405160200161015c929190610349565b60405160208183030381529060405280519060200120905092915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601e6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e7573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061020b9190610393565b92915050565b5f60208284031215610221575f80fd5b81356001600160c01b031981168114610238575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f8060408385031215610264575f80fd5b82356bffffffffffffffffffffffff8116811461027f575f80fd5b9150602083013567ffffffffffffffff81111561029a575f80fd5b8301601f810185136102aa575f80fd5b803567ffffffffffffffff8111156102c4576102c461023f565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156102f3576102f361023f565b60405281815282820160200187101561030a575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f60208284031215610339575f80fd5b813560ff81168114610238575f80fd5b6bffffffffffffffffffffffff83168152604060208201525f82518060408401528060208501606085015e5f606082850101526060601f19601f8301168401019150509392505050565b5f602082840312156103a3575f80fd5b505191905056fea26469706673582212206681dfbf1f0c11ee7ad369b1621b0ccabe193a1a4b6a990fcdb86628491e2c4e64736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c80632cf96bf91461006f5780633f093cd6146100a257806355ee6275146100ce5780637bc32ecf146100ef578063a420c7871461011f578063bc1b392d14610142575b5f80fd5b61008a61007d366004610211565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100b56100b0366004610253565b610148565b6040516001600160c01b03199091168152602001610099565b6100e16100dc366004610211565b61017a565b604051908152602001610099565b61010f6100fd366004610211565b5f6001600160c01b031982161561020b565b6040519015158152602001610099565b61013061012d366004610329565b90565b60405160ff9091168152602001610099565b5f6100b5565b5f828260405160200161015c929190610349565b60405160208183030381529060405280519060200120905092915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601e6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e7573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061020b9190610393565b92915050565b5f60208284031215610221575f80fd5b81356001600160c01b031981168114610238575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f8060408385031215610264575f80fd5b82356bffffffffffffffffffffffff8116811461027f575f80fd5b9150602083013567ffffffffffffffff81111561029a575f80fd5b8301601f810185136102aa575f80fd5b803567ffffffffffffffff8111156102c4576102c461023f565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156102f3576102f361023f565b60405281815282820160200187101561030a575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f60208284031215610339575f80fd5b813560ff81168114610238575f80fd5b6bffffffffffffffffffffffff83168152604060208201525f82518060408401528060208501606085015e5f606082850101526060601f19601f8301168401019150509392505050565b5f602082840312156103a3575f80fd5b505191905056fea26469706673582212206681dfbf1f0c11ee7ad369b1621b0ccabe193a1a4b6a990fcdb86628491e2c4e64736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [

package/artifacts/contracts/type/RequestId.sol/RequestIdLib.dbg.json

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

package/artifacts/contracts/type/RequestId.sol/RequestIdLib.json

@@ -179,8 +179,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x610334610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c806367cb8ec11161006e57806367cb8ec11461013a578063755905de1461016c578063a42e52e914610196578063bc1b392d146101b3578063f37f38f0146101b9575f80fd5b8063057182b41461009f5780633120ca45146100d05780634894bb5e146100f0578063545ce21c14610111575b5f80fd5b6100bb6100ad36600461027f565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100bb6100de36600461029f565b67ffffffffffffffff90811691161490565b6100bb6100fe36600461029f565b67ffffffffffffffff9081169116141590565b61012c61011f36600461027f565b67ffffffffffffffff1690565b6040519081526020016100c7565b61015961014836600461027f565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100c7565b61017d61017a3660046102d0565b90565b60405167ffffffffffffffff90911681526020016100c7565b6100bb6101a436600461027f565b67ffffffffffffffff16151590565b5f61017d565b61012c6101c736600461027f565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601a600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610239573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061025d91906102e7565b92915050565b803567ffffffffffffffff8116811461027a575f80fd5b919050565b5f6020828403121561028f575f80fd5b61029882610263565b9392505050565b5f80604083850312156102b0575f80fd5b6102b983610263565b91506102c760208401610263565b90509250929050565b5f602082840312156102e0575f80fd5b5035919050565b5f602082840312156102f7575f80fd5b505191905056fea2646970667358221220d239f667f953f4677861e385da3882f73757592caea95586a437734194d7279e64736f6c634300081a0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c806367cb8ec11161006e57806367cb8ec11461013a578063755905de1461016c578063a42e52e914610196578063bc1b392d146101b3578063f37f38f0146101b9575f80fd5b8063057182b41461009f5780633120ca45146100d05780634894bb5e146100f0578063545ce21c14610111575b5f80fd5b6100bb6100ad36600461027f565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100bb6100de36600461029f565b67ffffffffffffffff90811691161490565b6100bb6100fe36600461029f565b67ffffffffffffffff9081169116141590565b61012c61011f36600461027f565b67ffffffffffffffff1690565b6040519081526020016100c7565b61015961014836600461027f565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100c7565b61017d61017a3660046102d0565b90565b60405167ffffffffffffffff90911681526020016100c7565b6100bb6101a436600461027f565b67ffffffffffffffff16151590565b5f61017d565b61012c6101c736600461027f565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601a600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610239573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061025d91906102e7565b92915050565b803567ffffffffffffffff8116811461027a575f80fd5b919050565b5f6020828403121561028f575f80fd5b61029882610263565b9392505050565b5f80604083850312156102b0575f80fd5b6102b983610263565b91506102c760208401610263565b90509250929050565b5f602082840312156102e0575f80fd5b5035919050565b5f602082840312156102f7575f80fd5b505191905056fea2646970667358221220d239f667f953f4677861e385da3882f73757592caea95586a437734194d7279e64736f6c634300081a0033",
+  "bytecode": "0x610334610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c806367cb8ec11161006e57806367cb8ec11461013a578063755905de1461016c578063a42e52e914610196578063bc1b392d146101b3578063f37f38f0146101b9575f80fd5b8063057182b41461009f5780633120ca45146100d05780634894bb5e146100f0578063545ce21c14610111575b5f80fd5b6100bb6100ad36600461027f565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100bb6100de36600461029f565b67ffffffffffffffff90811691161490565b6100bb6100fe36600461029f565b67ffffffffffffffff9081169116141590565b61012c61011f36600461027f565b67ffffffffffffffff1690565b6040519081526020016100c7565b61015961014836600461027f565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100c7565b61017d61017a3660046102d0565b90565b60405167ffffffffffffffff90911681526020016100c7565b6100bb6101a436600461027f565b67ffffffffffffffff16151590565b5f61017d565b61012c6101c736600461027f565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601b600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610239573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061025d91906102e7565b92915050565b803567ffffffffffffffff8116811461027a575f80fd5b919050565b5f6020828403121561028f575f80fd5b61029882610263565b9392505050565b5f80604083850312156102b0575f80fd5b6102b983610263565b91506102c760208401610263565b90509250929050565b5f602082840312156102e0575f80fd5b5035919050565b5f602082840312156102f7575f80fd5b505191905056fea2646970667358221220d4f9623d14c11c1e668e3eb982eded5823545d9a1d5cfd8736703409a2af479864736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c806367cb8ec11161006e57806367cb8ec11461013a578063755905de1461016c578063a42e52e914610196578063bc1b392d146101b3578063f37f38f0146101b9575f80fd5b8063057182b41461009f5780633120ca45146100d05780634894bb5e146100f0578063545ce21c14610111575b5f80fd5b6100bb6100ad36600461027f565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100bb6100de36600461029f565b67ffffffffffffffff90811691161490565b6100bb6100fe36600461029f565b67ffffffffffffffff9081169116141590565b61012c61011f36600461027f565b67ffffffffffffffff1690565b6040519081526020016100c7565b61015961014836600461027f565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100c7565b61017d61017a3660046102d0565b90565b60405167ffffffffffffffff90911681526020016100c7565b6100bb6101a436600461027f565b67ffffffffffffffff16151590565b5f61017d565b61012c6101c736600461027f565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601b600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610239573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061025d91906102e7565b92915050565b803567ffffffffffffffff8116811461027a575f80fd5b919050565b5f6020828403121561028f575f80fd5b61029882610263565b9392505050565b5f80604083850312156102b0575f80fd5b6102b983610263565b91506102c760208401610263565b90509250929050565b5f602082840312156102e0575f80fd5b5035919050565b5f602082840312156102f7575f80fd5b505191905056fea2646970667358221220d4f9623d14c11c1e668e3eb982eded5823545d9a1d5cfd8736703409a2af479864736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [

package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json

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

package/artifacts/contracts/type/RiskId.sol/RiskIdLib.json

@@ -7,7 +7,69 @@
       "inputs": [
         {
           "internalType": "RiskId",
-          "name": "id",
+          "name": "a",
+          "type": "bytes8"
+        },
+        {
+          "internalType": "RiskId",
+          "name": "b",
+          "type": "bytes8"
+        }
+      ],
+      "name": "eq",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "isSame",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "RiskId",
+          "name": "a",
+          "type": "bytes8"
+        }
+      ],
+      "name": "eqz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "isZero",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "RiskId",
+          "name": "riskId",
+          "type": "bytes8"
+        }
+      ],
+      "name": "toInt",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "RiskId",
+          "name": "riskId",
           "type": "bytes8"
         }
       ],
@@ -41,6 +103,25 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "KeyId",
+          "name": "keyId",
+          "type": "bytes31"
+        }
+      ],
+      "name": "toRiskId",
+      "outputs": [
+        {
+          "internalType": "RiskId",
+          "name": "riskId",
+          "type": "bytes8"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -59,16 +140,29 @@
       ],
       "stateMutability": "pure",
       "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "zero",
+      "outputs": [
+        {
+          "internalType": "RiskId",
+          "name": "",
+          "type": "bytes8"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
     }
   ],
-  "bytecode": "0x61030b610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061004a575f3560e01c80632cf96bf91461004e5780634a7485ba1461008157806355ee6275146100ad575b5f80fd5b61006961005c366004610194565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b61009461008f3660046101d6565b6100ce565b6040516001600160c01b03199091168152602001610078565b6100c06100bb366004610194565b6100fd565b604051908152602001610078565b5f816040516020016100e09190610289565b604051602081830303815290604052805190602001209050919050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60186001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561016a573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061018e91906102be565b92915050565b5f602082840312156101a4575f80fd5b81356001600160c01b0319811681146101bb575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f602082840312156101e6575f80fd5b813567ffffffffffffffff8111156101fc575f80fd5b8201601f8101841361020c575f80fd5b803567ffffffffffffffff811115610226576102266101c2565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610255576102556101c2565b60405281815282820160200186101561026c575f80fd5b816020840160208301375f91810160200191909152949350505050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b5f602082840312156102ce575f80fd5b505191905056fea2646970667358221220650f5be30f5fedee0fd1126bf1961a79780faa4042e773734ba0c087c16e3d0564736f6c634300081a0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061004a575f3560e01c80632cf96bf91461004e5780634a7485ba1461008157806355ee6275146100ad575b5f80fd5b61006961005c366004610194565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b61009461008f3660046101d6565b6100ce565b6040516001600160c01b03199091168152602001610078565b6100c06100bb366004610194565b6100fd565b604051908152602001610078565b5f816040516020016100e09190610289565b604051602081830303815290604052805190602001209050919050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60186001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561016a573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061018e91906102be565b92915050565b5f602082840312156101a4575f80fd5b81356001600160c01b0319811681146101bb575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f602082840312156101e6575f80fd5b813567ffffffffffffffff8111156101fc575f80fd5b8201601f8101841361020c575f80fd5b803567ffffffffffffffff811115610226576102266101c2565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610255576102556101c2565b60405281815282820160200186101561026c575f80fd5b816020840160208301375f91810160200191909152949350505050565b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b5f602082840312156102ce575f80fd5b505191905056fea2646970667358221220650f5be30f5fedee0fd1126bf1961a79780faa4042e773734ba0c087c16e3d0564736f6c634300081a0033",
+  "bytecode": "0x610469610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610090575f3560e01c806370a021ec1161006357806370a021ec146101275780637bc32ecf1461014a5780638b0d9ff01461016a578063bc1b392d1461017e575f80fd5b806301809eea146100945780632cf96bf9146100c55780634a7485ba146100f357806355ee627514610106575b5f80fd5b6100a76100a236600461028a565b610184565b6040516001600160c01b031990911681526020015b60405180910390f35b6100e06100d33660046102c2565b6001600160c01b03191690565b60405160ff1990911681526020016100bc565b6100a76101013660046102ef565b6101ab565b6101196101143660046102c2565b6101da565b6040519081526020016100bc565b61013a6101353660046103a2565b610271565b60405190151581526020016100bc565b61013a6101583660046102c2565b5f6001600160c01b031982161561026b565b6101196101783660046102c2565b60c01c90565b5f6100a7565b80680100000000000000006101998260c01c90565b106101a6576101a66103d3565b919050565b5f816040516020016101bd91906103e7565b604051602081830303815290604052805190602001209050919050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60196001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610247573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061026b919061041c565b92915050565b5f6001600160c01b0319808416908316145b9392505050565b5f6020828403121561029a575f80fd5b813560ff1981168114610283575f80fd5b80356001600160c01b0319811681146101a6575f80fd5b5f602082840312156102d2575f80fd5b610283826102ab565b634e487b7160e01b5f52604160045260245ffd5b5f602082840312156102ff575f80fd5b813567ffffffffffffffff811115610315575f80fd5b8201601f81018413610325575f80fd5b803567ffffffffffffffff81111561033f5761033f6102db565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561036e5761036e6102db565b604052818152828201602001861015610385575f80fd5b816020840160208301375f91810160200191909152949350505050565b5f80604083850312156103b3575f80fd5b6103bc836102ab565b91506103ca602084016102ab565b90509250929050565b634e487b7160e01b5f52600160045260245ffd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b5f6020828403121561042c575f80fd5b505191905056fea2646970667358221220dd6d651a9aa3faf4ed5fc923b73100c85ea29b1616130ed09f5b6be60de5fdba64736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610090575f3560e01c806370a021ec1161006357806370a021ec146101275780637bc32ecf1461014a5780638b0d9ff01461016a578063bc1b392d1461017e575f80fd5b806301809eea146100945780632cf96bf9146100c55780634a7485ba146100f357806355ee627514610106575b5f80fd5b6100a76100a236600461028a565b610184565b6040516001600160c01b031990911681526020015b60405180910390f35b6100e06100d33660046102c2565b6001600160c01b03191690565b60405160ff1990911681526020016100bc565b6100a76101013660046102ef565b6101ab565b6101196101143660046102c2565b6101da565b6040519081526020016100bc565b61013a6101353660046103a2565b610271565b60405190151581526020016100bc565b61013a6101583660046102c2565b5f6001600160c01b031982161561026b565b6101196101783660046102c2565b60c01c90565b5f6100a7565b80680100000000000000006101998260c01c90565b106101a6576101a66103d3565b919050565b5f816040516020016101bd91906103e7565b604051602081830303815290604052805190602001209050919050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60196001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610247573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061026b919061041c565b92915050565b5f6001600160c01b0319808416908316145b9392505050565b5f6020828403121561029a575f80fd5b813560ff1981168114610283575f80fd5b80356001600160c01b0319811681146101a6575f80fd5b5f602082840312156102d2575f80fd5b610283826102ab565b634e487b7160e01b5f52604160045260245ffd5b5f602082840312156102ff575f80fd5b813567ffffffffffffffff811115610315575f80fd5b8201601f81018413610325575f80fd5b803567ffffffffffffffff81111561033f5761033f6102db565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561036e5761036e6102db565b604052818152828201602001861015610385575f80fd5b816020840160208301375f91810160200191909152949350505050565b5f80604083850312156103b3575f80fd5b6103bc836102ab565b91506103ca602084016102ab565b90509250929050565b634e487b7160e01b5f52600160045260245ffd5b602081525f82518060208401528060208501604085015e5f604082850101526040601f19601f83011684010191505092915050565b5f6020828403121561042c575f80fd5b505191905056fea2646970667358221220dd6d651a9aa3faf4ed5fc923b73100c85ea29b1616130ed09f5b6be60de5fdba64736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [
         {
           "length": 20,
-          "start": 308
+          "start": 529
         }
       ]
     }
@@ -78,7 +172,7 @@
       "Key32Lib": [
         {
           "length": 20,
-          "start": 256
+          "start": 477
         }
       ]
     }

package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json

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