chore: force fmt on PRs and update aave-core lib (#116)

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Run Forge Format
         run: |
-          forge fmt
+          forge fmt --check
         id: format
 
       - name: Run Forge build

script/deploy/DeployHelper.s.sol

@@ -65,11 +65,11 @@ contract DeployHelper is BaseMainnetConstants {
         IERC20 underlyingToken
     ) internal returns (WrappedERC20PermissionedDeposit wrappedToken) {
         wrappedToken = new WrappedERC20PermissionedDeposit(
-      wrappedTokenERC20Config.name, 
-      wrappedTokenERC20Config.symbol, 
-      underlyingToken,
-      initialAdmin
-    );
+            wrappedTokenERC20Config.name,
+            wrappedTokenERC20Config.symbol,
+            underlyingToken,
+            initialAdmin
+        );
 
         _logAddress("WrappedToken", address(wrappedToken));
     }
@@ -140,14 +140,14 @@ contract DeployHelper is BaseMainnetConstants {
     ) internal returns (Swapper swapper) {
         Swapper swapperImplementation = new Swapper();
         ERC1967Proxy swapperProxy = new ERC1967Proxy(
-          address(swapperImplementation),
-          abi.encodeWithSelector(
-              Swapper.Swapper_init.selector, 
-              initialAdmin,
-              IPriceOracleGetter(poolAddressesProvider.getPriceOracle()),
-              swapperOffsetDeviation
-          )
-      );
+            address(swapperImplementation),
+            abi.encodeWithSelector(
+                Swapper.Swapper_init.selector,
+                initialAdmin,
+                IPriceOracleGetter(poolAddressesProvider.getPriceOracle()),
+                swapperOffsetDeviation
+            )
+        );
 
         swapper = Swapper(address(swapperProxy));
 
@@ -187,8 +187,9 @@ contract DeployHelper is BaseMainnetConstants {
         );
 
         // UnderlyingToken <-> WETH Aerodrome Adapter
