Modify structure

contracts/connectors/refinance.sol

@@ -542,6 +542,13 @@ contract Helpers is DSMath {
 
 contract CompoundHelpers is Helpers {
 
+    function _compEnterMarketOne(address token) internal {
+        ComptrollerInterface troller = ComptrollerInterface(getComptrollerAddress());
+        address[] memory cTokens = new address[](1);
+        cTokens[0] = InstaMapping(getMappingAddr()).cTokenMapping(token);
+        troller.enterMarkets(cTokens);
+    }
+
     function _compEnterMarkets(uint length, address[] memory tokens) internal {
         ComptrollerInterface troller = ComptrollerInterface(getComptrollerAddress());
         address[] memory cTokens = new address[](length);
@@ -552,6 +559,19 @@ contract CompoundHelpers is Helpers {
         troller.enterMarkets(cTokens);
     }
 
+    function _compBorrowOne(uint fee, address token, uint amt) internal {
+        address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token);
+        uint feeAmt = wmul(amt, fee);
+        uint _amt = add(amt, feeAmt);
+
+        require(CTokenInterface(cToken).borrow(_amt) == 0, "borrow-failed-collateral?");
+        if (token == getEthAddr()) {
+            feeCollector.transfer(feeAmt);
+        } else {
+            TokenInterface(token).transfer(feeCollector, feeAmt);
+        }
+    }
+
     function _compBorrow(
         uint length,
         uint fee,
@@ -560,21 +580,28 @@ contract CompoundHelpers is Helpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                address cToken = InstaMapping(getMappingAddr()).cTokenMapping(tokens[i]);
+                _compBorrowOne(fee, tokens[i], amts[i]);
-
-                uint feeAmt = wmul(amts[i], fee);
-                uint amt = add(amts[i], feeAmt);
-
-                require(CTokenInterface(cToken).borrow(amt) == 0, "borrow-failed-collateral?");
-                if (tokens[i] == getEthAddr()) {
-                    feeCollector.transfer(feeAmt);
-                } else {
-                    TokenInterface(tokens[i]).transfer(feeCollector, feeAmt);
-                }
             }
         }
     }
 
+    function _compDepositOne(uint fee, address token, uint amt) internal {
+        address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token);
+
+        uint feeAmt = wmul(amt, fee);
+        uint _amt = sub(amt, feeAmt);
+
+        if (token != getEthAddr()) {
+            TokenInterface tokenContract = TokenInterface(token);
+            tokenContract.approve(cToken, _amt);
+            require(CTokenInterface(cToken).mint(_amt) == 0, "deposit-failed");
+            tokenContract.transfer(feeCollector, feeAmt);
+        } else {
+            CETHInterface(cToken).mint.value(_amt)();
+            feeCollector.transfer(feeAmt);
+        }
+    }
+
     function _compDeposit(
         uint length,
         uint fee,
@@ -583,24 +610,20 @@ contract CompoundHelpers is Helpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                address cToken = InstaMapping(getMappingAddr()).cTokenMapping(tokens[i]);
+                _compDepositOne(fee, tokens[i], amts[i]);
-
-                uint feeAmt = wmul(amts[i], fee);
-                uint amt = sub(amts[i], feeAmt);
-
-                if (tokens[i] != getEthAddr()) {
-                    TokenInterface tokenContract = TokenInterface(tokens[i]);
-                    tokenContract.approve(cToken, amt);
-                    require(CTokenInterface(cToken).mint(amt) == 0, "deposit-failed");
-                    tokenContract.transfer(feeCollector, feeAmt);
-                } else {
-                    CETHInterface(cToken).mint.value(amt)();
-                    feeCollector.transfer(feeAmt);
-                }
             }
         }
     }
 
