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

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

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

package/artifacts/contracts/type/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/2b22356a28cf77644d8322732b1466b4.json"
+  "buildInfo": "../../../build-info/705b5a0c39a5dd813a8127e3769c4fe2.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": "uint160"
+        }
+      ],
+      "name": "multiplyWith",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -236,7 +337,7 @@
         {
           "internalType": "UFixed",
           "name": "",
-          "type": "uint256"
+          "type": "uint160"
         }
       ],
       "stateMutability": "pure",
@@ -256,14 +357,22 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61041461003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c806355205f0f1161007b57806355205f0f146101945780636ac5db19146101a757806398058c4c146101b4578063bc1b392d146101d3578063c4cade9d146101da578063c79eaa22146101f957600080fd5b806308dc895e146100c357806309a81d62146100f0578063274acb351461011f57806330b8415f1461014a5780634c41dd961461016657806352694ee814610179575b600080fd5b6100dd6100d1366004610301565b6001600160601b031690565b6040519081526020015b60405180910390f35b61010f6100fe36600461031c565b6001600160601b0390811691161090565b60405190151581526020016100e7565b61013261012d36600461031c565b61020c565b6040516001600160601b0390911681526020016100e7565b61010f610158366004610301565b6001600160601b0316151590565b61013261017436600461034f565b61021f565b61010f610187366004610301565b6001600160601b03161590565b6100dd6101a2366004610301565b610254565b6001600160601b03610132565b61010f6101c236600461031c565b6001600160601b0390811691161190565b6000610132565b61010f6101e836600461031c565b6001600160601b0390811691161490565b61013261020736600461031c565b6102d9565b6000610218828461037e565b9392505050565b60006001600160601b0382111561025057604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b038216600482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156102af573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d391906103a5565b92915050565b600061021882846103be565b80356001600160601b03811681146102fc57600080fd5b919050565b60006020828403121561031357600080fd5b610218826102e5565b6000806040838503121561032f57600080fd5b610338836102e5565b9150610346602084016102e5565b90509250929050565b60006020828403121561036157600080fd5b5035919050565b634e487b7160e01b600052601160045260246000fd5b6001600160601b0381811683821601908082111561039e5761039e610368565b5092915050565b6000602082840312156103b757600080fd5b5051919050565b6001600160601b0382811682821603908082111561039e5761039e61036856fea2646970667358221220ec77626414aa805945092be2df21e5d4ef115bb82db0a638523075e2c98ad3aa64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c806355205f0f1161007b57806355205f0f146101945780636ac5db19146101a757806398058c4c146101b4578063bc1b392d146101d3578063c4cade9d146101da578063c79eaa22146101f957600080fd5b806308dc895e146100c357806309a81d62146100f0578063274acb351461011f57806330b8415f1461014a5780634c41dd961461016657806352694ee814610179575b600080fd5b6100dd6100d1366004610301565b6001600160601b031690565b6040519081526020015b60405180910390f35b61010f6100fe36600461031c565b6001600160601b0390811691161090565b60405190151581526020016100e7565b61013261012d36600461031c565b61020c565b6040516001600160601b0390911681526020016100e7565b61010f610158366004610301565b6001600160601b0316151590565b61013261017436600461034f565b61021f565b61010f610187366004610301565b6001600160601b03161590565b6100dd6101a2366004610301565b610254565b6001600160601b03610132565b61010f6101c236600461031c565b6001600160601b0390811691161190565b6000610132565b61010f6101e836600461031c565b6001600160601b0390811691161490565b61013261020736600461031c565b6102d9565b6000610218828461037e565b9392505050565b60006001600160601b0382111561025057604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b038216600482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156102af573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d391906103a5565b92915050565b600061021882846103be565b80356001600160601b03811681146102fc57600080fd5b919050565b60006020828403121561031357600080fd5b610218826102e5565b6000806040838503121561032f57600080fd5b610338836102e5565b9150610346602084016102e5565b90509250929050565b60006020828403121561036157600080fd5b5035919050565b634e487b7160e01b600052601160045260246000fd5b6001600160601b0381811683821601908082111561039e5761039e610368565b5092915050565b6000602082840312156103b757600080fd5b5051919050565b6001600160601b0382811682821603908082111561039e5761039e61036856fea2646970667358221220ec77626414aa805945092be2df21e5d4ef115bb82db0a638523075e2c98ad3aa64736f6c63430008140033",
+  "bytecode": "0x61074a610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610106575f3560e01c806355205f0f1161009e57806398058c4c1161006e57806398058c4c1461026d578063bc1b392d1461028c578063c4cade9d14610292578063c79eaa22146102b1575f80fd5b806355205f0f1461020f5780636ac5db191461023a5780636e5912e7146102475780637931c8111461025a575f80fd5b8063274acb35116100d9578063274acb351461019a57806330b8415f146101c55780634c41dd96146101e157806352694ee8146101f4575f80fd5b806308dc895e1461010a57806309a81d62146101375780631f227d171461015a578063262b32d21461017a575b5f80fd5b6101246101183660046105cf565b6001600160601b031690565b6040519081526020015b60405180910390f35b61014a6101453660046105e8565b6102c4565b604051901515815260200161012e565b61014a6101683660046105e8565b6001600160601b039081169116111590565b61014a6101883660046105e8565b6001600160601b039081169116101590565b6101ad6101a83660046105e8565b6102da565b6040516001600160601b03909116815260200161012e565b61014a6101d33660046105cf565b6001600160601b0316151590565b6101ad6101ef366004610619565b6102ec565b61014a6102023660046105cf565b6001600160601b03161590565b61022261021d3660046105cf565b610320565b6040516001600160a01b03909116815260200161012e565b6001600160601b036101ad565b6101ad610255366004610647565b61039c565b6101ad6102683660046105e8565b6104a2565b61014a61027b3660046105e8565b6001600160601b0390811691161190565b5f6101ad565b61014a6102a03660046105e8565b6001600160601b0390811691161490565b6101ad6102bf3660046105e8565b6104ca565b6001600160601b03808216908316105b92915050565b5f6102e58284610690565b9392505050565b5f6001600160601b0382111561031c57604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b03821660048201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af4158015610378573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102d491906106af565b6040516322f5db0f60e11b81526001600160601b03831660048201525f906102e59061042790849073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156103fe573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061042291906106af565b6104d5565b60405163e2eb023b60e01b81526001600160a01b03909116600482015273__$bf7bc340cbb9229ef1de2c568356e67902$__9063e2eb023b90602401602060405180830381865af415801561047e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101ef91906106ca565b5f816001600160601b0316836001600160601b031610156104c45750816102d4565b50919050565b5f6102e582846106e1565b5f6102e5836001600160a01b0316836001600160a01b031666038d7ea4c680005f838302815f1985870982811083820303915050805f036105295783828161051f5761051f610700565b04925050506102e5565b8084116105495760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b80356001600160601b03811681146105ca575f80fd5b919050565b5f602082840312156105df575f80fd5b6102e5826105b4565b5f80604083850312156105f9575f80fd5b610602836105b4565b9150610610602084016105b4565b90509250929050565b5f60208284031215610629575f80fd5b5035919050565b6001600160a01b0381168114610644575f80fd5b50565b5f8060408385031215610658575f80fd5b610661836105b4565b9150602083013561067181610630565b809150509250929050565b634e487b7160e01b5f52601160045260245ffd5b6001600160601b0381811683821601908111156102d4576102d461067c565b5f602082840312156106bf575f80fd5b81516102e581610630565b5f602082840312156106da575f80fd5b5051919050565b6001600160601b0382811682821603908111156102d4576102d461067c565b634e487b7160e01b5f52601260045260245ffdfea26469706673582212207870bf3aac8bb6e001663f68144421f9a2020896c31d8fedcd43b9eab0ae876864736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610106575f3560e01c806355205f0f1161009e57806398058c4c1161006e57806398058c4c1461026d578063bc1b392d1461028c578063c4cade9d14610292578063c79eaa22146102b1575f80fd5b806355205f0f1461020f5780636ac5db191461023a5780636e5912e7146102475780637931c8111461025a575f80fd5b8063274acb35116100d9578063274acb351461019a57806330b8415f146101c55780634c41dd96146101e157806352694ee8146101f4575f80fd5b806308dc895e1461010a57806309a81d62146101375780631f227d171461015a578063262b32d21461017a575b5f80fd5b6101246101183660046105cf565b6001600160601b031690565b6040519081526020015b60405180910390f35b61014a6101453660046105e8565b6102c4565b604051901515815260200161012e565b61014a6101683660046105e8565b6001600160601b039081169116111590565b61014a6101883660046105e8565b6001600160601b039081169116101590565b6101ad6101a83660046105e8565b6102da565b6040516001600160601b03909116815260200161012e565b61014a6101d33660046105cf565b6001600160601b0316151590565b6101ad6101ef366004610619565b6102ec565b61014a6102023660046105cf565b6001600160601b03161590565b61022261021d3660046105cf565b610320565b6040516001600160a01b03909116815260200161012e565b6001600160601b036101ad565b6101ad610255366004610647565b61039c565b6101ad6102683660046105e8565b6104a2565b61014a61027b3660046105e8565b6001600160601b0390811691161190565b5f6101ad565b61014a6102a03660046105e8565b6001600160601b0390811691161490565b6101ad6102bf3660046105e8565b6104ca565b6001600160601b03808216908316105b92915050565b5f6102e58284610690565b9392505050565b5f6001600160601b0382111561031c57604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b03821660048201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af4158015610378573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102d491906106af565b6040516322f5db0f60e11b81526001600160601b03831660048201525f906102e59061042790849073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156103fe573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061042291906106af565b6104d5565b60405163e2eb023b60e01b81526001600160a01b03909116600482015273__$bf7bc340cbb9229ef1de2c568356e67902$__9063e2eb023b90602401602060405180830381865af415801561047e573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101ef91906106ca565b5f816001600160601b0316836001600160601b031610156104c45750816102d4565b50919050565b5f6102e582846106e1565b5f6102e5836001600160a01b0316836001600160a01b031666038d7ea4c680005f838302815f1985870982811083820303915050805f036105295783828161051f5761051f610700565b04925050506102e5565b8084116105495760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b80356001600160601b03811681146105ca575f80fd5b919050565b5f602082840312156105df575f80fd5b6102e5826105b4565b5f80604083850312156105f9575f80fd5b610602836105b4565b9150610610602084016105b4565b90509250929050565b5f60208284031215610629575f80fd5b5035919050565b6001600160a01b0381168114610644575f80fd5b50565b5f8060408385031215610658575f80fd5b610661836105b4565b9150602083013561067181610630565b809150509250929050565b634e487b7160e01b5f52601160045260245ffd5b6001600160601b0381811683821601908111156102d4576102d461067c565b5f602082840312156106bf575f80fd5b81516102e581610630565b5f602082840312156106da575f80fd5b5051919050565b6001600160601b0382811682821603908111156102d4576102d461067c565b634e487b7160e01b5f52601260045260245ffdfea26469706673582212207870bf3aac8bb6e001663f68144421f9a2020896c31d8fedcd43b9eab0ae876864736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/UFixed.sol": {
       "UFixedLib": [
         {
           "length": 20,
-          "start": 687
+          "start": 884
+        },
+        {
+          "length": 20,
+          "start": 1018
+        },
+        {
+          "length": 20,
+          "start": 1146
         }
       ]
     }
