Skip to content
This repository was archived by the owner on Oct 21, 2025. It is now read-only.

Commit 8f3380d

Browse files
authored
lint: align linting with aave v3 core (#179)
* refactor: align linting with core * rebase: rebase * fix: revert changelog changes * fix: revert properly 😓
1 parent 9050820 commit 8f3380d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+297
-518
lines changed

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
"plugin:prettier/recommended"
1414
],
1515
"rules": {}
16-
}
16+
}

.prettierrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
"singleQuote": true,
66
"tabWidth": 2,
77
"overrides": [
8+
{
9+
"files": "*.ts",
10+
"options": {
11+
"bracketSpacing": true
12+
}
13+
},
814
{
915
"files": "*.sol",
1016
"options": {

Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
FROM ethereum/solc:0.7.6 as build-deps
22

3-
FROM node:14
3+
FROM node:16
4+
5+
USER node
6+
47
COPY --from=build-deps /usr/bin/solc /usr/bin/solc

contracts/adapters/paraswap/BaseParaSwapAdapter.sol

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ abstract contract BaseParaSwapAdapter is FlashLoanSimpleReceiverBase, Ownable {
4949
uint256 receivedAmount
5050
);
5151

52-
constructor(IPoolAddressesProvider addressesProvider) FlashLoanSimpleReceiverBase(addressesProvider) {
52+
constructor(
53+
IPoolAddressesProvider addressesProvider
54+
) FlashLoanSimpleReceiverBase(addressesProvider) {
5355
ORACLE = IPriceOracleGetter(addressesProvider.getPriceOracle());
5456
}
5557

contracts/adapters/paraswap/BaseParaSwapBuyAdapter.sol

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ abstract contract BaseParaSwapBuyAdapter is BaseParaSwapAdapter {
2121

2222
IParaSwapAugustusRegistry public immutable AUGUSTUS_REGISTRY;
2323

24-
constructor(IPoolAddressesProvider addressesProvider, IParaSwapAugustusRegistry augustusRegistry)
25-
BaseParaSwapAdapter(addressesProvider)
26-
{
24+
constructor(
25+
IPoolAddressesProvider addressesProvider,
26+
IParaSwapAugustusRegistry augustusRegistry
27+
) BaseParaSwapAdapter(addressesProvider) {
2728
// Do something on Augustus registry to check the right contract was passed
2829
require(!augustusRegistry.isValidAugustus(address(0)), 'Not a valid Augustus address');
2930
AUGUSTUS_REGISTRY = augustusRegistry;
@@ -62,8 +63,8 @@ abstract contract BaseParaSwapBuyAdapter is BaseParaSwapAdapter {
6263
uint256 toAssetPrice = _getPrice(address(assetToSwapTo));
6364

6465
uint256 expectedMaxAmountToSwap = amountToReceive
65-
.mul(toAssetPrice.mul(10**fromAssetDecimals))
66-
.div(fromAssetPrice.mul(10**toAssetDecimals))
66+
.mul(toAssetPrice.mul(10 ** fromAssetDecimals))
67+
.div(fromAssetPrice.mul(10 ** toAssetDecimals))
6768
.percentMul(PercentageMath.PERCENTAGE_FACTOR.add(MAX_SLIPPAGE_PERCENT));
6869

6970
require(maxAmountToSwap <= expectedMaxAmountToSwap, 'maxAmountToSwap exceed max slippage');

contracts/adapters/paraswap/BaseParaSwapSellAdapter.sol

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ abstract contract BaseParaSwapSellAdapter is BaseParaSwapAdapter {
2222

2323
IParaSwapAugustusRegistry public immutable AUGUSTUS_REGISTRY;
2424

25-
constructor(IPoolAddressesProvider addressesProvider, IParaSwapAugustusRegistry augustusRegistry)
26-
BaseParaSwapAdapter(addressesProvider)
27-
{
25+
constructor(
26+
IPoolAddressesProvider addressesProvider,
27+
IParaSwapAugustusRegistry augustusRegistry
28+
) BaseParaSwapAdapter(addressesProvider) {
2829
// Do something on Augustus registry to check the right contract was passed
2930
require(!augustusRegistry.isValidAugustus(address(0)));
3031
AUGUSTUS_REGISTRY = augustusRegistry;
@@ -60,8 +61,8 @@ abstract contract BaseParaSwapSellAdapter is BaseParaSwapAdapter {
6061
uint256 toAssetPrice = _getPrice(address(assetToSwapTo));
6162

6263
uint256 expectedMinAmountOut = amountToSwap
63-
.mul(fromAssetPrice.mul(10**toAssetDecimals))
64-
.div(toAssetPrice.mul(10**fromAssetDecimals))
64+
.mul(fromAssetPrice.mul(10 ** toAssetDecimals))
65+
.div(toAssetPrice.mul(10 ** fromAssetDecimals))
6566
.percentMul(PercentageMath.PERCENTAGE_FACTOR - MAX_SLIPPAGE_PERCENT);
6667

6768
require(expectedMinAmountOut <= minAmountToReceive, 'MIN_AMOUNT_EXCEEDS_MAX_SLIPPAGE');

contracts/libraries/DataTypesHelper.sol

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ library DataTypesHelper {
1717
* @return The stable debt balance
1818
* @return The variable debt balance
1919
**/
20-
function getUserCurrentDebt(address user, DataTypes.ReserveData memory reserve)
21-
internal
22-
view
23-
returns (uint256, uint256)
24-
{
20+
function getUserCurrentDebt(
21+
address user,
22+
DataTypes.ReserveData memory reserve
23+
) internal view returns (uint256, uint256) {
2524
return (
2625
IERC20(reserve.stableDebtTokenAddress).balanceOf(user),
2726
IERC20(reserve.variableDebtTokenAddress).balanceOf(user)

contracts/misc/UiIncentiveDataProviderV3.sol

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ import {IUiIncentiveDataProviderV3} from './interfaces/IUiIncentiveDataProviderV
1414
contract UiIncentiveDataProviderV3 is IUiIncentiveDataProviderV3 {
1515
using UserConfiguration for DataTypes.UserConfigurationMap;
1616

17-
function getFullReservesIncentiveData(IPoolAddressesProvider provider, address user)
17+
function getFullReservesIncentiveData(
18+
IPoolAddressesProvider provider,
19+
address user
20+
)
1821
external
1922
view
2023
override
@@ -23,20 +26,15 @@ contract UiIncentiveDataProviderV3 is IUiIncentiveDataProviderV3 {
2326
return (_getReservesIncentivesData(provider), _getUserReservesIncentivesData(provider, user));
2427
}
2528

26-
function getReservesIncentivesData(IPoolAddressesProvider provider)
27-
external
28-
view
29-
override
30-
returns (AggregatedReserveIncentiveData[] memory)
31-
{
29+
function getReservesIncentivesData(
30+
IPoolAddressesProvider provider
31+
) external view override returns (AggregatedReserveIncentiveData[] memory) {
3232
return _getReservesIncentivesData(provider);
3333
}
3434

35-
function _getReservesIncentivesData(IPoolAddressesProvider provider)
36-
private
37-
view
38-
returns (AggregatedReserveIncentiveData[] memory)
39-
{
35+
function _getReservesIncentivesData(
36+
IPoolAddressesProvider provider
37+
) private view returns (AggregatedReserveIncentiveData[] memory) {
4038
IPool pool = IPool(provider.getPool());
4139
address[] memory reserves = pool.getReservesList();
4240
AggregatedReserveIncentiveData[]
@@ -216,20 +214,17 @@ contract UiIncentiveDataProviderV3 is IUiIncentiveDataProviderV3 {
216214
return (reservesIncentiveData);
217215
}
218216

219-
function getUserReservesIncentivesData(IPoolAddressesProvider provider, address user)
220-
external
221-
view
222-
override
223-
returns (UserReserveIncentiveData[] memory)
224-
{
217+
function getUserReservesIncentivesData(
218+
IPoolAddressesProvider provider,
219+
address user
220+
) external view override returns (UserReserveIncentiveData[] memory) {
225221
return _getUserReservesIncentivesData(provider, user);
226222
}
227223

228-
function _getUserReservesIncentivesData(IPoolAddressesProvider provider, address user)
229-
private
230-
view
231-
returns (UserReserveIncentiveData[] memory)
232-
{
224+
function _getUserReservesIncentivesData(
225+
IPoolAddressesProvider provider,
226+
address user
227+
) private view returns (UserReserveIncentiveData[] memory) {
233228
IPool pool = IPool(provider.getPool());
234229
address[] memory reserves = pool.getReservesList();
235230

contracts/misc/UiPoolDataProviderV3.sol

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,16 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
3636
marketReferenceCurrencyPriceInUsdProxyAggregator = _marketReferenceCurrencyPriceInUsdProxyAggregator;
3737
}
3838

39-
function getReservesList(IPoolAddressesProvider provider)
40-
public
41-
view
42-
override
43-
returns (address[] memory)
44-
{
39+
function getReservesList(
40+
IPoolAddressesProvider provider
41+
) public view override returns (address[] memory) {
4542
IPool pool = IPool(provider.getPool());
4643
return pool.getReservesList();
4744
}
4845

49-
function getReservesData(IPoolAddressesProvider provider)
50-
public
51-
view
52-
override
53-
returns (AggregatedReserveData[] memory, BaseCurrencyInfo memory)
54-
{
46+
function getReservesData(
47+
IPoolAddressesProvider provider
48+
) public view override returns (AggregatedReserveData[] memory, BaseCurrencyInfo memory) {
5549
IAaveOracle oracle = IAaveOracle(provider.getPriceOracle());
5650
IPool pool = IPool(provider.getPool());
5751
AaveProtocolDataProvider poolDataProvider = AaveProtocolDataProvider(
@@ -216,9 +210,7 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
216210
try oracle.BASE_CURRENCY_UNIT() returns (uint256 baseCurrencyUnit) {
217211
baseCurrencyInfo.marketReferenceCurrencyUnit = baseCurrencyUnit;
218212
baseCurrencyInfo.marketReferenceCurrencyPriceInUsd = int256(baseCurrencyUnit);
219-
} catch (
220-
bytes memory /*lowLevelData*/
221-
) {
213+
} catch (bytes memory /*lowLevelData*/) {
222214
baseCurrencyInfo.marketReferenceCurrencyUnit = ETH_CURRENCY_UNIT;
223215
baseCurrencyInfo
224216
.marketReferenceCurrencyPriceInUsd = marketReferenceCurrencyPriceInUsdProxyAggregator
@@ -228,12 +220,10 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
228220
return (reservesData, baseCurrencyInfo);
229221
}
230222

231-
function getUserReservesData(IPoolAddressesProvider provider, address user)
232-
external
233-
view
234-
override
235-
returns (UserReserveData[] memory, uint8)
236-
{
223+
function getUserReservesData(
224+
IPoolAddressesProvider provider,
225+
address user
226+
) external view override returns (UserReserveData[] memory, uint8) {
237227
IPool pool = IPool(provider.getPool());
238228
address[] memory reserves = pool.getReservesList();
239229
DataTypes.UserConfigurationMap memory userConfig = pool.getUserConfiguration(user);

contracts/misc/WalletBalanceProvider.sol

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,10 @@ contract WalletBalanceProvider {
5555
* @param tokens The list of tokens
5656
* @return And array with the concatenation of, for each user, his/her balances
5757
**/
58-
function batchBalanceOf(address[] calldata users, address[] calldata tokens)
59-
external
60-
view
61-
returns (uint256[] memory)
62-
{
58+
function batchBalanceOf(
59+
address[] calldata users,
60+
address[] calldata tokens
61+
) external view returns (uint256[] memory) {
6362
uint256[] memory balances = new uint256[](users.length * tokens.length);
6463

6564
for (uint256 i = 0; i < users.length; i++) {
@@ -74,11 +73,10 @@ contract WalletBalanceProvider {
7473
/**
7574
@dev provides balances of user wallet for all reserves available on the pool
7675
*/
77-
function getUserWalletBalances(address provider, address user)
78-
external
79-
view
80-
returns (address[] memory, uint256[] memory)
81-
{
76+
function getUserWalletBalances(
77+
address provider,
78+
address user
79+
) external view returns (address[] memory, uint256[] memory) {
8280
IPool pool = IPool(IPoolAddressesProvider(provider).getPool());
8381

8482
address[] memory reserves = pool.getReservesList();

0 commit comments

Comments
 (0)