+    function _compWithdrawOne(address token, uint amt) internal {
+        address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token);
+        CTokenInterface cTokenContract = CTokenInterface(cToken);
+        if (amt == uint(-1)) {
+            amt = cTokenContract.balanceOf(address(this));
+        }
+        require(cTokenContract.redeemUnderlying(amt) == 0, "withdraw-failed");
+    }
+
     function _compWithdraw(
         uint length,
         address[] memory tokens,
@@ -608,17 +631,27 @@ contract CompoundHelpers is Helpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                address cToken = InstaMapping(getMappingAddr()).cTokenMapping(tokens[i]);
+                _compWithdrawOne(tokens[i], amts[i]);
-                CTokenInterface cTokenContract = CTokenInterface(cToken);
-                uint _amt = amts[i];
-                if (_amt == uint(-1)) {
-                    _amt = cTokenContract.balanceOf(address(this));
-                }
-                require(cTokenContract.redeemUnderlying(amts[i]) == 0, "withdraw-failed");
             }
         }
     }
 
+    function _compPaybackOne(address token, uint amt) internal {
+        address cToken = InstaMapping(getMappingAddr()).cTokenMapping(token);
+        CTokenInterface cTokenContract = CTokenInterface(cToken);
+
+        if (amt == uint(-1)) {
+            amt = cTokenContract.borrowBalanceCurrent(address(this));
+        }
+        if (token != getEthAddr()) {
+            TokenInterface tokenContract = TokenInterface(token);
+            tokenContract.approve(cToken, amt);
+            require(cTokenContract.repayBorrow(amt) == 0, "repay-failed.");
+        } else {
+            CETHInterface(cToken).repayBorrow.value(amt)();
+        }
+    }
+
     function _compPayback(
         uint length,
         address[] memory tokens,
@@ -626,20 +659,7 @@ contract CompoundHelpers is Helpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                address cToken = InstaMapping(getMappingAddr()).cTokenMapping(tokens[i]);
+                _compPaybackOne(tokens[i], amts[i]);
-                CTokenInterface cTokenContract = CTokenInterface(cToken);
-
-                uint _amt = amts[i];
-                if (_amt == uint(-1)) {
-                    _amt = cTokenContract.borrowBalanceCurrent(address(this));
-                }
-                if (tokens[i] != getEthAddr()) {
-                    TokenInterface tokenContract = TokenInterface(tokens[i]);
-                    tokenContract.approve(cToken, _amt);
-                    require(cTokenContract.repayBorrow(_amt) == 0, "repay-failed.");
-                } else {
-                    CETHInterface(cToken).repayBorrow.value(_amt)();
-                }
             }
         }
     }
@@ -647,6 +667,24 @@ contract CompoundHelpers is Helpers {
 
 contract AaveV1Helpers is CompoundHelpers {
 
+    function _aaveV1BorrowOne(
+        AaveV1Interface aave,
+        uint fee,
+        address token,
+        uint amt,
+        uint rateMode
+    ) internal {
+        uint feeAmt = wmul(amt, fee);
+        uint _amt = add(amt, feeAmt);
+
+        aave.borrow(token, _amt, rateMode, getReferralCode());
+        if (token == getEthAddr()) {
+            feeCollector.transfer(feeAmt);
+        } else {
+            TokenInterface(token).transfer(feeCollector, feeAmt);
+        }
+    }
+
     function _aaveV1Borrow(
         AaveV1Interface aave,
         uint length,
@@ -657,19 +695,37 @@ contract AaveV1Helpers is CompoundHelpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                uint feeAmt = wmul(amts[i], fee);
+                _aaveV1BorrowOne(aave, fee, tokens[i], amts[i], rateModes[i]);
-                uint amt = add(amts[i], feeAmt);
-
-                aave.borrow(tokens[i], amt, rateModes[i], getReferralCode());
-                if (tokens[i] == getEthAddr()) {
-                    feeCollector.transfer(feeAmt);
-                } else {
-                    TokenInterface(tokens[i]).transfer(feeCollector, feeAmt);
-                }
             }
         }
     }
 
