chore: running forge update and fixing OZ related methods

.gitmodules

@@ -7,3 +7,4 @@
 [submodule "lib/openzeppelin"]
 	path = lib/openzeppelin
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch = release-v5.0

src/ConstantProduct.sol

@@ -269,6 +269,6 @@ contract ConstantProduct is IERC1271 {
      * @param spender The address that can transfer on behalf of this contract.
      */
     function approveUnlimited(IERC20 token, address spender) internal {
-        OZIERC20(address(token)).safeApprove(spender, type(uint256).max);
+        OZIERC20(address(token)).forceApprove(spender, type(uint256).max);
     }
 }

src/libraries/GetTradeableOrder.sol

@@ -57,12 +57,12 @@ library GetTradeableOrder {
             sellToken = params.token0;
             buyToken = params.token1;
             sellAmount = selfReserve0 / 2 - Math.ceilDiv(selfReserve1TimesPriceNumerator, 2 * params.priceDenominator);
-            buyAmount = Math.mulDiv(sellAmount, selfReserve1, selfReserve0 - sellAmount, Math.Rounding.Up);
+            buyAmount = Math.mulDiv(sellAmount, selfReserve1, selfReserve0 - sellAmount, Math.Rounding.Ceil);
         } else {
             sellToken = params.token1;
             buyToken = params.token0;
             sellAmount = selfReserve1 / 2 - Math.ceilDiv(selfReserve0TimesPriceDenominator, 2 * params.priceNumerator);
-            buyAmount = Math.mulDiv(sellAmount, selfReserve0, selfReserve1 - sellAmount, Math.Rounding.Up);
+            buyAmount = Math.mulDiv(sellAmount, selfReserve0, selfReserve1 - sellAmount, Math.Rounding.Ceil);
         }
 
         order_ = GPv2Order.Data(

src/oracles/BalancerWeightedPoolPriceOracle.sol

@@ -137,8 +137,8 @@ contract BalancerWeightedPoolPriceOracle is IPriceOracle {
         } else {
             (max, min) = (num2, num1);
         }
-        uint256 logMax = Math.log2(max, Math.Rounding.Up);
-        uint256 logMin = Math.log2(min, Math.Rounding.Down);
+        uint256 logMax = Math.log2(max, Math.Rounding.Ceil);
+        uint256 logMin = Math.log2(min, Math.Rounding.Floor);
 
         if ((logMax <= 128) || (logMin <= TOLERANCE)) {
             return (num1, num2);

test/ConstantProduct/ConstantProductTestHarness.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.24;
 
 import {BaseComposableCoWTest} from "lib/composable-cow/test/ComposableCoW.base.t.sol";
 
-import {ConstantProduct, GPv2Order, IERC20} from "src/ConstantProduct.sol";
+import {ConstantProduct, GPv2Order, IERC20, SafeERC20} from "src/ConstantProduct.sol";
 import {UniswapV2PriceOracle, IUniswapV2Pair} from "src/oracles/UniswapV2PriceOracle.sol";
 import {ISettlement} from "src/interfaces/ISettlement.sol";
 

test/ConstantProduct/DeploymentParamsTest.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.24;
 
-import {ConstantProductTestHarness, ConstantProduct, IERC20} from "./ConstantProductTestHarness.sol";
+import {ConstantProductTestHarness, ConstantProduct, IERC20, SafeERC20} from "./ConstantProductTestHarness.sol";
 
 abstract contract DeploymentParamsTest is ConstantProductTestHarness {
     function testSetsDeploymentParameters() public {
@@ -40,7 +40,8 @@ abstract contract DeploymentParamsTest is ConstantProductTestHarness {
         mockZeroAllowance(token, expectedDeploymentAddress(), spenderBadApproval);
         vm.mockCallRevert(
             address(token),
-            abi.encodeCall(IERC20.approve, (spenderBadApproval, type(uint256).max)),
+            // Notice: we intentionally don't match the approved amount.
+            abi.encodeWithSelector(IERC20.approve.selector, spenderBadApproval),
             "mock revert on approval"
         );
         vm.mockCallRevert(address(token), hex"", abi.encode("Unexpected call to token contract"));
@@ -93,7 +94,7 @@ abstract contract DeploymentParamsTest is ConstantProductTestHarness {
         );
 
         vm.prank(defaultDeployer());
-        vm.expectRevert("SafeERC20: ERC20 operation did not succeed");
+        vm.expectRevert(abi.encodeWithSelector(SafeERC20.SafeERC20FailedOperation.selector, falseOnApproval));
         new ConstantProduct(solutionSettler, falseOnApproval, regular);
     }
 

test/ConstantProductFactory/ConstantProductFactoryTestHarness.sol

@@ -1,7 +1,14 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.24;
 
-import {ConstantProductFactory, ConstantProduct, GPv2Order, ISettlement, IERC20} from "src/ConstantProductFactory.sol";
+import {
+    ConstantProductFactory,
+    ConstantProduct,
+    GPv2Order,
+    ISettlement,
+    IERC20,
+    SafeERC20
+} from "src/ConstantProductFactory.sol";
 
 import {ConstantProductTestHarness} from "test/ConstantProduct/ConstantProductTestHarness.sol";
 

test/ConstantProductFactory/Deposit.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.24;
 
 import {IERC20} from "src/ConstantProductFactory.sol";
 
-import {ConstantProductFactoryTestHarness} from "./ConstantProductFactoryTestHarness.sol";
+import {ConstantProductFactoryTestHarness, SafeERC20} from "./ConstantProductFactoryTestHarness.sol";
 
 abstract contract Deposit is ConstantProductFactoryTestHarness {
     function testAnyoneCanDeposit() public {
@@ -54,7 +54,7 @@ abstract contract Deposit is ConstantProductFactoryTestHarness {
             abi.encode(false)
         );
 
-        vm.expectRevert("SafeERC20: ERC20 operation did not succeed");
+        vm.expectRevert(abi.encodeWithSelector(SafeERC20.SafeERC20FailedOperation.selector, token1));
         constantProductFactory.deposit(constantProduct, amount0, amount1);
     }
 

test/ConstantProductFactory/Withdraw.sol

@@ -5,7 +5,8 @@ import {ConstantProductFactory, IERC20} from "src/ConstantProductFactory.sol";
 
 import {
     EditableOwnerConstantProductFactory,
-    ConstantProductFactoryTestHarness
+    ConstantProductFactoryTestHarness,
+    SafeERC20
 } from "./ConstantProductFactoryTestHarness.sol";
 
 abstract contract Withdraw is ConstantProductFactoryTestHarness {
@@ -64,7 +65,7 @@ abstract contract Withdraw is ConstantProductFactoryTestHarness {
             token1, abi.encodeCall(IERC20.transferFrom, (address(constantProduct), owner, amount1)), abi.encode(false)
         );
 
-        vm.expectRevert("SafeERC20: ERC20 operation did not succeed");
+        vm.expectRevert(abi.encodeWithSelector(SafeERC20.SafeERC20FailedOperation.selector, token1));
         vm.prank(owner);
         factory.withdraw(constantProduct, amount0, amount1);
     }