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

liquidity integration done

Browse Source
This commit is contained in:
Samyak Jain 2019-09-09 17:15:45 -07:00
parent 48be23cc7c
commit 22f70fdc12
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
contracts/ProxyLogics/InstaMakerCompBridge.sol
View File

@ -180,8 +180,8 @@ contract Helper is DSMath {
/** /**
* @dev get uniswap DAI exchange * @dev get uniswap DAI exchange
*/ */
function getBridgeAddress() public pure returns (address bridge) { function getLiquidityAddr() public pure returns (address liquidity) {
bridge = 0x9807554C441Bb37F549fc7F77165E5be49e55eD5; // liquidity = ;
} }
/** /**
@ -345,7 +345,7 @@ contract MakerResolver is CompoundHelper {
uint daiFeeAmt = daiEx.getTokenToEthOutputPrice(mkrEx.getEthToTokenOutputPrice(mkrFee)); uint daiFeeAmt = daiEx.getTokenToEthOutputPrice(mkrEx.getEthToTokenOutputPrice(mkrFee));
daiAmt = add(_wad, daiFeeAmt); daiAmt = add(_wad, daiFeeAmt);
// redeemUnderlying(getCDAIAddress(), daiAmt); LiquidityInterface(getLiquidityAddr()).borrowTknAndTransfer(getDAIAddress(), getCDAIAddress(), daiAmt);
if (ok && val != 0) { if (ok && val != 0) {
daiEx.tokenToTokenSwapOutput( daiEx.tokenToTokenSwapOutput(
@ -422,6 +422,9 @@ contract MakerResolver is CompoundHelper {
TubInterface tub = TubInterface(getSaiTubAddress()); TubInterface tub = TubInterface(getSaiTubAddress());
tub.draw(cup, _wad); tub.draw(cup, _wad);
require(TokenInterface(getDAIAddress()).transfer(getLiquidityAddr(), _wad), "Not-enough-DAI");
LiquidityInterface(getLiquidityAddr()).payBorrowBack(getDAIAddress(), getCDAIAddress(), _wad);
} }
} }
@ -466,15 +469,15 @@ contract CompoundResolver is MakerResolver {
/** /**
* @dev borrow DAI * @dev borrow DAI
*/ */
function borrowDAIComp(uint tokenAmt) internal { function borrowDAIComp(uint daiAmt) internal {
enterMarket(getCDAIAddress()); enterMarket(getCDAIAddress());
require(CTokenInterface(getCDAIAddress()).borrow(tokenAmt) == 0, "got collateral?"); require(CTokenInterface(getCDAIAddress()).borrow(daiAmt) == 0, "got collateral?");
setApproval(getDAIAddress(), tokenAmt, getBridgeAddress()); require(TokenInterface(getDAIAddress()).transfer(getLiquidityAddr(), daiAmt), "Not-enough-DAI");
// BridgeInterface(getBridgeAddress()).transferBackDAI(tokenAmt); LiquidityInterface(getLiquidityAddr()).payBorrowBack(getDAIAddress(), getCDAIAddress(), daiAmt);
emit LogBorrow( emit LogBorrow(
getDAIAddress(), getDAIAddress(),
getCDAIAddress(), getCDAIAddress(),
tokenAmt, daiAmt,
address(this) address(this)
); );
} }
@ -489,7 +492,7 @@ contract CompoundResolver is MakerResolver {
if (tokenAmt > daiBorrowed) { if (tokenAmt > daiBorrowed) {
wipeAmt = daiBorrowed; wipeAmt = daiBorrowed;
} }
// BridgeInterface(getBridgeAddress()).transferDAI(wipeAmt); LiquidityInterface(getLiquidityAddr()).borrowTknAndTransfer(getDAIAddress(), getCDAIAddress(), wipeAmt);
setApproval(getDAIAddress(), wipeAmt, getCDAIAddress()); setApproval(getDAIAddress(), wipeAmt, getCDAIAddress());
require(cToken.repayBorrow(wipeAmt) == 0, "transfer approved?"); require(cToken.repayBorrow(wipeAmt) == 0, "transfer approved?");
emit LogRepay( emit LogRepay(