NoBey/uniswap-v2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make GenericERC20 inherit from...

Browse Source 
...UniswapV2ERC20 not UniswapV2Exchange

tabs -> spaces
This commit is contained in:
Noah Zinsmeister
2020-01-14 14:23:40 -05:00
parent ddbb5e0ba0
commit f04890ef4c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contracts/UniswapV2ERC20.sol
View File

@ -13,9 +13,9 @@ contract UniswapV2ERC20 is IUniswapV2ERC20 {
mapping (address => uint) public balanceOf; mapping (address => uint) public balanceOf;
mapping (address => mapping (address => uint)) public allowance; mapping (address => mapping (address => uint)) public allowance;
bytes32 public DOMAIN_SEPARATOR; bytes32 public DOMAIN_SEPARATOR;
// keccak256("Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)"); // keccak256("Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)");
bytes32 public constant PERMIT_TYPEHASH = 0x6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c9; bytes32 public constant PERMIT_TYPEHASH = 0x6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c9;
mapping (address => uint) public nonces; mapping (address => uint) public nonces;
event Transfer(address indexed from, address indexed to, uint value); event Transfer(address indexed from, address indexed to, uint value);
@ -27,12 +27,12 @@ contract UniswapV2ERC20 is IUniswapV2ERC20 {
chainId := chainid() chainId := chainid()
} }
DOMAIN_SEPARATOR = keccak256(abi.encode( DOMAIN_SEPARATOR = keccak256(abi.encode(
keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)"), keccak256("EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)"),
keccak256(bytes(name)), keccak256(bytes(name)),
keccak256(bytes("1")), keccak256(bytes("1")),
chainId, chainId,
address(this) address(this)
)); ));
} }
function _mint(address to, uint value) internal { function _mint(address to, uint value) internal {

4
contracts/test/GenericERC20.sol
View File

@ -1,8 +1,8 @@
pragma solidity 0.5.15; pragma solidity 0.5.15;
import "../UniswapV2Exchange.sol"; import "../UniswapV2ERC20.sol";
contract GenericERC20 is UniswapV2Exchange { contract GenericERC20 is UniswapV2ERC20 {
constructor(uint _totalSupply) public { constructor(uint _totalSupply) public {
if (_totalSupply > 0) _mint(msg.sender, _totalSupply); if (_totalSupply > 0) _mint(msg.sender, _totalSupply);
} }