@etherisc/gif-next 0.0.2-ff282a4-523 → 0.0.2-ffa91a6-022

package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.json

@@ -3,8 +3,8 @@
   "contractName": "LibAddressSet",
   "sourceName": "contracts/type/AddressSet.sol",
   "abi": [],
-  "bytecode": "0x61042c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806360a174941461007157806361f54352146100a65780638f78eb28146100d55780639fc5d958146100f5578063b06b9b8c14610115578063c01a867914610128575b600080fd5b81801561007d57600080fd5b5061009161008c366004610332565b610153565b60405190151581526020015b60405180910390f35b6100916100b4366004610332565b6001600160a01b031660009081526001919091016020526040902054151590565b6100e76100e336600461036e565b5490565b60405190815260200161009d565b81801561010157600080fd5b50610091610110366004610332565b61028b565b61009161012336600461036e565b541590565b61013b610136366004610387565b6102ff565b6040516001600160a01b03909116815260200161009d565b6001600160a01b0381166000908152600183016020526040812054801561027f5760006101816001836103a9565b8554909150600090610195906001906103a9565b90508181146102215760008660000182815481106101b5576101b56103ca565b60009182526020909120015487546001600160a01b03909116915081908890859081106101e4576101e46103ca565b600091825260208083209190910180546001600160a01b0319166001600160a01b0394851617905592909116815260018801909152604090208390555b8554869080610232576102326103e0565b60008281526020808220830160001990810180546001600160a01b03191690559092019092556001600160a01b038716825260018881019091526040822091909155935061028592505050565b60009150505b92915050565b6001600160a01b038116600090815260018301602052604081205481036102f757508154600180820184556000848152602080822090930180546001600160a01b0319166001600160a01b03861690811790915585549082528286019093526040902091909155610285565b506000610285565b6000826000018281548110610316576103166103ca565b6000918252602090912001546001600160a01b03169392505050565b6000806040838503121561034557600080fd5b8235915060208301356001600160a01b038116811461036357600080fd5b809150509250929050565b60006020828403121561038057600080fd5b5035919050565b6000806040838503121561039a57600080fd5b50508035926020909101359150565b8181038181111561028557634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea26469706673582212203bc8da38d0d370b4b340f201ae7d654fecc8ae75a4001a87929542d68f8039cf64736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806360a174941461007157806361f54352146100a65780638f78eb28146100d55780639fc5d958146100f5578063b06b9b8c14610115578063c01a867914610128575b600080fd5b81801561007d57600080fd5b5061009161008c366004610332565b610153565b60405190151581526020015b60405180910390f35b6100916100b4366004610332565b6001600160a01b031660009081526001919091016020526040902054151590565b6100e76100e336600461036e565b5490565b60405190815260200161009d565b81801561010157600080fd5b50610091610110366004610332565b61028b565b61009161012336600461036e565b541590565b61013b610136366004610387565b6102ff565b6040516001600160a01b03909116815260200161009d565b6001600160a01b0381166000908152600183016020526040812054801561027f5760006101816001836103a9565b8554909150600090610195906001906103a9565b90508181146102215760008660000182815481106101b5576101b56103ca565b60009182526020909120015487546001600160a01b03909116915081908890859081106101e4576101e46103ca565b600091825260208083209190910180546001600160a01b0319166001600160a01b0394851617905592909116815260018801909152604090208390555b8554869080610232576102326103e0565b60008281526020808220830160001990810180546001600160a01b03191690559092019092556001600160a01b038716825260018881019091526040822091909155935061028592505050565b60009150505b92915050565b6001600160a01b038116600090815260018301602052604081205481036102f757508154600180820184556000848152602080822090930180546001600160a01b0319166001600160a01b03861690811790915585549082528286019093526040902091909155610285565b506000610285565b6000826000018281548110610316576103166103ca565b6000918252602090912001546001600160a01b03169392505050565b6000806040838503121561034557600080fd5b8235915060208301356001600160a01b038116811461036357600080fd5b809150509250929050565b60006020828403121561038057600080fd5b5035919050565b6000806040838503121561039a57600080fd5b50508035926020909101359150565b8181038181111561028557634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea26469706673582212203bc8da38d0d370b4b340f201ae7d654fecc8ae75a4001a87929542d68f8039cf64736f6c63430008140033",
+  "bytecode": "0x61040a610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c806360a174941461006f57806361f54352146100a35780638f78eb28146100d15780639fc5d958146100f1578063b06b9b8c14610110578063c01a867914610123575b5f80fd5b81801561007a575f80fd5b5061008e61008936600461031d565b61014e565b60405190151581526020015b60405180910390f35b61008e6100b136600461031d565b6001600160a01b03165f9081526001919091016020526040902054151590565b6100e36100df366004610356565b5490565b60405190815260200161009a565b8180156100fc575f80fd5b5061008e61010b36600461031d565b61027c565b61008e61011e366004610356565b541590565b61013661013136600461036d565b6102ed565b6040516001600160a01b03909116815260200161009a565b6001600160a01b0381165f9081526001830160205260408120548015610271575f61017a60018361038d565b85549091505f9061018d9060019061038d565b9050818114610215575f865f0182815481106101ab576101ab6103ac565b5f9182526020909120015487546001600160a01b03909116915081908890859081106101d9576101d96103ac565b5f91825260208083209190910180546001600160a01b0319166001600160a01b0394851617905592909116815260018801909152604090208390555b8554869080610226576102266103c0565b5f828152602080822083015f1990810180546001600160a01b03191690559092019092556001600160a01b038716825260018881019091526040822091909155935061027692505050565b5f9150505b92915050565b6001600160a01b0381165f90815260018301602052604081205481036102e657508154600180820184555f848152602080822090930180546001600160a01b0319166001600160a01b03861690811790915585549082528286019093526040902091909155610276565b505f610276565b5f825f018281548110610302576103026103ac565b5f918252602090912001546001600160a01b03169392505050565b5f806040838503121561032e575f80fd5b8235915060208301356001600160a01b038116811461034b575f80fd5b809150509250929050565b5f60208284031215610366575f80fd5b5035919050565b5f806040838503121561037e575f80fd5b50508035926020909101359150565b8181038181111561027657634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea2646970667358221220b7831f60b62ede306b6d39ce2ad683f89c6c1760dee80baac4668bf34861717f64736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006b575f3560e01c806360a174941461006f57806361f54352146100a35780638f78eb28146100d15780639fc5d958146100f1578063b06b9b8c14610110578063c01a867914610123575b5f80fd5b81801561007a575f80fd5b5061008e61008936600461031d565b61014e565b60405190151581526020015b60405180910390f35b61008e6100b136600461031d565b6001600160a01b03165f9081526001919091016020526040902054151590565b6100e36100df366004610356565b5490565b60405190815260200161009a565b8180156100fc575f80fd5b5061008e61010b36600461031d565b61027c565b61008e61011e366004610356565b541590565b61013661013136600461036d565b6102ed565b6040516001600160a01b03909116815260200161009a565b6001600160a01b0381165f9081526001830160205260408120548015610271575f61017a60018361038d565b85549091505f9061018d9060019061038d565b9050818114610215575f865f0182815481106101ab576101ab6103ac565b5f9182526020909120015487546001600160a01b03909116915081908890859081106101d9576101d96103ac565b5f91825260208083209190910180546001600160a01b0319166001600160a01b0394851617905592909116815260018801909152604090208390555b8554869080610226576102266103c0565b5f828152602080822083015f1990810180546001600160a01b03191690559092019092556001600160a01b038716825260018881019091526040822091909155935061027692505050565b5f9150505b92915050565b6001600160a01b0381165f90815260018301602052604081205481036102e657508154600180820184555f848152602080822090930180546001600160a01b0319166001600160a01b03861690811790915585549082528286019093526040902091909155610276565b505f610276565b5f825f018281548110610302576103026103ac565b5f918252602090912001546001600160a01b03169392505050565b5f806040838503121561032e575f80fd5b8235915060208301356001600160a01b038116811461034b575f80fd5b809150509250929050565b5f60208284031215610366575f80fd5b5035919050565b5f806040838503121561037e575f80fd5b50508035926020909101359150565b8181038181111561027657634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52603260045260245ffd5b634e487b7160e01b5f52603160045260245ffdfea2646970667358221220b7831f60b62ede306b6d39ce2ad683f89c6c1760dee80baac4668bf34861717f64736f6c634300081a0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json

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

