pull v4 periphery and revert payments

contracts/modules/Payments.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.24;
 
 import {Constants} from '../libraries/Constants.sol';
 import {ActionConstants} from '@uniswap/v4-periphery/src/libraries/ActionConstants.sol';
+import {BipsLibrary} from '@uniswap/v4-periphery/src/libraries/BipsLibrary.sol';
 import {PaymentsImmutables} from '../modules/PaymentsImmutables.sol';
 import {SafeTransferLib} from 'solmate/src/utils/SafeTransferLib.sol';
 import {ERC20} from 'solmate/src/tokens/ERC20.sol';
@@ -12,12 +13,10 @@ import {ERC20} from 'solmate/src/tokens/ERC20.sol';
 abstract contract Payments is PaymentsImmutables {
     using SafeTransferLib for ERC20;
     using SafeTransferLib for address;
+    using BipsLibrary for uint256;
 
     error InsufficientToken();
     error InsufficientETH();
-    error InvalidBips();
-
-    uint256 internal constant BPS_DENOMINATOR = 10_000;
 
     /// @notice Pays an amount of ETH or ERC20 to a recipient
     /// @param token The token to pay (can be ETH using Constants.ETH)
@@ -40,14 +39,13 @@ abstract contract Payments is PaymentsImmutables {
     /// @param recipient The address that will receive payment
     /// @param bips Portion in bips of whole balance of the contract
     function payPortion(address token, address recipient, uint256 bips) internal {
-        if (bips > BPS_DENOMINATOR) revert InvalidBips();
         if (token == Constants.ETH) {
             uint256 balance = address(this).balance;
-            uint256 amount = (balance * bips) / BPS_DENOMINATOR;
+            uint256 amount = balance.calculatePortion(bips);
             recipient.safeTransferETH(amount);
         } else {
             uint256 balance = ERC20(token).balanceOf(address(this));
-            uint256 amount = (balance * bips) / BPS_DENOMINATOR;
+            uint256 amount = balance.calculatePortion(bips);
             ERC20(token).safeTransfer(recipient, amount);
         }
     }

contracts/modules/V3ToV4Migrator.sol

@@ -32,7 +32,7 @@ abstract contract V3ToV4Migrator is MigratorImmutables {
     }
 
     /// @dev check that a call is to the ERC721 permit function
-    function _checkV3PermitCall(bytes calldata inputs) internal view {
+    function _checkV3PermitCall(bytes calldata inputs) internal pure {
         bytes4 selector;
         assembly {
             selector := calldataload(inputs.offset)

test/integration-tests/gas-tests/__snapshots__/Payments.gas.test.ts.snap

@@ -10,7 +10,7 @@ Object {
 exports[`Payments Gas Tests Individual Command Tests gas: SWEEP_WITH_FEE 1`] = `
 Object {
   "calldataByteLength": 516,
-  "gasUsed": 65702,
+  "gasUsed": 65726,
 }
 `;
 
@@ -38,7 +38,7 @@ Object {
 exports[`Payments Gas Tests Individual Command Tests gas: UNWRAP_WETH_WITH_FEE 1`] = `
 Object {
   "calldataByteLength": 644,
-  "gasUsed": 50973,
+  "gasUsed": 51006,
 }
 `;
 

test/integration-tests/gas-tests/__snapshots__/Uniswap.gas.test.ts.snap

@@ -143,7 +143,7 @@ Object {
 exports[`Uniswap Gas Tests Trade on UniswapV2 with Universal Router. ERC20 --> ERC20 gas: exactIn trade, where an output fee is taken 1`] = `
 Object {
   "calldataByteLength": 836,
-  "gasUsed": 126681,
+  "gasUsed": 126705,
 }
 `;
 
@@ -220,7 +220,7 @@ Object {
 exports[`Uniswap Gas Tests Trade on UniswapV2 with Universal Router. ERC20 --> ETH gas: exactOut, with ETH fee 1`] = `
 Object {
   "calldataByteLength": 964,
-  "gasUsed": 135975,
+  "gasUsed": 136008,
 }
 `;
 

test/integration-tests/gas-tests/__snapshots__/UniversalRouter.gas.test.ts.snap

@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`UniversalRouter Gas Tests gas: bytecode size 1`] = `19630`;
+exports[`UniversalRouter Gas Tests gas: bytecode size 1`] = `19615`;

test/integration-tests/gas-tests/__snapshots__/V3ToV4Migration.gas.test.ts.snap

@@ -31,7 +31,7 @@ Object {
 exports[`V3 to V4 Migration Gas Tests V4 Commands initialize pool gas: initialize a pool 1`] = `
 Object {
   "calldataByteLength": 484,
-  "gasUsed": 64626,
+  "gasUsed": 62478,
 }
 `;