@@ -273,7 +382,15 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 629
+          "start": 832
+        },
+        {
+          "length": 20,
+          "start": 966
+        },
+        {
+          "length": 20,
+          "start": 1094
         }
       ]
     }

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

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

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

@@ -5,12 +5,12 @@
   "abi": [
     {
       "inputs": [],
-      "name": "currentBlocknumber",
+      "name": "current",
       "outputs": [
         {
           "internalType": "Blocknumber",
           "name": "",
-          "type": "uint32"
+          "type": "uint40"
         }
       ],
       "stateMutability": "view",
@@ -21,12 +21,12 @@
         {
           "internalType": "Blocknumber",
           "name": "a",
-          "type": "uint32"
+          "type": "uint40"
         },
         {
           "internalType": "Blocknumber",
           "name": "b",
-          "type": "uint32"
+          "type": "uint40"
         }
       ],
       "name": "eq",
@@ -40,17 +40,36 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "Blocknumber",
+          "name": "blocknumber",
+          "type": "uint40"
+        }
+      ],
+      "name": "eqz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
           "internalType": "Blocknumber",
           "name": "a",
-          "type": "uint32"
+          "type": "uint40"
         },
         {
           "internalType": "Blocknumber",
           "name": "b",
-          "type": "uint32"
+          "type": "uint40"
         }
       ],
       "name": "gt",