package/artifacts/contracts/type/Amount.sol/AmountLib.json

@@ -14,6 +14,11 @@
       "name": "ErrorAmountLibValueTooBig",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "MathOverflowedMulDiv",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -105,6 +110,30 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "a1",
+          "type": "uint96"
+        },
+        {
+          "internalType": "Amount",
+          "name": "a2",
+          "type": "uint96"
+        }
+      ],
+      "name": "gte",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -148,6 +177,30 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "a1",
+          "type": "uint96"
+        },
+        {
+          "internalType": "Amount",
+          "name": "a2",
+          "type": "uint96"
+        }
+      ],
+      "name": "lte",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "max",
@@ -161,6 +214,54 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "a1",
+          "type": "uint96"
+        },
+        {
+          "internalType": "Amount",
+          "name": "a2",
+          "type": "uint96"
+        }
+      ],
+      "name": "min",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
+        },
+        {
+          "internalType": "UFixed",
+          "name": "factor",
+          "type": "uint256"
+        }
+      ],
+      "name": "multiplyWith",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -256,14 +357,22 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61041461003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c806355205f0f1161007b57806355205f0f146101945780636ac5db19146101a757806398058c4c146101b4578063bc1b392d146101d3578063c4cade9d146101da578063c79eaa22146101f957600080fd5b806308dc895e146100c357806309a81d62146100f0578063274acb351461011f57806330b8415f1461014a5780634c41dd961461016657806352694ee814610179575b600080fd5b6100dd6100d1366004610301565b6001600160601b031690565b6040519081526020015b60405180910390f35b61010f6100fe36600461031c565b6001600160601b0390811691161090565b60405190151581526020016100e7565b61013261012d36600461031c565b61020c565b6040516001600160601b0390911681526020016100e7565b61010f610158366004610301565b6001600160601b0316151590565b61013261017436600461034f565b61021f565b61010f610187366004610301565b6001600160601b03161590565b6100dd6101a2366004610301565b610254565b6001600160601b03610132565b61010f6101c236600461031c565b6001600160601b0390811691161190565b6000610132565b61010f6101e836600461031c565b6001600160601b0390811691161490565b61013261020736600461031c565b6102d9565b6000610218828461037e565b9392505050565b60006001600160601b0382111561025057604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b038216600482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156102af573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d391906103a5565b92915050565b600061021882846103be565b80356001600160601b03811681146102fc57600080fd5b919050565b60006020828403121561031357600080fd5b610218826102e5565b6000806040838503121561032f57600080fd5b610338836102e5565b9150610346602084016102e5565b90509250929050565b60006020828403121561036157600080fd5b5035919050565b634e487b7160e01b600052601160045260246000fd5b6001600160601b0381811683821601908082111561039e5761039e610368565b5092915050565b6000602082840312156103b757600080fd5b5051919050565b6001600160601b0382811682821603908082111561039e5761039e61036856fea2646970667358221220db924a2b0939ec3c57f3417afc461f648fc0c756af70f112d7510be9c280e00664736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c806355205f0f1161007b57806355205f0f146101945780636ac5db19146101a757806398058c4c146101b4578063bc1b392d146101d3578063c4cade9d146101da578063c79eaa22146101f957600080fd5b806308dc895e146100c357806309a81d62146100f0578063274acb351461011f57806330b8415f1461014a5780634c41dd961461016657806352694ee814610179575b600080fd5b6100dd6100d1366004610301565b6001600160601b031690565b6040519081526020015b60405180910390f35b61010f6100fe36600461031c565b6001600160601b0390811691161090565b60405190151581526020016100e7565b61013261012d36600461031c565b61020c565b6040516001600160601b0390911681526020016100e7565b61010f610158366004610301565b6001600160601b0316151590565b61013261017436600461034f565b61021f565b61010f610187366004610301565b6001600160601b03161590565b6100dd6101a2366004610301565b610254565b6001600160601b03610132565b61010f6101c236600461031c565b6001600160601b0390811691161190565b6000610132565b61010f6101e836600461031c565b6001600160601b0390811691161490565b61013261020736600461031c565b6102d9565b6000610218828461037e565b9392505050565b60006001600160601b0382111561025057604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b038216600482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156102af573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d391906103a5565b92915050565b600061021882846103be565b80356001600160601b03811681146102fc57600080fd5b919050565b60006020828403121561031357600080fd5b610218826102e5565b6000806040838503121561032f57600080fd5b610338836102e5565b9150610346602084016102e5565b90509250929050565b60006020828403121561036157600080fd5b5035919050565b634e487b7160e01b600052601160045260246000fd5b6001600160601b0381811683821601908082111561039e5761039e610368565b5092915050565b6000602082840312156103b757600080fd5b5051919050565b6001600160601b0382811682821603908082111561039e5761039e61036856fea2646970667358221220db924a2b0939ec3c57f3417afc461f648fc0c756af70f112d7510be9c280e00664736f6c63430008140033",
+  "bytecode": "0x6106da610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610106575f3560e01c806355205f0f1161009e57806398058c4c1161006e57806398058c4c14610255578063bc1b392d14610274578063c4cade9d1461027a578063c79eaa2214610299575f80fd5b806355205f0f1461020f5780635869dfca146102225780636ac5db19146102355780637931c81114610242575f80fd5b8063274acb35116100d9578063274acb351461019a57806330b8415f146101c55780634c41dd96146101e157806352694ee8146101f4575f80fd5b806308dc895e1461010a57806309a81d62146101375780631f227d171461015a578063262b32d21461017a575b5f80fd5b61012461011836600461059e565b6001600160601b031690565b6040519081526020015b60405180910390f35b61014a6101453660046105b7565b6102ac565b604051901515815260200161012e565b61014a6101683660046105b7565b6001600160601b039081169116111590565b61014a6101883660046105b7565b6001600160601b039081169116101590565b6101ad6101a83660046105b7565b6102c2565b6040516001600160601b03909116815260200161012e565b61014a6101d336600461059e565b6001600160601b0316151590565b6101ad6101ef3660046105e8565b6102d4565b61014a61020236600461059e565b6001600160601b03161590565b61012461021d36600461059e565b610308565b6101ad6102303660046105ff565b610384565b6001600160601b036101ad565b6101ad6102503660046105b7565b610482565b61014a6102633660046105b7565b6001600160601b0390811691161190565b5f6101ad565b61014a6102883660046105b7565b6001600160601b0390811691161490565b6101ad6102a73660046105b7565b6104aa565b6001600160601b03808216908316105b92915050565b5f6102cd828461063b565b9392505050565b5f6001600160601b0382111561030457604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b03821660048201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af4158015610360573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102bc919061065a565b6040516322f5db0f60e11b81526001600160601b03831660048201525f906102cd9061040f90849073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156103e6573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061040a919061065a565b6104b5565b604051632255341b60e11b8152600481019190915273__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561045e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101ef919061065a565b5f816001600160601b0316836001600160601b031610156104a45750816102bc565b50919050565b5f6102cd8284610671565b5f6102cd8383670de0b6b3a76400005f838302815f1985870982811083820303915050805f036104f8578382816104ee576104ee610690565b04925050506102cd565b8084116105185760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b80356001600160601b0381168114610599575f80fd5b919050565b5f602082840312156105ae575f80fd5b6102cd82610583565b5f80604083850312156105c8575f80fd5b6105d183610583565b91506105df60208401610583565b90509250929050565b5f602082840312156105f8575f80fd5b5035919050565b5f8060408385031215610610575f80fd5b61061983610583565b946020939093013593505050565b634e487b7160e01b5f52601160045260245ffd5b6001600160601b0381811683821601908111156102bc576102bc610627565b5f6020828403121561066a575f80fd5b5051919050565b6001600160601b0382811682821603908111156102bc576102bc610627565b634e487b7160e01b5f52601260045260245ffdfea26469706673582212209eadc55f303c353ed59af1986eeb0cc861c9582349f7fb14e3746b15c0920bbe64736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610106575f3560e01c806355205f0f1161009e57806398058c4c1161006e57806398058c4c14610255578063bc1b392d14610274578063c4cade9d1461027a578063c79eaa2214610299575f80fd5b806355205f0f1461020f5780635869dfca146102225780636ac5db19146102355780637931c81114610242575f80fd5b8063274acb35116100d9578063274acb351461019a57806330b8415f146101c55780634c41dd96146101e157806352694ee8146101f4575f80fd5b806308dc895e1461010a57806309a81d62146101375780631f227d171461015a578063262b32d21461017a575b5f80fd5b61012461011836600461059e565b6001600160601b031690565b6040519081526020015b60405180910390f35b61014a6101453660046105b7565b6102ac565b604051901515815260200161012e565b61014a6101683660046105b7565b6001600160601b039081169116111590565b61014a6101883660046105b7565b6001600160601b039081169116101590565b6101ad6101a83660046105b7565b6102c2565b6040516001600160601b03909116815260200161012e565b61014a6101d336600461059e565b6001600160601b0316151590565b6101ad6101ef3660046105e8565b6102d4565b61014a61020236600461059e565b6001600160601b03161590565b61012461021d36600461059e565b610308565b6101ad6102303660046105ff565b610384565b6001600160601b036101ad565b6101ad6102503660046105b7565b610482565b61014a6102633660046105b7565b6001600160601b0390811691161190565b5f6101ad565b61014a6102883660046105b7565b6001600160601b0390811691161490565b6101ad6102a73660046105b7565b6104aa565b6001600160601b03808216908316105b92915050565b5f6102cd828461063b565b9392505050565b5f6001600160601b0382111561030457604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b03821660048201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af4158015610360573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102bc919061065a565b6040516322f5db0f60e11b81526001600160601b03831660048201525f906102cd9061040f90849073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156103e6573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061040a919061065a565b6104b5565b604051632255341b60e11b8152600481019190915273__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561045e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101ef919061065a565b5f816001600160601b0316836001600160601b031610156104a45750816102bc565b50919050565b5f6102cd8284610671565b5f6102cd8383670de0b6b3a76400005f838302815f1985870982811083820303915050805f036104f8578382816104ee576104ee610690565b04925050506102cd565b8084116105185760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b80356001600160601b0381168114610599575f80fd5b919050565b5f602082840312156105ae575f80fd5b6102cd82610583565b5f80604083850312156105c8575f80fd5b6105d183610583565b91506105df60208401610583565b90509250929050565b5f602082840312156105f8575f80fd5b5035919050565b5f8060408385031215610610575f80fd5b61061983610583565b946020939093013593505050565b634e487b7160e01b5f52601160045260245ffd5b6001600160601b0381811683821601908111156102bc576102bc610627565b5f6020828403121561066a575f80fd5b5051919050565b6001600160601b0382811682821603908111156102bc576102bc610627565b634e487b7160e01b5f52601260045260245ffdfea26469706673582212209eadc55f303c353ed59af1986eeb0cc861c9582349f7fb14e3746b15c0920bbe64736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/UFixed.sol": {
       "UFixedLib": [
         {
           "length": 20,
-          "start": 687
+          "start": 860
+        },
+        {
+          "length": 20,
+          "start": 994
+        },
+        {
+          "length": 20,
+          "start": 1114
         }
       ]
     }
