From e3589a1f726b6704dafc143bea727b8ac2627a55 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Tue, 12 Jan 2021 15:29:12 +0530 Subject: [PATCH 01/10] Refinance fixes --- contracts/connectors/refinance.sol | 71 ++++++++++++++++-------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/contracts/connectors/refinance.sol b/contracts/connectors/refinance.sol index 92b7a7b..2b0a7dc 100644 --- a/contracts/connectors/refinance.sol +++ b/contracts/connectors/refinance.sol @@ -17,6 +17,7 @@ interface TokenInterface { // Compound Helpers interface CTokenInterface { function mint(uint mintAmount) external returns (uint); + function redeem(uint redeemTokens) external returns (uint); function borrow(uint borrowAmount) external returns (uint); function repayBorrow(uint repayAmount) external returns (uint); @@ -477,8 +478,7 @@ contract Helpers is DSMath { (uint _amt, uint _fee) = getPaybackBalance(aaveV1, token); amt = _amt + _fee; } else if (target == Protocol.AaveV2) { - address _token = token == getEthAddr() ? getWethAddr() : token; - amt = getPaybackBalanceV2(aaveData, _token, rateMode); + amt = getPaybackBalanceV2(aaveData, token, rateMode); } else if (target == Protocol.Compound) { address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token); amt = CTokenInterface(cToken).borrowBalanceCurrent(address(this)); @@ -495,6 +495,11 @@ contract Helpers is DSMath { } } + function calculateFee(uint256 amount, uint256 fee, bool toAdd) internal pure returns(uint feeAmount, uint _amount){ + feeAmount = wmul(amount, fee); + _amount = toAdd ? add(amount, feeAmount) : sub(amount, feeAmount); + } + 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++) { @@ -551,11 +556,10 @@ contract CompoundHelpers is Helpers { address _token = address(token) == getWethAddr() ? getEthAddr() : address(token); if (amt == uint(-1)) { - amt = getMaxBorrow(target, _token, rateMode); + amt = getMaxBorrow(target, address(token), rateMode); } - uint feeAmt = wmul(amt, fee); - uint _amt = add(amt, feeAmt); + (uint feeAmt, uint _amt) = calculateFee(amt, fee, true); require(ctoken.borrow(_amt) == 0, "borrow-failed-collateral?"); transferFees(_token, feeAmt); @@ -584,8 +588,7 @@ contract CompoundHelpers is Helpers { if (amt > 0) { address _token = address(token) == getWethAddr() ? getEthAddr() : address(token); - uint feeAmt = wmul(amt, fee); - uint _amt = sub(amt, feeAmt); + (uint feeAmt, uint _amt) = calculateFee(amt, fee, false); if (_token != getEthAddr()) { token.approve(address(ctoken), _amt); @@ -609,12 +612,17 @@ contract CompoundHelpers is Helpers { } } - function _compWithdrawOne(CTokenInterface ctoken, uint amt) internal returns (uint) { + function _compWithdrawOne(CTokenInterface ctoken, TokenInterface token, uint amt) internal returns (uint) { if (amt > 0) { if (amt == uint(-1)) { - amt = ctoken.balanceOf(address(this)); + bool isEth = address(token) == getWethAddr(); + uint initalBal = isEth ? address(this).balance : token.balanceOf(address(this)); + require(ctoken.redeem(ctoken.balanceOf(address(this))) == 0, "withdraw-failed"); + uint finalBal = isEth ? address(this).balance : token.balanceOf(address(this)); + amt = finalBal - initalBal; + } else { + require(ctoken.redeemUnderlying(amt) == 0, "withdraw-failed"); } - require(ctoken.redeemUnderlying(amt) == 0, "withdraw-failed"); } return amt; } @@ -622,11 +630,12 @@ contract CompoundHelpers is Helpers { function _compWithdraw( uint length, CTokenInterface[] memory ctokens, + TokenInterface[] memory tokens, uint[] memory amts ) internal returns(uint[] memory) { uint[] memory finalAmts = new uint[](length); for (uint i = 0; i < length; i++) { - finalAmts[i] = _compWithdrawOne(ctokens[i], amts[i]); + finalAmts[i] = _compWithdrawOne(ctokens[i], tokens[i], amts[i]); } return finalAmts; } @@ -685,11 +694,10 @@ contract AaveV1Helpers is CompoundHelpers { address _token = address(token) == getWethAddr() ? getEthAddr() : address(token); if (amt == uint(-1)) { - amt = getMaxBorrow(target, _token, paybackRateMode); + amt = getMaxBorrow(target, address(token), paybackRateMode); } - uint feeAmt = wmul(amt, fee); - uint _amt = add(amt, feeAmt); + (uint feeAmt, uint _amt) = calculateFee(amt, fee, true); aave.borrow(_token, _amt, borrowRateMode, getReferralCode()); transferFees(_token, feeAmt); @@ -724,8 +732,7 @@ contract AaveV1Helpers is CompoundHelpers { ) internal { if (amt > 0) { uint ethAmt; - uint feeAmt = wmul(amt, fee); - uint _amt = sub(amt, feeAmt); + (uint feeAmt, uint _amt) = calculateFee(amt, fee, false); bool isEth = address(token) == getWethAddr(); @@ -768,10 +775,10 @@ contract AaveV1Helpers is CompoundHelpers { if (amt > 0) { address _token = address(token) == getWethAddr() ? getEthAddr() : address(token); ATokenV1Interface atoken = ATokenV1Interface(aaveCore.getReserveATokenAddress(_token)); - atoken.redeem(amt); if (amt == uint(-1)) { amt = getWithdrawBalance(aave, _token); } + atoken.redeem(amt); } return amt; } @@ -859,8 +866,7 @@ contract AaveV2Helpers is AaveV1Helpers { amt = getMaxBorrow(target, _token, rateMode); } - uint feeAmt = wmul(amt, fee); - uint _amt = add(amt, feeAmt); + (uint feeAmt, uint _amt) = calculateFee(amt, fee, true); bool isEth = address(token) == getWethAddr(); @@ -897,8 +903,7 @@ contract AaveV2Helpers is AaveV1Helpers { uint amt ) internal { if (amt > 0) { - uint feeAmt = wmul(amt, fee); - uint _amt = sub(amt, feeAmt); + (uint feeAmt, uint _amt) = calculateFee(amt, fee, false); bool isEth = address(token) == getWethAddr(); address _token = isEth ? getEthAddr() : address(token); @@ -1020,11 +1025,9 @@ contract MakerHelpers is AaveV2Helpers { uint collateralFee, uint debtFee ) internal { - uint collateralFeeAmt = wmul(collateralAmt, collateralFee); - uint _collateralAmt = sub(collateralAmt, collateralFeeAmt); + (uint collateralFeeAmt, uint _collateralAmt) = calculateFee(collateralAmt, collateralFee, false); - uint debtFeeAmt = wmul(debtAmt, debtFee); - uint _debtAmt = add(debtAmt, debtFeeAmt); + (uint debtFeeAmt, uint _debtAmt) = calculateFee(debtAmt, debtFee, true); MakerData memory makerData; @@ -1200,7 +1203,7 @@ contract RefinanceResolver is MakerHelpers { _aaveV2BorrowData.aave = aaveV2; _aaveV2BorrowData.length = length; _aaveV2BorrowData.fee = data.debtFee; - _aaveV2BorrowData.target = data.target; + _aaveV2BorrowData.target = data.source; _aaveV2BorrowData.tokens = tokens; _aaveV2BorrowData.amts = data.borrowAmts; _aaveV2BorrowData.rateModes = data.borrowRateModes; @@ -1217,7 +1220,7 @@ contract RefinanceResolver is MakerHelpers { _compoundBorrowData.length = length; _compoundBorrowData.fee = data.debtFee; - _compoundBorrowData.target = data.target; + _compoundBorrowData.target = data.source; _compoundBorrowData.ctokens = _ctokens; _compoundBorrowData.tokens = tokens; _compoundBorrowData.amts = data.borrowAmts; @@ -1235,7 +1238,7 @@ contract RefinanceResolver is MakerHelpers { _aaveV1BorrowData.aave = aaveV1; _aaveV1BorrowData.length = length; _aaveV1BorrowData.fee = data.debtFee; - _aaveV1BorrowData.target = data.target; + _aaveV1BorrowData.target = data.source; _aaveV1BorrowData.tokens = tokens; _aaveV1BorrowData.amts = data.borrowAmts; _aaveV1BorrowData.borrowRateModes = data.borrowRateModes; @@ -1254,7 +1257,7 @@ contract RefinanceResolver is MakerHelpers { _compoundBorrowData.length = length; _compoundBorrowData.fee = data.debtFee; - _compoundBorrowData.target = data.target; + _compoundBorrowData.target = data.source; _compoundBorrowData.ctokens = _ctokens; _compoundBorrowData.tokens = tokens; _compoundBorrowData.amts = data.borrowAmts; @@ -1273,7 +1276,7 @@ contract RefinanceResolver is MakerHelpers { _aaveV1BorrowData.aave = aaveV1; _aaveV1BorrowData.length = length; _aaveV1BorrowData.fee = data.debtFee; - _aaveV1BorrowData.target = data.target; + _aaveV1BorrowData.target = data.source; _aaveV1BorrowData.tokens = tokens; _aaveV1BorrowData.amts = data.borrowAmts; _aaveV1BorrowData.borrowRateModes = data.borrowRateModes; @@ -1283,7 +1286,7 @@ contract RefinanceResolver is MakerHelpers { { CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens); _compPayback(length, _ctokens, tokens, paybackAmts); - depositAmts = _compWithdraw(length, _ctokens, data.withdrawAmts); + depositAmts = _compWithdraw(length, _ctokens, tokens, data.withdrawAmts); } _aaveV1Deposit(aaveV1, aaveCore, length, data.collateralFee, tokens, depositAmts); } else if (data.source == Protocol.Compound && data.target == Protocol.AaveV2) { @@ -1294,14 +1297,14 @@ contract RefinanceResolver is MakerHelpers { _aaveV2BorrowData.aave = aaveV2; _aaveV2BorrowData.length = length; _aaveV2BorrowData.fee = data.debtFee; - _aaveV2BorrowData.target = data.target; + _aaveV2BorrowData.target = data.source; _aaveV2BorrowData.tokens = tokens; _aaveV2BorrowData.amts = data.borrowAmts; _aaveV2BorrowData.rateModes = data.borrowRateModes; paybackAmts = _aaveV2Borrow(_aaveV2BorrowData); _compPayback(length, _ctokens, tokens, paybackAmts); - depositAmts = _compWithdraw(length, _ctokens, data.withdrawAmts); + depositAmts = _compWithdraw(length, _ctokens, tokens, data.withdrawAmts); _aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, tokens, depositAmts); } else { revert("invalid-options"); @@ -1367,7 +1370,7 @@ contract RefinanceResolver is MakerHelpers { CTokenInterface cToken = CTokenInterface(_cToken); borrowAmt = _compPaybackOne(cDai, dai, data.debt); - depositAmt = _compWithdrawOne(cToken, data.collateral); + depositAmt = _compWithdrawOne(cToken, TokenInterface(data.token), data.collateral); } else { revert("invalid-option"); } From be564539a39edf0a89ac2749f00cc6e6e8916843 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Tue, 12 Jan 2021 15:34:53 +0530 Subject: [PATCH 02/10] Use correct token --- contracts/connectors/refinance.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/connectors/refinance.sol b/contracts/connectors/refinance.sol index 2b0a7dc..8de00c1 100644 --- a/contracts/connectors/refinance.sol +++ b/contracts/connectors/refinance.sol @@ -1370,7 +1370,7 @@ contract RefinanceResolver is MakerHelpers { CTokenInterface cToken = CTokenInterface(_cToken); borrowAmt = _compPaybackOne(cDai, dai, data.debt); - depositAmt = _compWithdrawOne(cToken, TokenInterface(data.token), data.collateral); + depositAmt = _compWithdrawOne(cToken, token, data.collateral); } else { revert("invalid-option"); } From 051b9029f73297b35055bc2515f4243b45c491d4 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Tue, 12 Jan 2021 17:35:56 +0530 Subject: [PATCH 03/10] Update --- contracts/connectors/refinance.sol | 150 ++++++++++++++++++++--------- 1 file changed, 107 insertions(+), 43 deletions(-) diff --git a/contracts/connectors/refinance.sol b/contracts/connectors/refinance.sol index 8de00c1..7450773 100644 --- a/contracts/connectors/refinance.sol +++ b/contracts/connectors/refinance.sol @@ -470,7 +470,7 @@ contract Helpers is DSMath { } } - function getMaxBorrow(Protocol target, address token, uint rateMode) internal returns (uint amt) { + function getMaxBorrow(Protocol target, address token, CTokenInterface ctoken, uint rateMode) internal returns (uint amt) { AaveV1Interface aaveV1 = AaveV1Interface(getAaveProvider().getLendingPool()); AaveV2DataProviderInterface aaveData = getAaveV2DataProvider(); @@ -480,8 +480,7 @@ contract Helpers is DSMath { } else if (target == Protocol.AaveV2) { amt = getPaybackBalanceV2(aaveData, token, rateMode); } else if (target == Protocol.Compound) { - address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token); - amt = CTokenInterface(cToken).borrowBalanceCurrent(address(this)); + amt = ctoken.borrowBalanceCurrent(address(this)); } } @@ -556,7 +555,7 @@ contract CompoundHelpers is Helpers { address _token = address(token) == getWethAddr() ? getEthAddr() : address(token); if (amt == uint(-1)) { - amt = getMaxBorrow(target, address(token), rateMode); + amt = getMaxBorrow(target, address(token), ctoken, rateMode); } (uint feeAmt, uint _amt) = calculateFee(amt, fee, true); @@ -619,7 +618,7 @@ contract CompoundHelpers is Helpers { uint initalBal = isEth ? address(this).balance : token.balanceOf(address(this)); require(ctoken.redeem(ctoken.balanceOf(address(this))) == 0, "withdraw-failed"); uint finalBal = isEth ? address(this).balance : token.balanceOf(address(this)); - amt = finalBal - initalBal; + amt = sub(finalBal, initalBal); } else { require(ctoken.redeemUnderlying(amt) == 0, "withdraw-failed"); } @@ -675,6 +674,7 @@ contract AaveV1Helpers is CompoundHelpers { uint fee; Protocol target; TokenInterface[] tokens; + CTokenInterface[] ctokens; uint[] amts; uint[] borrowRateModes; uint[] paybackRateModes; @@ -685,6 +685,7 @@ contract AaveV1Helpers is CompoundHelpers { uint fee, Protocol target, TokenInterface token, + CTokenInterface ctoken, uint amt, uint borrowRateMode, uint paybackRateMode @@ -694,7 +695,7 @@ contract AaveV1Helpers is CompoundHelpers { address _token = address(token) == getWethAddr() ? getEthAddr() : address(token); if (amt == uint(-1)) { - amt = getMaxBorrow(target, address(token), paybackRateMode); + amt = getMaxBorrow(target, address(token), ctoken, paybackRateMode); } (uint feeAmt, uint _amt) = calculateFee(amt, fee, true); @@ -715,6 +716,7 @@ contract AaveV1Helpers is CompoundHelpers { data.fee, data.target, data.tokens[i], + data.ctokens[i], data.amts[i], data.borrowRateModes[i], data.paybackRateModes[i] @@ -847,15 +849,34 @@ contract AaveV2Helpers is AaveV1Helpers { uint fee; Protocol target; TokenInterface[] tokens; + CTokenInterface[] ctokens; uint[] amts; uint[] rateModes; } + struct AaveV2PaybackData { + AaveV2Interface aave; + AaveV2DataProviderInterface aaveData; + uint length; + TokenInterface[] tokens; + uint[] amts; + uint[] rateModes; + } + + struct AaveV2WithdrawData { + AaveV2Interface aave; + AaveV2DataProviderInterface aaveData; + uint length; + TokenInterface[] tokens; + uint[] amts; + } + function _aaveV2BorrowOne( AaveV2Interface aave, uint fee, Protocol target, TokenInterface token, + CTokenInterface ctoken, uint amt, uint rateMode ) internal returns (uint) { @@ -863,7 +884,7 @@ contract AaveV2Helpers is AaveV1Helpers { address _token = address(token) == getWethAddr() ? getEthAddr() : address(token); if (amt == uint(-1)) { - amt = getMaxBorrow(target, _token, rateMode); + amt = getMaxBorrow(target, _token, ctoken, rateMode); } (uint feeAmt, uint _amt) = calculateFee(amt, fee, true); @@ -888,6 +909,7 @@ contract AaveV2Helpers is AaveV1Helpers { data.fee, data.target, data.tokens[i], + data.ctokens[i], data.amts[i], data.rateModes[i] ); @@ -953,15 +975,16 @@ contract AaveV2Helpers is AaveV1Helpers { } function _aaveV2Withdraw( - AaveV2Interface aave, - AaveV2DataProviderInterface aaveData, - uint length, - TokenInterface[] memory tokens, - uint[] memory amts + AaveV2WithdrawData memory data ) internal returns (uint[] memory) { - uint[] memory finalAmts = new uint[](length); - for (uint i = 0; i < length; i++) { - finalAmts[i] = _aaveV2WithdrawOne(aave, aaveData, tokens[i], amts[i]); + uint[] memory finalAmts = new uint[](data.length); + for (uint i = 0; i < data.length; i++) { + finalAmts[i] = _aaveV2WithdrawOne( + data.aave, + data.aaveData, + data.tokens[i], + data.amts[i] + ); } return finalAmts; } @@ -987,15 +1010,16 @@ contract AaveV2Helpers is AaveV1Helpers { } function _aaveV2Payback( - AaveV2Interface aave, - AaveV2DataProviderInterface aaveData, - uint length, - TokenInterface[] memory tokens, - uint[] memory amts, - uint[] memory rateModes + AaveV2PaybackData memory data ) internal { - for (uint i = 0; i < length; i++) { - _aaveV2PaybackOne(aave, aaveData, tokens[i], amts[i], rateModes[i]); + for (uint i = 0; i < data.length; i++) { + _aaveV2PaybackOne( + data.aave, + data.aaveData, + data.tokens[i], + data.amts[i], + data.rateModes[i] + ); } } } @@ -1196,6 +1220,7 @@ contract RefinanceResolver is MakerHelpers { uint[] memory paybackAmts; TokenInterface[] memory tokens = getTokenInterfaces(length, data.tokens); + CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens); if (data.source == Protocol.Aave && data.target == Protocol.AaveV2) { AaveV2BorrowData memory _aaveV2BorrowData; @@ -1205,6 +1230,7 @@ contract RefinanceResolver is MakerHelpers { _aaveV2BorrowData.fee = data.debtFee; _aaveV2BorrowData.target = data.source; _aaveV2BorrowData.tokens = tokens; + _aaveV2BorrowData.ctokens = _ctokens; _aaveV2BorrowData.amts = data.borrowAmts; _aaveV2BorrowData.rateModes = data.borrowRateModes; @@ -1213,7 +1239,6 @@ contract RefinanceResolver is MakerHelpers { depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, tokens, data.withdrawAmts); _aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, tokens, depositAmts); } else if (data.source == Protocol.Aave && data.target == Protocol.Compound) { - CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens); _compEnterMarkets(length, _ctokens); CompoundBorrowData memory _compoundBorrowData; @@ -1234,22 +1259,43 @@ contract RefinanceResolver is MakerHelpers { } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Aave) { AaveV1BorrowData memory _aaveV1BorrowData; + AaveV2PaybackData memory _aaveV2PaybackData; + AaveV2WithdrawData memory _aaveV2WithdrawData; - _aaveV1BorrowData.aave = aaveV1; - _aaveV1BorrowData.length = length; - _aaveV1BorrowData.fee = data.debtFee; - _aaveV1BorrowData.target = data.source; - _aaveV1BorrowData.tokens = tokens; - _aaveV1BorrowData.amts = data.borrowAmts; - _aaveV1BorrowData.borrowRateModes = data.borrowRateModes; - _aaveV1BorrowData.paybackRateModes = data.paybackRateModes; + { + _aaveV1BorrowData.aave = aaveV1; + _aaveV1BorrowData.length = length; + _aaveV1BorrowData.fee = data.debtFee; + _aaveV1BorrowData.target = data.source; + _aaveV1BorrowData.tokens = tokens; + _aaveV1BorrowData.ctokens = _ctokens; + _aaveV1BorrowData.amts = data.borrowAmts; + _aaveV1BorrowData.borrowRateModes = data.borrowRateModes; + _aaveV1BorrowData.paybackRateModes = data.paybackRateModes; - paybackAmts = _aaveV1Borrow(_aaveV1BorrowData); - _aaveV2Payback(aaveV2, aaveData, length, tokens, paybackAmts, data.paybackRateModes); - depositAmts = _aaveV2Withdraw(aaveV2, aaveData, length, tokens, data.withdrawAmts); + paybackAmts = _aaveV1Borrow(_aaveV1BorrowData); + } + + { + _aaveV2PaybackData.aave = aaveV2; + _aaveV2PaybackData.aaveData = aaveData; + _aaveV2PaybackData.length = length; + _aaveV2PaybackData.tokens = tokens; + _aaveV2PaybackData.amts = paybackAmts; + _aaveV2PaybackData.rateModes = data.paybackRateModes; + _aaveV2Payback(_aaveV2PaybackData); + } + + { + _aaveV2WithdrawData.aave = aaveV2; + _aaveV2WithdrawData.aaveData = aaveData; + _aaveV2WithdrawData.length = length; + _aaveV2WithdrawData.tokens = tokens; + _aaveV2WithdrawData.amts = data.withdrawAmts; + depositAmts = _aaveV2Withdraw(_aaveV2WithdrawData); + } _aaveV1Deposit(aaveV1, aaveCore, length, data.collateralFee, tokens, depositAmts); } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Compound) { - CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens); _compEnterMarkets(length, _ctokens); { @@ -1265,9 +1311,28 @@ contract RefinanceResolver is MakerHelpers { paybackAmts = _compBorrow(_compoundBorrowData); } + + AaveV2PaybackData memory _aaveV2PaybackData; + + _aaveV2PaybackData.aave = aaveV2; + _aaveV2PaybackData.aaveData = aaveData; + _aaveV2PaybackData.length = length; + _aaveV2PaybackData.tokens = tokens; + _aaveV2PaybackData.amts = paybackAmts; + _aaveV2PaybackData.rateModes = data.paybackRateModes; - _aaveV2Payback(aaveV2, aaveData, length, tokens, paybackAmts, data.paybackRateModes); - depositAmts = _aaveV2Withdraw(aaveV2, aaveData, length, tokens, data.withdrawAmts); + _aaveV2Payback(_aaveV2PaybackData); + + { + AaveV2WithdrawData memory _aaveV2WithdrawData; + + _aaveV2WithdrawData.aave = aaveV2; + _aaveV2WithdrawData.aaveData = aaveData; + _aaveV2WithdrawData.length = length; + _aaveV2WithdrawData.tokens = tokens; + _aaveV2WithdrawData.amts = data.withdrawAmts; + depositAmts = _aaveV2Withdraw(_aaveV2WithdrawData); + } _compDeposit(length, data.collateralFee, _ctokens, tokens, depositAmts); } else if (data.source == Protocol.Compound && data.target == Protocol.Aave) { @@ -1278,20 +1343,18 @@ contract RefinanceResolver is MakerHelpers { _aaveV1BorrowData.fee = data.debtFee; _aaveV1BorrowData.target = data.source; _aaveV1BorrowData.tokens = tokens; + _aaveV1BorrowData.ctokens = _ctokens; _aaveV1BorrowData.amts = data.borrowAmts; _aaveV1BorrowData.borrowRateModes = data.borrowRateModes; _aaveV1BorrowData.paybackRateModes = data.paybackRateModes; paybackAmts = _aaveV1Borrow(_aaveV1BorrowData); { - CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens); _compPayback(length, _ctokens, tokens, paybackAmts); depositAmts = _compWithdraw(length, _ctokens, tokens, data.withdrawAmts); } _aaveV1Deposit(aaveV1, aaveCore, length, data.collateralFee, tokens, depositAmts); } else if (data.source == Protocol.Compound && data.target == Protocol.AaveV2) { - CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens); - AaveV2BorrowData memory _aaveV2BorrowData; _aaveV2BorrowData.aave = aaveV2; @@ -1299,6 +1362,7 @@ contract RefinanceResolver is MakerHelpers { _aaveV2BorrowData.fee = data.debtFee; _aaveV2BorrowData.target = data.source; _aaveV2BorrowData.tokens = tokens; + _aaveV2BorrowData.ctokens = _ctokens; _aaveV2BorrowData.amts = data.borrowAmts; _aaveV2BorrowData.rateModes = data.borrowRateModes; @@ -1333,10 +1397,10 @@ contract RefinanceResolver is MakerHelpers { if (data.target == Protocol.Aave) { _aaveV1DepositOne(aaveV1, aaveCore, data.collateralFee, token, depositAmt); - _aaveV1BorrowOne(aaveV1, data.debtFee, Protocol.AaveV2, dai, borrowAmt, data.borrowRateMode, 2); + _aaveV1BorrowOne(aaveV1, data.debtFee, Protocol.AaveV2, dai, CTokenInterface(address(0)), borrowAmt, data.borrowRateMode, 2); } else if (data.target == Protocol.AaveV2) { _aaveV2DepositOne(aaveV2, aaveData, data.collateralFee, token, depositAmt); - _aaveV2BorrowOne(aaveV2, data.debtFee, Protocol.AaveV2, dai, borrowAmt, data.borrowRateMode); + _aaveV2BorrowOne(aaveV2, data.debtFee, Protocol.AaveV2, dai, CTokenInterface(address(0)), borrowAmt, data.borrowRateMode); } else if (data.target == Protocol.Compound) { address[] memory tokens = new address[](2); tokens[0] = address(dai); From cd84e7157d4b6d80a53949e5107abe11205e3e32 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Tue, 12 Jan 2021 17:49:23 +0530 Subject: [PATCH 04/10] Update --- contracts/connectors/refinance.sol | 55 ++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/contracts/connectors/refinance.sol b/contracts/connectors/refinance.sol index 7450773..adb6642 100644 --- a/contracts/connectors/refinance.sol +++ b/contracts/connectors/refinance.sol @@ -680,6 +680,15 @@ contract AaveV1Helpers is CompoundHelpers { uint[] paybackRateModes; } + struct AaveV1DepositData { + AaveV1Interface aave; + AaveV1CoreInterface aaveCore; + uint length; + uint fee; + TokenInterface[] tokens; + uint[] amts; + } + function _aaveV1BorrowOne( AaveV1Interface aave, uint fee, @@ -756,15 +765,16 @@ contract AaveV1Helpers is CompoundHelpers { } function _aaveV1Deposit( - AaveV1Interface aave, - AaveV1CoreInterface aaveCore, - uint length, - uint fee, - TokenInterface[] memory tokens, - uint[] memory amts + AaveV1DepositData memory data ) internal { - for (uint i = 0; i < length; i++) { - _aaveV1DepositOne(aave, aaveCore, fee, tokens[i], amts[i]); + for (uint i = 0; i < data.length; i++) { + _aaveV1DepositOne( + data.aave, + data.aaveCore, + data.fee, + data.tokens[i], + data.amts[i] + ); } } @@ -1294,7 +1304,18 @@ contract RefinanceResolver is MakerHelpers { _aaveV2WithdrawData.amts = data.withdrawAmts; depositAmts = _aaveV2Withdraw(_aaveV2WithdrawData); } - _aaveV1Deposit(aaveV1, aaveCore, length, data.collateralFee, tokens, depositAmts); + { + AaveV1DepositData memory _aaveV1DepositData; + + _aaveV1DepositData.aave = aaveV1; + _aaveV1DepositData.aaveCore = aaveCore; + _aaveV1DepositData.length = length; + _aaveV1DepositData.fee = data.collateralFee; + _aaveV1DepositData.tokens = tokens; + _aaveV1DepositData.amts = depositAmts; + + _aaveV1Deposit(_aaveV1DepositData); + } } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Compound) { _compEnterMarkets(length, _ctokens); @@ -1325,7 +1346,7 @@ contract RefinanceResolver is MakerHelpers { { AaveV2WithdrawData memory _aaveV2WithdrawData; - + _aaveV2WithdrawData.aave = aaveV2; _aaveV2WithdrawData.aaveData = aaveData; _aaveV2WithdrawData.length = length; @@ -1353,7 +1374,19 @@ contract RefinanceResolver is MakerHelpers { _compPayback(length, _ctokens, tokens, paybackAmts); depositAmts = _compWithdraw(length, _ctokens, tokens, data.withdrawAmts); } - _aaveV1Deposit(aaveV1, aaveCore, length, data.collateralFee, tokens, depositAmts); + + { + AaveV1DepositData memory _aaveV1DepositData; + + _aaveV1DepositData.aave = aaveV1; + _aaveV1DepositData.aaveCore = aaveCore; + _aaveV1DepositData.length = length; + _aaveV1DepositData.fee = data.collateralFee; + _aaveV1DepositData.tokens = tokens; + _aaveV1DepositData.amts = depositAmts; + + _aaveV1Deposit(_aaveV1DepositData); + } } else if (data.source == Protocol.Compound && data.target == Protocol.AaveV2) { AaveV2BorrowData memory _aaveV2BorrowData; From 9a0b2fff32ddd81286f26b985b44e62c70336eb5 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Tue, 12 Jan 2021 18:26:56 +0530 Subject: [PATCH 05/10] Minor change --- contracts/connectors/refinance.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/connectors/refinance.sol b/contracts/connectors/refinance.sol index adb6642..015e227 100644 --- a/contracts/connectors/refinance.sol +++ b/contracts/connectors/refinance.sol @@ -891,7 +891,9 @@ contract AaveV2Helpers is AaveV1Helpers { uint rateMode ) internal returns (uint) { if (amt > 0) { - address _token = address(token) == getWethAddr() ? getEthAddr() : address(token); + bool isEth = address(token) == getWethAddr(); + + address _token = isEth ? getEthAddr() : address(token); if (amt == uint(-1)) { amt = getMaxBorrow(target, _token, ctoken, rateMode); @@ -899,8 +901,6 @@ contract AaveV2Helpers is AaveV1Helpers { (uint feeAmt, uint _amt) = calculateFee(amt, fee, true); - bool isEth = address(token) == getWethAddr(); - aave.borrow(address(token), _amt, rateMode, getReferralCode(), address(this)); convertWethToEth(isEth, token, amt); From 64f85d51a7e90134cfbbf6dc4b46493c6fe254ad Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Tue, 12 Jan 2021 18:28:04 +0530 Subject: [PATCH 06/10] Updated connector ID --- contracts/connectors/refinance.sol | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/contracts/connectors/refinance.sol b/contracts/connectors/refinance.sol index 015e227..07323ab 100644 --- a/contracts/connectors/refinance.sol +++ b/contracts/connectors/refinance.sol @@ -30,8 +30,6 @@ interface CTokenInterface { interface CETHInterface { function mint() external payable; function repayBorrow() external payable; - // function repayBorrowBehalf(address borrower) external payable; - // function liquidateBorrow(address borrower, address cTokenCollateral) external payable; } interface InstaMapping { @@ -41,9 +39,6 @@ interface InstaMapping { interface ComptrollerInterface { function enterMarkets(address[] calldata cTokens) external returns (uint[] memory); - // function exitMarket(address cTokenAddress) external returns (uint); - // function getAssetsIn(address account) external view returns (address[] memory); - // function getAccountLiquidity(address account) external view returns (uint, uint, uint); } // End Compound Helpers @@ -108,14 +103,6 @@ interface AaveV2Interface { ) external; function repay(address _asset, uint256 _amount, uint256 _rateMode, address _onBehalfOf) external; function setUserUseReserveAsCollateral(address _asset, bool _useAsCollateral) external; - function getUserAccountData(address user) external view returns ( - uint256 totalCollateralETH, - uint256 totalDebtETH, - uint256 availableBorrowsETH, - uint256 currentLiquidationThreshold, - uint256 ltv, - uint256 healthFactor - ); } interface AaveV2LendingPoolProviderInterface { @@ -266,7 +253,7 @@ contract Helpers is DSMath { * @dev Connector Details. */ function connectorID() public pure returns(uint _type, uint _id) { - (_type, _id) = (1, 72); + (_type, _id) = (1, 73); } /** From 2dba6e0603f99d182258cd45b956f6d4b5988d63 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Tue, 12 Jan 2021 19:05:54 +0530 Subject: [PATCH 07/10] WIP: code refactoring --- contracts/connectors/refinance.sol | 381 +++++++++++++++++------------ 1 file changed, 231 insertions(+), 150 deletions(-) diff --git a/contracts/connectors/refinance.sol b/contracts/connectors/refinance.sol index 07323ab..f347a59 100644 --- a/contracts/connectors/refinance.sol +++ b/contracts/connectors/refinance.sol @@ -1,8 +1,153 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol"; -import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +/** + * @dev Interface of the ERC20 standard as defined in the EIP. + */ +interface IERC20 { + /** + * @dev Returns the amount of tokens in existence. + */ + function totalSupply() external view returns (uint256); + + /** + * @dev Returns the amount of tokens owned by `account`. + */ + function balanceOf(address account) external view returns (uint256); + + /** + * @dev Moves `amount` tokens from the caller's account to `recipient`. + * + * Returns a boolean value indicating whether the operation succeeded. + * + * Emits a {Transfer} event. + */ + function transfer(address recipient, uint256 amount) external returns (bool); + + /** + * @dev Returns the remaining number of tokens that `spender` will be + * allowed to spend on behalf of `owner` through {transferFrom}. This is + * zero by default. + * + * This value changes when {approve} or {transferFrom} are called. + */ + function allowance(address owner, address spender) external view returns (uint256); + + /** + * @dev Sets `amount` as the allowance of `spender` over the caller's tokens. + * + * Returns a boolean value indicating whether the operation succeeded. + * + * IMPORTANT: Beware that changing an allowance with this method brings the risk + * that someone may use both the old and the new allowance by unfortunate + * transaction ordering. One possible solution to mitigate this race + * condition is to first reduce the spender's allowance to 0 and set the + * desired value afterwards: + * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 + * + * Emits an {Approval} event. + */ + function approve(address spender, uint256 amount) external returns (bool); + + /** + * @dev Moves `amount` tokens from `sender` to `recipient` using the + * allowance mechanism. `amount` is then deducted from the caller's + * allowance. + * + * Returns a boolean value indicating whether the operation succeeded. + * + * Emits a {Transfer} event. + */ + function transferFrom(address sender, address recipient, uint256 amount) external returns (bool); + + /** + * @dev Emitted when `value` tokens are moved from one account (`from`) to + * another (`to`). + * + * Note that `value` may be zero. + */ + event Transfer(address indexed from, address indexed to, uint256 value); + + /** + * @dev Emitted when the allowance of a `spender` for an `owner` is set by + * a call to {approve}. `value` is the new allowance. + */ + event Approval(address indexed owner, address indexed spender, uint256 value); +} + +/** + * @dev Collection of functions related to the address type + */ +library Address { + function isContract(address account) internal view returns (bool) { + // According to EIP-1052, 0x0 is the value returned for not-yet created accounts + // and 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 is returned + // for accounts without code, i.e. `keccak256('')` + bytes32 codehash; + bytes32 accountHash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470; + // solhint-disable-next-line no-inline-assembly + assembly { codehash := extcodehash(account) } + return (codehash != accountHash && codehash != 0x0); + } + + + /** + * @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`], but with + * `errorMessage` as a fallback revert reason when `target` reverts. + * + * _Available since v3.1._ + */ + function functionCall(address target, bytes memory data, string memory errorMessage) internal returns (bytes memory) { + return _functionCallWithValue(target, data, 0, errorMessage); + } + + function _functionCallWithValue(address target, bytes memory data, uint256 weiValue, string memory errorMessage) private returns (bytes memory) { + require(isContract(target), "Address: call to non-contract"); + + // solhint-disable-next-line avoid-low-level-calls + (bool success, bytes memory returndata) = target.call{ value: weiValue }(data); + if (success) { + return returndata; + } else { + // Look for revert reason and bubble it up if present + if (returndata.length > 0) { + // The easiest way to bubble the revert reason is using memory via assembly + + // solhint-disable-next-line no-inline-assembly + assembly { + let returndata_size := mload(returndata) + revert(add(32, returndata), returndata_size) + } + } else { + revert(errorMessage); + } + } + } +} + +library SafeERC20 { + using Address for address; + + function safeTransfer(IERC20 token, address to, uint256 value) internal { + _callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value)); + } + + function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal { + _callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value)); + } + + function _callOptionalReturn(IERC20 token, bytes memory data) private { + // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since + // we're implementing it ourselves. We use {Address.functionCall} to perform this call, which verifies that + // the target address contains contract code and also asserts for success in the low-level call. + + bytes memory returndata = address(token).functionCall(data, "SafeERC20: low-level call failed"); + if (returndata.length > 0) { // Return data is optional + // solhint-disable-next-line max-line-length + require(abi.decode(returndata, (bool)), "SafeERC20: ERC20 operation did not succeed"); + } + } +} interface TokenInterface { function approve(address, uint256) external; @@ -1197,31 +1342,40 @@ contract RefinanceResolver is MakerHelpers { uint paybackRateMode; } - function refinance(RefinanceData calldata data) external payable { + struct CommonData { + AaveV2Interface aaveV2; + AaveV1Interface aaveV1; + AaveV1CoreInterface aaveCore; + AaveV2DataProviderInterface aaveData; + uint length; + TokenInterface[] tokens; + CTokenInterface[] _ctokens; + } + function refinance(RefinanceData calldata data) external payable { + CommonData memory commonData; require(data.source != data.target, "source-and-target-unequal"); - uint length = data.tokens.length; + uint length = data.tokens.length; // TODO: move to common struct require(data.borrowAmts.length == length, "length-mismatch"); require(data.withdrawAmts.length == length, "length-mismatch"); require(data.borrowRateModes.length == length, "length-mismatch"); require(data.paybackRateModes.length == length, "length-mismatch"); - AaveV2Interface aaveV2 = AaveV2Interface(getAaveV2Provider().getLendingPool()); - AaveV1Interface aaveV1 = AaveV1Interface(getAaveProvider().getLendingPool()); - AaveV1CoreInterface aaveCore = AaveV1CoreInterface(getAaveProvider().getLendingPoolCore()); - AaveV2DataProviderInterface aaveData = getAaveV2DataProvider(); + AaveV2Interface aaveV2 = AaveV2Interface(getAaveV2Provider().getLendingPool()); // TODO: move to common struct + AaveV1Interface aaveV1 = AaveV1Interface(getAaveProvider().getLendingPool()); // TODO: move to common struct + AaveV1CoreInterface aaveCore = AaveV1CoreInterface(getAaveProvider().getLendingPoolCore()); // TODO: move to common struct + AaveV2DataProviderInterface aaveData = getAaveV2DataProvider(); // TODO: move to common struct - uint[] memory depositAmts; - uint[] memory paybackAmts; + uint[] memory depositAmts; // TODO: move to common struct + uint[] memory paybackAmts; // TODO: move to common struct - TokenInterface[] memory tokens = getTokenInterfaces(length, data.tokens); - CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens); - - if (data.source == Protocol.Aave && data.target == Protocol.AaveV2) { - AaveV2BorrowData memory _aaveV2BorrowData; + TokenInterface[] memory tokens = getTokenInterfaces(length, data.tokens); // TODO: move to common struct + CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens); // TODO: move to common struct + AaveV2BorrowData memory _aaveV2BorrowData; + if (data.target == Protocol.AaveV2) { _aaveV2BorrowData.aave = aaveV2; _aaveV2BorrowData.length = length; _aaveV2BorrowData.fee = data.debtFee; @@ -1230,16 +1384,10 @@ contract RefinanceResolver is MakerHelpers { _aaveV2BorrowData.ctokens = _ctokens; _aaveV2BorrowData.amts = data.borrowAmts; _aaveV2BorrowData.rateModes = data.borrowRateModes; + } - paybackAmts = _aaveV2Borrow(_aaveV2BorrowData); - _aaveV1Payback(aaveV1, aaveCore, length, tokens, paybackAmts); - depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, tokens, data.withdrawAmts); - _aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, tokens, depositAmts); - } else if (data.source == Protocol.Aave && data.target == Protocol.Compound) { - _compEnterMarkets(length, _ctokens); - - CompoundBorrowData memory _compoundBorrowData; - + CompoundBorrowData memory _compoundBorrowData; + if (data.target == Protocol.Compound) { _compoundBorrowData.length = length; _compoundBorrowData.fee = data.debtFee; _compoundBorrowData.target = data.source; @@ -1247,105 +1395,12 @@ contract RefinanceResolver is MakerHelpers { _compoundBorrowData.tokens = tokens; _compoundBorrowData.amts = data.borrowAmts; _compoundBorrowData.rateModes = data.borrowRateModes; - - paybackAmts = _compBorrow(_compoundBorrowData); - - _aaveV1Payback(aaveV1, aaveCore, length, tokens, paybackAmts); - depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, tokens, data.withdrawAmts); - _compDeposit(length, data.collateralFee, _ctokens, tokens, depositAmts); - } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Aave) { - - AaveV1BorrowData memory _aaveV1BorrowData; - AaveV2PaybackData memory _aaveV2PaybackData; - AaveV2WithdrawData memory _aaveV2WithdrawData; - - { - _aaveV1BorrowData.aave = aaveV1; - _aaveV1BorrowData.length = length; - _aaveV1BorrowData.fee = data.debtFee; - _aaveV1BorrowData.target = data.source; - _aaveV1BorrowData.tokens = tokens; - _aaveV1BorrowData.ctokens = _ctokens; - _aaveV1BorrowData.amts = data.borrowAmts; - _aaveV1BorrowData.borrowRateModes = data.borrowRateModes; - _aaveV1BorrowData.paybackRateModes = data.paybackRateModes; - - paybackAmts = _aaveV1Borrow(_aaveV1BorrowData); - } - - { - _aaveV2PaybackData.aave = aaveV2; - _aaveV2PaybackData.aaveData = aaveData; - _aaveV2PaybackData.length = length; - _aaveV2PaybackData.tokens = tokens; - _aaveV2PaybackData.amts = paybackAmts; - _aaveV2PaybackData.rateModes = data.paybackRateModes; - _aaveV2Payback(_aaveV2PaybackData); - } - - { - _aaveV2WithdrawData.aave = aaveV2; - _aaveV2WithdrawData.aaveData = aaveData; - _aaveV2WithdrawData.length = length; - _aaveV2WithdrawData.tokens = tokens; - _aaveV2WithdrawData.amts = data.withdrawAmts; - depositAmts = _aaveV2Withdraw(_aaveV2WithdrawData); - } - { - AaveV1DepositData memory _aaveV1DepositData; + } + + AaveV1BorrowData memory _aaveV1BorrowData; + AaveV1DepositData memory _aaveV1DepositData; - _aaveV1DepositData.aave = aaveV1; - _aaveV1DepositData.aaveCore = aaveCore; - _aaveV1DepositData.length = length; - _aaveV1DepositData.fee = data.collateralFee; - _aaveV1DepositData.tokens = tokens; - _aaveV1DepositData.amts = depositAmts; - - _aaveV1Deposit(_aaveV1DepositData); - } - } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Compound) { - _compEnterMarkets(length, _ctokens); - - { - CompoundBorrowData memory _compoundBorrowData; - - _compoundBorrowData.length = length; - _compoundBorrowData.fee = data.debtFee; - _compoundBorrowData.target = data.source; - _compoundBorrowData.ctokens = _ctokens; - _compoundBorrowData.tokens = tokens; - _compoundBorrowData.amts = data.borrowAmts; - _compoundBorrowData.rateModes = data.borrowRateModes; - - paybackAmts = _compBorrow(_compoundBorrowData); - } - - AaveV2PaybackData memory _aaveV2PaybackData; - - _aaveV2PaybackData.aave = aaveV2; - _aaveV2PaybackData.aaveData = aaveData; - _aaveV2PaybackData.length = length; - _aaveV2PaybackData.tokens = tokens; - _aaveV2PaybackData.amts = paybackAmts; - _aaveV2PaybackData.rateModes = data.paybackRateModes; - - _aaveV2Payback(_aaveV2PaybackData); - - { - AaveV2WithdrawData memory _aaveV2WithdrawData; - - _aaveV2WithdrawData.aave = aaveV2; - _aaveV2WithdrawData.aaveData = aaveData; - _aaveV2WithdrawData.length = length; - _aaveV2WithdrawData.tokens = tokens; - _aaveV2WithdrawData.amts = data.withdrawAmts; - depositAmts = _aaveV2Withdraw(_aaveV2WithdrawData); - } - _compDeposit(length, data.collateralFee, _ctokens, tokens, depositAmts); - } else if (data.source == Protocol.Compound && data.target == Protocol.Aave) { - - AaveV1BorrowData memory _aaveV1BorrowData; - + if (data.target == Protocol.Aave) { _aaveV1BorrowData.aave = aaveV1; _aaveV1BorrowData.length = length; _aaveV1BorrowData.fee = data.debtFee; @@ -1355,37 +1410,63 @@ contract RefinanceResolver is MakerHelpers { _aaveV1BorrowData.amts = data.borrowAmts; _aaveV1BorrowData.borrowRateModes = data.borrowRateModes; _aaveV1BorrowData.paybackRateModes = data.paybackRateModes; - + + _aaveV1DepositData.aave = aaveV1; + _aaveV1DepositData.aaveCore = aaveCore; + _aaveV1DepositData.length = length; + _aaveV1DepositData.fee = data.collateralFee; + _aaveV1DepositData.tokens = tokens; + _aaveV1DepositData.amts = depositAmts; + } + + AaveV2PaybackData memory _aaveV2PaybackData; + AaveV2WithdrawData memory _aaveV2WithdrawData; + if (data.source == Protocol.AaveV2) { + _aaveV2PaybackData.aave = aaveV2; + _aaveV2PaybackData.aaveData = aaveData; + _aaveV2PaybackData.length = length; + _aaveV2PaybackData.tokens = tokens; + _aaveV2PaybackData.amts = paybackAmts; + _aaveV2PaybackData.rateModes = data.paybackRateModes; + + _aaveV2WithdrawData.aave = aaveV2; + _aaveV2WithdrawData.aaveData = aaveData; + _aaveV2WithdrawData.length = length; + _aaveV2WithdrawData.tokens = tokens; + _aaveV2WithdrawData.amts = data.withdrawAmts; + } + + if (data.source == Protocol.Aave && data.target == Protocol.AaveV2) { + paybackAmts = _aaveV2Borrow(_aaveV2BorrowData); // TODO: pass common struct + RefinanceData calldata data and refactor in the common function + _aaveV1Payback(aaveV1, aaveCore, length, tokens, paybackAmts); + depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, tokens, data.withdrawAmts); + _aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, tokens, depositAmts); + } else if (data.source == Protocol.Aave && data.target == Protocol.Compound) { + _compEnterMarkets(length, _ctokens); + + paybackAmts = _compBorrow(_compoundBorrowData); + _aaveV1Payback(aaveV1, aaveCore, length, tokens, paybackAmts); + depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, tokens, data.withdrawAmts); + _compDeposit(length, data.collateralFee, _ctokens, tokens, depositAmts); + } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Aave) { + paybackAmts = _aaveV1Borrow(_aaveV1BorrowData); + _aaveV2Payback(_aaveV2PaybackData); + depositAmts = _aaveV2Withdraw(_aaveV2WithdrawData); + + _aaveV1Deposit(_aaveV1DepositData); + } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Compound) { + _compEnterMarkets(length, _ctokens); + + paybackAmts = _compBorrow(_compoundBorrowData); + _aaveV2Payback(_aaveV2PaybackData); + depositAmts = _aaveV2Withdraw(_aaveV2WithdrawData); + _compDeposit(length, data.collateralFee, _ctokens, tokens, depositAmts); + } else if (data.source == Protocol.Compound && data.target == Protocol.Aave) { paybackAmts = _aaveV1Borrow(_aaveV1BorrowData); - { _compPayback(length, _ctokens, tokens, paybackAmts); depositAmts = _compWithdraw(length, _ctokens, tokens, data.withdrawAmts); - } - - { - AaveV1DepositData memory _aaveV1DepositData; - - _aaveV1DepositData.aave = aaveV1; - _aaveV1DepositData.aaveCore = aaveCore; - _aaveV1DepositData.length = length; - _aaveV1DepositData.fee = data.collateralFee; - _aaveV1DepositData.tokens = tokens; - _aaveV1DepositData.amts = depositAmts; - - _aaveV1Deposit(_aaveV1DepositData); - } + _aaveV1Deposit(_aaveV1DepositData); } else if (data.source == Protocol.Compound && data.target == Protocol.AaveV2) { - AaveV2BorrowData memory _aaveV2BorrowData; - - _aaveV2BorrowData.aave = aaveV2; - _aaveV2BorrowData.length = length; - _aaveV2BorrowData.fee = data.debtFee; - _aaveV2BorrowData.target = data.source; - _aaveV2BorrowData.tokens = tokens; - _aaveV2BorrowData.ctokens = _ctokens; - _aaveV2BorrowData.amts = data.borrowAmts; - _aaveV2BorrowData.rateModes = data.borrowRateModes; - paybackAmts = _aaveV2Borrow(_aaveV2BorrowData); _compPayback(length, _ctokens, tokens, paybackAmts); depositAmts = _compWithdraw(length, _ctokens, tokens, data.withdrawAmts); @@ -1465,5 +1546,5 @@ contract RefinanceResolver is MakerHelpers { } contract ConnectRefinance is RefinanceResolver { - string public name = "Refinance-v1"; + string public name = "Refinance-v1.1"; } From f4146016f6365e4ce53019cf9e67873ac2f8f864 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Tue, 12 Jan 2021 20:05:11 +0530 Subject: [PATCH 08/10] Remove refianceMaker --- contracts/connectors/refinance.sol | 68 ------------------------------ 1 file changed, 68 deletions(-) diff --git a/contracts/connectors/refinance.sol b/contracts/connectors/refinance.sol index 07323ab..daaf0cd 100644 --- a/contracts/connectors/refinance.sol +++ b/contracts/connectors/refinance.sol @@ -1394,74 +1394,6 @@ contract RefinanceResolver is MakerHelpers { revert("invalid-options"); } } - - function refinanceMaker(RefinanceMakerData calldata data) external payable { - - AaveV2Interface aaveV2 = AaveV2Interface(getAaveV2Provider().getLendingPool()); - AaveV1Interface aaveV1 = AaveV1Interface(getAaveProvider().getLendingPool()); - AaveV1CoreInterface aaveCore = AaveV1CoreInterface(getAaveProvider().getLendingPoolCore()); - AaveV2DataProviderInterface aaveData = getAaveV2DataProvider(); - - TokenInterface dai = TokenInterface(getMcdDai()); - TokenInterface token = TokenInterface(data.token == getEthAddr() ? getWethAddr() : data.token); - - uint depositAmt; - uint borrowAmt; - - if (data.isFrom) { - (depositAmt, borrowAmt) = _makerPaybackAndWithdraw( - data.fromVaultId, - data.collateral, - data.debt - ); - - if (data.target == Protocol.Aave) { - _aaveV1DepositOne(aaveV1, aaveCore, data.collateralFee, token, depositAmt); - _aaveV1BorrowOne(aaveV1, data.debtFee, Protocol.AaveV2, dai, CTokenInterface(address(0)), borrowAmt, data.borrowRateMode, 2); - } else if (data.target == Protocol.AaveV2) { - _aaveV2DepositOne(aaveV2, aaveData, data.collateralFee, token, depositAmt); - _aaveV2BorrowOne(aaveV2, data.debtFee, Protocol.AaveV2, dai, CTokenInterface(address(0)), borrowAmt, data.borrowRateMode); - } else if (data.target == Protocol.Compound) { - address[] memory tokens = new address[](2); - tokens[0] = address(dai); - tokens[1] = data.token; - - CTokenInterface[] memory _ctokens = getCtokenInterfaces(2, tokens); - - _compEnterMarkets(2, _ctokens); - - _compDepositOne(data.collateralFee, _ctokens[1], token, depositAmt); - _compBorrowOne(data.debtFee, _ctokens[0], dai, borrowAmt, Protocol.Aave, 2); - } else { - revert("invalid-option"); - } - } else { - if (data.toVaultId == 0) { - _makerOpen(data.colType); - } - - if (data.source == Protocol.Aave) { - borrowAmt = _aaveV1PaybackOne(aaveV1, aaveCore, dai, data.debt); - depositAmt = _aaveV1WithdrawOne(aaveV1, aaveCore, token, data.collateral); - } else if (data.source == Protocol.AaveV2) { - borrowAmt = _aaveV2PaybackOne(aaveV2, aaveData, dai, data.debt, data.paybackRateMode); - depositAmt = _aaveV2WithdrawOne(aaveV2, aaveData, token, data.collateral); - } else if (data.source == Protocol.Compound) { - address _cDai = InstaMapping(getMappingAddr()).cTokenMapping(address(dai)); - address _cToken = InstaMapping(getMappingAddr()).cTokenMapping(data.token); - - CTokenInterface cDai = CTokenInterface(_cDai); - CTokenInterface cToken = CTokenInterface(_cToken); - - borrowAmt = _compPaybackOne(cDai, dai, data.debt); - depositAmt = _compWithdrawOne(cToken, token, data.collateral); - } else { - revert("invalid-option"); - } - - _makerDepositAndBorrow(data.toVaultId, depositAmt, borrowAmt, data.collateralFee, data.debtFee); - } - } } contract ConnectRefinance is RefinanceResolver { From e1ad68a3ebae51f3334d1c869447b8c841846f55 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Tue, 12 Jan 2021 20:06:44 +0530 Subject: [PATCH 09/10] Revert "WIP: code refactoring" This reverts commit 2dba6e0603f99d182258cd45b956f6d4b5988d63. --- contracts/connectors/refinance.sol | 381 ++++++++++++----------------- 1 file changed, 150 insertions(+), 231 deletions(-) diff --git a/contracts/connectors/refinance.sol b/contracts/connectors/refinance.sol index f347a59..07323ab 100644 --- a/contracts/connectors/refinance.sol +++ b/contracts/connectors/refinance.sol @@ -1,153 +1,8 @@ pragma solidity ^0.6.0; pragma experimental ABIEncoderV2; -/** - * @dev Interface of the ERC20 standard as defined in the EIP. - */ -interface IERC20 { - /** - * @dev Returns the amount of tokens in existence. - */ - function totalSupply() external view returns (uint256); - - /** - * @dev Returns the amount of tokens owned by `account`. - */ - function balanceOf(address account) external view returns (uint256); - - /** - * @dev Moves `amount` tokens from the caller's account to `recipient`. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transfer(address recipient, uint256 amount) external returns (bool); - - /** - * @dev Returns the remaining number of tokens that `spender` will be - * allowed to spend on behalf of `owner` through {transferFrom}. This is - * zero by default. - * - * This value changes when {approve} or {transferFrom} are called. - */ - function allowance(address owner, address spender) external view returns (uint256); - - /** - * @dev Sets `amount` as the allowance of `spender` over the caller's tokens. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * IMPORTANT: Beware that changing an allowance with this method brings the risk - * that someone may use both the old and the new allowance by unfortunate - * transaction ordering. One possible solution to mitigate this race - * condition is to first reduce the spender's allowance to 0 and set the - * desired value afterwards: - * https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * Emits an {Approval} event. - */ - function approve(address spender, uint256 amount) external returns (bool); - - /** - * @dev Moves `amount` tokens from `sender` to `recipient` using the - * allowance mechanism. `amount` is then deducted from the caller's - * allowance. - * - * Returns a boolean value indicating whether the operation succeeded. - * - * Emits a {Transfer} event. - */ - function transferFrom(address sender, address recipient, uint256 amount) external returns (bool); - - /** - * @dev Emitted when `value` tokens are moved from one account (`from`) to - * another (`to`). - * - * Note that `value` may be zero. - */ - event Transfer(address indexed from, address indexed to, uint256 value); - - /** - * @dev Emitted when the allowance of a `spender` for an `owner` is set by - * a call to {approve}. `value` is the new allowance. - */ - event Approval(address indexed owner, address indexed spender, uint256 value); -} - -/** - * @dev Collection of functions related to the address type - */ -library Address { - function isContract(address account) internal view returns (bool) { - // According to EIP-1052, 0x0 is the value returned for not-yet created accounts - // and 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470 is returned - // for accounts without code, i.e. `keccak256('')` - bytes32 codehash; - bytes32 accountHash = 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470; - // solhint-disable-next-line no-inline-assembly - assembly { codehash := extcodehash(account) } - return (codehash != accountHash && codehash != 0x0); - } - - - /** - * @dev Same as {xref-Address-functionCall-address-bytes-}[`functionCall`], but with - * `errorMessage` as a fallback revert reason when `target` reverts. - * - * _Available since v3.1._ - */ - function functionCall(address target, bytes memory data, string memory errorMessage) internal returns (bytes memory) { - return _functionCallWithValue(target, data, 0, errorMessage); - } - - function _functionCallWithValue(address target, bytes memory data, uint256 weiValue, string memory errorMessage) private returns (bytes memory) { - require(isContract(target), "Address: call to non-contract"); - - // solhint-disable-next-line avoid-low-level-calls - (bool success, bytes memory returndata) = target.call{ value: weiValue }(data); - if (success) { - return returndata; - } else { - // Look for revert reason and bubble it up if present - if (returndata.length > 0) { - // The easiest way to bubble the revert reason is using memory via assembly - - // solhint-disable-next-line no-inline-assembly - assembly { - let returndata_size := mload(returndata) - revert(add(32, returndata), returndata_size) - } - } else { - revert(errorMessage); - } - } - } -} - -library SafeERC20 { - using Address for address; - - function safeTransfer(IERC20 token, address to, uint256 value) internal { - _callOptionalReturn(token, abi.encodeWithSelector(token.transfer.selector, to, value)); - } - - function safeTransferFrom(IERC20 token, address from, address to, uint256 value) internal { - _callOptionalReturn(token, abi.encodeWithSelector(token.transferFrom.selector, from, to, value)); - } - - function _callOptionalReturn(IERC20 token, bytes memory data) private { - // We need to perform a low level call here, to bypass Solidity's return data size checking mechanism, since - // we're implementing it ourselves. We use {Address.functionCall} to perform this call, which verifies that - // the target address contains contract code and also asserts for success in the low-level call. - - bytes memory returndata = address(token).functionCall(data, "SafeERC20: low-level call failed"); - if (returndata.length > 0) { // Return data is optional - // solhint-disable-next-line max-line-length - require(abi.decode(returndata, (bool)), "SafeERC20: ERC20 operation did not succeed"); - } - } -} +import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol"; +import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; interface TokenInterface { function approve(address, uint256) external; @@ -1342,40 +1197,31 @@ contract RefinanceResolver is MakerHelpers { uint paybackRateMode; } - struct CommonData { - AaveV2Interface aaveV2; - AaveV1Interface aaveV1; - AaveV1CoreInterface aaveCore; - AaveV2DataProviderInterface aaveData; - uint length; - TokenInterface[] tokens; - CTokenInterface[] _ctokens; - } - function refinance(RefinanceData calldata data) external payable { - CommonData memory commonData; + require(data.source != data.target, "source-and-target-unequal"); - uint length = data.tokens.length; // TODO: move to common struct + uint length = data.tokens.length; require(data.borrowAmts.length == length, "length-mismatch"); require(data.withdrawAmts.length == length, "length-mismatch"); require(data.borrowRateModes.length == length, "length-mismatch"); require(data.paybackRateModes.length == length, "length-mismatch"); - AaveV2Interface aaveV2 = AaveV2Interface(getAaveV2Provider().getLendingPool()); // TODO: move to common struct - AaveV1Interface aaveV1 = AaveV1Interface(getAaveProvider().getLendingPool()); // TODO: move to common struct - AaveV1CoreInterface aaveCore = AaveV1CoreInterface(getAaveProvider().getLendingPoolCore()); // TODO: move to common struct - AaveV2DataProviderInterface aaveData = getAaveV2DataProvider(); // TODO: move to common struct + AaveV2Interface aaveV2 = AaveV2Interface(getAaveV2Provider().getLendingPool()); + AaveV1Interface aaveV1 = AaveV1Interface(getAaveProvider().getLendingPool()); + AaveV1CoreInterface aaveCore = AaveV1CoreInterface(getAaveProvider().getLendingPoolCore()); + AaveV2DataProviderInterface aaveData = getAaveV2DataProvider(); - uint[] memory depositAmts; // TODO: move to common struct - uint[] memory paybackAmts; // TODO: move to common struct + uint[] memory depositAmts; + uint[] memory paybackAmts; - TokenInterface[] memory tokens = getTokenInterfaces(length, data.tokens); // TODO: move to common struct - CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens); // TODO: move to common struct + TokenInterface[] memory tokens = getTokenInterfaces(length, data.tokens); + CTokenInterface[] memory _ctokens = getCtokenInterfaces(length, data.tokens); + + if (data.source == Protocol.Aave && data.target == Protocol.AaveV2) { + AaveV2BorrowData memory _aaveV2BorrowData; - AaveV2BorrowData memory _aaveV2BorrowData; - if (data.target == Protocol.AaveV2) { _aaveV2BorrowData.aave = aaveV2; _aaveV2BorrowData.length = length; _aaveV2BorrowData.fee = data.debtFee; @@ -1384,10 +1230,16 @@ contract RefinanceResolver is MakerHelpers { _aaveV2BorrowData.ctokens = _ctokens; _aaveV2BorrowData.amts = data.borrowAmts; _aaveV2BorrowData.rateModes = data.borrowRateModes; - } - CompoundBorrowData memory _compoundBorrowData; - if (data.target == Protocol.Compound) { + paybackAmts = _aaveV2Borrow(_aaveV2BorrowData); + _aaveV1Payback(aaveV1, aaveCore, length, tokens, paybackAmts); + depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, tokens, data.withdrawAmts); + _aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, tokens, depositAmts); + } else if (data.source == Protocol.Aave && data.target == Protocol.Compound) { + _compEnterMarkets(length, _ctokens); + + CompoundBorrowData memory _compoundBorrowData; + _compoundBorrowData.length = length; _compoundBorrowData.fee = data.debtFee; _compoundBorrowData.target = data.source; @@ -1395,12 +1247,105 @@ contract RefinanceResolver is MakerHelpers { _compoundBorrowData.tokens = tokens; _compoundBorrowData.amts = data.borrowAmts; _compoundBorrowData.rateModes = data.borrowRateModes; - } - - AaveV1BorrowData memory _aaveV1BorrowData; - AaveV1DepositData memory _aaveV1DepositData; + + paybackAmts = _compBorrow(_compoundBorrowData); + + _aaveV1Payback(aaveV1, aaveCore, length, tokens, paybackAmts); + depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, tokens, data.withdrawAmts); + _compDeposit(length, data.collateralFee, _ctokens, tokens, depositAmts); + } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Aave) { + + AaveV1BorrowData memory _aaveV1BorrowData; + AaveV2PaybackData memory _aaveV2PaybackData; + AaveV2WithdrawData memory _aaveV2WithdrawData; + + { + _aaveV1BorrowData.aave = aaveV1; + _aaveV1BorrowData.length = length; + _aaveV1BorrowData.fee = data.debtFee; + _aaveV1BorrowData.target = data.source; + _aaveV1BorrowData.tokens = tokens; + _aaveV1BorrowData.ctokens = _ctokens; + _aaveV1BorrowData.amts = data.borrowAmts; + _aaveV1BorrowData.borrowRateModes = data.borrowRateModes; + _aaveV1BorrowData.paybackRateModes = data.paybackRateModes; + + paybackAmts = _aaveV1Borrow(_aaveV1BorrowData); + } + + { + _aaveV2PaybackData.aave = aaveV2; + _aaveV2PaybackData.aaveData = aaveData; + _aaveV2PaybackData.length = length; + _aaveV2PaybackData.tokens = tokens; + _aaveV2PaybackData.amts = paybackAmts; + _aaveV2PaybackData.rateModes = data.paybackRateModes; + _aaveV2Payback(_aaveV2PaybackData); + } + + { + _aaveV2WithdrawData.aave = aaveV2; + _aaveV2WithdrawData.aaveData = aaveData; + _aaveV2WithdrawData.length = length; + _aaveV2WithdrawData.tokens = tokens; + _aaveV2WithdrawData.amts = data.withdrawAmts; + depositAmts = _aaveV2Withdraw(_aaveV2WithdrawData); + } + { + AaveV1DepositData memory _aaveV1DepositData; - if (data.target == Protocol.Aave) { + _aaveV1DepositData.aave = aaveV1; + _aaveV1DepositData.aaveCore = aaveCore; + _aaveV1DepositData.length = length; + _aaveV1DepositData.fee = data.collateralFee; + _aaveV1DepositData.tokens = tokens; + _aaveV1DepositData.amts = depositAmts; + + _aaveV1Deposit(_aaveV1DepositData); + } + } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Compound) { + _compEnterMarkets(length, _ctokens); + + { + CompoundBorrowData memory _compoundBorrowData; + + _compoundBorrowData.length = length; + _compoundBorrowData.fee = data.debtFee; + _compoundBorrowData.target = data.source; + _compoundBorrowData.ctokens = _ctokens; + _compoundBorrowData.tokens = tokens; + _compoundBorrowData.amts = data.borrowAmts; + _compoundBorrowData.rateModes = data.borrowRateModes; + + paybackAmts = _compBorrow(_compoundBorrowData); + } + + AaveV2PaybackData memory _aaveV2PaybackData; + + _aaveV2PaybackData.aave = aaveV2; + _aaveV2PaybackData.aaveData = aaveData; + _aaveV2PaybackData.length = length; + _aaveV2PaybackData.tokens = tokens; + _aaveV2PaybackData.amts = paybackAmts; + _aaveV2PaybackData.rateModes = data.paybackRateModes; + + _aaveV2Payback(_aaveV2PaybackData); + + { + AaveV2WithdrawData memory _aaveV2WithdrawData; + + _aaveV2WithdrawData.aave = aaveV2; + _aaveV2WithdrawData.aaveData = aaveData; + _aaveV2WithdrawData.length = length; + _aaveV2WithdrawData.tokens = tokens; + _aaveV2WithdrawData.amts = data.withdrawAmts; + depositAmts = _aaveV2Withdraw(_aaveV2WithdrawData); + } + _compDeposit(length, data.collateralFee, _ctokens, tokens, depositAmts); + } else if (data.source == Protocol.Compound && data.target == Protocol.Aave) { + + AaveV1BorrowData memory _aaveV1BorrowData; + _aaveV1BorrowData.aave = aaveV1; _aaveV1BorrowData.length = length; _aaveV1BorrowData.fee = data.debtFee; @@ -1410,63 +1355,37 @@ contract RefinanceResolver is MakerHelpers { _aaveV1BorrowData.amts = data.borrowAmts; _aaveV1BorrowData.borrowRateModes = data.borrowRateModes; _aaveV1BorrowData.paybackRateModes = data.paybackRateModes; - - _aaveV1DepositData.aave = aaveV1; - _aaveV1DepositData.aaveCore = aaveCore; - _aaveV1DepositData.length = length; - _aaveV1DepositData.fee = data.collateralFee; - _aaveV1DepositData.tokens = tokens; - _aaveV1DepositData.amts = depositAmts; - } - - AaveV2PaybackData memory _aaveV2PaybackData; - AaveV2WithdrawData memory _aaveV2WithdrawData; - if (data.source == Protocol.AaveV2) { - _aaveV2PaybackData.aave = aaveV2; - _aaveV2PaybackData.aaveData = aaveData; - _aaveV2PaybackData.length = length; - _aaveV2PaybackData.tokens = tokens; - _aaveV2PaybackData.amts = paybackAmts; - _aaveV2PaybackData.rateModes = data.paybackRateModes; - - _aaveV2WithdrawData.aave = aaveV2; - _aaveV2WithdrawData.aaveData = aaveData; - _aaveV2WithdrawData.length = length; - _aaveV2WithdrawData.tokens = tokens; - _aaveV2WithdrawData.amts = data.withdrawAmts; - } - - if (data.source == Protocol.Aave && data.target == Protocol.AaveV2) { - paybackAmts = _aaveV2Borrow(_aaveV2BorrowData); // TODO: pass common struct + RefinanceData calldata data and refactor in the common function - _aaveV1Payback(aaveV1, aaveCore, length, tokens, paybackAmts); - depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, tokens, data.withdrawAmts); - _aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, tokens, depositAmts); - } else if (data.source == Protocol.Aave && data.target == Protocol.Compound) { - _compEnterMarkets(length, _ctokens); - - paybackAmts = _compBorrow(_compoundBorrowData); - _aaveV1Payback(aaveV1, aaveCore, length, tokens, paybackAmts); - depositAmts = _aaveV1Withdraw(aaveV1, aaveCore, length, tokens, data.withdrawAmts); - _compDeposit(length, data.collateralFee, _ctokens, tokens, depositAmts); - } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Aave) { - paybackAmts = _aaveV1Borrow(_aaveV1BorrowData); - _aaveV2Payback(_aaveV2PaybackData); - depositAmts = _aaveV2Withdraw(_aaveV2WithdrawData); - - _aaveV1Deposit(_aaveV1DepositData); - } else if (data.source == Protocol.AaveV2 && data.target == Protocol.Compound) { - _compEnterMarkets(length, _ctokens); - - paybackAmts = _compBorrow(_compoundBorrowData); - _aaveV2Payback(_aaveV2PaybackData); - depositAmts = _aaveV2Withdraw(_aaveV2WithdrawData); - _compDeposit(length, data.collateralFee, _ctokens, tokens, depositAmts); - } else if (data.source == Protocol.Compound && data.target == Protocol.Aave) { + paybackAmts = _aaveV1Borrow(_aaveV1BorrowData); + { _compPayback(length, _ctokens, tokens, paybackAmts); depositAmts = _compWithdraw(length, _ctokens, tokens, data.withdrawAmts); - _aaveV1Deposit(_aaveV1DepositData); + } + + { + AaveV1DepositData memory _aaveV1DepositData; + + _aaveV1DepositData.aave = aaveV1; + _aaveV1DepositData.aaveCore = aaveCore; + _aaveV1DepositData.length = length; + _aaveV1DepositData.fee = data.collateralFee; + _aaveV1DepositData.tokens = tokens; + _aaveV1DepositData.amts = depositAmts; + + _aaveV1Deposit(_aaveV1DepositData); + } } else if (data.source == Protocol.Compound && data.target == Protocol.AaveV2) { + AaveV2BorrowData memory _aaveV2BorrowData; + + _aaveV2BorrowData.aave = aaveV2; + _aaveV2BorrowData.length = length; + _aaveV2BorrowData.fee = data.debtFee; + _aaveV2BorrowData.target = data.source; + _aaveV2BorrowData.tokens = tokens; + _aaveV2BorrowData.ctokens = _ctokens; + _aaveV2BorrowData.amts = data.borrowAmts; + _aaveV2BorrowData.rateModes = data.borrowRateModes; + paybackAmts = _aaveV2Borrow(_aaveV2BorrowData); _compPayback(length, _ctokens, tokens, paybackAmts); depositAmts = _compWithdraw(length, _ctokens, tokens, data.withdrawAmts); @@ -1546,5 +1465,5 @@ contract RefinanceResolver is MakerHelpers { } contract ConnectRefinance is RefinanceResolver { - string public name = "Refinance-v1.1"; + string public name = "Refinance-v1"; } From 6d31585b1b9c30cb5bb56c68143d9c04366ae508 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Tue, 12 Jan 2021 20:09:22 +0530 Subject: [PATCH 10/10] Remove all of Maker --- contracts/connectors/refinance.sol | 351 +---------------------------- 1 file changed, 1 insertion(+), 350 deletions(-) diff --git a/contracts/connectors/refinance.sol b/contracts/connectors/refinance.sol index daaf0cd..58de11f 100644 --- a/contracts/connectors/refinance.sol +++ b/contracts/connectors/refinance.sol @@ -125,59 +125,6 @@ interface AaveV2DataProviderInterface { } // End Aave v2 Helpers -// MakerDAO Helpers -interface ManagerLike { - function cdpCan(address, uint, address) external view returns (uint); - function ilks(uint) external view returns (bytes32); - function last(address) external view returns (uint); - function count(address) external view returns (uint); - function owns(uint) external view returns (address); - function urns(uint) external view returns (address); - function vat() external view returns (address); - function open(bytes32, address) external returns (uint); - function give(uint, address) external; - function frob(uint, int, int) external; - function flux(uint, address, uint) external; - function move(uint, address, uint) external; -} - -interface VatLike { - function can(address, address) external view returns (uint); - function ilks(bytes32) external view returns (uint, uint, uint, uint, uint); - function dai(address) external view returns (uint); - function urns(bytes32, address) external view returns (uint, uint); - function frob( - bytes32, - address, - address, - address, - int, - int - ) external; - function hope(address) external; - function move(address, address, uint) external; - function gem(bytes32, address) external view returns (uint); -} - -interface TokenJoinInterface { - function dec() external returns (uint); - function gem() external returns (TokenInterface); - function join(address, uint) external payable; - function exit(address, uint) external; -} - -interface DaiJoinInterface { - function vat() external returns (VatLike); - function dai() external returns (TokenInterface); - function join(address, uint) external payable; - function exit(address, uint) external; -} - -interface JugLike { - function drip(bytes32) external returns (uint); -} -// End MakerDAO Helpers - contract DSMath { uint constant WAD = 10 ** 18; @@ -198,28 +145,6 @@ contract DSMath { function wmul(uint x, uint y) internal pure returns (uint z) { z = add(mul(x, y), WAD / 2) / WAD; } - - function wdiv(uint x, uint y) internal pure returns (uint z) { - z = add(mul(x, WAD), y / 2) / y; - } - - function toRad(uint wad) internal pure returns (uint rad) { - rad = mul(wad, 10 ** 27); - } - - function toInt(uint x) internal pure returns (int y) { - y = int(x); - require(y >= 0, "int-overflow"); - } - - function convertTo18(uint _dec, uint256 _amt) internal pure returns (uint256 amt) { - amt = mul(_amt, 10 ** (18 - _dec)); - } - - function convert18ToDec(uint _dec, uint256 _amt) internal pure returns (uint256 amt) { - amt = (_amt / 10 ** (18 - _dec)); - } - } contract Helpers is DSMath { @@ -270,34 +195,6 @@ contract Helpers is DSMath { return 0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B; } - /** - * @dev Return Maker MCD DAI_Join Address. - */ - function getMcdDaiJoin() internal pure returns (address) { - return 0x9759A6Ac90977b93B58547b4A71c78317f391A28; - } - - /** - * @dev Return Maker MCD Manager Address. - */ - function getMcdManager() internal pure returns (address) { - return 0x5ef30b9986345249bc32d8928B7ee64DE9435E39; - } - - /** - * @dev Return Maker MCD DAI Address. - */ - function getMcdDai() internal pure returns (address) { - return 0x6B175474E89094C44Da98b954EedeAC495271d0F; - } - - /** - * @dev Return Maker MCD Jug Address. - */ - function getMcdJug() internal pure returns (address) { - return 0x19c0976f590D67707E62397C87829d896Dc0f1F1; - } - /** * @dev get Aave Provider */ @@ -362,90 +259,6 @@ contract Helpers is DSMath { (, , , , , , , , isCol) = aaveData.getUserReserveData(token, address(this)); } - /** - * @dev Get Vault's ilk. - */ - function getVaultData(ManagerLike managerContract, uint vault) internal view returns (bytes32 ilk, address urn) { - ilk = managerContract.ilks(vault); - urn = managerContract.urns(vault); - } - - /** - * @dev Get Vault Debt Amount. - */ - function _getVaultDebt( - address vat, - bytes32 ilk, - address urn - ) internal view returns (uint wad) { - (, uint rate,,,) = VatLike(vat).ilks(ilk); - (, uint art) = VatLike(vat).urns(ilk, urn); - uint dai = VatLike(vat).dai(urn); - - uint rad = sub(mul(art, rate), dai); - wad = rad / RAY; - - wad = mul(wad, RAY) < rad ? wad + 1 : wad; - } - - /** - * @dev Get Payback Amount. - */ - function _getWipeAmt( - address vat, - uint amt, - address urn, - bytes32 ilk - ) internal view returns (int dart) - { - (, uint rate,,,) = VatLike(vat).ilks(ilk); - (, uint art) = VatLike(vat).urns(ilk, urn); - dart = toInt(amt / rate); - dart = uint(dart) <= art ? - dart : - toInt(art); - } - - /** - * @dev Convert String to bytes32. - */ - function stringToBytes32(string memory str) internal pure returns (bytes32 result) { - require(bytes(str).length != 0, "string-empty"); - // solium-disable-next-line security/no-inline-assembly - assembly { - result := mload(add(str, 32)) - } - } - - /** - * @dev Get vault ID. If `vault` is 0, get last opened vault. - */ - function getVault(ManagerLike managerContract, uint vault) internal view returns (uint _vault) { - if (vault == 0) { - require(managerContract.count(address(this)) > 0, "no-vault-opened"); - _vault = managerContract.last(address(this)); - } else { - _vault = vault; - } - } - - /** - * @dev Get Borrow Amount [MakerDAO] - */ - function _getBorrowAmt( - address vat, - address urn, - bytes32 ilk, - uint amt - ) internal returns (int dart) - { - address jug = getMcdJug(); - uint rate = JugLike(jug).drip(ilk); - uint dai = VatLike(vat).dai(urn); - if (dai < mul(amt, RAY)) { - dart = toInt(sub(mul(amt, RAY), dai) / rate); - dart = mul(uint(dart), rate) < mul(amt, RAY) ? dart + 1 : dart; - } - } - function convertEthToWeth(bool isEth, TokenInterface token, uint amount) internal { if(isEth) token.deposit.value(amount)(); } @@ -1021,153 +834,7 @@ contract AaveV2Helpers is AaveV1Helpers { } } -contract MakerHelpers is AaveV2Helpers { - - struct MakerData { - uint _vault; - address colAddr; - address daiJoin; - TokenJoinInterface tokenJoinContract; - VatLike vatContract; - TokenInterface tokenContract; - DaiJoinInterface daiJoinContract; - } - - function _makerOpen(string memory colType) internal { - bytes32 ilk = stringToBytes32(colType); - require(InstaMapping(getMappingAddr()).gemJoinMapping(ilk) != address(0), "wrong-col-type"); - ManagerLike(getMcdManager()).open(ilk, address(this)); - } - - function _makerDepositAndBorrow( - uint vault, - uint collateralAmt, - uint debtAmt, - uint collateralFee, - uint debtFee - ) internal { - (uint collateralFeeAmt, uint _collateralAmt) = calculateFee(collateralAmt, collateralFee, false); - - (uint debtFeeAmt, uint _debtAmt) = calculateFee(debtAmt, debtFee, true); - - MakerData memory makerData; - - ManagerLike managerContract = ManagerLike(getMcdManager()); - - makerData._vault = getVault(managerContract, vault); - (bytes32 ilk, address urn) = getVaultData(managerContract, makerData._vault); - - makerData.colAddr = InstaMapping(getMappingAddr()).gemJoinMapping(ilk); - makerData.tokenJoinContract = TokenJoinInterface(makerData.colAddr); - makerData.tokenContract = makerData.tokenJoinContract.gem(); - makerData.daiJoin = getMcdDaiJoin(); - makerData.vatContract = VatLike(managerContract.vat()); - - if (address(makerData.tokenContract) == getWethAddr()) { - makerData.tokenContract.deposit.value(collateralAmt)(); - } - - transferFees(address(makerData.tokenContract), collateralFeeAmt); - - makerData.tokenContract.approve(address(makerData.colAddr), _collateralAmt); - makerData.tokenJoinContract.join(urn, _collateralAmt); - - int intAmt = toInt(convertTo18(makerData.tokenJoinContract.dec(), _collateralAmt)); - - int dart = _getBorrowAmt(address(makerData.vatContract), urn, ilk, _debtAmt); - - managerContract.frob( - makerData._vault, - intAmt, - dart - ); - - managerContract.move( - makerData._vault, - address(this), - toRad(_debtAmt) - ); - - if (makerData.vatContract.can(address(this), address(makerData.daiJoin)) == 0) { - makerData.vatContract.hope(makerData.daiJoin); - } - - DaiJoinInterface(makerData.daiJoin).exit(address(this), _debtAmt); - - transferFees(getMcdDai(), debtFeeAmt); - } - - function _makerPaybackAndWithdraw( - uint vault, - uint withdrawAmt, - uint paybackAmt - ) internal returns (uint, uint) { - ManagerLike managerContract = ManagerLike(getMcdManager()); - MakerData memory makerData; - - makerData._vault = getVault(managerContract, vault); - (bytes32 ilk, address urn) = getVaultData(managerContract, makerData._vault); - - makerData.colAddr = InstaMapping(getMappingAddr()).gemJoinMapping(ilk); - makerData.tokenJoinContract = TokenJoinInterface(makerData.colAddr); - makerData.tokenContract = makerData.tokenJoinContract.gem(); - makerData.daiJoin = getMcdDaiJoin(); - makerData.vatContract = VatLike(managerContract.vat()); - - uint _withdrawAmt18; - if (withdrawAmt == uint(-1)) { - (_withdrawAmt18,) = makerData.vatContract.urns(ilk, urn); - withdrawAmt = convert18ToDec(makerData.tokenJoinContract.dec(), _withdrawAmt18); - } else { - _withdrawAmt18 = convertTo18(makerData.tokenJoinContract.dec(), withdrawAmt); - } - - int _paybackDart; - { - (, uint art) = makerData.vatContract.urns(ilk, urn); - uint _maxDebt = _getVaultDebt(address(makerData.vatContract), ilk, urn); - _paybackDart = paybackAmt == uint(-1) ? - -int(art) : - _getWipeAmt( - address(makerData.vatContract), - makerData.vatContract.dai(urn), - urn, - ilk - ); - - paybackAmt = paybackAmt == uint(-1) ? _maxDebt : paybackAmt; - - require(_maxDebt >= paybackAmt, "paying-excess-debt"); - } - - makerData.daiJoinContract = DaiJoinInterface(makerData.daiJoin); - makerData.daiJoinContract.dai().approve(makerData.daiJoin, paybackAmt); - makerData.daiJoinContract.join(urn, paybackAmt); - - managerContract.frob( - makerData._vault, - -toInt(_withdrawAmt18), - _paybackDart - ); - - managerContract.flux( - makerData._vault, - address(this), - _withdrawAmt18 - ); - - if (address(makerData.tokenContract) == getWethAddr()) { - makerData.tokenJoinContract.exit(address(this), _withdrawAmt18); - makerData.tokenContract.withdraw(_withdrawAmt18); - } else { - makerData.tokenJoinContract.exit(address(this), _withdrawAmt18); - } - - return (withdrawAmt, paybackAmt); - } -} - -contract RefinanceResolver is MakerHelpers { +contract RefinanceResolver is AaveV2Helpers { struct RefinanceData { Protocol source; @@ -1181,22 +848,6 @@ contract RefinanceResolver is MakerHelpers { uint[] paybackRateModes; } - struct RefinanceMakerData { - uint fromVaultId; - uint toVaultId; - Protocol source; - Protocol target; - uint collateralFee; - uint debtFee; - bool isFrom; - string colType; - address token; - uint debt; - uint collateral; - uint borrowRateMode; - uint paybackRateMode; - } - function refinance(RefinanceData calldata data) external payable { require(data.source != data.target, "source-and-target-unequal");