@@ -69,12 +88,12 @@
         {
           "internalType": "Blocknumber",
           "name": "a",
-          "type": "uint32"
+          "type": "uint40"
         },
         {
           "internalType": "Blocknumber",
           "name": "b",
-          "type": "uint32"
+          "type": "uint40"
         }
       ],
       "name": "gte",
@@ -88,17 +107,36 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "Blocknumber",
+          "name": "blocknumber",
+          "type": "uint40"
+        }
+      ],
+      "name": "gtz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
           "internalType": "Blocknumber",
           "name": "a",
-          "type": "uint32"
+          "type": "uint40"
         },
         {
           "internalType": "Blocknumber",
           "name": "b",
-          "type": "uint32"
+          "type": "uint40"
         }
       ],
       "name": "lt",
@@ -117,12 +155,12 @@
         {
           "internalType": "Blocknumber",
           "name": "a",
-          "type": "uint32"
+          "type": "uint40"
         },
         {
           "internalType": "Blocknumber",
           "name": "b",
-          "type": "uint32"
+          "type": "uint40"
         }
       ],
       "name": "lte",
@@ -136,17 +174,30 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "max",
+      "outputs": [
+        {
+          "internalType": "Blocknumber",
+          "name": "",
+          "type": "uint40"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
           "internalType": "Blocknumber",
           "name": "a",
-          "type": "uint32"
+          "type": "uint40"
         },
         {
           "internalType": "Blocknumber",
           "name": "b",
-          "type": "uint32"
+          "type": "uint40"
         }
       ],
       "name": "ne",
