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

Checked Thilok's edits. Changed pool addr

Browse Source
This commit is contained in:
Samyak Jain 2019-10-16 19:49:25 +05:30
parent b5cc0891c0
commit 09eb0a4e36
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/ProxyLogics/import/InstaCompImport.sol
View File

@ -79,7 +79,7 @@ contract Helpers is DSMath {
* @dev get InstaDApp Liquidity Address * @dev get InstaDApp Liquidity Address
*/ */
function getPoolAddress() public pure returns (address payable liqAddr) { function getPoolAddress() public pure returns (address payable liqAddr) {
liqAddr = 0x2b10e1970Ba95C27C6fe3d496DD5d624A1e68D56; //Check Thrilok liqAddr = 0x1564D040EC290C743F67F5cB11f3C1958B39872A;
} }
/** /**
@ -135,8 +135,8 @@ contract ImportResolver is Helpers {
// subtracting 0.00000001 ETH from initialPoolBal to solve Compound 8 decimal CETH error. // subtracting 0.00000001 ETH from initialPoolBal to solve Compound 8 decimal CETH error.
uint initialPoolBal = sub(getPoolAddress().balance, 10000000000); uint initialPoolBal = sub(getPoolAddress().balance, 10000000000);
address[] memory markets = enteredMarkets(msg.sender); address[] memory markets = enteredMarkets(msg.sender);
address[] memory borrowAddr = new address[](markets.length); //Check Thrilok address[] memory borrowAddr = new address[](markets.length);
uint[] memory borrowAmt = new uint[](markets.length); //Check Thrilok uint[] memory borrowAmt = new uint[](markets.length);
uint borrowCount = 0; uint borrowCount = 0;
// create an array of borrowed address and amount // create an array of borrowed address and amount
@ -155,10 +155,9 @@ contract ImportResolver is Helpers {
PoolInterface(getPoolAddress()).accessToken(borrowAddr, borrowAmt, isCompound); PoolInterface(getPoolAddress()).accessToken(borrowAddr, borrowAmt, isCompound);
// // payback user wallet borrowed assets // // payback user wallet borrowed assets
for (uint i = 0; i < borrowCount; i++) { //Check Thrilok for (uint i = 0; i < borrowCount; i++) {
address cErc20 = borrowAddr[i]; address cErc20 = borrowAddr[i];
uint toPayback = borrowAmt[i]; uint toPayback = borrowAmt[i];
assert(cErc20 != address(0)); //Check Thrilok
if (cErc20 == getCETHAddress()) { if (cErc20 == getCETHAddress()) {
CETHInterface(cErc20).repayBorrowBehalf.value(toPayback)(msg.sender); CETHInterface(cErc20).repayBorrowBehalf.value(toPayback)(msg.sender);
} else { } else {
@ -182,10 +181,9 @@ contract ImportResolver is Helpers {
// // borrow and transfer assets to payback liquidity // // borrow and transfer assets to payback liquidity
enterMarket(markets); enterMarket(markets);
for (uint i = 0; i < borrowCount; i++) { //Check Thrilok for (uint i = 0; i < borrowCount; i++) {
address cErc20 = borrowAddr[i]; address cErc20 = borrowAddr[i];
uint toBorrow = borrowAmt[i]; uint toBorrow = borrowAmt[i];
assert(cErc20 != address(0)); //Check Thrilok
CTokenInterface ctknContract = CTokenInterface(cErc20); CTokenInterface ctknContract = CTokenInterface(cErc20);
require(ctknContract.borrow(toBorrow) == 0, "got collateral?"); require(ctknContract.borrow(toBorrow) == 0, "got collateral?");
if (cErc20 == getCETHAddress()) { if (cErc20 == getCETHAddress()) {