@etherisc/gif-next 0.0.2-f08528a-758 → 0.0.2-f0ccf08-591

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",
@@ -195,7 +248,7 @@
         {
           "internalType": "UFixed",
           "name": "factor",
-          "type": "uint256"
+          "type": "uint160"
         }
       ],
       "name": "multiplyWith",
@@ -284,7 +337,7 @@
         {
           "internalType": "UFixed",
           "name": "",
-          "type": "uint256"
+          "type": "uint160"
         }
       ],
       "stateMutability": "pure",
@@ -304,22 +357,22 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6106da61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100f45760003560e01c80635869dfca1161009657806398058c4c1161007057806398058c4c14610204578063bc1b392d14610223578063c4cade9d1461022a578063c79eaa221461024957600080fd5b80635869dfca146101d15780636ac5db19146101e45780637931c811146101f157600080fd5b806330b8415f116100d257806330b8415f146101745780634c41dd961461019057806352694ee8146101a357806355205f0f146101be57600080fd5b806308dc895e146100f957806309a81d6214610126578063274acb3514610149575b600080fd5b610113610107366004610587565b6001600160601b031690565b6040519081526020015b60405180910390f35b6101396101343660046105a2565b61025c565b604051901515815260200161011d565b61015c6101573660046105a2565b610272565b6040516001600160601b03909116815260200161011d565b610139610182366004610587565b6001600160601b0316151590565b61015c61019e3660046105d5565b610285565b6101396101b1366004610587565b6001600160601b03161590565b6101136101cc366004610587565b6102bb565b61015c6101df3660046105ee565b61033a565b6001600160601b0361015c565b61015c6101ff3660046105a2565b61043d565b6101396102123660046105a2565b6001600160601b0390811691161190565b600061015c565b6101396102383660046105a2565b6001600160601b0390811691161490565b61015c6102573660046105a2565b610466565b6001600160601b03808216908316105b92915050565b600061027e828461062e565b9392505050565b60006001600160601b038211156102b757604051635a1bd76760e01b8152600481018390526024015b60405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b038216600482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af4158015610316573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026c9190610655565b6040516322f5db0f60e11b81526001600160601b038316600482015260009061027e906103c890849073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af415801561039f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c39190610655565b610472565b604051632255341b60e11b8152600481019190915273__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af4158015610419573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019e9190610655565b6000816001600160601b0316836001600160601b0316101561046057508161026c565b50919050565b600061027e828461066e565b600061027e8383670de0b6b3a764000060008080600019858709858702925082811083820303915050806000036104bc578382816104b2576104b261068e565b049250505061027e565b8084116105035760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b60448201526064016102ae565b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b80356001600160601b038116811461058257600080fd5b919050565b60006020828403121561059957600080fd5b61027e8261056b565b600080604083850312156105b557600080fd5b6105be8361056b565b91506105cc6020840161056b565b90509250929050565b6000602082840312156105e757600080fd5b5035919050565b6000806040838503121561060157600080fd5b61060a8361056b565b946020939093013593505050565b634e487b7160e01b600052601160045260246000fd5b6001600160601b0381811683821601908082111561064e5761064e610618565b5092915050565b60006020828403121561066757600080fd5b5051919050565b6001600160601b0382811682821603908082111561064e5761064e610618565b634e487b7160e01b600052601260045260246000fdfea264697066735822122082093457f2d8168538fc5fbb8f3c5464fc5e4577d365b1461bd0930a8a8e3e7464736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100f45760003560e01c80635869dfca1161009657806398058c4c1161007057806398058c4c14610204578063bc1b392d14610223578063c4cade9d1461022a578063c79eaa221461024957600080fd5b80635869dfca146101d15780636ac5db19146101e45780637931c811146101f157600080fd5b806330b8415f116100d257806330b8415f146101745780634c41dd961461019057806352694ee8146101a357806355205f0f146101be57600080fd5b806308dc895e146100f957806309a81d6214610126578063274acb3514610149575b600080fd5b610113610107366004610587565b6001600160601b031690565b6040519081526020015b60405180910390f35b6101396101343660046105a2565b61025c565b604051901515815260200161011d565b61015c6101573660046105a2565b610272565b6040516001600160601b03909116815260200161011d565b610139610182366004610587565b6001600160601b0316151590565b61015c61019e3660046105d5565b610285565b6101396101b1366004610587565b6001600160601b03161590565b6101136101cc366004610587565b6102bb565b61015c6101df3660046105ee565b61033a565b6001600160601b0361015c565b61015c6101ff3660046105a2565b61043d565b6101396102123660046105a2565b6001600160601b0390811691161190565b600061015c565b6101396102383660046105a2565b6001600160601b0390811691161490565b61015c6102573660046105a2565b610466565b6001600160601b03808216908316105b92915050565b600061027e828461062e565b9392505050565b60006001600160601b038211156102b757604051635a1bd76760e01b8152600481018390526024015b60405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b038216600482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af4158015610316573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026c9190610655565b6040516322f5db0f60e11b81526001600160601b038316600482015260009061027e906103c890849073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af415801561039f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c39190610655565b610472565b604051632255341b60e11b8152600481019190915273__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af4158015610419573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061019e9190610655565b6000816001600160601b0316836001600160601b0316101561046057508161026c565b50919050565b600061027e828461066e565b600061027e8383670de0b6b3a764000060008080600019858709858702925082811083820303915050806000036104bc578382816104b2576104b261068e565b049250505061027e565b8084116105035760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b60448201526064016102ae565b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b80356001600160601b038116811461058257600080fd5b919050565b60006020828403121561059957600080fd5b61027e8261056b565b600080604083850312156105b557600080fd5b6105be8361056b565b91506105cc6020840161056b565b90509250929050565b6000602082840312156105e757600080fd5b5035919050565b6000806040838503121561060157600080fd5b61060a8361056b565b946020939093013593505050565b634e487b7160e01b600052601160045260246000fd5b6001600160601b0381811683821601908082111561064e5761064e610618565b5092915050565b60006020828403121561066757600080fd5b5051919050565b6001600160601b0382811682821603908082111561064e5761064e610618565b634e487b7160e01b600052601260045260246000fdfea264697066735822122082093457f2d8168538fc5fbb8f3c5464fc5e4577d365b1461bd0930a8a8e3e7464736f6c63430008140033",
+  "bytecode": "0x61074a610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610106575f3560e01c806355205f0f1161009e57806398058c4c1161006e57806398058c4c1461026d578063bc1b392d1461028c578063c4cade9d14610292578063c79eaa22146102b1575f80fd5b806355205f0f1461020f5780636ac5db191461023a5780636e5912e7146102475780637931c8111461025a575f80fd5b8063274acb35116100d9578063274acb351461019a57806330b8415f146101c55780634c41dd96146101e157806352694ee8146101f4575f80fd5b806308dc895e1461010a57806309a81d62146101375780631f227d171461015a578063262b32d21461017a575b5f80fd5b6101246101183660046105cf565b6001600160601b031690565b6040519081526020015b60405180910390f35b61014a6101453660046105e8565b6102c4565b604051901515815260200161012e565b61014a6101683660046105e8565b6001600160601b039081169116111590565b61014a6101883660046105e8565b6001600160601b039081169116101590565b6101ad6101a83660046105e8565b6102da565b6040516001600160601b03909116815260200161012e565b61014a6101d33660046105cf565b6001600160601b0316151590565b6101ad6101ef366004610619565b6102ec565b61014a6102023660046105cf565b6001600160601b03161590565b61022261021d3660046105cf565b610320565b6040516001600160a01b03909116815260200161012e565b6001600160601b036101ad565b6101ad610255366004610647565b61039c565b6101ad6102683660046105e8565b6104a2565b61014a61027b3660046105e8565b6001600160601b0390811691161190565b5f6101ad565b61014a6102a03660046105e8565b6001600160601b0390811691161490565b6101ad6102bf3660046105e8565b6104ca565b6001600160601b03808216908316105b92915050565b5f6102e58284610690565b9392505050565b5f6001600160601b0382111561031c57604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b03821660048201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af4158015610378573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102d491906106af565b6040516322f5db0f60e11b81526001600160601b03831660048201525f906102e59061042790849073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156103fe573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061042291906106af565b6104d5565b60405163e2eb023b60e01b81526001600160a01b03909116600482015273__$bf7bc340cbb9229ef1de2c568356e67902$__9063e2eb023b90602401602060405180830381865af415801561047e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101ef91906106ca565b5f816001600160601b0316836001600160601b031610156104c45750816102d4565b50919050565b5f6102e582846106e1565b5f6102e5836001600160a01b0316836001600160a01b031666038d7ea4c680005f838302815f1985870982811083820303915050805f036105295783828161051f5761051f610700565b04925050506102e5565b8084116105495760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b80356001600160601b03811681146105ca575f80fd5b919050565b5f602082840312156105df575f80fd5b6102e5826105b4565b5f80604083850312156105f9575f80fd5b610602836105b4565b9150610610602084016105b4565b90509250929050565b5f60208284031215610629575f80fd5b5035919050565b6001600160a01b0381168114610644575f80fd5b50565b5f8060408385031215610658575f80fd5b610661836105b4565b9150602083013561067181610630565b809150509250929050565b634e487b7160e01b5f52601160045260245ffd5b6001600160601b0381811683821601908111156102d4576102d461067c565b5f602082840312156106bf575f80fd5b81516102e581610630565b5f602082840312156106da575f80fd5b5051919050565b6001600160601b0382811682821603908111156102d4576102d461067c565b634e487b7160e01b5f52601260045260245ffdfea264697066735822122082496a829129f713238eafedf0a6ab1f05c3f39ed995c5b240bfad1c8612681764736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610106575f3560e01c806355205f0f1161009e57806398058c4c1161006e57806398058c4c1461026d578063bc1b392d1461028c578063c4cade9d14610292578063c79eaa22146102b1575f80fd5b806355205f0f1461020f5780636ac5db191461023a5780636e5912e7146102475780637931c8111461025a575f80fd5b8063274acb35116100d9578063274acb351461019a57806330b8415f146101c55780634c41dd96146101e157806352694ee8146101f4575f80fd5b806308dc895e1461010a57806309a81d62146101375780631f227d171461015a578063262b32d21461017a575b5f80fd5b6101246101183660046105cf565b6001600160601b031690565b6040519081526020015b60405180910390f35b61014a6101453660046105e8565b6102c4565b604051901515815260200161012e565b61014a6101683660046105e8565b6001600160601b039081169116111590565b61014a6101883660046105e8565b6001600160601b039081169116101590565b6101ad6101a83660046105e8565b6102da565b6040516001600160601b03909116815260200161012e565b61014a6101d33660046105cf565b6001600160601b0316151590565b6101ad6101ef366004610619565b6102ec565b61014a6102023660046105cf565b6001600160601b03161590565b61022261021d3660046105cf565b610320565b6040516001600160a01b03909116815260200161012e565b6001600160601b036101ad565b6101ad610255366004610647565b61039c565b6101ad6102683660046105e8565b6104a2565b61014a61027b3660046105e8565b6001600160601b0390811691161190565b5f6101ad565b61014a6102a03660046105e8565b6001600160601b0390811691161490565b6101ad6102bf3660046105e8565b6104ca565b6001600160601b03808216908316105b92915050565b5f6102e58284610690565b9392505050565b5f6001600160601b0382111561031c57604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b03821660048201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af4158015610378573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102d491906106af565b6040516322f5db0f60e11b81526001600160601b03831660048201525f906102e59061042790849073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156103fe573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061042291906106af565b6104d5565b60405163e2eb023b60e01b81526001600160a01b03909116600482015273__$bf7bc340cbb9229ef1de2c568356e67902$__9063e2eb023b90602401602060405180830381865af415801561047e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101ef91906106ca565b5f816001600160601b0316836001600160601b031610156104c45750816102d4565b50919050565b5f6102e582846106e1565b5f6102e5836001600160a01b0316836001600160a01b031666038d7ea4c680005f838302815f1985870982811083820303915050805f036105295783828161051f5761051f610700565b04925050506102e5565b8084116105495760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b80356001600160601b03811681146105ca575f80fd5b919050565b5f602082840312156105df575f80fd5b6102e5826105b4565b5f80604083850312156105f9575f80fd5b610602836105b4565b9150610610602084016105b4565b90509250929050565b5f60208284031215610629575f80fd5b5035919050565b6001600160a01b0381168114610644575f80fd5b50565b5f8060408385031215610658575f80fd5b610661836105b4565b9150602083013561067181610630565b809150509250929050565b634e487b7160e01b5f52601160045260245ffd5b6001600160601b0381811683821601908111156102d4576102d461067c565b5f602082840312156106bf575f80fd5b81516102e581610630565b5f602082840312156106da575f80fd5b5051919050565b6001600160601b0382811682821603908111156102d4576102d461067c565b634e487b7160e01b5f52601260045260245ffdfea264697066735822122082496a829129f713238eafedf0a6ab1f05c3f39ed995c5b240bfad1c8612681764736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/UFixed.sol": {
       "UFixedLib": [
         {
           "length": 20,
-          "start": 790
+          "start": 884
         },
         {
           "length": 20,
-          "start": 927
+          "start": 1018
         },
         {
           "length": 20,
-          "start": 1049
+          "start": 1146
         }
       ]
     }
