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

remove superfluous safety checks

Browse Source 
whitespaces + comments
This commit is contained in:
Noah Zinsmeister
2020-01-24 13:31:19 -05:00
parent 1f5c9aa9e7
commit d4661b1ae7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/UniswapV2Exchange.sol
View File

@ -12,6 +12,7 @@ contract UniswapV2Exchange is IUniswapV2Exchange, UniswapV2ERC20 {
using UQ112x112 for uint224;
bytes4 public constant selector = bytes4(keccak256(bytes('transfer(address,uint256)')));
address public factory;
address public token0;
address public token1;
@ -47,7 +48,7 @@ contract UniswapV2Exchange is IUniswapV2Exchange, UniswapV2ERC20 {
}
function initialize(address _token0, address _token1) external {
require(msg.sender == factory && token0 == address(0) && token1 == address(0), 'UniswapV2: FORBIDDEN');
require(msg.sender == factory, 'UniswapV2: FORBIDDEN');
token0 = _token0;
token1 = _token1;
}
@ -126,8 +127,8 @@ contract UniswapV2Exchange is IUniswapV2Exchange, UniswapV2ERC20 {
uint liquidity = balanceOf[address(this)];
bool feeOn = _mintFee(_reserve0, _reserve1);
amount0 = liquidity.mul(balance0) / _totalSupply; // use balances instead of reserves to address edge case
amount1 = liquidity.mul(balance1) / _totalSupply; // use balances instead of reserves to address edge case
amount0 = liquidity.mul(balance0) / _totalSupply; // use balances instead of reserves to address force sends
amount1 = liquidity.mul(balance1) / _totalSupply; // use balances instead of reserves to address force sends
require(amount0 > 0 && amount1 > 0, 'UniswapV2: INSUFFICIENT_LIQUIDITY_BURNED');
_burn(address(this), liquidity);
_safeTransfer(_token0, to, amount0);

1
contracts/UniswapV2Factory.sol
View File

@ -26,7 +26,6 @@ contract UniswapV2Factory is IUniswapV2Factory {
(address token0, address token1) = tokenA < tokenB ? (tokenA, tokenB) : (tokenB, tokenA);
require(token0 != address(0), 'UniswapV2: ZERO_ADDRESS');
require(getExchange[token0][token1] == address(0), 'UniswapV2: EXCHANGE_EXISTS');
require(getExchange[token1][token0] == address(0), 'UniswapV2: EXCHANGE_EXISTS');
bytes memory exchangeBytecode = type(UniswapV2Exchange).creationCode;
bytes32 salt = keccak256(abi.encodePacked(token0, token1));
assembly {