@etherisc/gif-next 0.0.2-ac5f18b → 0.0.2-aeb86f4

package/contracts/types/Timestamp.sol

@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+type Timestamp is uint40;
+
+using {
+    gtTimestamp as >,
+    gteTimestamp as >=,
+    ltTimestamp as <,
+    lteTimestamp as <=,
+    eqTimestamp as ==,
+    neTimestamp as !=
+} for Timestamp global;
+
+/// @dev return true if Timestamp a is after Timestamp b
+function gtTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) > Timestamp.unwrap(b); }
+/// @dev return true if Timestamp a is after or equal to Timestamp b
+function gteTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) >= Timestamp.unwrap(b); }
+
+/// @dev return true if Timestamp a is before Timestamp b
+function ltTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) < Timestamp.unwrap(b); }
+/// @dev return true if Timestamp a is before or equal to Timestamp b
+function lteTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) <= Timestamp.unwrap(b); }
+
+/// @dev return true if Timestamp a is equal to Timestamp b
+function eqTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) == Timestamp.unwrap(b); }
+/// @dev return true if Timestamp a is not equal to Timestamp b
+function neTimestamp(Timestamp a, Timestamp b) pure returns(bool) { return Timestamp.unwrap(a) != Timestamp.unwrap(b); }
+
+/// @dev Converts the uint256 to a Timestamp.
+function toTimestamp(uint256 timestamp) pure returns(Timestamp) { return Timestamp.wrap(uint40(timestamp));}
+
+function blockTimestamp() view returns(Timestamp) { return toTimestamp(block.timestamp); }
+
+/// @dev Return the Timestamp zero (0)
+function zeroTimestamp() pure returns(Timestamp) { return toTimestamp(0); }
+
+library TimestampLib {
+    /// @dev return true if Timestamp a is after Timestamp b
+    function gt(Timestamp a, Timestamp b) public pure returns(bool isAfter) { return gtTimestamp(a, b); }
+    /// @dev return true if Timestamp a is after or the same than Timestamp b
+    function gte(Timestamp a, Timestamp b) public pure returns(bool isAfterOrSame) { return gteTimestamp(a, b); }
+
+    /// @dev return true if Timestamp a is before Timestamp b
+    function lt(Timestamp a, Timestamp b) public pure returns(bool isBefore) { return ltTimestamp(a, b); }
+    /// @dev return true if Timestamp a is before or the same than Timestamp b
+    function lte(Timestamp a, Timestamp b) public pure returns(bool isBeforeOrSame) { return lteTimestamp(a, b); }
+
+    /// @dev return true if Timestamp a is equal to Timestamp b
+    function eq(Timestamp a, Timestamp b) public pure returns(bool isSame) { return eqTimestamp(a, b); }
+    /// @dev return true if Timestamp a is not equal to Timestamp b
+    function ne(Timestamp a, Timestamp b) public pure returns(bool isDifferent) { return neTimestamp(a, b); }
+
+    function toInt(Timestamp timestamp) public pure returns(uint256) { return uint256(uint40(Timestamp.unwrap(timestamp))); }
+}

package/contracts/types/UFixed.sol

