Use permit2 from Permit2Lib

Uniswap · Sep 28, 2023 · acacd7e · acacd7e
1 parent d3526ef
commit acacd7e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatch.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatch.snap
@@ -1 +1 @@
-197273
+197283
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputs.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputs.snap
@@ -1 +1 @@
-207039
+207049
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchMultipleOutputsDifferentTokens.snap
@@ -1 +1 @@
-260710
+260720
diff --git a/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchNativeOutput.snap b/.forge-snapshots/Base-ExclusiveDutchOrder-ExecuteBatchNativeOutput.snap
@@ -1 +1 @@
-190835
+190845
diff --git a/.forge-snapshots/SwapRouter02ExecutorExecute.snap b/.forge-snapshots/SwapRouter02ExecutorExecute.snap
@@ -1 +1 @@
-250378
+250324
diff --git a/.forge-snapshots/SwapRouter02ExecutorExecuteAlreadyApproved.snap b/.forge-snapshots/SwapRouter02ExecutorExecuteAlreadyApproved.snap
@@ -1 +1 @@
-111832
+111778
diff --git a/.forge-snapshots/SwapRouter02ExecutorPermitAndExecute.snap b/.forge-snapshots/SwapRouter02ExecutorPermitAndExecute.snap
@@ -1 +1 @@
-305831
+305688
diff --git a/test/executors/SwapRouter02Executor.t.sol b/test/executors/SwapRouter02Executor.t.sol
@@ -97,7 +97,7 @@ contract SwapRouter02ExecutorTest is Test, PermitSignature, GasSnapshot, DeployP
         address signer = ecrecover(digest, v, r, s);
         assertEq(signer, bob);
 
-        tokenInPermitData = PermitData(address(tokenIn), abi.encode(bob, address(permit2), amount, deadline, v, r, s));
+        tokenInPermitData = PermitData(ERC20(tokenIn), bob, address(permit2), amount, deadline, v, r, s);
         // assert that swapper has not approved P2 yet
         assertEq(tokenIn.allowance(bob, address(permit2)), 0);
     }
@@ -216,7 +216,7 @@ contract SwapRouter02ExecutorTest is Test, PermitSignature, GasSnapshot, DeployP
         multicallData[0] = abi.encodeWithSelector(ISwapRouter02.exactInput.selector, exactInputParams);
 
         bytes[] memory data = new bytes[](2);
-        data[0] = abi.encodeWithSignature("permit((address,bytes))", tokenInPermitData);
+        data[0] = abi.encodeWithSignature("permit((address,address,address,uint256,uint256,uint8,bytes32,bytes32))", tokenInPermitData);
         data[1] = abi.encodeWithSignature(
             "execute((bytes,bytes),bytes)",
             SignedOrder(abi.encode(order), signOrder(swapperPrivateKey, address(permit2), order)),
@@ -452,7 +452,7 @@ contract SwapRouter02ExecutorTest is Test, PermitSignature, GasSnapshot, DeployP
         multicallData[0] = abi.encodeWithSelector(ISwapRouter02.exactInput.selector, exactInputParams);
 
         bytes[] memory data = new bytes[](2);
-        data[0] = abi.encodeWithSignature("permit((address,bytes))", tokenInPermitData);
+        data[0] = abi.encodeWithSignature("permit((address,address,address,uint256,uint256,uint8,bytes32,bytes32))", tokenInPermitData);
         data[1] = abi.encodeWithSignature(
             "executeBatch((bytes,bytes)[],bytes)",
             signedOrders,