@etherisc/gif-next 0.0.2-7ef1483-704 → 0.0.2-7f111bb-562

package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.dbg.json

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

package/artifacts/contracts/staking/TargetManagerLib.sol/TargetManagerLib.json

@@ -30,9 +30,19 @@
           "internalType": "NftId",
           "name": "targetNftId",
           "type": "uint96"
+        },
+        {
+          "internalType": "Seconds",
+          "name": "minLockingPeriod",
+          "type": "uint40"
+        },
+        {
+          "internalType": "Seconds",
+          "name": "lockingPeriod",
+          "type": "uint40"
         }
       ],
-      "name": "ErrorStakingLockingPeriodZero",
+      "name": "ErrorStakingLockingPeriodTooShort",
       "type": "error"
     },
     {
@@ -120,6 +130,64 @@
       "name": "ErrorStakingTargetUnexpectedObjectType",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "MathLigMulDivOverflow",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "tokenAmount",
+          "type": "uint96"
+        },
+        {
+          "internalType": "UFixed",
+          "name": "stakingRate",
+          "type": "uint256"
+        }
+      ],
+      "name": "calculateRequiredDipAmount",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "dipAmount",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "contract IERC20Metadata",
+          "name": "dipToken",
+          "type": "IERC20Metadata"
+        },
+        {
+          "internalType": "contract IERC20Metadata",
+          "name": "token",
+          "type": "IERC20Metadata"
+        },
+        {
+          "internalType": "UFixed",
+          "name": "requiredDipPerToken",
+          "type": "uint256"
+        }
+      ],
+      "name": "calculateStakingRate",
+      "outputs": [
+        {
+          "internalType": "UFixed",
+          "name": "stakingRate",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -246,6 +314,19 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "getMinimumLockingPeriod",
+      "outputs": [
+        {
+          "internalType": "Seconds",
+          "name": "minLockingPeriod",
+          "type": "uint40"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -397,18 +478,26 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6111d661003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100b35760003560e01c8063aea958cf1161007b578063aea958cf1461013c578063bf381be61461014f578063c6edc3dd14610170578063da86eb8014610178578063e8e7a2b41461018b578063f87bf373146101ac57600080fd5b80633e7964a1146100b8578063504a473d146100db5780635bcf927a146100fc578063658501a61461011f5780639ed616cd14610127575b600080fd5b6100c06101b4565b60405164ffffffffff90911681526020015b60405180910390f35b6100ee6100e9366004610c5f565b610234565b6040519081526020016100d2565b61010f61010a366004610c8b565b6102d2565b60405190151581526020016100d2565b6100ee610313565b61013a610135366004610cd0565b610393565b005b61013a61014a366004610d49565b61067c565b61016261015d366004610d75565b6106cf565b6040516100d2929190610dc0565b6100c061088b565b61013a610186366004610e06565b6108c8565b61019e610199366004610e3f565b6109c4565b6040516100d2929190610e80565b6100ee610b78565b604051630319d08b60e21b81526309660180600482015260009073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c906024015b602060405180830381865af415801561020b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061022f9190610ebf565b905090565b600073__$94a2c899be079b00d952d0d84fffaa5c34$__633889a4c86001600160601b038416601e6040516001600160e01b031960e085901b1681526001600160601b03909216600483015260ff166024820152604401602060405180830381865af41580156102a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102cc9190610edc565b92915050565b60006102e682600a5b60ff90811691161490565b156102f357506001919050565b6102fe8260466102db565b1561030b57506001919050565b506000919050565b604051631488c84560e01b815260216004820152600119602482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044015b602060405180830381865af415801561036f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061022f9190610edc565b604051630a4d29dd60e31b81526001600160601b038516600482015273__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af41580156103eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061040f9190610f0a565b1561042d5760405163019dbc4d60e31b815260040160405180910390fd5b60405163134fc55b60e11b81526001600160601b03851660048201526001600160a01b0386169063269f8ab690602401602060405180830381865afa15801561047a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061049e9190610f0a565b156104cc57604051638bf515e960e01b81526001600160601b03851660048201526024015b60405180910390fd5b6104d5836102d2565b61050657604051632778739960e11b81526001600160601b038516600482015260ff841660248201526044016104c3565b61051084836108c8565b61051a848261067c565b60405163e74d052f60e01b81526001600160601b03851660048201526001600160a01b0387169063e74d052f90602401602060405180830381865afa158015610567573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058b9190610f0a565b6105b35760405163686c563560e11b81526001600160601b03851660048201526024016104c3565b6040516305247a1760e51b81526001600160601b03851660048201526000906001600160a01b0388169063a48f42e090602401600060405180830381865afa158015610603573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261062b919081019061103b565b60400151905060ff808216908516146106735760405163e3c5e85760e01b81526001600160601b038616600482015260ff8086166024830152821660448201526064016104c3565b50505050505050565b61068c81610688610313565b1090565b156106cb578161069a610313565b604051637eed2aab60e01b81526001600160601b0390921660048301526024820152604481018290526064016104c3565b5050565b60408051608081018252600080825260208201819052918101829052606081018290526000856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610732573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610756919061110e565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa1580156107a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107ca9190610f0a565b6107f25760405163686c563560e11b81526001600160601b03861660048201526024016104c3565b6107fc85856108c8565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa158015610849573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061086d919061112b565b60408101805164ffffffffff90961690529396939550929350505050565b604051630319d08b60e21b815262f099c0600482015260009073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c906024016101ee565b60405163790a38ad60e01b815264ffffffffff8216600482015273__$71e292c09eace9601b3e21e68a1278917a$__9063790a38ad90602401602060405180830381865af415801561091e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109429190610f0a565b1561096b5760405163b7c4528f60e01b81526001600160601b03831660048201526024016104c3565b61097c816109776101b4565b610bbb565b156106cb578161098a6101b4565b6040516316eec12960e31b81526001600160601b03909216600483015264ffffffffff9081166024830152821660448201526064016104c3565b60408051608081018252600080825260208201819052918101829052606081018290526000856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610a27573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a4b919061110e565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610a9b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610abf9190610f0a565b610ae75760405163686c563560e11b81526001600160601b03861660048201526024016104c3565b610af1858561067c565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa158015610b3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b62919061112b565b6060810180519590529396939550929350505050565b604051631488c84560e01b815260056004820152600119602482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c84590604401610352565b6040516383ffcdef60e01b815264ffffffffff80841660048301528216602482015260009073__$71e292c09eace9601b3e21e68a1278917a$__906383ffcdef90604401602060405180830381865af4158015610c1c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c409190610f0a565b9392505050565b6001600160601b0381168114610c5c57600080fd5b50565b600060208284031215610c7157600080fd5b8135610c4081610c47565b60ff81168114610c5c57600080fd5b600060208284031215610c9d57600080fd5b8135610c4081610c7c565b6001600160a01b0381168114610c5c57600080fd5b64ffffffffff81168114610c5c57600080fd5b60008060008060008060c08789031215610ce957600080fd5b8635610cf481610ca8565b95506020870135610d0481610ca8565b94506040870135610d1481610c47565b93506060870135610d2481610c7c565b92506080870135610d3481610cbd565b8092505060a087013590509295509295509295565b60008060408385031215610d5c57600080fd5b8235610d6781610c47565b946020939093013593505050565b600080600060608486031215610d8a57600080fd5b8335610d9581610ca8565b92506020840135610da581610c47565b91506040840135610db581610cbd565b809150509250925092565b64ffffffffff8316815260a08101610c40602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b60008060408385031215610e1957600080fd5b8235610e2481610c47565b91506020830135610e3481610cbd565b809150509250929050565b600080600060608486031215610e5457600080fd5b8335610e5f81610ca8565b92506020840135610e6f81610c47565b929592945050506040919091013590565b82815260a08101610c40602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b600060208284031215610ed157600080fd5b8151610c4081610cbd565b600060208284031215610eee57600080fd5b5051919050565b80518015158114610f0557600080fd5b919050565b600060208284031215610f1c57600080fd5b610c4082610ef5565b634e487b7160e01b600052604160045260246000fd5b60405160e0810167ffffffffffffffff81118282101715610f5e57610f5e610f25565b60405290565b604051601f8201601f1916810167ffffffffffffffff81118282101715610f8d57610f8d610f25565b604052919050565b8051610f0581610c47565b8051610f0581610c7c565b8051610f0581610ca8565b600082601f830112610fc757600080fd5b815167ffffffffffffffff811115610fe157610fe1610f25565b6020610ff5601f8301601f19168201610f64565b828152858284870101111561100957600080fd5b60005b8381101561102757858101830151828201840152820161100c565b506000928101909101919091529392505050565b60006020828403121561104d57600080fd5b815167ffffffffffffffff8082111561106557600080fd5b9083019060e0828603121561107957600080fd5b611081610f3b565b61108a83610f95565b815261109860208401610f95565b60208201526110a960408401610fa0565b60408201526110ba60608401610ef5565b60608201526110cb60808401610fab565b60808201526110dc60a08401610fab565b60a082015260c0830151828111156110f357600080fd5b6110ff87828601610fb6565b60c08301525095945050505050565b60006020828403121561112057600080fd5b8151610c4081610ca8565b60006080828403121561113d57600080fd5b6040516080810181811067ffffffffffffffff8211171561116057611160610f25565b604052825161116e81610c7c565b815260208381015190820152604083015161118881610cbd565b6040820152606092830151928101929092525091905056fea2646970667358221220478d1e8b6de1603a66e083dbe0e895330c89a14977e996dd58374bde1033726864736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100b35760003560e01c8063aea958cf1161007b578063aea958cf1461013c578063bf381be61461014f578063c6edc3dd14610170578063da86eb8014610178578063e8e7a2b41461018b578063f87bf373146101ac57600080fd5b80633e7964a1146100b8578063504a473d146100db5780635bcf927a146100fc578063658501a61461011f5780639ed616cd14610127575b600080fd5b6100c06101b4565b60405164ffffffffff90911681526020015b60405180910390f35b6100ee6100e9366004610c5f565b610234565b6040519081526020016100d2565b61010f61010a366004610c8b565b6102d2565b60405190151581526020016100d2565b6100ee610313565b61013a610135366004610cd0565b610393565b005b61013a61014a366004610d49565b61067c565b61016261015d366004610d75565b6106cf565b6040516100d2929190610dc0565b6100c061088b565b61013a610186366004610e06565b6108c8565b61019e610199366004610e3f565b6109c4565b6040516100d2929190610e80565b6100ee610b78565b604051630319d08b60e21b81526309660180600482015260009073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c906024015b602060405180830381865af415801561020b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061022f9190610ebf565b905090565b600073__$94a2c899be079b00d952d0d84fffaa5c34$__633889a4c86001600160601b038416601e6040516001600160e01b031960e085901b1681526001600160601b03909216600483015260ff166024820152604401602060405180830381865af41580156102a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102cc9190610edc565b92915050565b60006102e682600a5b60ff90811691161490565b156102f357506001919050565b6102fe8260466102db565b1561030b57506001919050565b506000919050565b604051631488c84560e01b815260216004820152600119602482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044015b602060405180830381865af415801561036f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061022f9190610edc565b604051630a4d29dd60e31b81526001600160601b038516600482015273__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af41580156103eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061040f9190610f0a565b1561042d5760405163019dbc4d60e31b815260040160405180910390fd5b60405163134fc55b60e11b81526001600160601b03851660048201526001600160a01b0386169063269f8ab690602401602060405180830381865afa15801561047a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061049e9190610f0a565b156104cc57604051638bf515e960e01b81526001600160601b03851660048201526024015b60405180910390fd5b6104d5836102d2565b61050657604051632778739960e11b81526001600160601b038516600482015260ff841660248201526044016104c3565b61051084836108c8565b61051a848261067c565b60405163e74d052f60e01b81526001600160601b03851660048201526001600160a01b0387169063e74d052f90602401602060405180830381865afa158015610567573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061058b9190610f0a565b6105b35760405163686c563560e11b81526001600160601b03851660048201526024016104c3565b6040516305247a1760e51b81526001600160601b03851660048201526000906001600160a01b0388169063a48f42e090602401600060405180830381865afa158015610603573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261062b919081019061103b565b60400151905060ff808216908516146106735760405163e3c5e85760e01b81526001600160601b038616600482015260ff8086166024830152821660448201526064016104c3565b50505050505050565b61068c81610688610313565b1090565b156106cb578161069a610313565b604051637eed2aab60e01b81526001600160601b0390921660048301526024820152604481018290526064016104c3565b5050565b60408051608081018252600080825260208201819052918101829052606081018290526000856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610732573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610756919061110e565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa1580156107a6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107ca9190610f0a565b6107f25760405163686c563560e11b81526001600160601b03861660048201526024016104c3565b6107fc85856108c8565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa158015610849573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061086d919061112b565b60408101805164ffffffffff90961690529396939550929350505050565b604051630319d08b60e21b815262f099c0600482015260009073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c906024016101ee565b60405163790a38ad60e01b815264ffffffffff8216600482015273__$71e292c09eace9601b3e21e68a1278917a$__9063790a38ad90602401602060405180830381865af415801561091e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109429190610f0a565b1561096b5760405163b7c4528f60e01b81526001600160601b03831660048201526024016104c3565b61097c816109776101b4565b610bbb565b156106cb578161098a6101b4565b6040516316eec12960e31b81526001600160601b03909216600483015264ffffffffff9081166024830152821660448201526064016104c3565b60408051608081018252600080825260208201819052918101829052606081018290526000856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610a27573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a4b919061110e565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610a9b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610abf9190610f0a565b610ae75760405163686c563560e11b81526001600160601b03861660048201526024016104c3565b610af1858561067c565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa158015610b3e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b62919061112b565b6060810180519590529396939550929350505050565b604051631488c84560e01b815260056004820152600119602482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c84590604401610352565b6040516383ffcdef60e01b815264ffffffffff80841660048301528216602482015260009073__$71e292c09eace9601b3e21e68a1278917a$__906383ffcdef90604401602060405180830381865af4158015610c1c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c409190610f0a565b9392505050565b6001600160601b0381168114610c5c57600080fd5b50565b600060208284031215610c7157600080fd5b8135610c4081610c47565b60ff81168114610c5c57600080fd5b600060208284031215610c9d57600080fd5b8135610c4081610c7c565b6001600160a01b0381168114610c5c57600080fd5b64ffffffffff81168114610c5c57600080fd5b60008060008060008060c08789031215610ce957600080fd5b8635610cf481610ca8565b95506020870135610d0481610ca8565b94506040870135610d1481610c47565b93506060870135610d2481610c7c565b92506080870135610d3481610cbd565b8092505060a087013590509295509295509295565b60008060408385031215610d5c57600080fd5b8235610d6781610c47565b946020939093013593505050565b600080600060608486031215610d8a57600080fd5b8335610d9581610ca8565b92506020840135610da581610c47565b91506040840135610db581610cbd565b809150509250925092565b64ffffffffff8316815260a08101610c40602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b60008060408385031215610e1957600080fd5b8235610e2481610c47565b91506020830135610e3481610cbd565b809150509250929050565b600080600060608486031215610e5457600080fd5b8335610e5f81610ca8565b92506020840135610e6f81610c47565b929592945050506040919091013590565b82815260a08101610c40602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b600060208284031215610ed157600080fd5b8151610c4081610cbd565b600060208284031215610eee57600080fd5b5051919050565b80518015158114610f0557600080fd5b919050565b600060208284031215610f1c57600080fd5b610c4082610ef5565b634e487b7160e01b600052604160045260246000fd5b60405160e0810167ffffffffffffffff81118282101715610f5e57610f5e610f25565b60405290565b604051601f8201601f1916810167ffffffffffffffff81118282101715610f8d57610f8d610f25565b604052919050565b8051610f0581610c47565b8051610f0581610c7c565b8051610f0581610ca8565b600082601f830112610fc757600080fd5b815167ffffffffffffffff811115610fe157610fe1610f25565b6020610ff5601f8301601f19168201610f64565b828152858284870101111561100957600080fd5b60005b8381101561102757858101830151828201840152820161100c565b506000928101909101919091529392505050565b60006020828403121561104d57600080fd5b815167ffffffffffffffff8082111561106557600080fd5b9083019060e0828603121561107957600080fd5b611081610f3b565b61108a83610f95565b815261109860208401610f95565b60208201526110a960408401610fa0565b60408201526110ba60608401610ef5565b60608201526110cb60808401610fab565b60808201526110dc60a08401610fab565b60a082015260c0830151828111156110f357600080fd5b6110ff87828601610fb6565b60c08301525095945050505050565b60006020828403121561112057600080fd5b8151610c4081610ca8565b60006080828403121561113d57600080fd5b6040516080810181811067ffffffffffffffff8211171561116057611160610f25565b604052825161116e81610c7c565b815260208381015190820152604083015161118881610cbd565b6040820152606092830151928101929092525091905056fea2646970667358221220478d1e8b6de1603a66e083dbe0e895330c89a14977e996dd58374bde1033726864736f6c63430008140033",
+  "bytecode": "0x611589610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100f0575f3560e01c8063bf381be611610093578063e3bedc7d1161006e578063e3bedc7d146101da578063e8e7a2b4146101e2578063f2bbb0a814610203578063f87bf3731461022e575f80fd5b8063bf381be61461019e578063c6edc3dd146101bf578063da86eb80146101c7575f80fd5b8063658501a6116100ce578063658501a61461015b5780639ed616cd14610163578063aea958cf14610178578063b7f3e12c1461018b575f80fd5b80633e7964a1146100f4578063504a473d146101175780635bcf927a14610138575b5f80fd5b6100fc610236565b60405164ffffffffff90911681526020015b60405180910390f35b61012a610125366004610fc2565b6102b3565b60405190815260200161010e565b61014b610146366004610feb565b610341565b604051901515815260200161010e565b61012a61036f565b61017661017136600461102c565b6103ec565b005b6101766101863660046110a1565b6106ca565b61012a6101993660046110cb565b61071d565b6101b16101ac366004611109565b61087f565b60405161010e929190611151565b6100fc610a33565b6101766101d5366004611197565b610a6f565b6100fc610ba5565b6101f56101f03660046111ce565b610be1565b60405161010e9291906111fb565b6102166102113660046110a1565b610d8d565b6040516001600160601b03909116815260200161010e565b61012a610e17565b604051630319d08b60e21b8152630966018060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c906024015b602060405180830381865af415801561028a573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102ae919061123a565b905090565b60408051630711349960e31b81526001600160601b038316600482015260206024820181905291515f9273__$94a2c899be079b00d952d0d84fffaa5c34$__92633889a4c892604480830193928290030181865af4158015610317573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061033b9190611255565b92915050565b5f60ff821660010361035557506001919050565b60ff8216600a0361036857506001919050565b505f919050565b604051631488c84560e01b81526021600482015260011960248201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044015b602060405180830381865af41580156103c8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102ae9190611255565b604051630a4d29dd60e31b81526001600160601b038516600482015273__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af4158015610442573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104669190611280565b156104845760405163019dbc4d60e31b815260040160405180910390fd5b60405163134fc55b60e11b81526001600160601b03851660048201526001600160a01b0386169063269f8ab690602401602060405180830381865afa1580156104cf573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104f39190611280565b1561052157604051638bf515e960e01b81526001600160601b03851660048201526024015b60405180910390fd5b61052a83610341565b61055b57604051632778739960e11b81526001600160601b038516600482015260ff84166024820152604401610518565b6105658483610a6f565b61056f84826106ca565b60405163e74d052f60e01b81526001600160601b03851660048201526001600160a01b0387169063e74d052f90602401602060405180830381865afa1580156105ba573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105de9190611280565b6106065760405163686c563560e11b81526001600160601b0385166004820152602401610518565b6040516305247a1760e51b81526001600160601b03851660048201525f906001600160a01b0388169063a48f42e0906024015f60405180830381865afa158015610652573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526106799190810190611382565b60400151905060ff808216908516146106c15760405163e3c5e85760e01b81526001600160601b038616600482015260ff808616602483015282166044820152606401610518565b50505050505050565b6106da816106d661036f565b1090565b1561071957816106e861036f565b604051637eed2aab60e01b81526001600160601b039092166004830152602482015260448101829052606401610518565b5050565b5f8073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c8456001866001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610777573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061079b9190611454565b886001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156107d7573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107fb9190611454565b610805919061146f565b6040516001600160e01b031960e085901b16815260048101929092525f0b6024820152604401602060405180830381865af4158015610846573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061086a9190611255565b90506108768382610e59565b95945050505050565b604080516080810182525f80825260208201819052918101829052606081018290525f856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108de573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109029190611494565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610950573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109749190611280565b61099c5760405163686c563560e11b81526001600160601b0386166004820152602401610518565b6109a68585610a6f565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa1580156109f1573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a1591906114af565b60408101805164ffffffffff90961690529396939550929350505050565b604051630319d08b60e21b815262f099c060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c9060240161026f565b73__$71e292c09eace9601b3e21e68a1278917a$__63add9ce9964ffffffffff8316610a99610ba5565b6040516001600160e01b031960e085901b16815264ffffffffff928316600482015291166024820152604401602060405180830381865af4158015610ae0573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610b049190611280565b15610b4c5781610b12610ba5565b604051630114a1ef60e51b81526001600160601b03909216600483015264ffffffffff908116602483015282166044820152606401610518565b610b5d81610b58610236565b610e6d565b156107195781610b6b610236565b6040516316eec12960e31b81526001600160601b03909216600483015264ffffffffff908116602483015282166044820152606401610518565b604051630319d08b60e21b81526201518060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c9060240161026f565b604080516080810182525f80825260208201819052918101829052606081018290525f856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c40573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c649190611494565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610cb2573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610cd69190611280565b610cfe5760405163686c563560e11b81526001600160601b0386166004820152602401610518565b610d0885856106ca565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa158015610d53573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d7791906114af565b6060810180519590529396939550929350505050565b604051632c34efe560e11b81526001600160601b0383166004820152602481018290525f9073__$3bac17678db7ae928afa209f2f44deec9c$__90635869dfca90604401602060405180830381865af4158015610dec573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e109190611524565b9392505050565b604051631488c84560e01b81526005600482015260011960248201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044016103ad565b5f610e108383670de0b6b3a7640000610eef565b6040516383ffcdef60e01b815264ffffffffff8084166004830152821660248201525f9073__$71e292c09eace9601b3e21e68a1278917a$__906383ffcdef90604401602060405180830381865af4158015610ecb573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e109190611280565b5f80805f19858709858702925082811083820303915050805f03610f2657838281610f1c57610f1c61153f565b0492505050610e10565b808411610f4557604051629540d960e61b815260040160405180910390fd5b5f84868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203025f889003889004909101858311909403939093029303949094049190911702949350505050565b6001600160601b0381168114610fbf575f80fd5b50565b5f60208284031215610fd2575f80fd5b8135610e1081610fab565b60ff81168114610fbf575f80fd5b5f60208284031215610ffb575f80fd5b8135610e1081610fdd565b6001600160a01b0381168114610fbf575f80fd5b64ffffffffff81168114610fbf575f80fd5b5f805f805f8060c08789031215611041575f80fd5b863561104c81611006565b9550602087013561105c81611006565b9450604087013561106c81610fab565b9350606087013561107c81610fdd565b9250608087013561108c8161101a565b9598949750929591949360a090920135925050565b5f80604083850312156110b2575f80fd5b82356110bd81610fab565b946020939093013593505050565b5f805f606084860312156110dd575f80fd5b83356110e881611006565b925060208401356110f881611006565b929592945050506040919091013590565b5f805f6060848603121561111b575f80fd5b833561112681611006565b9250602084013561113681610fab565b915060408401356111468161101a565b809150509250925092565b64ffffffffff8316815260a08101610e10602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b5f80604083850312156111a8575f80fd5b82356111b381610fab565b915060208301356111c38161101a565b809150509250929050565b5f805f606084860312156111e0575f80fd5b83356111eb81611006565b925060208401356110f881610fab565b82815260a08101610e10602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b5f6020828403121561124a575f80fd5b8151610e108161101a565b5f60208284031215611265575f80fd5b5051919050565b8051801515811461127b575f80fd5b919050565b5f60208284031215611290575f80fd5b610e108261126c565b634e487b7160e01b5f52604160045260245ffd5b60405160e0810167ffffffffffffffff811182821017156112d0576112d0611299565b60405290565b805161127b81610fab565b805161127b81610fdd565b805161127b81611006565b5f82601f830112611306575f80fd5b815167ffffffffffffffff81111561132057611320611299565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561134f5761134f611299565b604052818152838201602001851015611366575f80fd5b8160208501602083015e5f918101602001919091529392505050565b5f60208284031215611392575f80fd5b815167ffffffffffffffff8111156113a8575f80fd5b820160e081850312156113b9575f80fd5b6113c16112ad565b6113ca826112d6565b81526113d8602083016112d6565b60208201526113e9604083016112e1565b60408201526113fa6060830161126c565b606082015261140b608083016112ec565b608082015261141c60a083016112ec565b60a082015260c082015167ffffffffffffffff81111561143a575f80fd5b611446868285016112f7565b60c083015250949350505050565b5f60208284031215611464575f80fd5b8151610e1081610fdd565b60ff828116828216039081111561033b57634e487b7160e01b5f52601160045260245ffd5b5f602082840312156114a4575f80fd5b8151610e1081611006565b5f60808284031280156114c0575f80fd5b506040516080810167ffffffffffffffff811182821017156114e4576114e4611299565b60405282516114f281610fdd565b815260208381015190820152604083015161150c8161101a565b60408201526060928301519281019290925250919050565b5f60208284031215611534575f80fd5b8151610e1081610fab565b634e487b7160e01b5f52601260045260245ffdfea2646970667358221220a600491292300f94c30da958e3c0c1d0c70303490a706156d625592e4904ea8064736f6c634300081a0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100f0575f3560e01c8063bf381be611610093578063e3bedc7d1161006e578063e3bedc7d146101da578063e8e7a2b4146101e2578063f2bbb0a814610203578063f87bf3731461022e575f80fd5b8063bf381be61461019e578063c6edc3dd146101bf578063da86eb80146101c7575f80fd5b8063658501a6116100ce578063658501a61461015b5780639ed616cd14610163578063aea958cf14610178578063b7f3e12c1461018b575f80fd5b80633e7964a1146100f4578063504a473d146101175780635bcf927a14610138575b5f80fd5b6100fc610236565b60405164ffffffffff90911681526020015b60405180910390f35b61012a610125366004610fc2565b6102b3565b60405190815260200161010e565b61014b610146366004610feb565b610341565b604051901515815260200161010e565b61012a61036f565b61017661017136600461102c565b6103ec565b005b6101766101863660046110a1565b6106ca565b61012a6101993660046110cb565b61071d565b6101b16101ac366004611109565b61087f565b60405161010e929190611151565b6100fc610a33565b6101766101d5366004611197565b610a6f565b6100fc610ba5565b6101f56101f03660046111ce565b610be1565b60405161010e9291906111fb565b6102166102113660046110a1565b610d8d565b6040516001600160601b03909116815260200161010e565b61012a610e17565b604051630319d08b60e21b8152630966018060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c906024015b602060405180830381865af415801561028a573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102ae919061123a565b905090565b60408051630711349960e31b81526001600160601b038316600482015260206024820181905291515f9273__$94a2c899be079b00d952d0d84fffaa5c34$__92633889a4c892604480830193928290030181865af4158015610317573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061033b9190611255565b92915050565b5f60ff821660010361035557506001919050565b60ff8216600a0361036857506001919050565b505f919050565b604051631488c84560e01b81526021600482015260011960248201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044015b602060405180830381865af41580156103c8573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102ae9190611255565b604051630a4d29dd60e31b81526001600160601b038516600482015273__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af4158015610442573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104669190611280565b156104845760405163019dbc4d60e31b815260040160405180910390fd5b60405163134fc55b60e11b81526001600160601b03851660048201526001600160a01b0386169063269f8ab690602401602060405180830381865afa1580156104cf573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104f39190611280565b1561052157604051638bf515e960e01b81526001600160601b03851660048201526024015b60405180910390fd5b61052a83610341565b61055b57604051632778739960e11b81526001600160601b038516600482015260ff84166024820152604401610518565b6105658483610a6f565b61056f84826106ca565b60405163e74d052f60e01b81526001600160601b03851660048201526001600160a01b0387169063e74d052f90602401602060405180830381865afa1580156105ba573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105de9190611280565b6106065760405163686c563560e11b81526001600160601b0385166004820152602401610518565b6040516305247a1760e51b81526001600160601b03851660048201525f906001600160a01b0388169063a48f42e0906024015f60405180830381865afa158015610652573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526106799190810190611382565b60400151905060ff808216908516146106c15760405163e3c5e85760e01b81526001600160601b038616600482015260ff808616602483015282166044820152606401610518565b50505050505050565b6106da816106d661036f565b1090565b1561071957816106e861036f565b604051637eed2aab60e01b81526001600160601b039092166004830152602482015260448101829052606401610518565b5050565b5f8073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c8456001866001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610777573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061079b9190611454565b886001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156107d7573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107fb9190611454565b610805919061146f565b6040516001600160e01b031960e085901b16815260048101929092525f0b6024820152604401602060405180830381865af4158015610846573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061086a9190611255565b90506108768382610e59565b95945050505050565b604080516080810182525f80825260208201819052918101829052606081018290525f856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108de573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109029190611494565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610950573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109749190611280565b61099c5760405163686c563560e11b81526001600160601b0386166004820152602401610518565b6109a68585610a6f565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa1580156109f1573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a1591906114af565b60408101805164ffffffffff90961690529396939550929350505050565b604051630319d08b60e21b815262f099c060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c9060240161026f565b73__$71e292c09eace9601b3e21e68a1278917a$__63add9ce9964ffffffffff8316610a99610ba5565b6040516001600160e01b031960e085901b16815264ffffffffff928316600482015291166024820152604401602060405180830381865af4158015610ae0573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610b049190611280565b15610b4c5781610b12610ba5565b604051630114a1ef60e51b81526001600160601b03909216600483015264ffffffffff908116602483015282166044820152606401610518565b610b5d81610b58610236565b610e6d565b156107195781610b6b610236565b6040516316eec12960e31b81526001600160601b03909216600483015264ffffffffff908116602483015282166044820152606401610518565b604051630319d08b60e21b81526201518060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c9060240161026f565b604080516080810182525f80825260208201819052918101829052606081018290525f856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610c40573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c649190611494565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610cb2573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610cd69190611280565b610cfe5760405163686c563560e11b81526001600160601b0386166004820152602401610518565b610d0885856106ca565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa158015610d53573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d7791906114af565b6060810180519590529396939550929350505050565b604051632c34efe560e11b81526001600160601b0383166004820152602481018290525f9073__$3bac17678db7ae928afa209f2f44deec9c$__90635869dfca90604401602060405180830381865af4158015610dec573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e109190611524565b9392505050565b604051631488c84560e01b81526005600482015260011960248201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044016103ad565b5f610e108383670de0b6b3a7640000610eef565b6040516383ffcdef60e01b815264ffffffffff8084166004830152821660248201525f9073__$71e292c09eace9601b3e21e68a1278917a$__906383ffcdef90604401602060405180830381865af4158015610ecb573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e109190611280565b5f80805f19858709858702925082811083820303915050805f03610f2657838281610f1c57610f1c61153f565b0492505050610e10565b808411610f4557604051629540d960e61b815260040160405180910390fd5b5f84868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203025f889003889004909101858311909403939093029303949094049190911702949350505050565b6001600160601b0381168114610fbf575f80fd5b50565b5f60208284031215610fd2575f80fd5b8135610e1081610fab565b60ff81168114610fbf575f80fd5b5f60208284031215610ffb575f80fd5b8135610e1081610fdd565b6001600160a01b0381168114610fbf575f80fd5b64ffffffffff81168114610fbf575f80fd5b5f805f805f8060c08789031215611041575f80fd5b863561104c81611006565b9550602087013561105c81611006565b9450604087013561106c81610fab565b9350606087013561107c81610fdd565b9250608087013561108c8161101a565b9598949750929591949360a090920135925050565b5f80604083850312156110b2575f80fd5b82356110bd81610fab565b946020939093013593505050565b5f805f606084860312156110dd575f80fd5b83356110e881611006565b925060208401356110f881611006565b929592945050506040919091013590565b5f805f6060848603121561111b575f80fd5b833561112681611006565b9250602084013561113681610fab565b915060408401356111468161101a565b809150509250925092565b64ffffffffff8316815260a08101610e10602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b5f80604083850312156111a8575f80fd5b82356111b381610fab565b915060208301356111c38161101a565b809150509250929050565b5f805f606084860312156111e0575f80fd5b83356111eb81611006565b925060208401356110f881610fab565b82815260a08101610e10602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b5f6020828403121561124a575f80fd5b8151610e108161101a565b5f60208284031215611265575f80fd5b5051919050565b8051801515811461127b575f80fd5b919050565b5f60208284031215611290575f80fd5b610e108261126c565b634e487b7160e01b5f52604160045260245ffd5b60405160e0810167ffffffffffffffff811182821017156112d0576112d0611299565b60405290565b805161127b81610fab565b805161127b81610fdd565b805161127b81611006565b5f82601f830112611306575f80fd5b815167ffffffffffffffff81111561132057611320611299565b604051601f8201601f19908116603f0116810167ffffffffffffffff8111828210171561134f5761134f611299565b604052818152838201602001851015611366575f80fd5b8160208501602083015e5f918101602001919091529392505050565b5f60208284031215611392575f80fd5b815167ffffffffffffffff8111156113a8575f80fd5b820160e081850312156113b9575f80fd5b6113c16112ad565b6113ca826112d6565b81526113d8602083016112d6565b60208201526113e9604083016112e1565b60408201526113fa6060830161126c565b606082015261140b608083016112ec565b608082015261141c60a083016112ec565b60a082015260c082015167ffffffffffffffff81111561143a575f80fd5b611446868285016112f7565b60c083015250949350505050565b5f60208284031215611464575f80fd5b8151610e1081610fdd565b60ff828116828216039081111561033b57634e487b7160e01b5f52601160045260245ffd5b5f602082840312156114a4575f80fd5b8151610e1081611006565b5f60808284031280156114c0575f80fd5b506040516080810167ffffffffffffffff811182821017156114e4576114e4611299565b60405282516114f281610fdd565b815260208381015190820152604083015161150c8161101a565b60408201526060928301519281019290925250919050565b5f60208284031215611534575f80fd5b8151610e1081610fab565b634e487b7160e01b5f52601260045260245ffdfea2646970667358221220a600491292300f94c30da958e3c0c1d0c70303490a706156d625592e4904ea8064736f6c634300081a0033",
   "linkReferences": {
+    "contracts/type/Amount.sol": {
+      "AmountLib": [
+        {
+          "length": 20,
+          "start": 3560
+        }
+      ]
+    },
     "contracts/type/NftId.sol": {
       "NftIdLib": [
         {
           "length": 20,
-          "start": 626
+          "start": 787
         },
         {
           "length": 20,
-          "start": 1003
+          "start": 1086
         }
       ]
     },
@@ -416,19 +505,23 @@
       "SecondsLib": [
         {
           "length": 20,
-          "start": 522
+          "start": 645
         },
         {
           "length": 20,
-          "start": 2272
+          "start": 2689
         },
         {
           "length": 20,
-          "start": 2334
+          "start": 2725
         },
         {
           "length": 20,
-          "start": 3100
+          "start": 3059
+        },
+        {
+          "length": 20,
+          "start": 3783
         }
       ]
     },
@@ -436,25 +529,37 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 878
+          "start": 963
         },
         {
           "length": 20,
-          "start": 3027
+          "start": 1877
+        },
+        {
+          "length": 20,
+          "start": 3691
         }
       ]
     }
   },
   "deployedLinkReferences": {
+    "contracts/type/Amount.sol": {
+      "AmountLib": [
+        {
+          "length": 20,
+          "start": 3508
+        }
+      ]
+    },
     "contracts/type/NftId.sol": {
       "NftIdLib": [
         {
           "length": 20,
-          "start": 568
+          "start": 735
         },
         {
           "length": 20,
-          "start": 945
+          "start": 1034
         }
       ]
     },
@@ -462,19 +567,23 @@
       "SecondsLib": [
         {
           "length": 20,
-          "start": 464
+          "start": 593
+        },
+        {
+          "length": 20,
+          "start": 2637
         },
         {
           "length": 20,
-          "start": 2214
+          "start": 2673
         },
         {
           "length": 20,
-          "start": 2276
+          "start": 3007
         },
         {
           "length": 20,
-          "start": 3042
+          "start": 3731
         }
       ]
     },