@@ -329,15 +382,15 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 732
+          "start": 832
         },
         {
           "length": 20,
-          "start": 869
+          "start": 966
         },
         {
           "length": 20,
-          "start": 991
+          "start": 1094
         }
       ]
     }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/66b888b9920d1d1f6002878b18a10a0a.json"
+  "buildInfo": "../../../build-info/9be9cf8d974fab34269f1cabbcb7ad5a.json"
 }

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

@@ -218,8 +218,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6102b361003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100a85760003560e01c80636effeac4116100705780636effeac4146101265780637b4f5d3b1461014b578063946428041461015e578063d15b589314610171578063e8b7afe31461018a57600080fd5b806301234028146100ad57806342f49ac0146100d5578063559cbd25146100ed57806356b0a7d4146101005780636303db5914610113575b600080fd5b6100c06100bb36600461022f565b61019e565b60405190151581526020015b60405180910390f35b6100c06100e3366004610262565b63ffffffff161590565b6100c06100fb36600461022f565b6101b5565b6100c061010e36600461022f565b6101c8565b6100c061012136600461022f565b6101db565b61013d610134366004610262565b63ffffffff1690565b6040519081526020016100cc565b6100c061015936600461022f565b6101ee565b6100c061016c36600461022f565b610202565b6100c061017f366004610262565b63ffffffff16151590565b60405163ffffffff431681526020016100cc565b600063ffffffff80831690841610155b9392505050565b600063ffffffff808416908316146101ae565b600063ffffffff808316908416116101ae565b600063ffffffff808316908416106101ae565b600063ffffffff80841690831614156101ae565b600063ffffffff80831690841611156101ae565b803563ffffffff8116811461022a57600080fd5b919050565b6000806040838503121561024257600080fd5b61024b83610216565b915061025960208401610216565b90509250929050565b60006020828403121561027457600080fd5b6101ae8261021656fea2646970667358221220f1fd95039348b502430e13d72f47facf01975d45a8c874ad57bc37fea81ae74d64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100a85760003560e01c80636effeac4116100705780636effeac4146101265780637b4f5d3b1461014b578063946428041461015e578063d15b589314610171578063e8b7afe31461018a57600080fd5b806301234028146100ad57806342f49ac0146100d5578063559cbd25146100ed57806356b0a7d4146101005780636303db5914610113575b600080fd5b6100c06100bb36600461022f565b61019e565b60405190151581526020015b60405180910390f35b6100c06100e3366004610262565b63ffffffff161590565b6100c06100fb36600461022f565b6101b5565b6100c061010e36600461022f565b6101c8565b6100c061012136600461022f565b6101db565b61013d610134366004610262565b63ffffffff1690565b6040519081526020016100cc565b6100c061015936600461022f565b6101ee565b6100c061016c36600461022f565b610202565b6100c061017f366004610262565b63ffffffff16151590565b60405163ffffffff431681526020016100cc565b600063ffffffff80831690841610155b9392505050565b600063ffffffff808416908316146101ae565b600063ffffffff808316908416116101ae565b600063ffffffff808316908416106101ae565b600063ffffffff80841690831614156101ae565b600063ffffffff80831690841611156101ae565b803563ffffffff8116811461022a57600080fd5b919050565b6000806040838503121561024257600080fd5b61024b83610216565b915061025960208401610216565b90509250929050565b60006020828403121561027457600080fd5b6101ae8261021656fea2646970667358221220f1fd95039348b502430e13d72f47facf01975d45a8c874ad57bc37fea81ae74d64736f6c63430008140033",
+  "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/66b888b9920d1d1f6002878b18a10a0a.json"
+  "buildInfo": "../../../build-info/9be9cf8d974fab34269f1cabbcb7ad5a.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$__63f48016ce60166101cf8686610161565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610216573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023a91906102ff565b9392505050565b803561ffff8116811461025357600080fd5b919050565b60006020828403121561026a57600080fd5b61023a82610241565b6000806040838503121561028657600080fd5b61028f83610241565b915060208301356001600160601b03811681146102ab57600080fd5b809150509250929050565b6000602082840312156102c857600080fd5b5035919050565b61ffff8181168382160190808211156102f857634e487b7160e01b600052601160045260246000fd5b5092915050565b60006020828403121561031157600080fd5b505191905056fea26469706673582212207d6e0d66c9231ac1396c78067061fc7f7eafbfc211eb0fe770a7e5978e04373064736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c8063b9c6c93011610065578063b9c6c930146100fc578063bc1b392d14610123578063f3ac7cb51461012a578063faac2b221461014057600080fd5b80635d21681c146100975780636ac5db19146100c0578063904da217146100c85780639cc45a36146100ee575b600080fd5b6100a86100a5366004610258565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100a8565b6100db6100d6366004610273565b610161565b60405160ff1990911681526020016100b7565b6100a86100a53660046102b6565b61011361010a366004610258565b61ffff16151590565b60405190151581526020016100b7565b60006100a8565b610113610138366004610258565b61ffff161590565b61015361014e366004610273565b6101a7565b6040519081526020016100b7565b600061016e8360106102cf565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff1916905092915050565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60166101cf8686610161565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610216573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023a91906102ff565b9392505050565b803561ffff8116811461025357600080fd5b919050565b60006020828403121561026a57600080fd5b61023a82610241565b6000806040838503121561028657600080fd5b61028f83610241565b915060208301356001600160601b03811681146102ab57600080fd5b809150509250929050565b6000602082840312156102c857600080fd5b5035919050565b61ffff8181168382160190808211156102f857634e487b7160e01b600052601160045260246000fd5b5092915050565b60006020828403121561031157600080fd5b505191905056fea26469706673582212207d6e0d66c9231ac1396c78067061fc7f7eafbfc211eb0fe770a7e5978e04373064736f6c63430008140033",
+  "bytecode": "0x610389610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c8063b9c6c9301161006e578063b9c6c93014610104578063bc1b392d1461012b578063dfc00be914610131578063f3ac7cb51461014b578063faac2b2214610161575f80fd5b80635d21681c1461009f5780636ac5db19146100c8578063904da217146100d05780639cc45a36146100f6575b5f80fd5b6100b06100ad366004610275565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100b0565b6100e36100de36600461028e565b610182565b60405160ff1990911681526020016100bf565b6100b06100ad3660046102ce565b61011b610112366004610275565b61ffff16151590565b60405190151581526020016100bf565b5f6100b0565b61011b61013f3660046102e5565b61ffff90811691161490565b61011b610159366004610275565b61ffff161590565b61017461016f36600461028e565b6101c8565b6040519081526020016100bf565b5f61018e836010610316565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff191690505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce602d6101ef8686610182565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610234573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610258919061033c565b9392505050565b803561ffff81168114610270575f80fd5b919050565b5f60208284031215610285575f80fd5b6102588261025f565b5f806040838503121561029f575f80fd5b6102a88361025f565b915060208301356001600160601b03811681146102c3575f80fd5b809150509250929050565b5f602082840312156102de575f80fd5b5035919050565b5f80604083850312156102f6575f80fd5b6102ff8361025f565b915061030d6020840161025f565b90509250929050565b61ffff81811683821601908111156101c257634e487b7160e01b5f52601160045260245ffd5b5f6020828403121561034c575f80fd5b505191905056fea2646970667358221220097757d7000b2c55ca7d2bfee587903fa4c77f1e53534ad263fa01e3bd6d4d3e64736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c8063b9c6c9301161006e578063b9c6c93014610104578063bc1b392d1461012b578063dfc00be914610131578063f3ac7cb51461014b578063faac2b2214610161575f80fd5b80635d21681c1461009f5780636ac5db19146100c8578063904da217146100d05780639cc45a36146100f6575b5f80fd5b6100b06100ad366004610275565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100b0565b6100e36100de36600461028e565b610182565b60405160ff1990911681526020016100bf565b6100b06100ad3660046102ce565b61011b610112366004610275565b61ffff16151590565b60405190151581526020016100bf565b5f6100b0565b61011b61013f3660046102e5565b61ffff90811691161490565b61011b610159366004610275565b61ffff161590565b61017461016f36600461028e565b6101c8565b6040519081526020016100bf565b5f61018e836010610316565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff191690505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce602d6101ef8686610182565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610234573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610258919061033c565b9392505050565b803561ffff81168114610270575f80fd5b919050565b5f60208284031215610285575f80fd5b6102588261025f565b5f806040838503121561029f575f80fd5b6102a88361025f565b915060208301356001600160601b03811681146102c3575f80fd5b809150509250929050565b5f602082840312156102de575f80fd5b5035919050565b5f80604083850312156102f6575f80fd5b6102ff8361025f565b915061030d6020840161025f565b90509250929050565b61ffff81811683821601908111156101c257634e487b7160e01b5f52601160045260245ffd5b5f6020828403121561034c575f80fd5b505191905056fea2646970667358221220097757d7000b2c55ca7d2bfee587903fa4c77f1e53534ad263fa01e3bd6d4d3e64736f6c634300081a0033",
   "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/66b888b9920d1d1f6002878b18a10a0a.json"
