-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: update Broker + TradingLimits to 0.8 and make G$ changes
- Loading branch information
Showing
14 changed files
with
407 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| pragma solidity ^0.8.0; | ||
| //TODO: check if this is latest impl of openzeppelin or any other impl | ||
|
|
||
| /** | ||
| * @dev Interface of the ERC20 standard as defined in the EIP. Does not include | ||
| * the optional functions; to access them see {ERC20Detailed}. | ||
| */ | ||
| interface IERC20MintableBurnable { | ||
| /** | ||
| * @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); | ||
|
|
||
| function mint(address account, uint256 amount) external; | ||
|
|
||
| function burn(uint256 amount) external; | ||
|
|
||
| /** | ||
| * @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); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| pragma solidity ^0.8.0; | ||
|
|
||
| import { IERC20MintableBurnable as IERC20 } from "contracts/common/IERC20MintableBurnable.sol"; | ||
| import { Address } from "openzeppelin-contracts-next/contracts/utils/Address.sol"; | ||
| //TODO: merge with lattest impl of openzeppelin | ||
| /** | ||
| * @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 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 safeMint(IERC20 token, address account, uint256 amount) internal { | ||
| callOptionalReturn(token, abi.encodeWithSelector(token.mint.selector, account, amount)); | ||
| } | ||
|
|
||
| function safeBurn(IERC20 token, uint256 amount) internal { | ||
| callOptionalReturn(token, abi.encodeWithSelector(token.burn.selector, amount)); | ||
| } | ||
|
|
||
| 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) + 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) - value; | ||
| 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: call to non-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: ERC20 operation did not succeed"); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.