Instadapp/dsa-connectors-old
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors-old.git synced 2024-07-29 22:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use CToken Interface instead of address

Browse Source
This commit is contained in:
Mubaris NK 2021-01-10 16:17:27 +05:30
parent db19ebe2ec
commit c8c44a1158
No known key found for this signature in database
GPG Key ID: 1F132294E8700320
1 changed files with 99 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
contracts/connectors/refinance.sol
View File

@ -29,6 +29,8 @@ interface CTokenInterface {
function balanceOf(address owner) external view returns (uint256 balance); function balanceOf(address owner) external view returns (uint256 balance);
function transferFrom(address, address, uint) external returns (bool); function transferFrom(address, address, uint) external returns (bool);
function underlying() external view returns (address);
} }
interface CETHInterface { interface CETHInterface {
@ -279,6 +281,13 @@ contract Helpers is DSMath {
// return 0xd0A1E359811322d97991E03f863a0C30C2cF029C; // Kovan WETH Address // return 0xd0A1E359811322d97991E03f863a0C30C2cF029C; // Kovan WETH Address
} }
/**
* @dev Return CEth address
*/
function getCethAddr() internal pure returns (address) {
return 0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5;
}
/** /**
* @dev Return InstaDApp Mapping Address * @dev Return InstaDApp Mapping Address
*/ */
@ -488,7 +497,8 @@ contract Helpers is DSMath {
(uint _amt, uint _fee) = getPaybackBalance(aaveV1, token); (uint _amt, uint _fee) = getPaybackBalance(aaveV1, token);
amt = _amt + _fee; amt = _amt + _fee;
} else if (target == Protocol.AaveV2) { } else if (target == Protocol.AaveV2) {
amt = getPaybackBalanceV2(aaveData, token, rateMode); address _token = token == getEthAddr() ? getWethAddr() : token;
amt = getPaybackBalanceV2(aaveData, _token, rateMode);
} else if (target == Protocol.Compound) { } else if (target == Protocol.Compound) {
address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token); address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token);
amt = CTokenInterface(cToken).borrowBalanceCurrent(address(this)); amt = CTokenInterface(cToken).borrowBalanceCurrent(address(this));
@ -504,32 +514,58 @@ contract Helpers is DSMath {
} }
} }
} }
function getTokenInterfaces(uint length, address[] memory tokens) internal pure returns (TokenInterface[] memory) {
TokenInterface[] memory _tokens = new TokenInterface[](length);
for (uint i = 0; i < length; i++) {
if (tokens[i] == getEthAddr()) {
_tokens[i] = TokenInterface(getWethAddr());
} else {
_tokens[i] = TokenInterface(tokens[i]);
}
}
return _tokens;
}
function getCtokenInterfaces(uint length, address[] memory tokens) internal view returns (CTokenInterface[] memory) {
CTokenInterface[] memory _ctokens = new CTokenInterface[](length);
for (uint i = 0; i < length; i++) {
if (tokens[i] == getEthAddr()) {
_ctokens[i] = CTokenInterface(getCethAddr());
} else {
address _cToken = InstaMapping(getMappingAddr()).cTokenMapping(tokens[i]);
_ctokens[i] = CTokenInterface(_cToken);
}
}
return _ctokens;
}
} }
contract CompoundHelpers is Helpers { contract CompoundHelpers is Helpers {
function _compEnterMarkets(uint length, address[] memory tokens) internal { function _compEnterMarkets(uint length, CTokenInterface[] memory ctokens) internal {
ComptrollerInterface troller = ComptrollerInterface(getComptrollerAddress()); ComptrollerInterface troller = ComptrollerInterface(getComptrollerAddress());
address[] memory cTokens = new address[](length); address[] memory _cTokens = new address[](length);
for (uint i = 0; i < length; i++) { for (uint i = 0; i < length; i++) {
cTokens[i] = InstaMapping(getMappingAddr()).cTokenMapping(tokens[i]); _cTokens[i] = address(ctokens[i]);
} }
troller.enterMarkets(cTokens); troller.enterMarkets(_cTokens);
} }
function _compBorrowOne(uint fee, address token, uint amt, Protocol target, uint rateMode) internal returns (uint) { function _compBorrowOne(uint fee, CTokenInterface ctoken, uint amt, Protocol target, uint rateMode) internal returns (uint) {
if (amt > 0) { if (amt > 0) {
address token = address(ctoken) == getCethAddr() ? getEthAddr() : ctoken.underlying();
if (amt == uint(-1)) { if (amt == uint(-1)) {
amt = getMaxBorrow(target, token, rateMode); amt = getMaxBorrow(target, token, rateMode);
} }
address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token);
uint feeAmt = wmul(amt, fee); uint feeAmt = wmul(amt, fee);
uint _amt = add(amt, feeAmt); uint _amt = add(amt, feeAmt);
require(CTokenInterface(cToken).borrow(_amt) == 0, "borrow-failed-collateral?"); require(ctoken.borrow(_amt) == 0, "borrow-failed-collateral?");
transferFees(token, feeAmt); transferFees(token, feeAmt);
} }
return amt; return amt;
@ -539,30 +575,30 @@ contract CompoundHelpers is Helpers {
uint length, uint length,
uint fee, uint fee,
Protocol target, Protocol target,
address[] memory tokens, CTokenInterface[] memory ctokens,
uint[] memory amts, uint[] memory amts,
uint[] memory rateModes uint[] memory rateModes
) internal returns (uint[] memory) { ) internal returns (uint[] memory) {
uint[] memory finalAmts = new uint[](length); uint[] memory finalAmts = new uint[](length);
for (uint i = 0; i < length; i++) { for (uint i = 0; i < length; i++) {
finalAmts[i] = _compBorrowOne(fee, tokens[i], amts[i], target, rateModes[i]); finalAmts[i] = _compBorrowOne(fee, ctokens[i], amts[i], target, rateModes[i]);
} }
return finalAmts; return finalAmts;
} }
function _compDepositOne(uint fee, address token, uint amt) internal { function _compDepositOne(uint fee, CTokenInterface ctoken, uint amt) internal {
if (amt > 0) { if (amt > 0) {
address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token); address token = address(ctoken) == getCethAddr() ? getEthAddr() : ctoken.underlying();
uint feeAmt = wmul(amt, fee); uint feeAmt = wmul(amt, fee);
uint _amt = sub(amt, feeAmt); uint _amt = sub(amt, feeAmt);
if (token != getEthAddr()) { if (token != getEthAddr()) {
TokenInterface tokenContract = TokenInterface(token); TokenInterface tokenContract = TokenInterface(token);
tokenContract.approve(cToken, _amt); tokenContract.approve(address(ctoken), _amt);
require(CTokenInterface(cToken).mint(_amt) == 0, "deposit-failed"); require(ctoken.mint(_amt) == 0, "deposit-failed");
} else { } else {
CETHInterface(cToken).mint.value(_amt)(); CETHInterface(getCethAddr()).mint.value(_amt)();
} }
transferFees(token, feeAmt); transferFees(token, feeAmt);
} }
@ -571,52 +607,50 @@ contract CompoundHelpers is Helpers {
function _compDeposit( function _compDeposit(
uint length, uint length,
uint fee, uint fee,
address[] memory tokens, CTokenInterface[] memory ctokens,
uint[] memory amts uint[] memory amts
) internal { ) internal {
for (uint i = 0; i < length; i++) { for (uint i = 0; i < length; i++) {
_compDepositOne(fee, tokens[i], amts[i]); _compDepositOne(fee, ctokens[i], amts[i]);
} }
} }
function _compWithdrawOne(address token, uint amt) internal returns (uint) { function _compWithdrawOne(CTokenInterface ctoken, uint amt) internal returns (uint) {
if (amt > 0) { if (amt > 0) {
address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token);
CTokenInterface cTokenContract = CTokenInterface(cToken);
if (amt == uint(-1)) { if (amt == uint(-1)) {
amt = cTokenContract.balanceOf(address(this)); amt = ctoken.balanceOf(address(this));
} }
require(cTokenContract.redeemUnderlying(amt) == 0, "withdraw-failed"); require(ctoken.redeemUnderlying(amt) == 0, "withdraw-failed");
} }
return amt; return amt;
} }
function _compWithdraw( function _compWithdraw(
uint length, uint length,
address[] memory tokens, CTokenInterface[] memory ctokens,
uint[] memory amts uint[] memory amts
) internal returns(uint[] memory) { ) internal returns(uint[] memory) {
uint[] memory finalAmts = new uint[](length); uint[] memory finalAmts = new uint[](length);
for (uint i = 0; i < length; i++) { for (uint i = 0; i < length; i++) {
finalAmts[i] = _compWithdrawOne(tokens[i], amts[i]); finalAmts[i] = _compWithdrawOne(ctokens[i], amts[i]);
} }
return finalAmts; return finalAmts;
} }
function _compPaybackOne(address token, uint amt) internal returns (uint) { function _compPaybackOne(CTokenInterface ctoken, uint amt) internal returns (uint) {
if (amt > 0) { if (amt > 0) {
address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token);
CTokenInterface cTokenContract = CTokenInterface(cToken); address token = address(ctoken) == getCethAddr() ? getEthAddr() : ctoken.underlying();
if (amt == uint(-1)) { if (amt == uint(-1)) {
amt = cTokenContract.borrowBalanceCurrent(address(this)); amt = ctoken.borrowBalanceCurrent(address(this));
} }
if (token != getEthAddr()) { if (token != getEthAddr()) {
TokenInterface tokenContract = TokenInterface(token); TokenInterface tokenContract = TokenInterface(token);
tokenContract.approve(cToken, amt); tokenContract.approve(address(ctoken), amt);
require(cTokenContract.repayBorrow(amt) == 0, "repay-failed."); require(ctoken.repayBorrow(amt) == 0, "repay-failed.");
} else { } else {
CETHInterface(cToken).repayBorrow.value(amt)(); CETHInterface(getCethAddr()).repayBorrow.value(amt)();
} }
} }
return amt; return amt;
@ -624,11 +658,11 @@ contract CompoundHelpers is Helpers {
function _compPayback( function _compPayback(
uint length, uint length,
address[] memory tokens, CTokenInterface[] memory ctokens,
uint[] memory amts uint[] memory amts
) internal { ) internal {
for (uint i = 0; i < length; i++) { for (uint i = 0; i < length; i++) {
_compPaybackOne(tokens[i], amts[i]); _compPaybackOne(ctokens[i], amts[i]);
} }
} }
} }
@ -1102,9 +1136,6 @@ contract MakerHelpers is AaveV2Helpers {
contract RefinanceResolver is MakerHelpers { contract RefinanceResolver is MakerHelpers {
// Aave v1 Id - 1
// Aave v2 Id - 2
// Compound Id - 3
struct RefinanceData { struct RefinanceData {
Protocol source; Protocol source;
Protocol target; Protocol target;
@ -1117,9 +1148,6 @@ contract RefinanceResolver is MakerHelpers {
uint[] paybackRateModes; uint[] paybackRateModes;
} }
// Aave v1 Id - 1
// Aave v2 Id - 2
// Compound Id - 3
struct RefinanceMakerData { struct RefinanceMakerData {
uint fromVaultId; uint fromVaultId;
uint toVaultId; uint toVaultId;
@ -1136,7 +1164,7 @@ contract RefinanceResolver is MakerHelpers {
uint paybackRateMode; uint paybackRateMode;
} }
function refinance(RefinanceData calldata data) external payable { function refinance(RefinanceData calldata data) public payable {
require(data.source != data.target, "source-and-target-unequal"); require(data.source != data.target, "source-and-target-unequal");
@ -1155,6 +1183,7 @@ contract RefinanceResolver is MakerHelpers {
uint[] memory depositAmts; uint[] memory depositAmts;
uint[] memory paybackAmts; uint[] memory paybackAmts;
if (data.source == Protocol.Aave && data.target == Protocol.AaveV2) { if (data.source == Protocol.Aave && data.target == Protocol.AaveV2) {
paybackAmts = _aaveV2Borrow( paybackAmts = _aaveV2Borrow(
aaveV2, aaveV2,
@ -1169,20 +1198,21 @@ contract RefinanceResolver is MakerHelpers {
depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, data.tokens, data.withdrawAmts); depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, data.tokens, data.withdrawAmts);
_aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, data.tokens, depositAmts); _aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, data.tokens, depositAmts);
} else if (data.source == Protocol.Aave && data.target == Protocol.Compound) { } else if (data.source == Protocol.Aave && data.target == Protocol.Compound) {
_compEnterMarkets(length, data.tokens); CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens);
_compEnterMarkets(length, _ctokens);
paybackAmts = _compBorrow( paybackAmts = _compBorrow(
length, length,
data.debtFee, data.debtFee,
data.target, data.target,
data.tokens, _ctokens,
data.borrowAmts, data.borrowAmts,
data.borrowRateModes data.borrowRateModes
); );
_aaveV1Payback(aaveV1, aaveCore, length, data.tokens, paybackAmts); _aaveV1Payback(aaveV1, aaveCore, length, data.tokens, paybackAmts);
depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, data.tokens, data.withdrawAmts); depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, data.tokens, data.withdrawAmts);
_compDeposit(length, data.collateralFee, data.tokens, depositAmts); _compDeposit(length, data.collateralFee, _ctokens, depositAmts);
} else if (data.source == Protocol.AaveV2 && data.target == Protocol.Aave) { } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Aave) {
paybackAmts = _aaveV1Borrow( paybackAmts = _aaveV1Borrow(
aaveV1, aaveV1,
@ -1198,20 +1228,22 @@ contract RefinanceResolver is MakerHelpers {
depositAmts = _aaveV2Withdraw(aaveV2, aaveData, length, data.tokens, data.withdrawAmts); depositAmts = _aaveV2Withdraw(aaveV2, aaveData, length, data.tokens, data.withdrawAmts);
_aaveV1Deposit(aaveV1, aaveCore, length, data.collateralFee, data.tokens, depositAmts); _aaveV1Deposit(aaveV1, aaveCore, length, data.collateralFee, data.tokens, depositAmts);
} else if (data.source == Protocol.AaveV2 && data.target == Protocol.Compound) { } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Compound) {
_compEnterMarkets(length, data.tokens); CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens);
_compEnterMarkets(length, _ctokens);
paybackAmts = _compBorrow( paybackAmts = _compBorrow(
length, length,
data.debtFee, data.debtFee,
data.target, data.target,
data.tokens, _ctokens,
data.borrowAmts, data.borrowAmts,
data.borrowRateModes data.borrowRateModes
); );
_aaveV2Payback(aaveV2, aaveData, length, data.tokens, paybackAmts, data.paybackRateModes); _aaveV2Payback(aaveV2, aaveData, length, data.tokens, paybackAmts, data.paybackRateModes);
depositAmts = _aaveV2Withdraw(aaveV2, aaveData, length, data.tokens, data.withdrawAmts); depositAmts = _aaveV2Withdraw(aaveV2, aaveData, length, data.tokens, data.withdrawAmts);
_compDeposit(length, data.collateralFee, data.tokens, depositAmts); _compDeposit(length, data.collateralFee, _ctokens, depositAmts);
} else if (data.source == Protocol.Compound && data.target == Protocol.Aave) { } else if (data.source == Protocol.Compound && data.target == Protocol.Aave) {
paybackAmts = _aaveV1Borrow( paybackAmts = _aaveV1Borrow(
aaveV1, aaveV1,
length, length,
@ -1222,10 +1254,14 @@ contract RefinanceResolver is MakerHelpers {
data.borrowRateModes, data.borrowRateModes,
data.paybackRateModes data.paybackRateModes
); );
_compPayback(length, data.tokens, paybackAmts); {
depositAmts = _compWithdraw(length, data.tokens, data.withdrawAmts); CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens);
_compPayback(length, _ctokens, paybackAmts);
depositAmts = _compWithdraw(length, _ctokens, data.withdrawAmts);
}
_aaveV1Deposit(aaveV1, aaveCore, length, data.collateralFee, data.tokens, depositAmts); _aaveV1Deposit(aaveV1, aaveCore, length, data.collateralFee, data.tokens, depositAmts);
} else if (data.source == Protocol.Compound && data.target == Protocol.AaveV2) { } else if (data.source == Protocol.Compound && data.target == Protocol.AaveV2) {
CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens);
paybackAmts = _aaveV2Borrow( paybackAmts = _aaveV2Borrow(
aaveV2, aaveV2,
length, length,
@ -1235,8 +1271,8 @@ contract RefinanceResolver is MakerHelpers {
data.borrowAmts, data.borrowAmts,
data.borrowRateModes data.borrowRateModes
); );
_compPayback(length, data.tokens, paybackAmts); _compPayback(length, _ctokens, paybackAmts);
depositAmts = _compWithdraw(length, data.tokens, data.withdrawAmts); depositAmts = _compWithdraw(length, _ctokens, data.withdrawAmts);
_aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, data.tokens, depositAmts); _aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, data.tokens, depositAmts);
} else { } else {
revert("invalid-options"); revert("invalid-options");
@ -1273,10 +1309,12 @@ contract RefinanceResolver is MakerHelpers {
tokens[0] = dai; tokens[0] = dai;
tokens[1] = data.token; tokens[1] = data.token;
_compEnterMarkets(2, tokens); CTokenInterface[] memory _ctokens = getCtokenInterfaces(2, tokens);
_compDepositOne(data.collateralFee, data.token, depositAmt); _compEnterMarkets(2, _ctokens);
_compBorrowOne(data.debtFee, dai, borrowAmt, Protocol.Aave, 2);
_compDepositOne(data.collateralFee, _ctokens[1], depositAmt);
_compBorrowOne(data.debtFee, _ctokens[0], borrowAmt, Protocol.Aave, 2);
} else { } else {
revert("invalid-option"); revert("invalid-option");
} }
@ -1292,8 +1330,14 @@ contract RefinanceResolver is MakerHelpers {
borrowAmt = _aaveV2PaybackOne(aaveV2, aaveData, dai, data.debt, data.paybackRateMode); borrowAmt = _aaveV2PaybackOne(aaveV2, aaveData, dai, data.debt, data.paybackRateMode);
depositAmt = _aaveV2WithdrawOne(aaveV2, aaveData, data.token, data.collateral); depositAmt = _aaveV2WithdrawOne(aaveV2, aaveData, data.token, data.collateral);
} else if (data.source == Protocol.Compound) { } else if (data.source == Protocol.Compound) {
borrowAmt = _compPaybackOne(dai, data.debt); address _cDai = InstaMapping(getMappingAddr()).cTokenMapping(dai);
depositAmt = _compWithdrawOne(data.token, data.collateral); address _cToken = InstaMapping(getMappingAddr()).cTokenMapping(data.token);
CTokenInterface cDai = CTokenInterface(_cDai);
CTokenInterface cToken = CTokenInterface(_cToken);
borrowAmt = _compPaybackOne(cDai, data.debt);
depositAmt = _compWithdrawOne(cToken, data.collateral);
} else { } else {
revert("invalid-option"); revert("invalid-option");
} }