consenlabs · alex0207s · Jul 19, 2024 · May 28, 2024 · May 28, 2024 · May 28, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
-	url = https://github.com/openzeppelin/openzeppelin-contracts
-	branch = v4.9.2
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch = v5.0.2
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std

diff --git a/contracts/AllowanceTarget.sol b/contracts/AllowanceTarget.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity 0.8.26;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import { Pausable } from "@openzeppelin/contracts/security/Pausable.sol";
+import { Pausable } from "@openzeppelin/contracts/utils/Pausable.sol";
 
 import { Ownable } from "./abstracts/Ownable.sol";
 import { IAllowanceTarget } from "./interfaces/IAllowanceTarget.sol";
@@ -29,7 +29,7 @@ contract AllowanceTarget is IAllowanceTarget, Pausable, Ownable {
     }
 
     /// @inheritdoc IAllowanceTarget
-    function spendFromUserTo(address from, address token, address to, uint256 amount) external override whenNotPaused {
+    function spendFromUserTo(address from, address token, address to, uint256 amount) external whenNotPaused {
         if (!authorized[msg.sender]) revert NotAuthorized();
         IERC20(token).safeTransferFrom(from, to, amount);
     }

diff --git a/contracts/CoordinatedTaker.sol b/contracts/CoordinatedTaker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity 0.8.26;
 
 import { TokenCollector } from "./abstracts/TokenCollector.sol";
 import { AdminManagement } from "./abstracts/AdminManagement.sol";
@@ -53,7 +53,7 @@ contract CoordinatedTaker is ICoordinatedTaker, AdminManagement, TokenCollector,
         bytes calldata extraAction,
         bytes calldata userTokenPermit,
         CoordinatorParams calldata crdParams
-    ) external payable override {
+    ) external payable {
         // validate fill permission
         {
             if (crdParams.expiry < block.timestamp) revert ExpiredPermission();

diff --git a/contracts/GenericSwap.sol b/contracts/GenericSwap.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity 0.8.26;
 
 import { TokenCollector } from "./abstracts/TokenCollector.sol";
 import { EIP712 } from "./abstracts/EIP712.sol";
@@ -20,7 +20,7 @@ contract GenericSwap is IGenericSwap, TokenCollector, EIP712 {
 
     /// @param swapData Swap data
     /// @return returnAmount Output amount of the swap
-    function executeSwap(GenericSwapData calldata swapData, bytes calldata takerTokenPermit) external payable override returns (uint256 returnAmount) {
+    function executeSwap(GenericSwapData calldata swapData, bytes calldata takerTokenPermit) external payable returns (uint256 returnAmount) {
         returnAmount = _executeSwap(swapData, msg.sender, takerTokenPermit);
 
         _emitGSExecuted(getGSDataHash(swapData), swapData, msg.sender, returnAmount);
@@ -35,7 +35,7 @@ contract GenericSwap is IGenericSwap, TokenCollector, EIP712 {
         bytes calldata takerTokenPermit,
         address taker,
         bytes calldata takerSig
-    ) external payable override returns (uint256 returnAmount) {
+    ) external payable returns (uint256 returnAmount) {
         bytes32 swapHash = getGSDataHash(swapData);
         bytes32 gs712Hash = getEIP712Hash(swapHash);
         if (filledSwap[swapHash]) revert AlreadyFilled();

diff --git a/contracts/LimitOrderSwap.sol b/contracts/LimitOrderSwap.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity 0.8.26;
 
-import { ReentrancyGuard } from "@openzeppelin/contracts/security/ReentrancyGuard.sol";
+import { ReentrancyGuard } from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 
 import { TokenCollector } from "./abstracts/TokenCollector.sol";
 import { Ownable } from "./abstracts/Ownable.sol";
@@ -51,7 +51,7 @@ contract LimitOrderSwap is ILimitOrderSwap, Ownable, TokenCollector, EIP712, Ree
     }
 
     /// @inheritdoc ILimitOrderSwap
-    function fillLimitOrder(LimitOrder calldata order, bytes calldata makerSignature, TakerParams calldata takerParams) external payable override nonReentrant {
+    function fillLimitOrder(LimitOrder calldata order, bytes calldata makerSignature, TakerParams calldata takerParams) external payable nonReentrant {
         _fillLimitOrder(order, makerSignature, takerParams, false);
     }
 
@@ -60,7 +60,7 @@ contract LimitOrderSwap is ILimitOrderSwap, Ownable, TokenCollector, EIP712, Ree
         LimitOrder calldata order,
         bytes calldata makerSignature,
         TakerParams calldata takerParams
-    ) external payable override nonReentrant {
+    ) external payable nonReentrant {
         _fillLimitOrder(order, makerSignature, takerParams, true);
     }
 
@@ -70,7 +70,7 @@ contract LimitOrderSwap is ILimitOrderSwap, Ownable, TokenCollector, EIP712, Ree
         bytes[] calldata makerSignatures,
         uint256[] calldata makerTokenAmounts,
         address[] calldata profitTokens
-    ) external payable override nonReentrant {
+    ) external payable nonReentrant {
         if (orders.length != makerSignatures.length || orders.length != makerTokenAmounts.length) revert InvalidParams();
 
         // validate orders and calculate takingAmounts
@@ -130,7 +130,7 @@ contract LimitOrderSwap is ILimitOrderSwap, Ownable, TokenCollector, EIP712, Ree
     }
 
     /// @inheritdoc ILimitOrderSwap
-    function cancelOrder(LimitOrder calldata order) external override nonReentrant {
+    function cancelOrder(LimitOrder calldata order) external nonReentrant {
         if (order.expiry < uint64(block.timestamp)) revert ExpiredOrder();
         if (msg.sender != order.maker) revert NotOrderMaker();
         bytes32 orderHash = getLimitOrderHash(order);
@@ -143,7 +143,7 @@ contract LimitOrderSwap is ILimitOrderSwap, Ownable, TokenCollector, EIP712, Ree
         emit OrderCanceled(orderHash, order.maker);
     }
 
-    function isOrderCanceled(bytes32 orderHash) external view override returns (bool) {
+    function isOrderCanceled(bytes32 orderHash) external view returns (bool) {
         uint256 orderFilledAmount = orderHashToMakerTokenFilledAmount[orderHash];
         return (orderFilledAmount & ORDER_CANCEL_AMOUNT_MASK) != 0;
     }
@@ -175,9 +175,7 @@ contract LimitOrderSwap is ILimitOrderSwap, Ownable, TokenCollector, EIP712, Ree
             if (msg.value != takerParams.takerTokenAmount) revert InvalidMsgValue();
             Asset.transferTo(Constant.ETH_ADDRESS, order.maker, takerSpendingAmount);
             uint256 ethRefund = takerParams.takerTokenAmount - takerSpendingAmount;
-            if (ethRefund > 0) {
-                Asset.transferTo(Constant.ETH_ADDRESS, payable(msg.sender), ethRefund);
-            }
+            Asset.transferTo(Constant.ETH_ADDRESS, payable(msg.sender), ethRefund);
         } else {
             if (msg.value != 0) revert InvalidMsgValue();
             _collect(order.takerToken, msg.sender, order.maker, takerSpendingAmount, takerParams.takerTokenPermit);

diff --git a/contracts/RFQ.sol b/contracts/RFQ.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity 0.8.26;
 
 import { Address } from "@openzeppelin/contracts/utils/Address.sol";
 
@@ -54,12 +54,7 @@ contract RFQ is IRFQ, Ownable, TokenCollector, EIP712 {
         emit SetFeeCollector(_newFeeCollector);
     }
 
-    function fillRFQ(
-        RFQTx calldata rfqTx,
-        bytes calldata makerSignature,
-        bytes calldata makerTokenPermit,
-        bytes calldata takerTokenPermit
-    ) external payable override {
+    function fillRFQ(RFQTx calldata rfqTx, bytes calldata makerSignature, bytes calldata makerTokenPermit, bytes calldata takerTokenPermit) external payable {
         _fillRFQ(rfqTx, makerSignature, makerTokenPermit, takerTokenPermit, bytes(""));
     }
 
@@ -69,11 +64,11 @@ contract RFQ is IRFQ, Ownable, TokenCollector, EIP712 {
         bytes calldata makerTokenPermit,
         bytes calldata takerTokenPermit,
         bytes calldata takerSignature
-    ) external override {
+    ) external {
         _fillRFQ(rfqTx, makerSignature, makerTokenPermit, takerTokenPermit, takerSignature);
     }
 
-    function cancelRFQOffer(RFQOffer calldata rfqOffer) external override {
+    function cancelRFQOffer(RFQOffer calldata rfqOffer) external {
         if (msg.sender != rfqOffer.maker) revert NotOfferMaker();
         bytes32 rfqOfferHash = getRFQOfferHash(rfqOffer);
         if (filledOffer[rfqOfferHash]) revert FilledRFQOffer();

diff --git a/contracts/SmartOrderStrategy.sol b/contracts/SmartOrderStrategy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity 0.8.26;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
@@ -26,7 +26,7 @@ contract SmartOrderStrategy is ISmartOrderStrategy, AdminManagement {
     }
 
     /// @inheritdoc IStrategy
-    function executeStrategy(address inputToken, address outputToken, uint256 inputAmount, bytes calldata data) external payable override onlyGenericSwap {
+    function executeStrategy(address inputToken, address outputToken, uint256 inputAmount, bytes calldata data) external payable onlyGenericSwap {
         if (inputAmount == 0) revert ZeroInput();
 
         Operation[] memory ops = abi.decode(data, (Operation[]));

diff --git a/contracts/abstracts/AdminManagement.sol b/contracts/abstracts/AdminManagement.sol
@@ -17,17 +17,15 @@ abstract contract AdminManagement is Ownable {
     function approveTokens(address[] calldata tokens, address[] calldata spenders) external onlyOwner {
         for (uint256 i = 0; i < tokens.length; ++i) {
             for (uint256 j = 0; j < spenders.length; ++j) {
-                IERC20(tokens[i]).safeApprove(spenders[j], type(uint256).max);
+                IERC20(tokens[i]).forceApprove(spenders[j], type(uint256).max);
             }
         }
     }
 
     function rescueTokens(address[] calldata tokens, address recipient) external onlyOwner {
         for (uint256 i = 0; i < tokens.length; ++i) {
             uint256 selfBalance = Asset.getBalance(tokens[i], address(this));
-            if (selfBalance > 0) {
-                Asset.transferTo(tokens[i], payable(recipient), selfBalance);
-            }
+            Asset.transferTo(tokens[i], payable(recipient), selfBalance);
         }
     }
 }
diff --git a/contracts/abstracts/Multicall.sol b/contracts/abstracts/Multicall.sol
diff --git a/contracts/abstracts/TokenCollector.sol b/contracts/abstracts/TokenCollector.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.17;
+pragma solidity 0.8.26;
 
 import { IERC20Permit } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Permit.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
@@ -13,7 +13,7 @@

    error Permit2DataEmpty();

    enum Source {
        TokenlonAllowanceTarget,
        Token,
        TokenPermit,
@@ -21,8 +21,8 @@
        Permit2SignatureTransfer
    }

    address public immutable permit2;
    address public immutable allowanceTarget;

    constructor(address _permit2, address _allowanceTarget) {
        permit2 = _permit2;
@@ -37,7 +37,7 @@
        } else if (src == Source.Token) {
            return IERC20(token).safeTransferFrom(from, to, amount);
        } else if (src == Source.TokenPermit) {
            (bool success, bytes memory result) = token.call(abi.encodePacked(IERC20Permit.permit.selector, data[1:]));
            if (!success) {
                assembly {
                    revert(add(result, 32), returndatasize())

diff --git a/contracts/interfaces/IAMMStrategy.sol b/contracts/interfaces/IAMMStrategy.sol
diff --git a/contracts/interfaces/IAllowanceTarget.sol b/contracts/interfaces/IAllowanceTarget.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.0;
+pragma solidity ^0.8.0;
 
 /// @title IAllowanceTarget Interface
 /// @author imToken Labs

diff --git a/contracts/interfaces/IBalancerV2Vault.sol b/contracts/interfaces/IBalancerV2Vault.sol
diff --git a/contracts/interfaces/ICoordinatedTaker.sol b/contracts/interfaces/ICoordinatedTaker.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.0;
+pragma solidity ^0.8.0;
 
 import { LimitOrder } from "../libraries/LimitOrder.sol";
 

diff --git a/contracts/interfaces/IERC1271Wallet.sol b/contracts/interfaces/IERC1271Wallet.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.0;
+pragma solidity ^0.8.0;
 
 interface IERC1271Wallet {
     function isValidSignature(bytes32 _hash, bytes calldata _signature) external view returns (bytes4 magicValue);

diff --git a/contracts/interfaces/IGenericSwap.sol b/contracts/interfaces/IGenericSwap.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.0;
+pragma solidity ^0.8.0;
 
 import { GenericSwapData } from "../libraries/GenericSwapData.sol";
 

diff --git a/contracts/interfaces/ILimitOrderSwap.sol b/contracts/interfaces/ILimitOrderSwap.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.0;
+pragma solidity ^0.8.0;
 
 import { LimitOrder } from "../libraries/LimitOrder.sol";
 

diff --git a/contracts/interfaces/IMulticall.sol b/contracts/interfaces/IMulticall.sol
diff --git a/contracts/interfaces/IRFQ.sol b/contracts/interfaces/IRFQ.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.0;
+pragma solidity ^0.8.0;
 
 import { RFQOffer } from "../libraries/RFQOffer.sol";
 import { RFQTx } from "../libraries/RFQTx.sol";

diff --git a/contracts/interfaces/ISmartOrderStrategy.sol b/contracts/interfaces/ISmartOrderStrategy.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.0;
+pragma solidity ^0.8.0;
 
 import { IStrategy } from "./IStrategy.sol";