+    function _aaveV1DepositOne(
+        AaveV1Interface aave,
+        uint fee,
+        address token,
+        uint amt
+    ) internal {
+        uint ethAmt;
+        uint feeAmt = wmul(amt, fee);
+        uint _amt = sub(amt, feeAmt);
+
+        bool isEth = token == getEthAddr();
+        if (isEth) {
+            ethAmt = _amt;
+            feeCollector.transfer(feeAmt);
+        } else {
+            TokenInterface tokenContract = TokenInterface(token);
+            tokenContract.approve(address(aave), _amt);
+            tokenContract.transfer(feeCollector, feeAmt);
+        }
+
+        aave.deposit.value(ethAmt)(token, _amt, getReferralCode());
+
+        if (!getIsColl(aave, token))
+            aave.setUserUseReserveAsCollateral(token, true);
+    }
+
     function _aaveV1Deposit(
         AaveV1Interface aave,
         uint length,
@@ -679,28 +735,20 @@ contract AaveV1Helpers is CompoundHelpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                uint ethAmt;
+                _aaveV1DepositOne(aave, fee, tokens[i], amts[i]);
-                uint feeAmt = wmul(amts[i], fee);
-                uint amt = sub(amts[i], feeAmt);
-
-                bool isEth = tokens[i] == getEthAddr();
-                if (isEth) {
-                    ethAmt = amt;
-                    feeCollector.transfer(feeAmt);
-                } else {
-                    TokenInterface tokenContract = TokenInterface(tokens[i]);
-                    tokenContract.approve(address(aave), amt);
-                    tokenContract.transfer(feeCollector, feeAmt);
-                }
-
-                aave.deposit.value(ethAmt)(tokens[i], amt, getReferralCode());
-
-                if (!getIsColl(aave, tokens[i]))
-                    aave.setUserUseReserveAsCollateral(tokens[i], true);
             }
         }
     }
 
+    function _aaveV1WithdrawOne(
+        AaveV1CoreInterface aaveCore,
+        address token,
+        uint amt
+    ) internal {
+        ATokenV1Interface atoken = ATokenV1Interface(aaveCore.getReserveATokenAddress(token));
+        atoken.redeem(amt);
+    }
+
     function _aaveV1Withdraw(
         AaveV1CoreInterface aaveCore,
         uint length,
@@ -709,12 +757,28 @@ contract AaveV1Helpers is CompoundHelpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                ATokenV1Interface atoken = ATokenV1Interface(aaveCore.getReserveATokenAddress(tokens[i]));
+                _aaveV1WithdrawOne(aaveCore, tokens[i], amts[i]);
-                atoken.redeem(amts[i]);
             }
         }
     }
 
+    function _aaveV1PaybackOne(
+        AaveV1Interface aave,
+        address token,
+        uint amt
+    ) internal {
+        uint ethAmt;
+        bool isEth = token == getEthAddr();
+        if (isEth) {
+            ethAmt = amt;
+        } else {
+            TokenInterface tokenContract = TokenInterface(token);
+            tokenContract.approve(address(aave), amt);
+        }
+
+        aave.repay.value(ethAmt)(token, amt, payable(address(this)));
+    }
+
     function _aaveV1Payback(
         AaveV1Interface aave,
         uint length,
@@ -723,16 +787,7 @@ contract AaveV1Helpers is CompoundHelpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                uint ethAmt;
+                _aaveV1PaybackOne(aave, tokens[i], amts[i]);
-                bool isEth = tokens[i] == getEthAddr();
-                if (isEth) {
-                    ethAmt = amts[i];
-                } else {
-                    TokenInterface tokenContract = TokenInterface(tokens[i]);
-                    tokenContract.approve(address(aave), amts[i]);
-                }
-
-                aave.repay.value(ethAmt)(tokens[i], amts[i], payable(address(this)));
             }
         }
     }
