From 7477438395e74d87f1356437bf4185a6552b5bf2 Mon Sep 17 00:00:00 2001 From: pradyuman-verma Date: Wed, 8 Jun 2022 19:07:56 +0530 Subject: [PATCH] bug fixes + refactoring --- .../arbitrum/connectors/aave/v3/main.sol | 33 +++++++++++++++--- .../avalanche/connectors/aave/v3/main.sol | 34 ++++++++++++++++--- contracts/fantom/connectors/aave/v3/main.sol | 34 +++++++++++++++---- .../optimism/connectors/aave/v3/main.sol | 33 +++++++++++++++--- contracts/polygon/connectors/aave/v3/main.sol | 33 +++++++++++++++--- 5 files changed, 141 insertions(+), 26 deletions(-) diff --git a/contracts/arbitrum/connectors/aave/v3/main.sol b/contracts/arbitrum/connectors/aave/v3/main.sol index e7365567..941aa138 100644 --- a/contracts/arbitrum/connectors/aave/v3/main.sol +++ b/contracts/arbitrum/connectors/aave/v3/main.sol @@ -103,7 +103,7 @@ abstract contract AaveResolver is Events, Helpers { aave.supply(_token, _amt, address(this), referralCode); - if (getCollateralBalance(_token) > 0 && getIsColl(token)) { + if (getCollateralBalance(_token) > 0 && getIsColl(_token)) { aave.setUserUseReserveAsCollateral(_token, false); } @@ -224,7 +224,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogBorrowOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, onBehalfOf, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + onBehalfOf, + getId, + setId + ); } /** @@ -344,7 +351,9 @@ abstract contract AaveResolver is Events, Helpers { TokenInterface tokenContract = TokenInterface(_token); - _amt = _amt == uint256(-1) ? getOnBehalfOfPaybackBalance(_token, rateMode, onBehalfOf) : _amt; + _amt = _amt == uint256(-1) + ? getOnBehalfOfPaybackBalance(_token, rateMode, onBehalfOf) + : _amt; if (isEth) convertEthToWeth(isEth, tokenContract, _amt); @@ -355,7 +364,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogPaybackOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, onBehalfOf, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + onBehalfOf, + getId, + setId + ); } /** @@ -484,7 +500,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogDelegateBorrow(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, delegateTo, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + delegateTo, + getId, + setId + ); } } diff --git a/contracts/avalanche/connectors/aave/v3/main.sol b/contracts/avalanche/connectors/aave/v3/main.sol index beec94a7..3fc3f86f 100644 --- a/contracts/avalanche/connectors/aave/v3/main.sol +++ b/contracts/avalanche/connectors/aave/v3/main.sol @@ -103,7 +103,7 @@ abstract contract AaveResolver is Events, Helpers { aave.supply(_token, _amt, address(this), referralCode); - if (getCollateralBalance(_token) > 0 && getIsColl(token)) { + if (getCollateralBalance(_token) > 0 && getIsColl(_token)) { aave.setUserUseReserveAsCollateral(_token, false); } @@ -224,7 +224,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogBorrowOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, onBehalfOf, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + onBehalfOf, + getId, + setId + ); } /** @@ -344,7 +351,9 @@ abstract contract AaveResolver is Events, Helpers { TokenInterface tokenContract = TokenInterface(_token); - _amt = _amt == uint256(-1) ? getOnBehalfOfPaybackBalance(_token, rateMode, onBehalfOf) : _amt; + _amt = _amt == uint256(-1) + ? getOnBehalfOfPaybackBalance(_token, rateMode, onBehalfOf) + : _amt; if (isAVAX) convertAvaxToWavax(isAVAX, tokenContract, _amt); @@ -355,7 +364,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogPaybackOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, onBehalfOf, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + onBehalfOf, + getId, + setId + ); } /** @@ -409,6 +425,7 @@ abstract contract AaveResolver is Events, Helpers { _eventName = "LogDisableCollateral(address[])"; _eventParam = abi.encode(tokens); } + /** * @dev Swap borrow rate mode * @notice Swaps user borrow rate mode between variable and stable @@ -483,7 +500,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogDelegateBorrow(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, delegateTo, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + delegateTo, + getId, + setId + ); } } diff --git a/contracts/fantom/connectors/aave/v3/main.sol b/contracts/fantom/connectors/aave/v3/main.sol index 2a35f3dd..4457e1f8 100644 --- a/contracts/fantom/connectors/aave/v3/main.sol +++ b/contracts/fantom/connectors/aave/v3/main.sol @@ -103,7 +103,7 @@ abstract contract AaveResolver is Events, Helpers { aave.supply(_token, _amt, address(this), referralCode); - if (getCollateralBalance(_token) > 0 && getIsColl(token)) { + if (getCollateralBalance(_token) > 0 && getIsColl(_token)) { aave.setUserUseReserveAsCollateral(_token, false); } @@ -224,7 +224,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogBorrowOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, onBehalfOf, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + onBehalfOf, + getId, + setId + ); } /** @@ -344,7 +351,9 @@ abstract contract AaveResolver is Events, Helpers { TokenInterface tokenContract = TokenInterface(_token); - _amt = _amt == uint256(-1) ? getOnBehalfOfPaybackBalance(_token, rateMode, onBehalfOf) : _amt; + _amt = _amt == uint256(-1) + ? getOnBehalfOfPaybackBalance(_token, rateMode, onBehalfOf) + : _amt; if (isFTM) convertFtmToWftm(isFTM, tokenContract, _amt); @@ -355,7 +364,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogPaybackOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, onBehalfOf, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + onBehalfOf, + getId, + setId + ); } /** @@ -484,8 +500,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogDelegateBorrow(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, delegateTo, getId, setId); - + _eventParam = abi.encode( + token, + _amt, + rateMode, + delegateTo, + getId, + setId + ); } } diff --git a/contracts/optimism/connectors/aave/v3/main.sol b/contracts/optimism/connectors/aave/v3/main.sol index 04992f43..523c2545 100644 --- a/contracts/optimism/connectors/aave/v3/main.sol +++ b/contracts/optimism/connectors/aave/v3/main.sol @@ -103,7 +103,7 @@ abstract contract AaveResolver is Events, Helpers { aave.supply(_token, _amt, address(this), referralCode); - if (getCollateralBalance(_token) > 0 && getIsColl(token)) { + if (getCollateralBalance(_token) > 0 && getIsColl(_token)) { aave.setUserUseReserveAsCollateral(_token, false); } @@ -224,7 +224,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogBorrowOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, onBehalfOf, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + onBehalfOf, + getId, + setId + ); } /** @@ -344,7 +351,9 @@ abstract contract AaveResolver is Events, Helpers { TokenInterface tokenContract = TokenInterface(_token); - _amt = _amt == uint256(-1) ? getOnBehalfOfPaybackBalance(_token, rateMode, onBehalfOf) : _amt; + _amt = _amt == uint256(-1) + ? getOnBehalfOfPaybackBalance(_token, rateMode, onBehalfOf) + : _amt; if (isEth) convertEthToWeth(isEth, tokenContract, _amt); @@ -355,7 +364,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogPaybackOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, onBehalfOf, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + onBehalfOf, + getId, + setId + ); } /** @@ -484,7 +500,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogDelegateBorrow(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, delegateTo, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + delegateTo, + getId, + setId + ); } } diff --git a/contracts/polygon/connectors/aave/v3/main.sol b/contracts/polygon/connectors/aave/v3/main.sol index d60d1b21..e8b45987 100644 --- a/contracts/polygon/connectors/aave/v3/main.sol +++ b/contracts/polygon/connectors/aave/v3/main.sol @@ -103,7 +103,7 @@ abstract contract AaveResolver is Events, Helpers { aave.supply(_token, _amt, address(this), referralCode); - if (getCollateralBalance(_token) > 0 && getIsColl(token)) { + if (getCollateralBalance(_token) > 0 && getIsColl(_token)) { aave.setUserUseReserveAsCollateral(_token, false); } @@ -224,7 +224,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogBorrowOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, onBehalfOf, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + onBehalfOf, + getId, + setId + ); } /** @@ -344,7 +351,9 @@ abstract contract AaveResolver is Events, Helpers { TokenInterface tokenContract = TokenInterface(_token); - _amt = _amt == uint256(-1) ? getOnBehalfOfPaybackBalance(_token, rateMode, onBehalfOf) : _amt; + _amt = _amt == uint256(-1) + ? getOnBehalfOfPaybackBalance(_token, rateMode, onBehalfOf) + : _amt; if (isMatic) convertMaticToWmatic(isMatic, tokenContract, _amt); @@ -355,7 +364,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogPaybackOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, onBehalfOf, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + onBehalfOf, + getId, + setId + ); } /** @@ -485,7 +501,14 @@ abstract contract AaveResolver is Events, Helpers { setUint(setId, _amt); _eventName = "LogDelegateBorrow(address,uint256,uint256,address,uint256,uint256)"; - _eventParam = abi.encode(token, _amt, rateMode, delegateTo, getId, setId); + _eventParam = abi.encode( + token, + _amt, + rateMode, + delegateTo, + getId, + setId + ); } }