Authorized deployer contract PRO-80

foundry.toml

@@ -5,7 +5,6 @@ optimizer = true
 via_ir = true
 optimizer_runs = 1000000
 no_match_path = "*/integration/*"
-fuzz_runs = 10000
 # needed for marktoda/forge-gas-snapshot
 ffi = true
 fs_permissions = [{ access = "read-write", path = ".forge-snapshots/"}]
@@ -15,3 +14,6 @@ evm_version = "shanghai"
 no_match_path = ""
 match_path = "*/integration/*"
 evm_version = "shanghai"
+
+[fuzz]
+runs = 100_000

src/AllowanceHolder.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.21;
 import {IAllowanceHolder} from "./IAllowanceHolder.sol";
 import {IERC20} from "./IERC20.sol";
 import {ISignatureTransfer} from "permit2/src/interfaces/ISignatureTransfer.sol";
-import {SafeTransferLib} from "./utils/SafeTransferLib.sol";
+import {SafeTransferLib} from "./vendor/SafeTransferLib.sol";
 import {UnsafeMath} from "./utils/UnsafeMath.sol";
 import {CheckCall} from "./utils/CheckCall.sol";
 import {FreeMemory} from "./utils/FreeMemory.sol";

src/Settler.sol

@@ -11,7 +11,7 @@ import {UniswapV3} from "./core/UniswapV3.sol";
 import {UniswapV2} from "./core/UniswapV2.sol";
 import {IPSM, MakerPSM} from "./core/MakerPSM.sol";
 
-import {SafeTransferLib} from "./utils/SafeTransferLib.sol";
+import {SafeTransferLib} from "./vendor/SafeTransferLib.sol";
 import {UnsafeMath} from "./utils/UnsafeMath.sol";
 import {FullMath} from "./utils/FullMath.sol";
 import {FreeMemory} from "./utils/FreeMemory.sol";
@@ -87,10 +87,10 @@ contract Settler is Permit2Payment, Basic, OtcOrderSettlement, UniswapV3, Uniswa
         address uniFactory,
         bytes32 poolInitCodeHash,
         address dai,
-        address feeRecipient,
-        address trustedForwarder
+        address trustedForwarder,
+        address feeCollector
     )
-        Permit2Payment(permit2, feeRecipient, trustedForwarder)
+        Permit2Payment(permit2, trustedForwarder, feeCollector)
         Basic()
         OtcOrderSettlement()
         UniswapV3(uniFactory, poolInitCodeHash)

src/core/Basic.sol

@@ -5,7 +5,7 @@ import {Permit2PaymentAbstract} from "./Permit2Payment.sol";
 import {InvalidOffset, ConfusedDeputy, InvalidTarget} from "./SettlerErrors.sol";
 
 import {IERC20} from "../IERC20.sol";
-import {SafeTransferLib} from "../utils/SafeTransferLib.sol";
+import {SafeTransferLib} from "../vendor/SafeTransferLib.sol";
 import {FullMath} from "../utils/FullMath.sol";
 import {Panic} from "../utils/Panic.sol";
 import {Revert} from "../utils/Revert.sol";

src/core/IFeeCollector.sol

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.21;
+
+interface IFeeCollector {
+    function feeCollector() external view returns (address);
+}

src/core/MakerPSM.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.21;
 
 import {IERC20, IERC20Meta} from "../IERC20.sol";
 
-import {SafeTransferLib} from "../utils/SafeTransferLib.sol";
+import {SafeTransferLib} from "../vendor/SafeTransferLib.sol";
 import {UnsafeMath} from "../utils/UnsafeMath.sol";
 
 interface IPSM {

src/core/OtcOrderSettlement.sol

@@ -5,7 +5,7 @@ import {IERC20} from "../IERC20.sol";
 import {ISignatureTransfer} from "permit2/src/interfaces/ISignatureTransfer.sol";
 import {SettlerAbstract} from "../SettlerAbstract.sol";
 
-import {SafeTransferLib} from "../utils/SafeTransferLib.sol";
+import {SafeTransferLib} from "../vendor/SafeTransferLib.sol";
 import {FullMath} from "../utils/FullMath.sol";
 
 abstract contract OtcOrderSettlement is SettlerAbstract {

src/core/Permit2Payment.sol

@@ -5,6 +5,7 @@ import {ForwarderNotAllowed, InvalidSignatureLen} from "./SettlerErrors.sol";
 import {ContextAbstract} from "../Context.sol";
 import {AllowanceHolderContext} from "../AllowanceHolderContext.sol";
 import {IAllowanceHolder} from "../IAllowanceHolder.sol";
+import {IFeeCollector} from "./IFeeCollector.sol";
 
 import {ISignatureTransfer} from "permit2/src/interfaces/ISignatureTransfer.sol";
 import {Panic} from "../utils/Panic.sol";
@@ -42,7 +43,7 @@ library UnsafeArray {
     }
 }
 
-abstract contract Permit2PaymentAbstract is ContextAbstract {
+abstract contract Permit2PaymentAbstract is ContextAbstract, IFeeCollector {
     string internal constant TOKEN_PERMISSIONS_TYPE = "TokenPermissions(address token,uint256 amount)";
 
     function isRestrictedTarget(address) internal view virtual returns (bool);
@@ -136,17 +137,17 @@ abstract contract Permit2Payment is Permit2PaymentAbstract, AllowanceHolderConte
 
     /// @dev Permit2 address
     ISignatureTransfer private immutable _PERMIT2;
-    address private immutable _FEE_RECIPIENT;
+    address public immutable override feeCollector;
 
     function isRestrictedTarget(address target) internal view override returns (bool) {
         return target == address(_PERMIT2) || target == address(allowanceHolder);
     }
 
-    constructor(address permit2, address feeRecipient, address allowanceHolder)
+    constructor(address permit2, address allowanceHolder, address feeCollector)
         AllowanceHolderContext(allowanceHolder)
     {
         _PERMIT2 = ISignatureTransfer(permit2);
-        _FEE_RECIPIENT = feeRecipient;
+        feeCollector = feeCollector;
     }
 
     error FeeTokenMismatch(address paymentToken, address feeToken);
@@ -175,7 +176,7 @@ abstract contract Permit2Payment is Permit2PaymentAbstract, AllowanceHolderConte
                 revert FeeTokenMismatch(token, permitted.token);
             }
             ISignatureTransfer.SignatureTransferDetails memory transferDetail = transferDetails.unsafeGet(1);
-            transferDetail.to = _FEE_RECIPIENT;
+            transferDetail.to = feeCollector;
             transferDetail.requestedAmount = permitted.amount;
         }
     }

