@etherisc/gif-next 0.0.2-d16f92c-416 → 0.0.2-d1ee1ae-450

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/6efa1c926ce3374a2355eff3df062902.json"
+  "buildInfo": "../../../build-info/e9f8bea1f0ae4730026a44f2d32e430a.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"
     },
     {
@@ -45,12 +55,12 @@
         {
           "internalType": "UFixed",
           "name": "maxRewardRate",
-          "type": "uint256"
+          "type": "uint160"
         },
         {
           "internalType": "UFixed",
           "name": "rewardRate",
-          "type": "uint256"
+          "type": "uint160"
         }
       ],
       "name": "ErrorStakingRewardRateTooHigh",
@@ -120,6 +130,11 @@
       "name": "ErrorStakingTargetUnexpectedObjectType",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "MathOverflowedMulDiv",
+      "type": "error"
+    },
     {
       "inputs": [
         {
@@ -130,7 +145,7 @@
         {
           "internalType": "UFixed",
           "name": "stakingRate",
-          "type": "uint256"
+          "type": "uint160"
         }
       ],
       "name": "calculateRequiredDipAmount",
@@ -159,7 +174,7 @@
         {
           "internalType": "UFixed",
           "name": "requiredDipPerToken",
-          "type": "uint256"
+          "type": "uint160"
         }
       ],
       "name": "calculateStakingRate",
@@ -167,7 +182,7 @@
         {
           "internalType": "UFixed",
           "name": "stakingRate",
-          "type": "uint256"
+          "type": "uint160"
         }
       ],
       "stateMutability": "view",
@@ -201,7 +216,7 @@
         {
           "internalType": "UFixed",
           "name": "rewardRate",
-          "type": "uint256"
+          "type": "uint160"
         }
       ],
       "name": "checkRewardRate",
@@ -239,7 +254,7 @@
         {
           "internalType": "UFixed",
           "name": "initialRewardRate",
-          "type": "uint256"
+          "type": "uint160"
         }
       ],
       "name": "checkTargetParameters",
@@ -267,7 +282,7 @@
         {
           "internalType": "UFixed",
           "name": "defaultRewardRate",
-          "type": "uint256"
+          "type": "uint160"
         }
       ],
       "stateMutability": "pure",
@@ -293,7 +308,20 @@
         {
           "internalType": "UFixed",
           "name": "maxRewardRate",
-          "type": "uint256"
+          "type": "uint160"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getMinimumLockingPeriod",
+      "outputs": [
+        {
+          "internalType": "Seconds",
+          "name": "minLockingPeriod",
+          "type": "uint40"
         }
       ],
       "stateMutability": "pure",
@@ -364,24 +392,29 @@
         },
         {
           "components": [
+            {
+              "internalType": "UFixed",
+              "name": "rewardRate",
+              "type": "uint160"
+            },
+            {
+              "internalType": "Amount",
+              "name": "maxStakedAmount",
+              "type": "uint96"
+            },
             {
               "internalType": "ObjectType",
               "name": "objectType",
               "type": "uint8"
             },
-            {
-              "internalType": "uint256",
-              "name": "chainId",
-              "type": "uint256"
-            },
             {
               "internalType": "Seconds",
               "name": "lockingPeriod",
               "type": "uint40"
             },
             {
-              "internalType": "UFixed",
-              "name": "rewardRate",
+              "internalType": "uint256",
+              "name": "chainId",
               "type": "uint256"
             }
           ],
@@ -408,7 +441,7 @@
         {
           "internalType": "UFixed",
           "name": "rewardRate",
-          "type": "uint256"
+          "type": "uint160"
         }
       ],
       "name": "updateRewardRate",
