* Error handling in ERC20 and ERC721 * Added message string for require. * Fixed solhint errors. * Updated PR as per issue #1709 * changes as per #1709 and openzeppelin forum. * Changes in require statement * Changes in require statement * build pipeline fix * Changes as per @nventuro's comment. * Update revert reason strings. * Fianal update of revert reason strings. * WIP: Updating reason strings in test cases * WIP: Added changes to ERC20 and ERC721 * Fixes linting errors in *.tes.js files * Achieved 100% code coverage * Updated the test cases with shouldFail.reverting.withMessage() * Fix package-lock. * address review comments * fix linter issues * fix remaining revert reasons
130 lines
3.4 KiB
Solidity
130 lines
3.4 KiB
Solidity
pragma solidity ^0.5.7;
|
|
|
|
import "../token/ERC20/IERC20.sol";
|
|
import "../token/ERC20/SafeERC20.sol";
|
|
|
|
contract ERC20ReturnFalseMock {
|
|
uint256 private _allowance;
|
|
|
|
// IERC20's functions are not pure, but these mock implementations are: to prevent Solidity from issuing warnings,
|
|
// we write to a dummy state variable.
|
|
uint256 private _dummy;
|
|
|
|
function transfer(address, uint256) public returns (bool) {
|
|
_dummy = 0;
|
|
return false;
|
|
}
|
|
|
|
function transferFrom(address, address, uint256) public returns (bool) {
|
|
_dummy = 0;
|
|
return false;
|
|
}
|
|
|
|
function approve(address, uint256) public returns (bool) {
|
|
_dummy = 0;
|
|
return false;
|
|
}
|
|
|
|
function allowance(address, address) public view returns (uint256) {
|
|
require(_dummy == 0); // Duummy read from a state variable so that the function is view
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
contract ERC20ReturnTrueMock {
|
|
mapping (address => uint256) private _allowances;
|
|
|
|
// IERC20's functions are not pure, but these mock implementations are: to prevent Solidity from issuing warnings,
|
|
// we write to a dummy state variable.
|
|
uint256 private _dummy;
|
|
|
|
function transfer(address, uint256) public returns (bool) {
|
|
_dummy = 0;
|
|
return true;
|
|
}
|
|
|
|
function transferFrom(address, address, uint256) public returns (bool) {
|
|
_dummy = 0;
|
|
return true;
|
|
}
|
|
|
|
function approve(address, uint256) public returns (bool) {
|
|
_dummy = 0;
|
|
return true;
|
|
}
|
|
|
|
function setAllowance(uint256 allowance_) public {
|
|
_allowances[msg.sender] = allowance_;
|
|
}
|
|
|
|
function allowance(address owner, address) public view returns (uint256) {
|
|
return _allowances[owner];
|
|
}
|
|
}
|
|
|
|
contract ERC20NoReturnMock {
|
|
mapping (address => uint256) private _allowances;
|
|
|
|
// IERC20's functions are not pure, but these mock implementations are: to prevent Solidity from issuing warnings,
|
|
// we write to a dummy state variable.
|
|
uint256 private _dummy;
|
|
|
|
function transfer(address, uint256) public {
|
|
_dummy = 0;
|
|
}
|
|
|
|
function transferFrom(address, address, uint256) public {
|
|
_dummy = 0;
|
|
}
|
|
|
|
function approve(address, uint256) public {
|
|
_dummy = 0;
|
|
}
|
|
|
|
function setAllowance(uint256 allowance_) public {
|
|
_allowances[msg.sender] = allowance_;
|
|
}
|
|
|
|
function allowance(address owner, address) public view returns (uint256) {
|
|
return _allowances[owner];
|
|
}
|
|
}
|
|
|
|
contract SafeERC20Wrapper {
|
|
using SafeERC20 for IERC20;
|
|
|
|
IERC20 private _token;
|
|
|
|
constructor (IERC20 token) public {
|
|
_token = token;
|
|
}
|
|
|
|
function transfer() public {
|
|
_token.safeTransfer(address(0), 0);
|
|
}
|
|
|
|
function transferFrom() public {
|
|
_token.safeTransferFrom(address(0), address(0), 0);
|
|
}
|
|
|
|
function approve(uint256 amount) public {
|
|
_token.safeApprove(address(0), amount);
|
|
}
|
|
|
|
function increaseAllowance(uint256 amount) public {
|
|
_token.safeIncreaseAllowance(address(0), amount);
|
|
}
|
|
|
|
function decreaseAllowance(uint256 amount) public {
|
|
_token.safeDecreaseAllowance(address(0), amount);
|
|
}
|
|
|
|
function setAllowance(uint256 allowance_) public {
|
|
ERC20ReturnTrueMock(address(_token)).setAllowance(allowance_);
|
|
}
|
|
|
|
function allowance() public view returns (uint256) {
|
|
return _token.allowance(address(0), address(0));
|
|
}
|
|
}
|