@@ -740,6 +795,29 @@ contract AaveV1Helpers is CompoundHelpers {
 
 contract AaveV2Helpers is AaveV1Helpers {
 
+    function _aaveV2BorrowOne(
+        AaveV2Interface aave,
+        uint fee,
+        address token,
+        uint amt,
+        uint rateMode
+    ) internal {
+        uint feeAmt = wmul(amt, fee);
+        uint _amt = add(amt, feeAmt);
+
+        bool isEth = token == getEthAddr();
+        address _token = isEth ? getWethAddr() : token;
+
+        aave.borrow(_token, _amt, rateMode, getReferralCode(), address(this));
+        convertWethToEth(isEth, TokenInterface(_token), amt);
+
+        if (isEth) {
+            feeCollector.transfer(feeAmt);
+        } else {
+            TokenInterface(_token).transfer(feeCollector, feeAmt);
+        }
+    }
+
     function _aaveV2Borrow(
         AaveV2Interface aave,
         uint length,
@@ -750,24 +828,42 @@ contract AaveV2Helpers is AaveV1Helpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                uint feeAmt = wmul(amts[i], fee);
+                _aaveV2BorrowOne(aave, fee, tokens[i], amts[i], rateModes[i]);
-                uint amt = add(amts[i], feeAmt);
-
-                bool isEth = tokens[i] == getEthAddr();
-                address _token = isEth ? getWethAddr() : tokens[i];
-
-                aave.borrow(_token, amt, rateModes[i], getReferralCode(), address(this));
-                convertWethToEth(isEth, TokenInterface(_token), amts[i]);
-
-                if (isEth) {
-                    feeCollector.transfer(feeAmt);
-                } else {
-                    TokenInterface(_token).transfer(feeCollector, feeAmt);
-                }
             }
         }
     }
 
+    function _aaveV2DepositOne(
+        AaveV2Interface aave,
+        AaveV2DataProviderInterface aaveData,
+        uint fee,
+        address token,
+        uint amt
+    ) internal {
+        uint feeAmt = wmul(amt, fee);
+        uint _amt = sub(amt, feeAmt);
+
+        bool isEth = token == getEthAddr();
+        address _token = isEth ? getWethAddr() : token;
+        TokenInterface tokenContract = TokenInterface(_token);
+
+        if (isEth) {
+            feeCollector.transfer(feeAmt);
+        } else {
+            tokenContract.transfer(feeCollector, feeAmt);
+        }
+
+        convertEthToWeth(isEth, tokenContract, _amt);
+
+        tokenContract.approve(address(aave), _amt);
+
+        aave.deposit(_token, _amt, address(this), getReferralCode());
+
+        if (!getIsCollV2(aaveData, _token)) {
+            aave.setUserUseReserveAsCollateral(_token, true);
+        }
+    }
+
     function _aaveV2Deposit(
         AaveV2Interface aave,
         AaveV2DataProviderInterface aaveData,
@@ -778,32 +874,28 @@ contract AaveV2Helpers is AaveV1Helpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                uint feeAmt = wmul(amts[i], fee);
+                _aaveV2DepositOne(aave, aaveData, fee, tokens[i], amts[i]);
-                uint amt = sub(amts[i], feeAmt);
-
-                bool isEth = tokens[i] == getEthAddr();
-                address _token = isEth ? getWethAddr() : tokens[i];
-                TokenInterface tokenContract = TokenInterface(_token);
-
-                if (isEth) {
-                    feeCollector.transfer(feeAmt);
-                } else {
-                    tokenContract.transfer(feeCollector, feeAmt);
-                }
-
-                convertEthToWeth(isEth, tokenContract, amt);
-
-                tokenContract.approve(address(aave), amt);
-
-                aave.deposit(_token, amt, address(this), getReferralCode());
-
-                if (!getIsCollV2(aaveData, _token)) {
-                    aave.setUserUseReserveAsCollateral(_token, true);
-                }
             }
         }
     }
 
