Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor repayMode in repayAdapter

Browse Source
This commit is contained in:
Gerardo Nardelli 2020-11-19 16:39:00 -03:00
parent 9478381992
commit 8a303c6195
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
contracts/adapters/UniswapRepayAdapter.sol
View File

@ -16,11 +16,18 @@ import {ReserveLogic} from '../libraries/logic/ReserveLogic.sol';
**/ **/
contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver { contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
/*
* STANDARD: Use the provided amounts parameters
* ALL_DEBT: Repay the whole debt balance
* ALL_COLLATERAL: Use all the collateral balance to repay the max amount of debt
*/
enum RepayMode {STANDARD, ALL_DEBT, ALL_COLLATERAL}
struct RepayParams { struct RepayParams {
address assetToSwapTo; address assetToSwapTo;
uint256 repayAmount; uint256 repayAmount;
uint256 rateMode; uint256 rateMode;
bool repayAllDebt; RepayMode repayMode;
PermitSignature permitSignature; PermitSignature permitSignature;
} }
@ -45,7 +52,7 @@ contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
* address Address of the reserve to be swapped to and repay * address Address of the reserve to be swapped to and repay
* uint256 repayAmount Amount of debt to be repaid * uint256 repayAmount Amount of debt to be repaid
* uint256 rateMode Rate modes of the debt to be repaid * uint256 rateMode Rate modes of the debt to be repaid
* bool repayAllDebt Flag indicating if all the debt should be repaid * RepayMode repayMode Enum indicating the repaid mode
* uint256 permitAmount Amount for the permit signature * uint256 permitAmount Amount for the permit signature
* uint256 deadline Deadline for the permit signature * uint256 deadline Deadline for the permit signature
* uint8 v V param for the permit signature * uint8 v V param for the permit signature
@ -70,7 +77,7 @@ contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
decodedParams.repayAmount, decodedParams.repayAmount,
decodedParams.rateMode, decodedParams.rateMode,
initiator, initiator,
decodedParams.repayAllDebt, decodedParams.repayMode,
premiums[0], premiums[0],
decodedParams.permitSignature decodedParams.permitSignature
); );
@ -97,13 +104,13 @@ contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
uint256 repayAmount, uint256 repayAmount,
uint256 rateMode, uint256 rateMode,
address initiator, address initiator,
bool repayAllDebt, RepayMode repayMode,
uint256 premium, uint256 premium,
PermitSignature memory permitSignature PermitSignature memory permitSignature
) internal { ) internal {
uint256 debtRepayAmount; uint256 debtRepayAmount;
if (repayAllDebt) { if (repayMode == RepayMode.ALL_DEBT) {
ReserveLogic.ReserveData memory reserveDebtData = _getReserveData(assetTo); ReserveLogic.ReserveData memory reserveDebtData = _getReserveData(assetTo);
address debtToken = ReserveLogic.InterestRateMode(rateMode) == ReserveLogic.InterestRateMode.STABLE address debtToken = ReserveLogic.InterestRateMode(rateMode) == ReserveLogic.InterestRateMode.STABLE
@ -137,7 +144,7 @@ contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
* address Address of the reserve to be swapped to and repay * address Address of the reserve to be swapped to and repay
* uint256 repayAmount Amount of debt to be repaid * uint256 repayAmount Amount of debt to be repaid
* uint256 rateMode Rate modes of the debt to be repaid * uint256 rateMode Rate modes of the debt to be repaid
* bool repayAllDebt Flag indicating if all the debt should be repaid * RepayMode repayMode Enum indicating the repaid mode
* uint256 permitAmount Amount for the permit signature * uint256 permitAmount Amount for the permit signature
* uint256 deadline Deadline for the permit signature * uint256 deadline Deadline for the permit signature
* uint8 v V param for the permit signature * uint8 v V param for the permit signature
@ -150,19 +157,19 @@ contract UniswapRepayAdapter is BaseUniswapAdapter, IFlashLoanReceiver {
address assetToSwapTo, address assetToSwapTo,
uint256 repayAmount, uint256 repayAmount,
uint256 rateMode, uint256 rateMode,
bool repayAllDebt, RepayMode repayMode,
uint256 permitAmount, uint256 permitAmount,
uint256 deadline, uint256 deadline,
uint8 v, uint8 v,
bytes32 r, bytes32 r,
bytes32 s bytes32 s
) = abi.decode(params, (address, uint256, uint256, bool, uint256, uint256, uint8, bytes32, bytes32)); ) = abi.decode(params, (address, uint256, uint256, RepayMode, uint256, uint256, uint8, bytes32, bytes32));
return RepayParams( return RepayParams(
assetToSwapTo, assetToSwapTo,
repayAmount, repayAmount,
rateMode, rateMode,
repayAllDebt, repayMode,
PermitSignature( PermitSignature(
permitAmount, permitAmount,
deadline, deadline,