feat: add exclusive override to xv2

This commit adds exclusive override to xv2, where anyone can fill an order even during exclusivity period as long as they pay a certain amount of basis points extra on the output
Uniswap · Feb 13, 2024 · fba5682 · fba5682
1 parent c86fbb9
commit fba5682
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 14 deletions.
diff --git a/.forge-snapshots/Base-V2DutchOrder-BaseExecuteSingleWithFee.snap b/.forge-snapshots/Base-V2DutchOrder-BaseExecuteSingleWithFee.snap
@@ -1 +1 @@
-188808
+189048
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExclusiveFiller.snap b/.forge-snapshots/Base-V2DutchOrder-ExclusiveFiller.snap
@@ -1 +1 @@
-158712
+158953
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteBatch.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteBatch.snap
@@ -1 +1 @@
-210595
+211089
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchMultipleOutputs.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchMultipleOutputs.snap
@@ -1 +1 @@
-221002
+221496
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap
@@ -1 +1 @@
-275311
+275806
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchNativeOutput.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteBatchNativeOutput.snap
@@ -1 +1 @@
-204121
+204615
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteSingle.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteSingle.snap
@@ -1 +1 @@
-155015
+155256
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteSingleNativeOutput.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteSingleNativeOutput.snap
@@ -1 +1 @@
-140582
+140822
diff --git a/.forge-snapshots/Base-V2DutchOrder-ExecuteSingleValidation.snap b/.forge-snapshots/Base-V2DutchOrder-ExecuteSingleValidation.snap
@@ -1 +1 @@
-164325
+164567
diff --git a/.forge-snapshots/Base-V2DutchOrder-InputOverride.snap b/.forge-snapshots/Base-V2DutchOrder-InputOverride.snap
@@ -1 +1 @@
-159069
+159310
diff --git a/.forge-snapshots/Base-V2DutchOrder-OutputOverride.snap b/.forge-snapshots/Base-V2DutchOrder-OutputOverride.snap
@@ -1 +1 @@
-158739
+158980
diff --git a/src/lib/V2DutchOrderLib.sol b/src/lib/V2DutchOrderLib.sol
@@ -12,6 +12,8 @@ struct CosignerData {
     uint256 decayEndTime;
     // The address who has exclusive rights to the order until decayStartTime
     address exclusiveFiller;
+    // The amount in bps that a non-exclusive filler needs to improve the outputs by to be able to fill the order
+    uint256 exclusivityOverrideBps;
     // The tokens that the swapper will provide when settling the order
     uint256 inputOverride;
     // The tokens that must be received to satisfy the order

diff --git a/src/reactors/V2DutchOrderReactor.sol b/src/reactors/V2DutchOrderReactor.sol
@@ -23,6 +23,7 @@ contract V2DutchOrderReactor is BaseReactor {
     using V2DutchOrderLib for V2DutchOrder;
     using DutchDecayLib for DutchOutput[];
     using DutchDecayLib for DutchInput;
+    using ExclusivityLib for ResolvedOrder;
 
     /// @notice thrown when an order's deadline is before its end time
     error DeadlineBeforeEndTime();
@@ -63,7 +64,11 @@ contract V2DutchOrderReactor is BaseReactor {
             sig: signedOrder.sig,
             hash: orderHash
         });
-        ExclusivityLib.handleStrictExclusivity(order.cosignerData.exclusiveFiller, order.cosignerData.decayStartTime);
+        resolvedOrder.handleExclusiveOverride(
+            order.cosignerData.exclusiveFiller,
+            order.cosignerData.decayStartTime,
+            order.cosignerData.exclusivityOverrideBps
+        );
     }
 
     /// @inheritdoc BaseReactor

diff --git a/test/reactors/V2DutchOrderReactor.t.sol b/test/reactors/V2DutchOrderReactor.t.sol
@@ -68,6 +68,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
             decayStartTime: block.timestamp,
             decayEndTime: request.info.deadline,
             exclusiveFiller: address(0),