+    function _aaveV2WithdrawOne(
+        AaveV2Interface aave,
+        AaveV2DataProviderInterface aaveData,
+        address token,
+        uint amt
+    ) internal {
+        bool isEth = token == getEthAddr();
+        address _token = isEth ? getWethAddr() : token;
+        TokenInterface tokenContract = TokenInterface(_token);
+
+        aave.withdraw(_token, amt, address(this));
+
+        uint _amt = amt == uint(-1) ? getWithdrawBalanceV2(aaveData, _token) : amt;
+
+        convertWethToEth(isEth, tokenContract, _amt);
+    }
+
     function _aaveV2Withdraw(
         AaveV2Interface aave,
         AaveV2DataProviderInterface aaveData,
@@ -813,19 +905,29 @@ contract AaveV2Helpers is AaveV1Helpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                bool isEth = tokens[i] == getEthAddr();
+                _aaveV2WithdrawOne(aave, aaveData, tokens[i], amts[i]);
-                address _token = isEth ? getWethAddr() : tokens[i];
-                TokenInterface tokenContract = TokenInterface(_token);
-
-                aave.withdraw(_token, amts[i], address(this));
-
-                uint _amt = amts[i] == uint(-1) ? getWithdrawBalanceV2(aaveData, _token) : amts[i];
-
-                convertWethToEth(isEth, tokenContract, _amt);
             }
         }
     }
 