@@ -482,11 +591,15 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 820
+          "start": 911
+        },
+        {
+          "length": 20,
+          "start": 1825
         },
         {
           "length": 20,
-          "start": 2969
+          "start": 3639
         }
       ]
     }

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

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

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

@@ -3,8 +3,8 @@
   "contractName": "LibAddressSet",
   "sourceName": "contracts/type/AddressSet.sol",
   "abi": [],
-  "bytecode": "0x61042c61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806360a174941461007157806361f54352146100a65780638f78eb28146100d55780639fc5d958146100f5578063b06b9b8c14610115578063c01a867914610128575b600080fd5b81801561007d57600080fd5b5061009161008c366004610332565b610153565b60405190151581526020015b60405180910390f35b6100916100b4366004610332565b6001600160a01b031660009081526001919091016020526040902054151590565b6100e76100e336600461036e565b5490565b60405190815260200161009d565b81801561010157600080fd5b50610091610110366004610332565b61028b565b61009161012336600461036e565b541590565b61013b610136366004610387565b6102ff565b6040516001600160a01b03909116815260200161009d565b6001600160a01b0381166000908152600183016020526040812054801561027f5760006101816001836103a9565b8554909150600090610195906001906103a9565b90508181146102215760008660000182815481106101b5576101b56103ca565b60009182526020909120015487546001600160a01b03909116915081908890859081106101e4576101e46103ca565b600091825260208083209190910180546001600160a01b0319166001600160a01b0394851617905592909116815260018801909152604090208390555b8554869080610232576102326103e0565b60008281526020808220830160001990810180546001600160a01b03191690559092019092556001600160a01b038716825260018881019091526040822091909155935061028592505050565b60009150505b92915050565b6001600160a01b038116600090815260018301602052604081205481036102f757508154600180820184556000848152602080822090930180546001600160a01b0319166001600160a01b03861690811790915585549082528286019093526040902091909155610285565b506000610285565b6000826000018281548110610316576103166103ca565b6000918252602090912001546001600160a01b03169392505050565b6000806040838503121561034557600080fd5b8235915060208301356001600160a01b038116811461036357600080fd5b809150509250929050565b60006020828403121561038057600080fd5b5035919050565b6000806040838503121561039a57600080fd5b50508035926020909101359150565b8181038181111561028557634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea2646970667358221220f4c01c80939653069a4336852da32fdf268da234c74d1baea2c56632e1804efb64736f6c63430008140033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061006c5760003560e01c806360a174941461007157806361f54352146100a65780638f78eb28146100d55780639fc5d958146100f5578063b06b9b8c14610115578063c01a867914610128575b600080fd5b81801561007d57600080fd5b5061009161008c366004610332565b610153565b60405190151581526020015b60405180910390f35b6100916100b4366004610332565b6001600160a01b031660009081526001919091016020526040902054151590565b6100e76100e336600461036e565b5490565b60405190815260200161009d565b81801561010157600080fd5b50610091610110366004610332565b61028b565b61009161012336600461036e565b541590565b61013b610136366004610387565b6102ff565b6040516001600160a01b03909116815260200161009d565b6001600160a01b0381166000908152600183016020526040812054801561027f5760006101816001836103a9565b8554909150600090610195906001906103a9565b90508181146102215760008660000182815481106101b5576101b56103ca565b60009182526020909120015487546001600160a01b03909116915081908890859081106101e4576101e46103ca565b600091825260208083209190910180546001600160a01b0319166001600160a01b0394851617905592909116815260018801909152604090208390555b8554869080610232576102326103e0565b60008281526020808220830160001990810180546001600160a01b03191690559092019092556001600160a01b038716825260018881019091526040822091909155935061028592505050565b60009150505b92915050565b6001600160a01b038116600090815260018301602052604081205481036102f757508154600180820184556000848152602080822090930180546001600160a01b0319166001600160a01b03861690811790915585549082528286019093526040902091909155610285565b506000610285565b6000826000018281548110610316576103166103ca565b6000918252602090912001546001600160a01b03169392505050565b6000806040838503121561034557600080fd5b8235915060208301356001600160a01b038116811461036357600080fd5b809150509250929050565b60006020828403121561038057600080fd5b5035919050565b6000806040838503121561039a57600080fd5b50508035926020909101359150565b8181038181111561028557634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052603160045260246000fdfea2646970667358221220f4c01c80939653069a4336852da32fdf268da234c74d1baea2c56632e1804efb64736f6c63430008140033",
+  "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/b2b3c284f1c84c1299a34aea4fbe374f.json"
+  "buildInfo": "../../../build-info/069e2a3d84abad36150ad93219befd86.json"
 }

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

