Skip to content

Commit

Permalink
fix: UniswapV2ERC20.sol
Browse files Browse the repository at this point in the history
  • Loading branch information
asmitb127 committed Feb 3, 2022
1 parent 5f9866d commit 52f354b
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 14 deletions.
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,8 @@ node_modules
.vscode
/cache
*/artifacts
*/.deps
*/.deps
*/*/artifacts
*/*/.deps
*/*/*/artifacts
*/*/*/.deps
26 changes: 13 additions & 13 deletions contracts/liquidityPools/core/UniswapV2ERC20.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import './libraries/SafeMath.sol';
contract UniswapV2ERC20 is IUniswapV2ERC20 {
using SafeMath for uint;

string public override constant name = 'Uniswap V2';
string public override constant symbol = 'UNI-V2';
uint8 public override constant decimals = 18;
uint public override totalSupply;
mapping(address => uint) public override balanceOf;
mapping(address => mapping(address => uint)) public override allowance;
string public constant name = 'Uniswap V2';
string public constant symbol = 'UNI-V2';
uint8 public constant decimals = 18;
uint public totalSupply;
mapping(address => uint) public balanceOf;
mapping(address => mapping(address => uint)) public allowance;

bytes32 public override DOMAIN_SEPARATOR;
bytes32 public DOMAIN_SEPARATOR;
// keccak256("Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)");
bytes32 public constant override PERMIT_TYPEHASH = 0x6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c9;
mapping(address => uint) public override nonces;
bytes32 public constant PERMIT_TYPEHASH = 0x6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c9;
mapping(address => uint) public nonces;

// event Approval(address indexed owner, address indexed spender, uint value);
// event Transfer(address indexed from, address indexed to, uint value);
Expand Down Expand Up @@ -60,25 +60,25 @@ contract UniswapV2ERC20 is IUniswapV2ERC20 {
emit Transfer(from, to, value);
}

function approve(address spender, uint value) override external returns (bool) {
function approve(address spender, uint value) external returns (bool) {
_approve(msg.sender, spender, value);
return true;
}

function transfer(address to, uint value) override external returns (bool) {
function transfer(address to, uint value) external returns (bool) {
_transfer(msg.sender, to, value);
return true;
}

function transferFrom(address from, address to, uint value) override external returns (bool) {
function transferFrom(address from, address to, uint value) external returns (bool) {
if (allowance[from][msg.sender] != uint(-1)) {
allowance[from][msg.sender] = allowance[from][msg.sender].sub(value);
}
_transfer(from, to, value);
return true;
}

function permit(address owner, address spender, uint value, uint deadline, uint8 v, bytes32 r, bytes32 s) override external {
function permit(address owner, address spender, uint value, uint deadline, uint8 v, bytes32 r, bytes32 s) external {
require(deadline >= block.timestamp, 'UniswapV2: EXPIRED');
bytes32 digest = keccak256(
abi.encodePacked(
Expand Down

0 comments on commit 52f354b

Please sign in to comment.