From 1a5ddc01bec008b640dbc094e7a23c5ee9151a3f Mon Sep 17 00:00:00 2001 From: aboudjem Date: Tue, 27 Oct 2020 21:14:10 +0100 Subject: [PATCH 1/6] :init:(Init) fork + init project --- package-lock.json | 13 +++++++++++++ package.json | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 package-lock.json create mode 100644 package.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..b23f3b8 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,13 @@ +{ + "name": "keep3r", + "version": "1.0.0-RC", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@openzeppelin/contracts": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.2.0.tgz", + "integrity": "sha512-bUOmkSoPkjnUyMiKo6RYnb0VHBk5D9KKDAgNLzF41aqAM3TeE0yGdFF5dVRcV60pZdJLlyFT/jjXIZCWyyEzAQ==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..d2f3ce1 --- /dev/null +++ b/package.json @@ -0,0 +1,33 @@ +{ + "name": "keep3r", + "version": "1.0.0-RC", + "description": "Keep3r Network is a decentralized keeper network for projects that need external devops and for external teams to find keeper jobs", + "main": "truffle-config.js", + "directories": { + "doc": "docs", + "test": "test" + }, + "dependencies": { + "@openzeppelin/contracts": "^3.2.0" + }, + "devDependencies": {}, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/Fantom-foundation/keep3r.network.git" + }, + "keywords": [ + "keeper", + "blockchain", + "fantom", + "opera" + ], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/Fantom-foundation/keep3r.network/issues" + }, + "homepage": "https://github.com/Fantom-foundation/keep3r.network#readme" +} From ec27fa0fb9572309f6c3f27ef2480951a586bb92 Mon Sep 17 00:00:00 2001 From: aboudjem Date: Tue, 27 Oct 2020 21:35:40 +0100 Subject: [PATCH 2/6] :add:(openzeppelin) add openzeppelin, remove duplicates & redundancy + clean --- contracts/Keep3r.sol | 408 +-------------------------------- contracts/Keep3rGovernance.sol | 191 +-------------- contracts/Keep3rHelper.sol | 184 +-------------- contracts/Keep3rJob.sol | 2 +- truffle-config.js | 2 +- 5 files changed, 16 insertions(+), 771 deletions(-) diff --git a/contracts/Keep3r.sol b/contracts/Keep3r.sol index f286f19..9e334e2 100644 --- a/contracts/Keep3r.sol +++ b/contracts/Keep3r.sol @@ -1,190 +1,11 @@ -// SPDX-License-Identifier: MIT -pragma solidity ^0.6.12; - -// From https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/math/Math.sol -// Subject to the MIT license. - -/** - * @dev Wrappers over Solidity's arithmetic operations with added overflow - * checks. - * - * Arithmetic operations in Solidity wrap on overflow. This can easily result - * in bugs, because programmers usually assume that an overflow raises an - * error, which is the standard behavior in high level programming languages. - * `SafeMath` restores this intuition by reverting the transaction when an - * operation overflows. - * - * Using this library instead of the unchecked operations eliminates an entire - * class of bugs, so it's recommended to use it always. - */ -library SafeMath { - /** - * @dev Returns the addition of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint a, uint b) internal pure returns (uint) { - uint c = a + b; - require(c >= a, "add: +"); - - return c; - } - - /** - * @dev Returns the addition of two unsigned integers, reverting with custom message on overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - uint c = a + b; - require(c >= a, errorMessage); - - return c; - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting on underflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot underflow. - */ - function sub(uint a, uint b) internal pure returns (uint) { - return sub(a, b, "sub: -"); - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting with custom message on underflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot underflow. - */ - function sub(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - require(b <= a, errorMessage); - uint c = a - b; - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint a, uint b) internal pure returns (uint) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } +import '@openzeppelin/contracts/math/SafeMath.sol'; +import '@openzeppelin/contracts/token/ERC20/SafeERC20.sol'; +import '@openzeppelin/contracts/utils/Address.sol'; +import '@openzeppelin/contracts/token/ERC20/IERC20.sol'; - uint c = a * b; - require(c / a == b, "mul: *"); - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint c = a * b; - require(c / a == b, errorMessage); - - return c; - } - - /** - * @dev Returns the integer division of two unsigned integers. - * Reverts on division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint a, uint b) internal pure returns (uint) { - return div(a, b, "div: /"); - } - - /** - * @dev Returns the integer division of two unsigned integers. - * Reverts with custom message on division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - // Solidity only automatically asserts when dividing by 0 - require(b > 0, errorMessage); - uint c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - - return c; - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint a, uint b) internal pure returns (uint) { - return mod(a, b, "mod: %"); - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts with custom message when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - require(b != 0, errorMessage); - return a % b; - } -} +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.12; /** * @dev Contract module that helps prevent reentrant calls to a function. @@ -253,219 +74,6 @@ interface IKeep3rHelper { function getQuoteLimit(uint gasUsed) external view returns (uint); } -/** - * @dev Interface of the ERC20 standard as defined in the EIP. - */ -interface IERC20 { - /** - * @dev Returns the amount of tokens in existence. - */ - function totalSupply() external view returns (uint256); - - /** - * @dev Returns the amount of tokens owned by `account`. - */ - function balanceOf(address account) external view returns (uint256); - - /** - * @dev Moves `amount` tokens from the caller's account to `recipient`. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transfer(address recipient, uint256 amount) external returns (bool); - - /** - * @dev Returns the remaining number of tokens that `spender` will be - * allowed to spend on behalf of `owner` through {transferFrom}. This is - * zero by default. - * - * This value changes when {approve} or {transferFrom} are called. - */ - function allowance(address owner, address spender) external view returns (uint256); - - /** - * @dev Sets `amount` as the allowance of `spender` over the caller's tokens. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * IMPORTANT: Beware that changing an allowance with this method brings the risk - * that someone may use both the old and the new allowance by unfortunate - * transaction ordering. One possible solution to mitigate this race - * condition is to first reduce the spender's allowance to 0 and set the - * desired value afterwards: - * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * Emits an {Approval} event. - */ - function approve(address spender, uint256 amount) external returns (bool); - - /** - * @dev Moves `amount` tokens from `sender` to `recipient` using the - * allowance mechanism. `amount` is then deducted from the caller's - * allowance. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transferFrom(address sender, address recipient, uint256 amount) external returns (bool); - - /** - * @dev Emitted when `value` tokens are moved from one account (`from`) to - * another (`to`). - * - * Note that `value` may be zero. - */ - event Transfer(address indexed from, address indexed to, uint256 value); - - /** - * @dev Emitted when the allowance of a `spender` for an `owner` is set by - * a call to {approve}. `value` is the new allowance. - */ - event Approval(address indexed owner, address indexed spender, uint256 value); -} - -/** - * @dev Collection of functions related to the address type - */ -library Address { - /** - * @dev Returns true if `account` is a contract. - * - * [IMPORTANT] - * ==== - * It is unsafe to assume that an address for which this function returns - * false is an externally-owned account (EOA) and not a contract. - * - * Among others, `isContract` will return false for the following - * types of addresses: - * - * - an externally-owned account - * - a contract in construction - * - an address where a contract will be created - * - an address where a contract lived, but was destroyed - * ==== - */ - function isContract(address account) internal view returns (bool) { - // According to EIP-1052, 0x0 is the value returned for not-yet created accounts - // and 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 is returned - // for accounts without code, i.e. `keccak256('')` - bytes32 codehash; - bytes32 accountHash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470; - // solhint-disable-next-line no-inline-assembly - assembly { codehash := extcodehash(account) } - return (codehash != accountHash && codehash != 0x0); - } - - /** - * @dev Converts an `address` into `address payable`. Note that this is - * simply a type cast: the actual underlying value is not changed. - * - * _Available since v2.4.0._ - */ - function toPayable(address account) internal pure returns (address payable) { - return address(uint160(account)); - } - - /** - * @dev Replacement for Solidity's `transfer`: sends `amount` wei to - * `recipient`, forwarding all available gas and reverting on errors. - * - * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost - * of certain opcodes, possibly making contracts go over the 2300 gas limit - * imposed by `transfer`, making them unable to receive funds via - * `transfer`. {sendValue} removes this limitation. - * - * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more]. - * - * IMPORTANT: because control is transferred to `recipient`, care must be - * taken to not create reentrancy vulnerabilities. Consider using - * {ReentrancyGuard} or the - * https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern]. - * - * _Available since v2.4.0._ - */ - function sendValue(address payable recipient, uint256 amount) internal { - require(address(this).balance >= amount, "Address: insufficient"); - - // solhint-disable-next-line avoid-call-value - (bool success, ) = recipient.call{value:amount}(""); - require(success, "Address: reverted"); - } -} - -/** - * @title SafeERC20 - * @dev Wrappers around ERC20 operations that throw on failure (when the token - * contract returns false). Tokens that return no value (and instead revert or - * throw on failure) are also supported, non-reverting calls are assumed to be - * successful. - * To use this library you can add a `using SafeERC20 for ERC20;` statement to your contract, - * which allows you to call the safe operations as `token.safeTransfer(...)`, etc. - */ -library SafeERC20 { - using SafeMath for uint256; - using Address for address; - - function safeTransfer(IERC20 token, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value)); - } - - function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value)); - } - - function safeApprove(IERC20 token, address spender, uint256 value) internal { - // safeApprove should only be called when setting an initial allowance, - // or when resetting it to zero. To increase and decrease it, use - // 'safeIncreaseAllowance' and 'safeDecreaseAllowance' - // solhint-disable-next-line max-line-length - require((value == 0) || (token.allowance(address(this), spender) == 0), - "SafeERC20: approve from non-zero to non-zero allowance" - ); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, value)); - } - - function safeIncreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).add(value); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - function safeDecreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).sub(value, "SafeERC20: < 0"); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - /** - * @dev Imitates a Solidity high-level call (i.e. a regular function call to a contract), relaxing the requirement - * on the return value: the return value is optional (but if data is returned, it must not be false). - * @param token The token targeted by the call. - * @param data The call data (encoded using abi.encode or one of its variants). - */ - function callOptionalReturn(IERC20 token, bytes memory data) private { - // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since - // we're implementing it ourselves. - - // A Solidity high level call has three parts: - // 1. The target address is checked to verify it contains contract code - // 2. The call itself is made, and success asserted - // 3. The return value is decoded, which in turn checks the size of the returned data. - // solhint-disable-next-line max-line-length - require(address(token).isContract(), "SafeERC20: !contract"); - - // solhint-disable-next-line avoid-low-level-calls - (bool success, bytes memory returndata) = address(token).call(data); - require(success, "SafeERC20: low-level call failed"); - - if (returndata.length > 0) { // Return data is optional - // solhint-disable-next-line max-line-length - require(abi.decode(returndata, (bool)), "SafeERC20: !succeed"); - } - } -} - contract Keep3r is ReentrancyGuard { using SafeMath for uint; using SafeERC20 for IERC20; @@ -1390,8 +998,8 @@ contract Keep3r is ReentrancyGuard { require(src != address(0), "_transferTokens: zero address"); require(dst != address(0), "_transferTokens: zero address"); - balances[src] = balances[src].sub(amount, "_transferTokens: exceeds balance"); - balances[dst] = balances[dst].add(amount, "_transferTokens: overflows"); + balances[src] = balances[src].sub(amount); + balances[dst] = balances[dst].add(amount); emit Transfer(src, dst, amount); } diff --git a/contracts/Keep3rGovernance.sol b/contracts/Keep3rGovernance.sol index d0591ea..e4a3bda 100644 --- a/contracts/Keep3rGovernance.sol +++ b/contracts/Keep3rGovernance.sol @@ -1,190 +1,7 @@ -pragma solidity ^0.5.17; -pragma experimental ABIEncoderV2; - -// From https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/math/Math.sol -// Subject to the MIT license. - -/** - * @dev Wrappers over Solidity's arithmetic operations with added overflow - * checks. - * - * Arithmetic operations in Solidity wrap on overflow. This can easily result - * in bugs, because programmers usually assume that an overflow raises an - * error, which is the standard behavior in high level programming languages. - * `SafeMath` restores this intuition by reverting the transaction when an - * operation overflows. - * - * Using this library instead of the unchecked operations eliminates an entire - * class of bugs, so it's recommended to use it always. - */ -library SafeMath { - /** - * @dev Returns the addition of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint256 a, uint256 b) internal pure returns (uint256) { - uint256 c = a + b; - require(c >= a, "SafeMath: addition overflow"); - - return c; - } - - /** - * @dev Returns the addition of two unsigned integers, reverting with custom message on overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - uint256 c = a + b; - require(c >= a, errorMessage); - - return c; - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting on underflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot underflow. - */ - function sub(uint256 a, uint256 b) internal pure returns (uint256) { - return sub(a, b, "SafeMath: subtraction underflow"); - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting with custom message on underflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot underflow. - */ - function sub(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b <= a, errorMessage); - uint256 c = a - b; - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint256 a, uint256 b) internal pure returns (uint256) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint256 c = a * b; - require(c / a == b, "SafeMath: multiplication overflow"); - - return c; - } +import '@openzeppelin/contracts/math/SafeMath.sol'; - /** - * @dev Returns the multiplication of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint256 c = a * b; - require(c / a == b, errorMessage); - - return c; - } - - /** - * @dev Returns the integer division of two unsigned integers. - * Reverts on division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint256 a, uint256 b) internal pure returns (uint256) { - return div(a, b, "SafeMath: division by zero"); - } - - /** - * @dev Returns the integer division of two unsigned integers. - * Reverts with custom message on division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - // Solidity only automatically asserts when dividing by 0 - require(b > 0, errorMessage); - uint256 c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - - return c; - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint256 a, uint256 b) internal pure returns (uint256) { - return mod(a, b, "SafeMath: modulo by zero"); - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts with custom message when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint256 a, uint256 b, string memory errorMessage) internal pure returns (uint256) { - require(b != 0, errorMessage); - return a % b; - } -} +pragma solidity ^0.6.12; +pragma experimental ABIEncoderV2; contract Governance { using SafeMath for uint; @@ -516,7 +333,7 @@ contract Governance { VOTER = DelegateInterface(token_); } - function() external payable { } + receive() external payable { } function setDelay(uint delay_) public { require(msg.sender == address(this), "Timelock::setDelay: Call must come from Timelock."); diff --git a/contracts/Keep3rHelper.sol b/contracts/Keep3rHelper.sol index c1244bd..d80b744 100644 --- a/contracts/Keep3rHelper.sol +++ b/contracts/Keep3rHelper.sol @@ -1,188 +1,8 @@ +import '@openzeppelin/contracts/math/SafeMath.sol'; + // SPDX-License-Identifier: MIT pragma solidity ^0.6.12; -/** - * @dev Wrappers over Solidity's arithmetic operations with added overflow - * checks. - * - * Arithmetic operations in Solidity wrap on overflow. This can easily result - * in bugs, because programmers usually assume that an overflow raises an - * error, which is the standard behavior in high level programming languages. - * `SafeMath` restores this intuition by reverting the transaction when an - * operation overflows. - * - * Using this library instead of the unchecked operations eliminates an entire - * class of bugs, so it's recommended to use it always. - */ -library SafeMath { - /** - * @dev Returns the addition of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint a, uint b) internal pure returns (uint) { - uint c = a + b; - require(c >= a, "add: +"); - - return c; - } - - /** - * @dev Returns the addition of two unsigned integers, reverting with custom message on overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - uint c = a + b; - require(c >= a, errorMessage); - - return c; - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting on underflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot underflow. - */ - function sub(uint a, uint b) internal pure returns (uint) { - return sub(a, b, "sub: -"); - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting with custom message on underflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot underflow. - */ - function sub(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - require(b <= a, errorMessage); - uint c = a - b; - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint a, uint b) internal pure returns (uint) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint c = a * b; - require(c / a == b, "mul: *"); - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint c = a * b; - require(c / a == b, errorMessage); - - return c; - } - - /** - * @dev Returns the integer division of two unsigned integers. - * Reverts on division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint a, uint b) internal pure returns (uint) { - return div(a, b, "div: /"); - } - - /** - * @dev Returns the integer division of two unsigned integers. - * Reverts with custom message on division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - // Solidity only automatically asserts when dividing by 0 - require(b > 0, errorMessage); - uint c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - - return c; - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint a, uint b) internal pure returns (uint) { - return mod(a, b, "mod: %"); - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts with custom message when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - require(b != 0, errorMessage); - return a % b; - } -} - interface IChainLinkFeed { function latestAnswer() external view returns (int256); } diff --git a/contracts/Keep3rJob.sol b/contracts/Keep3rJob.sol index e622d37..ffd6813 100644 --- a/contracts/Keep3rJob.sol +++ b/contracts/Keep3rJob.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.6.6; +pragma solidity ^0.6.12; interface UniOracleFactory { function update(address tokenA, address tokenB) external; diff --git a/truffle-config.js b/truffle-config.js index dae33c3..939ed83 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -82,7 +82,7 @@ module.exports = { // Configure your compilers compilers: { solc: { - // version: "0.5.1", // Fetch exact version from solc-bin (default: truffle's version) + version: "0.6.12", // Fetch exact version from solc-bin (default: truffle's version) // docker: true, // Use "0.5.1" you've installed locally with docker (default: false) // settings: { // See the solidity docs for advice about optimization and evmVersion // optimizer: { From f43f082ec8f88618637b37e567c8954c8fd475cc Mon Sep 17 00:00:00 2001 From: Adam Boudjemaa Date: Wed, 28 Oct 2020 21:51:46 +0100 Subject: [PATCH 3/6] PR Master (#2) * Job system implemented DOMAINSEPARATOR moved to immutable constant (PVE010) mapping work dead code removed (PVE009) Closes #13, #2, #14 Signed-off-by: Andre Cronje * Removed delegate/delegateBySigh returns Removed return definition for proposeJob Closes #15 Closes #2 Closes #14 Signed-off-by: Andre Cronje * PVE013 Improved Events in SubmitJob/UnbondJob/RemoveJob Closes #17 Signed-off-by: Andre Cronje * Switched to using IUniswapV2Pair reserves instead (makes flash loans expensive) Closes #16 Signed-off-by: Andre Cronje * PVE018: Incompatibility With Deflationary/Rebasing Tokens Signed-off-by: Andre Cronje * Removed slashing, can be handled by gov instead Signed-off-by: Andre Cronje * Updated environment docs Signed-off-by: Andre Cronje * Keep3rV1 updates for event emits Signed-off-by: Andre Cronje * Environment updates for oracle Signed-off-by: Andre Cronje * Added Aave liquidation jobs Signed-off-by: Andre Cronje Co-authored-by: Andre Cronje --- README.md | 12 ++-- contracts/Keep3r.sol | 146 ++++++++++++++++++++++++++++--------------- 2 files changed, 103 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 0456ccd..9333bff 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,9 @@ To add credits, you simply need to have KPR-WETH LP tokens, you then call ```add ## Beta Addresses Description | Address --- | --- -Keep3r | [0xB63650C42d6fCcA02f5353A711cB85400dB6a8FE](https://etherscan.io/address/0xB63650C42d6fCcA02f5353A711cB85400dB6a8FE) (rc.1.1-a) +Keep3rV1 | [0x1cEB5cB57C4D4E2b2433641b95Dd330A33185A44](https://etherscan.io/address/0x1cEB5cB57C4D4E2b2433641b95Dd330A33185A44) (rc.1.2-a) +Keep3rV1Library | [0xfc38B6eBA9d47CBFc8C7B4FFfFd142B78996B6f1](https://etherscan.io/address/0xfc38B6eBA9d47CBFc8C7B4FFfFd142B78996B6f1) +Keep3rV1Helper | [0xb41772890c8B1564c5015A12c0dC6f18B0aF955e](https://etherscan.io/address/0xb41772890c8b1564c5015a12c0dc6f18b0af955e) Governance | [0xEEFb7264FD804e23eF55478c55105f6E2Bf1EFd9](https://etherscan.io/address/0xeefb7264fd804e23ef55478c55105f6e2bf1efd9) (Deprecated) Keep3rJob | [0xB68E7dEB279EAa11F234DFf4931458d2C002D10D](https://etherscan.io/address/0xb68e7deb279eaa11f234dff4931458d2c002d10d) (Deprecated) @@ -96,8 +98,9 @@ Keep3rJob | [0xB68E7dEB279EAa11F234DFf4931458d2C002D10D](https://etherscan.io/ad Job | Address --- | --- -UniQuote | [0x61da8b0808CEA5281A912Cd85421A6D12261D136](https://etherscan.io/address/0x61da8b0808cea5281a912cd85421a6d12261d136) -Keep3rOracle | [0x2ec4901ebBCE581bBAE029BA6405fcA5ab3B3d23](https://etherscan.io/address/0x2ec4901ebBCE581bBAE029BA6405fcA5ab3B3d23#code) +UniQuote | [0x127a2975c4E1c75f1ed4757a861bbd42523DB035](https://etherscan.io/address/0x127a2975c4E1c75f1ed4757a861bbd42523DB035) +AaveLiquidate | [0x5D18A46371e313fdC3BB66E77b10405087536e75](https://etherscan.io/address/0x5d18a46371e313fdc3bb66e77b10405087536e75) +Keep3rOracle | [0x2ec4901ebBCE581bBAE029BA6405fcA5ab3B3d23](https://etherscan.io/address/0x2ec4901ebBCE581bBAE029BA6405fcA5ab3B3d23#code) (Deprecated) ## Pairs @@ -115,4 +118,5 @@ MKR | 0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2 AAVE | 0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9 SNX | 0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F COMP | 0xc00e94Cb662C3520282E6f5717214004A7f26888 -KPR | 0xb920eBcf540BE36215dF3211E095fAbe15412B5B +CRV | 0xD533a949740bb3306d119CC777fa900bA034cd52 +KPR | 0x1cEB5cB57C4D4E2b2433641b95Dd330A33185A44 diff --git a/contracts/Keep3r.sol b/contracts/Keep3r.sol index f286f19..2ef2b70 100644 --- a/contracts/Keep3r.sol +++ b/contracts/Keep3r.sol @@ -245,14 +245,6 @@ contract ReentrancyGuard { } } -interface IGovernance { - function proposeJob(address job) external returns (uint); -} - -interface IKeep3rHelper { - function getQuoteLimit(uint gasUsed) external view returns (uint); -} - /** * @dev Interface of the ERC20 standard as defined in the EIP. */ @@ -466,18 +458,90 @@ library SafeERC20 { } } -contract Keep3r is ReentrancyGuard { +library Keep3rV1Library { + function getReserve(address pair, address reserve) external view returns (uint) { + (uint _r0, uint _r1,) = IUniswapV2Pair(pair).getReserves(); + if (IUniswapV2Pair(pair).token0() == reserve) { + return _r0; + } else if (IUniswapV2Pair(pair).token1() == reserve) { + return _r1; + } else { + return 0; + } + } +} + +interface IUniswapV2Pair { + event Approval(address indexed owner, address indexed spender, uint value); + event Transfer(address indexed from, address indexed to, uint value); + + function name() external pure returns (string memory); + function symbol() external pure returns (string memory); + function decimals() external pure returns (uint8); + function totalSupply() external view returns (uint); + function balanceOf(address owner) external view returns (uint); + function allowance(address owner, address spender) external view returns (uint); + + function approve(address spender, uint value) external returns (bool); + function transfer(address to, uint value) external returns (bool); + function transferFrom(address from, address to, uint value) external returns (bool); + + function DOMAIN_SEPARATOR() external view returns (bytes32); + function PERMIT_TYPEHASH() external pure returns (bytes32); + function nonces(address owner) external view returns (uint); + + function permit(address owner, address spender, uint value, uint deadline, uint8 v, bytes32 r, bytes32 s) external; + + event Mint(address indexed sender, uint amount0, uint amount1); + event Burn(address indexed sender, uint amount0, uint amount1, address indexed to); + event Swap( + address indexed sender, + uint amount0In, + uint amount1In, + uint amount0Out, + uint amount1Out, + address indexed to + ); + event Sync(uint112 reserve0, uint112 reserve1); + + function MINIMUM_LIQUIDITY() external pure returns (uint); + function factory() external view returns (address); + function token0() external view returns (address); + function token1() external view returns (address); + function getReserves() external view returns (uint112 reserve0, uint112 reserve1, uint32 blockTimestampLast); + function price0CumulativeLast() external view returns (uint); + function price1CumulativeLast() external view returns (uint); + function kLast() external view returns (uint); + + function mint(address to) external returns (uint liquidity); + function burn(address to) external returns (uint amount0, uint amount1); + function swap(uint amount0Out, uint amount1Out, address to, bytes calldata data) external; + function skim(address to) external; + function sync() external; + + function initialize(address, address) external; +} + +interface IGovernance { + function proposeJob(address job) external; +} + +interface IKeep3rV1Helper { + function getQuoteLimit(uint gasUsed) external view returns (uint); +} + +contract Keep3rV1 is ReentrancyGuard { using SafeMath for uint; using SafeERC20 for IERC20; /// @notice Keep3r Helper to set max prices for the ecosystem - IKeep3rHelper public KPRH; + IKeep3rV1Helper public KPRH; /// @notice EIP-20 token name for this token - string public constant name = "Keep3r"; + string public constant name = "Keep3rV1"; /// @notice EIP-20 token symbol for this token - string public constant symbol = "KPR"; + string public constant symbol = "KPRv1"; /// @notice EIP-20 token decimals for this token uint8 public constant decimals = 18; @@ -499,6 +563,7 @@ contract Keep3r is ReentrancyGuard { /// @notice The EIP-712 typehash for the contract's domain bytes32 public constant DOMAIN_TYPEHASH = keccak256("EIP712Domain(string name,uint chainId,address verifyingContract)"); + bytes32 public immutable DOMAINSEPARATOR; /// @notice The EIP-712 typehash for the delegation struct used by the contract bytes32 public constant DELEGATION_TYPEHASH = keccak256("Delegation(address delegatee,uint nonce,uint expiry)"); @@ -527,7 +592,7 @@ contract Keep3r is ReentrancyGuard { * @param delegatee The address to delegate votes to */ function delegate(address delegatee) public { - return _delegate(msg.sender, delegatee); + _delegate(msg.sender, delegatee); } /** @@ -540,14 +605,13 @@ contract Keep3r is ReentrancyGuard { * @param s Half of the ECDSA signature pair */ function delegateBySig(address delegatee, uint nonce, uint expiry, uint8 v, bytes32 r, bytes32 s) public { - bytes32 domainSeparator = keccak256(abi.encode(DOMAIN_TYPEHASH, keccak256(bytes(name)), _getChainId(), address(this))); bytes32 structHash = keccak256(abi.encode(DELEGATION_TYPEHASH, delegatee, nonce, expiry)); - bytes32 digest = keccak256(abi.encodePacked("\x19\x01", domainSeparator, structHash)); + bytes32 digest = keccak256(abi.encodePacked("\x19\x01", DOMAINSEPARATOR, structHash)); address signatory = ecrecover(digest, v, r, s); require(signatory != address(0), "delegateBySig: sig"); require(nonce == nonces[signatory]++, "delegateBySig: nonce"); require(now <= expiry, "delegateBySig: expired"); - return _delegate(signatory, delegatee); + _delegate(signatory, delegatee); } /** @@ -654,16 +718,16 @@ contract Keep3r is ReentrancyGuard { event Approval(address indexed owner, address indexed spender, uint amount); /// @notice Submit a job - event SubmitJob(address indexed job, address indexed provider, uint block, uint credit); + event SubmitJob(address indexed job, address indexed liquidity, address indexed provider, uint block, uint credit); /// @notice Apply credit to a job - event ApplyCredit(address indexed job, address indexed provider, uint block, uint credit); + event ApplyCredit(address indexed job, address indexed liquidity, address indexed provider, uint block, uint credit); /// @notice Remove credit for a job - event RemoveJob(address indexed job, address indexed provider, uint block, uint credit); + event RemoveJob(address indexed job, address indexed liquidity, address indexed provider, uint block, uint credit); /// @notice Unbond credit for a job - event UnbondJob(address indexed job, address indexed provider, uint block, uint credit); + event UnbondJob(address indexed job, address indexed liquidity, address indexed provider, uint block, uint credit); /// @notice Added a Job event JobAdded(address indexed job, uint block, address governance); @@ -701,15 +765,11 @@ contract Keep3r is ReentrancyGuard { uint constant public BOND = 3 days; /// @notice 14 days to unbond to remove funds from being a keeper uint constant public UNBOND = 14 days; - /// @notice 7 days maximum downtime before being slashed - uint constant public DOWNTIME = 7 days; /// @notice 3 days till liquidity can be bound uint constant public LIQUIDITYBOND = 3 days; /// @notice direct liquidity fee 0.3% uint constant public FEE = 30; - /// @notice 5% of funds slashed for downtime - uint constant public DOWNTIMESLASH = 500; uint constant public BASE = 10000; /// @notice address used for ETH transfers @@ -781,6 +841,7 @@ contract Keep3r is ReentrancyGuard { constructor() public { // Set governance for this token governance = msg.sender; + DOMAINSEPARATOR = keccak256(abi.encode(DOMAIN_TYPEHASH, keccak256(bytes(name)), _getChainId(), address(this))); } /** @@ -896,7 +957,7 @@ contract Keep3r is ReentrancyGuard { IGovernance(governance).proposeJob(job); jobProposalDelay[job] = now.add(UNBOND); } - emit SubmitJob(job, msg.sender, block.number, amount); + emit SubmitJob(job, liquidity, msg.sender, block.number, amount); } /** @@ -909,13 +970,13 @@ contract Keep3r is ReentrancyGuard { require(liquidityAccepted[liquidity], "addLiquidityToJob: !pair"); require(liquidityApplied[provider][liquidity][job] != 0, "credit: no bond"); require(liquidityApplied[provider][liquidity][job] < now, "credit: bonding"); - uint _liquidity = balances[address(liquidity)]; + uint _liquidity = Keep3rV1Library.getReserve(liquidity, address(this)); uint _credit = _liquidity.mul(liquidityAmount[provider][liquidity][job]).div(IERC20(liquidity).totalSupply()); _mint(address(this), _credit); credits[job][address(this)] = credits[job][address(this)].add(_credit); liquidityAmount[provider][liquidity][job] = 0; - emit ApplyCredit(job, provider, block.number, _credit); + emit ApplyCredit(job, liquidity, provider, block.number, _credit); } /** @@ -930,7 +991,7 @@ contract Keep3r is ReentrancyGuard { liquidityAmountsUnbonding[msg.sender][liquidity][job] = liquidityAmountsUnbonding[msg.sender][liquidity][job].add(amount); require(liquidityAmountsUnbonding[msg.sender][liquidity][job] <= liquidityProvided[msg.sender][liquidity][job], "unbondLiquidityFromJob: insufficient funds"); - uint _liquidity = balances[address(liquidity)]; + uint _liquidity = Keep3rV1Library.getReserve(liquidity, address(this)); uint _credit = _liquidity.mul(amount).div(IERC20(liquidity).totalSupply()); if (_credit > credits[job][address(this)]) { _burn(address(this), credits[job][address(this)]); @@ -940,7 +1001,7 @@ contract Keep3r is ReentrancyGuard { credits[job][address(this)] = credits[job][address(this)].sub(_credit); } - emit UnbondJob(job, msg.sender, block.number, amount); + emit UnbondJob(job, liquidity, msg.sender, block.number, amount); } /** @@ -956,7 +1017,7 @@ contract Keep3r is ReentrancyGuard { liquidityAmountsUnbonding[msg.sender][liquidity][job] = 0; IERC20(liquidity).safeTransfer(msg.sender, _amount); - emit RemoveJob(job, msg.sender, block.number, _amount); + emit RemoveJob(job, liquidity, msg.sender, block.number, _amount); } /** @@ -1092,7 +1153,7 @@ contract Keep3r is ReentrancyGuard { * @notice Allows governance to change the Keep3rHelper for max spend * @param _kprh new helper address to set */ - function setKeep3rHelper(IKeep3rHelper _kprh) external { + function setKeep3rHelper(IKeep3rV1Helper _kprh) external { require(msg.sender == governance, "setKeep3rHelper: !gov"); KPRH = _kprh; } @@ -1168,7 +1229,9 @@ contract Keep3r is ReentrancyGuard { if (bonding == address(this)) { _transferTokens(msg.sender, address(this), amount); } else { + uint _before = IERC20(bonding).balanceOf(address(this)); IERC20(bonding).safeTransferFrom(msg.sender, address(this), amount); + amount = IERC20(bonding).balanceOf(address(this)).sub(_before); } pendingbonds[msg.sender][bonding] = pendingbonds[msg.sender][bonding].add(amount); emit KeeperBonding(msg.sender, block.number, bondings[msg.sender][bonding], amount); @@ -1228,24 +1291,6 @@ contract Keep3r is ReentrancyGuard { partialUnbonding[msg.sender][bonding] = 0; } - /** - * @notice slash a keeper for downtime - * @param keeper the address being slashed - */ - function down(address keeper) external { - require(keepers[msg.sender], "down: !keeper"); - require(keepers[keeper], "down: msg.sender !keeper"); - require(lastJob[keeper].add(DOWNTIME) < now, "down: safe"); - uint _slash = bonds[keeper][address(this)].mul(DOWNTIMESLASH).div(BASE); - - _unbond(address(this), keeper, _slash); - _bond(address(this), msg.sender, _slash); - - lastJob[keeper] = now; - lastJob[msg.sender] = now; - emit KeeperSlashed(keeper, msg.sender, block.number, _slash); - } - /** * @notice allows governance to create a dispute for a given keeper * @param keeper the address in dispute @@ -1331,9 +1376,8 @@ contract Keep3r is ReentrancyGuard { * @param s Half of the ECDSA signature pair */ function permit(address owner, address spender, uint amount, uint deadline, uint8 v, bytes32 r, bytes32 s) external { - bytes32 domainSeparator = keccak256(abi.encode(DOMAIN_TYPEHASH, keccak256(bytes(name)), _getChainId(), address(this))); bytes32 structHash = keccak256(abi.encode(PERMIT_TYPEHASH, owner, spender, amount, nonces[owner]++, deadline)); - bytes32 digest = keccak256(abi.encodePacked("\x19\x01", domainSeparator, structHash)); + bytes32 digest = keccak256(abi.encodePacked("\x19\x01", DOMAINSEPARATOR, structHash)); address signatory = ecrecover(digest, v, r, s); require(signatory != address(0), "permit: signature"); require(signatory == owner, "permit: unauthorized"); From 5e4306771af205385fe4783ff8f8516b59d5a35b Mon Sep 17 00:00:00 2001 From: aboudjem Date: Wed, 28 Oct 2020 22:31:19 +0100 Subject: [PATCH 4/6] :add:(openzeppelin) import libraries --- contracts/Keep3r.sol | 403 +------------------------------------------ 1 file changed, 6 insertions(+), 397 deletions(-) diff --git a/contracts/Keep3r.sol b/contracts/Keep3r.sol index 2ef2b70..b7fe712 100644 --- a/contracts/Keep3r.sol +++ b/contracts/Keep3r.sol @@ -1,191 +1,13 @@ +import '@openzeppelin/contracts/math/SafeMath.sol'; +import '@openzeppelin/contracts/token/ERC20/IERC20.sol'; +import '@openzeppelin/contracts/token/ERC20/SafeERC20.sol'; +import '@openzeppelin/contracts/utils/Address.sol'; // SPDX-License-Identifier: MIT pragma solidity ^0.6.12; // From https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/math/Math.sol // Subject to the MIT license. -/** - * @dev Wrappers over Solidity's arithmetic operations with added overflow - * checks. - * - * Arithmetic operations in Solidity wrap on overflow. This can easily result - * in bugs, because programmers usually assume that an overflow raises an - * error, which is the standard behavior in high level programming languages. - * `SafeMath` restores this intuition by reverting the transaction when an - * operation overflows. - * - * Using this library instead of the unchecked operations eliminates an entire - * class of bugs, so it's recommended to use it always. - */ -library SafeMath { - /** - * @dev Returns the addition of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint a, uint b) internal pure returns (uint) { - uint c = a + b; - require(c >= a, "add: +"); - - return c; - } - - /** - * @dev Returns the addition of two unsigned integers, reverting with custom message on overflow. - * - * Counterpart to Solidity's `+` operator. - * - * Requirements: - * - Addition cannot overflow. - */ - function add(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - uint c = a + b; - require(c >= a, errorMessage); - - return c; - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting on underflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot underflow. - */ - function sub(uint a, uint b) internal pure returns (uint) { - return sub(a, b, "sub: -"); - } - - /** - * @dev Returns the subtraction of two unsigned integers, reverting with custom message on underflow (when the result is negative). - * - * Counterpart to Solidity's `-` operator. - * - * Requirements: - * - Subtraction cannot underflow. - */ - function sub(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - require(b <= a, errorMessage); - uint c = a - b; - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint a, uint b) internal pure returns (uint) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint c = a * b; - require(c / a == b, "mul: *"); - - return c; - } - - /** - * @dev Returns the multiplication of two unsigned integers, reverting on overflow. - * - * Counterpart to Solidity's `*` operator. - * - * Requirements: - * - Multiplication cannot overflow. - */ - function mul(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - // Gas optimization: this is cheaper than requiring 'a' not being zero, but the - // benefit is lost if 'b' is also tested. - // See: https://github.com/OpenZeppelin/openzeppelin-contracts/pull/522 - if (a == 0) { - return 0; - } - - uint c = a * b; - require(c / a == b, errorMessage); - - return c; - } - - /** - * @dev Returns the integer division of two unsigned integers. - * Reverts on division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint a, uint b) internal pure returns (uint) { - return div(a, b, "div: /"); - } - - /** - * @dev Returns the integer division of two unsigned integers. - * Reverts with custom message on division by zero. The result is rounded towards zero. - * - * Counterpart to Solidity's `/` operator. Note: this function uses a - * `revert` opcode (which leaves remaining gas untouched) while Solidity - * uses an invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function div(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - // Solidity only automatically asserts when dividing by 0 - require(b > 0, errorMessage); - uint c = a / b; - // assert(a == b * c + a % b); // There is no case in which this doesn't hold - - return c; - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint a, uint b) internal pure returns (uint) { - return mod(a, b, "mod: %"); - } - - /** - * @dev Returns the remainder of dividing two unsigned integers. (unsigned integer modulo), - * Reverts with custom message when dividing by zero. - * - * Counterpart to Solidity's `%` operator. This function uses a `revert` - * opcode (which leaves remaining gas untouched) while Solidity uses an - * invalid opcode to revert (consuming all remaining gas). - * - * Requirements: - * - The divisor cannot be zero. - */ - function mod(uint a, uint b, string memory errorMessage) internal pure returns (uint) { - require(b != 0, errorMessage); - return a % b; - } -} - /** * @dev Contract module that helps prevent reentrant calls to a function. * @@ -245,219 +67,6 @@ contract ReentrancyGuard { } } -/** - * @dev Interface of the ERC20 standard as defined in the EIP. - */ -interface IERC20 { - /** - * @dev Returns the amount of tokens in existence. - */ - function totalSupply() external view returns (uint256); - - /** - * @dev Returns the amount of tokens owned by `account`. - */ - function balanceOf(address account) external view returns (uint256); - - /** - * @dev Moves `amount` tokens from the caller's account to `recipient`. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transfer(address recipient, uint256 amount) external returns (bool); - - /** - * @dev Returns the remaining number of tokens that `spender` will be - * allowed to spend on behalf of `owner` through {transferFrom}. This is - * zero by default. - * - * This value changes when {approve} or {transferFrom} are called. - */ - function allowance(address owner, address spender) external view returns (uint256); - - /** - * @dev Sets `amount` as the allowance of `spender` over the caller's tokens. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * IMPORTANT: Beware that changing an allowance with this method brings the risk - * that someone may use both the old and the new allowance by unfortunate - * transaction ordering. One possible solution to mitigate this race - * condition is to first reduce the spender's allowance to 0 and set the - * desired value afterwards: - * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * Emits an {Approval} event. - */ - function approve(address spender, uint256 amount) external returns (bool); - - /** - * @dev Moves `amount` tokens from `sender` to `recipient` using the - * allowance mechanism. `amount` is then deducted from the caller's - * allowance. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transferFrom(address sender, address recipient, uint256 amount) external returns (bool); - - /** - * @dev Emitted when `value` tokens are moved from one account (`from`) to - * another (`to`). - * - * Note that `value` may be zero. - */ - event Transfer(address indexed from, address indexed to, uint256 value); - - /** - * @dev Emitted when the allowance of a `spender` for an `owner` is set by - * a call to {approve}. `value` is the new allowance. - */ - event Approval(address indexed owner, address indexed spender, uint256 value); -} - -/** - * @dev Collection of functions related to the address type - */ -library Address { - /** - * @dev Returns true if `account` is a contract. - * - * [IMPORTANT] - * ==== - * It is unsafe to assume that an address for which this function returns - * false is an externally-owned account (EOA) and not a contract. - * - * Among others, `isContract` will return false for the following - * types of addresses: - * - * - an externally-owned account - * - a contract in construction - * - an address where a contract will be created - * - an address where a contract lived, but was destroyed - * ==== - */ - function isContract(address account) internal view returns (bool) { - // According to EIP-1052, 0x0 is the value returned for not-yet created accounts - // and 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 is returned - // for accounts without code, i.e. `keccak256('')` - bytes32 codehash; - bytes32 accountHash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470; - // solhint-disable-next-line no-inline-assembly - assembly { codehash := extcodehash(account) } - return (codehash != accountHash && codehash != 0x0); - } - - /** - * @dev Converts an `address` into `address payable`. Note that this is - * simply a type cast: the actual underlying value is not changed. - * - * _Available since v2.4.0._ - */ - function toPayable(address account) internal pure returns (address payable) { - return address(uint160(account)); - } - - /** - * @dev Replacement for Solidity's `transfer`: sends `amount` wei to - * `recipient`, forwarding all available gas and reverting on errors. - * - * https://eips.ethereum.org/EIPS/eip-1884[EIP1884] increases the gas cost - * of certain opcodes, possibly making contracts go over the 2300 gas limit - * imposed by `transfer`, making them unable to receive funds via - * `transfer`. {sendValue} removes this limitation. - * - * https://diligence.consensys.net/posts/2019/09/stop-using-soliditys-transfer-now/[Learn more]. - * - * IMPORTANT: because control is transferred to `recipient`, care must be - * taken to not create reentrancy vulnerabilities. Consider using - * {ReentrancyGuard} or the - * https://solidity.readthedocs.io/en/v0.5.11/security-considerations.html#use-the-checks-effects-interactions-pattern[checks-effects-interactions pattern]. - * - * _Available since v2.4.0._ - */ - function sendValue(address payable recipient, uint256 amount) internal { - require(address(this).balance >= amount, "Address: insufficient"); - - // solhint-disable-next-line avoid-call-value - (bool success, ) = recipient.call{value:amount}(""); - require(success, "Address: reverted"); - } -} - -/** - * @title SafeERC20 - * @dev Wrappers around ERC20 operations that throw on failure (when the token - * contract returns false). Tokens that return no value (and instead revert or - * throw on failure) are also supported, non-reverting calls are assumed to be - * successful. - * To use this library you can add a `using SafeERC20 for ERC20;` statement to your contract, - * which allows you to call the safe operations as `token.safeTransfer(...)`, etc. - */ -library SafeERC20 { - using SafeMath for uint256; - using Address for address; - - function safeTransfer(IERC20 token, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value)); - } - - function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal { - callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value)); - } - - function safeApprove(IERC20 token, address spender, uint256 value) internal { - // safeApprove should only be called when setting an initial allowance, - // or when resetting it to zero. To increase and decrease it, use - // 'safeIncreaseAllowance' and 'safeDecreaseAllowance' - // solhint-disable-next-line max-line-length - require((value == 0) || (token.allowance(address(this), spender) == 0), - "SafeERC20: approve from non-zero to non-zero allowance" - ); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, value)); - } - - function safeIncreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).add(value); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - function safeDecreaseAllowance(IERC20 token, address spender, uint256 value) internal { - uint256 newAllowance = token.allowance(address(this), spender).sub(value, "SafeERC20: < 0"); - callOptionalReturn(token, abi.encodeWithSelector(token.approve.selector, spender, newAllowance)); - } - - /** - * @dev Imitates a Solidity high-level call (i.e. a regular function call to a contract), relaxing the requirement - * on the return value: the return value is optional (but if data is returned, it must not be false). - * @param token The token targeted by the call. - * @param data The call data (encoded using abi.encode or one of its variants). - */ - function callOptionalReturn(IERC20 token, bytes memory data) private { - // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since - // we're implementing it ourselves. - - // A Solidity high level call has three parts: - // 1. The target address is checked to verify it contains contract code - // 2. The call itself is made, and success asserted - // 3. The return value is decoded, which in turn checks the size of the returned data. - // solhint-disable-next-line max-line-length - require(address(token).isContract(), "SafeERC20: !contract"); - - // solhint-disable-next-line avoid-low-level-calls - (bool success, bytes memory returndata) = address(token).call(data); - require(success, "SafeERC20: low-level call failed"); - - if (returndata.length > 0) { // Return data is optional - // solhint-disable-next-line max-line-length - require(abi.decode(returndata, (bool)), "SafeERC20: !succeed"); - } - } -} - library Keep3rV1Library { function getReserve(address pair, address reserve) external view returns (uint) { (uint _r0, uint _r1,) = IUniswapV2Pair(pair).getReserves(); @@ -1434,8 +1043,8 @@ contract Keep3rV1 is ReentrancyGuard { require(src != address(0), "_transferTokens: zero address"); require(dst != address(0), "_transferTokens: zero address"); - balances[src] = balances[src].sub(amount, "_transferTokens: exceeds balance"); - balances[dst] = balances[dst].add(amount, "_transferTokens: overflows"); + balances[src] = balances[src].sub(amount); + balances[dst] = balances[dst].add(amount); emit Transfer(src, dst, amount); } From a6fb17e49ab566b307845df2ec94498e515ff45a Mon Sep 17 00:00:00 2001 From: aboudjem Date: Wed, 28 Oct 2020 23:43:30 +0100 Subject: [PATCH 5/6] :feat:(Contracts) clean and split contracts, update all contracts to 0.6.6 --- contracts/Keep3r.sol | 143 +-------------------- contracts/Keep3rGovernance.sol | 17 +-- contracts/Keep3rHelper.sol | 9 +- contracts/Keep3rJob.sol | 20 +-- contracts/ReentrancyGuard.sol | 61 +++++++++ contracts/interfaces/DelegateInterface.sol | 7 + contracts/interfaces/IChainLinkFeed.sol | 6 + contracts/interfaces/IGovernance.sol | 6 + contracts/interfaces/IKeep3r.sol | 7 + contracts/interfaces/IKeep3rHelper.sol | 7 + contracts/interfaces/IKeep3rV1Helper.sol | 6 + contracts/interfaces/IUniswapV2Pair.sol | 53 ++++++++ contracts/interfaces/UniOracleFactory.sol | 6 + contracts/libraries/Keep3rV1Library.sol | 17 +++ 14 files changed, 198 insertions(+), 167 deletions(-) create mode 100644 contracts/ReentrancyGuard.sol create mode 100644 contracts/interfaces/DelegateInterface.sol create mode 100644 contracts/interfaces/IChainLinkFeed.sol create mode 100644 contracts/interfaces/IGovernance.sol create mode 100644 contracts/interfaces/IKeep3r.sol create mode 100644 contracts/interfaces/IKeep3rHelper.sol create mode 100644 contracts/interfaces/IKeep3rV1Helper.sol create mode 100644 contracts/interfaces/IUniswapV2Pair.sol create mode 100644 contracts/interfaces/UniOracleFactory.sol create mode 100644 contracts/libraries/Keep3rV1Library.sol diff --git a/contracts/Keep3r.sol b/contracts/Keep3r.sol index b7fe712..710fbf3 100644 --- a/contracts/Keep3r.sol +++ b/contracts/Keep3r.sol @@ -1,143 +1,14 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; + import '@openzeppelin/contracts/math/SafeMath.sol'; import '@openzeppelin/contracts/token/ERC20/IERC20.sol'; import '@openzeppelin/contracts/token/ERC20/SafeERC20.sol'; import '@openzeppelin/contracts/utils/Address.sol'; -// SPDX-License-Identifier: MIT -pragma solidity ^0.6.12; - -// From https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/math/Math.sol -// Subject to the MIT license. - -/** - * @dev Contract module that helps prevent reentrant calls to a function. - * - * Inheriting from `ReentrancyGuard` will make the {nonReentrant} modifier - * available, which can be applied to functions to make sure there are no nested - * (reentrant) calls to them. - * - * Note that because there is a single `nonReentrant` guard, functions marked as - * `nonReentrant` may not call one another. This can be worked around by making - * those functions `private`, and then adding `external` `nonReentrant` entry - * points to them. - * - * TIP: If you would like to learn more about reentrancy and alternative ways - * to protect against it, check out our blog post - * https://blog.openzeppelin.com/reentrancy-after-istanbul/[Reentrancy After Istanbul]. - */ -contract ReentrancyGuard { - // Booleans are more expensive than uint256 or any type that takes up a full - // word because each write operation emits an extra SLOAD to first read the - // slot's contents, replace the bits taken up by the boolean, and then write - // back. This is the compiler's defense against contract upgrades and - // pointer aliasing, and it cannot be disabled. - - // The values being non-zero value makes deployment a bit more expensive, - // but in exchange the refund on every call to nonReentrant will be lower in - // amount. Since refunds are capped to a percentage of the total - // transaction's gas, it is best to keep them low in cases like this one, to - // increase the likelihood of the full refund coming into effect. - uint256 private constant _NOT_ENTERED = 1; - uint256 private constant _ENTERED = 2; - - uint256 private _status; - - constructor () internal { - _status = _NOT_ENTERED; - } - - /** - * @dev Prevents a contract from calling itself, directly or indirectly. - * Calling a `nonReentrant` function from another `nonReentrant` - * function is not supported. It is possible to prevent this from happening - * by making the `nonReentrant` function external, and make it call a - * `private` function that does the actual work. - */ - modifier nonReentrant() { - // On the first call to nonReentrant, _notEntered will be true - require(_status != _ENTERED, "ReentrancyGuard: reentrant call"); - - // Any calls to nonReentrant after this point will fail - _status = _ENTERED; - - _; - - // By storing the original value once again, a refund is triggered (see - // https://eips.ethereum.org/EIPS/eip-2200) - _status = _NOT_ENTERED; - } -} - -library Keep3rV1Library { - function getReserve(address pair, address reserve) external view returns (uint) { - (uint _r0, uint _r1,) = IUniswapV2Pair(pair).getReserves(); - if (IUniswapV2Pair(pair).token0() == reserve) { - return _r0; - } else if (IUniswapV2Pair(pair).token1() == reserve) { - return _r1; - } else { - return 0; - } - } -} - -interface IUniswapV2Pair { - event Approval(address indexed owner, address indexed spender, uint value); - event Transfer(address indexed from, address indexed to, uint value); - - function name() external pure returns (string memory); - function symbol() external pure returns (string memory); - function decimals() external pure returns (uint8); - function totalSupply() external view returns (uint); - function balanceOf(address owner) external view returns (uint); - function allowance(address owner, address spender) external view returns (uint); - - function approve(address spender, uint value) external returns (bool); - function transfer(address to, uint value) external returns (bool); - function transferFrom(address from, address to, uint value) external returns (bool); - - function DOMAIN_SEPARATOR() external view returns (bytes32); - function PERMIT_TYPEHASH() external pure returns (bytes32); - function nonces(address owner) external view returns (uint); - - function permit(address owner, address spender, uint value, uint deadline, uint8 v, bytes32 r, bytes32 s) external; - - event Mint(address indexed sender, uint amount0, uint amount1); - event Burn(address indexed sender, uint amount0, uint amount1, address indexed to); - event Swap( - address indexed sender, - uint amount0In, - uint amount1In, - uint amount0Out, - uint amount1Out, - address indexed to - ); - event Sync(uint112 reserve0, uint112 reserve1); - - function MINIMUM_LIQUIDITY() external pure returns (uint); - function factory() external view returns (address); - function token0() external view returns (address); - function token1() external view returns (address); - function getReserves() external view returns (uint112 reserve0, uint112 reserve1, uint32 blockTimestampLast); - function price0CumulativeLast() external view returns (uint); - function price1CumulativeLast() external view returns (uint); - function kLast() external view returns (uint); - - function mint(address to) external returns (uint liquidity); - function burn(address to) external returns (uint amount0, uint amount1); - function swap(uint amount0Out, uint amount1Out, address to, bytes calldata data) external; - function skim(address to) external; - function sync() external; - - function initialize(address, address) external; -} - -interface IGovernance { - function proposeJob(address job) external; -} - -interface IKeep3rV1Helper { - function getQuoteLimit(uint gasUsed) external view returns (uint); -} +import "./ReentrancyGuard.sol"; +import "./interfaces/IKeep3rV1Helper.sol"; +import "./interfaces/IGovernance.sol"; +import "./libraries/Keep3rV1Library.sol"; contract Keep3rV1 is ReentrancyGuard { using SafeMath for uint; diff --git a/contracts/Keep3rGovernance.sol b/contracts/Keep3rGovernance.sol index e4a3bda..9bfde56 100644 --- a/contracts/Keep3rGovernance.sol +++ b/contracts/Keep3rGovernance.sol @@ -1,8 +1,10 @@ -import '@openzeppelin/contracts/math/SafeMath.sol'; - -pragma solidity ^0.6.12; +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; pragma experimental ABIEncoderV2; +import '@openzeppelin/contracts/math/SafeMath.sol'; +import "./interfaces/DelegateInterface.sol"; + contract Governance { using SafeMath for uint; /// @notice The name of this contract @@ -383,7 +385,7 @@ contract Governance { } // solium-disable-next-line security/no-call-value - (bool success, bytes memory returnData) = target.call.value(value)(callData); + (bool success, bytes memory returnData) = target.call{value: value}(callData); require(success, "Timelock::executeTransaction: Transaction execution reverted."); emit ExecuteTransaction(txHash, target, value, signature, data, eta); @@ -395,9 +397,4 @@ contract Governance { // solium-disable-next-line security/no-block-members return block.timestamp; } -} - -interface DelegateInterface { - function getPriorVotes(address account, uint blockNumber) external view returns (uint); - function totalBonded() external view returns (uint); -} +} \ No newline at end of file diff --git a/contracts/Keep3rHelper.sol b/contracts/Keep3rHelper.sol index d80b744..0668532 100644 --- a/contracts/Keep3rHelper.sol +++ b/contracts/Keep3rHelper.sol @@ -1,11 +1,8 @@ -import '@openzeppelin/contracts/math/SafeMath.sol'; - // SPDX-License-Identifier: MIT -pragma solidity ^0.6.12; +pragma solidity ^0.6.6; -interface IChainLinkFeed { - function latestAnswer() external view returns (int256); -} +import '@openzeppelin/contracts/math/SafeMath.sol'; +import "./interfaces/IChainLinkFeed.sol"; contract Keep3rHelper { using SafeMath for uint; diff --git a/contracts/Keep3rJob.sol b/contracts/Keep3rJob.sol index ffd6813..17a721e 100644 --- a/contracts/Keep3rJob.sol +++ b/contracts/Keep3rJob.sol @@ -1,24 +1,14 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.6.12; -interface UniOracleFactory { - function update(address tokenA, address tokenB) external; -} - -interface Keep3r { - function isKeeper(address) external view returns (bool); - function workReceipt(address keeper, uint amount) external; -} - -interface Keep3rHelper { - // Allows for variable pricing amounts - function getQuoteFor(uint) external view returns (uint); -} +import "./interfaces/IKeep3rHelper.sol"; +import "./interfaces/IKeep3r.sol"; +import "./interfaces/UniOracleFactory.sol"; contract Keep3rJob { UniOracleFactory constant JOB = UniOracleFactory(0x61da8b0808CEA5281A912Cd85421A6D12261D136); - Keep3r constant KPR = Keep3r(0x9696Fea1121C938C861b94FcBEe98D971de54B32); - Keep3rHelper constant KPRH = Keep3rHelper(0x0); + IKeep3r constant KPR = IKeep3r(0x9696Fea1121C938C861b94FcBEe98D971de54B32); + IKeep3rHelper constant KPRH = IKeep3rHelper(0x0); // TODO: Add whitelist for approved contracts (worth paying for) // TODO: Get context values to know how much is a better value to pay out function update(address tokenA, address tokenB) external { diff --git a/contracts/ReentrancyGuard.sol b/contracts/ReentrancyGuard.sol new file mode 100644 index 0000000..77cdfe2 --- /dev/null +++ b/contracts/ReentrancyGuard.sol @@ -0,0 +1,61 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; + +/** + * @dev Contract module that helps prevent reentrant calls to a function. + * + * Inheriting from `ReentrancyGuard` will make the {nonReentrant} modifier + * available, which can be applied to functions to make sure there are no nested + * (reentrant) calls to them. + * + * Note that because there is a single `nonReentrant` guard, functions marked as + * `nonReentrant` may not call one another. This can be worked around by making + * those functions `private`, and then adding `external` `nonReentrant` entry + * points to them. + * + * TIP: If you would like to learn more about reentrancy and alternative ways + * to protect against it, check out our blog post + * https://blog.openzeppelin.com/reentrancy-after-istanbul/[Reentrancy After Istanbul]. + */ +contract ReentrancyGuard { + // Booleans are more expensive than uint256 or any type that takes up a full + // word because each write operation emits an extra SLOAD to first read the + // slot's contents, replace the bits taken up by the boolean, and then write + // back. This is the compiler's defense against contract upgrades and + // pointer aliasing, and it cannot be disabled. + + // The values being non-zero value makes deployment a bit more expensive, + // but in exchange the refund on every call to nonReentrant will be lower in + // amount. Since refunds are capped to a percentage of the total + // transaction's gas, it is best to keep them low in cases like this one, to + // increase the likelihood of the full refund coming into effect. + uint256 private constant _NOT_ENTERED = 1; + uint256 private constant _ENTERED = 2; + + uint256 private _status; + + constructor () internal { + _status = _NOT_ENTERED; + } + + /** + * @dev Prevents a contract from calling itself, directly or indirectly. + * Calling a `nonReentrant` function from another `nonReentrant` + * function is not supported. It is possible to prevent this from happening + * by making the `nonReentrant` function external, and make it call a + * `private` function that does the actual work. + */ + modifier nonReentrant() { + // On the first call to nonReentrant, _notEntered will be true + require(_status != _ENTERED, "ReentrancyGuard: reentrant call"); + + // Any calls to nonReentrant after this point will fail + _status = _ENTERED; + + _; + + // By storing the original value once again, a refund is triggered (see + // https://eips.ethereum.org/EIPS/eip-2200) + _status = _NOT_ENTERED; + } +} \ No newline at end of file diff --git a/contracts/interfaces/DelegateInterface.sol b/contracts/interfaces/DelegateInterface.sol new file mode 100644 index 0000000..f69e05b --- /dev/null +++ b/contracts/interfaces/DelegateInterface.sol @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; + +interface DelegateInterface { + function getPriorVotes(address account, uint blockNumber) external view returns (uint); + function totalBonded() external view returns (uint); +} \ No newline at end of file diff --git a/contracts/interfaces/IChainLinkFeed.sol b/contracts/interfaces/IChainLinkFeed.sol new file mode 100644 index 0000000..b51f6a9 --- /dev/null +++ b/contracts/interfaces/IChainLinkFeed.sol @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; + +interface IChainLinkFeed { + function latestAnswer() external view returns (int256); +} \ No newline at end of file diff --git a/contracts/interfaces/IGovernance.sol b/contracts/interfaces/IGovernance.sol new file mode 100644 index 0000000..7fc5955 --- /dev/null +++ b/contracts/interfaces/IGovernance.sol @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; + +interface IGovernance { + function proposeJob(address job) external; +} \ No newline at end of file diff --git a/contracts/interfaces/IKeep3r.sol b/contracts/interfaces/IKeep3r.sol new file mode 100644 index 0000000..8cc8fea --- /dev/null +++ b/contracts/interfaces/IKeep3r.sol @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; + +interface IKeep3r { + function isKeeper(address) external view returns (bool); + function workReceipt(address keeper, uint amount) external; +} \ No newline at end of file diff --git a/contracts/interfaces/IKeep3rHelper.sol b/contracts/interfaces/IKeep3rHelper.sol new file mode 100644 index 0000000..f0525df --- /dev/null +++ b/contracts/interfaces/IKeep3rHelper.sol @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; + +interface IKeep3rHelper { + // Allows for variable pricing amounts + function getQuoteFor(uint) external view returns (uint); +} \ No newline at end of file diff --git a/contracts/interfaces/IKeep3rV1Helper.sol b/contracts/interfaces/IKeep3rV1Helper.sol new file mode 100644 index 0000000..151b8dc --- /dev/null +++ b/contracts/interfaces/IKeep3rV1Helper.sol @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; + +interface IKeep3rV1Helper { + function getQuoteLimit(uint gasUsed) external view returns (uint); +} diff --git a/contracts/interfaces/IUniswapV2Pair.sol b/contracts/interfaces/IUniswapV2Pair.sol new file mode 100644 index 0000000..e345b09 --- /dev/null +++ b/contracts/interfaces/IUniswapV2Pair.sol @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; + +interface IUniswapV2Pair { + event Approval(address indexed owner, address indexed spender, uint value); + event Transfer(address indexed from, address indexed to, uint value); + + function name() external pure returns (string memory); + function symbol() external pure returns (string memory); + function decimals() external pure returns (uint8); + function totalSupply() external view returns (uint); + function balanceOf(address owner) external view returns (uint); + function allowance(address owner, address spender) external view returns (uint); + + function approve(address spender, uint value) external returns (bool); + function transfer(address to, uint value) external returns (bool); + function transferFrom(address from, address to, uint value) external returns (bool); + + function DOMAIN_SEPARATOR() external view returns (bytes32); + function PERMIT_TYPEHASH() external pure returns (bytes32); + function nonces(address owner) external view returns (uint); + + function permit(address owner, address spender, uint value, uint deadline, uint8 v, bytes32 r, bytes32 s) external; + + event Mint(address indexed sender, uint amount0, uint amount1); + event Burn(address indexed sender, uint amount0, uint amount1, address indexed to); + event Swap( + address indexed sender, + uint amount0In, + uint amount1In, + uint amount0Out, + uint amount1Out, + address indexed to + ); + event Sync(uint112 reserve0, uint112 reserve1); + + function MINIMUM_LIQUIDITY() external pure returns (uint); + function factory() external view returns (address); + function token0() external view returns (address); + function token1() external view returns (address); + function getReserves() external view returns (uint112 reserve0, uint112 reserve1, uint32 blockTimestampLast); + function price0CumulativeLast() external view returns (uint); + function price1CumulativeLast() external view returns (uint); + function kLast() external view returns (uint); + + function mint(address to) external returns (uint liquidity); + function burn(address to) external returns (uint amount0, uint amount1); + function swap(uint amount0Out, uint amount1Out, address to, bytes calldata data) external; + function skim(address to) external; + function sync() external; + + function initialize(address, address) external; +} \ No newline at end of file diff --git a/contracts/interfaces/UniOracleFactory.sol b/contracts/interfaces/UniOracleFactory.sol new file mode 100644 index 0000000..bddeb4f --- /dev/null +++ b/contracts/interfaces/UniOracleFactory.sol @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; + +interface UniOracleFactory { + function update(address tokenA, address tokenB) external; +} \ No newline at end of file diff --git a/contracts/libraries/Keep3rV1Library.sol b/contracts/libraries/Keep3rV1Library.sol new file mode 100644 index 0000000..0eb761c --- /dev/null +++ b/contracts/libraries/Keep3rV1Library.sol @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.6; + +import "../interfaces/IUniswapV2Pair.sol"; + +library Keep3rV1Library { + function getReserve(address pair, address reserve) external view returns (uint) { + (uint _r0, uint _r1,) = IUniswapV2Pair(pair).getReserves(); + if (IUniswapV2Pair(pair).token0() == reserve) { + return _r0; + } else if (IUniswapV2Pair(pair).token1() == reserve) { + return _r1; + } else { + return 0; + } + } +} From 02ec2e097fe6888335e9e098fac82ccffa4cbcd4 Mon Sep 17 00:00:00 2001 From: aboudjem Date: Wed, 28 Oct 2020 23:48:03 +0100 Subject: [PATCH 6/6] :feat:(Contracts) clean Keep3r.sol + split + update to 0.6.6 --- contracts/Keep3r.sol | 144 +++---------------------------------------- 1 file changed, 7 insertions(+), 137 deletions(-) diff --git a/contracts/Keep3r.sol b/contracts/Keep3r.sol index 8c987f8..97946b2 100644 --- a/contracts/Keep3r.sol +++ b/contracts/Keep3r.sol @@ -1,144 +1,14 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.6.12; + import '@openzeppelin/contracts/math/SafeMath.sol'; import '@openzeppelin/contracts/token/ERC20/IERC20.sol'; import '@openzeppelin/contracts/token/ERC20/SafeERC20.sol'; import '@openzeppelin/contracts/utils/Address.sol'; -// SPDX-License-Identifier: MIT -pragma solidity ^0.6.12; - -// From https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/math/Math.sol -// Subject to the MIT license. - -/** - * @dev Contract module that helps prevent reentrant calls to a function. - * - * Inheriting from `ReentrancyGuard` will make the {nonReentrant} modifier - * available, which can be applied to functions to make sure there are no nested - * (reentrant) calls to them. - * - * Note that because there is a single `nonReentrant` guard, functions marked as - * `nonReentrant` may not call one another. This can be worked around by making - * those functions `private`, and then adding `external` `nonReentrant` entry - * points to them. - * - * TIP: If you would like to learn more about reentrancy and alternative ways - * to protect against it, check out our blog post - * https://blog.openzeppelin.com/reentrancy-after-istanbul/[Reentrancy After Istanbul]. - */ -contract ReentrancyGuard { - // Booleans are more expensive than uint256 or any type that takes up a full - // word because each write operation emits an extra SLOAD to first read the - // slot's contents, replace the bits taken up by the boolean, and then write - // back. This is the compiler's defense against contract upgrades and - // pointer aliasing, and it cannot be disabled. - - // The values being non-zero value makes deployment a bit more expensive, - // but in exchange the refund on every call to nonReentrant will be lower in - // amount. Since refunds are capped to a percentage of the total - // transaction's gas, it is best to keep them low in cases like this one, to - // increase the likelihood of the full refund coming into effect. - uint256 private constant _NOT_ENTERED = 1; - uint256 private constant _ENTERED = 2; - - uint256 private _status; - - constructor () internal { - _status = _NOT_ENTERED; - } - - /** - * @dev Prevents a contract from calling itself, directly or indirectly. - * Calling a `nonReentrant` function from another `nonReentrant` - * function is not supported. It is possible to prevent this from happening - * by making the `nonReentrant` function external, and make it call a - * `private` function that does the actual work. - */ - modifier nonReentrant() { - // On the first call to nonReentrant, _notEntered will be true - require(_status != _ENTERED, "ReentrancyGuard: reentrant call"); - - // Any calls to nonReentrant after this point will fail - _status = _ENTERED; - - _; - - // By storing the original value once again, a refund is triggered (see - // https://eips.ethereum.org/EIPS/eip-2200) - _status = _NOT_ENTERED; - } -} - - -library Keep3rV1Library { - function getReserve(address pair, address reserve) external view returns (uint) { - (uint _r0, uint _r1,) = IUniswapV2Pair(pair).getReserves(); - if (IUniswapV2Pair(pair).token0() == reserve) { - return _r0; - } else if (IUniswapV2Pair(pair).token1() == reserve) { - return _r1; - } else { - return 0; - } - } -} - -interface IUniswapV2Pair { - event Approval(address indexed owner, address indexed spender, uint value); - event Transfer(address indexed from, address indexed to, uint value); - - function name() external pure returns (string memory); - function symbol() external pure returns (string memory); - function decimals() external pure returns (uint8); - function totalSupply() external view returns (uint); - function balanceOf(address owner) external view returns (uint); - function allowance(address owner, address spender) external view returns (uint); - - function approve(address spender, uint value) external returns (bool); - function transfer(address to, uint value) external returns (bool); - function transferFrom(address from, address to, uint value) external returns (bool); - - function DOMAIN_SEPARATOR() external view returns (bytes32); - function PERMIT_TYPEHASH() external pure returns (bytes32); - function nonces(address owner) external view returns (uint); - - function permit(address owner, address spender, uint value, uint deadline, uint8 v, bytes32 r, bytes32 s) external; - - event Mint(address indexed sender, uint amount0, uint amount1); - event Burn(address indexed sender, uint amount0, uint amount1, address indexed to); - event Swap( - address indexed sender, - uint amount0In, - uint amount1In, - uint amount0Out, - uint amount1Out, - address indexed to - ); - event Sync(uint112 reserve0, uint112 reserve1); - - function MINIMUM_LIQUIDITY() external pure returns (uint); - function factory() external view returns (address); - function token0() external view returns (address); - function token1() external view returns (address); - function getReserves() external view returns (uint112 reserve0, uint112 reserve1, uint32 blockTimestampLast); - function price0CumulativeLast() external view returns (uint); - function price1CumulativeLast() external view returns (uint); - function kLast() external view returns (uint); - - function mint(address to) external returns (uint liquidity); - function burn(address to) external returns (uint amount0, uint amount1); - function swap(uint amount0Out, uint amount1Out, address to, bytes calldata data) external; - function skim(address to) external; - function sync() external; - - function initialize(address, address) external; -} - -interface IGovernance { - function proposeJob(address job) external; -} - -interface IKeep3rV1Helper { - function getQuoteLimit(uint gasUsed) external view returns (uint); -} +import "./ReentrancyGuard.sol"; +import "./interfaces/IKeep3rV1Helper.sol"; +import "./libraries/Keep3rV1Library.sol"; +import "./interfaces/IGovernance.sol"; contract Keep3rV1 is ReentrancyGuard { using SafeMath for uint;