@@ -14,6 +14,11 @@
       "name": "ErrorAmountLibValueTooBig",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "MathLigMulDivOverflow",
+      "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": [
         {
@@ -161,6 +190,54 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "a1",
+          "type": "uint96"
+        },
+        {
+          "internalType": "Amount",
+          "name": "a2",
+          "type": "uint96"
+        }
+      ],
+      "name": "min",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "Amount",
+          "name": "amount",
+          "type": "uint96"
+        },
+        {
+          "internalType": "UFixed",
+          "name": "factor",
+          "type": "uint256"
+        }
+      ],
+      "name": "multiplyWith",
+      "outputs": [
+        {
+          "internalType": "Amount",
+          "name": "",
+          "type": "uint96"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -256,14 +333,22 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61041461003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c806355205f0f1161007b57806355205f0f146101945780636ac5db19146101a757806398058c4c146101b4578063bc1b392d146101d3578063c4cade9d146101da578063c79eaa22146101f957600080fd5b806308dc895e146100c357806309a81d62146100f0578063274acb351461011f57806330b8415f1461014a5780634c41dd961461016657806352694ee814610179575b600080fd5b6100dd6100d1366004610301565b6001600160601b031690565b6040519081526020015b60405180910390f35b61010f6100fe36600461031c565b6001600160601b0390811691161090565b60405190151581526020016100e7565b61013261012d36600461031c565b61020c565b6040516001600160601b0390911681526020016100e7565b61010f610158366004610301565b6001600160601b0316151590565b61013261017436600461034f565b61021f565b61010f610187366004610301565b6001600160601b03161590565b6100dd6101a2366004610301565b610254565b6001600160601b03610132565b61010f6101c236600461031c565b6001600160601b0390811691161190565b6000610132565b61010f6101e836600461031c565b6001600160601b0390811691161490565b61013261020736600461031c565b6102d9565b6000610218828461037e565b9392505050565b60006001600160601b0382111561025057604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b038216600482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156102af573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d391906103a5565b92915050565b600061021882846103be565b80356001600160601b03811681146102fc57600080fd5b919050565b60006020828403121561031357600080fd5b610218826102e5565b6000806040838503121561032f57600080fd5b610338836102e5565b9150610346602084016102e5565b90509250929050565b60006020828403121561036157600080fd5b5035919050565b634e487b7160e01b600052601160045260246000fd5b6001600160601b0381811683821601908082111561039e5761039e610368565b5092915050565b6000602082840312156103b757600080fd5b5051919050565b6001600160601b0382811682821603908082111561039e5761039e61036856fea2646970667358221220ec77626414aa805945092be2df21e5d4ef115bb82db0a638523075e2c98ad3aa64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100be5760003560e01c806355205f0f1161007b57806355205f0f146101945780636ac5db19146101a757806398058c4c146101b4578063bc1b392d146101d3578063c4cade9d146101da578063c79eaa22146101f957600080fd5b806308dc895e146100c357806309a81d62146100f0578063274acb351461011f57806330b8415f1461014a5780634c41dd961461016657806352694ee814610179575b600080fd5b6100dd6100d1366004610301565b6001600160601b031690565b6040519081526020015b60405180910390f35b61010f6100fe36600461031c565b6001600160601b0390811691161090565b60405190151581526020016100e7565b61013261012d36600461031c565b61020c565b6040516001600160601b0390911681526020016100e7565b61010f610158366004610301565b6001600160601b0316151590565b61013261017436600461034f565b61021f565b61010f610187366004610301565b6001600160601b03161590565b6100dd6101a2366004610301565b610254565b6001600160601b03610132565b61010f6101c236600461031c565b6001600160601b0390811691161190565b6000610132565b61010f6101e836600461031c565b6001600160601b0390811691161490565b61013261020736600461031c565b6102d9565b6000610218828461037e565b9392505050565b60006001600160601b0382111561025057604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b038216600482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156102af573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d391906103a5565b92915050565b600061021882846103be565b80356001600160601b03811681146102fc57600080fd5b919050565b60006020828403121561031357600080fd5b610218826102e5565b6000806040838503121561032f57600080fd5b610338836102e5565b9150610346602084016102e5565b90509250929050565b60006020828403121561036157600080fd5b5035919050565b634e487b7160e01b600052601160045260246000fd5b6001600160601b0381811683821601908082111561039e5761039e610368565b5092915050565b6000602082840312156103b757600080fd5b5051919050565b6001600160601b0382811682821603908082111561039e5761039e61036856fea2646970667358221220ec77626414aa805945092be2df21e5d4ef115bb82db0a638523075e2c98ad3aa64736f6c63430008140033",
+  "bytecode": "0x6106ac610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100fb575f3560e01c806355205f0f1161009e57806398058c4c1161006e57806398058c4c1461022a578063bc1b392d14610249578063c4cade9d1461024f578063c79eaa221461026e575f80fd5b806355205f0f146101e45780635869dfca146101f75780636ac5db191461020a5780637931c81114610217575f80fd5b8063274acb35116100d9578063274acb351461016f57806330b8415f1461019a5780634c41dd96146101b657806352694ee8146101c9575f80fd5b806308dc895e146100ff57806309a81d621461012c578063262b32d21461014f575b5f80fd5b61011961010d366004610570565b6001600160601b031690565b6040519081526020015b60405180910390f35b61013f61013a366004610589565b610281565b6040519015158152602001610123565b61013f61015d366004610589565b6001600160601b039081169116101590565b61018261017d366004610589565b610297565b6040516001600160601b039091168152602001610123565b61013f6101a8366004610570565b6001600160601b0316151590565b6101826101c43660046105ba565b6102a9565b61013f6101d7366004610570565b6001600160601b03161590565b6101196101f2366004610570565b6102dd565b6101826102053660046105d1565b610359565b6001600160601b03610182565b610182610225366004610589565b610457565b61013f610238366004610589565b6001600160601b0390811691161190565b5f610182565b61013f61025d366004610589565b6001600160601b0390811691161490565b61018261027c366004610589565b61047f565b6001600160601b03808216908316105b92915050565b5f6102a2828461060d565b9392505050565b5f6001600160601b038211156102d957604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b03821660048201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af4158015610335573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610291919061062c565b6040516322f5db0f60e11b81526001600160601b03831660048201525f906102a2906103e490849073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156103bb573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103df919061062c565b61048a565b604051632255341b60e11b8152600481019190915273__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af4158015610433573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101c4919061062c565b5f816001600160601b0316836001600160601b03161015610479575081610291565b50919050565b5f6102a28284610643565b5f6102a28383670de0b6b3a76400005f80805f19858709858702925082811083820303915050805f036104d0578382816104c6576104c6610662565b04925050506102a2565b8084116104ef57604051629540d960e61b815260040160405180910390fd5b5f84868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203025f889003889004909101858311909403939093029303949094049190911702949350505050565b80356001600160601b038116811461056b575f80fd5b919050565b5f60208284031215610580575f80fd5b6102a282610555565b5f806040838503121561059a575f80fd5b6105a383610555565b91506105b160208401610555565b90509250929050565b5f602082840312156105ca575f80fd5b5035919050565b5f80604083850312156105e2575f80fd5b6105eb83610555565b946020939093013593505050565b634e487b7160e01b5f52601160045260245ffd5b6001600160601b038181168382160190811115610291576102916105f9565b5f6020828403121561063c575f80fd5b5051919050565b6001600160601b038281168282160390811115610291576102916105f9565b634e487b7160e01b5f52601260045260245ffdfea264697066735822122013765204b0b341e5f899c19c579dc5f273e4df7c20bc624cd8e865431bddce3764736f6c634300081a0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100fb575f3560e01c806355205f0f1161009e57806398058c4c1161006e57806398058c4c1461022a578063bc1b392d14610249578063c4cade9d1461024f578063c79eaa221461026e575f80fd5b806355205f0f146101e45780635869dfca146101f75780636ac5db191461020a5780637931c81114610217575f80fd5b8063274acb35116100d9578063274acb351461016f57806330b8415f1461019a5780634c41dd96146101b657806352694ee8146101c9575f80fd5b806308dc895e146100ff57806309a81d621461012c578063262b32d21461014f575b5f80fd5b61011961010d366004610570565b6001600160601b031690565b6040519081526020015b60405180910390f35b61013f61013a366004610589565b610281565b6040519015158152602001610123565b61013f61015d366004610589565b6001600160601b039081169116101590565b61018261017d366004610589565b610297565b6040516001600160601b039091168152602001610123565b61013f6101a8366004610570565b6001600160601b0316151590565b6101826101c43660046105ba565b6102a9565b61013f6101d7366004610570565b6001600160601b03161590565b6101196101f2366004610570565b6102dd565b6101826102053660046105d1565b610359565b6001600160601b03610182565b610182610225366004610589565b610457565b61013f610238366004610589565b6001600160601b0390811691161190565b5f610182565b61013f61025d366004610589565b6001600160601b0390811691161490565b61018261027c366004610589565b61047f565b6001600160601b03808216908316105b92915050565b5f6102a2828461060d565b9392505050565b5f6001600160601b038211156102d957604051635a1bd76760e01b81526004810183905260240160405180910390fd5b5090565b6040516322f5db0f60e11b81526001600160601b03821660048201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af4158015610335573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610291919061062c565b6040516322f5db0f60e11b81526001600160601b03831660048201525f906102a2906103e490849073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e90602401602060405180830381865af41580156103bb573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103df919061062c565b61048a565b604051632255341b60e11b8152600481019190915273__$bf7bc340cbb9229ef1de2c568356e67902$__906344aa683690602401602060405180830381865af4158015610433573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101c4919061062c565b5f816001600160601b0316836001600160601b03161015610479575081610291565b50919050565b5f6102a28284610643565b5f6102a28383670de0b6b3a76400005f80805f19858709858702925082811083820303915050805f036104d0578382816104c6576104c6610662565b04925050506102a2565b8084116104ef57604051629540d960e61b815260040160405180910390fd5b5f84868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203025f889003889004909101858311909403939093029303949094049190911702949350505050565b80356001600160601b038116811461056b575f80fd5b919050565b5f60208284031215610580575f80fd5b6102a282610555565b5f806040838503121561059a575f80fd5b6105a383610555565b91506105b160208401610555565b90509250929050565b5f602082840312156105ca575f80fd5b5035919050565b5f80604083850312156105e2575f80fd5b6105eb83610555565b946020939093013593505050565b634e487b7160e01b5f52601160045260245ffd5b6001600160601b038181168382160190811115610291576102916105f9565b5f6020828403121561063c575f80fd5b5051919050565b6001600160601b038281168282160390811115610291576102916105f9565b634e487b7160e01b5f52601260045260245ffdfea264697066735822122013765204b0b341e5f899c19c579dc5f273e4df7c20bc624cd8e865431bddce3764736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/UFixed.sol": {
       "UFixedLib": [
         {
           "length": 20,
-          "start": 687
+          "start": 817
+        },
+        {
+          "length": 20,
+          "start": 951
+        },
+        {
+          "length": 20,
+          "start": 1071
         }
       ]
     }
@@ -273,7 +358,15 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 629
+          "start": 765
+        },
+        {
+          "length": 20,
+          "start": 899
+        },
+        {
+          "length": 20,
+          "start": 1019
         }
       ]
     }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/b2b3c284f1c84c1299a34aea4fbe374f.json"
