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

split swap completed

Browse Source
This commit is contained in:
Samyak Jain 2019-06-27 00:49:22 +05:30
parent 2ed12e7ab5
commit 1e6656619e
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
contracts/ProxyLogics/SplitSwap/SplitSwap.sol
View File

@ -199,6 +199,9 @@ contract SplitHelper is AdminStuffs {
contract SplitResolver is SplitHelper { contract SplitResolver is SplitHelper {
event LogEthToDai(uint srcAmt, uint destAmt);
event LogDaiToEth(uint srcAmt, uint destAmt);
function ethToDaiLoop(uint srcAmt, uint splitAmt, uint finalAmt) internal returns (uint destAmt) { function ethToDaiLoop(uint srcAmt, uint splitAmt, uint finalAmt) internal returns (uint destAmt) {
if (srcAmt > splitAmt) { if (srcAmt > splitAmt) {
uint amtToSwap = splitAmt; uint amtToSwap = splitAmt;
@ -214,15 +217,8 @@ contract SplitResolver is SplitHelper {
} }
destAmt = ethToDaiLoop(nextSrcAmt, splitAmt, ethBought); destAmt = ethToDaiLoop(nextSrcAmt, splitAmt, ethBought);
} else if (srcAmt > 0) { } else if (srcAmt > 0) {
(uint bestExchange,) = getBest(ethAddr, daiAddr, srcAmt);
destAmt = finalAmt; destAmt = finalAmt;
if (bestExchange == 0) { destAmt += swapKyber(ethAddr, daiAddr, srcAmt);
destAmt += swapEth2Dai(wethAddr, daiAddr, srcAmt);
} else if (bestExchange == 1) {
destAmt += swapKyber(ethAddr, daiAddr, srcAmt);
} else {
destAmt += swapUniswap(ethAddr, daiAddr, srcAmt);
}
} else { } else {
destAmt = finalAmt; destAmt = finalAmt;
} }
@ -243,22 +239,19 @@ contract SplitResolver is SplitHelper {
} }
destAmt = daiToEthLoop(nextSrcAmt, splitAmt, ethBought); destAmt = daiToEthLoop(nextSrcAmt, splitAmt, ethBought);
} else if (srcAmt > 0) { } else if (srcAmt > 0) {
(uint bestExchange,) = getBest(daiAddr, ethAddr, srcAmt);
destAmt = finalAmt; destAmt = finalAmt;
if (bestExchange == 0) { destAmt += swapKyber(daiAddr, ethAddr, srcAmt);
destAmt += swapEth2Dai(daiAddr, wethAddr, srcAmt);
} else if (bestExchange == 1) {
destAmt += swapKyber(daiAddr, ethAddr, srcAmt);
} else {
destAmt += swapUniswap(daiAddr, ethAddr, srcAmt);
}
TokenInterface wethContract = TokenInterface(wethAddr); TokenInterface wethContract = TokenInterface(wethAddr);
uint balanceWeth = wethContract.balanceOf(address(this)); uint balanceWeth = wethContract.balanceOf(address(this));
wethContract.withdraw(balanceWeth); if (balanceWeth > 0) {
wethContract.withdraw(balanceWeth);
}
} else { } else {
TokenInterface wethContract = TokenInterface(wethAddr); TokenInterface wethContract = TokenInterface(wethAddr);
uint balanceWeth = wethContract.balanceOf(address(this)); uint balanceWeth = wethContract.balanceOf(address(this));
wethContract.withdraw(balanceWeth); if (balanceWeth > 0) {
wethContract.withdraw(balanceWeth);
}
destAmt = finalAmt; destAmt = finalAmt;
} }
} }
@ -306,15 +299,17 @@ contract SplitSwap is SplitResolver {
destAmt = wmul(destAmt, cut); destAmt = wmul(destAmt, cut);
require(destAmt > slippageAmt, "Dest Amt < slippage"); require(destAmt > slippageAmt, "Dest Amt < slippage");
require(TokenInterface(daiAddr).transfer(msg.sender, destAmt), "Not enough DAI to transfer"); require(TokenInterface(daiAddr).transfer(msg.sender, destAmt), "Not enough DAI to transfer");
emit LogEthToDai(msg.value, destAmt);
} }
function daiToEthSwap(uint srcAmt, uint splitAmt, uint slippageAmt) public payable returns (uint destAmt) { function daiToEthSwap(uint srcAmt, uint splitAmt, uint slippageAmt) public returns (uint destAmt) {
require(maxSplitAmtDai >= splitAmt, "split amt > max"); require(maxSplitAmtDai >= splitAmt, "split amt > max");
require(TokenInterface(daiAddr).transferFrom(msg.sender, address(this), srcAmt), "Token Approved?"); require(TokenInterface(daiAddr).transferFrom(msg.sender, address(this), srcAmt), "Token Approved?");
uint finalSrcAmt = wmul(srcAmt, cut); uint finalSrcAmt = wmul(srcAmt, cut);
destAmt = daiToEthLoop(finalSrcAmt, splitAmt, 0); destAmt = daiToEthLoop(finalSrcAmt, splitAmt, 0);
require(destAmt > slippageAmt, "Dest Amt < slippage"); require(destAmt > slippageAmt, "Dest Amt < slippage");
msg.sender.transfer(destAmt); msg.sender.transfer(destAmt);
emit LogDaiToEth(finalSrcAmt, destAmt);
} }
} }