+            exclusivityOverrideBps: 0,
             inputOverride: 0,
             outputOverrides: outputOverrides
         });
@@ -101,6 +102,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
             decayStartTime: request.decayStartTime,
             decayEndTime: request.decayEndTime,
             exclusiveFiller: address(0),
+            exclusivityOverrideBps: 0,
             inputOverride: 0,
             outputOverrides: outputOverrides
         });
@@ -125,6 +127,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
             decayStartTime: block.timestamp,
             decayEndTime: block.timestamp + 100,
             exclusiveFiller: address(0),
+            exclusivityOverrideBps: 0,
             inputOverride: 1 ether,
             outputOverrides: ArrayBuilder.fill(1, 1 ether)
         });
@@ -149,6 +152,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
             decayStartTime: block.timestamp,
             decayEndTime: block.timestamp + 100,
             exclusiveFiller: address(0),
+            exclusivityOverrideBps: 0,
             // override is more input tokens than expected
             inputOverride: 0.9 ether,
             outputOverrides: ArrayBuilder.fill(1, 1.1 ether)
@@ -173,6 +177,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
             decayStartTime: block.timestamp,
             decayEndTime: block.timestamp + 100,
             exclusiveFiller: address(0),
+            exclusivityOverrideBps: 0,
             // override is more input tokens than expected
             inputOverride: 1 ether,
             outputOverrides: ArrayBuilder.fill(1, 0.9 ether)
@@ -197,6 +202,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
             decayStartTime: block.timestamp,
             decayEndTime: block.timestamp + 100,
             exclusiveFiller: address(0),
+            exclusivityOverrideBps: 0,
             // override is more input tokens than expected
             inputOverride: 1 ether,
             outputOverrides: ArrayBuilder.fill(2, 1.1 ether)
@@ -226,6 +232,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
             decayStartTime: block.timestamp,
             decayEndTime: block.timestamp + 100,
             exclusiveFiller: address(0),
+            exclusivityOverrideBps: 0,
             inputOverride: overriddenInputAmount,
             outputOverrides: ArrayBuilder.fill(1, 0)
         });
@@ -261,6 +268,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
             decayStartTime: block.timestamp,
             decayEndTime: block.timestamp + 100,
             exclusiveFiller: address(0),
+            exclusivityOverrideBps: 0,
             inputOverride: 0,
             outputOverrides: ArrayBuilder.fill(1, overriddenOutputAmount)
         });
@@ -286,7 +294,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
         assertEq(tokenIn.balanceOf(address(fillContract)), inputAmount);
     }
 
-    function testExclusivityInvalidCaller() public {
+    function testStrictExclusivityInvalidCaller() public {
         uint256 inputAmount = 1 ether;
         tokenIn.mint(swapper, inputAmount);
         tokenOut.mint(address(fillContract), inputAmount);
@@ -295,6 +303,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
             decayStartTime: block.timestamp,
             decayEndTime: block.timestamp + 100,
             exclusiveFiller: address(1),
+            exclusivityOverrideBps: 0,
             inputOverride: 0,
             outputOverrides: ArrayBuilder.fill(1, 0)
         });
@@ -314,7 +323,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
         fillContract.execute(signedOrder);
     }
 
-    function testExclusivityValidCaller() public {
+    function testStrictExclusivityValidCaller() public {
         uint256 inputAmount = 1 ether;
         uint256 outputAmount = 1 ether;
         tokenIn.mint(swapper, inputAmount);
@@ -324,6 +333,7 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
             decayStartTime: block.timestamp,
             decayEndTime: block.timestamp + 100,
             exclusiveFiller: address(fillContract),
+            exclusivityOverrideBps: 0,
             inputOverride: 0,
             outputOverrides: ArrayBuilder.fill(1, 0)
         });
@@ -350,6 +360,73 @@ contract V2DutchOrderTest is PermitSignature, DeployPermit2, BaseDutchOrderReact
         assertEq(tokenIn.balanceOf(address(fillContract)), inputAmount);
     }
 