@@ -165,7 +216,7 @@
         {
           "internalType": "Blocknumber",
           "name": "blocknumber",
-          "type": "uint32"
+          "type": "uint40"
         }
       ],
       "name": "toInt",
@@ -178,10 +229,23 @@
       ],
       "stateMutability": "pure",
       "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "zero",
+      "outputs": [
+        {
+          "internalType": "Blocknumber",
+          "name": "",
+          "type": "uint40"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
     }
   ],
-  "bytecode": "0x61026c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80636effeac4116100655780636effeac4146100f85780637b4f5d3b1461011d5780639464280414610130578063e8b7afe31461014357600080fd5b80630123402814610097578063559cbd25146100bf57806356b0a7d4146100d25780636303db59146100e5575b600080fd5b6100aa6100a53660046101e8565b610157565b60405190151581526020015b60405180910390f35b6100aa6100cd3660046101e8565b61016e565b6100aa6100e03660046101e8565b610181565b6100aa6100f33660046101e8565b610194565b61010f61010636600461021b565b63ffffffff1690565b6040519081526020016100b6565b6100aa61012b3660046101e8565b6101a7565b6100aa61013e3660046101e8565b6101bb565b60405163ffffffff431681526020016100b6565b600063ffffffff80831690841610155b9392505050565b600063ffffffff80841690831614610167565b600063ffffffff80831690841611610167565b600063ffffffff80831690841610610167565b600063ffffffff8084169083161415610167565b600063ffffffff8083169084161115610167565b803563ffffffff811681146101e357600080fd5b919050565b600080604083850312156101fb57600080fd5b610204836101cf565b9150610212602084016101cf565b90509250929050565b60006020828403121561022d57600080fd5b610167826101cf56fea26469706673582212200301af4ac7fbd333c491316b5e715e093b8689f3fc63fff38b44b960d9172c4264736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c80636effeac4116100655780636effeac4146100f85780637b4f5d3b1461011d5780639464280414610130578063e8b7afe31461014357600080fd5b80630123402814610097578063559cbd25146100bf57806356b0a7d4146100d25780636303db59146100e5575b600080fd5b6100aa6100a53660046101e8565b610157565b60405190151581526020015b60405180910390f35b6100aa6100cd3660046101e8565b61016e565b6100aa6100e03660046101e8565b610181565b6100aa6100f33660046101e8565b610194565b61010f61010636600461021b565b63ffffffff1690565b6040519081526020016100b6565b6100aa61012b3660046101e8565b6101a7565b6100aa61013e3660046101e8565b6101bb565b60405163ffffffff431681526020016100b6565b600063ffffffff80831690841610155b9392505050565b600063ffffffff80841690831614610167565b600063ffffffff80831690841611610167565b600063ffffffff80831690841610610167565b600063ffffffff8084169083161415610167565b600063ffffffff8083169084161115610167565b803563ffffffff811681146101e357600080fd5b919050565b600080604083850312156101fb57600080fd5b610204836101cf565b9150610212602084016101cf565b90509250929050565b60006020828403121561022d57600080fd5b610167826101cf56fea26469706673582212200301af4ac7fbd333c491316b5e715e093b8689f3fc63fff38b44b960d9172c4264736f6c63430008140033",
+  "bytecode": "0x6102d9610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100bc575f3560e01c80639fa6a6e3116100795780639fa6a6e31461015e578063add9ce9914610164578063bc1b392d14610177578063c24922ce1461017d578063da09d48414610190578063ddf3d631146101b5575f80fd5b80636ac5db19146100c0578063790a38ad146100e257806383ffcdef1461010b5780638d38cd4b1461011e57806394335b1a146101385780639df876391461014b575b5f80fd5b64ffffffffff5b60405164ffffffffff90911681526020015b60405180910390f35b6100fb6100f0366004610259565b64ffffffffff161590565b60405190151581526020016100d9565b6100fb610119366004610272565b6101c8565b6100fb61012c366004610259565b64ffffffffff16151590565b6100fb610146366004610272565b6101de565b6100fb610159366004610272565b6101f2565b436100c7565b6100fb610172366004610272565b610205565b5f6100c7565b6100fb61018b366004610272565b610218565b6101a761019e366004610259565b63ffffffff1690565b6040519081526020016100d9565b6100fb6101c3366004610272565b61022c565b5f64ffffffffff808316908416115b9392505050565b5f64ffffffffff80831690841611156101d7565b5f64ffffffffff808416908316146101d7565b5f64ffffffffff808316908416106101d7565b5f64ffffffffff80831690841610156101d7565b5f64ffffffffff80841690831614156101d7565b803564ffffffffff81168114610254575f80fd5b919050565b5f60208284031215610269575f80fd5b6101d782610240565b5f8060408385031215610283575f80fd5b61028c83610240565b915061029a60208401610240565b9050925092905056fea2646970667358221220aaaafea640517fcdd24cee176e90b192ee4bb1d8927a1d43bb8c75b2ada7266064736f6c634300081a0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100bc575f3560e01c80639fa6a6e3116100795780639fa6a6e31461015e578063add9ce9914610164578063bc1b392d14610177578063c24922ce1461017d578063da09d48414610190578063ddf3d631146101b5575f80fd5b80636ac5db19146100c0578063790a38ad146100e257806383ffcdef1461010b5780638d38cd4b1461011e57806394335b1a146101385780639df876391461014b575b5f80fd5b64ffffffffff5b60405164ffffffffff90911681526020015b60405180910390f35b6100fb6100f0366004610259565b64ffffffffff161590565b60405190151581526020016100d9565b6100fb610119366004610272565b6101c8565b6100fb61012c366004610259565b64ffffffffff16151590565b6100fb610146366004610272565b6101de565b6100fb610159366004610272565b6101f2565b436100c7565b6100fb610172366004610272565b610205565b5f6100c7565b6100fb61018b366004610272565b610218565b6101a761019e366004610259565b63ffffffff1690565b6040519081526020016100d9565b6100fb6101c3366004610272565b61022c565b5f64ffffffffff808316908416115b9392505050565b5f64ffffffffff80831690841611156101d7565b5f64ffffffffff808416908316146101d7565b5f64ffffffffff808316908416106101d7565b5f64ffffffffff80831690841610156101d7565b5f64ffffffffff80841690831614156101d7565b803564ffffffffff81168114610254575f80fd5b919050565b5f60208284031215610269575f80fd5b6101d782610240565b5f8060408385031215610283575f80fd5b61028c83610240565b915061029a60208401610240565b9050925092905056fea2646970667358221220aaaafea640517fcdd24cee176e90b192ee4bb1d8927a1d43bb8c75b2ada7266064736f6c634300081a0033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/type/ChainId.sol/ChainIdLib.dbg.json

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