@@ -416,28 +449,33 @@
         {
           "internalType": "UFixed",
           "name": "oldRewardRate",
-          "type": "uint256"
+          "type": "uint160"
         },
         {
           "components": [
+            {
+              "internalType": "UFixed",
+              "name": "rewardRate",
+              "type": "uint160"
+            },
+            {
+              "internalType": "Amount",
+              "name": "maxStakedAmount",
+              "type": "uint96"
+            },
             {
               "internalType": "ObjectType",
               "name": "objectType",
               "type": "uint8"
             },
-            {
-              "internalType": "uint256",
-              "name": "chainId",
-              "type": "uint256"
-            },
             {
               "internalType": "Seconds",
               "name": "lockingPeriod",
               "type": "uint40"
             },
             {
-              "internalType": "UFixed",
-              "name": "rewardRate",
+              "internalType": "uint256",
+              "name": "chainId",
               "type": "uint256"
             }
           ],
@@ -450,14 +488,14 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6115be61003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100d95760003560e01c8063b7f3e12c11610096578063da86eb8011610070578063da86eb80146101b1578063e8e7a2b4146101c4578063f2bbb0a8146101e5578063f87bf3731461021057600080fd5b8063b7f3e12c14610175578063bf381be614610188578063c6edc3dd146101a957600080fd5b80633e7964a1146100de578063504a473d146101015780635bcf927a14610122578063658501a6146101455780639ed616cd1461014d578063aea958cf14610162575b600080fd5b6100e6610218565b60405164ffffffffff90911681526020015b60405180910390f35b61011461010f366004610fa0565b610298565b6040519081526020016100f8565b610135610130366004610fcc565b610336565b60405190151581526020016100f8565b610114610366565b61016061015b366004611011565b6103e6565b005b61016061017036600461108a565b6106cf565b6101146101833660046110b6565b610722565b61019b6101963660046110f7565b61088c565b6040516100f8929190611142565b6100e6610a48565b6101606101bf366004611188565b610a85565b6101d76101d23660046111c1565b610b81565b6040516100f89291906111f1565b6101f86101f336600461108a565b610d35565b6040516001600160601b0390911681526020016100f8565b610114610dc2565b604051630319d08b60e21b81526309660180600482015260009073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c906024015b602060405180830381865af415801561026f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102939190611230565b905090565b600073__$94a2c899be079b00d952d0d84fffaa5c34$__633889a4c86001600160601b038416601f6040516001600160e01b031960e085901b1681526001600160601b03909216600483015260ff166024820152604401602060405180830381865af415801561030c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610330919061124d565b92915050565b600060ff821660010361034b57506001919050565b60ff8216600a0361035e57506001919050565b506000919050565b604051631488c84560e01b815260216004820152600119602482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044015b602060405180830381865af41580156103c2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610293919061124d565b604051630a4d29dd60e31b81526001600160601b038516600482015273__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af415801561043e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610462919061127b565b156104805760405163019dbc4d60e31b815260040160405180910390fd5b60405163134fc55b60e11b81526001600160601b03851660048201526001600160a01b0386169063269f8ab690602401602060405180830381865afa1580156104cd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104f1919061127b565b1561051f57604051638bf515e960e01b81526001600160601b03851660048201526024015b60405180910390fd5b61052883610336565b61055957604051632778739960e11b81526001600160601b038516600482015260ff84166024820152604401610516565b6105638483610a85565b61056d84826106cf565b60405163e74d052f60e01b81526001600160601b03851660048201526001600160a01b0387169063e74d052f90602401602060405180830381865afa1580156105ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105de919061127b565b6106065760405163686c563560e11b81526001600160601b0385166004820152602401610516565b6040516305247a1760e51b81526001600160601b03851660048201526000906001600160a01b0388169063a48f42e090602401600060405180830381865afa158015610656573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261067e91908101906113ac565b60400151905060ff808216908516146106c65760405163e3c5e85760e01b81526001600160601b038616600482015260ff808616602483015282166044820152606401610516565b50505050505050565b6106df816106db610366565b1090565b1561071e57816106ed610366565b604051637eed2aab60e01b81526001600160601b039092166004830152602482015260448101829052606401610516565b5050565b60008073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c8456001866001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa15801561077f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107a3919061147f565b886001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156107e1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610805919061147f565b61080f919061149c565b6040516001600160e01b031960e085901b168152600481019290925260000b6024820152604401602060405180830381865af4158015610853573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610877919061124d565b90506108838382610e05565b95945050505050565b60408051608081018252600080825260208201819052918101829052606081018290526000856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108ef573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061091391906114c3565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610963573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610987919061127b565b6109af5760405163686c563560e11b81526001600160601b0386166004820152602401610516565b6109b98585610a85565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa158015610a06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a2a91906114e0565b60408101805164ffffffffff90961690529396939550929350505050565b604051630319d08b60e21b815262f099c0600482015260009073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c90602401610252565b60405163790a38ad60e01b815264ffffffffff8216600482015273__$71e292c09eace9601b3e21e68a1278917a$__9063790a38ad90602401602060405180830381865af4158015610adb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610aff919061127b565b15610b285760405163b7c4528f60e01b81526001600160601b0383166004820152602401610516565b610b3981610b34610218565b610e1a565b1561071e5781610b47610218565b6040516316eec12960e31b81526001600160601b03909216600483015264ffffffffff908116602483015282166044820152606401610516565b60408051608081018252600080825260208201819052918101829052606081018290526000856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610be4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c0891906114c3565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610c58573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7c919061127b565b610ca45760405163686c563560e11b81526001600160601b0386166004820152602401610516565b610cae85856106cf565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa158015610cfb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d1f91906114e0565b6060810180519590529396939550929350505050565b604051632c34efe560e11b81526001600160601b03831660048201526024810182905260009073__$3bac17678db7ae928afa209f2f44deec9c$__90635869dfca90604401602060405180830381865af4158015610d97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dbb9190611555565b9392505050565b604051631488c84560e01b815260056004820152600119602482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044016103a5565b6000610dbb8383670de0b6b3a7640000610e9f565b6040516383ffcdef60e01b815264ffffffffff80841660048301528216602482015260009073__$71e292c09eace9601b3e21e68a1278917a$__906383ffcdef90604401602060405180830381865af4158015610e7b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dbb919061127b565b6000808060001985870985870292508281108382030391505080600003610ed957838281610ecf57610ecf611572565b0492505050610dbb565b808411610f205760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b6044820152606401610516565b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6001600160601b0381168114610f9d57600080fd5b50565b600060208284031215610fb257600080fd5b8135610dbb81610f88565b60ff81168114610f9d57600080fd5b600060208284031215610fde57600080fd5b8135610dbb81610fbd565b6001600160a01b0381168114610f9d57600080fd5b64ffffffffff81168114610f9d57600080fd5b60008060008060008060c0878903121561102a57600080fd5b863561103581610fe9565b9550602087013561104581610fe9565b9450604087013561105581610f88565b9350606087013561106581610fbd565b9250608087013561107581610ffe565b8092505060a087013590509295509295509295565b6000806040838503121561109d57600080fd5b82356110a881610f88565b946020939093013593505050565b6000806000606084860312156110cb57600080fd5b83356110d681610fe9565b925060208401356110e681610fe9565b929592945050506040919091013590565b60008060006060848603121561110c57600080fd5b833561111781610fe9565b9250602084013561112781610f88565b9150604084013561113781610ffe565b809150509250925092565b64ffffffffff8316815260a08101610dbb602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b6000806040838503121561119b57600080fd5b82356111a681610f88565b915060208301356111b681610ffe565b809150509250929050565b6000806000606084860312156111d657600080fd5b83356111e181610fe9565b925060208401356110e681610f88565b82815260a08101610dbb602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b60006020828403121561124257600080fd5b8151610dbb81610ffe565b60006020828403121561125f57600080fd5b5051919050565b8051801515811461127657600080fd5b919050565b60006020828403121561128d57600080fd5b610dbb82611266565b634e487b7160e01b600052604160045260246000fd5b60405160e0810167ffffffffffffffff811182821017156112cf576112cf611296565b60405290565b604051601f8201601f1916810167ffffffffffffffff811182821017156112fe576112fe611296565b604052919050565b805161127681610f88565b805161127681610fbd565b805161127681610fe9565b600082601f83011261133857600080fd5b815167ffffffffffffffff81111561135257611352611296565b6020611366601f8301601f191682016112d5565b828152858284870101111561137a57600080fd5b60005b8381101561139857858101830151828201840152820161137d565b506000928101909101919091529392505050565b6000602082840312156113be57600080fd5b815167ffffffffffffffff808211156113d657600080fd5b9083019060e082860312156113ea57600080fd5b6113f26112ac565b6113fb83611306565b815261140960208401611306565b602082015261141a60408401611311565b604082015261142b60608401611266565b606082015261143c6080840161131c565b608082015261144d60a0840161131c565b60a082015260c08301518281111561146457600080fd5b61147087828601611327565b60c08301525095945050505050565b60006020828403121561149157600080fd5b8151610dbb81610fbd565b60ff828116828216039081111561033057634e487b7160e01b600052601160045260246000fd5b6000602082840312156114d557600080fd5b8151610dbb81610fe9565b6000608082840312156114f257600080fd5b6040516080810181811067ffffffffffffffff8211171561151557611515611296565b604052825161152381610fbd565b815260208381015190820152604083015161153d81610ffe565b60408201526060928301519281019290925250919050565b60006020828403121561156757600080fd5b8151610dbb81610f88565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220d12ff741e439b439d74ff71cf55f7495b4e3c2cc9e819c6c406d1adf069e2c5c64736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100d95760003560e01c8063b7f3e12c11610096578063da86eb8011610070578063da86eb80146101b1578063e8e7a2b4146101c4578063f2bbb0a8146101e5578063f87bf3731461021057600080fd5b8063b7f3e12c14610175578063bf381be614610188578063c6edc3dd146101a957600080fd5b80633e7964a1146100de578063504a473d146101015780635bcf927a14610122578063658501a6146101455780639ed616cd1461014d578063aea958cf14610162575b600080fd5b6100e6610218565b60405164ffffffffff90911681526020015b60405180910390f35b61011461010f366004610fa0565b610298565b6040519081526020016100f8565b610135610130366004610fcc565b610336565b60405190151581526020016100f8565b610114610366565b61016061015b366004611011565b6103e6565b005b61016061017036600461108a565b6106cf565b6101146101833660046110b6565b610722565b61019b6101963660046110f7565b61088c565b6040516100f8929190611142565b6100e6610a48565b6101606101bf366004611188565b610a85565b6101d76101d23660046111c1565b610b81565b6040516100f89291906111f1565b6101f86101f336600461108a565b610d35565b6040516001600160601b0390911681526020016100f8565b610114610dc2565b604051630319d08b60e21b81526309660180600482015260009073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c906024015b602060405180830381865af415801561026f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102939190611230565b905090565b600073__$94a2c899be079b00d952d0d84fffaa5c34$__633889a4c86001600160601b038416601f6040516001600160e01b031960e085901b1681526001600160601b03909216600483015260ff166024820152604401602060405180830381865af415801561030c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610330919061124d565b92915050565b600060ff821660010361034b57506001919050565b60ff8216600a0361035e57506001919050565b506000919050565b604051631488c84560e01b815260216004820152600119602482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044015b602060405180830381865af41580156103c2573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610293919061124d565b604051630a4d29dd60e31b81526001600160601b038516600482015273__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af415801561043e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610462919061127b565b156104805760405163019dbc4d60e31b815260040160405180910390fd5b60405163134fc55b60e11b81526001600160601b03851660048201526001600160a01b0386169063269f8ab690602401602060405180830381865afa1580156104cd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104f1919061127b565b1561051f57604051638bf515e960e01b81526001600160601b03851660048201526024015b60405180910390fd5b61052883610336565b61055957604051632778739960e11b81526001600160601b038516600482015260ff84166024820152604401610516565b6105638483610a85565b61056d84826106cf565b60405163e74d052f60e01b81526001600160601b03851660048201526001600160a01b0387169063e74d052f90602401602060405180830381865afa1580156105ba573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105de919061127b565b6106065760405163686c563560e11b81526001600160601b0385166004820152602401610516565b6040516305247a1760e51b81526001600160601b03851660048201526000906001600160a01b0388169063a48f42e090602401600060405180830381865afa158015610656573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261067e91908101906113ac565b60400151905060ff808216908516146106c65760405163e3c5e85760e01b81526001600160601b038616600482015260ff808616602483015282166044820152606401610516565b50505050505050565b6106df816106db610366565b1090565b1561071e57816106ed610366565b604051637eed2aab60e01b81526001600160601b039092166004830152602482015260448101829052606401610516565b5050565b60008073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c8456001866001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa15801561077f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107a3919061147f565b886001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa1580156107e1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610805919061147f565b61080f919061149c565b6040516001600160e01b031960e085901b168152600481019290925260000b6024820152604401602060405180830381865af4158015610853573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610877919061124d565b90506108838382610e05565b95945050505050565b60408051608081018252600080825260208201819052918101829052606081018290526000856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156108ef573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061091391906114c3565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610963573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610987919061127b565b6109af5760405163686c563560e11b81526001600160601b0386166004820152602401610516565b6109b98585610a85565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa158015610a06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a2a91906114e0565b60408101805164ffffffffff90961690529396939550929350505050565b604051630319d08b60e21b815262f099c0600482015260009073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c90602401610252565b60405163790a38ad60e01b815264ffffffffff8216600482015273__$71e292c09eace9601b3e21e68a1278917a$__9063790a38ad90602401602060405180830381865af4158015610adb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610aff919061127b565b15610b285760405163b7c4528f60e01b81526001600160601b0383166004820152602401610516565b610b3981610b34610218565b610e1a565b1561071e5781610b47610218565b6040516316eec12960e31b81526001600160601b03909216600483015264ffffffffff908116602483015282166044820152606401610516565b60408051608081018252600080825260208201819052918101829052606081018290526000856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610be4573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c0891906114c3565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610c58573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7c919061127b565b610ca45760405163686c563560e11b81526001600160601b0386166004820152602401610516565b610cae85856106cf565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea092890602401608060405180830381865afa158015610cfb573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d1f91906114e0565b6060810180519590529396939550929350505050565b604051632c34efe560e11b81526001600160601b03831660048201526024810182905260009073__$3bac17678db7ae928afa209f2f44deec9c$__90635869dfca90604401602060405180830381865af4158015610d97573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dbb9190611555565b9392505050565b604051631488c84560e01b815260056004820152600119602482015260009073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044016103a5565b6000610dbb8383670de0b6b3a7640000610e9f565b6040516383ffcdef60e01b815264ffffffffff80841660048301528216602482015260009073__$71e292c09eace9601b3e21e68a1278917a$__906383ffcdef90604401602060405180830381865af4158015610e7b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610dbb919061127b565b6000808060001985870985870292508281108382030391505080600003610ed957838281610ecf57610ecf611572565b0492505050610dbb565b808411610f205760405162461bcd60e51b81526020600482015260156024820152744d6174683a206d756c446976206f766572666c6f7760581b6044820152606401610516565b600084868809600260036001881981018916988990049182028318808302840302808302840302808302840302808302840302808302840302918202909203026000889003889004909101858311909403939093029303949094049190911702949350505050565b6001600160601b0381168114610f9d57600080fd5b50565b600060208284031215610fb257600080fd5b8135610dbb81610f88565b60ff81168114610f9d57600080fd5b600060208284031215610fde57600080fd5b8135610dbb81610fbd565b6001600160a01b0381168114610f9d57600080fd5b64ffffffffff81168114610f9d57600080fd5b60008060008060008060c0878903121561102a57600080fd5b863561103581610fe9565b9550602087013561104581610fe9565b9450604087013561105581610f88565b9350606087013561106581610fbd565b9250608087013561107581610ffe565b8092505060a087013590509295509295509295565b6000806040838503121561109d57600080fd5b82356110a881610f88565b946020939093013593505050565b6000806000606084860312156110cb57600080fd5b83356110d681610fe9565b925060208401356110e681610fe9565b929592945050506040919091013590565b60008060006060848603121561110c57600080fd5b833561111781610fe9565b9250602084013561112781610f88565b9150604084013561113781610ffe565b809150509250925092565b64ffffffffff8316815260a08101610dbb602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b6000806040838503121561119b57600080fd5b82356111a681610f88565b915060208301356111b681610ffe565b809150509250929050565b6000806000606084860312156111d657600080fd5b83356111e181610fe9565b925060208401356110e681610f88565b82815260a08101610dbb602083018460ff81511682526020810151602083015264ffffffffff6040820151166040830152606081015160608301525050565b60006020828403121561124257600080fd5b8151610dbb81610ffe565b60006020828403121561125f57600080fd5b5051919050565b8051801515811461127657600080fd5b919050565b60006020828403121561128d57600080fd5b610dbb82611266565b634e487b7160e01b600052604160045260246000fd5b60405160e0810167ffffffffffffffff811182821017156112cf576112cf611296565b60405290565b604051601f8201601f1916810167ffffffffffffffff811182821017156112fe576112fe611296565b604052919050565b805161127681610f88565b805161127681610fbd565b805161127681610fe9565b600082601f83011261133857600080fd5b815167ffffffffffffffff81111561135257611352611296565b6020611366601f8301601f191682016112d5565b828152858284870101111561137a57600080fd5b60005b8381101561139857858101830151828201840152820161137d565b506000928101909101919091529392505050565b6000602082840312156113be57600080fd5b815167ffffffffffffffff808211156113d657600080fd5b9083019060e082860312156113ea57600080fd5b6113f26112ac565b6113fb83611306565b815261140960208401611306565b602082015261141a60408401611311565b604082015261142b60608401611266565b606082015261143c6080840161131c565b608082015261144d60a0840161131c565b60a082015260c08301518281111561146457600080fd5b61147087828601611327565b60c08301525095945050505050565b60006020828403121561149157600080fd5b8151610dbb81610fbd565b60ff828116828216039081111561033057634e487b7160e01b600052601160045260246000fd5b6000602082840312156114d557600080fd5b8151610dbb81610fe9565b6000608082840312156114f257600080fd5b6040516080810181811067ffffffffffffffff8211171561151557611515611296565b604052825161152381610fbd565b815260208381015190820152604083015161153d81610ffe565b60408201526060928301519281019290925250919050565b60006020828403121561156757600080fd5b8151610dbb81610f88565b634e487b7160e01b600052601260045260246000fdfea2646970667358221220d12ff741e439b439d74ff71cf55f7495b4e3c2cc9e819c6c406d1adf069e2c5c64736f6c63430008140033",
+  "bytecode": "0x611613610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100f0575f3560e01c8063bf381be611610093578063e31a9b2b1161006e578063e31a9b2b14610218578063e3bedc7d1461022b578063f87bf37314610233578063ff7495261461023b575f80fd5b8063bf381be6146101dc578063c6edc3dd146101fd578063da86eb8014610205575f80fd5b80635bcf927a116100ce5780635bcf927a14610163578063647b8c2f14610186578063658501a61461019b5780636f678e29146101bb575f80fd5b80631fcac27a146100f45780633e7964a114610124578063504a473d14610142575b5f80fd5b61010761010236600461103e565b61024e565b6040516001600160601b0390911681526020015b60405180910390f35b61012c6102e0565b60405164ffffffffff909116815260200161011b565b610155610150366004611075565b61035d565b60405190815260200161011b565b61017661017136600461109e565b6103f8565b604051901515815260200161011b565b6101996101943660046110cb565b610426565b005b6101a3610704565b6040516001600160a01b03909116815260200161011b565b6101ce6101c9366004611149565b610781565b60405161011b9291906111da565b6101ef6101ea3660046111f7565b61093a565b60405161011b929190611234565b61012c610af5565b61019961021336600461124f565b610b31565b6101a361022636600461127b565b610c6b565b61012c610dcd565b6101a3610e09565b61019961024936600461103e565b610e4b565b604051636e5912e760e01b81526001600160601b03831660048201526001600160a01b03821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__90636e5912e790604401602060405180830381865af41580156102b5573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102d991906112b8565b9392505050565b604051630319d08b60e21b8152630966018060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c906024015b602060405180830381865af4158015610334573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061035891906112d3565b905090565b5f73__$94a2c899be079b00d952d0d84fffaa5c34$__633889a4c86001600160601b038416601f6040516001600160e01b031960e085901b1681526001600160601b03909216600483015260ff166024820152604401602060405180830381865af41580156103ce573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103f291906112ee565b92915050565b5f60ff821660010361040c57506001919050565b60ff8216600a0361041f57506001919050565b505f919050565b604051630a4d29dd60e31b81526001600160601b038516600482015273__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af415801561047c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104a09190611314565b156104be5760405163019dbc4d60e31b815260040160405180910390fd5b60405163134fc55b60e11b81526001600160601b03851660048201526001600160a01b0386169063269f8ab690602401602060405180830381865afa158015610509573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061052d9190611314565b1561055b57604051638bf515e960e01b81526001600160601b03851660048201526024015b60405180910390fd5b610564836103f8565b61059557604051632778739960e11b81526001600160601b038516600482015260ff84166024820152604401610552565b61059f8483610b31565b6105a98482610e4b565b60405163e74d052f60e01b81526001600160601b03851660048201526001600160a01b0387169063e74d052f90602401602060405180830381865afa1580156105f4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106189190611314565b6106405760405163686c563560e11b81526001600160601b0385166004820152602401610552565b6040516305247a1760e51b81526001600160601b03851660048201525f906001600160a01b0388169063a48f42e0906024015f60405180830381865afa15801561068c573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526106b3919081019061140b565b60400151905060ff808216908516146106fb5760405163e3c5e85760e01b81526001600160601b038616600482015260ff808616602483015282166044820152606401610552565b50505050505050565b604051631488c84560e01b81526021600482015260011960248201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044015b602060405180830381865af415801561075d573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061035891906114dd565b6040805160a0810182525f8082526020820181905291810182905260608101829052608081018290525f856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156107e7573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061080b91906114dd565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610859573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061087d9190611314565b6108a55760405163686c563560e11b81526001600160601b0386166004820152602401610552565b6108af8585610e4b565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea09289060240160a060405180830381865afa1580156108fa573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061091e91906114f8565b80516001600160a01b0390951681529396939550929350505050565b6040805160a0810182525f8082526020820181905291810182905260608101829052608081018290525f856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156109a0573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109c491906114dd565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610a12573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a369190611314565b610a5e5760405163686c563560e11b81526001600160601b0386166004820152602401610552565b610a688585610b31565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea09289060240160a060405180830381865afa158015610ab3573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ad791906114f8565b60608101805164ffffffffff90961690529396939550929350505050565b604051630319d08b60e21b815262f099c060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c90602401610319565b73__$71e292c09eace9601b3e21e68a1278917a$__63add9ce9964ffffffffff8316610b5b610dcd565b6040516001600160e01b031960e085901b16815264ffffffffff928316600482015291166024820152604401602060405180830381865af4158015610ba2573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610bc69190611314565b15610c0e5781610bd4610dcd565b604051630114a1ef60e51b81526001600160601b03909216600483015264ffffffffff908116602483015282166044820152606401610552565b610c1f81610c1a6102e0565b610eb2565b15610c675781610c2d6102e0565b6040516316eec12960e31b81526001600160601b03909216600483015264ffffffffff908116602483015282166044820152606401610552565b5050565b5f8073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c8456001866001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610cc5573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ce99190611589565b886001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610d25573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d499190611589565b610d5391906115a4565b6040516001600160e01b031960e085901b16815260048101929092525f0b6024820152604401602060405180830381865af4158015610d94573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610db891906114dd565b9050610dc48382610f34565b95945050505050565b604051630319d08b60e21b81526201518060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c90602401610319565b604051631488c84560e01b81526005600482015260011960248201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c84590604401610742565b610e6881610e57610704565b6001600160a01b0390811691161190565b15610c675781610e76610704565b604051639af5ab3b60e01b81526001600160601b0390921660048301526001600160a01b03908116602483015282166044820152606401610552565b6040516383ffcdef60e01b815264ffffffffff8084166004830152821660248201525f9073__$71e292c09eace9601b3e21e68a1278917a$__906383ffcdef90604401602060405180830381865af4158015610f10573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102d99190611314565b5f6102d9836001600160a01b0316836001600160a01b031666038d7ea4c680005f838302815f1985870982811083820303915050805f03610f8857838281610f7e57610f7e6115c9565b04925050506102d9565b808411610fa85760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b6001600160601b0381168114611027575f80fd5b50565b6001600160a01b0381168114611027575f80fd5b5f806040838503121561104f575f80fd5b823561105a81611013565b9150602083013561106a8161102a565b809150509250929050565b5f60208284031215611085575f80fd5b81356102d981611013565b60ff81168114611027575f80fd5b5f602082840312156110ae575f80fd5b81356102d981611090565b64ffffffffff81168114611027575f80fd5b5f805f805f8060c087890312156110e0575f80fd5b86356110eb8161102a565b955060208701356110fb8161102a565b9450604087013561110b81611013565b9350606087013561111b81611090565b9250608087013561112b816110b9565b915060a087013561113b8161102a565b809150509295509295509295565b5f805f6060848603121561115b575f80fd5b83356111668161102a565b9250602084013561117681611013565b915060408401356111868161102a565b809150509250925092565b80516001600160a01b031682526020808201516001600160601b03169083015260408082015160ff169083015260608082015164ffffffffff1690830152608090810151910152565b6001600160a01b038316815260c081016102d96020830184611191565b5f805f60608486031215611209575f80fd5b83356112148161102a565b9250602084013561122481611013565b91506040840135611186816110b9565b64ffffffffff8316815260c081016102d96020830184611191565b5f8060408385031215611260575f80fd5b823561126b81611013565b9150602083013561106a816110b9565b5f805f6060848603121561128d575f80fd5b83356112988161102a565b925060208401356111768161102a565b80516112b381611013565b919050565b5f602082840312156112c8575f80fd5b81516102d981611013565b5f602082840312156112e3575f80fd5b81516102d9816110b9565b5f602082840312156112fe575f80fd5b5051919050565b805180151581146112b3575f80fd5b5f60208284031215611324575f80fd5b6102d982611305565b634e487b7160e01b5f52604160045260245ffd5b60405160e0810167ffffffffffffffff811182821017156113645761136461132d565b60405290565b80516112b381611090565b80516112b38161102a565b5f82601f83011261138f575f80fd5b815167ffffffffffffffff8111156113a9576113a961132d565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156113d8576113d861132d565b6040528181528382016020018510156113ef575f80fd5b8160208501602083015e5f918101602001919091529392505050565b5f6020828403121561141b575f80fd5b815167ffffffffffffffff811115611431575f80fd5b820160e08185031215611442575f80fd5b61144a611341565b611453826112a8565b8152611461602083016112a8565b60208201526114726040830161136a565b604082015261148360608301611305565b606082015261149460808301611375565b60808201526114a560a08301611375565b60a082015260c082015167ffffffffffffffff8111156114c3575f80fd5b6114cf86828501611380565b60c083015250949350505050565b5f602082840312156114ed575f80fd5b81516102d98161102a565b5f60a0828403128015611509575f80fd5b5060405160a0810167ffffffffffffffff8111828210171561152d5761152d61132d565b604052825161153b8161102a565b8152602083015161154b81611013565b6020820152604083015161155e81611090565b60408201526060830151611571816110b9565b60608201526080928301519281019290925250919050565b5f60208284031215611599575f80fd5b81516102d981611090565b60ff82811682821603908111156103f257634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52601260045260245ffdfea26469706673582212207794e5b36cd28a78b2c2f7f1088cbd9c8754cceea0eb4b521f1a5259ccac114664736f6c634300081a0033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100f0575f3560e01c8063bf381be611610093578063e31a9b2b1161006e578063e31a9b2b14610218578063e3bedc7d1461022b578063f87bf37314610233578063ff7495261461023b575f80fd5b8063bf381be6146101dc578063c6edc3dd146101fd578063da86eb8014610205575f80fd5b80635bcf927a116100ce5780635bcf927a14610163578063647b8c2f14610186578063658501a61461019b5780636f678e29146101bb575f80fd5b80631fcac27a146100f45780633e7964a114610124578063504a473d14610142575b5f80fd5b61010761010236600461103e565b61024e565b6040516001600160601b0390911681526020015b60405180910390f35b61012c6102e0565b60405164ffffffffff909116815260200161011b565b610155610150366004611075565b61035d565b60405190815260200161011b565b61017661017136600461109e565b6103f8565b604051901515815260200161011b565b6101996101943660046110cb565b610426565b005b6101a3610704565b6040516001600160a01b03909116815260200161011b565b6101ce6101c9366004611149565b610781565b60405161011b9291906111da565b6101ef6101ea3660046111f7565b61093a565b60405161011b929190611234565b61012c610af5565b61019961021336600461124f565b610b31565b6101a361022636600461127b565b610c6b565b61012c610dcd565b6101a3610e09565b61019961024936600461103e565b610e4b565b604051636e5912e760e01b81526001600160601b03831660048201526001600160a01b03821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__90636e5912e790604401602060405180830381865af41580156102b5573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102d991906112b8565b9392505050565b604051630319d08b60e21b8152630966018060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c906024015b602060405180830381865af4158015610334573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061035891906112d3565b905090565b5f73__$94a2c899be079b00d952d0d84fffaa5c34$__633889a4c86001600160601b038416601f6040516001600160e01b031960e085901b1681526001600160601b03909216600483015260ff166024820152604401602060405180830381865af41580156103ce573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103f291906112ee565b92915050565b5f60ff821660010361040c57506001919050565b60ff8216600a0361041f57506001919050565b505f919050565b604051630a4d29dd60e31b81526001600160601b038516600482015273__$94a2c899be079b00d952d0d84fffaa5c34$__906352694ee890602401602060405180830381865af415801561047c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104a09190611314565b156104be5760405163019dbc4d60e31b815260040160405180910390fd5b60405163134fc55b60e11b81526001600160601b03851660048201526001600160a01b0386169063269f8ab690602401602060405180830381865afa158015610509573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061052d9190611314565b1561055b57604051638bf515e960e01b81526001600160601b03851660048201526024015b60405180910390fd5b610564836103f8565b61059557604051632778739960e11b81526001600160601b038516600482015260ff84166024820152604401610552565b61059f8483610b31565b6105a98482610e4b565b60405163e74d052f60e01b81526001600160601b03851660048201526001600160a01b0387169063e74d052f90602401602060405180830381865afa1580156105f4573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106189190611314565b6106405760405163686c563560e11b81526001600160601b0385166004820152602401610552565b6040516305247a1760e51b81526001600160601b03851660048201525f906001600160a01b0388169063a48f42e0906024015f60405180830381865afa15801561068c573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526106b3919081019061140b565b60400151905060ff808216908516146106fb5760405163e3c5e85760e01b81526001600160601b038616600482015260ff808616602483015282166044820152606401610552565b50505050505050565b604051631488c84560e01b81526021600482015260011960248201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c845906044015b602060405180830381865af415801561075d573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061035891906114dd565b6040805160a0810182525f8082526020820181905291810182905260608101829052608081018290525f856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156107e7573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061080b91906114dd565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610859573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061087d9190611314565b6108a55760405163686c563560e11b81526001600160601b0386166004820152602401610552565b6108af8585610e4b565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea09289060240160a060405180830381865afa1580156108fa573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061091e91906114f8565b80516001600160a01b0390951681529396939550929350505050565b6040805160a0810182525f8082526020820181905291810182905260608101829052608081018290525f856001600160a01b0316636291423a6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156109a0573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109c491906114dd565b60405163134fc55b60e11b81526001600160601b03871660048201529091506001600160a01b0382169063269f8ab690602401602060405180830381865afa158015610a12573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a369190611314565b610a5e5760405163686c563560e11b81526001600160601b0386166004820152602401610552565b610a688585610b31565b60405163153d412560e31b81526001600160601b03861660048201526001600160a01b0382169063a9ea09289060240160a060405180830381865afa158015610ab3573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ad791906114f8565b60608101805164ffffffffff90961690529396939550929350505050565b604051630319d08b60e21b815262f099c060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c90602401610319565b73__$71e292c09eace9601b3e21e68a1278917a$__63add9ce9964ffffffffff8316610b5b610dcd565b6040516001600160e01b031960e085901b16815264ffffffffff928316600482015291166024820152604401602060405180830381865af4158015610ba2573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610bc69190611314565b15610c0e5781610bd4610dcd565b604051630114a1ef60e51b81526001600160601b03909216600483015264ffffffffff908116602483015282166044820152606401610552565b610c1f81610c1a6102e0565b610eb2565b15610c675781610c2d6102e0565b6040516316eec12960e31b81526001600160601b03909216600483015264ffffffffff908116602483015282166044820152606401610552565b5050565b5f8073__$bf7bc340cbb9229ef1de2c568356e67902$__631488c8456001866001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610cc5573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ce99190611589565b886001600160a01b031663313ce5676040518163ffffffff1660e01b8152600401602060405180830381865afa158015610d25573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d499190611589565b610d5391906115a4565b6040516001600160e01b031960e085901b16815260048101929092525f0b6024820152604401602060405180830381865af4158015610d94573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610db891906114dd565b9050610dc48382610f34565b95945050505050565b604051630319d08b60e21b81526201518060048201525f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c90602401610319565b604051631488c84560e01b81526005600482015260011960248201525f9073__$bf7bc340cbb9229ef1de2c568356e67902$__90631488c84590604401610742565b610e6881610e57610704565b6001600160a01b0390811691161190565b15610c675781610e76610704565b604051639af5ab3b60e01b81526001600160601b0390921660048301526001600160a01b03908116602483015282166044820152606401610552565b6040516383ffcdef60e01b815264ffffffffff8084166004830152821660248201525f9073__$71e292c09eace9601b3e21e68a1278917a$__906383ffcdef90604401602060405180830381865af4158015610f10573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102d99190611314565b5f6102d9836001600160a01b0316836001600160a01b031666038d7ea4c680005f838302815f1985870982811083820303915050805f03610f8857838281610f7e57610f7e6115c9565b04925050506102d9565b808411610fa85760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b6001600160601b0381168114611027575f80fd5b50565b6001600160a01b0381168114611027575f80fd5b5f806040838503121561104f575f80fd5b823561105a81611013565b9150602083013561106a8161102a565b809150509250929050565b5f60208284031215611085575f80fd5b81356102d981611013565b60ff81168114611027575f80fd5b5f602082840312156110ae575f80fd5b81356102d981611090565b64ffffffffff81168114611027575f80fd5b5f805f805f8060c087890312156110e0575f80fd5b86356110eb8161102a565b955060208701356110fb8161102a565b9450604087013561110b81611013565b9350606087013561111b81611090565b9250608087013561112b816110b9565b915060a087013561113b8161102a565b809150509295509295509295565b5f805f6060848603121561115b575f80fd5b83356111668161102a565b9250602084013561117681611013565b915060408401356111868161102a565b809150509250925092565b80516001600160a01b031682526020808201516001600160601b03169083015260408082015160ff169083015260608082015164ffffffffff1690830152608090810151910152565b6001600160a01b038316815260c081016102d96020830184611191565b5f805f60608486031215611209575f80fd5b83356112148161102a565b9250602084013561122481611013565b91506040840135611186816110b9565b64ffffffffff8316815260c081016102d96020830184611191565b5f8060408385031215611260575f80fd5b823561126b81611013565b9150602083013561106a816110b9565b5f805f6060848603121561128d575f80fd5b83356112988161102a565b925060208401356111768161102a565b80516112b381611013565b919050565b5f602082840312156112c8575f80fd5b81516102d981611013565b5f602082840312156112e3575f80fd5b81516102d9816110b9565b5f602082840312156112fe575f80fd5b5051919050565b805180151581146112b3575f80fd5b5f60208284031215611324575f80fd5b6102d982611305565b634e487b7160e01b5f52604160045260245ffd5b60405160e0810167ffffffffffffffff811182821017156113645761136461132d565b60405290565b80516112b381611090565b80516112b38161102a565b5f82601f83011261138f575f80fd5b815167ffffffffffffffff8111156113a9576113a961132d565b604051601f8201601f19908116603f0116810167ffffffffffffffff811182821017156113d8576113d861132d565b6040528181528382016020018510156113ef575f80fd5b8160208501602083015e5f918101602001919091529392505050565b5f6020828403121561141b575f80fd5b815167ffffffffffffffff811115611431575f80fd5b820160e08185031215611442575f80fd5b61144a611341565b611453826112a8565b8152611461602083016112a8565b60208201526114726040830161136a565b604082015261148360608301611305565b606082015261149460808301611375565b60808201526114a560a08301611375565b60a082015260c082015167ffffffffffffffff8111156114c3575f80fd5b6114cf86828501611380565b60c083015250949350505050565b5f602082840312156114ed575f80fd5b81516102d98161102a565b5f60a0828403128015611509575f80fd5b5060405160a0810167ffffffffffffffff8111828210171561152d5761152d61132d565b604052825161153b8161102a565b8152602083015161154b81611013565b6020820152604083015161155e81611090565b60408201526060830151611571816110b9565b60608201526080928301519281019290925250919050565b5f60208284031215611599575f80fd5b81516102d981611090565b60ff82811682821603908111156103f257634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52601260045260245ffdfea26469706673582212207794e5b36cd28a78b2c2f7f1088cbd9c8754cceea0eb4b521f1a5259ccac114664736f6c634300081a0033",
   "linkReferences": {
     "contracts/type/Amount.sol": {
       "AmountLib": [
         {
           "length": 20,
-          "start": 3479
+          "start": 689
         }
       ]
     },
@@ -465,11 +503,11 @@
       "NftIdLib": [
         {
           "length": 20,
-          "start": 726
+          "start": 916
         },
         {
           "length": 20,
-          "start": 1086
+          "start": 1144
         }
       ]
     },
@@ -477,19 +515,23 @@
       "SecondsLib": [
         {
           "length": 20,
-          "start": 622
+          "start": 815
+        },
+        {
+          "length": 20,
+          "start": 2883
         },
         {
           "length": 20,
-          "start": 2717
+          "start": 2919
         },
         {
           "length": 20,
-          "start": 2779
+          "start": 3611
         },
         {
           "length": 20,
-          "start": 3707
+          "start": 3852
         }
       ]
     },
