allow bypassing FeeTaker

1inch · Nov 20, 2024 · 11448df · 11448df
1 parent 4081669
commit 11448df
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/contracts/extensions/FeeTaker.sol b/contracts/extensions/FeeTaker.sol
@@ -38,6 +38,11 @@ contract FeeTaker is IPostInteraction, AmountGetterWithFee, Ownable {
      */
     error EthTransferFailed();
 
+    /**
+     * @dev Fee taker is set to be receiver but no fees were set.
+     */
+    error InconsistentFee();
+
     address private immutable _LIMIT_ORDER_PROTOCOL;
     address private immutable _WETH;
     /// @notice Contract address whose tokens allow filling limit orders with a fee for resolvers that are outside the whitelist
@@ -128,16 +133,20 @@ contract FeeTaker is IPostInteraction, AmountGetterWithFee, Ownable {
             // fee is calculated as a sum of separate fees to limit rounding errors
             uint256 fee = Math.mulDiv(takingAmount, integratorFee, denominator) + Math.mulDiv(takingAmount, resolverFee, denominator);
 
-            if (order.takerAsset.get() == address(_WETH) && order.makerTraits.unwrapWeth()) {
-                if (fee > 0) {
-                    _sendEth(feeRecipient, fee);
-                }
-                _sendEth(receiver, takingAmount - fee);
-            } else {
-                if (fee > 0) {
-                    IERC20(order.takerAsset.get()).safeTransfer(feeRecipient, fee);
+            if (order.receiver.get() == address(this)) {
+                if (fee == 0) revert InconsistentFee();
+
+                if (order.takerAsset.get() == address(_WETH) && order.makerTraits.unwrapWeth()) {
+                    if (fee > 0) {
+                        _sendEth(feeRecipient, fee);
+                    }
+                    _sendEth(receiver, takingAmount - fee);
+                } else {
+                    if (fee > 0) {
+                        IERC20(order.takerAsset.get()).safeTransfer(feeRecipient, fee);
+                    }
+                    IERC20(order.takerAsset.get()).safeTransfer(receiver, takingAmount - fee);
                 }
-                IERC20(order.takerAsset.get()).safeTransfer(receiver, takingAmount - fee);
             }
 
             if (tail.length >= 20) {

diff --git a/test/FeeTaker.js b/test/FeeTaker.js
@@ -45,16 +45,12 @@ describe('FeeTaker', function () {
         const order = buildOrder(
             {
                 maker: addr1.address,
-                receiver: await feeTaker.getAddress(),
                 makerAsset: await dai.getAddress(),
                 takerAsset: await weth.getAddress(),
                 makingAmount,
                 takingAmount,
             },
-            buildFeeTakerExtensions({
-                feeTaker: await feeTaker.getAddress(),
-                feeRecipient,
-            }),
+            buildFeeTakerExtensions({ feeTaker: await feeTaker.getAddress() }),
         );
 
         const { r, yParityAndS: vs } = ethers.Signature.from(await signOrder(order, chainId, await swap.getAddress(), addr1));
@@ -78,17 +74,13 @@ describe('FeeTaker', function () {
         const order = buildOrder(
             {
                 maker: addr1.address,
-                receiver: await feeTaker.getAddress(),
+                receiver: makerReceiver,
                 makerAsset: await dai.getAddress(),
                 takerAsset: await weth.getAddress(),
                 makingAmount,
                 takingAmount,
             },
-            buildFeeTakerExtensions({
-                feeTaker: await feeTaker.getAddress(),
-                feeRecipient,
-                makerReceiver,
-            }),
+            buildFeeTakerExtensions({ feeTaker: await feeTaker.getAddress() }),
         );
 
         const { r, yParityAndS: vs } = ethers.Signature.from(await signOrder(order, chainId, await swap.getAddress(), addr1));