@@ -0,0 +1,211 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import { Math } from "@openzeppelin/contracts/utils/math/Math.sol";
+
+/// @dev UFixed is a fixed point number with 18 decimals precision.
+type UFixed is uint256;
+
+using {
+    addUFixed as +,
+    subUFixed as -,
+    mulUFixed as *,
+    divUFixed as /,
+    gtUFixed as >,
+    gteUFixed as >=,
+    ltUFixed as <,
+    lteUFixed as <=,
+    eqUFixed as ==
+} for UFixed global;
+
+function addUFixed(UFixed a, UFixed b) pure returns(UFixed) {
+    return UFixed.wrap(UFixed.unwrap(a) + UFixed.unwrap(b));
+}
+
+function subUFixed(UFixed a, UFixed b) pure returns(UFixed) {
+    require(a >= b, "ERROR:UFM-010:NEGATIVE_RESULT");
+    return UFixed.wrap(UFixed.unwrap(a) - UFixed.unwrap(b));
+}
+
+function mulUFixed(UFixed a, UFixed b) pure returns(UFixed) {
+    return UFixed.wrap(Math.mulDiv(UFixed.unwrap(a), UFixed.unwrap(b), 10 ** 18));
+}
+
+function divUFixed(UFixed a, UFixed b) pure returns(UFixed) {
+    require(UFixed.unwrap(b) > 0, "ERROR:UFM-020:DIVISOR_ZERO");
+
+    return UFixed.wrap(
+        Math.mulDiv(
+            UFixed.unwrap(a), 
+            10 ** 18,
+            UFixed.unwrap(b)));
+}
+
+function gtUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
+    return UFixed.unwrap(a) > UFixed.unwrap(b);
+}
+
+function gteUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
+    return UFixed.unwrap(a) >= UFixed.unwrap(b);
+}
+
+function ltUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
+    return UFixed.unwrap(a) < UFixed.unwrap(b);
+}
+
+function lteUFixed(UFixed a, UFixed b) pure returns(bool isGreaterThan) {
+    return UFixed.unwrap(a) <= UFixed.unwrap(b);
+}
+
+function eqUFixed(UFixed a, UFixed b) pure returns(bool isEqual) {
+    return UFixed.unwrap(a) == UFixed.unwrap(b);
+}
+
+function gtzUFixed(UFixed a) pure returns(bool isZero) {
+    return UFixed.unwrap(a) > 0;
+}
+
+function eqzUFixed(UFixed a) pure returns(bool isZero) {
+    return UFixed.unwrap(a) == 0;
+}
+
+function deltaUFixed(UFixed a, UFixed b) pure returns(UFixed) {
+    if(a > b) {
+        return a - b;
+    }
+
+    return b - a;
+}
+
+library UFixedMathLib {
+
+    enum Rounding {
+        /// @dev Round down - floor(value)
+        Down, 
+        /// @dev Round up - ceil(value)
+        Up, 
+        /// @dev Round half up - round(value)
+        HalfUp 
+    }
+
+    int8 public constant EXP = 18;
+    uint256 public constant MULTIPLIER = 10 ** uint256(int256(EXP));
+    uint256 public constant MULTIPLIER_HALF = MULTIPLIER / 2;
+    
+    /// @dev Default rounding mode used by ftoi is HalfUp
+    Rounding public constant ROUNDING_DEFAULT = Rounding.HalfUp;
+
+    /// @dev returns the decimals precision of the UFixed type
+    function decimals() public pure returns(uint256) {
+        return uint8(EXP);
+    }
+
+    /// @dev Converts the uint256 to a UFixed.
+    function itof(uint256 a)
+        public
+        pure
+        returns(UFixed)
+    {
+        return UFixed.wrap(a * MULTIPLIER);
+    }
+
+    /// @dev Converts the uint256 to a UFixed with given exponent.
+    function itof(uint256 a, int8 exp)
+        public
+        pure
+        returns(UFixed)
+    {
+        require(EXP + exp >= 0, "ERROR:FM-010:EXPONENT_TOO_SMALL");
+        require(EXP + exp <= 64, "ERROR:FM-011:EXPONENT_TOO_LARGE");
+
+        return UFixed.wrap(a * 10 ** uint8(EXP + exp));
+    }
+
+    /// @dev Converts a UFixed to a uint256.
+    function ftoi(UFixed a)
+        public
+        pure
+        returns(uint256)
+    {
+        return ftoi(a, ROUNDING_DEFAULT);
+    }
+
+    /// @dev Converts a UFixed to a uint256 with given rounding mode.
+    function ftoi(UFixed a, Rounding rounding)
+        public
+        pure
+        returns(uint256)
+    {
+        if(rounding == Rounding.HalfUp) {
+            return Math.mulDiv(UFixed.unwrap(a) + MULTIPLIER_HALF, 1, MULTIPLIER, Math.Rounding.Down);
+        } else if(rounding == Rounding.Down) {
+            return Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Down);
+        } else {
+            return Math.mulDiv(UFixed.unwrap(a), 1, MULTIPLIER, Math.Rounding.Up);
+        }
+    }
+
+    /// @dev adds two UFixed numbers
+    function add(UFixed a, UFixed b) public pure returns(UFixed) {
+        return addUFixed(a, b);
+    }
+
+    /// @dev subtracts two UFixed numbers
+    function sub(UFixed a, UFixed b) public pure returns(UFixed) {
+        return subUFixed(a, b);
+    }
+
+    /// @dev multiplies two UFixed numbers
+    function mul(UFixed a, UFixed b) public pure returns(UFixed) {
+        return mulUFixed(a, b);
+    }
+
+    /// @dev divides two UFixed numbers
+    function div(UFixed a, UFixed b) public pure returns(UFixed) {
+        return divUFixed(a, b);
+    }
+
+    /// @dev return true if UFixed a is greater than UFixed b
+    function gt(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
+        return gtUFixed(a, b);
+    }
+
+    /// @dev return true if UFixed a is greater than or equal to UFixed b
+    function gte(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
+        return gteUFixed(a, b);
+    }
+
+    /// @dev return true if UFixed a is less than UFixed b
+    function lt(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
+        return ltUFixed(a, b);
+    }
+
+    /// @dev return true if UFixed a is less than or equal to UFixed b
+    function lte(UFixed a, UFixed b) public pure returns(bool isGreaterThan) {
+        return lteUFixed(a, b);
+    }
+
+    /// @dev return true if UFixed a is equal to UFixed b
+    function eq(UFixed a, UFixed b) public pure returns(bool isEqual) {
+        return eqUFixed(a, b);
+    }
+
+    /// @dev return true if UFixed a is not zero
+    function gtz(UFixed a) public pure returns(bool isZero) {
+        return gtzUFixed(a);
+    }
+
+    /// @dev return true if UFixed a is zero
+    function eqz(UFixed a) public pure returns(bool isZero) {
+        return eqzUFixed(a);
+    }
+
+    function zero() public pure returns(UFixed) {
+        return UFixed.wrap(0);
+    }
+
+    /// @dev return the absolute delta between two UFixed numbers
+    function delta(UFixed a, UFixed b) public pure returns(UFixed) {
+        return deltaUFixed(a, b);
+    }
+}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-ac5f18b",
+  "version": "0.0.2-aeb86f4",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
-    "build": "hardhat compile",
-    "test": "hardhat test",
-    "ptest": "hardhat test --parallel",
-    "test-with-gas": "REPORT_GAS=true hardhat test",
-    "coverage": "hardhat coverage"
+    "build": "hh compile",
+    "test": "hh test",
+    "ptest": "hh test --parallel",
+    "test-with-gas": "REPORT_GAS=true hh test",
+    "coverage": "hh coverage"
   },
   "repository": {
     "type": "git",

package/artifacts/contracts/Dip.sol/DIP.dbg.json

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

package/artifacts/contracts/Dip.sol/DIP.json

@@ -1,338 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "DIP",
-  "sourceName": "contracts/Dip.sol",
-  "abi": [
-    {
-      "inputs": [],
-      "stateMutability": "nonpayable",
-      "type": "constructor"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Approval",
-      "type": "event"
-    },
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "indexed": true,
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "uint256",
-          "name": "value",
-          "type": "uint256"
-        }
-      ],
-      "name": "Transfer",
-      "type": "event"
-    },
-    {
-      "inputs": [],
-      "name": "DECIMALS",
-      "outputs": [
-        {
-          "internalType": "uint8",
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "INITIAL_SUPPLY",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "NAME",
-      "outputs": [
-        {
-          "internalType": "string",
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "SYMBOL",
-      "outputs": [
-        {
-          "internalType": "string",
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "owner",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        }
-      ],
-      "name": "allowance",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "approve",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "account",
-          "type": "address"
-        }
-      ],
-      "name": "balanceOf",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "decimals",
-      "outputs": [
-        {
-          "internalType": "uint8",
-          "name": "",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "subtractedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "decreaseAllowance",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "spender",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "addedValue",
-          "type": "uint256"
-        }
-      ],
-      "name": "increaseAllowance",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "name",
-      "outputs": [
-        {
-          "internalType": "string",
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "symbol",
-      "outputs": [
-        {
-          "internalType": "string",
-          "name": "",
-          "type": "string"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "totalSupply",
-      "outputs": [
-        {
-          "internalType": "uint256",
-          "name": "",
-          "type": "uint256"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "transfer",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "from",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "to",
-          "type": "address"
-        },
-        {
-          "internalType": "uint256",
-          "name": "amount",
-          "type": "uint256"
-        }
-      ],
-      "name": "transferFrom",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x60806040523480156200001157600080fd5b5060405180606001604052806028815260200162001e2c602891396040518060400160405280600381526020017f44495000000000000000000000000000000000000000000000000000000000008152508160039081620000739190620004c8565b508060049081620000859190620004c8565b505050620000c96200009c620000cf60201b60201c565b6012600a620000ac91906200073f565b633b9aca00620000bd919062000790565b620000d760201b60201c565b620008c7565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160362000149576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000140906200083c565b60405180910390fd5b6200015d600083836200024460201b60201c565b80600260008282546200017191906200085e565b92505081905550806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef83604051620002249190620008aa565b60405180910390a362000240600083836200024960201b60201c565b5050565b505050565b505050565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680620002d057607f821691505b602082108103620002e657620002e562000288565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b600060088302620003507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8262000311565b6200035c868362000311565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b6000620003a9620003a36200039d8462000374565b6200037e565b62000374565b9050919050565b6000819050919050565b620003c58362000388565b620003dd620003d482620003b0565b8484546200031e565b825550505050565b600090565b620003f4620003e5565b62000401818484620003ba565b505050565b5b8181101562000429576200041d600082620003ea565b60018101905062000407565b5050565b601f82111562000478576200044281620002ec565b6200044d8462000301565b810160208510156200045d578190505b620004756200046c8562000301565b83018262000406565b50505b505050565b600082821c905092915050565b60006200049d600019846008026200047d565b1980831691505092915050565b6000620004b883836200048a565b9150826002028217905092915050565b620004d3826200024e565b67ffffffffffffffff811115620004ef57620004ee62000259565b5b620004fb8254620002b7565b620005088282856200042d565b600060209050601f8311600181146200054057600084156200052b578287015190505b620005378582620004aa565b865550620005a7565b601f1984166200055086620002ec565b60005b828110156200057a5784890151825560018201915060208501945060208101905062000553565b868310156200059a578489015162000596601f8916826200048a565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b60018511156200063d57808604811115620006155762000614620005af565b5b6001851615620006255780820291505b80810290506200063585620005de565b9450620005f5565b94509492505050565b6000826200065857600190506200072b565b816200066857600090506200072b565b81600181146200068157600281146200068c57620006c2565b60019150506200072b565b60ff841115620006a157620006a0620005af565b5b8360020a915084821115620006bb57620006ba620005af565b5b506200072b565b5060208310610133831016604e8410600b8410161715620006fc5782820a905083811115620006f657620006f5620005af565b5b6200072b565b6200070b8484846001620005eb565b92509050818404811115620007255762000724620005af565b5b81810290505b9392505050565b600060ff82169050919050565b60006200074c8262000374565b9150620007598362000732565b9250620007887fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff848462000646565b905092915050565b60006200079d8262000374565b9150620007aa8362000374565b9250828202620007ba8162000374565b91508282048414831517620007d457620007d3620005af565b5b5092915050565b600082825260208201905092915050565b7f45524332303a206d696e7420746f20746865207a65726f206164647265737300600082015250565b600062000824601f83620007db565b91506200083182620007ec565b602082019050919050565b60006020820190508181036000830152620008578162000815565b9050919050565b60006200086b8262000374565b9150620008788362000374565b9250828201905080821115620008935762000892620005af565b5b92915050565b620008a48162000374565b82525050565b6000602082019050620008c1600083018462000899565b92915050565b61155580620008d76000396000f3fe608060405234801561001057600080fd5b50600436106100f55760003560e01c80633950935111610097578063a457c2d711610066578063a457c2d71461028c578063a9059cbb146102bc578063dd62ed3e146102ec578063f76f8d781461031c576100f5565b806339509351146101f057806370a082311461022057806395d89b4114610250578063a3f4df7e1461026e576100f5565b806323b872dd116100d357806323b872dd146101665780632e0f2625146101965780632ff2e9dc146101b4578063313ce567146101d2576100f5565b806306fdde03146100fa578063095ea7b31461011857806318160ddd14610148575b600080fd5b61010261033a565b60405161010f9190610c4a565b60405180910390f35b610132600480360381019061012d9190610d05565b6103cc565b60405161013f9190610d60565b60405180910390f35b6101506103ef565b60405161015d9190610d8a565b60405180910390f35b610180600480360381019061017b9190610da5565b6103f9565b60405161018d9190610d60565b60405180910390f35b61019e610428565b6040516101ab9190610e14565b60405180910390f35b6101bc61042d565b6040516101c99190610d8a565b60405180910390f35b6101da61044d565b6040516101e79190610e14565b60405180910390f35b61020a60048036038101906102059190610d05565b610456565b6040516102179190610d60565b60405180910390f35b61023a60048036038101906102359190610e2f565b61048d565b6040516102479190610d8a565b60405180910390f35b6102586104d5565b6040516102659190610c4a565b60405180910390f35b610276610567565b6040516102839190610c4a565b60405180910390f35b6102a660048036038101906102a19190610d05565b610583565b6040516102b39190610d60565b60405180910390f35b6102d660048036038101906102d19190610d05565b6105fa565b6040516102e39190610d60565b60405180910390f35b61030660048036038101906103019190610e5c565b61061d565b6040516103139190610d8a565b60405180910390f35b6103246106a4565b6040516103319190610c4a565b60405180910390f35b60606003805461034990610ecb565b80601f016020809104026020016040519081016040528092919081815260200182805461037590610ecb565b80156103c25780601f10610397576101008083540402835291602001916103c2565b820191906000526020600020905b8154815290600101906020018083116103a557829003601f168201915b5050505050905090565b6000806103d76106dd565b90506103e48185856106e5565b600191505092915050565b6000600254905090565b6000806104046106dd565b90506104118582856108ae565b61041c85858561093a565b60019150509392505050565b601281565b6012600a61043b919061105e565b633b9aca0061044a91906110a9565b81565b60006012905090565b6000806104616106dd565b9050610482818585610473858961061d565b61047d91906110eb565b6106e5565b600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b6060600480546104e490610ecb565b80601f016020809104026020016040519081016040528092919081815260200182805461051090610ecb565b801561055d5780601f106105325761010080835404028352916020019161055d565b820191906000526020600020905b81548152906001019060200180831161054057829003601f168201915b5050505050905090565b6040518060600160405280602881526020016114f86028913981565b60008061058e6106dd565b9050600061059c828661061d565b9050838110156105e1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016105d890611191565b60405180910390fd5b6105ee82868684036106e5565b60019250505092915050565b6000806106056106dd565b905061061281858561093a565b600191505092915050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6040518060400160405280600381526020017f444950000000000000000000000000000000000000000000000000000000000081525081565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610754576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161074b90611223565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036107c3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107ba906112b5565b60405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925836040516108a19190610d8a565b60405180910390a3505050565b60006108ba848461061d565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81146109345781811015610926576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161091d90611321565b60405180910390fd5b61093384848484036106e5565b5b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036109a9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109a0906113b3565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610a18576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a0f90611445565b60405180910390fd5b610a23838383610bb0565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905081811015610aa9576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610aa0906114d7565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef84604051610b979190610d8a565b60405180910390a3610baa848484610bb5565b50505050565b505050565b505050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610bf4578082015181840152602081019050610bd9565b60008484015250505050565b6000601f19601f8301169050919050565b6000610c1c82610bba565b610c268185610bc5565b9350610c36818560208601610bd6565b610c3f81610c00565b840191505092915050565b60006020820190508181036000830152610c648184610c11565b905092915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610c9c82610c71565b9050919050565b610cac81610c91565b8114610cb757600080fd5b50565b600081359050610cc981610ca3565b92915050565b6000819050919050565b610ce281610ccf565b8114610ced57600080fd5b50565b600081359050610cff81610cd9565b92915050565b60008060408385031215610d1c57610d1b610c6c565b5b6000610d2a85828601610cba565b9250506020610d3b85828601610cf0565b9150509250929050565b60008115159050919050565b610d5a81610d45565b82525050565b6000602082019050610d756000830184610d51565b92915050565b610d8481610ccf565b82525050565b6000602082019050610d9f6000830184610d7b565b92915050565b600080600060608486031215610dbe57610dbd610c6c565b5b6000610dcc86828701610cba565b9350506020610ddd86828701610cba565b9250506040610dee86828701610cf0565b9150509250925092565b600060ff82169050919050565b610e0e81610df8565b82525050565b6000602082019050610e296000830184610e05565b92915050565b600060208284031215610e4557610e44610c6c565b5b6000610e5384828501610cba565b91505092915050565b60008060408385031215610e7357610e72610c6c565b5b6000610e8185828601610cba565b9250506020610e9285828601610cba565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680610ee357607f821691505b602082108103610ef657610ef5610e9c565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b6001851115610f8257808604811115610f5e57610f5d610efc565b5b6001851615610f6d5780820291505b8081029050610f7b85610f2b565b9450610f42565b94509492505050565b600082610f9b5760019050611057565b81610fa95760009050611057565b8160018114610fbf5760028114610fc957610ff8565b6001915050611057565b60ff841115610fdb57610fda610efc565b5b8360020a915084821115610ff257610ff1610efc565b5b50611057565b5060208310610133831016604e8410600b841016171561102d5782820a90508381111561102857611027610efc565b5b611057565b61103a8484846001610f38565b9250905081840481111561105157611050610efc565b5b81810290505b9392505050565b600061106982610ccf565b915061107483610df8565b92506110a17fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f8b565b905092915050565b60006110b482610ccf565b91506110bf83610ccf565b92508282026110cd81610ccf565b915082820484148315176110e4576110e3610efc565b5b5092915050565b60006110f682610ccf565b915061110183610ccf565b925082820190508082111561111957611118610efc565b5b92915050565b7f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f7760008201527f207a65726f000000000000000000000000000000000000000000000000000000602082015250565b600061117b602583610bc5565b91506111868261111f565b604082019050919050565b600060208201905081810360008301526111aa8161116e565b9050919050565b7f45524332303a20617070726f76652066726f6d20746865207a65726f2061646460008201527f7265737300000000000000000000000000000000000000000000000000000000602082015250565b600061120d602483610bc5565b9150611218826111b1565b604082019050919050565b6000602082019050818103600083015261123c81611200565b9050919050565b7f45524332303a20617070726f766520746f20746865207a65726f20616464726560008201527f7373000000000000000000000000000000000000000000000000000000000000602082015250565b600061129f602283610bc5565b91506112aa82611243565b604082019050919050565b600060208201905081810360008301526112ce81611292565b9050919050565b7f45524332303a20696e73756666696369656e7420616c6c6f77616e6365000000600082015250565b600061130b601d83610bc5565b9150611316826112d5565b602082019050919050565b6000602082019050818103600083015261133a816112fe565b9050919050565b7f45524332303a207472616e736665722066726f6d20746865207a65726f20616460008201527f6472657373000000000000000000000000000000000000000000000000000000602082015250565b600061139d602583610bc5565b91506113a882611341565b604082019050919050565b600060208201905081810360008301526113cc81611390565b9050919050565b7f45524332303a207472616e7366657220746f20746865207a65726f206164647260008201527f6573730000000000000000000000000000000000000000000000000000000000602082015250565b600061142f602383610bc5565b915061143a826113d3565b604082019050919050565b6000602082019050818103600083015261145e81611422565b9050919050565b7f45524332303a207472616e7366657220616d6f756e742065786365656473206260008201527f616c616e63650000000000000000000000000000000000000000000000000000602082015250565b60006114c1602683610bc5565b91506114cc82611465565b604082019050919050565b600060208201905081810360008301526114f0816114b4565b905091905056fe446563656e7472616c697a656420496e737572616e63652050726f746f636f6c202d2044554d4d59a26469706673582212207c0b5fc9c425154d4c614fe0925d4fc2f9079abd8b114f30cb85a2942310245b64736f6c63430008140033446563656e7472616c697a656420496e737572616e63652050726f746f636f6c202d2044554d4d59",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100f55760003560e01c80633950935111610097578063a457c2d711610066578063a457c2d71461028c578063a9059cbb146102bc578063dd62ed3e146102ec578063f76f8d781461031c576100f5565b806339509351146101f057806370a082311461022057806395d89b4114610250578063a3f4df7e1461026e576100f5565b806323b872dd116100d357806323b872dd146101665780632e0f2625146101965780632ff2e9dc146101b4578063313ce567146101d2576100f5565b806306fdde03146100fa578063095ea7b31461011857806318160ddd14610148575b600080fd5b61010261033a565b60405161010f9190610c4a565b60405180910390f35b610132600480360381019061012d9190610d05565b6103cc565b60405161013f9190610d60565b60405180910390f35b6101506103ef565b60405161015d9190610d8a565b60405180910390f35b610180600480360381019061017b9190610da5565b6103f9565b60405161018d9190610d60565b60405180910390f35b61019e610428565b6040516101ab9190610e14565b60405180910390f35b6101bc61042d565b6040516101c99190610d8a565b60405180910390f35b6101da61044d565b6040516101e79190610e14565b60405180910390f35b61020a60048036038101906102059190610d05565b610456565b6040516102179190610d60565b60405180910390f35b61023a60048036038101906102359190610e2f565b61048d565b6040516102479190610d8a565b60405180910390f35b6102586104d5565b6040516102659190610c4a565b60405180910390f35b610276610567565b6040516102839190610c4a565b60405180910390f35b6102a660048036038101906102a19190610d05565b610583565b6040516102b39190610d60565b60405180910390f35b6102d660048036038101906102d19190610d05565b6105fa565b6040516102e39190610d60565b60405180910390f35b61030660048036038101906103019190610e5c565b61061d565b6040516103139190610d8a565b60405180910390f35b6103246106a4565b6040516103319190610c4a565b60405180910390f35b60606003805461034990610ecb565b80601f016020809104026020016040519081016040528092919081815260200182805461037590610ecb565b80156103c25780601f10610397576101008083540402835291602001916103c2565b820191906000526020600020905b8154815290600101906020018083116103a557829003601f168201915b5050505050905090565b6000806103d76106dd565b90506103e48185856106e5565b600191505092915050565b6000600254905090565b6000806104046106dd565b90506104118582856108ae565b61041c85858561093a565b60019150509392505050565b601281565b6012600a61043b919061105e565b633b9aca0061044a91906110a9565b81565b60006012905090565b6000806104616106dd565b9050610482818585610473858961061d565b61047d91906110eb565b6106e5565b600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b6060600480546104e490610ecb565b80601f016020809104026020016040519081016040528092919081815260200182805461051090610ecb565b801561055d5780601f106105325761010080835404028352916020019161055d565b820191906000526020600020905b81548152906001019060200180831161054057829003601f168201915b5050505050905090565b6040518060600160405280602881526020016114f86028913981565b60008061058e6106dd565b9050600061059c828661061d565b9050838110156105e1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016105d890611191565b60405180910390fd5b6105ee82868684036106e5565b60019250505092915050565b6000806106056106dd565b905061061281858561093a565b600191505092915050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b6040518060400160405280600381526020017f444950000000000000000000000000000000000000000000000000000000000081525081565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610754576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161074b90611223565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036107c3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107ba906112b5565b60405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925836040516108a19190610d8a565b60405180910390a3505050565b60006108ba848461061d565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81146109345781811015610926576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161091d90611321565b60405180910390fd5b61093384848484036106e5565b5b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036109a9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109a0906113b3565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610a18576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a0f90611445565b60405180910390fd5b610a23838383610bb0565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905081811015610aa9576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610aa0906114d7565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef84604051610b979190610d8a565b60405180910390a3610baa848484610bb5565b50505050565b505050565b505050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610bf4578082015181840152602081019050610bd9565b60008484015250505050565b6000601f19601f8301169050919050565b6000610c1c82610bba565b610c268185610bc5565b9350610c36818560208601610bd6565b610c3f81610c00565b840191505092915050565b60006020820190508181036000830152610c648184610c11565b905092915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610c9c82610c71565b9050919050565b610cac81610c91565b8114610cb757600080fd5b50565b600081359050610cc981610ca3565b92915050565b6000819050919050565b610ce281610ccf565b8114610ced57600080fd5b50565b600081359050610cff81610cd9565b92915050565b60008060408385031215610d1c57610d1b610c6c565b5b6000610d2a85828601610cba565b9250506020610d3b85828601610cf0565b9150509250929050565b60008115159050919050565b610d5a81610d45565b82525050565b6000602082019050610d756000830184610d51565b92915050565b610d8481610ccf565b82525050565b6000602082019050610d9f6000830184610d7b565b92915050565b600080600060608486031215610dbe57610dbd610c6c565b5b6000610dcc86828701610cba565b9350506020610ddd86828701610cba565b9250506040610dee86828701610cf0565b9150509250925092565b600060ff82169050919050565b610e0e81610df8565b82525050565b6000602082019050610e296000830184610e05565b92915050565b600060208284031215610e4557610e44610c6c565b5b6000610e5384828501610cba565b91505092915050565b60008060408385031215610e7357610e72610c6c565b5b6000610e8185828601610cba565b9250506020610e9285828601610cba565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680610ee357607f821691505b602082108103610ef657610ef5610e9c565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b6001851115610f8257808604811115610f5e57610f5d610efc565b5b6001851615610f6d5780820291505b8081029050610f7b85610f2b565b9450610f42565b94509492505050565b600082610f9b5760019050611057565b81610fa95760009050611057565b8160018114610fbf5760028114610fc957610ff8565b6001915050611057565b60ff841115610fdb57610fda610efc565b5b8360020a915084821115610ff257610ff1610efc565b5b50611057565b5060208310610133831016604e8410600b841016171561102d5782820a90508381111561102857611027610efc565b5b611057565b61103a8484846001610f38565b9250905081840481111561105157611050610efc565b5b81810290505b9392505050565b600061106982610ccf565b915061107483610df8565b92506110a17fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610f8b565b905092915050565b60006110b482610ccf565b91506110bf83610ccf565b92508282026110cd81610ccf565b915082820484148315176110e4576110e3610efc565b5b5092915050565b60006110f682610ccf565b915061110183610ccf565b925082820190508082111561111957611118610efc565b5b92915050565b7f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f7760008201527f207a65726f000000000000000000000000000000000000000000000000000000602082015250565b600061117b602583610bc5565b91506111868261111f565b604082019050919050565b600060208201905081810360008301526111aa8161116e565b9050919050565b7f45524332303a20617070726f76652066726f6d20746865207a65726f2061646460008201527f7265737300000000000000000000000000000000000000000000000000000000602082015250565b600061120d602483610bc5565b9150611218826111b1565b604082019050919050565b6000602082019050818103600083015261123c81611200565b9050919050565b7f45524332303a20617070726f766520746f20746865207a65726f20616464726560008201527f7373000000000000000000000000000000000000000000000000000000000000602082015250565b600061129f602283610bc5565b91506112aa82611243565b604082019050919050565b600060208201905081810360008301526112ce81611292565b9050919050565b7f45524332303a20696e73756666696369656e7420616c6c6f77616e6365000000600082015250565b600061130b601d83610bc5565b9150611316826112d5565b602082019050919050565b6000602082019050818103600083015261133a816112fe565b9050919050565b7f45524332303a207472616e736665722066726f6d20746865207a65726f20616460008201527f6472657373000000000000000000000000000000000000000000000000000000602082015250565b600061139d602583610bc5565b91506113a882611341565b604082019050919050565b600060208201905081810360008301526113cc81611390565b9050919050565b7f45524332303a207472616e7366657220746f20746865207a65726f206164647260008201527f6573730000000000000000000000000000000000000000000000000000000000602082015250565b600061142f602383610bc5565b915061143a826113d3565b604082019050919050565b6000602082019050818103600083015261145e81611422565b9050919050565b7f45524332303a207472616e7366657220616d6f756e742065786365656473206260008201527f616c616e63650000000000000000000000000000000000000000000000000000602082015250565b60006114c1602683610bc5565b91506114cc82611465565b604082019050919050565b600060208201905081810360008301526114f0816114b4565b905091905056fe446563656e7472616c697a656420496e737572616e63652050726f746f636f6c202d2044554d4d59a26469706673582212207c0b5fc9c425154d4c614fe0925d4fc2f9079abd8b114f30cb85a2942310245b64736f6c63430008140033",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/artifacts/contracts/Lock.sol/Lock.dbg.json

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