@etherisc/gif-next 0.0.2-f15b559-661 → 0.0.2-f1b01e0-214

package/contracts/type/UFixed.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.20;
 
 import {Math} from "@openzeppelin/contracts/utils/math/Math.sol";
 
-/// @dev UFixed is a fixed point number with 18 decimals precision.
-type UFixed is uint256;
+/// @dev UFixed is a 160-bit fixed point number with 15 decimals precision.
+type UFixed is uint160; 
 
 using {
     addUFixed as +,
@@ -41,7 +41,7 @@ function subUFixed(UFixed a, UFixed b) pure returns (UFixed) {
 
 function mulUFixed(UFixed a, UFixed b) pure returns (UFixed) {
     return
-        UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
+        UFixed.wrap(uint160(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 15)));
 }
 
 function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
@@ -50,7 +50,7 @@ function divUFixed(UFixed a, UFixed b) pure returns (UFixed) {
     }
     
     return
-        UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), 10 ** 18, UFixed.unwrap(b)));
+        UFixed.wrap(uint160(Math.mulDiv(UFixed.unwrap(a), 10 ** 15, UFixed.unwrap(b))));
 }
 
 function gtUFixed(UFixed a, UFixed b) pure returns (bool isGreaterThan) {
@@ -100,7 +100,9 @@ library UFixedLib {
     error UFixedLibExponentTooSmall(int8 exp);
     error UFixedLibExponentTooLarge(int8 exp);
 
-    int8 public constant EXP = 18;
+    error UFixedLibNumberTooLarge(uint256 number);
+
+    int8 public constant EXP = 15;
     uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
     uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
 
@@ -119,9 +121,14 @@ library UFixedLib {
         return uint8(2);
     }
 
-    /// @dev Converts the uint256 to a UFixed.
+    /// @dev Converts the uint256 to a uint160 based UFixed. 
+    /// This method reverts if the number is too large to fit in a uint160.
     function toUFixed(uint256 a) public pure returns (UFixed) {
-        return UFixed.wrap(a * MULTIPLIER);
+        uint256 n = a * MULTIPLIER;
+        if (n > type(uint160).max) {
+            revert UFixedLibNumberTooLarge(a);
+        }
+        return UFixed.wrap(uint160(n));
     }
 
     /// @dev Converts the uint256 to a UFixed with given exponent.
@@ -129,11 +136,17 @@ library UFixedLib {
         if (EXP + exp < 0) {
             revert UFixedLibExponentTooSmall(exp);
         }
-        if (EXP + exp > 64) {
+        if (EXP + exp > 48) {
             revert UFixedLibExponentTooLarge(exp);
         }
         
-        return UFixed.wrap(a * 10 ** uint8(EXP + exp));
+        uint256 n = a * 10 ** uint8(EXP + exp);
+
+        if (n > type(uint160).max) {
+            revert UFixedLibNumberTooLarge(n);
+        }
+
+        return UFixed.wrap(uint160(n));
     }
 
     /// @dev returns the decimals precision of the UFixed type
@@ -235,7 +248,11 @@ library UFixedLib {
     }
 
     function one() public pure returns (UFixed) {
-        return UFixed.wrap(MULTIPLIER);
+        return UFixed.wrap(uint160(MULTIPLIER));
+    }
+
+    function max() public pure returns (UFixed) {
+        return UFixed.wrap(type(uint160).max);
     }
 
     /// @dev return the absolute delta between two UFixed numbers

package/contracts/type/Version.sol

@@ -8,7 +8,9 @@ using {
     versionPartEq as ==,
     versionPartNe as !=,
     VersionPartLib.eqz,
+    VersionPartLib.gtz,
     VersionPartLib.toInt,
+    VersionPartLib.toString,
     VersionPartLib.isValidRelease
 }
     for VersionPart global;
@@ -18,6 +20,9 @@ function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) {
 function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
 
 library VersionPartLib {
+
+    error ErrorReleaseTooBig(VersionPart releaseMax, VersionPart release);
+
     function releaseMin() public pure returns (VersionPart) { return toVersionPart(3); }
     function releaseMax() public pure returns (VersionPart) { return toVersionPart(99); }
 
@@ -26,7 +31,41 @@ library VersionPartLib {
         return 3 <= releaseInt && releaseInt <= 99; 
     } 
 
+    function toString(VersionPart a) external pure returns (string memory) {
+        if (a > releaseMax()) {
+            revert ErrorReleaseTooBig(releaseMax(), a);
+        }
+
+        uint256 value = VersionPart.unwrap(a);
+        if (value == 0) {
+            return "0";
+        }
+
+        uint256 temp = value;
+        uint256 digits = 0;
+        while (temp != 0) {
+            digits++;
+            temp /= 10;
+        }
+
+        bytes memory buffer = new bytes(digits);
+        uint index = digits - 1;
+
+        temp = value;
+        while (temp != 0) {
+            buffer[index] = bytes1(uint8(48 + temp % 10));
+            temp /= 10;
+
+            if (index > 0) {
+                index--;
+            }
+        }
+
+        return string(buffer);
+    }
+
     function eqz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) == 0; }
+    function gtz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) > 0; }
     function toInt(VersionPart a) external pure returns(uint256) { return VersionPart.unwrap(a); }
     function toVersionPart(uint256 a) public pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-f15b559-661",
