fix: remove redundant code

- Order expiration is handled by permit2 - Dutch decay validation happens in dutchdecaylib Fixes: L-07
Uniswap · Aug 22, 2023 · 36a0a28 · 36a0a28
1 parent 0d81086
commit 36a0a28
Show file tree

Hide file tree

Showing 45 changed files with 46 additions and 68 deletions.
diff --git a/.forge-snapshots/Base-DutchOrder-BaseExecuteSingleWithFee.snap b/.forge-snapshots/Base-DutchOrder-BaseExecuteSingleWithFee.snap
@@ -1 +1 @@
-181978
+150708
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteBatch.snap b/.forge-snapshots/Base-DutchOrder-ExecuteBatch.snap
@@ -1 +1 @@
-196879
+196805
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteBatchMultipleOutputs.snap b/.forge-snapshots/Base-DutchOrder-ExecuteBatchMultipleOutputs.snap
@@ -1 +1 @@
-206650
+206576
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap b/.forge-snapshots/Base-DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap
@@ -1 +1 @@
-260307
+260233
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteBatchNativeOutput.snap b/.forge-snapshots/Base-DutchOrder-ExecuteBatchNativeOutput.snap
@@ -1 +1 @@
-190411
+190337
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteSingle.snap b/.forge-snapshots/Base-DutchOrder-ExecuteSingle.snap
@@ -1 +1 @@
-148194
+148157
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteSingleNativeOutput.snap b/.forge-snapshots/Base-DutchOrder-ExecuteSingleNativeOutput.snap
@@ -1 +1 @@
-133756
+133719
diff --git a/.forge-snapshots/Base-DutchOrder-ExecuteSingleValidation.snap b/.forge-snapshots/Base-DutchOrder-ExecuteSingleValidation.snap
@@ -1 +1 @@
-137605
+157468
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-BaseExecuteSingleWithFee.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-BaseExecuteSingleWithFee.snap
@@ -1 +1 @@
-150633
+182105
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatch.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatch.snap
@@ -1 +1 @@
-197283
+197121
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputs.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputs.snap
@@ -1 +1 @@
-207049
+206887
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap
@@ -1 +1 @@
-260720
+260558
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchNativeOutput.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchNativeOutput.snap
@@ -1 +1 @@
-190809
+190647
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingle.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingle.snap
@@ -1 +1 @@
-148401
+148320
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingleNativeOutput.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingleNativeOutput.snap
@@ -1 +1 @@
-95568
+133887
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingleValidation.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteSingleValidation.snap
@@ -1 +1 @@
-157716
+157635
diff --git a/.forge-snapshots/Base-LimitOrderReactor-BaseExecuteSingleWithFee.snap b/.forge-snapshots/Base-LimitOrderReactor-BaseExecuteSingleWithFee.snap
@@ -1 +1 @@
-178116
+146845
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatch.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatch.snap
@@ -1 +1 @@
-189056
+188982
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchMultipleOutputs.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchMultipleOutputs.snap
@@ -1 +1 @@
-197889
+197815
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchMultipleOutputsDifferentTokens.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchMultipleOutputsDifferentTokens.snap
@@ -1 +1 @@
-250617
+250543
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchNativeOutput.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteBatchNativeOutput.snap
@@ -1 +1 @@
-182582
+182508
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingle.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingle.snap
@@ -1 +1 @@
-144333
+144296
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingleNativeOutput.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingleNativeOutput.snap
@@ -1 +1 @@
-129895
+129858
diff --git a/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingleValidation.snap b/.forge-snapshots/Base-LimitOrderReactor-ExecuteSingleValidation.snap
@@ -1 +1 @@
-133743
+153606
diff --git a/.forge-snapshots/DirectFillerFillMacroSingleOrder.snap b/.forge-snapshots/DirectFillerFillMacroSingleOrder.snap
@@ -1 +1 @@
-136213
+136176
diff --git a/.forge-snapshots/DirectFillerFillMacroSingleOrderWithFee.snap b/.forge-snapshots/DirectFillerFillMacroSingleOrderWithFee.snap
@@ -1 +1 @@
-175064
+175027
diff --git a/.forge-snapshots/DirectFillerFillMacroTestEth1Output.snap b/.forge-snapshots/DirectFillerFillMacroTestEth1Output.snap
@@ -1 +1 @@
-147390
+147353
diff --git a/.forge-snapshots/DirectFillerFillMacroTestEth2Outputs.snap b/.forge-snapshots/DirectFillerFillMacroTestEth2Outputs.snap
@@ -1 +1 @@
-170604
+170530
diff --git a/.forge-snapshots/DirectFillerFillMacroThreeOrdersWithFees.snap b/.forge-snapshots/DirectFillerFillMacroThreeOrdersWithFees.snap
@@ -1 +1 @@
-435187
+435076
diff --git a/.forge-snapshots/DirectFillerFillMacroTwoOrders.snap b/.forge-snapshots/DirectFillerFillMacroTwoOrders.snap
@@ -1 +1 @@
-255972
+255898
diff --git a/.forge-snapshots/EthOutputTest3OrdersWithEthAndERC20Outputs.snap b/.forge-snapshots/EthOutputTest3OrdersWithEthAndERC20Outputs.snap
@@ -1 +1 @@
-363478
+363367
diff --git a/.forge-snapshots/EthOutputTestEthOutput.snap b/.forge-snapshots/EthOutputTestEthOutput.snap
@@ -1 +1 @@
-156223
+156186
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceAndProtocolFee.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceAndProtocolFee.snap
@@ -1 +1 @@
-176915
+176834
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceAndProtocolFeeEthOutput.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceAndProtocolFeeEthOutput.snap
@@ -1 +1 @@
-162907
+162826
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceFee.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceFee.snap
@@ -1 +1 @@
-166046
+165965
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceFeeEthOutput.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-InterfaceFeeEthOutput.snap
@@ -1 +1 @@
-146873
+146792
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-NoFees.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-NoFees.snap
@@ -1 +1 @@
-149267
+149186
diff --git a/.forge-snapshots/ProtocolFeesGasComparisonTest-NoFeesEthOutput.snap b/.forge-snapshots/ProtocolFeesGasComparisonTest-NoFeesEthOutput.snap
@@ -1 +1 @@
-124929
+124848
diff --git a/.forge-snapshots/SwapRouter02ExecutorExecute.snap b/.forge-snapshots/SwapRouter02ExecutorExecute.snap
@@ -1 +1 @@
-262973
+262936
diff --git a/.forge-snapshots/SwapRouter02ExecutorExecuteAlreadyApproved.snap b/.forge-snapshots/SwapRouter02ExecutorExecuteAlreadyApproved.snap
@@ -1 +1 @@
-118092
+118055
diff --git a/.forge-snapshots/testExclusiveFillerSucceeds.snap b/.forge-snapshots/testExclusiveFillerSucceeds.snap
@@ -1 +1 @@
-174066
+174029
diff --git a/src/lib/ResolvedOrderLib.sol b/src/lib/ResolvedOrderLib.sol
@@ -8,20 +8,13 @@ library ResolvedOrderLib {
     /// @notice thrown when the order targets a different reactor
     error InvalidReactor();
 
-    /// @notice thrown if the order has expired
-    error DeadlinePassed();
-
     /// @notice Validates a resolved order, reverting if invalid
     /// @param filler The filler of the order
     function validate(ResolvedOrder memory resolvedOrder, address filler) internal view {
         if (address(this) != address(resolvedOrder.info.reactor)) {
             revert InvalidReactor();
         }
 
-        if (block.timestamp > resolvedOrder.info.deadline) {
-            revert DeadlinePassed();
-        }
-
         if (address(resolvedOrder.info.additionalValidationContract) != address(0)) {
             resolvedOrder.info.additionalValidationContract.validate(filler, resolvedOrder);
         }

diff --git a/src/reactors/ExclusiveDutchOrderReactor.sol b/src/reactors/ExclusiveDutchOrderReactor.sol
@@ -20,9 +20,6 @@ contract ExclusiveDutchOrderReactor is BaseReactor {
     /// @notice thrown when an order's deadline is before its end time
     error DeadlineBeforeEndTime();
 
-    /// @notice thrown when an order's end time is before its start time
-    error OrderEndTimeBeforeStartTime();
-
     /// @notice thrown when an order's inputs and outputs both decay
     error InputAndOutputDecay();
 
@@ -71,10 +68,6 @@ contract ExclusiveDutchOrderReactor is BaseReactor {
             revert DeadlineBeforeEndTime();
         }
 
-        if (order.decayEndTime < order.decayStartTime) {
-            revert OrderEndTimeBeforeStartTime();
-        }
-
         if (order.input.startAmount != order.input.endAmount) {
             unchecked {
                 for (uint256 i = 0; i < order.outputs.length; i++) {

diff --git a/test/lib/OrderQuoter.t.sol b/test/lib/OrderQuoter.t.sol
@@ -26,6 +26,8 @@ contract OrderQuoterTest is Test, PermitSignature, ReactorEvents, DeployPermit2
     uint256 constant ONE = 10 ** 18;
     address constant PROTOCOL_FEE_OWNER = address(1);
 
+    error SignatureExpired(uint256 deadline);
+
     OrderQuoter quoter;
     MockERC20 tokenIn;
     MockERC20 tokenOut;
@@ -128,15 +130,14 @@ contract OrderQuoterTest is Test, PermitSignature, ReactorEvents, DeployPermit2
         uint256 timestamp = block.timestamp;
         vm.warp(timestamp + 100);
         tokenIn.forceApprove(swapper, address(permit2), ONE);
+        uint256 deadline = block.timestamp - 1;
         LimitOrder memory order = LimitOrder({
-            info: OrderInfoBuilder.init(address(limitOrderReactor)).withSwapper(address(swapper)).withDeadline(
-                block.timestamp - 1
-                ),
+            info: OrderInfoBuilder.init(address(limitOrderReactor)).withSwapper(address(swapper)).withDeadline(deadline),
             input: InputToken(tokenIn, ONE, ONE),
             outputs: OutputsBuilder.single(address(tokenOut), ONE, address(swapper))
         });
         bytes memory sig = signOrder(swapperPrivateKey, address(permit2), order);
-        vm.expectRevert(ResolvedOrderLib.DeadlinePassed.selector);
+        vm.expectRevert(abi.encodeWithSelector(SignatureExpired.selector, deadline));
         quoter.quote(abi.encode(order), sig);
     }
 

diff --git a/test/lib/ResolvedOrderLib.t.sol b/test/lib/ResolvedOrderLib.t.sol
@@ -26,15 +26,6 @@ contract ResolvedOrderLibTest is Test {
         resolvedOrderLib.validate(mockResolvedOrder, address(0));
     }
 
-    function testDeadlinePassed() public {
-        uint256 timestamp = block.timestamp;
-        vm.warp(timestamp + 100);
-        mockResolvedOrder.info = OrderInfoBuilder.init(address(resolvedOrderLib)).withDeadline(block.timestamp - 1);
-
-        vm.expectRevert(ResolvedOrderLib.DeadlinePassed.selector);
-        resolvedOrderLib.validate(mockResolvedOrder, address(0));
-    }
-
     function testValid() public {
         mockResolvedOrder.info = OrderInfoBuilder.init(address(resolvedOrderLib));
         resolvedOrderLib.validate(mockResolvedOrder, address(0));