From ba6f368b725083bf01cce1fa1ec8dfa1174bda1e Mon Sep 17 00:00:00 2001 From: Shriya Tyagi Date: Thu, 28 Apr 2022 21:34:54 +0400 Subject: [PATCH] minor updates --- contracts/arbitrum/connectors/aave/v3/main.sol | 2 +- contracts/avalanche/connectors/aave/v3/main.sol | 4 ++-- contracts/fantom/connectors/aave/v3/main.sol | 4 ++-- contracts/mainnet/connectors/aave/v3/main.sol | 2 +- contracts/optimism/connectors/aave/v3/main.sol | 3 +-- contracts/polygon/connectors/aave/v3/main.sol | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/contracts/arbitrum/connectors/aave/v3/main.sol b/contracts/arbitrum/connectors/aave/v3/main.sol index be42dd55..1bdda4a5 100644 --- a/contracts/arbitrum/connectors/aave/v3/main.sol +++ b/contracts/arbitrum/connectors/aave/v3/main.sol @@ -219,7 +219,7 @@ abstract contract AaveResolver is Events, Helpers { address _token = isEth ? wethAddr : token; aave.borrow(_token, _amt, rateMode, referralCode, onBehalfOf); - convertEthToWeth(isEth, TokenInterface(_token), _amt); + convertWethToEth(isEth, TokenInterface(_token), _amt); setUint(setId, _amt); diff --git a/contracts/avalanche/connectors/aave/v3/main.sol b/contracts/avalanche/connectors/aave/v3/main.sol index 675a04ac..19087d5f 100644 --- a/contracts/avalanche/connectors/aave/v3/main.sol +++ b/contracts/avalanche/connectors/aave/v3/main.sol @@ -64,7 +64,7 @@ abstract contract AaveResolver is Events, Helpers { } /** - * @dev Deposit ETH/ERC20_Token without collateral + * @dev Deposit avax/ERC20_Token without collateral * @notice Deposit a token to Aave v3 without enabling it as collateral. * @param token The address of the token to deposit.(For avax: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param amt The amount of the token to deposit. (For max: `uint256(-1)`) @@ -219,7 +219,7 @@ abstract contract AaveResolver is Events, Helpers { address _token = isAVAX ? wavaxAddr : token; aave.borrow(_token, _amt, rateMode, referralCode, onBehalfOf); - convertAvaxToWavax(isAVAX, TokenInterface(_token), _amt); + convertWavaxToAvax(isAVAX, TokenInterface(_token), _amt); setUint(setId, _amt); diff --git a/contracts/fantom/connectors/aave/v3/main.sol b/contracts/fantom/connectors/aave/v3/main.sol index 4d1b4500..ca0accf7 100644 --- a/contracts/fantom/connectors/aave/v3/main.sol +++ b/contracts/fantom/connectors/aave/v3/main.sol @@ -64,7 +64,7 @@ abstract contract AaveResolver is Events, Helpers { } /** - * @dev Deposit ETH/ERC20_Token without collateral + * @dev Deposit Ftm/ERC20_Token without collateral * @notice Deposit a token to Aave v3 without enabling it as collateral. * @param token The address of the token to deposit.(For FTM: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param amt The amount of the token to deposit. (For max: `uint256(-1)`) @@ -219,7 +219,7 @@ abstract contract AaveResolver is Events, Helpers { address _token = isFTM ? wftmAddr : token; aave.borrow(_token, _amt, rateMode, referralCode, onBehalfOf); - convertFtmToWftm(isFTM, TokenInterface(_token), _amt); + convertWftmToFtm(isFTM, TokenInterface(_token), _amt); setUint(setId, _amt); diff --git a/contracts/mainnet/connectors/aave/v3/main.sol b/contracts/mainnet/connectors/aave/v3/main.sol index cc46cb9b..16f58258 100644 --- a/contracts/mainnet/connectors/aave/v3/main.sol +++ b/contracts/mainnet/connectors/aave/v3/main.sol @@ -219,7 +219,7 @@ abstract contract AaveResolver is Events, Helpers { address _token = isEth ? wethAddr : token; aave.borrow(_token, _amt, rateMode, referralCode, onBehalfOf); - convertEthToWeth(isEth, TokenInterface(_token), _amt); + convertWethToEth(isEth, TokenInterface(_token), _amt); setUint(setId, _amt); diff --git a/contracts/optimism/connectors/aave/v3/main.sol b/contracts/optimism/connectors/aave/v3/main.sol index 60f534e3..518032ed 100644 --- a/contracts/optimism/connectors/aave/v3/main.sol +++ b/contracts/optimism/connectors/aave/v3/main.sol @@ -219,7 +219,7 @@ abstract contract AaveResolver is Events, Helpers { address _token = isEth ? wethAddr : token; aave.borrow(_token, _amt, rateMode, referralCode, onBehalfOf); - convertEthToWeth(isEth, TokenInterface(_token), _amt); + convertWethToEth(isEth, TokenInterface(_token), _amt); setUint(setId, _amt); @@ -430,7 +430,6 @@ abstract contract AaveResolver is Events, Helpers { require(rateMode == 1 || rateMode == 2, "Invalid debt type"); uint256 _amt = getUint(getId, amount); - bool isEth = token == ethAddr; address _token = isEth ? wethAddr : token; diff --git a/contracts/polygon/connectors/aave/v3/main.sol b/contracts/polygon/connectors/aave/v3/main.sol index b05cd1b5..5ff5f53d 100644 --- a/contracts/polygon/connectors/aave/v3/main.sol +++ b/contracts/polygon/connectors/aave/v3/main.sol @@ -64,7 +64,7 @@ abstract contract AaveResolver is Events, Helpers { } /** - ** @dev Deposit ETH/ERC20_Token without collateral + ** @dev Deposit Matic/ERC20_Token without collateral * @notice Deposit a token to Aave v3 without enabling it as collateral. * @param token The address of the token to deposit.(For Matic: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param amt The amount of the token to deposit. (For max: `uint256(-1)`)