+  "buildInfo": "../../../build-info/9be9cf8d974fab34269f1cabbcb7ad5a.json"
 }

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

@@ -79,14 +79,14 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61037e61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632cf96bf91461005b57806355ee62751461008e578063578c3039146100af578063bc1b392d146100db575b600080fd5b6100766100693660046101af565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100a161009c3660046101af565b6100e2565b604051908152602001610085565b6100c26100bd3660046101f6565b61017c565b6040516001600160c01b03199091168152602001610085565b60006100c2565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601b6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610152573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017691906102cb565b92915050565b600082826040516020016101919291906102e4565b60405160208183030381529060405280519060200120905092915050565b6000602082840312156101c157600080fd5b81356001600160c01b0319811681146101d957600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561020957600080fd5b82356bffffffffffffffffffffffff8116811461022557600080fd5b9150602083013567ffffffffffffffff8082111561024257600080fd5b818501915085601f83011261025657600080fd5b813581811115610268576102686101e0565b604051601f8201601f19908116603f01168101908382118183101715610290576102906101e0565b816040528281528860208487010111156102a957600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b818110156103265785810183015185820160600152820161030a565b506000606082860101526060601f19601f83011685010192505050939250505056fea2646970667358221220f7e0a904dc166571011fb369b78d2728c597136e2d58e9bf0a51c5c7554fbdbc64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100565760003560e01c80632cf96bf91461005b57806355ee62751461008e578063578c3039146100af578063bc1b392d146100db575b600080fd5b6100766100693660046101af565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b6100a161009c3660046101af565b6100e2565b604051908152602001610085565b6100c26100bd3660046101f6565b61017c565b6040516001600160c01b03199091168152602001610085565b60006100c2565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce601b6001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610152573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061017691906102cb565b92915050565b600082826040516020016101919291906102e4565b60405160208183030381529060405280519060200120905092915050565b6000602082840312156101c157600080fd5b81356001600160c01b0319811681146101d957600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561020957600080fd5b82356bffffffffffffffffffffffff8116811461022557600080fd5b9150602083013567ffffffffffffffff8082111561024257600080fd5b818501915085601f83011261025657600080fd5b813581811115610268576102686101e0565b604051601f8201601f19908116603f01168101908382118183101715610290576102906101e0565b816040528281528860208487010111156102a957600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b6000602082840312156102dd57600080fd5b5051919050565b6bffffffffffffffffffffffff8316815260006020604081840152835180604085015260005b818110156103265785810183015185820160600152820161030a565b506000606082860101526060601f19601f83011685010192505050939250505056fea2646970667358221220f7e0a904dc166571011fb369b78d2728c597136e2d58e9bf0a51c5c7554fbdbc64736f6c63430008140033",
+  "bytecode": "0x610357610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610055575f3560e01c80632cf96bf91461005957806355ee62751461008c578063578c3039146100ad578063bc1b392d146100d9575b5f80fd5b6100746100673660046101a8565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b61009f61009a3660046101a8565b6100df565b604051908152602001610083565b6100c06100bb3660046101ea565b610176565b6040516001600160c01b03199091168152602001610083565b5f6100c0565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60306001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561014c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061017091906102c0565b92915050565b5f828260405160200161018a9291906102d7565b60405160208183030381529060405280519060200120905092915050565b5f602082840312156101b8575f80fd5b81356001600160c01b0319811681146101cf575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156101fb575f80fd5b82356bffffffffffffffffffffffff81168114610216575f80fd5b9150602083013567ffffffffffffffff811115610231575f80fd5b8301601f81018513610241575f80fd5b803567ffffffffffffffff81111561025b5761025b6101d6565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561028a5761028a6101d6565b6040528181528282016020018710156102a1575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f602082840312156102d0575f80fd5b5051919050565b6bffffffffffffffffffffffff83168152604060208201525f82518060408401528060208501606085015e5f606082850101526060601f19601f830116840101915050939250505056fea2646970667358221220a88b985476d2cbfbfc357c762f9e28b7b563ac06dcf6f44d0e4061a84a73f20864736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610055575f3560e01c80632cf96bf91461005957806355ee62751461008c578063578c3039146100ad578063bc1b392d146100d9575b5f80fd5b6100746100673660046101a8565b6001600160c01b03191690565b60405160ff1990911681526020015b60405180910390f35b61009f61009a3660046101a8565b6100df565b604051908152602001610083565b6100c06100bb3660046101ea565b610176565b6040516001600160c01b03199091168152602001610083565b5f6100c0565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60306001600160c01b031985166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561014c573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061017091906102c0565b92915050565b5f828260405160200161018a9291906102d7565b60405160208183030381529060405280519060200120905092915050565b5f602082840312156101b8575f80fd5b81356001600160c01b0319811681146101cf575f80fd5b9392505050565b634e487b7160e01b5f52604160045260245ffd5b5f80604083850312156101fb575f80fd5b82356bffffffffffffffffffffffff81168114610216575f80fd5b9150602083013567ffffffffffffffff811115610231575f80fd5b8301601f81018513610241575f80fd5b803567ffffffffffffffff81111561025b5761025b6101d6565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561028a5761028a6101d6565b6040528181528282016020018710156102a1575f80fd5b816020840160208301375f602083830101528093505050509250929050565b5f602082840312156102d0575f80fd5b5051919050565b6bffffffffffffffffffffffff83168152604060208201525f82518060408401528060208501606085015e5f606082850101526060601f19601f830116840101915050939250505056fea2646970667358221220a88b985476d2cbfbfc357c762f9e28b7b563ac06dcf6f44d0e4061a84a73f20864736f6c634300081a0033",
   "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/66b888b9920d1d1f6002878b18a10a0a.json"