@@ -273,7 +382,15 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 629
+          "start": 808
+        },
+        {
+          "length": 20,
+          "start": 942
+        },
+        {
+          "length": 20,
+          "start": 1062
         }
       ]
     }

package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.dbg.json

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

package/artifacts/contracts/type/Blocknumber.sol/BlocknumberLib.json

@@ -3,6 +3,19 @@
   "contractName": "BlocknumberLib",
   "sourceName": "contracts/type/Blocknumber.sol",
   "abi": [
+    {
+      "inputs": [],
+      "name": "currentBlocknumber",
+      "outputs": [
+        {
+          "internalType": "Blocknumber",
+          "name": "",
+          "type": "uint32"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -27,6 +40,25 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "Blocknumber",
+          "name": "blocknumber",
+          "type": "uint32"
+        }
+      ],
+      "name": "eqz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -75,6 +107,25 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "Blocknumber",
+          "name": "blocknumber",
+          "type": "uint32"
+        }
+      ],
+      "name": "gtz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -167,8 +218,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61024d61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80636303db59116100655780636303db59146100da5780636effeac4146100ed5780637b4f5d3b14610112578063946428041461012557600080fd5b8063012340281461008c578063559cbd25146100b457806356b0a7d4146100c7575b600080fd5b61009f61009a3660046101c9565b610138565b60405190151581526020015b60405180910390f35b61009f6100c23660046101c9565b61014f565b61009f6100d53660046101c9565b610162565b61009f6100e83660046101c9565b610175565b6101046100fb3660046101fc565b63ffffffff1690565b6040519081526020016100ab565b61009f6101203660046101c9565b610188565b61009f6101333660046101c9565b61019c565b600063ffffffff80831690841610155b9392505050565b600063ffffffff80841690831614610148565b600063ffffffff80831690841611610148565b600063ffffffff80831690841610610148565b600063ffffffff8084169083161415610148565b600063ffffffff8083169084161115610148565b803563ffffffff811681146101c457600080fd5b919050565b600080604083850312156101dc57600080fd5b6101e5836101b0565b91506101f3602084016101b0565b90509250929050565b60006020828403121561020e57600080fd5b610148826101b056fea2646970667358221220686effff04cdef2268ee41b58b083b65e299b6ad6c90c96a03e6987c38fa355264736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80636303db59116100655780636303db59146100da5780636effeac4146100ed5780637b4f5d3b14610112578063946428041461012557600080fd5b8063012340281461008c578063559cbd25146100b457806356b0a7d4146100c7575b600080fd5b61009f61009a3660046101c9565b610138565b60405190151581526020015b60405180910390f35b61009f6100c23660046101c9565b61014f565b61009f6100d53660046101c9565b610162565b61009f6100e83660046101c9565b610175565b6101046100fb3660046101fc565b63ffffffff1690565b6040519081526020016100ab565b61009f6101203660046101c9565b610188565b61009f6101333660046101c9565b61019c565b600063ffffffff80831690841610155b9392505050565b600063ffffffff80841690831614610148565b600063ffffffff80831690841611610148565b600063ffffffff80831690841610610148565b600063ffffffff8084169083161415610148565b600063ffffffff8083169084161115610148565b803563ffffffff811681146101c457600080fd5b919050565b600080604083850312156101dc57600080fd5b6101e5836101b0565b91506101f3602084016101b0565b90509250929050565b60006020828403121561020e57600080fd5b610148826101b056fea2646970667358221220686effff04cdef2268ee41b58b083b65e299b6ad6c90c96a03e6987c38fa355264736f6c63430008140033",
+  "bytecode": "0x6102a5610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100a6575f3560e01c80636effeac41161006e5780636effeac4146101235780637b4f5d3b14610148578063946428041461015b578063d15b58931461016e578063e8b7afe314610187575f80fd5b806301234028146100aa57806342f49ac0146100d2578063559cbd25146100ea57806356b0a7d4146100fd5780636303db5914610110575b5f80fd5b6100bd6100b8366004610225565b61019b565b60405190151581526020015b60405180910390f35b6100bd6100e0366004610256565b63ffffffff161590565b6100bd6100f8366004610225565b6101b1565b6100bd61010b366004610225565b6101c3565b6100bd61011e366004610225565b6101d5565b61013a610131366004610256565b63ffffffff1690565b6040519081526020016100c9565b6100bd610156366004610225565b6101e7565b6100bd610169366004610225565b6101fa565b6100bd61017c366004610256565b63ffffffff16151590565b60405163ffffffff431681526020016100c9565b5f63ffffffff80831690841610155b9392505050565b5f63ffffffff808416908316146101aa565b5f63ffffffff808316908416116101aa565b5f63ffffffff808316908416106101aa565b5f63ffffffff80841690831614156101aa565b5f63ffffffff80831690841611156101aa565b803563ffffffff81168114610220575f80fd5b919050565b5f8060408385031215610236575f80fd5b61023f8361020d565b915061024d6020840161020d565b90509250929050565b5f60208284031215610266575f80fd5b6101aa8261020d56fea264697066735822122060ea6f2b11fbb7ec34feb93272a69d8cd0ca7b2786f2d8f2db4c0dec0c12d53f64736f6c634300081a0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100a6575f3560e01c80636effeac41161006e5780636effeac4146101235780637b4f5d3b14610148578063946428041461015b578063d15b58931461016e578063e8b7afe314610187575f80fd5b806301234028146100aa57806342f49ac0146100d2578063559cbd25146100ea57806356b0a7d4146100fd5780636303db5914610110575b5f80fd5b6100bd6100b8366004610225565b61019b565b60405190151581526020015b60405180910390f35b6100bd6100e0366004610256565b63ffffffff161590565b6100bd6100f8366004610225565b6101b1565b6100bd61010b366004610225565b6101c3565b6100bd61011e366004610225565b6101d5565b61013a610131366004610256565b63ffffffff1690565b6040519081526020016100c9565b6100bd610156366004610225565b6101e7565b6100bd610169366004610225565b6101fa565b6100bd61017c366004610256565b63ffffffff16151590565b60405163ffffffff431681526020016100c9565b5f63ffffffff80831690841610155b9392505050565b5f63ffffffff808416908316146101aa565b5f63ffffffff808316908416116101aa565b5f63ffffffff808316908416106101aa565b5f63ffffffff80841690831614156101aa565b5f63ffffffff80831690841611156101aa565b803563ffffffff81168114610220575f80fd5b919050565b5f8060408385031215610236575f80fd5b61023f8361020d565b915061024d6020840161020d565b90509250929050565b5f60208284031215610266575f80fd5b6101aa8261020d56fea264697066735822122060ea6f2b11fbb7ec34feb93272a69d8cd0ca7b2786f2d8f2db4c0dec0c12d53f64736f6c634300081a0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

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

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

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$__63f48016ce60d46101cf8686610161565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610216573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023a91906102ff565b9392505050565b803561ffff8116811461025357600080fd5b919050565b60006020828403121561026a57600080fd5b61023a82610241565b6000806040838503121561028657600080fd5b61028f83610241565b915060208301356001600160601b03811681146102ab57600080fd5b809150509250929050565b6000602082840312156102c857600080fd5b5035919050565b61ffff8181168382160190808211156102f857634e487b7160e01b600052601160045260246000fd5b5092915050565b60006020828403121561031157600080fd5b505191905056fea2646970667358221220b30e3f289d070926cb218efc88147819156c84cb36824d08dcd38068af606ba264736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c8063b9c6c93011610065578063b9c6c930146100fc578063bc1b392d14610123578063f3ac7cb51461012a578063faac2b221461014057600080fd5b80635d21681c146100975780636ac5db19146100c0578063904da217146100c85780639cc45a36146100ee575b600080fd5b6100a86100a5366004610258565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100a8565b6100db6100d6366004610273565b610161565b60405160ff1990911681526020016100b7565b6100a86100a53660046102b6565b61011361010a366004610258565b61ffff16151590565b60405190151581526020016100b7565b60006100a8565b610113610138366004610258565b61ffff161590565b61015361014e366004610273565b6101a7565b6040519081526020016100b7565b600061016e8360106102cf565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff1916905092915050565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60d46101cf8686610161565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610216573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023a91906102ff565b9392505050565b803561ffff8116811461025357600080fd5b919050565b60006020828403121561026a57600080fd5b61023a82610241565b6000806040838503121561028657600080fd5b61028f83610241565b915060208301356001600160601b03811681146102ab57600080fd5b809150509250929050565b6000602082840312156102c857600080fd5b5035919050565b61ffff8181168382160190808211156102f857634e487b7160e01b600052601160045260246000fd5b5092915050565b60006020828403121561031157600080fd5b505191905056fea2646970667358221220b30e3f289d070926cb218efc88147819156c84cb36824d08dcd38068af606ba264736f6c63430008140033",
+  "bytecode": "0x610389610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c8063b9c6c9301161006e578063b9c6c93014610104578063bc1b392d1461012b578063dfc00be914610131578063f3ac7cb51461014b578063faac2b2214610161575f80fd5b80635d21681c1461009f5780636ac5db19146100c8578063904da217146100d05780639cc45a36146100f6575b5f80fd5b6100b06100ad366004610275565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100b0565b6100e36100de36600461028e565b610182565b60405160ff1990911681526020016100bf565b6100b06100ad3660046102ce565b61011b610112366004610275565b61ffff16151590565b60405190151581526020016100bf565b5f6100b0565b61011b61013f3660046102e5565b61ffff90811691161490565b61011b610159366004610275565b61ffff161590565b61017461016f36600461028e565b6101c8565b6040519081526020016100bf565b5f61018e836010610316565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff191690505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce602d6101ef8686610182565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610234573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610258919061033c565b9392505050565b803561ffff81168114610270575f80fd5b919050565b5f60208284031215610285575f80fd5b6102588261025f565b5f806040838503121561029f575f80fd5b6102a88361025f565b915060208301356001600160601b03811681146102c3575f80fd5b809150509250929050565b5f602082840312156102de575f80fd5b5035919050565b5f80604083850312156102f6575f80fd5b6102ff8361025f565b915061030d6020840161025f565b90509250929050565b61ffff81811683821601908111156101c257634e487b7160e01b5f52601160045260245ffd5b5f6020828403121561034c575f80fd5b505191905056fea26469706673582212204602cf6e0ac09ea3553629dc6875268bea73c507e4e89fcae54c65e8a8da11a164736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c8063b9c6c9301161006e578063b9c6c93014610104578063bc1b392d1461012b578063dfc00be914610131578063f3ac7cb51461014b578063faac2b2214610161575f80fd5b80635d21681c1461009f5780636ac5db19146100c8578063904da217146100d05780639cc45a36146100f6575b5f80fd5b6100b06100ad366004610275565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100b0565b6100e36100de36600461028e565b610182565b60405160ff1990911681526020016100bf565b6100b06100ad3660046102ce565b61011b610112366004610275565b61ffff16151590565b60405190151581526020016100bf565b5f6100b0565b61011b61013f3660046102e5565b61ffff90811691161490565b61011b610159366004610275565b61ffff161590565b61017461016f36600461028e565b6101c8565b6040519081526020016100bf565b5f61018e836010610316565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff191690505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce602d6101ef8686610182565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610234573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610258919061033c565b9392505050565b803561ffff81168114610270575f80fd5b919050565b5f60208284031215610285575f80fd5b6102588261025f565b5f806040838503121561029f575f80fd5b6102a88361025f565b915060208301356001600160601b03811681146102c3575f80fd5b809150509250929050565b5f602082840312156102de575f80fd5b5035919050565b5f80604083850312156102f6575f80fd5b6102ff8361025f565b915061030d6020840161025f565b90509250929050565b61ffff81811683821601908111156101c257634e487b7160e01b5f52601160045260245ffd5b5f6020828403121561034c575f80fd5b505191905056fea26469706673582212204602cf6e0ac09ea3553629dc6875268bea73c507e4e89fcae54c65e8a8da11a164736f6c634300081a0033",
   "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/b46abe232d1056159d3dfcfb5eebfc0f.json"
