Merge branch 'main' of https://github.com/Tranquil-Flow/shaave-contracts

chainrule-labs · Mar 22, 2024 · 58ee7dd · 58ee7dd
2 parents d9cd361 + f79c7b5
commit 58ee7dd
Show file tree

Hide file tree

Showing 23 changed files with 34 additions and 29 deletions.
diff --git a/src/FeeCollector.sol b/src/FeeCollector.sol
@@ -120,8 +120,4 @@ contract FeeCollector is Ownable, IFeeCollector {
         SafeTransferLib.safeTransfer(ERC20(_token), msg.sender, withdrawAmt);
     }
 
-    /**
-     * @notice Executes when native is sent to this contract through a non-existent function.
-     */
-    fallback() external payable { } // solhint-disable-line no-empty-blocks
 }
diff --git a/src/Position.sol b/src/Position.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 // Local Imports
 import { DebtService } from "src/services/DebtService.sol";

diff --git a/src/PositionFactory.sol b/src/PositionFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 // Local
 import { Position } from "src/Position.sol";
@@ -78,7 +78,13 @@ contract PositionFactory is Ownable, IPositionFactory {
     }
 
     /**
+<<<<<<< HEAD
      * @notice Executes when native is sent to this contract through a non-existent function.
      */
     fallback() external payable { } // solhint-disable-line no-empty-blocks
+=======
+     * @notice Executes when native is sent to this contract with a plain transaction.
+     */
+    receive() external payable { } // solhint-disable-line no-empty-blocks
+>>>>>>> f79c7b55671c8204d3d03bb5efe0ec65e1f85a29
 }
diff --git a/src/dependencies/aave/DataTypes.sol b/src/dependencies/aave/DataTypes.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 library DataTypes {
     struct ReserveData {

diff --git a/src/dependencies/access/Context.sol b/src/dependencies/access/Context.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.1) (utils/Context.sol)
 
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 /**
  * @dev Provides information about the current execution context, including the

diff --git a/src/dependencies/access/Ownable.sol b/src/dependencies/access/Ownable.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (access/Ownable.sol)
 
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 import { Context } from "src/dependencies/access/Context.sol";
 

diff --git a/src/dependencies/uniswap/TransferHelper.sol b/src/dependencies/uniswap/TransferHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 import { IERC20 } from "src/interfaces/token/IERC20.sol";
 

diff --git a/src/interfaces/IFeeCollector.sol b/src/interfaces/IFeeCollector.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 interface IFeeCollector {
     /* solhint-disable func-name-mixedcase */

diff --git a/src/interfaces/IPosition.sol b/src/interfaces/IPosition.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 import { IDebtService } from "src/interfaces/IDebtService.sol";
 

diff --git a/src/interfaces/IPositionFactory.sol b/src/interfaces/IPositionFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 interface IPositionFactory {
     /* solhint-disable func-name-mixedcase */

diff --git a/src/interfaces/aave/IAaveOracle.sol b/src/interfaces/aave/IAaveOracle.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 import { IPriceOracleGetter } from "./IPriceOracleGetter.sol";
 import { IPoolAddressesProvider } from "./IPoolAddressesProvider.sol";

diff --git a/src/interfaces/aave/IPool.sol b/src/interfaces/aave/IPool.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 import { IPoolAddressesProvider } from "src/interfaces/aave/IPoolAddressesProvider.sol";
 import { DataTypes } from "src/dependencies/aave/DataTypes.sol";

diff --git a/src/interfaces/aave/IPoolAddressesProvider.sol b/src/interfaces/aave/IPoolAddressesProvider.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 /**
  * @title IPoolAddressesProvider

diff --git a/src/interfaces/aave/IPriceOracleGetter.sol b/src/interfaces/aave/IPriceOracleGetter.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 /**
  * @title IPriceOracleGetter

diff --git a/src/interfaces/token/IERC20.sol b/src/interfaces/token/IERC20.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (token/ERC20/IERC20.sol)
 
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 /**
  * @dev Interface of the ERC-20 standard as defined in the ERC.

diff --git a/src/interfaces/token/IERC20Metadata.sol b/src/interfaces/token/IERC20Metadata.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 import { IERC20 } from "src/interfaces/token/IERC20.sol";
 

diff --git a/src/interfaces/token/IERC20Permit.sol b/src/interfaces/token/IERC20Permit.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (token/ERC20/extensions/IERC20Permit.sol)
 
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 /**
  * @dev Interface of the ERC-20 Permit extension allowing approvals to be made via signatures, as defined in

diff --git a/src/interfaces/uniswap/ISwapRouter.sol b/src/interfaces/uniswap/ISwapRouter.sol
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.21;
-pragma abicoder v2;
+pragma solidity 0.8.21;
 
 import { IUniswapV3SwapCallback } from "src/interfaces/uniswap/IUniswapV3SwapCallback.sol";
 

diff --git a/src/interfaces/uniswap/IUniswapV3SwapCallback.sol b/src/interfaces/uniswap/IUniswapV3SwapCallback.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 /// @title Callback for IUniswapV3PoolActions#swap
 /// @notice Any contract that calls IUniswapV3PoolActions#swap must implement this interface

diff --git a/src/libraries/FeeLib.sol b/src/libraries/FeeLib.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 import { SafeTransferLib, ERC20 } from "solmate/utils/SafeTransferLib.sol";
 import { IFeeCollector } from "src/interfaces/IFeeCollector.sol";

diff --git a/src/services/AdminService.sol b/src/services/AdminService.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 // Local Imports
 import { IERC20 } from "src/interfaces/token/IERC20.sol";
@@ -37,9 +37,15 @@ contract AdminService is IAdminService {
     }
 
     /**
+<<<<<<< HEAD
      * @notice Executes when native is sent to this contract through a non-existent function.
      */
     fallback() external payable { } // solhint-disable-line no-empty-blocks
+=======
+     * @notice Executes when native is sent to this contract with a plain transaction.
+     */
+    receive() external payable { } // solhint-disable-line no-empty-blocks
+>>>>>>> f79c7b55671c8204d3d03bb5efe0ec65e1f85a29
 
     /// @notice Check if the caller is the owner of the Position contract
     modifier onlyOwner() {

diff --git a/src/services/DebtService.sol b/src/services/DebtService.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.21;
+pragma solidity 0.8.21;
 
 // Local Imports
 import { AdminService } from "src/services/AdminService.sol";

diff --git a/src/services/SwapService.sol b/src/services/SwapService.sol
@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.21;
-
-pragma abicoder v2;
+pragma solidity 0.8.21;
 
 // Local imports
 import { TransferHelper } from "src/dependencies/uniswap/TransferHelper.sol";