feat: Add SwapRouter02ExecutorMultiRefactor

.forge-snapshots/Base-DutchOrder-BaseExecuteSingleWithFee.snap

@@ -1 +1 @@
-227437
+227406

.forge-snapshots/Base-DutchOrder-ExecuteBatch.snap

@@ -1 +1 @@
-222646
+222594

.forge-snapshots/Base-DutchOrder-ExecuteBatchMultipleOutputs.snap

@@ -1 +1 @@
-233204
+233154

.forge-snapshots/Base-DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap

@@ -1 +1 @@
-290148
+290100

.forge-snapshots/Base-DutchOrder-ExecuteBatchNativeOutput.snap

@@ -1 +1 @@
-213248
+213192

.forge-snapshots/Base-DutchOrder-ExecuteSingle.snap

@@ -1 +1 @@
-185136
+185110

.forge-snapshots/Base-DutchOrder-ExecuteSingleNativeOutput.snap

@@ -1 +1 @@
-166195
+166167

.forge-snapshots/Base-DutchOrder-ExecuteSingleValidation.snap

@@ -1 +1 @@
-194387
+194362

.forge-snapshots/Base-ExclusiveDutchOrder-BaseExecuteSingleWithFee.snap

@@ -1 +1 @@
-228115
+228084

.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatch.snap

@@ -1 +1 @@
-223968
+223916

.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputs.snap

@@ -1 +1 @@
-234545
+234495

.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap

@@ -1 +1 @@
-291515
+291467

.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchNativeOutput.snap

@@ -1 +1 @@
-214576
+214520

.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingle.snap

@@ -1 +1 @@
-185813
+185787

.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingleNativeOutput.snap

@@ -1 +1 @@
-166877
+166849

.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingleValidation.snap

@@ -1 +1 @@
-195068
+195043

.forge-snapshots/Base-LimitOrderReactor-BaseExecuteSingleWithFee.snap

@@ -1 +1 @@
-224455
+224424

.forge-snapshots/Base-LimitOrderReactor-ExecuteBatch.snap

@@ -1 +1 @@
-226171
+226119

.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchMultipleOutputs.snap

@@ -1 +1 @@
-235672
+235622

.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchMultipleOutputsDifferentTokens.snap

@@ -1 +1 @@
-291580
+291532

.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchNativeOutput.snap

@@ -1 +1 @@
-211979
+211923

.forge-snapshots/Base-LimitOrderReactor-ExecuteSingle.snap

@@ -1 +1 @@
-182155
+182129

.forge-snapshots/Base-LimitOrderReactor-ExecuteSingleNativeOutput.snap

@@ -1 +1 @@
-163202
+163174

.forge-snapshots/Base-LimitOrderReactor-ExecuteSingleValidation.snap

@@ -1 +1 @@
-191393
+191368

.forge-snapshots/DirectFillerFillMacroSingleOrder.snap

@@ -1 +1 @@
-156088
+156058

.forge-snapshots/DirectFillerFillMacroSingleOrderWithFee.snap

@@ -1 +1 @@
-201739
+201704

.forge-snapshots/DirectFillerFillMacroTestEth1Output.snap

@@ -1 +1 @@
-164539
+164508

.forge-snapshots/DirectFillerFillMacroTestEth2Outputs.snap

@@ -1 +1 @@
-192352
+192288

.forge-snapshots/DirectFillerFillMacroThreeOrdersWithFees.snap

@@ -1 +1 @@
-481843
+481734

.forge-snapshots/DirectFillerFillMacroTwoOrders.snap

@@ -1 +1 @@
-286504
+286443

.forge-snapshots/EthOutputTest3OrdersWithEthAndERC20Outputs.snap

@@ -1 +1 @@
-387763
+387680

.forge-snapshots/EthOutputTestEthOutput.snap

@@ -1 +1 @@
-172864
+172838

.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceAndProtocolFee.snap

@@ -1 +1 @@
-206304
+206277

.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceAndProtocolFeeEthOutput.snap

@@ -1 +1 @@
-184591
+184558

.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceFee.snap

@@ -1 +1 @@
-191078
+191056

.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceFeeEthOutput.snap

@@ -1 +1 @@
-164175
+164149

.forge-snapshots/ProtocolFeesGasComparisonTest-NoFees.snap

@@ -1 +1 @@
-169007
+168983