+  "buildInfo": "../../../build-info/c00682b5fe2a68467165493f5b572122.json"
 }

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

@@ -79,14 +79,14 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61037e61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632cf96bf91461005b57806355ee62751461008e578063578c3039146100af578063bc1b392d146100db575b600080fd5b6100766100693660046101af565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100a161009c3660046101af565b6100e2565b604051908152602001610085565b6100c26100bd3660046101f6565b61017c565b6040516001600160c01b03199091168152602001610085565b60006100c2565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60796001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610152573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017691906102cb565b92915050565b600082826040516020016101919291906102e4565b60405160208183030381529060405280519060200120905092915050565b6000602082840312156101c157600080fd5b81356001600160c01b0319811681146101d957600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561020957600080fd5b82356bffffffffffffffffffffffff8116811461022557600080fd5b9150602083013567ffffffffffffffff8082111561024257600080fd5b818501915085601f83011261025657600080fd5b813581811115610268576102686101e0565b604051601f8201601f19908116603f01168101908382118183101715610290576102906101e0565b816040528281528860208487010111156102a957600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b818110156103265785810183015185820160600152820161030a565b506000606082860101526060601f19601f83011685010192505050939250505056fea2646970667358221220e3f6a1b9e6d8bd19c3162d071c76d20a6cb0975d6c3e5fb8d0dc51bc666a84b464736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632cf96bf91461005b57806355ee62751461008e578063578c3039146100af578063bc1b392d146100db575b600080fd5b6100766100693660046101af565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100a161009c3660046101af565b6100e2565b604051908152602001610085565b6100c26100bd3660046101f6565b61017c565b6040516001600160c01b03199091168152602001610085565b60006100c2565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60796001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610152573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017691906102cb565b92915050565b600082826040516020016101919291906102e4565b60405160208183030381529060405280519060200120905092915050565b6000602082840312156101c157600080fd5b81356001600160c01b0319811681146101d957600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561020957600080fd5b82356bffffffffffffffffffffffff8116811461022557600080fd5b9150602083013567ffffffffffffffff8082111561024257600080fd5b818501915085601f83011261025657600080fd5b813581811115610268576102686101e0565b604051601f8201601f19908116603f01168101908382118183101715610290576102906101e0565b816040528281528860208487010111156102a957600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b818110156103265785810183015185820160600152820161030a565b506000606082860101526060601f19601f83011685010192505050939250505056fea2646970667358221220e3f6a1b9e6d8bd19c3162d071c76d20a6cb0975d6c3e5fb8d0dc51bc666a84b464736f6c63430008140033",
+  "bytecode": "0x610357610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610055575f3560e01c80632cf96bf91461005957806355ee62751461008c578063578c3039146100ad578063bc1b392d146100d9575b5f80fd5b6100746100673660046101a8565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b61009f61009a3660046101a8565b6100df565b604051908152602001610083565b6100c06100bb3660046101ea565b610176565b6040516001600160c01b03199091168152602001610083565b5f6100c0565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60306001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561014c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061017091906102c0565b92915050565b5f828260405160200161018a9291906102d7565b60405160208183030381529060405280519060200120905092915050565b5f602082840312156101b8575f80fd5b81356001600160c01b0319811681146101cf575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156101fb575f80fd5b82356bffffffffffffffffffffffff81168114610216575f80fd5b9150602083013567ffffffffffffffff811115610231575f80fd5b8301601f81018513610241575f80fd5b803567ffffffffffffffff81111561025b5761025b6101d6565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561028a5761028a6101d6565b6040528181528282016020018710156102a1575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f602082840312156102d0575f80fd5b5051919050565b6bffffffffffffffffffffffff83168152604060208201525f82518060408401528060208501606085015e5f606082850101526060601f19601f830116840101915050939250505056fea26469706673582212205d8731a919b3aaccb0bbc488c351449c6c1c9758ea88b9e40881917295874d6764736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610055575f3560e01c80632cf96bf91461005957806355ee62751461008c578063578c3039146100ad578063bc1b392d146100d9575b5f80fd5b6100746100673660046101a8565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b61009f61009a3660046101a8565b6100df565b604051908152602001610083565b6100c06100bb3660046101ea565b610176565b6040516001600160c01b03199091168152602001610083565b5f6100c0565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60306001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561014c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061017091906102c0565b92915050565b5f828260405160200161018a9291906102d7565b60405160208183030381529060405280519060200120905092915050565b5f602082840312156101b8575f80fd5b81356001600160c01b0319811681146101cf575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156101fb575f80fd5b82356bffffffffffffffffffffffff81168114610216575f80fd5b9150602083013567ffffffffffffffff811115610231575f80fd5b8301601f81018513610241575f80fd5b803567ffffffffffffffff81111561025b5761025b6101d6565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561028a5761028a6101d6565b6040528181528282016020018710156102a1575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f602082840312156102d0575f80fd5b5051919050565b6bffffffffffffffffffffffff83168152604060208201525f82518060408401528060208501606085015e5f606082850101526060601f19601f830116840101915050939250505056fea26469706673582212205d8731a919b3aaccb0bbc488c351449c6c1c9758ea88b9e40881917295874d6764736f6c634300081a0033",
   "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/b46abe232d1056159d3dfcfb5eebfc0f.json"