+    function _aaveV2PaybackOne(
+        AaveV2Interface aave,
+        AaveV2DataProviderInterface aaveData,
+        address token,
+        uint amt,
+        uint rateMode
+    ) internal {
+        bool isEth = token == getEthAddr();
+        address _token = isEth ? getWethAddr() : token;
+        TokenInterface tokenContract = TokenInterface(_token);
+
+        uint _amt = amt == uint(-1) ? getPaybackBalanceV2(aaveData, _token, rateMode) : amt;
+
+        convertEthToWeth(isEth, tokenContract, amt);
+
+        aave.repay(_token, _amt, rateMode, address(this));
+    }
+
     function _aaveV2Payback(
         AaveV2Interface aave,
         AaveV2DataProviderInterface aaveData,
@@ -836,15 +938,7 @@ contract AaveV2Helpers is AaveV1Helpers {
     ) internal {
         for (uint i = 0; i < length; i++) {
             if (amts[i] > 0) {
-                bool isEth = tokens[i] == getEthAddr();
+                _aaveV2PaybackOne(aave, aaveData, tokens[i], amts[i], rateModes[i]);
-                address _token = isEth ? getWethAddr() : tokens[i];
-                TokenInterface tokenContract = TokenInterface(_token);
-
-                uint _amt = amts[i] == uint(-1) ? getPaybackBalanceV2(aaveData, _token, rateModes[i]) : amts[i];
-
-                convertEthToWeth(isEth, tokenContract, amts[i]);
-
-                aave.repay(_token, _amt, rateModes[i], address(this));
             }
         }
     }
@@ -899,12 +993,12 @@ contract MakerHelpers is AaveV2Helpers {
 
     function _makerDeposit(uint vault, uint amt, uint fee) internal {
         uint feeAmt = wmul(amt, fee);
-        uint _amt = sub(amt, feeAmt);
+        amt = sub(amt, feeAmt);
 
         ManagerLike managerContract = ManagerLike(getMcdManager());
 
-        uint _vault = getVault(managerContract, vault);
+        vault = getVault(managerContract, vault);
-        (bytes32 ilk, address urn) = getVaultData(managerContract, _vault);
+        (bytes32 ilk, address urn) = getVaultData(managerContract, vault);
 
         address colAddr = InstaMapping(getMappingAddr()).gemJoinMapping(ilk);
         TokenJoinInterface tokenJoinContract = TokenJoinInterface(colAddr);
@@ -912,20 +1006,20 @@ contract MakerHelpers is AaveV2Helpers {
 
         if (address(tokenContract) == getWethAddr()) {
             feeCollector.transfer(feeAmt);
-            tokenContract.deposit.value(_amt)();
+            tokenContract.deposit.value(amt)();
         } else {
             tokenContract.transfer(feeCollector, feeAmt);
         }
 
-        tokenContract.approve(address(colAddr), _amt);
+        tokenContract.approve(address(colAddr), amt);
-        tokenJoinContract.join(address(this), _amt);
+        tokenJoinContract.join(address(this), amt);
 
         VatLike(managerContract.vat()).frob(
             ilk,
             urn,
             address(this),
             address(this),
-            toInt(convertTo18(tokenJoinContract.dec(), _amt)),
+            toInt(convertTo18(tokenJoinContract.dec(), amt)),
             0
         );
     }
@@ -1098,26 +1192,21 @@ contract RefinanceResolver is MakerHelpers {
         AaveV1CoreInterface aaveCore = AaveV1CoreInterface(getAaveProvider().getLendingPoolCore());
         AaveV2DataProviderInterface aaveData = getAaveV2DataProvider();
 
-        address[1] memory daiArray = [getMcdDai()];
+        address dai = getMcdDai();
-        address[1] memory tokens = [data.token];
-        uint[1] memory debtAmts = [data.debt];
-        uint[1] memory collateralAmts = [data.collateral];
 
         if (data.isFrom) {
             _makerPayback(data.fromVaultId, data.debt);
             _makerWithdraw(data.fromVaultId, data.collateral);
 
-            uint[1] memory borrowRateModes = [data.borrowRateMode];
-
             if (data.target == 1) {
-                _aaveV1Deposit(aaveV1, 1, data.collateralFee, tokens, collateralAmts);
+                _aaveV1DepositOne(aaveV1, data.collateralFee, data.token, data.collateral);
-                _aaveV1Borrow(aaveV1, 1, data.debtFee, daiArray, debtAmts, borrowRateModes);
+                _aaveV1BorrowOne(aaveV1, data.debtFee, dai, data.debt, data.borrowRateMode);
             } else if (data.target == 2) {
-                _aaveV2Deposit(aaveV2, aaveData, 1, data.collateralFee, tokens, collateralAmts);
+                _aaveV2DepositOne(aaveV2, aaveData, data.collateralFee, data.token, data.collateral);
-                _aaveV2Borrow(aaveV2, 1, data.debtFee, daiArray, debtAmts, borrowRateModes);
+                _aaveV2BorrowOne(aaveV2, data.debtFee, dai, data.debt, data.borrowRateMode);
             } else if (data.target == 3) {
-                _compDeposit(1, data.collateralFee, tokens, collateralAmts);
+                _compDepositOne(data.collateralFee, data.token, data.collateral);
-                _compBorrow(1, data.debtFee, daiArray, debtAmts);
+                _compBorrowOne(data.debtFee, dai, data.debt);
             } else {
                 revert("invalid-option");
             }
@@ -1126,17 +1215,15 @@ contract RefinanceResolver is MakerHelpers {
                 _makerOpen(data.colType);
             }
 
-            uint[1] memory paybackRateModes = [data.paybackRateMode];
-
             if (data.source == 1) {
-                _aaveV1Payback(aaveV1, 1, daiArray, debtAmts);
+                _aaveV1PaybackOne(aaveV1, dai, data.debt);
-                _aaveV1Withdraw(aaveCore, 1, tokens, collateralAmts);
+                _aaveV1WithdrawOne(aaveCore, data.token, data.collateral);
             } else if (data.source == 2) {
-                _aaveV2Payback(aaveV2, aaveData, 1, daiArray, debtAmts, paybackRateModes);
+                _aaveV2PaybackOne(aaveV2, aaveData, dai, data.debt, data.paybackRateMode);
-                _aaveV2Withdraw(aaveV2, aaveData, 1, tokens, collateralAmts);
+                _aaveV2WithdrawOne(aaveV2, aaveData, data.token, data.collateral);
             } else if (data.source == 3) {
-                _compPayback(1, daiArray, debtAmts);
+                _compPaybackOne(dai, data.debt);
-                _compWithdraw(1, tokens, collateralAmts);
+                _compWithdrawOne(data.token, data.collateral);
             } else {
                 revert("invalid-option");
             }