-        aerodromeAdapter =
-        new AerodromeAdapter(initialAdmin, AERODROME_ROUTER, AERODROME_FACTORY, address(swapper));
+        aerodromeAdapter = new AerodromeAdapter(
+            initialAdmin, AERODROME_ROUTER, AERODROME_FACTORY, address(swapper)
+        );
 
         IRouter.Route[] memory routesUnderlyingtoWETH = new IRouter.Route[](1);
         routesUnderlyingtoWETH[0] = IRouter.Route({
@@ -290,21 +291,21 @@ contract DeployHelper is BaseMainnetConstants {
         LoopStrategy strategyImplementation = new LoopStrategy();
 
         ERC1967Proxy strategyProxy = new ERC1967Proxy(
-          address(strategyImplementation),
-          abi.encodeWithSelector(
-              LoopStrategy.LoopStrategy_init.selector,
-              config.strategyERC20Config.name,
-              config.strategyERC20Config.symbol,
-              initialAdmin,
-              strategyAssets,
-              config.collateralRatioConfig.collateralRatioTargets,
-              poolAddressesProvider,
-              IPriceOracleGetter(poolAddressesProvider.getPriceOracle()),
-              swapper,
-              config.collateralRatioConfig.ratioMargin,
-              config.collateralRatioConfig.maxIterations
-          )
-      );
+            address(strategyImplementation),
+            abi.encodeWithSelector(
+                LoopStrategy.LoopStrategy_init.selector,
+                config.strategyERC20Config.name,
+                config.strategyERC20Config.symbol,
+                initialAdmin,
+                strategyAssets,
+                config.collateralRatioConfig.collateralRatioTargets,
+                poolAddressesProvider,
+                IPriceOracleGetter(poolAddressesProvider.getPriceOracle()),
+                swapper,
+                config.collateralRatioConfig.ratioMargin,
+                config.collateralRatioConfig.maxIterations
+            )
+        );
         strategy = LoopStrategy(address(strategyProxy));
 
         strategy.grantRole(strategy.PAUSER_ROLE(), initialAdmin);

src/interfaces/IPriceOracleGetter.sol

@@ -7,7 +7,6 @@ pragma solidity ^0.8.21;
  * @author Aave
  * @notice Interface for the Aave price oracle.
  */
-
 interface IPriceOracleGetter {
     /**
      * @notice Returns the base currency address

test/integration/IntegrationBase.sol

@@ -107,18 +107,17 @@ contract IntegrationBase is Test, DeployHelper, DeployForkConfigs {
     function _changeBorrowInterestRate(uint256 borrowRate) internal {
         vm.startPrank(testDeployer.addr);
 
-        DefaultReserveInterestRateStrategy interestRateStrategy =
-        new DefaultReserveInterestRateStrategy(
+        DefaultReserveInterestRateStrategy interestRateStrategy = new DefaultReserveInterestRateStrategy(
             poolAddressesProvider,
-            0.5 * 1e27,               
-            borrowRate,               
-            0.0000001 * 1e27,           
-            0.0000001 * 1e27,               
-            0.0000001 * 1e27,             
-            0.0000001 * 1e27,             
-            0.0000001 * 1e27,           
-            0.0000001 * 1e27,             
-            0.0000001 * 1e27          
+            0.5 * 1e27,
+            borrowRate,
+            0.0000001 * 1e27,
+            0.0000001 * 1e27,
+            0.0000001 * 1e27,
+            0.0000001 * 1e27,
+            0.0000001 * 1e27,
+            0.0000001 * 1e27,
+            0.0000001 * 1e27
         );
 
         IPoolConfigurator(poolAddressesProvider.getPoolConfigurator())

test/integration/SimulationTest.sol

@@ -59,12 +59,12 @@ contract SimulationTest is IntegrationBase {
         _deployLoopStrategyWithMockSwapper();
 
         handler = new SimulationHandler(
-          strategy, 
-          NUM_USERS, 
-          START_AMOUNT_PER_USER, 
-          MIN_DEPOSIT, 
-          MAX_DEPOSIT, 
-          JSON_PATH
+            strategy,
+            NUM_USERS,
+            START_AMOUNT_PER_USER,
+            MIN_DEPOSIT,
+            MAX_DEPOSIT,
+            JSON_PATH
         );
 
         uint256 currWethPrice = IPriceOracleGetter(
@@ -162,10 +162,10 @@ contract SimulationTest is IntegrationBase {
     function _deployLoopStrategyWithMockSwapper() internal {
         vm.startPrank(testDeployer.addr);
         SwapperMock swapperMock = new SwapperMock(
-              address(wrappedToken), 
-              address(WETH), 
-              poolAddressesProvider.getPriceOracle()
-          );
+            address(wrappedToken),
+            address(WETH),
+            poolAddressesProvider.getPriceOracle()
+        );
         swapperMock.setOffsets(DEX_FEE, DEX_FEE);
         swapperMock.setRealOffsets(DEX_FEE, DEX_FEE);
         swapperMock.setWrapped(IERC20(wrappedToken), true);

test/lib/RebalanceLogicContext.t.sol

@@ -94,8 +94,11 @@ abstract contract RebalanceLogicContext is BaseForkTest {
         CbETH_price = $.oracle.getAssetPrice(address(CbETH));
 
         // deploy mock swapper instance
-        $.swapper =
-        new SwapperMock(address($.assets.collateral), address($.assets.debt), address($.oracle));
+        $.swapper = new SwapperMock(
+            address($.assets.collateral),
+            address($.assets.debt),
+            address($.oracle)
+        );
 
         assert(
             address(SwapperMock(address($.swapper)).borrowAsset())
@@ -125,7 +128,7 @@ abstract contract RebalanceLogicContext is BaseForkTest {
         ERC1967Proxy swapperProxy = new ERC1967Proxy(
             address(swapperImplementation),
             abi.encodeWithSelector(
-                Swapper.Swapper_init.selector, 
+                Swapper.Swapper_init.selector,
                 address(this),
                 $.oracle,
                 OFFSET_DEVIATION_USD

test/unit/AerodromeAdapter.t.sol

@@ -56,8 +56,9 @@ contract AerodromeAdapterTest is BaseForkTest {
     AerodromeAdapter adapter;
 
     function setUp() public {
-        adapter =
-        new AerodromeAdapter(OWNER, AERODROME_ROUTER, AERODROME_FACTORY, alice);
+        adapter = new AerodromeAdapter(
+            OWNER, AERODROME_ROUTER, AERODROME_FACTORY, alice
+        );
 
         deal(address(WETH), address(alice), 100 ether);
     }

test/unit/LoopStrategy.t.sol

@@ -124,11 +124,13 @@ contract LoopStrategyTest is BaseForkTest {
         _changePrice(CbETH, COLLATERAL_PRICE);
         _changePrice(WETH, COLLATERAL_PRICE * 80 / 100);
 
-        wrappedToken =
-        new WrappedERC20PermissionedDeposit("wCbETH", "wCbETH", CbETH, address(this));
+        wrappedToken = new WrappedERC20PermissionedDeposit(
+            "wCbETH", "wCbETH", CbETH, address(this)
+        );
 
-        swapper =
-        new SwapperMock(address(CbETH), address(USDbC), address(priceOracle));
+        swapper = new SwapperMock(
+            address(CbETH), address(USDbC), address(priceOracle)
+        );
         strategyAssets = StrategyAssets({
             underlying: CbETH,
             collateral: CbETH,

test/unit/Swapper.t.sol

@@ -89,7 +89,7 @@ contract SwapperTest is BaseForkTest {
         ERC1967Proxy swapperProxy = new ERC1967Proxy(
             address(swapperImplementation),
             abi.encodeWithSelector(
-                Swapper.Swapper_init.selector, 
+                Swapper.Swapper_init.selector,
                 OWNER,
                 IPriceOracleGetter(poolAddressProvider.getPriceOracle()),
                 1

test/unit/WrappedERC20PermissionedDeposit.t.sol

@@ -22,8 +22,9 @@ contract WrappedERC20PermissionedDepositTest is Test {
 
     function setUp() public {
         mockERC20 = new MockERC20("Mock", "M");
-        wrappedToken =
-        new WrappedERC20PermissionedDeposit("WrappedMock", "WM", IERC20(mockERC20), address(this));
+        wrappedToken = new WrappedERC20PermissionedDeposit(
+            "WrappedMock", "WM", IERC20(mockERC20), address(this)
+        );
 
         deal(address(mockERC20), address(alice), 100 ether);
     }

test/unit/WrappedTokenAdapter.t.sol

@@ -54,8 +54,9 @@ contract WrappedTokenAdapterTest is BaseForkTest {
         adapter = new WrappedTokenAdapter(OWNER, alice);
 
         mockERC20 = new MockERC20("Mock", "M");
-        wrappedToken =
-        new WrappedERC20PermissionedDeposit("WrappedMock", "WM", IERC20(mockERC20), OWNER);
+        wrappedToken = new WrappedERC20PermissionedDeposit(
+            "WrappedMock", "WM", IERC20(mockERC20), OWNER
+        );
 
         deal(address(mockERC20), address(alice), 100 ether);