added paybackWithAToken func + minor fix

contracts/mainnet/connectors/aave/v3/helpers.sol

@@ -2,31 +2,36 @@ pragma solidity ^0.7.0;
 
 import { DSMath } from "../../../common/math.sol";
 import { Basic } from "../../../common/basic.sol";
-import { AaveLendingPoolProviderInterface, AaveDataProviderInterface } from "./interface.sol";
+import { AavePoolProviderInterface, AaveDataProviderInterface } from "./interface.sol";
 
 abstract contract Helpers is DSMath, Basic {
+	/**
+	 * @dev Aave Pool Provider
+	 */
+	AavePoolProviderInterface internal constant aaveProvider =
+		AavePoolProviderInterface(0xA55125A90d75a95EC00130E8E8C197dB5641Eb19); // rinkeby address
 
 	/**
-     * @dev Aave Lending Pool Provider
+	 * @dev Aave Pool Data Provider
 	 */
-    AaveLendingPoolProviderInterface constant internal aaveProvider = AaveLendingPoolProviderInterface(0xB53C1a33016B2DC2fF3653530bfF1848a515c8c5);
+	AaveDataProviderInterface internal constant aaveData =
-
+		AaveDataProviderInterface(0x256bBbeDbA70a1240a1EB64210abB1b063267408); // rinkeby address
-    /**
-     * @dev Aave Protocol Data Provider
-    */
-    AaveDataProviderInterface constant internal aaveData = AaveDataProviderInterface(0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d);
 
 	/**
 	 * @dev Aave Referral Code
 	 */
-    uint16 constant internal referralCode = 3228;
+	uint16 internal constant referralCode = 3228;
 
 	/**
 	 * @dev Checks if collateral is enabled for an asset
 	 * @param token token address of the asset.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
 	 */
+
 	function getIsColl(address token) internal view returns (bool isCol) {
-        (, , , , , , , , isCol) = aaveData.getUserReserveData(token, address(this));
+		(, , , , , , , , isCol) = aaveData.getUserReserveData(
+			token,
+			address(this)
+		);
 	}
 
 	/**
@@ -34,8 +39,13 @@ abstract contract Helpers is DSMath, Basic {
 	 * @param token token address of the debt.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
 	 * @param rateMode Borrow rate mode (Stable = 1, Variable = 2)
 	 */
-    function getPaybackBalance(address token, uint rateMode) internal view returns (uint) {
+	function getPaybackBalance(address token, uint256 rateMode)
-        (, uint stableDebt, uint variableDebt, , , , , , ) = aaveData.getUserReserveData(token, address(this));
+		internal
+		view
+		returns (uint256)
+	{
+		(, uint256 stableDebt, uint256 variableDebt, , , , , , ) = aaveData
+			.getUserReserveData(token, address(this));
 		return rateMode == 1 ? stableDebt : variableDebt;
 	}
 
@@ -43,7 +53,14 @@ abstract contract Helpers is DSMath, Basic {
 	 * @dev Get total collateral balance for an asset
 	 * @param token token address of the collateral.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
 	 */
-    function getCollateralBalance(address token) internal view returns (uint bal) {
+	function getCollateralBalance(address token)
-        (bal, , , , , , , ,) = aaveData.getUserReserveData(token, address(this));
+		internal
+		view
+		returns (uint256 bal)
+	{
+		(bal, , , , , , , , ) = aaveData.getUserReserveData(
+			token,
+			address(this)
+		);
 	}
 }

contracts/mainnet/connectors/aave/v3/interface.sol

@@ -1,31 +1,67 @@
 pragma solidity ^0.7.0;
 
 interface AaveInterface {
-    function deposit(address _asset, uint256 _amount, address _onBehalfOf, uint16 _referralCode) external;
+	function supply(
-    function withdraw(address _asset, uint256 _amount, address _to) external;
+		address asset,
-    function borrow(
+		uint256 amount,
-        address _asset,
+		address onBehalfOf,
-        uint256 _amount,
+		uint16 referralCode
-        uint256 _interestRateMode,
-        uint16 _referralCode,
-        address _onBehalfOf
 	) external;
-    function repay(address _asset, uint256 _amount, uint256 _rateMode, address _onBehalfOf) external;
+
-    function setUserUseReserveAsCollateral(address _asset, bool _useAsCollateral) external;
+	function withdraw(
-    function swapBorrowRateMode(address _asset, uint256 _rateMode) external;
+		address asset,
+		uint256 amount,
+		address to
+	) external returns (uint256);
+
+	function borrow(
+		address asset,
+		uint256 amount,
+		uint256 interestRateMode,
+		uint16 referralCode,
+		address onBehalfOf
+	) external;
+
+	function repay(
+		address asset,
+		uint256 amount,
+		uint256 interestRateMode,
+		address onBehalfOf
+	) external returns (uint256);
+
+	function repayWithATokens(
+		address asset,
+		uint256 amount,
+		uint256 interestRateMode
+	) external returns (uint256);
+
+	function setUserUseReserveAsCollateral(address asset, bool useAsCollateral)
+		external;
+
+	function swapBorrowRateMode(address asset, uint256 interestRateMode)
+		external;
+
+	function setUserEMode(uint8 categoryId) external;
 }
 
-interface AaveLendingPoolProviderInterface {
+interface AavePoolProviderInterface {
-    function getLendingPool() external view returns (address);
+	function getPool() external view returns (address);
 }
 
 interface AaveDataProviderInterface {
-    function getReserveTokensAddresses(address _asset) external view returns (
+	function getReserveTokensAddresses(address _asset)
+		external
+		view
+		returns (
 			address aTokenAddress,
 			address stableDebtTokenAddress,
 			address variableDebtTokenAddress
 		);
-    function getUserReserveData(address _asset, address _user) external view returns (
+
+	function getUserReserveData(address _asset, address _user)
+		external
+		view
+		returns (
 			uint256 currentATokenBalance,
 			uint256 currentStableDebt,
 			uint256 currentVariableDebt,
@@ -36,12 +72,20 @@ interface AaveDataProviderInterface {
 			uint40 stableRateLastUpdated,
 			bool usageAsCollateralEnabled
 		);
+
+	function getReserveEModeCategory(address asset)
+		external
+		view
+		returns (uint256);
 }
 
 interface AaveAddressProviderRegistryInterface {
-    function getAddressesProvidersList() external view returns (address[] memory);
+	function getAddressesProvidersList()
+		external
+		view
+		returns (address[] memory);
 }
 
 interface ATokenInterface {
-    function balanceOf(address _user) external view returns(uint256);
+	function balanceOf(address _user) external view returns (uint256);
 }

contracts/mainnet/connectors/aave/v3/main.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.7.0;
 
 /**
- * @title Aave v2.
+ * @title Aave v3.
  * @dev Lending & Borrowing.
  */
 
@@ -25,10 +25,14 @@ abstract contract AaveResolver is Events, Helpers {
 		uint256 amt,
 		uint256 getId,
 		uint256 setId
-    ) external payable returns (string memory _eventName, bytes memory _eventParam) {
+	)
-        uint _amt = getUint(getId, amt);
+		external
+		payable
+		returns (string memory _eventName, bytes memory _eventParam)
+	{
+		uint256 _amt = getUint(getId, amt);
 
-        AaveInterface aave = AaveInterface(aaveProvider.getLendingPool());
+		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		bool isEth = token == ethAddr;
 		address _token = isEth ? wethAddr : token;
@@ -36,15 +40,17 @@ abstract contract AaveResolver is Events, Helpers {
 		TokenInterface tokenContract = TokenInterface(_token);
 
 		if (isEth) {
-            _amt = _amt == uint(-1) ? address(this).balance : _amt;
+			_amt = _amt == uint256(-1) ? address(this).balance : _amt;
 			convertEthToWeth(isEth, tokenContract, _amt);
 		} else {
-            _amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt;
+			_amt = _amt == uint256(-1)
+				? tokenContract.balanceOf(address(this))
+				: _amt;
 		}
 
 		approve(tokenContract, address(aave), _amt);
 
-        aave.deposit(_token, _amt, address(this), referralCode);
+		aave.supply(_token, _amt, address(this), referralCode);
 
 		if (!getIsColl(_token)) {
 			aave.setUserUseReserveAsCollateral(_token, true);
@@ -69,18 +75,22 @@ abstract contract AaveResolver is Events, Helpers {
 		uint256 amt,
 		uint256 getId,
 		uint256 setId
-    ) external payable returns (string memory _eventName, bytes memory _eventParam) {
+	)
-        uint _amt = getUint(getId, amt);
+		external
+		payable
+		returns (string memory _eventName, bytes memory _eventParam)
+	{
+		uint256 _amt = getUint(getId, amt);
 
-        AaveInterface aave = AaveInterface(aaveProvider.getLendingPool());
+		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 		bool isEth = token == ethAddr;
 		address _token = isEth ? wethAddr : token;
 
 		TokenInterface tokenContract = TokenInterface(_token);
 
-        uint initialBal = tokenContract.balanceOf(address(this));
+		uint256 initialBal = tokenContract.balanceOf(address(this));
 		aave.withdraw(_token, _amt, address(this));
-        uint finalBal = tokenContract.balanceOf(address(this));
+		uint256 finalBal = tokenContract.balanceOf(address(this));
 
 		_amt = sub(finalBal, initialBal);
 
@@ -107,10 +117,14 @@ abstract contract AaveResolver is Events, Helpers {
 		uint256 rateMode,
 		uint256 getId,
 		uint256 setId
-    ) external payable returns (string memory _eventName, bytes memory _eventParam) {
+	)
-        uint _amt = getUint(getId, amt);
+		external
+		payable
+		returns (string memory _eventName, bytes memory _eventParam)
+	{
+		uint256 _amt = getUint(getId, amt);
 
-        AaveInterface aave = AaveInterface(aaveProvider.getLendingPool());
+		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		bool isEth = token == ethAddr;
 		address _token = isEth ? wethAddr : token;
@@ -139,17 +153,21 @@ abstract contract AaveResolver is Events, Helpers {
 		uint256 rateMode,
 		uint256 getId,
 		uint256 setId
-    ) external payable returns (string memory _eventName, bytes memory _eventParam) {
+	)
-        uint _amt = getUint(getId, amt);
+		external
+		payable
+		returns (string memory _eventName, bytes memory _eventParam)
+	{
+		uint256 _amt = getUint(getId, amt);
 
-        AaveInterface aave = AaveInterface(aaveProvider.getLendingPool());
+		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
 		bool isEth = token == ethAddr;
 		address _token = isEth ? wethAddr : token;
 
 		TokenInterface tokenContract = TokenInterface(_token);
 
-        _amt = _amt == uint(-1) ? getPaybackBalance(_token, rateMode) : _amt;
+		_amt = _amt == uint256(-1) ? getPaybackBalance(_token, rateMode) : _amt;
 
 		if (isEth) convertEthToWeth(isEth, tokenContract, _amt);
 
@@ -163,20 +181,65 @@ abstract contract AaveResolver is Events, Helpers {
 		_eventParam = abi.encode(token, _amt, rateMode, getId, setId);
 	}
 
+	/**
+	 * @dev Payback borrowed ETH/ERC20_Token .
+	 * @notice Payback debt owed.
+	 * @param token The address of the token to payback.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
+	 * @param amt The amount of the token to payback. (For max: `uint256(-1)`)
+	 * @param rateMode The type of debt paying back. (For Stable: 1, Variable: 2)
+	 * @param getId ID to retrieve amt.
+	 * @param setId ID stores the amount of tokens paid back.
+	 */
+	function paybackWithATokens(
+		address token,
+		uint256 amt,
+		uint256 rateMode,
+		uint256 getId,
+		uint256 setId
+	)
+		external
+		payable
+		returns (string memory _eventName, bytes memory _eventParam)
+	{
+		uint256 _amt = getUint(getId, amt);
+
+		AaveInterface aave = AaveInterface(aaveProvider.getPool());
+
+		bool isEth = token == ethAddr;
+		address _token = isEth ? wethAddr : token;
+
+		TokenInterface tokenContract = TokenInterface(_token);
+
+		_amt = _amt == uint256(-1) ? getPaybackBalance(_token, rateMode) : _amt;
+
+		if (isEth) convertEthToWeth(isEth, tokenContract, _amt);
+
+		approve(tokenContract, address(aave), _amt);
+
+		aave.repayWithATokens(_token, _amt, rateMode);
+
+		setUint(setId, _amt);
+
+		_eventName = "LogPayback(address,uint256,uint256,uint256,uint256)";
+		_eventParam = abi.encode(token, _amt, rateMode, getId, setId);
+	}
+
 	/**
 	 * @dev Enable collateral
 	 * @notice Enable an array of tokens as collateral
 	 * @param tokens Array of tokens to enable collateral
 	 */
-    function enableCollateral(
+	function enableCollateral(address[] calldata tokens)
-        address[] calldata tokens
+		external
-    ) external payable returns (string memory _eventName, bytes memory _eventParam) {
+		payable
-        uint _length = tokens.length;
+		returns (string memory _eventName, bytes memory _eventParam)
+	{
+		uint256 _length = tokens.length;
 		require(_length > 0, "0-tokens-not-allowed");
 
-        AaveInterface aave = AaveInterface(aaveProvider.getLendingPool());
+		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
-        for (uint i = 0; i < _length; i++) {
+		for (uint256 i = 0; i < _length; i++) {
 			address token = tokens[i];
 			if (getCollateralBalance(token) > 0 && !getIsColl(token)) {
 				aave.setUserUseReserveAsCollateral(token, true);
@@ -193,13 +256,14 @@ abstract contract AaveResolver is Events, Helpers {
 	 * @param token The address of the token to swap borrow rate.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
 	 * @param rateMode Desired borrow rate mode. (Stable = 1, Variable = 2)
 	 */
-    function swapBorrowRateMode(
+	function swapBorrowRateMode(address token, uint256 rateMode)
-        address token,
+		external
-        uint rateMode
+		payable
-    ) external payable returns (string memory _eventName, bytes memory _eventParam) {
+		returns (string memory _eventName, bytes memory _eventParam)
-        AaveInterface aave = AaveInterface(aaveProvider.getLendingPool());
+	{
+		AaveInterface aave = AaveInterface(aaveProvider.getPool());
 
-        uint currentRateMode = rateMode == 1 ? 2 : 1;
+		uint256 currentRateMode = rateMode == 1 ? 2 : 1;
 
 		if (getPaybackBalance(token, currentRateMode) > 0) {
 			aave.swapBorrowRateMode(token, rateMode);
@@ -210,6 +274,6 @@ abstract contract AaveResolver is Events, Helpers {
 	}
 }
 
-contract ConnectV2AaveV2 is AaveResolver {
+contract ConnectV2AaveV3 is AaveResolver {
-    string constant public name = "AaveV2-v1.1";
+	string public constant name = "AaveV3-v1.1";
 }