src/core/UniswapV3.sol

@@ -9,7 +9,8 @@ import {IERC20} from "../IERC20.sol";
 import {ISignatureTransfer} from "permit2/src/interfaces/ISignatureTransfer.sol";
 import {UnsafeMath} from "../utils/UnsafeMath.sol";
 import {Panic} from "../utils/Panic.sol";
-import {SafeTransferLib} from "../utils/SafeTransferLib.sol";
+import {SafeTransferLib} from "../vendor/SafeTransferLib.sol";
+import {AddressDerivation} from "../utils/AddressDerivation.sol";
 import {VIPBase} from "./VIPBase.sol";
 import {SettlerAbstract} from "../SettlerAbstract.sol";
 
@@ -38,8 +39,8 @@ abstract contract UniswapV3 is SettlerAbstract, VIPBase {
     using UnsafeMath for uint256;
     using SafeTransferLib for IERC20;
 
-    /// @dev UniswapV3 Factory contract address prepended with '0xff' and left-aligned.
-    bytes32 private immutable UNI_FF_FACTORY_ADDRESS;
+    /// @dev UniswapV3 Factory contract address
+    address private immutable UNI_FACTORY_ADDRESS;
     /// @dev UniswapV3 pool init code hash.
     bytes32 private immutable UNI_POOL_INIT_CODE_HASH;
     /// @dev Minimum size of an encoded swap path:
@@ -64,7 +65,7 @@ abstract contract UniswapV3 is SettlerAbstract, VIPBase {
     uint256 private constant UINT24_MASK = 0xffffff;
 
     constructor(address uniFactory, bytes32 poolInitCodeHash) {
-        UNI_FF_FACTORY_ADDRESS = bytes32((uint256(0xff) << 248) | (uint256(uint160(uniFactory)) << 88));
+        UNI_FACTORY_ADDRESS = uniFactory;
         UNI_POOL_INIT_CODE_HASH = poolInitCodeHash;
     }
 
@@ -294,30 +295,27 @@ abstract contract UniswapV3 is SettlerAbstract, VIPBase {
     }
 
     // Compute the pool address given two tokens and a fee.
-    function _toPool(IERC20 inputToken, uint24 fee, IERC20 outputToken) private view returns (IUniswapV3Pool pool) {
+    function _toPool(IERC20 inputToken, uint24 fee, IERC20 outputToken) private view returns (IUniswapV3Pool) {
         // address(keccak256(abi.encodePacked(
         //     hex"ff",
         //     UNI_FACTORY_ADDRESS,
         //     keccak256(abi.encode(inputToken, outputToken, fee)),
         //     UNI_POOL_INIT_CODE_HASH
         // )))
-        bytes32 ffFactoryAddress = UNI_FF_FACTORY_ADDRESS;
-        bytes32 poolInitCodeHash = UNI_POOL_INIT_CODE_HASH;
         (IERC20 token0, IERC20 token1) =
             inputToken < outputToken ? (inputToken, outputToken) : (outputToken, inputToken);
+        bytes32 salt;
         assembly ("memory-safe") {
-            let s := mload(0x40)
-            mstore(s, ffFactoryAddress)
-            let p := add(s, 0x15)
-            // Compute the inner hash in-place
-            mstore(p, and(ADDRESS_MASK, token0))
-            mstore(add(p, 0x20), and(ADDRESS_MASK, token1))
-            mstore(add(p, 0x40), and(UINT24_MASK, fee))
-            mstore(p, keccak256(p, 0x60))
-            // compute the address
-            mstore(add(p, 0x20), poolInitCodeHash)
-            pool := keccak256(s, 0x55) // solidity clears dirty bits for us
+            let ptr := mload(0x40)
+            mstore(0x00, and(ADDRESS_MASK, token0))
+            mstore(0x20, and(ADDRESS_MASK, token1))
+            mstore(0x40, and(UINT24_MASK, fee))
+            salt := keccak256(0x00, 0x60)
+            mstore(0x40, ptr)
         }
+        return IUniswapV3Pool(
+            AddressDerivation.deriveDeterministicContract(UNI_FACTORY_ADDRESS, salt, UNI_POOL_INIT_CODE_HASH)
+        );
     }
 
     error ZeroSwapAmount();