Prevent Basic flow from interacting with Permit2

0xProject · Jul 10, 2023 · d258b1b · d258b1b
1 parent 0b36675
commit d258b1b
Show file tree

Hide file tree

Showing 51 changed files with 59 additions and 49 deletions.
diff --git a/.forge-snapshots/curveV2Pool_USDT-WETH.snap b/.forge-snapshots/curveV2Pool_USDT-WETH.snap
@@ -1 +1 @@
-293853
+361267
diff --git a/.forge-snapshots/curveV2Pool_swapRouter_USDT-WETH.snap b/.forge-snapshots/curveV2Pool_swapRouter_USDT-WETH.snap
@@ -1 +1 @@
-364005
+431419
diff --git a/.forge-snapshots/settler_basic_curve_USDT-WETH.snap b/.forge-snapshots/settler_basic_curve_USDT-WETH.snap
@@ -1 +1 @@
-368143
+441124
diff --git a/.forge-snapshots/settler_curveV2VIP_USDT-WETH.snap b/.forge-snapshots/settler_curveV2VIP_USDT-WETH.snap
@@ -1 +1 @@
-363926
+436876
diff --git a/.forge-snapshots/settler_curveV2_fee_USDT-WETH.snap b/.forge-snapshots/settler_curveV2_fee_USDT-WETH.snap
@@ -1 +1 @@
-374947
+447897
diff --git a/.forge-snapshots/settler_metaTxn_uniswapV3_DAI-WETH.snap b/.forge-snapshots/settler_metaTxn_uniswapV3_DAI-WETH.snap
@@ -1 +1 @@
-151324
+143020
diff --git a/.forge-snapshots/settler_metaTxn_uniswapV3_USDC-WETH.snap b/.forge-snapshots/settler_metaTxn_uniswapV3_USDC-WETH.snap
@@ -1 +1 @@
-167330
+167307
diff --git a/.forge-snapshots/settler_metaTxn_uniswapV3_USDT-WETH.snap b/.forge-snapshots/settler_metaTxn_uniswapV3_USDT-WETH.snap
@@ -1 +1 @@
-157712
+157696
diff --git a/.forge-snapshots/settler_uniswapV3VIP_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_DAI-WETH.snap
@@ -1 +1 @@
-121884
+113580
diff --git a/.forge-snapshots/settler_uniswapV3VIP_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_USDC-WETH.snap
@@ -1 +1 @@
-134547
+134524
diff --git a/.forge-snapshots/settler_uniswapV3VIP_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_USDT-WETH.snap
@@ -1 +1 @@
-124845
+124829
diff --git a/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_DAI-WETH.snap
@@ -1 +1 @@
-138828
+130524
diff --git a/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_USDC-WETH.snap
@@ -1 +1 @@
-155665
+155642
diff --git a/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3VIP_sellToken_fee_USDT-WETH.snap
@@ -1 +1 @@
-142901
+142885
diff --git a/.forge-snapshots/settler_uniswapV3_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3_DAI-WETH.snap
@@ -1 +1 @@
-145396
+137092
diff --git a/.forge-snapshots/settler_uniswapV3_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3_USDC-WETH.snap
@@ -1 +1 @@
-161402
+161379
diff --git a/.forge-snapshots/settler_uniswapV3_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3_USDT-WETH.snap
@@ -1 +1 @@
-151784
+151768
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_DAI-WETH.snap
@@ -1 +1 @@
-185256
+176952
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_USDC-WETH.snap
@@ -1 +1 @@
-201262
+201239
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_full_custody_USDT-WETH.snap
@@ -1 +1 @@
-191644
+191628
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_DAI-WETH.snap
@@ -1 +1 @@
-161032
+152728
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_USDC-WETH.snap
@@ -1 +1 @@
-173695
+173672
diff --git a/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3_buyToken_fee_single_custody_USDT-WETH.snap
@@ -1 +1 @@
-163993
+163977
diff --git a/.forge-snapshots/settler_uniswapV3_multiplex2_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3_multiplex2_DAI-WETH.snap
@@ -1 +1 @@
-178819
+170883
diff --git a/.forge-snapshots/settler_uniswapV3_multiplex2_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3_multiplex2_USDC-WETH.snap
@@ -1 +1 @@
-198029
+197983
diff --git a/.forge-snapshots/settler_uniswapV3_multiplex2_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3_multiplex2_USDT-WETH.snap
@@ -1 +1 @@
-187155
+187123
diff --git a/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_DAI-WETH.snap b/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_DAI-WETH.snap
@@ -1 +1 @@
-161889
+153585
diff --git a/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_USDC-WETH.snap b/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_USDC-WETH.snap
@@ -1 +1 @@
-182069
+182046
diff --git a/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_USDT-WETH.snap b/.forge-snapshots/settler_uniswapV3_sellToken_fee_single_custody_USDT-WETH.snap
@@ -1 +1 @@
-169389
+169373
diff --git a/.forge-snapshots/uniswapRouter_uniswapV3_DAI-WETH.snap b/.forge-snapshots/uniswapRouter_uniswapV3_DAI-WETH.snap
@@ -1 +1 @@
-104158
+105467
diff --git a/.forge-snapshots/uniswapRouter_uniswapV3_USDC-WETH.snap b/.forge-snapshots/uniswapRouter_uniswapV3_USDC-WETH.snap
@@ -1 +1 @@
-125460
+126411
diff --git a/.forge-snapshots/uniswapRouter_uniswapV3_USDT-WETH.snap b/.forge-snapshots/uniswapRouter_uniswapV3_USDT-WETH.snap
@@ -1 +1 @@
-116570
+116522
diff --git a/.forge-snapshots/zeroEx_curveV2VIP_USDT-WETH.snap b/.forge-snapshots/zeroEx_curveV2VIP_USDT-WETH.snap
@@ -1 +1 @@
-405054
+472468
diff --git a/.forge-snapshots/zeroEx_curveV2_transformERC20_USDT-WETH.snap b/.forge-snapshots/zeroEx_curveV2_transformERC20_USDT-WETH.snap
@@ -1 +1 @@
-410036
+477450
diff --git a/.forge-snapshots/zeroEx_metaTxn_uniswapV3_DAI-WETH.snap b/.forge-snapshots/zeroEx_metaTxn_uniswapV3_DAI-WETH.snap
@@ -1 +1 @@
-231270
+232579
diff --git a/.forge-snapshots/zeroEx_metaTxn_uniswapV3_USDC-WETH.snap b/.forge-snapshots/zeroEx_metaTxn_uniswapV3_USDC-WETH.snap
@@ -1 +1 @@
-252572
+253523
diff --git a/.forge-snapshots/zeroEx_metaTxn_uniswapV3_USDT-WETH.snap b/.forge-snapshots/zeroEx_metaTxn_uniswapV3_USDT-WETH.snap
@@ -1 +1 @@
-243810
+243762
diff --git a/.forge-snapshots/zeroEx_uniswapV3VIP_DAI-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3VIP_DAI-WETH.snap
@@ -1 +1 @@
-102959
+104268
diff --git a/.forge-snapshots/zeroEx_uniswapV3VIP_USDC-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3VIP_USDC-WETH.snap
@@ -1 +1 @@
-124261
+125212
diff --git a/.forge-snapshots/zeroEx_uniswapV3VIP_USDT-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3VIP_USDT-WETH.snap
@@ -1 +1 @@
-115499
+115451
diff --git a/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex1_DAI-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex1_DAI-WETH.snap
@@ -1 +1 @@
-116475
+117784
diff --git a/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex1_USDC-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex1_USDC-WETH.snap
@@ -1 +1 @@
-137762
+138713
diff --git a/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex1_USDT-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex1_USDT-WETH.snap
@@ -1 +1 @@
-129000
+128952
diff --git a/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex2_DAI-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex2_DAI-WETH.snap
@@ -1 +1 @@
-154293
+156911
diff --git a/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex2_USDC-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex2_USDC-WETH.snap
@@ -1 +1 @@
-179576
+181478
diff --git a/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex2_USDT-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3VIP_multiplex2_USDT-WETH.snap
@@ -1 +1 @@
-169352
+169256
diff --git a/.forge-snapshots/zeroEx_uniswapV3_transformERC20_DAI-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3_transformERC20_DAI-WETH.snap
@@ -1 +1 @@
-213732
+215041
diff --git a/.forge-snapshots/zeroEx_uniswapV3_transformERC20_USDC-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3_transformERC20_USDC-WETH.snap
@@ -1 +1 @@
-245470
+246421
diff --git a/.forge-snapshots/zeroEx_uniswapV3_transformERC20_USDT-WETH.snap b/.forge-snapshots/zeroEx_uniswapV3_transformERC20_USDT-WETH.snap
@@ -1 +1 @@
-230364
+230316
diff --git a/src/Settler.sol b/src/Settler.sol
@@ -31,6 +31,7 @@ contract Settler is Basic, OtcOrderSettlement, UniswapV3, Permit2Payment, CurveV
     uint256 private constant LOWER_255_BITS = HIGH_BIT - 1;
 
     constructor(address permit2, address zeroEx, address uniFactory, bytes32 poolInitCodeHash)
+        Basic(permit2)
         CurveV2()
         OtcOrderSettlement(permit2)
         Permit2Payment(permit2)

diff --git a/src/core/Basic.sol b/src/core/Basic.sol
@@ -8,6 +8,13 @@ import {SafeTransferLib} from "../utils/SafeTransferLib.sol";
 abstract contract Basic {
     using SafeTransferLib for ERC20;
 
+    /// @dev Permit2 address
+    address private immutable PERMIT2;
+
+    constructor(address permit2) {
+        PERMIT2 = permit2;
+    }
+
     /// @dev Sell to a pool with a generic approval, transferFrom interaction.
     /// offset in the calldata is used to update the sellAmount given a proportion of the sellToken balance
     /// @return buyAmount Amount of tokens bought
@@ -19,6 +26,8 @@ abstract contract Basic {
         uint256 offset,
         bytes memory data
     ) internal returns (uint256 buyAmount) {
+        require(pool != PERMIT2, "Basic: Pool address invalid");
+
         uint256 beforeBalanceSell = sellToken.balanceOf(address(this));
         uint256 proportionSellBalance = (beforeBalanceSell * bips) / 10_000;
         // Update the sellAmount given a proportion of the sellToken balance