+  "buildInfo": "../../../build-info/069e2a3d84abad36150ad93219befd86.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/b2b3c284f1c84c1299a34aea4fbe374f.json"
+  "buildInfo": "../../../build-info/069e2a3d84abad36150ad93219befd86.json"
 }

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

@@ -154,14 +154,14 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x61034e61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c8063b9c6c93011610065578063b9c6c930146100fc578063bc1b392d14610123578063f3ac7cb51461012a578063faac2b221461014057600080fd5b80635d21681c146100975780636ac5db19146100c0578063904da217146100c85780639cc45a36146100ee575b600080fd5b6100a86100a5366004610258565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100a8565b6100db6100d6366004610273565b610161565b60405160ff1990911681526020016100b7565b6100a86100a53660046102b6565b61011361010a366004610258565b61ffff16151590565b60405190151581526020016100b7565b60006100a8565b610113610138366004610258565b61ffff161590565b61015361014e366004610273565b6101a7565b6040519081526020016100b7565b600061016e8360106102cf565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff1916905092915050565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60d46101cf8686610161565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610216573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023a91906102ff565b9392505050565b803561ffff8116811461025357600080fd5b919050565b60006020828403121561026a57600080fd5b61023a82610241565b6000806040838503121561028657600080fd5b61028f83610241565b915060208301356001600160601b03811681146102ab57600080fd5b809150509250929050565b6000602082840312156102c857600080fd5b5035919050565b61ffff8181168382160190808211156102f857634e487b7160e01b600052601160045260246000fd5b5092915050565b60006020828403121561031157600080fd5b505191905056fea2646970667358221220fa9cc7e8fdfbd359dbc33e97451272c650da5b2957aed5933b25872da462a89764736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100925760003560e01c8063b9c6c93011610065578063b9c6c930146100fc578063bc1b392d14610123578063f3ac7cb51461012a578063faac2b221461014057600080fd5b80635d21681c146100975780636ac5db19146100c0578063904da217146100c85780639cc45a36146100ee575b600080fd5b6100a86100a5366004610258565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100a8565b6100db6100d6366004610273565b610161565b60405160ff1990911681526020016100b7565b6100a86100a53660046102b6565b61011361010a366004610258565b61ffff16151590565b60405190151581526020016100b7565b60006100a8565b610113610138366004610258565b61ffff161590565b61015361014e366004610273565b6101a7565b6040519081526020016100b7565b600061016e8360106102cf565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff1916905092915050565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60d46101cf8686610161565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af4158015610216573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061023a91906102ff565b9392505050565b803561ffff8116811461025357600080fd5b919050565b60006020828403121561026a57600080fd5b61023a82610241565b6000806040838503121561028657600080fd5b61028f83610241565b915060208301356001600160601b03811681146102ab57600080fd5b809150509250929050565b6000602082840312156102c857600080fd5b5035919050565b61ffff8181168382160190808211156102f857634e487b7160e01b600052601160045260246000fd5b5092915050565b60006020828403121561031157600080fd5b505191905056fea2646970667358221220fa9cc7e8fdfbd359dbc33e97451272c650da5b2957aed5933b25872da462a89764736f6c63430008140033",
+  "bytecode": "0x610333610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe7300000000000000000000000000000000000000003014608060405260043610610090575f3560e01c8063b9c6c93011610063578063b9c6c930146100f9578063bc1b392d14610120578063f3ac7cb514610126578063faac2b221461013c575f80fd5b80635d21681c146100945780636ac5db19146100bd578063904da217146100c55780639cc45a36146100eb575b5f80fd5b6100a56100a2366004610250565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100a5565b6100d86100d3366004610269565b61015d565b60405160ff1990911681526020016100b4565b6100a56100a23660046102a9565b610110610107366004610250565b61ffff16151590565b60405190151581526020016100b4565b5f6100a5565b610110610134366004610250565b61ffff161590565b61014f61014a366004610269565b6101a3565b6040519081526020016100b4565b5f6101698360106102c0565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff191690505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60176101ca868661015d565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561020f573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061023391906102e6565b9392505050565b803561ffff8116811461024b575f80fd5b919050565b5f60208284031215610260575f80fd5b6102338261023a565b5f806040838503121561027a575f80fd5b6102838361023a565b915060208301356001600160601b038116811461029e575f80fd5b809150509250929050565b5f602082840312156102b9575f80fd5b5035919050565b61ffff818116838216019081111561019d57634e487b7160e01b5f52601160045260245ffd5b5f602082840312156102f6575f80fd5b505191905056fea2646970667358221220ed8d9dfe90ceaf3f5af6cbecf1d4994fa204b577ae8c7f10b7245e677e24529664736f6c634300081a0033",
+  "deployedBytecode": "0x7300000000000000000000000000000000000000003014608060405260043610610090575f3560e01c8063b9c6c93011610063578063b9c6c930146100f9578063bc1b392d14610120578063f3ac7cb514610126578063faac2b221461013c575f80fd5b80635d21681c146100945780636ac5db19146100bd578063904da217146100c55780639cc45a36146100eb575b5f80fd5b6100a56100a2366004610250565b90565b60405161ffff90911681526020015b60405180910390f35b61ffff6100a5565b6100d86100d3366004610269565b61015d565b60405160ff1990911681526020016100b4565b6100a56100a23660046102a9565b610110610107366004610250565b61ffff16151590565b60405190151581526020016100b4565b5f6100a5565b610110610134366004610250565b61ffff161590565b61014f61014a366004610269565b6101a3565b6040519081526020016100b4565b5f6101698360106102c0565b61ffff16826001600160601b0316901b6001600160601b031660901b71ffffffffffffffffffffffffffffffffffff191690505b92915050565b5f73__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce60176101ca868661015d565b6040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af415801561020f573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061023391906102e6565b9392505050565b803561ffff8116811461024b575f80fd5b919050565b5f60208284031215610260575f80fd5b6102338261023a565b5f806040838503121561027a575f80fd5b6102838361023a565b915060208301356001600160601b038116811461029e575f80fd5b809150509250929050565b5f602082840312156102b9575f80fd5b5035919050565b61ffff818116838216019081111561019d57634e487b7160e01b5f52601160045260245ffd5b5f602082840312156102f6575f80fd5b505191905056fea2646970667358221220ed8d9dfe90ceaf3f5af6cbecf1d4994fa204b577ae8c7f10b7245e677e24529664736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [
         {
           "length": 20,
-          "start": 485
+          "start": 474
         }
       ]
     }
@@ -171,7 +171,7 @@
       "Key32Lib": [
         {
           "length": 20,
-          "start": 427
+          "start": 422
         }
       ]
     }

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

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