ButterflyEffect/uniswap-interface-uncensored
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix eth purchase bug

Browse Source
This commit is contained in:
Hayden Adams 2017-11-09 01:42:13 -05:00
parent 348bcfdd11
commit 77810772bf
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
smart_contracts/uniswap.sol
View File

@ -97,15 +97,15 @@ contract uniswap is Ownable{
} }
function ethToTokens(uint256 minimumTokens, uint256 timeout) public payable { function ethToTokens(uint256 minimumTokens, uint256 timeout) public payable {
require(msg.value != 0 && timeout != 0);
uint256 fee = msg.value/500; uint256 fee = msg.value/500;
uint256 ethInPurchase = msg.value.sub(fee); uint256 ethInPurchase = msg.value.sub(fee);
uint256 newTotalEth = totalEthQuantity.add(ethInPurchase); uint256 newTotalEth = totalEthQuantity.add(ethInPurchase);
uint256 newTotalTokens = invariant/newTotalEth; uint256 newTotalTokens = invariant/newTotalEth;
uint256 purchasedTokens = totalTokenQuantity.sub(newTotalTokens); uint256 purchasedTokens = totalTokenQuantity.sub(newTotalTokens);
require(purchasedTokens >= minimumTokens); require(purchasedTokens >= minimumTokens);
require(now < timeout); require(now < timeout);
token.transfer(msg.sender, purchasedTokens); token.transfer(msg.sender, purchasedTokens);
totalEthQuantity = newTotalEth; totalEthQuantity = newTotalEth;
totalTokenQuantity = newTotalTokens; totalTokenQuantity = newTotalTokens;
@ -114,9 +114,11 @@ contract uniswap is Ownable{
function tokenToEth(uint256 sellQuantity, uint256 minimumEth, uint256 timeout) public { function tokenToEth(uint256 sellQuantity, uint256 minimumEth, uint256 timeout) public {
require(sellQuantity!=0 && minimumEth != 0 && timeout != 0);
token.transferFrom(msg.sender, address(this), sellQuantity);
uint256 fee = sellQuantity/500; uint256 fee = sellQuantity/500;
uint256 tokensInPurchase = sellQuantity - fee; uint256 tokensInPurchase = sellQuantity - fee;
uint256 newTotalTokens = totalTokenQuantity.sub(fee); uint256 newTotalTokens = totalTokenQuantity.add(tokensInPurchase);
uint256 newTotalEth = invariant/newTotalTokens; uint256 newTotalEth = invariant/newTotalTokens;
uint256 purchasedEth = totalEthQuantity.sub(newTotalEth); uint256 purchasedEth = totalEthQuantity.sub(newTotalEth);
require(purchasedEth >= minimumEth); require(purchasedEth >= minimumEth);
@ -128,7 +130,23 @@ contract uniswap is Ownable{
} }
function ownerTokenDeposit(uint256 tokenAmount) public onlyOwner {
require(tokenAmount !=0);
token.transferFrom(msg.sender, address(this), tokenAmount);
totalTokenQuantity = totalTokenQuantity.add(tokenAmount);
invariant = totalTokenQuantity.mul(totalEthQuantity);
}
function ownerEthDeposit() public payable onlyOwner {
require(msg.value != 0);
totalEthQuantity = totalEthQuantity.add(msg.value);
invariant = totalEthQuantity.mul(totalTokenQuantity);
}
function ownerTokenWithdraw(uint256 tokenAmount) public onlyOwner { function ownerTokenWithdraw(uint256 tokenAmount) public onlyOwner {
require(tokenAmount !=0);
token.transfer(msg.sender, tokenAmount); token.transfer(msg.sender, tokenAmount);
totalTokenQuantity = totalTokenQuantity.sub(tokenAmount); totalTokenQuantity = totalTokenQuantity.sub(tokenAmount);
invariant = totalTokenQuantity.mul(totalEthQuantity); invariant = totalTokenQuantity.mul(totalEthQuantity);
@ -136,6 +154,7 @@ contract uniswap is Ownable{
function ownerEthWithdraw(uint256 ethAmount) public onlyOwner { function ownerEthWithdraw(uint256 ethAmount) public onlyOwner {
require(ethAmount !=0);
msg.sender.transfer(ethAmount); msg.sender.transfer(ethAmount);
totalEthQuantity = totalEthQuantity.sub(ethAmount); totalEthQuantity = totalEthQuantity.sub(ethAmount);
invariant = totalEthQuantity.mul(totalTokenQuantity); invariant = totalEthQuantity.mul(totalTokenQuantity);