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

bridge all done, access liquidity remain

Browse Source
This commit is contained in:
Samyak Jain 2019-09-09 15:53:35 -07:00
parent 837da10d3b
commit 7bbf40de18
1 changed files with 81 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
contracts/ProxyLogics/InstaMakerCompBridge.sol
View File

@ -441,12 +441,12 @@ contract MakerResolver is CompoundHelper {
ethCol = ethAmt < ethCol ? ethAmt : ethCol; // if ETH amount > max Col. Set max col ethCol = ethAmt < ethCol ? ethAmt : ethCol; // if ETH amount > max Col. Set max col
} }
function wipeAndFree(uint cdpNum, uint jam, uint _wad) internal returns (uint daiAmt) { function wipeAndFreeMaker(uint cdpNum, uint jam, uint _wad) internal returns (uint daiAmt) {
daiAmt = wipe(cdpNum, _wad); daiAmt = wipe(cdpNum, _wad);
free(cdpNum, jam); free(cdpNum, jam);
} }
function lockAndDraw(uint cdpNum, uint jam, uint _wad) internal { function lockAndDrawMaker(uint cdpNum, uint jam, uint _wad) internal {
lock(cdpNum, jam); lock(cdpNum, jam);
draw(cdpNum, _wad); draw(cdpNum, _wad);
} }
@ -478,7 +478,7 @@ contract CompoundResolver is MakerResolver {
enterMarket(getCDAIAddress()); enterMarket(getCDAIAddress());
require(CTokenInterface(getCDAIAddress()).borrow(tokenAmt) == 0, "got collateral?"); require(CTokenInterface(getCDAIAddress()).borrow(tokenAmt) == 0, "got collateral?");
setApproval(getDAIAddress(), tokenAmt, getBridgeAddress()); setApproval(getDAIAddress(), tokenAmt, getBridgeAddress());
BridgeInterface(getBridgeAddress()).transferBackDAI(tokenAmt); // BridgeInterface(getBridgeAddress()).transferBackDAI(tokenAmt);
emit LogBorrow( emit LogBorrow(
getDAIAddress(), getDAIAddress(),
getCDAIAddress(), getCDAIAddress(),
@ -512,13 +512,13 @@ contract CompoundResolver is MakerResolver {
* @dev Redeem CETH * @dev Redeem CETH
* @param tokenAmt Amount of token To Redeem * @param tokenAmt Amount of token To Redeem
*/ */
function redeemCETH(uint tokenAmt) internal { function redeemCETH(uint tokenAmt) internal returns(uint ethAmtReddemed) {
CTokenInterface cToken = CTokenInterface(getCETHAddress()); CTokenInterface cToken = CTokenInterface(getCETHAddress());
uint cethBal = cToken.balanceOf(address(this)); uint cethBal = cToken.balanceOf(address(this));
uint exchangeRate = cToken.exchangeRateCurrent(); uint exchangeRate = cToken.exchangeRateCurrent();
uint cethInEth = wmul(cethBal, exchangeRate); uint cethInEth = wmul(cethBal, exchangeRate);
setApproval(getCETHAddress(), 2**128, getCETHAddress()); setApproval(getCETHAddress(), 2**128, getCETHAddress());
uint ethAmtReddemed = tokenAmt; ethAmtReddemed = tokenAmt;
if (tokenAmt > cethInEth) { if (tokenAmt > cethInEth) {
require(cToken.redeem(cethBal) == 0, "something went wrong"); require(cToken.redeem(cethBal) == 0, "something went wrong");
ethAmtReddemed = cethInEth; ethAmtReddemed = cethInEth;
@ -533,6 +533,31 @@ contract CompoundResolver is MakerResolver {
); );
} }
function mintAndBorrowComp(uint ethAmt, uint daiAmt) internal {
mintCEth(ethAmt);
borrowDAIComp(daiAmt);
}
function paybackAndRedeemComp(uint ethCol, uint daiDebt) internal returns (uint ethAmt, uint daiAmt) {
daiAmt = repayDaiComp(daiDebt);
ethAmt = redeemCETH(ethCol);
}
/**
* @dev If col/debt > user's balance/borrow. Then set max
*/
function checkCompound(uint ethAmt, uint daiAmt) internal returns (uint ethCol, uint daiDebt) {
CTokenInterface cEthContract = CTokenInterface(getCETHAddress());
uint cEthBal = cEthContract.balanceOf(msg.sender);
uint ethExchangeRate = cEthContract.exchangeRateCurrent();
ethCol = wmul(cEthBal, ethExchangeRate);
ethCol = wdiv(ethCol, ethExchangeRate) <= cEthBal ? ethCol : ethCol - 1;
ethCol = ethCol <= ethAmt ? ethCol : ethAmt; // Set Max if amount is greater than the Col user have
daiDebt = CERC20Interface(getCDAIAddress()).borrowBalanceCurrent(msg.sender);
daiDebt = daiDebt <= daiAmt ? daiDebt : daiAmt; // Set Max if amount is greater than the Debt user have
}
} }
@ -542,21 +567,30 @@ contract Bridge is CompoundResolver {
* @dev convert Maker CDP into Compound Collateral * @dev convert Maker CDP into Compound Collateral
* @param toConvert ranges from 0 to 1 and has (18 decimals) * @param toConvert ranges from 0 to 1 and has (18 decimals)
*/ */
function makerToCompound(uint cdpId, uint toConvert) public { // function makerToCompound(uint cdpId, uint toConvert) public {
bytes32 cup = bytes32(cdpId); // bytes32 cup = bytes32(cdpId);
(uint ethCol, uint daiDebt) = getCDPStats(cup); // (uint ethCol, uint daiDebt) = getCDPStats(cup);
uint ethFree = ethCol; // uint ethFree = ethCol;
uint daiAmt = daiDebt; // uint daiAmt = daiDebt;
if (toConvert < 10**18) { // if (toConvert < 10**18) {
uint wipeAmt = wmul(daiDebt, toConvert); // uint wipeAmt = wmul(daiDebt, toConvert);
ethFree = wmul(ethCol, toConvert); // ethFree = wmul(ethCol, toConvert);
daiAmt = wipe(cup, wipeAmt, ethFree); // daiAmt = wipe(cup, wipeAmt, ethFree);
free(cup, ethFree); // free(cup, ethFree);
} else { // } else {
daiAmt = shut(cup); // daiAmt = shut(cup);
} // }
mintCEth(ethFree); // mintCEth(ethFree);
borrowDAIComp(daiAmt); // borrowDAIComp(daiAmt);
// }
/**
* @dev MakerDAO to Compound
*/
function makerToCompound(uint cdpId, uint ethQty, uint daiQty) public {
(uint ethAmt, uint daiDebt) = checkCDP(bytes32(cdpId), ethQty, daiQty);
uint daiAmt = wipeAndFreeMaker(cdpId, ethAmt, daiDebt); // Getting Liquidity inside Wipe function
mintAndBorrowComp(ethAmt, daiAmt); // Returning Liquidity inside Borrow function
} }
/** /**
@ -564,29 +598,34 @@ contract Bridge is CompoundResolver {
* @param cdpId = 0, if user don't have any CDP * @param cdpId = 0, if user don't have any CDP
* @param toConvert ranges from 0 to 1 and has (18 decimals) * @param toConvert ranges from 0 to 1 and has (18 decimals)
*/ */
function compoundToMaker(uint cdpId, uint toConvert) public { function compoundToMaker(uint cdpId, uint ethQty, uint daiQty) public {
bytes32 cup = bytes32(cdpId); (uint ethCol, uint daiDebt) = checkCompound(ethQty, daiQty);
if (cdpId == 0) { (uint ethAmt, uint daiAmt) = paybackAndRedeemComp(cdpId, ethCol, daiDebt); // Getting Liquidity inside Wipe function
cup = open(); lockAndDrawMaker(ethAmt, daiAmt); // Returning Liquidity inside Borrow function
} }
// function compoundToMaker(uint cdpId, uint toConvert) public {
// bytes32 cup = bytes32(cdpId);
// if (cdpId == 0) {
// cup = open();
// }
(uint ethCol, uint daiDebt,, uint totalBorrow, uint maxBorrow, uint daiInEth) = getCompoundStats(address(this)); // (uint ethCol, uint daiDebt,, uint totalBorrow, uint maxBorrow, uint daiInEth) = getCompoundStats(address(this));
uint ethFree = ethCol; // uint ethFree = ethCol;
uint daiAmt = daiDebt; // uint daiAmt = daiDebt;
if (toConvert < 10**18) { // if (toConvert < 10**18) {
daiAmt = wmul(daiDebt, toConvert); // daiAmt = wmul(daiDebt, toConvert);
ethFree = wmul(ethCol, toConvert); // ethFree = wmul(ethCol, toConvert);
} // }
uint makerFinalRatio = getMakerRatio(cup, ethFree, daiAmt); // uint makerFinalRatio = getMakerRatio(cup, ethFree, daiAmt);
require(makerFinalRatio < 660000000000000000, "Maker CDP will liquidate"); // require(makerFinalRatio < 660000000000000000, "Maker CDP will liquidate");
totalBorrow -= wmul(daiAmt, daiInEth); // totalBorrow -= wmul(daiAmt, daiInEth);
maxBorrow -= wmul(ethFree, 750000000000000000); // maxBorrow -= wmul(ethFree, 750000000000000000);
require(totalBorrow < maxBorrow, "Compound position will liquidate"); // require(totalBorrow < maxBorrow, "Compound position will liquidate");
repayToken(daiAmt); // repayToken(daiAmt);
redeemUnderlying(ethFree); // redeemUnderlying(ethFree);
lock(cup, ethFree); // lock(cup, ethFree);
draw(cup, daiAmt); // draw(cup, daiAmt);
} // }
} }