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

Fix aave payback

Browse Source
This commit is contained in:
Mubaris NK 2021-01-09 15:43:46 +05:30
parent 6554dfabfd
commit 1a4525ace2
No known key found for this signature in database
GPG Key ID: 1F132294E8700320
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/connectors/refinance.sol
View File

@ -752,6 +752,7 @@ contract AaveV1Helpers is CompoundHelpers {
function _aaveV1PaybackOne( function _aaveV1PaybackOne(
AaveV1Interface aave, AaveV1Interface aave,
AaveV1CoreInterface aaveCore,
address token, address token,
uint amt uint amt
) internal returns (uint) { ) internal returns (uint) {
@ -768,7 +769,7 @@ contract AaveV1Helpers is CompoundHelpers {
ethAmt = amt; ethAmt = amt;
} else { } else {
TokenInterface tokenContract = TokenInterface(token); TokenInterface tokenContract = TokenInterface(token);
tokenContract.approve(address(aave), amt); tokenContract.approve(address(aaveCore), amt);
} }
aave.repay.value(ethAmt)(token, amt, payable(address(this))); aave.repay.value(ethAmt)(token, amt, payable(address(this)));
@ -778,12 +779,13 @@ contract AaveV1Helpers is CompoundHelpers {
function _aaveV1Payback( function _aaveV1Payback(
AaveV1Interface aave, AaveV1Interface aave,
AaveV1CoreInterface aaveCore,
uint length, uint length,
address[] memory tokens, address[] memory tokens,
uint[] memory amts uint[] memory amts
) internal { ) internal {
for (uint i = 0; i < length; i++) { for (uint i = 0; i < length; i++) {
_aaveV1PaybackOne(aave, tokens[i], amts[i]); _aaveV1PaybackOne(aave, aaveCore, tokens[i], amts[i]);
} }
} }
} }
@ -1153,7 +1155,7 @@ contract RefinanceResolver is MakerHelpers {
data.borrowAmts, data.borrowAmts,
data.borrowRateModes data.borrowRateModes
); );
_aaveV1Payback(aaveV1, 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);
_aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, data.tokens, depositAmts); _aaveV2Deposit(aaveV2, aaveData, length, data.collateralFee, data.tokens, depositAmts);
} else if (data.source == 1 && data.target == 3) { } else if (data.source == 1 && data.target == 3) {
@ -1168,7 +1170,7 @@ contract RefinanceResolver is MakerHelpers {
data.borrowRateModes data.borrowRateModes
); );
_aaveV1Payback(aaveV1, 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, data.tokens, depositAmts);
} else if (data.source == 2 && data.target == 1) { } else if (data.source == 2 && data.target == 1) {
@ -1274,7 +1276,7 @@ contract RefinanceResolver is MakerHelpers {
} }
if (data.source == 1) { if (data.source == 1) {
borrowAmt = _aaveV1PaybackOne(aaveV1, dai, data.debt); borrowAmt = _aaveV1PaybackOne(aaveV1, aaveCore, dai, data.debt);
depositAmt = _aaveV1WithdrawOne(aaveV1, aaveCore, data.token, data.collateral); depositAmt = _aaveV1WithdrawOne(aaveV1, aaveCore, data.token, data.collateral);
} else if (data.source == 2) { } else if (data.source == 2) {
borrowAmt = _aaveV2PaybackOne(aaveV2, aaveData, dai, data.debt, data.paybackRateMode); borrowAmt = _aaveV2PaybackOne(aaveV2, aaveData, dai, data.debt, data.paybackRateMode);