+    function testExclusiveOverrideInvalidCallerCosignedAmountOutput() public {
+        uint256 inputAmount = 1 ether;
+        uint256 outputAmount = 1 ether;
+        uint256 exclusivityOverrideBps = 10;
+        tokenIn.mint(swapper, inputAmount);
+        tokenOut.mint(address(fillContract), outputAmount * 2);
+        tokenIn.forceApprove(swapper, address(permit2), type(uint256).max);
+        CosignerData memory cosignerData = CosignerData({
+            decayStartTime: block.timestamp,
+            decayEndTime: block.timestamp + 100,
+            exclusiveFiller: address(1),
+            exclusivityOverrideBps: exclusivityOverrideBps,
+            inputOverride: 0,
+            outputOverrides: ArrayBuilder.fill(1, outputAmount)
+        });
+
+        V2DutchOrder memory order = V2DutchOrder({
+            info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper),
+            cosigner: vm.addr(cosignerPrivateKey),
+            input: DutchInput(tokenIn, inputAmount, inputAmount),
+            outputs: OutputsBuilder.singleDutch(address(tokenOut), 1 ether, 0.9 ether, swapper),
+            cosignerData: cosignerData,
+            cosignature: bytes("")
+        });
+        order.cosignature = cosignOrder(order.hash(), cosignerData);
+        SignedOrder memory signedOrder =
+            SignedOrder(abi.encode(order), signOrder(swapperPrivateKey, address(permit2), order));
+        fillContract.execute(signedOrder);
+        assertEq(tokenIn.balanceOf(swapper), 0);
+        assertEq(tokenOut.balanceOf(swapper), outputAmount * (10000 + exclusivityOverrideBps) / 10000);
+        assertEq(tokenIn.balanceOf(address(fillContract)), inputAmount);
+    }
+
+    function testExclusiveOverrideInvalidCallerNoCosignedAmountOutput() public {
+        uint256 inputAmount = 1 ether;
+        uint256 outputAmount = 1 ether;
+        uint256 exclusivityOverrideBps = 10;
+        tokenIn.mint(swapper, inputAmount);
+        tokenOut.mint(address(fillContract), outputAmount * 2);
+        tokenIn.forceApprove(swapper, address(permit2), type(uint256).max);
+        CosignerData memory cosignerData = CosignerData({
+            decayStartTime: block.timestamp,
+            decayEndTime: block.timestamp + 100,
+            exclusiveFiller: address(1),
+            exclusivityOverrideBps: exclusivityOverrideBps,
+            inputOverride: 0,
+            outputOverrides: ArrayBuilder.fill(1, 0)
+        });
+
+        V2DutchOrder memory order = V2DutchOrder({
+            info: OrderInfoBuilder.init(address(reactor)).withSwapper(swapper),
+            cosigner: vm.addr(cosignerPrivateKey),
+            input: DutchInput(tokenIn, inputAmount, inputAmount),
+            outputs: OutputsBuilder.singleDutch(address(tokenOut), outputAmount, 0.9 ether, swapper),
+            cosignerData: cosignerData,
+            cosignature: bytes("")
+        });
+        order.cosignature = cosignOrder(order.hash(), cosignerData);
+        SignedOrder memory signedOrder =
+            SignedOrder(abi.encode(order), signOrder(swapperPrivateKey, address(permit2), order));
+        fillContract.execute(signedOrder);
+        assertEq(tokenIn.balanceOf(swapper), 0);
+        // still overrides the base swapper signed amount
+        assertEq(tokenOut.balanceOf(swapper), outputAmount * (10000 + exclusivityOverrideBps) / 10000);
+        assertEq(tokenIn.balanceOf(address(fillContract)), inputAmount);
+    }
+
     function cosignOrder(bytes32 orderHash, CosignerData memory cosignerData) private pure returns (bytes memory sig) {
         bytes32 msgHash = keccak256(abi.encodePacked(orderHash, abi.encode(cosignerData)));
         (uint8 v, bytes32 r, bytes32 s) = vm.sign(cosignerPrivateKey, msgHash);