.forge-snapshots/ProtocolFeesGasComparisonTest-NoFeesEthOutput.snap

@@ -1 +1 @@
-141954
+141928

.forge-snapshots/SwapRouter02ExecutorExecute.snap

@@ -1 +1 @@
-249557
+249540

.forge-snapshots/SwapRouter02ExecutorExecuteAlreadyApproved.snap

@@ -1 +1 @@
-156771
+156754

.forge-snapshots/testExclusiveFillerSucceeds.snap

@@ -1 +1 @@
-195398
+195377

foundry.toml

@@ -1,5 +1,5 @@
 [profile.default]
-#solc = "0.8.20"
+solc = "0.8.26"
 auto_detect_solc = true
 src = 'src'
 out = 'out'

src/sample-executors/SwapRouter02ExecutorMultiRefactor.sol

@@ -0,0 +1,165 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+pragma solidity ^0.8.26;
+
+import {Owned} from "solmate/src/auth/Owned.sol";
+import {SafeTransferLib} from "solmate/src/utils/SafeTransferLib.sol";
+import {ERC20} from "solmate/src/tokens/ERC20.sol";
+import {WETH} from "solmate/src/tokens/WETH.sol";
+import {IReactorCallback} from "../interfaces/IReactorCallback.sol";
+import {IReactor} from "../interfaces/IReactor.sol";
+import {CurrencyLibrary} from "../lib/CurrencyLibrary.sol";
+import {ResolvedOrder, SignedOrder} from "../base/ReactorStructs.sol";
+import {ISwapRouter02} from "../external/ISwapRouter02.sol";
+
+/// @notice A fill contract that uses SwapRouter02 to execute trades; supports multiple whitelisted reactors
+contract SwapRouter02ExecutorMultiRefactor is IReactorCallback, Owned {
+    using SafeTransferLib for ERC20;
+    using CurrencyLibrary for address;
+
+    /// @notice thrown if reactorCallback is called with a non-whitelisted filler
+    error CallerNotWhitelisted();
+    /// @notice thrown if the reactor is not whitelisted
+    error ReactorNotWhitelisted();
+    /// @notice thrown if callback is not tied to the latest execute/executeBatch transient hash
+    error InvalidTransientHash();
+
+    ISwapRouter02 private immutable swapRouter02;
+    address private immutable whitelistedCaller;
+    WETH private immutable weth;
+
+    /// @dev uint256 internal constant TRANSIENT_CALLBACK_HASH_SLOT =
+    /// uint256(keccak256("SwapRouter02ExecutorMultiRefactor.transientHash")) - 1;
+    uint256 internal constant TRANSIENT_CALLBACK_HASH_SLOT =
+        0x2f0bac3a76a2fba8f3f4772f250e00386eb67437599f5c1bacd6b53f5ec962e8;
+
+    /// @notice reactors allowed to call reactorCallback and to be used in execute / executeBatch
+    mapping(address => bool) public reactorWhitelist;
+    /// @notice Emitted when owner updates reactor whitelist status
+    event ReactorWhitelisted(address indexed reactor, bool whitelisted);
+
+    modifier onlyWhitelistedCaller() {
+        if (msg.sender != whitelistedCaller) {
+            revert CallerNotWhitelisted();
+        }
+        _;
+    }
+
+    /// @dev reactor must be a whitelisted reactor address
+    modifier onlyReactor(address reactor) {
+        if (!reactorWhitelist[reactor]) {
+            revert ReactorNotWhitelisted();
+        }
+        _;
+    }
+
+    constructor(address _whitelistedCaller, address _owner, ISwapRouter02 _swapRouter02) Owned(_owner) {
+        whitelistedCaller = _whitelistedCaller;
+        swapRouter02 = _swapRouter02;
+        weth = WETH(payable(_swapRouter02.WETH9()));
+    }
+
+    /// @notice Add or remove a reactor from the whitelist (only owner)
+    function setReactorWhitelisted(IReactor reactor, bool whitelisted) external onlyOwner {
+        reactorWhitelist[address(reactor)] = whitelisted;
+        emit ReactorWhitelisted(address(reactor), whitelisted);
+    }
+
+    /// @notice assume that we already have all output tokens
+    function execute(IReactor reactor, SignedOrder calldata order, bytes calldata callbackData)
+        external
+        onlyWhitelistedCaller
+        onlyReactor(address(reactor))
+    {
+        _saveTransientHash(keccak256(abi.encode(address(reactor), callbackData)));
+        reactor.executeWithCallback(order, callbackData);
+    }
+
+    /// @notice assume that we already have all output tokens
+    function executeBatch(IReactor reactor, SignedOrder[] calldata orders, bytes calldata callbackData)
+        external
+        onlyWhitelistedCaller
+        onlyReactor(address(reactor))
+    {
+        _saveTransientHash(keccak256(abi.encode(address(reactor), callbackData)));
+        reactor.executeBatchWithCallback(orders, callbackData);
+    }
+
+    /// @notice fill UniswapX orders using SwapRouter02
+    /// @param callbackData It has the below encoded:
+    /// address[] memory tokensToApproveForSwapRouter02: Max approve these tokens to swapRouter02
+    /// address[] memory tokensToApproveForReactor: Max approve these tokens to reactor (msg.sender)
+    /// bytes[] memory multicallData: Pass into swapRouter02.multicall()
+    function reactorCallback(ResolvedOrder[] calldata, bytes calldata callbackData) external onlyReactor(msg.sender) {
+        if (_loadTransientHash() != keccak256(abi.encode(msg.sender, callbackData))) {
+            revert InvalidTransientHash();
+        }
+        // Clear transient hash before external interactions.
+        _saveTransientHash(bytes32(0));
+
+        (
+            address[] memory tokensToApproveForSwapRouter02,
+            address[] memory tokensToApproveForReactor,
+            bytes[] memory multicallData
+        ) = abi.decode(callbackData, (address[], address[], bytes[]));
+
+        address reactorAddr = msg.sender;
+
+        unchecked {
+            for (uint256 i = 0; i < tokensToApproveForSwapRouter02.length; i++) {
+                ERC20(tokensToApproveForSwapRouter02[i]).safeApprove(address(swapRouter02), type(uint256).max);
+            }
+
+            for (uint256 i = 0; i < tokensToApproveForReactor.length; i++) {
+                ERC20(tokensToApproveForReactor[i]).safeApprove(reactorAddr, type(uint256).max);
+            }
+        }
+
+        swapRouter02.multicall(type(uint256).max, multicallData);
+
+        // transfer any native balance to the reactor
+        // it will refund any excess
+        if (address(this).balance > 0) {
+            CurrencyLibrary.transferNative(reactorAddr, address(this).balance);
+        }
+    }
+
+    /// @notice This function can be used to convert ERC20s to ETH that remains in this contract
+    /// @param tokensToApprove Max approve these tokens to swapRouter02
+    /// @param multicallData Pass into swapRouter02.multicall()
+    function multicall(ERC20[] calldata tokensToApprove, bytes[] calldata multicallData) external onlyOwner {
+        for (uint256 i = 0; i < tokensToApprove.length; i++) {
+            tokensToApprove[i].safeApprove(address(swapRouter02), type(uint256).max);
+        }
+        swapRouter02.multicall(type(uint256).max, multicallData);
+    }
+
+    /// @notice Unwraps the contract's WETH9 balance and sends it to the recipient as ETH. Can only be called by owner.
+    /// @param recipient The address receiving ETH
+    function unwrapWETH(address recipient) external onlyOwner {
+        uint256 balanceWETH = weth.balanceOf(address(this));
+
+        weth.withdraw(balanceWETH);
+        SafeTransferLib.safeTransferETH(recipient, address(this).balance);
+    }
+
+    /// @notice Transfer all ETH in this contract to the recipient. Can only be called by owner.
+    /// @param recipient The recipient of the ETH
+    function withdrawETH(address recipient) external onlyOwner {
+        SafeTransferLib.safeTransferETH(recipient, address(this).balance);
+    }
+
+    /// @notice Necessary for this contract to receive ETH when calling unwrapWETH()
+    receive() external payable {}
+
+    function _saveTransientHash(bytes32 hash) internal {
+        assembly ("memory-safe") {
+            tstore(TRANSIENT_CALLBACK_HASH_SLOT, hash)
+        }
+    }
+
+    function _loadTransientHash() internal view returns (bytes32 hash) {
+        assembly ("memory-safe") {
+            hash := tload(TRANSIENT_CALLBACK_HASH_SLOT)
+        }
+    }
+}