Instadapp/dsa-connectors
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors.git synced 2024-07-29 22:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

lint fix

Browse Source
This commit is contained in:
pradyuman-verma 2022-06-18 19:26:50 +05:30
parent 51f4b1b9f4
commit 09bcc1b8f7
No known key found for this signature in database
GPG Key ID: E36FD6BC8923221F
4 changed files with 268 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contracts/avalanche/connectors/aave/v2/main.sol
View File

@ -284,10 +284,11 @@ abstract contract AaveResolver is Events, Helpers {
* @param token The address of the token to swap borrow rate.(For AVAX: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param token The address of the token to swap borrow rate.(For AVAX: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param currentRateMode Current Rate mode. (Stable = 1, Variable = 2) * @param currentRateMode Current Rate mode. (Stable = 1, Variable = 2)
*/ */
function swapBorrowRateMode( function swapBorrowRateMode(address token, uint256 currentRateMode)
address token, external
uint currentRateMode 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.getLendingPool());
bool isAVAX = token == avaxAddr; bool isAVAX = token == avaxAddr;

94
contracts/mainnet/connectors/aave/v2/main.sol
View File

@ -26,8 +26,12 @@ abstract contract AaveResolver is Events, Helpers {
uint256 amt, uint256 amt,
uint256 getId, uint256 getId,
uint256 setId 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.getLendingPool());
@ -37,10 +41,12 @@ abstract contract AaveResolver is Events, Helpers {
TokenInterface tokenContract = TokenInterface(_token); TokenInterface tokenContract = TokenInterface(_token);
if (isEth) { if (isEth) {
_amt = _amt == uint(-1) ? address(this).balance : _amt; _amt = _amt == uint256(-1) ? address(this).balance : _amt;
convertEthToWeth(isEth, tokenContract, _amt); convertEthToWeth(isEth, tokenContract, _amt);
} else { } else {
_amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt; _amt = _amt == uint256(-1)
? tokenContract.balanceOf(address(this))
: _amt;
} }
approve(tokenContract, address(aave), _amt); approve(tokenContract, address(aave), _amt);
@ -70,8 +76,12 @@ abstract contract AaveResolver is Events, Helpers {
uint256 amt, uint256 amt,
uint256 getId, uint256 getId,
uint256 setId 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.getLendingPool());
bool isEth = token == ethAddr; bool isEth = token == ethAddr;
@ -79,9 +89,9 @@ abstract contract AaveResolver is Events, Helpers {
TokenInterface tokenContract = TokenInterface(_token); TokenInterface tokenContract = TokenInterface(_token);
uint initialBal = tokenContract.balanceOf(address(this)); uint256 initialBal = tokenContract.balanceOf(address(this));
aave.withdraw(_token, _amt, address(this)); aave.withdraw(_token, _amt, address(this));
uint finalBal = tokenContract.balanceOf(address(this)); uint256 finalBal = tokenContract.balanceOf(address(this));
_amt = sub(finalBal, initialBal); _amt = sub(finalBal, initialBal);
@ -108,8 +118,12 @@ abstract contract AaveResolver is Events, Helpers {
uint256 rateMode, uint256 rateMode,
uint256 getId, uint256 getId,
uint256 setId 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.getLendingPool());
@ -140,8 +154,12 @@ abstract contract AaveResolver is Events, Helpers {
uint256 rateMode, uint256 rateMode,
uint256 getId, uint256 getId,
uint256 setId 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.getLendingPool());
@ -150,9 +168,11 @@ abstract contract AaveResolver is Events, Helpers {
TokenInterface tokenContract = TokenInterface(_token); TokenInterface tokenContract = TokenInterface(_token);
if (_amt == uint(-1)) { if (_amt == uint256(-1)) {
uint _amtDSA = isEth ? address(this).balance : tokenContract.balanceOf(address(this)); uint256 _amtDSA = isEth
uint _amtDebt = getPaybackBalance(_token, rateMode); ? address(this).balance
: tokenContract.balanceOf(address(this));
uint256 _amtDebt = getPaybackBalance(_token, rateMode);
_amt = _amtDSA <= _amtDebt ? _amtDSA : _amtDebt; _amt = _amtDSA <= _amtDebt ? _amtDSA : _amtDebt;
} }
@ -199,9 +219,15 @@ abstract contract AaveResolver is Events, Helpers {
TokenInterface tokenContract = TokenInterface(_token); TokenInterface tokenContract = TokenInterface(_token);
if (_amt == uint(-1)) { if (_amt == uint256(-1)) {
uint _amtDSA = isEth ? address(this).balance : tokenContract.balanceOf(address(this)); uint256 _amtDSA = isEth
uint _amtDebt = getOnBehalfOfPaybackBalance(_token, rateMode, onBehalfOf); ? address(this).balance
: tokenContract.balanceOf(address(this));
uint256 _amtDebt = getOnBehalfOfPaybackBalance(
_token,
rateMode,
onBehalfOf
);
_amt = _amtDSA <= _amtDebt ? _amtDSA : _amtDebt; _amt = _amtDSA <= _amtDebt ? _amtDSA : _amtDebt;
} }
@ -214,7 +240,14 @@ abstract contract AaveResolver is Events, Helpers {
setUint(setId, _amt); setUint(setId, _amt);
_eventName = "LogPaybackOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; _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
);
} }
/** /**
@ -222,15 +255,17 @@ abstract contract AaveResolver is Events, Helpers {
* @notice Enable an array of tokens as collateral * @notice Enable an array of tokens as collateral
* @param tokens Array of tokens to enable 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"); require(_length > 0, "0-tokens-not-allowed");
AaveInterface aave = AaveInterface(aaveProvider.getLendingPool()); AaveInterface aave = AaveInterface(aaveProvider.getLendingPool());
for (uint i = 0; i < _length; i++) { for (uint256 i = 0; i < _length; i++) {
bool isEth = tokens[i] == ethAddr; bool isEth = tokens[i] == ethAddr;
address _token = isEth ? wethAddr : tokens[i]; address _token = isEth ? wethAddr : tokens[i];
@ -249,10 +284,11 @@ abstract contract AaveResolver is Events, Helpers {
* @param token The address of the token to swap borrow rate.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param token The address of the token to swap borrow rate.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param currentRateMode Current Rate mode. (Stable = 1, Variable = 2) * @param currentRateMode Current Rate mode. (Stable = 1, Variable = 2)
*/ */
function swapBorrowRateMode( function swapBorrowRateMode(address token, uint256 currentRateMode)
address token, external
uint currentRateMode 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.getLendingPool());
bool isEth = token == ethAddr; bool isEth = token == ethAddr;
@ -268,5 +304,5 @@ abstract contract AaveResolver is Events, Helpers {
} }
contract ConnectV2AaveV2 is AaveResolver { contract ConnectV2AaveV2 is AaveResolver {
string constant public name = "AaveV2-v1.2"; string public constant name = "AaveV2-v1.2";
} }

33
contracts/mainnet/connectors/aave/v3/main.sol
View File

@ -224,7 +224,14 @@ abstract contract AaveResolver is Events, Helpers {
setUint(setId, _amt); setUint(setId, _amt);
_eventName = "LogBorrowOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; _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); 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); if (isEth) convertEthToWeth(isEth, tokenContract, _amt);
@ -355,10 +364,16 @@ abstract contract AaveResolver is Events, Helpers {
setUint(setId, _amt); setUint(setId, _amt);
_eventName = "LogPaybackOnBehalfOf(address,uint256,uint256,address,uint256,uint256)"; _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
);
} }
/** /**
* @dev Enable collateral * @dev Enable collateral
* @notice Enable an array of tokens as collateral * @notice Enable an array of tokens as collateral
@ -463,8 +478,14 @@ abstract contract AaveResolver is Events, Helpers {
setUint(setId, _amt); setUint(setId, _amt);
_eventName = "LogDelegateBorrow(address,uint256,uint256,address,uint256,uint256)"; _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
);
} }
} }

9
contracts/polygon/connectors/aave/v2/main.sol
View File

@ -284,10 +284,11 @@ abstract contract AaveResolver is Events, Helpers {
* @param token The address of the token to swap borrow rate.(For MATIC: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) * @param token The address of the token to swap borrow rate.(For MATIC: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)
* @param currentRateMode Current Rate mode. (Stable = 1, Variable = 2) * @param currentRateMode Current Rate mode. (Stable = 1, Variable = 2)
*/ */
function swapBorrowRateMode( function swapBorrowRateMode(address token, uint256 currentRateMode)
address token, external
uint currentRateMode 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.getLendingPool());
bool isMatic = token == maticAddr; bool isMatic = token == maticAddr;