Instadapp/smart-contract
1
0
Fork 0
mirror of https://github.com/Instadapp/smart-contract.git synced 2024-07-29 22:08:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

user -> msg.sender

Browse Source
This commit is contained in:
Samyak 2019-03-21 23:26:40 +05:30
parent bedba4fce1
commit 5b2ae84dab
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contracts/ProxyLogics/uniswap.sol
View File

@ -167,9 +167,8 @@ contract Trade is Registry {
) public payable returns (uint) { ) public payable returns (uint) {
address eth = getAddress("eth"); address eth = getAddress("eth");
address user = msg.sender;
uint ethQty = _getToken( uint ethQty = _getToken(
user, msg.sender,
src, src,
srcAmt, srcAmt,
eth eth
@ -177,16 +176,16 @@ contract Trade is Registry {
if (src == eth) { if (src == eth) {
UniswapExchange exchangeContract = UniswapExchange(_getExchangeAddress(dest)); UniswapExchange exchangeContract = UniswapExchange(_getExchangeAddress(dest));
uint tokensBought = exchangeContract.ethToTokenTransferInput.value(ethQty)(minDestAmt, deadline, user); uint tokensBought = exchangeContract.ethToTokenTransferInput.value(ethQty)(minDestAmt, deadline, msg.sender);
return tokensBought; return tokensBought;
} else if (dest == eth) { } else if (dest == eth) {
UniswapExchange exchangeContract = UniswapExchange(_getExchangeAddress(src)); UniswapExchange exchangeContract = UniswapExchange(_getExchangeAddress(src));
uint ethBought = exchangeContract.tokenToEthTransferInput(srcAmt, minDestAmt, deadline, user); uint ethBought = exchangeContract.tokenToEthTransferInput(srcAmt, minDestAmt, deadline, msg.sender);
return ethBought; return ethBought;
} else { } else {
UniswapExchange exchangeContract = UniswapExchange(_getExchangeAddress(src)); UniswapExchange exchangeContract = UniswapExchange(_getExchangeAddress(src));
uint ethBought = exchangeContract.getTokenToEthInputPrice(srcAmt); uint ethBought = exchangeContract.getTokenToEthInputPrice(srcAmt);
uint tokensBought = exchangeContract.tokenToTokenTransferInput(srcAmt, minDestAmt, uint(0), deadline, user, dest); uint tokensBought = exchangeContract.tokenToTokenTransferInput(srcAmt, minDestAmt, uint(0), deadline, msg.sender, dest);
return tokensBought; return tokensBought;
} }
} }
@ -209,9 +208,8 @@ contract Trade is Registry {
) public payable returns (uint) { ) public payable returns (uint) {
address eth = getAddress("eth"); address eth = getAddress("eth");
address user = msg.sender;
uint ethQty = _getToken( uint ethQty = _getToken(
user, msg.sender,
src, src,
maxSrcAmt, maxSrcAmt,
eth eth
@ -219,7 +217,7 @@ contract Trade is Registry {
if (src == eth) { if (src == eth) {
UniswapExchange exchangeContract = UniswapExchange(_getExchangeAddress(dest)); UniswapExchange exchangeContract = UniswapExchange(_getExchangeAddress(dest));
uint ethSold = exchangeContract.ethToTokenTransferInput.value(ethQty)(destAmt, deadline, user); uint ethSold = exchangeContract.ethToTokenTransferInput.value(ethQty)(destAmt, deadline, msg.sender);
if (ethSold < ethQty) { if (ethSold < ethQty) {
uint srcToReturn = ethQty - ethSold; uint srcToReturn = ethQty - ethSold;
msg.sender.transfer(srcToReturn); msg.sender.transfer(srcToReturn);
@ -227,22 +225,22 @@ contract Trade is Registry {
return ethSold; return ethSold;
} else if (dest == eth) { } else if (dest == eth) {
UniswapExchange exchangeContract = UniswapExchange(_getExchangeAddress(src)); UniswapExchange exchangeContract = UniswapExchange(_getExchangeAddress(src));
uint tokensSold = exchangeContract.tokenToEthTransferInput(destAmt, maxSrcAmt, deadline, user); uint tokensSold = exchangeContract.tokenToEthTransferInput(destAmt, maxSrcAmt, deadline, msg.sender);
if (tokensSold < maxSrcAmt) { if (tokensSold < maxSrcAmt) {
IERC20 srcTkn = IERC20(src); IERC20 srcTkn = IERC20(src);
uint srcToReturn = maxSrcAmt - tokensSold; uint srcToReturn = maxSrcAmt - tokensSold;
srcTkn.transfer(user, srcToReturn); srcTkn.transfer(msg.sender, srcToReturn);
} }
return tokensSold; return tokensSold;
} else { } else {
UniswapExchange exchangeContractSrc = UniswapExchange(_getExchangeAddress(src)); UniswapExchange exchangeContractSrc = UniswapExchange(_getExchangeAddress(src));
UniswapExchange exchangeContractdest = UniswapExchange(_getExchangeAddress(dest)); UniswapExchange exchangeContractdest = UniswapExchange(_getExchangeAddress(dest));
uint ethBought = exchangeContractdest.getTokenToEthInputPrice(destAmt); uint ethBought = exchangeContractdest.getTokenToEthInputPrice(destAmt);
uint tokensSold = exchangeContractSrc.tokenToTokenTransferOutput(destAmt, maxSrcAmt, uint(0-1), deadline, user, dest); uint tokensSold = exchangeContractSrc.tokenToTokenTransferOutput(destAmt, maxSrcAmt, uint(0-1), deadline, msg.sender, dest);
if (tokensSold < maxSrcAmt) { if (tokensSold < maxSrcAmt) {
IERC20 srcTkn = IERC20(src); IERC20 srcTkn = IERC20(src);
uint srcToReturn = maxSrcAmt - tokensSold; uint srcToReturn = maxSrcAmt - tokensSold;
srcTkn.transfer(user, srcToReturn); srcTkn.transfer(msg.sender, srcToReturn);
} }
return tokensSold; return tokensSold;
} }