package/artifacts/contracts/type/ChainId.sol/ChainIdLib.json

@@ -0,0 +1,193 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "ChainIdLib",
+  "sourceName": "contracts/type/ChainId.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "chainId",
+          "type": "uint256"
+        }
+      ],
+      "name": "ErrorChainIdLibValueTooBig",
+      "type": "error"
+    },
+    {
+      "inputs": [],
+      "name": "current",
+      "outputs": [
+        {
+          "internalType": "ChainId",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "ChainId",
+          "name": "chainId",
+          "type": "uint96"
+        }
+      ],
+      "name": "eqz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "fromNftId",
+      "outputs": [
+        {
+          "internalType": "ChainId",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "ChainId",
+          "name": "chainId",
+          "type": "uint96"
+        }
+      ],
+      "name": "gtz",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "NftId",
+          "name": "nftId",
+          "type": "uint96"
+        }
+      ],
+      "name": "isCurrentChain",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "max",
+      "outputs": [
+        {
+          "internalType": "ChainId",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "chainId",
+          "type": "uint256"
+        }
+      ],
+      "name": "toChainId",
+      "outputs": [
+        {
+          "internalType": "ChainId",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "ChainId",
+          "name": "chainId",
+          "type": "uint96"
+        }
+      ],
+      "name": "toInt",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "zero",
+      "outputs": [
+        {
+          "internalType": "ChainId",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x6104a2610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c806352694ee81161006e57806352694ee8146101365780636ac5db19146101515780639fa6a6e31461015e578063bc1b392d14610166578063f2c821f71461016c575f80fd5b806308dc895e1461009f57806330b8415f146100cc5780633eb98356146100f85780633f0b10a014610123575b5f80fd5b6100b96100ad3660046102c9565b6001600160601b031690565b6040519081526020015b60405180910390f35b6100e86100da3660046102c9565b6001600160601b0316151590565b60405190151581526020016100c3565b61010b6101063660046102eb565b61017f565b6040516001600160601b0390911681526020016100c3565b61010b6101313660046102c9565b6101b3565b6100e86101443660046102c9565b6001600160601b03161590565b6001600160601b0361010b565b61010b6101cb565b5f61010b565b6100e861017a3660046102c9565b6101d5565b5f6001600160601b038211156101af576040516332bfb40d60e11b81526004810183905260240160405180910390fd5b5090565b5f6101c0610106836101e7565b92915050565b905090565b5f6101c64661017f565b5f466101e0836101e7565b1492915050565b60405163046e44af60e11b81526001600160601b03821660048201525f90819073__$94a2c899be079b00d952d0d84fffaa5c34$__906308dc895e90602401602060405180830381865af4158015610241573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102659190610302565b6001600160601b031690505f61027c606483610331565b9050606461028b826002610358565b61029690600a61044e565b6102a09084610331565b6102aa9190610459565b949350505050565b6001600160601b03811681146102c6575f80fd5b50565b5f602082840312156102d9575f80fd5b81356102e4816102b2565b9392505050565b5f602082840312156102fb575f80fd5b5035919050565b5f60208284031215610312575f80fd5b81516102e4816102b2565b634e487b7160e01b5f52601260045260245ffd5b5f8261033f5761033f61031d565b500690565b634e487b7160e01b5f52601160045260245ffd5b808201808211156101c0576101c0610344565b6001815b60018411156103a65780850481111561038a5761038a610344565b600184161561039857908102905b60019390931c92800261036f565b935093915050565b5f826103bc575060016101c0565b816103c857505f6101c0565b81600181146103de57600281146103e857610404565b60019150506101c0565b60ff8411156103f9576103f9610344565b50506001821b6101c0565b5060208310610133831016604e8410600b8410161715610427575081810a6101c0565b6104335f19848461036b565b805f190482111561044657610446610344565b029392505050565b5f6102e483836103ae565b5f826104675761046761031d565b50049056fea264697066735822122091c0ee9cd75999c17b406b1adc6d909e67f153b317981b970952987699a25ebc64736f6c634300081a0033",
+  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c806352694ee81161006e57806352694ee8146101365780636ac5db19146101515780639fa6a6e31461015e578063bc1b392d14610166578063f2c821f71461016c575f80fd5b806308dc895e1461009f57806330b8415f146100cc5780633eb98356146100f85780633f0b10a014610123575b5f80fd5b6100b96100ad3660046102c9565b6001600160601b031690565b6040519081526020015b60405180910390f35b6100e86100da3660046102c9565b6001600160601b0316151590565b60405190151581526020016100c3565b61010b6101063660046102eb565b61017f565b6040516001600160601b0390911681526020016100c3565b61010b6101313660046102c9565b6101b3565b6100e86101443660046102c9565b6001600160601b03161590565b6001600160601b0361010b565b61010b6101cb565b5f61010b565b6100e861017a3660046102c9565b6101d5565b5f6001600160601b038211156101af576040516332bfb40d60e11b81526004810183905260240160405180910390fd5b5090565b5f6101c0610106836101e7565b92915050565b905090565b5f6101c64661017f565b5f466101e0836101e7565b1492915050565b60405163046e44af60e11b81526001600160601b03821660048201525f90819073__$94a2c899be079b00d952d0d84fffaa5c34$__906308dc895e90602401602060405180830381865af4158015610241573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102659190610302565b6001600160601b031690505f61027c606483610331565b9050606461028b826002610358565b61029690600a61044e565b6102a09084610331565b6102aa9190610459565b949350505050565b6001600160601b03811681146102c6575f80fd5b50565b5f602082840312156102d9575f80fd5b81356102e4816102b2565b9392505050565b5f602082840312156102fb575f80fd5b5035919050565b5f60208284031215610312575f80fd5b81516102e4816102b2565b634e487b7160e01b5f52601260045260245ffd5b5f8261033f5761033f61031d565b500690565b634e487b7160e01b5f52601160045260245ffd5b808201808211156101c0576101c0610344565b6001815b60018411156103a65780850481111561038a5761038a610344565b600184161561039857908102905b60019390931c92800261036f565b935093915050565b5f826103bc575060016101c0565b816103c857505f6101c0565b81600181146103de57600281146103e857610404565b60019150506101c0565b60ff8411156103f9576103f9610344565b50506001821b6101c0565b5060208310610133831016604e8410600b8410161715610427575081810a6101c0565b6104335f19848461036b565b805f190482111561044657610446610344565b029392505050565b5f6102e483836103ae565b5f826104675761046761031d565b50049056fea264697066735822122091c0ee9cd75999c17b406b1adc6d909e67f153b317981b970952987699a25ebc64736f6c634300081a0033",
+  "linkReferences": {
+    "contracts/type/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 573
+        }
+      ]
+    }
+  },
+  "deployedLinkReferences": {
+    "contracts/type/NftId.sol": {
+      "NftIdLib": [
+        {
+          "length": 20,
+          "start": 521
+        }
+      ]
+    }
+  }
+}

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

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