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

update removeLiquidity

Browse Source
This commit is contained in:
Dan Robinson
2019-10-01 17:50:47 -07:00
parent e7877b887c
commit fe37136aaa
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
contracts/UniswapERC20.sol
View File

@ -150,7 +150,7 @@ contract UniswapERC20 is ERC20 {
accumulator: tokenAData.accumulator // TODO: accumulate accumulator: tokenAData.accumulator // TODO: accumulate
}); });
dataForToken[_tokenA] = TokenData({ dataForToken[_tokenB] = TokenData({
reserve: uint128(newReserveB), reserve: uint128(newReserveB),
accumulator: tokenBData.accumulator // TODO: accumulate accumulator: tokenBData.accumulator // TODO: accumulate
}); });
@ -166,6 +166,10 @@ contract UniswapERC20 is ERC20 {
require(amount > 0); require(amount > 0);
address _tokenA = tokenA; address _tokenA = tokenA;
address _tokenB = tokenB; address _tokenB = tokenB;
TokenData memory tokenAData = dataForToken[_tokenA];
TokenData memory tokenBData = dataForToken[_tokenB];
uint256 reserveA = IERC20(_tokenA).balanceOf(address(this)); uint256 reserveA = IERC20(_tokenA).balanceOf(address(this));
uint256 reserveB = IERC20(_tokenB).balanceOf(address(this)); uint256 reserveB = IERC20(_tokenB).balanceOf(address(this));
uint256 _totalSupply = totalSupply; uint256 _totalSupply = totalSupply;
@ -175,6 +179,17 @@ contract UniswapERC20 is ERC20 {
totalSupply = _totalSupply.sub(amount); totalSupply = _totalSupply.sub(amount);
require(IERC20(_tokenA).transfer(msg.sender, tokenAAmount)); require(IERC20(_tokenA).transfer(msg.sender, tokenAAmount));
require(IERC20(_tokenB).transfer(msg.sender, tokenBAmount)); require(IERC20(_tokenB).transfer(msg.sender, tokenBAmount));
dataForToken[_tokenA] = TokenData({
reserve: uint128(reserveA - tokenAAmount),
accumulator: tokenAData.accumulator // TODO: accumulate
});
dataForToken[_tokenB] = TokenData({
reserve: uint128(reserveB - tokenBAmount),
accumulator: tokenBData.accumulator // TODO: accumulate
});
emit RemoveLiquidity(msg.sender, tokenAAmount, tokenBAmount); emit RemoveLiquidity(msg.sender, tokenAAmount, tokenBAmount);
emit Transfer(msg.sender, address(0), amount); emit Transfer(msg.sender, address(0), amount);
return (tokenAAmount, tokenBAmount); return (tokenAAmount, tokenBAmount);