+  "buildInfo": "../../../build-info/c00682b5fe2a68467165493f5b572122.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": [
         {
@@ -60,23 +65,9 @@
             }
           ],
           "internalType": "struct Fee",
-          "name": "fee",
+          "name": "a",
           "type": "tuple"
-        }
-      ],
-      "name": "eqz",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [
+        },
         {
           "components": [
             {
@@ -91,9 +82,23 @@
             }
           ],
           "internalType": "struct Fee",
-          "name": "a",
+          "name": "b",
           "type": "tuple"
-        },
+        }
+      ],
+      "name": "eq",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "isSame",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
         {
           "components": [
             {
@@ -108,15 +113,15 @@
             }
           ],
           "internalType": "struct Fee",
-          "name": "b",
+          "name": "fee",
           "type": "tuple"
         }
       ],
-      "name": "feeIsSame",
+      "name": "eqz",
       "outputs": [
         {
           "internalType": "bool",
-          "name": "isSame",
+          "name": "",
           "type": "bool"
         }
       ],
@@ -223,7 +228,7 @@
     },
     {
       "inputs": [],
-      "name": "zeroFee",
+      "name": "zero",
       "outputs": [
         {
           "components": [
@@ -247,22 +252,22 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6107b561003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c8063952488681161006557806395248868146101085780639ed246ea1461011b578063c7010dfa1461014e578063d0e149f71461018257600080fd5b806305deb8b71461008c5780632bd182d3146100b45780635faa955b146100f5575b600080fd5b61009f61009a36600461062c565b610195565b60405190151581526020015b60405180910390f35b604080518082018252600080825260209182018190528251808401909352808352908201525b604080518251815260209283015192810192909252016100ab565b6100da610103366004610648565b6101b1565b61009f61011636600461066b565b61025a565b61012e6101293660046106b8565b61027b565b604080516001600160601b039384168152929091166020830152016100ab565b6100da61015c3660046106f0565b604080518082018252600080825260209182015281518083019092529281529182015290565b61009f61019036600461062c565b61042f565b80516000901515806101ab575060008260200151115b92915050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af4158015610226573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061024a9190610712565b8152600060209091015292915050565b600081602001518360200151148015610274575082518251145b9392505050565b60008161028784610195565b15610428576040516355205f0f60e01b81526001600160601b03841660048201526000906103169073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156102eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030f9190610712565b8651610446565b6020860151604051632255341b60e11b81526004810183905291925073__$3bac17678db7ae928afa209f2f44deec9c$__91634c41dd96919073__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561038b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103af9190610712565b6103b9919061072b565b6040518263ffffffff1660e01b81526004016103d791815260200190565b602060405180830381865af41580156103f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610418919061074c565b9250610424828461045b565b9150505b9250929050565b6000816020015160001480156101ab575050511590565b60006102748383670de0b6b3a76400006104e2565b6040516363cf551160e11b81526001600160601b0380841660048301528216602482015260009073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa2290604401602060405180830381865af41580156104be573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610274919061074c565b600080806000198587098587029250828110838203039150508060000361051c5783828161051257610512610769565b0492505050610274565b8084116105675760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156105e157600080fd5b6040516040810181811067ffffffffffffffff8211171561061257634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561063e57600080fd5b61027483836105cf565b60006020828403121561065a57600080fd5b813560ff8116811461027457600080fd5b6000806080838503121561067e57600080fd5b61068884846105cf565b915061069784604085016105cf565b90509250929050565b6001600160601b03811681146106b557600080fd5b50565b600080606083850312156106cb57600080fd5b6106d584846105cf565b915060408301356106e5816106a0565b809150509250929050565b6000806040838503121561070357600080fd5b50508035926020909101359150565b60006020828403121561072457600080fd5b5051919050565b808201808211156101ab57634e487b7160e01b600052601160045260246000fd5b60006020828403121561075e57600080fd5b8151610274816106a0565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220f1c63ddb106c59a6988b206abfdd2d360566ae5522dd850c0626b225e16f1be364736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c8063952488681161006557806395248868146101085780639ed246ea1461011b578063c7010dfa1461014e578063d0e149f71461018257600080fd5b806305deb8b71461008c5780632bd182d3146100b45780635faa955b146100f5575b600080fd5b61009f61009a36600461062c565b610195565b60405190151581526020015b60405180910390f35b604080518082018252600080825260209182018190528251808401909352808352908201525b604080518251815260209283015192810192909252016100ab565b6100da610103366004610648565b6101b1565b61009f61011636600461066b565b61025a565b61012e6101293660046106b8565b61027b565b604080516001600160601b039384168152929091166020830152016100ab565b6100da61015c3660046106f0565b604080518082018252600080825260209182015281518083019092529281529182015290565b61009f61019036600461062c565b61042f565b80516000901515806101ab575060008260200151115b92915050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af4158015610226573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061024a9190610712565b8152600060209091015292915050565b600081602001518360200151148015610274575082518251145b9392505050565b60008161028784610195565b15610428576040516355205f0f60e01b81526001600160601b03841660048201526000906103169073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156102eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030f9190610712565b8651610446565b6020860151604051632255341b60e11b81526004810183905291925073__$3bac17678db7ae928afa209f2f44deec9c$__91634c41dd96919073__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561038b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103af9190610712565b6103b9919061072b565b6040518263ffffffff1660e01b81526004016103d791815260200190565b602060405180830381865af41580156103f4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610418919061074c565b9250610424828461045b565b9150505b9250929050565b6000816020015160001480156101ab575050511590565b60006102748383670de0b6b3a76400006104e2565b6040516363cf551160e11b81526001600160601b0380841660048301528216602482015260009073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa2290604401602060405180830381865af41580156104be573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610274919061074c565b600080806000198587098587029250828110838203039150508060000361051c5783828161051257610512610769565b0492505050610274565b8084116105675760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156105e157600080fd5b6040516040810181811067ffffffffffffffff8211171561061257634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561063e57600080fd5b61027483836105cf565b60006020828403121561065a57600080fd5b813560ff8116811461027457600080fd5b6000806080838503121561067e57600080fd5b61068884846105cf565b915061069784604085016105cf565b90509250929050565b6001600160601b03811681146106b557600080fd5b50565b600080606083850312156106cb57600080fd5b6106d584846105cf565b915060408301356106e5816106a0565b809150509250929050565b6000806040838503121561070357600080fd5b50508035926020909101359150565b60006020828403121561072457600080fd5b5051919050565b808201808211156101ab57634e487b7160e01b600052601160045260246000fd5b60006020828403121561075e57600080fd5b8151610274816106a0565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220f1c63ddb106c59a6988b206abfdd2d360566ae5522dd850c0626b225e16f1be364736f6c63430008140033",
+  "bytecode": "0x610759610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610085575f3560e01c80639ed246ea116100635780639ed246ea146100f2578063bc1b392d14610125578063c7010dfa1461014e578063d0e149f714610181575f80fd5b806305deb8b7146100895780632b324dc0146100b15780635faa955b146100c4575b5f80fd5b61009c6100973660046105e4565b610194565b60405190151581526020015b60405180910390f35b61009c6100bf3660046105fe565b6101ae565b6100d76100d2366004610631565b6101ce565b604080518251815260209283015192810192909252016100a8565b610105610100366004610668565b610273565b604080516001600160601b039384168152929091166020830152016100a8565b6040805180820182525f80825260209182018190528251808401909352808352908201526100d7565b6100d761015c36600461069e565b6040805180820182525f80825260209182015281518083019092529281529182015290565b61009c61018f3660046105e4565b61041f565b80515f901515806101a857505f8260200151115b92915050565b5f816020015183602001511480156101c7575082518251145b9392505050565b6040805180820182525f8082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af4158015610240573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061026491906106be565b81525f60209091015292915050565b5f8161027e84610194565b15610418576040516355205f0f60e01b81526001600160601b03841660048201525f9061030a9073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156102df573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061030391906106be565b8651610434565b6020860151604051632255341b60e11b81526004810183905291925073__$3bac17678db7ae928afa209f2f44deec9c$__91634c41dd96919073__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561037d573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103a191906106be565b6103ab91906106d5565b6040518263ffffffff1660e01b81526004016103c991815260200190565b602060405180830381865af41580156103e4573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061040891906106f4565b92506104148284610448565b9150505b9250929050565b5f81602001515f1480156101a8575050511590565b5f6101c78383670de0b6b3a76400006104cc565b6040516363cf551160e11b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa2290604401602060405180830381865af41580156104a8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101c791906106f4565b5f838302815f1985870982811083820303915050805f03610500578382816104f6576104f661070f565b04925050506101c7565b8084116105205760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b5f6040828403121561059b575f80fd5b6040516040810181811067ffffffffffffffff821117156105ca57634e487b7160e01b5f52604160045260245ffd5b604052823581526020928301359281019290925250919050565b5f604082840312156105f4575f80fd5b6101c7838361058b565b5f806080838503121561060f575f80fd5b610619848461058b565b9150610628846040850161058b565b90509250929050565b5f60208284031215610641575f80fd5b813560ff811681146101c7575f80fd5b6001600160601b0381168114610665575f80fd5b50565b5f8060608385031215610679575f80fd5b610683848461058b565b9150604083013561069381610651565b809150509250929050565b5f80604083850312156106af575f80fd5b50508035926020909101359150565b5f602082840312156106ce575f80fd5b5051919050565b808201808211156101a857634e487b7160e01b5f52601160045260245ffd5b5f60208284031215610704575f80fd5b81516101c781610651565b634e487b7160e01b5f52601260045260245ffdfea2646970667358221220a48bbf555af976a3ef5d38054a3f6281f1816be33593a8fa57a9f09c1f72a0cb64736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610085575f3560e01c80639ed246ea116100635780639ed246ea146100f2578063bc1b392d14610125578063c7010dfa1461014e578063d0e149f714610181575f80fd5b806305deb8b7146100895780632b324dc0146100b15780635faa955b146100c4575b5f80fd5b61009c6100973660046105e4565b610194565b60405190151581526020015b60405180910390f35b61009c6100bf3660046105fe565b6101ae565b6100d76100d2366004610631565b6101ce565b604080518251815260209283015192810192909252016100a8565b610105610100366004610668565b610273565b604080516001600160601b039384168152929091166020830152016100a8565b6040805180820182525f80825260209182018190528251808401909352808352908201526100d7565b6100d761015c36600461069e565b6040805180820182525f80825260209182015281518083019092529281529182015290565b61009c61018f3660046105e4565b61041f565b80515f901515806101a857505f8260200151115b92915050565b5f816020015183602001511480156101c7575082518251145b9392505050565b6040805180820182525f8082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af4158015610240573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061026491906106be565b81525f60209091015292915050565b5f8161027e84610194565b15610418576040516355205f0f60e01b81526001600160601b03841660048201525f9061030a9073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156102df573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061030391906106be565b8651610434565b6020860151604051632255341b60e11b81526004810183905291925073__$3bac17678db7ae928afa209f2f44deec9c$__91634c41dd96919073__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561037d573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103a191906106be565b6103ab91906106d5565b6040518263ffffffff1660e01b81526004016103c991815260200190565b602060405180830381865af41580156103e4573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061040891906106f4565b92506104148284610448565b9150505b9250929050565b5f81602001515f1480156101a8575050511590565b5f6101c78383670de0b6b3a76400006104cc565b6040516363cf551160e11b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa2290604401602060405180830381865af41580156104a8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101c791906106f4565b5f838302815f1985870982811083820303915050805f03610500578382816104f6576104f661070f565b04925050506101c7565b8084116105205760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b5f6040828403121561059b575f80fd5b6040516040810181811067ffffffffffffffff821117156105ca57634e487b7160e01b5f52604160045260245ffd5b604052823581526020928301359281019290925250919050565b5f604082840312156105f4575f80fd5b6101c7838361058b565b5f806080838503121561060f575f80fd5b610619848461058b565b9150610628846040850161058b565b90509250929050565b5f60208284031215610641575f80fd5b813560ff811681146101c7575f80fd5b6001600160601b0381168114610665575f80fd5b50565b5f8060608385031215610679575f80fd5b610683848461058b565b9150604083013561069381610651565b809150509250929050565b5f80604083850312156106af575f80fd5b50508035926020909101359150565b5f602082840312156106ce575f80fd5b5051919050565b808201808211156101a857634e487b7160e01b5f52601160045260245ffd5b5f60208284031215610704575f80fd5b81516101c781610651565b634e487b7160e01b5f52601260045260245ffdfea2646970667358221220a48bbf555af976a3ef5d38054a3f6281f1816be33593a8fa57a9f09c1f72a0cb64736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Amount.sol": {
       "AmountLib": [
         {
           "length": 20,
-          "start": 747
+          "start": 731
         },
         {
           "length": 20,
-          "start": 878
+          "start": 860
         },
         {
           "length": 20,
-          "start": 1214
+          "start": 1188
         }
       ]
     },
@@ -270,11 +275,11 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 551
+          "start": 573
         },
         {
           "length": 20,
-          "start": 907
+          "start": 889
         }
       ]
     }
@@ -284,15 +289,15 @@
       "AmountLib": [
         {
           "length": 20,
-          "start": 689
+          "start": 679
         },
         {
           "length": 20,
-          "start": 820
+          "start": 808
         },
         {
           "length": 20,
-          "start": 1156
+          "start": 1136
         }
       ]
     },
@@ -300,11 +305,11 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 493
+          "start": 521
         },
         {
           "length": 20,
-          "start": 849
+          "start": 837
         }
       ]
     }