+  "buildInfo": "../../../build-info/9be9cf8d974fab34269f1cabbcb7ad5a.json"
 }

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

@@ -3,6 +3,11 @@
   "contractName": "FeeLib",
   "sourceName": "contracts/type/Fee.sol",
   "abi": [
+    {
+      "inputs": [],
+      "name": "MathOverflowedMulDiv",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -10,12 +15,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -51,12 +56,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -68,12 +73,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -99,12 +104,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -130,12 +135,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -169,12 +174,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -190,7 +195,7 @@
         {
           "internalType": "UFixed",
           "name": "fractionalFee",
-          "type": "uint256"
+          "type": "uint160"
         },
         {
           "internalType": "uint256",
@@ -205,12 +210,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -230,12 +235,12 @@
             {
               "internalType": "UFixed",
               "name": "fractionalFee",
-              "type": "uint256"
+              "type": "uint160"
             },
             {
-              "internalType": "uint256",
+              "internalType": "Amount",
               "name": "fixedFee",
-              "type": "uint256"
+              "type": "uint96"
             }
           ],
           "internalType": "struct Fee",
@@ -247,22 +252,50 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6107b961003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639ed246ea116100655780639ed246ea146100f5578063bc1b392d14610128578063c7010dfa14610152578063d0e149f71461018657600080fd5b806305deb8b71461008c5780632b324dc0146100b45780635faa955b146100c7575b600080fd5b61009f61009a366004610630565b610199565b60405190151581526020015b60405180910390f35b61009f6100c236600461064c565b6101b5565b6100da6100d5366004610681565b6101d6565b604080518251815260209283015192810192909252016100ab565b6101086101033660046106bc565b61027f565b604080516001600160601b039384168152929091166020830152016100ab565b604080518082018252600080825260209182018190528251808401909352808352908201526100da565b6100da6101603660046106f4565b604080518082018252600080825260209182015281518083019092529281529182015290565b61009f610194366004610630565b610433565b80516000901515806101af575060008260200151115b92915050565b6000816020015183602001511480156101cf575082518251145b9392505050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af415801561024b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026f9190610716565b8152600060209091015292915050565b60008161028b84610199565b1561042c576040516355205f0f60e01b81526001600160601b038416600482015260009061031a9073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156102ef573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103139190610716565b865161044a565b6020860151604051632255341b60e11b81526004810183905291925073__$3bac17678db7ae928afa209f2f44deec9c$__91634c41dd96919073__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561038f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103b39190610716565b6103bd919061072f565b6040518263ffffffff1660e01b81526004016103db91815260200190565b602060405180830381865af41580156103f8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061041c9190610750565b9250610428828461045f565b9150505b9250929050565b6000816020015160001480156101af575050511590565b60006101cf8383670de0b6b3a76400006104e6565b6040516363cf551160e11b81526001600160601b0380841660048301528216602482015260009073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa2290604401602060405180830381865af41580156104c2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cf9190610750565b6000808060001985870985870292508281108382030391505080600003610520578382816105165761051661076d565b04925050506101cf565b80841161056b5760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156105e557600080fd5b6040516040810181811067ffffffffffffffff8211171561061657634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561064257600080fd5b6101cf83836105d3565b6000806080838503121561065f57600080fd5b61066984846105d3565b915061067884604085016105d3565b90509250929050565b60006020828403121561069357600080fd5b813560ff811681146101cf57600080fd5b6001600160601b03811681146106b957600080fd5b50565b600080606083850312156106cf57600080fd5b6106d984846105d3565b915060408301356106e9816106a4565b809150509250929050565b6000806040838503121561070757600080fd5b50508035926020909101359150565b60006020828403121561072857600080fd5b5051919050565b808201808211156101af57634e487b7160e01b600052601160045260246000fd5b60006020828403121561076257600080fd5b81516101cf816106a4565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220579f0cdb2e743b5bc4a8910269b259f8c9ef5e64e21d6d6461caad4e7c593c6e64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c80639ed246ea116100655780639ed246ea146100f5578063bc1b392d14610128578063c7010dfa14610152578063d0e149f71461018657600080fd5b806305deb8b71461008c5780632b324dc0146100b45780635faa955b146100c7575b600080fd5b61009f61009a366004610630565b610199565b60405190151581526020015b60405180910390f35b61009f6100c236600461064c565b6101b5565b6100da6100d5366004610681565b6101d6565b604080518251815260209283015192810192909252016100ab565b6101086101033660046106bc565b61027f565b604080516001600160601b039384168152929091166020830152016100ab565b604080518082018252600080825260209182018190528251808401909352808352908201526100da565b6100da6101603660046106f4565b604080518082018252600080825260209182015281518083019092529281529182015290565b61009f610194366004610630565b610433565b80516000901515806101af575060008260200151115b92915050565b6000816020015183602001511480156101cf575082518251145b9392505050565b60408051808201825260008082526020820152815180830192839052631488c84560e01b90925260ff831660448301526001196064830152908073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af415801561024b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026f9190610716565b8152600060209091015292915050565b60008161028b84610199565b1561042c576040516355205f0f60e01b81526001600160601b038416600482015260009061031a9073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156102ef573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103139190610716565b865161044a565b6020860151604051632255341b60e11b81526004810183905291925073__$3bac17678db7ae928afa209f2f44deec9c$__91634c41dd96919073__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af415801561038f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103b39190610716565b6103bd919061072f565b6040518263ffffffff1660e01b81526004016103db91815260200190565b602060405180830381865af41580156103f8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061041c9190610750565b9250610428828461045f565b9150505b9250929050565b6000816020015160001480156101af575050511590565b60006101cf8383670de0b6b3a76400006104e6565b6040516363cf551160e11b81526001600160601b0380841660048301528216602482015260009073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa2290604401602060405180830381865af41580156104c2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cf9190610750565b6000808060001985870985870292508281108382030391505080600003610520578382816105165761051661076d565b04925050506101cf565b80841161056b5760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b604482015260640160405180910390fd5b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6000604082840312156105e557600080fd5b6040516040810181811067ffffffffffffffff8211171561061657634e487b7160e01b600052604160045260246000fd5b604052823581526020928301359281019290925250919050565b60006040828403121561064257600080fd5b6101cf83836105d3565b6000806080838503121561065f57600080fd5b61066984846105d3565b915061067884604085016105d3565b90509250929050565b60006020828403121561069357600080fd5b813560ff811681146101cf57600080fd5b6001600160601b03811681146106b957600080fd5b50565b600080606083850312156106cf57600080fd5b6106d984846105d3565b915060408301356106e9816106a4565b809150509250929050565b6000806040838503121561070757600080fd5b50508035926020909101359150565b60006020828403121561072857600080fd5b5051919050565b808201808211156101af57634e487b7160e01b600052601160045260246000fd5b60006020828403121561076257600080fd5b81516101cf816106a4565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220579f0cdb2e743b5bc4a8910269b259f8c9ef5e64e21d6d6461caad4e7c593c6e64736f6c63430008140033",
+  "bytecode": "0x610b4a610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610085575f3560e01c80639ed246ea116100635780639ed246ea14610104578063bc1b392d14610137578063c8f806b51461013f578063d0e149f714610152575f80fd5b806305deb8b7146100895780632b324dc0146100b15780635faa955b146100c4575b5f80fd5b61009c6100973660046109c7565b610165565b60405190151581526020015b60405180910390f35b61009c6100bf3660046109e1565b610200565b6100d76100d2366004610a14565b610234565b6040805182516001600160a01b031681526020928301516001600160601b031692810192909252016100a8565b610117610112366004610a34565b610356565b604080516001600160601b039384168152929091166020830152016100a8565b6100d7610508565b6100d761014d366004610a6a565b6105b0565b61009c6101603660046109c7565b610660565b80515f906001600160a01b03161515806101fa575060208201516040516330b8415f60e01b81526001600160601b03909116600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156101d6573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101fa9190610a94565b92915050565b5f610213836020015183602001516106f8565b801561022d5750825182516001600160a01b039182169116145b9392505050565b604080518082019091525f80825260208201526040805180820191829052631488c84560e01b90915260ff8316604482015260011960648201528073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af41580156102a8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102cc9190610ab3565b6001600160a01b0316815260200173__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af4158015610321573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103459190610ace565b6001600160601b0316905292915050565b5f8161036184610165565b15610501576040516355205f0f60e01b81526001600160601b03841660048201525f906103ed9073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156103c2573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103e69190610ab3565b865161077c565b60405163e2eb023b60e01b81526001600160a01b03821660048201529091506104f19073__$3bac17678db7ae928afa209f2f44deec9c$__90634c41dd969073__$bf7bc340cbb9229ef1de2c568356e67902$__9063e2eb023b90602401602060405180830381865af4158015610466573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061048a9190610ae9565b6040518263ffffffff1660e01b81526004016104a891815260200190565b602060405180830381865af41580156104c3573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104e79190610ace565b86602001516107a1565b92506104fd8284610826565b9150505b9250929050565b604080518082019091525f808252602082015260405180604001604052805f6001600160a01b0316815260200173__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af415801561057c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105a09190610ace565b6001600160601b03169052919050565b604080518082019091525f80825260208201526040805180820182526001600160a01b03851681529051632620eecb60e11b815260048101849052602082019073__$3bac17678db7ae928afa209f2f44deec9c$__90634c41dd9690602401602060405180830381865af415801561062a573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061064e9190610ace565b6001600160601b031690529392505050565b6020810151604051630a4d29dd60e31b81526001600160601b0390911660048201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__906352694ee890602401602060405180830381865af41580156106be573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106e29190610a94565b80156101fa575050516001600160a01b03161590565b60405163c4cade9d60e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063c4cade9d90604401602060405180830381865af4158015610758573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061022d9190610a94565b5f61022d836001600160a01b0316836001600160a01b031666038d7ea4c68000610870565b60405163274acb3560e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063274acb35906044015b602060405180830381865af4158015610802573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061022d9190610ace565b6040516363cf551160e11b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa22906044016107e7565b5f838302815f1985870982811083820303915050805f036108a45783828161089a5761089a610b00565b049250505061022d565b8084116108c45760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b6001600160a01b0381168114610943575f80fd5b50565b6001600160601b0381168114610943575f80fd5b5f6040828403121561096a575f80fd5b6040516040810181811067ffffffffffffffff8211171561099957634e487b7160e01b5f52604160045260245ffd5b60405290508082356109aa8161092f565b815260208301356109ba81610946565b6020919091015292915050565b5f604082840312156109d7575f80fd5b61022d838361095a565b5f80608083850312156109f2575f80fd5b6109fc848461095a565b9150610a0b846040850161095a565b90509250929050565b5f60208284031215610a24575f80fd5b813560ff8116811461022d575f80fd5b5f8060608385031215610a45575f80fd5b610a4f848461095a565b91506040830135610a5f81610946565b809150509250929050565b5f8060408385031215610a7b575f80fd5b8235610a868161092f565b946020939093013593505050565b5f60208284031215610aa4575f80fd5b8151801515811461022d575f80fd5b5f60208284031215610ac3575f80fd5b815161022d8161092f565b5f60208284031215610ade575f80fd5b815161022d81610946565b5f60208284031215610af9575f80fd5b5051919050565b634e487b7160e01b5f52601260045260245ffdfea2646970667358221220cf8d3d423d47e7846e63a1f2d8744a31e6dd394411ed89b98a791eed6d32b69264736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610085575f3560e01c80639ed246ea116100635780639ed246ea14610104578063bc1b392d14610137578063c8f806b51461013f578063d0e149f714610152575f80fd5b806305deb8b7146100895780632b324dc0146100b15780635faa955b146100c4575b5f80fd5b61009c6100973660046109c7565b610165565b60405190151581526020015b60405180910390f35b61009c6100bf3660046109e1565b610200565b6100d76100d2366004610a14565b610234565b6040805182516001600160a01b031681526020928301516001600160601b031692810192909252016100a8565b610117610112366004610a34565b610356565b604080516001600160601b039384168152929091166020830152016100a8565b6100d7610508565b6100d761014d366004610a6a565b6105b0565b61009c6101603660046109c7565b610660565b80515f906001600160a01b03161515806101fa575060208201516040516330b8415f60e01b81526001600160601b03909116600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906330b8415f90602401602060405180830381865af41580156101d6573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101fa9190610a94565b92915050565b5f610213836020015183602001516106f8565b801561022d5750825182516001600160a01b039182169116145b9392505050565b604080518082019091525f80825260208201526040805180820191829052631488c84560e01b90915260ff8316604482015260011960648201528073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c84560848301602060405180830381865af41580156102a8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102cc9190610ab3565b6001600160a01b0316815260200173__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af4158015610321573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103459190610ace565b6001600160601b0316905292915050565b5f8161036184610165565b15610501576040516355205f0f60e01b81526001600160601b03841660048201525f906103ed9073__$3bac17678db7ae928afa209f2f44deec9c$__906355205f0f90602401602060405180830381865af41580156103c2573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103e69190610ab3565b865161077c565b60405163e2eb023b60e01b81526001600160a01b03821660048201529091506104f19073__$3bac17678db7ae928afa209f2f44deec9c$__90634c41dd969073__$bf7bc340cbb9229ef1de2c568356e67902$__9063e2eb023b90602401602060405180830381865af4158015610466573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061048a9190610ae9565b6040518263ffffffff1660e01b81526004016104a891815260200190565b602060405180830381865af41580156104c3573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104e79190610ace565b86602001516107a1565b92506104fd8284610826565b9150505b9250929050565b604080518082019091525f808252602082015260405180604001604052805f6001600160a01b0316815260200173__$3bac17678db7ae928afa209f2f44deec9c$__63bc1b392d6040518163ffffffff1660e01b8152600401602060405180830381865af415801561057c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105a09190610ace565b6001600160601b03169052919050565b604080518082019091525f80825260208201526040805180820182526001600160a01b03851681529051632620eecb60e11b815260048101849052602082019073__$3bac17678db7ae928afa209f2f44deec9c$__90634c41dd9690602401602060405180830381865af415801561062a573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061064e9190610ace565b6001600160601b031690529392505050565b6020810151604051630a4d29dd60e31b81526001600160601b0390911660048201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__906352694ee890602401602060405180830381865af41580156106be573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106e29190610a94565b80156101fa575050516001600160a01b03161590565b60405163c4cade9d60e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063c4cade9d90604401602060405180830381865af4158015610758573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061022d9190610a94565b5f61022d836001600160a01b0316836001600160a01b031666038d7ea4c68000610870565b60405163274acb3560e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063274acb35906044015b602060405180830381865af4158015610802573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061022d9190610ace565b6040516363cf551160e11b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063c79eaa22906044016107e7565b5f838302815f1985870982811083820303915050805f036108a45783828161089a5761089a610b00565b049250505061022d565b8084116108c45760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b6001600160a01b0381168114610943575f80fd5b50565b6001600160601b0381168114610943575f80fd5b5f6040828403121561096a575f80fd5b6040516040810181811067ffffffffffffffff8211171561099957634e487b7160e01b5f52604160045260245ffd5b60405290508082356109aa8161092f565b815260208301356109ba81610946565b6020919091015292915050565b5f604082840312156109d7575f80fd5b61022d838361095a565b5f80608083850312156109f2575f80fd5b6109fc848461095a565b9150610a0b846040850161095a565b90509250929050565b5f60208284031215610a24575f80fd5b813560ff8116811461022d575f80fd5b5f8060608385031215610a45575f80fd5b610a4f848461095a565b91506040830135610a5f81610946565b809150509250929050565b5f8060408385031215610a7b575f80fd5b8235610a868161092f565b946020939093013593505050565b5f60208284031215610aa4575f80fd5b8151801515811461022d575f80fd5b5f60208284031215610ac3575f80fd5b815161022d8161092f565b5f60208284031215610ade575f80fd5b815161022d81610946565b5f60208284031215610af9575f80fd5b5051919050565b634e487b7160e01b5f52601260045260245ffdfea2646970667358221220cf8d3d423d47e7846e63a1f2d8744a31e6dd394411ed89b98a791eed6d32b69264736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Amount.sol": {
       "AmountLib": [
         {
           "length": 20,
-          "start": 751
+          "start": 466
+        },
+        {
+          "length": 20,
+          "start": 784
+        },
+        {
+          "length": 20,
+          "start": 958
+        },
+        {
+          "length": 20,
+          "start": 1094
+        },
+        {
+          "length": 20,
+          "start": 1387
+        },
+        {
+          "length": 20,
+          "start": 1574
+        },
+        {
+          "length": 20,
+          "start": 1722
+        },
+        {
+          "length": 20,
+          "start": 1876
         },
         {
           "length": 20,
-          "start": 882
+          "start": 2045
         },
         {
           "length": 20,
-          "start": 1218
+          "start": 2178
         }
       ]
     },
@@ -270,11 +303,11 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 588
+          "start": 677
         },
         {
           "length": 20,
-          "start": 911
+          "start": 1122
         }
       ]
     }
@@ -284,15 +317,43 @@
       "AmountLib": [
         {
           "length": 20,
-          "start": 693
+          "start": 414
+        },
+        {
+          "length": 20,
+          "start": 732
+        },
+        {
+          "length": 20,
+          "start": 906
+        },
+        {
+          "length": 20,
+          "start": 1042
+        },
+        {
+          "length": 20,
+          "start": 1335
+        },
+        {
+          "length": 20,
+          "start": 1522
+        },
+        {
+          "length": 20,
+          "start": 1670
+        },
+        {
+          "length": 20,
+          "start": 1824
         },
         {
           "length": 20,
-          "start": 824
+          "start": 1993
         },
         {
           "length": 20,
-          "start": 1160
+          "start": 2126
         }
       ]
     },
@@ -300,11 +361,11 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 530
+          "start": 625
         },
         {
           "length": 20,
-          "start": 853
+          "start": 1070
         }
       ]
     }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/66b888b9920d1d1f6002878b18a10a0a.json"
+  "buildInfo": "../../../build-info/9be9cf8d974fab34269f1cabbcb7ad5a.json"
 }