@@ -497,15 +539,15 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 961
+          "start": 1880
         },
         {
           "length": 20,
-          "start": 1889
+          "start": 3235
         },
         {
           "length": 20,
-          "start": 3613
+          "start": 3677
         }
       ]
     }
@@ -515,7 +557,7 @@
       "AmountLib": [
         {
           "length": 20,
-          "start": 3421
+          "start": 637
         }
       ]
     },
@@ -523,11 +565,11 @@
       "NftIdLib": [
         {
           "length": 20,
-          "start": 668
+          "start": 864
         },
         {
           "length": 20,
-          "start": 1028
+          "start": 1092
         }
       ]
     },
@@ -535,19 +577,23 @@
       "SecondsLib": [
         {
           "length": 20,
-          "start": 564
+          "start": 763
+        },
+        {
+          "length": 20,
+          "start": 2831
         },
         {
           "length": 20,
-          "start": 2659
+          "start": 2867
         },
         {
           "length": 20,
-          "start": 2721
+          "start": 3559
         },
         {
           "length": 20,
-          "start": 3649
+          "start": 3800
         }
       ]
     },
@@ -555,15 +601,15 @@
       "UFixedLib": [
         {
           "length": 20,
-          "start": 903
+          "start": 1828
         },
         {
           "length": 20,
-          "start": 1831
+          "start": 3183
         },
         {
           "length": 20,
-          "start": 3555
+          "start": 3625
         }
       ]
     }

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

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