+  "version": "0.0.2-f1b01e0-214",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
@@ -36,7 +36,7 @@
     "@typescript-eslint/parser": "^8.1.0",
     "antlr4ng-cli": "^2.0.0",
     "dotenv": "^16.3.1",
-    "eslint": "^8.50.0",
+    "eslint": "^9.9.1",
     "hardhat": "^2.17.2",
     "prettier": "^3.0.3",
     "prettier-plugin-solidity": "^1.1.3",

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

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

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

@@ -1,440 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "StakeManagerLib",
-  "sourceName": "contracts/staking/StakeManagerLib.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "targetNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "ErrorStakingNotTarget",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "targetNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "ErrorStakingStakeAmountZero",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "stakeNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "Timestamp",
-          "name": "lockedUntil",
-          "type": "uint40"
-        }
-      ],
-      "name": "ErrorStakingStakeLocked",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "NftId",
-          "name": "targetNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "ErrorStakingTargetNotActive",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "MathOverflowedMulDiv",
-      "type": "error"
-    },
-    {
-      "inputs": [],
-      "name": "UFixedLibDivisionByZero",
-      "type": "error"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "UFixed",
-          "name": "rewardRate",
-          "type": "uint256"
-        },
-        {
-          "internalType": "Seconds",
-          "name": "duration",
-          "type": "uint40"
-        },
-        {
-          "internalType": "Amount",
-          "name": "stakeAmount",
-          "type": "uint96"
-        }
-      ],
-      "name": "calculateRewardAmount",
-      "outputs": [
-        {
-          "internalType": "Amount",
-          "name": "rewardAmount",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "contract StakingReader",
-          "name": "stakingReader",
-          "type": "StakingReader"
-        },
-        {
-          "internalType": "NftId",
-          "name": "stakeNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "UFixed",
-          "name": "rewardRate",
-          "type": "uint256"
-        }
-      ],
-      "name": "calculateRewardIncrease",
-      "outputs": [
-        {
-          "internalType": "Amount",
-          "name": "rewardIncreaseAmount",
-          "type": "uint96"
-        },
-        {
-          "internalType": "Amount",
-          "name": "totalDipAmount",
-          "type": "uint96"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "contract StakingReader",
-          "name": "stakingReader",
-          "type": "StakingReader"
-        },
-        {
-          "internalType": "NftId",
-          "name": "targetNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "Amount",
-          "name": "dipAmount",
-          "type": "uint96"
-        }
-      ],
-      "name": "checkCreateParameters",
-      "outputs": [
-        {
-          "internalType": "Timestamp",
-          "name": "lockedUntil",
-          "type": "uint40"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "contract StakingReader",
-          "name": "stakingReader",
-          "type": "StakingReader"
-        },
-        {
-          "internalType": "NftId",
-          "name": "targetNftId",
-          "type": "uint96"
-        },
-        {
-          "internalType": "Amount",
-          "name": "dipAmount",
-          "type": "uint96"
-        }
-      ],
-      "name": "checkDipAmount",
-      "outputs": [],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "contract StakingReader",
-          "name": "stakingReader",
-          "type": "StakingReader"
-        },
-        {
-          "internalType": "NftId",
-          "name": "stakeNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "checkStakeParameters",
-      "outputs": [
-        {
-          "internalType": "UFixed",
-          "name": "rewardRate",
-          "type": "uint256"
-        },
-        {
-          "internalType": "Seconds",
-          "name": "lockingPeriod",
-          "type": "uint40"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "contract StakingReader",
-          "name": "stakingReader",
-          "type": "StakingReader"
-        },
-        {
-          "internalType": "NftId",
-          "name": "targetNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "checkTarget",
-      "outputs": [
-        {
-          "internalType": "Seconds",
-          "name": "lockingPeriod",
-          "type": "uint40"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "contract StakingReader",
-          "name": "stakingReader",
-          "type": "StakingReader"
-        },
-        {
-          "internalType": "NftId",
-          "name": "stakeNftId",
-          "type": "uint96"
-        }
-      ],
-      "name": "checkUnstakeParameters",
-      "outputs": [
-        {
-          "internalType": "UFixed",
-          "name": "rewardRate",
-          "type": "uint256"
-        },
-        {
-          "internalType": "Seconds",
-          "name": "lockingPeriod",
-          "type": "uint40"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Seconds",
-          "name": "duration",
-          "type": "uint40"
-        }
-      ],
-      "name": "getYearFraction",
-      "outputs": [
-        {
-          "internalType": "UFixed",
-          "name": "yearFraction",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x6114dc610034600b8282823980515f1a607314602857634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c8063746c22b81161006e578063746c22b81461012c578063b3eff9e11461013f578063d6b40e611461016d578063e048754d14610180578063e2a70ae3146101b3575f80fd5b80630fcf5d081461009f578063377e04ae146100db5780636d7b7389146101045780636feca3ff14610117575b5f80fd5b8180156100aa575f80fd5b506100be6100b936600461116f565b6101d4565b6040516001600160601b0390911681526020015b60405180910390f35b6100ee6100e93660046111dc565b6104ce565b60405164ffffffffff90911681526020016100d2565b6100be610112366004611225565b61067d565b61012a610125366004611264565b61071e565b005b6100ee61013a366004611264565b6107c5565b61015261014d3660046111dc565b6108d7565b6040805192835264ffffffffff9091166020830152016100d2565b61015261017b3660046111dc565b610a10565b61019361018e366004611291565b610ba8565b604080516001600160601b039384168152929091166020830152016100d2565b6101c66101c13660046112cf565b610d59565b6040519081526020016100d2565b5f805f6101e18786610a10565b915091505f806101f2898886610ba8565b915091506102008187610fb6565b60405163677d3feb60e11b81526001600160601b03891660048201529095505f906001600160a01b038c169063cefa7fd690602401602060405180830381865afa158015610250573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061027491906112ea565b6040516330f4419960e01b81526001600160601b03808b1660048301528083166024830152851660448201529091506001600160a01b038a16906330f44199906064015f604051808303815f87803b1580156102ce575f80fd5b505af11580156102e0573d5f803e3d5ffd5b5050604051633861317f60e01b81526001600160601b03808c16600483015280851660248301528a1660448201526001600160a01b038c169250633861317f91506064015f604051808303815f87803b15801561033b575f80fd5b505af115801561034d573d5f803e3d5ffd5b50505050886001600160a01b0316634b51da0c89604051806020016040528073__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__63adb618326040518163ffffffff1660e01b8152600401602060405180830381865af41580156103b3573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103d79190611305565b6040516352bcc5a760e11b815264ffffffffff9182166004820152908a16602482015273__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9063a5798b4e90604401602060405180830381865af4158015610434573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104589190611305565b64ffffffffff9081169091526040516001600160e01b031960e086901b1681526001600160601b03909316600484015290511660248201526044015f604051808303815f87803b1580156104aa575f80fd5b505af11580156104bc573d5f803e3d5ffd5b50505050505050505095945050505050565b60405163134fc55b60e11b81526001600160601b03821660048201525f906001600160a01b0384169063269f8ab690602401602060405180830381865afa15801561051b573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061053f9190611320565b61056c576040516396cff01560e01b81526001600160601b03831660048201526024015b60405180910390fd5b60405163777d185760e01b81526001600160601b03831660048201526001600160a01b0384169063777d185790602401602060405180830381865afa1580156105b7573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105db9190611320565b6106035760405163d0c1638160e01b81526001600160601b0383166004820152602401610563565b60405163153d412560e31b81526001600160601b03831660048201526001600160a01b0384169063a9ea092890602401608060405180830381865afa15801561064e573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610672919061133f565b604001519392505050565b5f8061069161068b85610d59565b86611041565b604051632c34efe560e11b81526001600160601b03851660048201526024810182905290915073__$3bac17678db7ae928afa209f2f44deec9c$__90635869dfca90604401602060405180830381865af41580156106f1573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061071591906112ea565b95945050505050565b604051630a4d29dd60e31b81526001600160601b038216600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906352694ee890602401602060405180830381865af4158015610774573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107989190611320565b156107c057604051625e4daf60e71b81526001600160601b0383166004820152602401610563565b505050565b5f806107d185856104ce565b90506107de85858561071e565b5f73__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__63adb618326040518163ffffffff1660e01b8152600401602060405180830381865af4158015610826573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061084a9190611305565b6040516352bcc5a760e11b815264ffffffffff80831660048301528416602482015290915073__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9063a5798b4e90604401602060405180830381865af41580156108a9573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108cd9190611305565b9695505050505050565b6040516301f33ce360e21b81526001600160601b03821660048201525f90819081906001600160a01b038616906307ccf38c90602401602060405180830381865afa158015610928573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061094c91906113c5565b90506109cf815f015173__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__63adb618326040518163ffffffff1660e01b8152600401602060405180830381865af415801561099c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109c09190611305565b64ffffffffff90811691161190565b15610a0857805160405163187bc0bd60e21b81526001600160601b038616600482015264ffffffffff9091166024820152604401610563565b509250929050565b604051632a4e656b60e01b81526001600160601b03821660048201525f90819081906001600160a01b03861690632a4e656b90602401602060405180830381865afa158015610a61573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a8591906112ea565b60405163777d185760e01b81526001600160601b03821660048201529091506001600160a01b0386169063777d185790602401602060405180830381865afa158015610ad3573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610af79190611320565b610b1f5760405163d0c1638160e01b81526001600160601b0382166004820152602401610563565b60405163153d412560e31b81526001600160601b03821660048201525f906001600160a01b0387169063a9ea092890602401608060405180830381865afa158015610b6c573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610b90919061133f565b60608101516040909101519097909650945050505050565b60405160016279fab360e01b031981526001600160601b03831660048201525f9081908190819081906001600160a01b0389169063ff86054d90602401606060405180830381865afa158015610c00573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c24919061141d565b604051633682752160e21b815264ffffffffff8216600482015292955090935091505f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c9073__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9063da09d48490602401602060405180830381865af4158015610c9e573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610cc2919061145c565b610ccc9042611473565b6040518263ffffffff1660e01b8152600401610cea91815260200190565b602060405180830381865af4158015610d05573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d299190611305565b9050610d3687828661067d565b9550610d4b610d458585610fb6565b87610fb6565b945050505050935093915050565b604051633682752160e21b815264ffffffffff821660048201525f90610fb09073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e9073__$71e292c09eace9601b3e21e68a1278917a$__9063da09d48490602401602060405180830381865af4158015610dcf573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610df3919061145c565b6040518263ffffffff1660e01b8152600401610e1191815260200190565b602060405180830381865af4158015610e2c573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e50919061145c565b73__$bf7bc340cbb9229ef1de2c568356e67902$__6345ebb61e73__$71e292c09eace9601b3e21e68a1278917a$__63f27c3bf66040518163ffffffff1660e01b8152600401602060405180830381865af4158015610eb1573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ed59190611305565b604051633682752160e21b815264ffffffffff909116600482015273__$71e292c09eace9601b3e21e68a1278917a$__9063da09d48490602401602060405180830381865af4158015610f2a573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610f4e919061145c565b6040518263ffffffff1660e01b8152600401610f6c91815260200190565b602060405180830381865af4158015610f87573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610fab919061145c565b611055565b92915050565b60405163274acb3560e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063274acb3590604401602060405180830381865af4158015611016573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061103a91906112ea565b9392505050565b5f61103a8383670de0b6b3a7640000611085565b5f815f0361107657604051630f6c8fc360e21b815260040160405180910390fd5b61103a83670de0b6b3a7640000845b5f838302815f1985870982811083820303915050805f036110b9578382816110af576110af611492565b049250505061103a565b8084116110d95760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b6001600160a01b0381168114611158575f80fd5b50565b6001600160601b0381168114611158575f80fd5b5f805f805f60a08688031215611183575f80fd5b853561118e81611144565b9450602086013561119e81611144565b935060408601356111ae81611144565b925060608601356111be8161115b565b915060808601356111ce8161115b565b809150509295509295909350565b5f80604083850312156111ed575f80fd5b82356111f881611144565b915060208301356112088161115b565b809150509250929050565b64ffffffffff81168114611158575f80fd5b5f805f60608486031215611237575f80fd5b83359250602084013561124981611213565b915060408401356112598161115b565b809150509250925092565b5f805f60608486031215611276575f80fd5b833561128181611144565b925060208401356112498161115b565b5f805f606084860312156112a3575f80fd5b83356112ae81611144565b925060208401356112be8161115b565b929592945050506040919091013590565b5f602082840312156112df575f80fd5b813561103a81611213565b5f602082840312156112fa575f80fd5b815161103a8161115b565b5f60208284031215611315575f80fd5b815161103a81611213565b5f60208284031215611330575f80fd5b8151801515811461103a575f80fd5b5f6080828403128015611350575f80fd5b506040516080810167ffffffffffffffff8111828210171561138057634e487b7160e01b5f52604160045260245ffd5b604052825160ff81168114611393575f80fd5b81526020838101519082015260408301516113ad81611213565b60408201526060928301519281019290925250919050565b5f60208284031280156113d6575f80fd5b506040516020810167ffffffffffffffff8111828210171561140657634e487b7160e01b5f52604160045260245ffd5b604052825161141481611213565b81529392505050565b5f805f6060848603121561142f575f80fd5b835161143a8161115b565b602085015190935061144b8161115b565b604085015190925061125981611213565b5f6020828403121561146c575f80fd5b5051919050565b81810381811115610fb057634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52601260045260245ffdfea26469706673582212205b0c7b67cd230bc125955d86d10e671e7c3685d17a9a2b95fb8c492fb18b297164736f6c634300081a0033",
-  "deployedBytecode": "0x730000000000000000000000000000000000000000301460806040526004361061009b575f3560e01c8063746c22b81161006e578063746c22b81461012c578063b3eff9e11461013f578063d6b40e611461016d578063e048754d14610180578063e2a70ae3146101b3575f80fd5b80630fcf5d081461009f578063377e04ae146100db5780636d7b7389146101045780636feca3ff14610117575b5f80fd5b8180156100aa575f80fd5b506100be6100b936600461116f565b6101d4565b6040516001600160601b0390911681526020015b60405180910390f35b6100ee6100e93660046111dc565b6104ce565b60405164ffffffffff90911681526020016100d2565b6100be610112366004611225565b61067d565b61012a610125366004611264565b61071e565b005b6100ee61013a366004611264565b6107c5565b61015261014d3660046111dc565b6108d7565b6040805192835264ffffffffff9091166020830152016100d2565b61015261017b3660046111dc565b610a10565b61019361018e366004611291565b610ba8565b604080516001600160601b039384168152929091166020830152016100d2565b6101c66101c13660046112cf565b610d59565b6040519081526020016100d2565b5f805f6101e18786610a10565b915091505f806101f2898886610ba8565b915091506102008187610fb6565b60405163677d3feb60e11b81526001600160601b03891660048201529095505f906001600160a01b038c169063cefa7fd690602401602060405180830381865afa158015610250573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061027491906112ea565b6040516330f4419960e01b81526001600160601b03808b1660048301528083166024830152851660448201529091506001600160a01b038a16906330f44199906064015f604051808303815f87803b1580156102ce575f80fd5b505af11580156102e0573d5f803e3d5ffd5b5050604051633861317f60e01b81526001600160601b03808c16600483015280851660248301528a1660448201526001600160a01b038c169250633861317f91506064015f604051808303815f87803b15801561033b575f80fd5b505af115801561034d573d5f803e3d5ffd5b50505050886001600160a01b0316634b51da0c89604051806020016040528073__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__63adb618326040518163ffffffff1660e01b8152600401602060405180830381865af41580156103b3573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103d79190611305565b6040516352bcc5a760e11b815264ffffffffff9182166004820152908a16602482015273__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9063a5798b4e90604401602060405180830381865af4158015610434573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104589190611305565b64ffffffffff9081169091526040516001600160e01b031960e086901b1681526001600160601b03909316600484015290511660248201526044015f604051808303815f87803b1580156104aa575f80fd5b505af11580156104bc573d5f803e3d5ffd5b50505050505050505095945050505050565b60405163134fc55b60e11b81526001600160601b03821660048201525f906001600160a01b0384169063269f8ab690602401602060405180830381865afa15801561051b573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061053f9190611320565b61056c576040516396cff01560e01b81526001600160601b03831660048201526024015b60405180910390fd5b60405163777d185760e01b81526001600160601b03831660048201526001600160a01b0384169063777d185790602401602060405180830381865afa1580156105b7573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105db9190611320565b6106035760405163d0c1638160e01b81526001600160601b0383166004820152602401610563565b60405163153d412560e31b81526001600160601b03831660048201526001600160a01b0384169063a9ea092890602401608060405180830381865afa15801561064e573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610672919061133f565b604001519392505050565b5f8061069161068b85610d59565b86611041565b604051632c34efe560e11b81526001600160601b03851660048201526024810182905290915073__$3bac17678db7ae928afa209f2f44deec9c$__90635869dfca90604401602060405180830381865af41580156106f1573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061071591906112ea565b95945050505050565b604051630a4d29dd60e31b81526001600160601b038216600482015273__$3bac17678db7ae928afa209f2f44deec9c$__906352694ee890602401602060405180830381865af4158015610774573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906107989190611320565b156107c057604051625e4daf60e71b81526001600160601b0383166004820152602401610563565b505050565b5f806107d185856104ce565b90506107de85858561071e565b5f73__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__63adb618326040518163ffffffff1660e01b8152600401602060405180830381865af4158015610826573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061084a9190611305565b6040516352bcc5a760e11b815264ffffffffff80831660048301528416602482015290915073__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9063a5798b4e90604401602060405180830381865af41580156108a9573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108cd9190611305565b9695505050505050565b6040516301f33ce360e21b81526001600160601b03821660048201525f90819081906001600160a01b038616906307ccf38c90602401602060405180830381865afa158015610928573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061094c91906113c5565b90506109cf815f015173__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__63adb618326040518163ffffffff1660e01b8152600401602060405180830381865af415801561099c573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906109c09190611305565b64ffffffffff90811691161190565b15610a0857805160405163187bc0bd60e21b81526001600160601b038616600482015264ffffffffff9091166024820152604401610563565b509250929050565b604051632a4e656b60e01b81526001600160601b03821660048201525f90819081906001600160a01b03861690632a4e656b90602401602060405180830381865afa158015610a61573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610a8591906112ea565b60405163777d185760e01b81526001600160601b03821660048201529091506001600160a01b0386169063777d185790602401602060405180830381865afa158015610ad3573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610af79190611320565b610b1f5760405163d0c1638160e01b81526001600160601b0382166004820152602401610563565b60405163153d412560e31b81526001600160601b03821660048201525f906001600160a01b0387169063a9ea092890602401608060405180830381865afa158015610b6c573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610b90919061133f565b60608101516040909101519097909650945050505050565b60405160016279fab360e01b031981526001600160601b03831660048201525f9081908190819081906001600160a01b0389169063ff86054d90602401606060405180830381865afa158015610c00573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c24919061141d565b604051633682752160e21b815264ffffffffff8216600482015292955090935091505f9073__$71e292c09eace9601b3e21e68a1278917a$__90630c67422c9073__$91d01b1eccbca8d6f94a5eb2a0acb040e9$__9063da09d48490602401602060405180830381865af4158015610c9e573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610cc2919061145c565b610ccc9042611473565b6040518263ffffffff1660e01b8152600401610cea91815260200190565b602060405180830381865af4158015610d05573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610d299190611305565b9050610d3687828661067d565b9550610d4b610d458585610fb6565b87610fb6565b945050505050935093915050565b604051633682752160e21b815264ffffffffff821660048201525f90610fb09073__$bf7bc340cbb9229ef1de2c568356e67902$__906345ebb61e9073__$71e292c09eace9601b3e21e68a1278917a$__9063da09d48490602401602060405180830381865af4158015610dcf573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610df3919061145c565b6040518263ffffffff1660e01b8152600401610e1191815260200190565b602060405180830381865af4158015610e2c573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610e50919061145c565b73__$bf7bc340cbb9229ef1de2c568356e67902$__6345ebb61e73__$71e292c09eace9601b3e21e68a1278917a$__63f27c3bf66040518163ffffffff1660e01b8152600401602060405180830381865af4158015610eb1573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610ed59190611305565b604051633682752160e21b815264ffffffffff909116600482015273__$71e292c09eace9601b3e21e68a1278917a$__9063da09d48490602401602060405180830381865af4158015610f2a573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610f4e919061145c565b6040518263ffffffff1660e01b8152600401610f6c91815260200190565b602060405180830381865af4158015610f87573d5f803e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610fab919061145c565b611055565b92915050565b60405163274acb3560e01b81526001600160601b038084166004830152821660248201525f9073__$3bac17678db7ae928afa209f2f44deec9c$__9063274acb3590604401602060405180830381865af4158015611016573d5f803e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061103a91906112ea565b9392505050565b5f61103a8383670de0b6b3a7640000611085565b5f815f0361107657604051630f6c8fc360e21b815260040160405180910390fd5b61103a83670de0b6b3a7640000845b5f838302815f1985870982811083820303915050805f036110b9578382816110af576110af611492565b049250505061103a565b8084116110d95760405163227bc15360e01b815260040160405180910390fd5b5f848688095f868103871696879004966002600389028118808a02820302808a02820302808a02820302808a02820302808a02820302808a02909103029181900381900460010186841190950394909402919094039290920491909117919091029150509392505050565b6001600160a01b0381168114611158575f80fd5b50565b6001600160601b0381168114611158575f80fd5b5f805f805f60a08688031215611183575f80fd5b853561118e81611144565b9450602086013561119e81611144565b935060408601356111ae81611144565b925060608601356111be8161115b565b915060808601356111ce8161115b565b809150509295509295909350565b5f80604083850312156111ed575f80fd5b82356111f881611144565b915060208301356112088161115b565b809150509250929050565b64ffffffffff81168114611158575f80fd5b5f805f60608486031215611237575f80fd5b83359250602084013561124981611213565b915060408401356112598161115b565b809150509250925092565b5f805f60608486031215611276575f80fd5b833561128181611144565b925060208401356112498161115b565b5f805f606084860312156112a3575f80fd5b83356112ae81611144565b925060208401356112be8161115b565b929592945050506040919091013590565b5f602082840312156112df575f80fd5b813561103a81611213565b5f602082840312156112fa575f80fd5b815161103a8161115b565b5f60208284031215611315575f80fd5b815161103a81611213565b5f60208284031215611330575f80fd5b8151801515811461103a575f80fd5b5f6080828403128015611350575f80fd5b506040516080810167ffffffffffffffff8111828210171561138057634e487b7160e01b5f52604160045260245ffd5b604052825160ff81168114611393575f80fd5b81526020838101519082015260408301516113ad81611213565b60408201526060928301519281019290925250919050565b5f60208284031280156113d6575f80fd5b506040516020810167ffffffffffffffff8111828210171561140657634e487b7160e01b5f52604160045260245ffd5b604052825161141481611213565b81529392505050565b5f805f6060848603121561142f575f80fd5b835161143a8161115b565b602085015190935061144b8161115b565b604085015190925061125981611213565b5f6020828403121561146c575f80fd5b5051919050565b81810381811115610fb057634e487b7160e01b5f52601160045260245ffd5b634e487b7160e01b5f52601260045260245ffdfea26469706673582212205b0c7b67cd230bc125955d86d10e671e7c3685d17a9a2b95fb8c492fb18b297164736f6c634300081a0033",
-  "linkReferences": {
-    "contracts/type/Amount.sol": {
-      "AmountLib": [
-        {
-          "length": 20,
-          "start": 1773
-        },
-        {
-          "length": 20,
-          "start": 1904
-        },
-        {
-          "length": 20,
-          "start": 4114
-        }
-      ]
-    },
-    "contracts/type/Seconds.sol": {
-      "SecondsLib": [
-        {
-          "length": 20,
-          "start": 3198
-        },
-        {
-          "length": 20,
-          "start": 3531
-        },
-        {
-          "length": 20,
-          "start": 3744
-        },
-        {
-          "length": 20,
-          "start": 3878
-        }
-      ]
-    },
-    "contracts/type/Timestamp.sol": {
-      "TimestampLib": [
-        {
-          "length": 20,
-          "start": 930
-        },
-        {
-          "length": 20,
-          "start": 1072
-        },
-        {
-          "length": 20,
-          "start": 2069
-        },
-        {
-          "length": 20,
-          "start": 2213
-        },
-        {
-          "length": 20,
-          "start": 2443
-        },
-        {
-          "length": 20,
-          "start": 3226
-        }
-      ]
-    },
-    "contracts/type/UFixed.sol": {
-      "UFixedLib": [
-        {
-          "length": 20,
-          "start": 3503
-        },
-        {
-          "length": 20,
-          "start": 3718
-        }
-      ]
-    }
-  },
-  "deployedLinkReferences": {
-    "contracts/type/Amount.sol": {
-      "AmountLib": [
-        {
-          "length": 20,
-          "start": 1721
-        },
-        {
-          "length": 20,
-          "start": 1852
-        },
-        {
-          "length": 20,
-          "start": 4062
-        }
-      ]
-    },
-    "contracts/type/Seconds.sol": {
-      "SecondsLib": [
-        {
-          "length": 20,
-          "start": 3146
-        },
-        {
-          "length": 20,
-          "start": 3479
-        },
-        {
-          "length": 20,
-          "start": 3692
-        },
-        {
-          "length": 20,
-          "start": 3826
-        }
-      ]
-    },
-    "contracts/type/Timestamp.sol": {
-      "TimestampLib": [
-        {
-          "length": 20,
-          "start": 878
-        },
-        {
-          "length": 20,
-          "start": 1020
-        },
-        {
-          "length": 20,
-          "start": 2017
-        },
-        {
-          "length": 20,
-          "start": 2161
-        },
-        {
-          "length": 20,
-          "start": 2391
-        },
-        {
-          "length": 20,
-          "start": 3174
-        }
-      ]
-    },
-    "contracts/type/UFixed.sol": {
-      "UFixedLib": [
-        {
-          "length": 20,
-          "start": 3451
-        },
-        {
-          "length": 20,
-          "start": 3666
-        }
-      ]
-    }
-  }
-}