Merge branch 'main' into feat/align-binPm-tokens

pancakeswap · Nov 14, 2024 · 7a0044c · 7a0044c
2 parents fbb935d + 72633c4
commit 7a0044c
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 21 deletions.
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2IncludingInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2IncludingInit.snap
@@ -1 +1 @@
-1184840
+1184840
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutInit.snap
@@ -1 +1 @@
-1050833
+1050843
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutNativeToken.snap
@@ -1 +1 @@
-1093093
+1093103
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3IncludingInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3IncludingInit.snap
@@ -1 +1 @@
-1257194
+1257194
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutInit.snap
@@ -1 +1 @@
-1123276
+1123286
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutNativeToken.snap
@@ -1 +1 @@
-1159530
+1159540
diff --git a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2IncludingInit.snap b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2IncludingInit.snap
@@ -1 +1 @@
-1184840
+1184840
diff --git a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutInit.snap b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutInit.snap
@@ -1 +1 @@
-1050833
+1050843
diff --git a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutNativeToken.snap
@@ -1 +1 @@
-1093089
+1093099
diff --git a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3IncludingInit.snap b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3IncludingInit.snap
@@ -1 +1 @@
-1255176
+1255176
diff --git a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutInit.snap b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutInit.snap
@@ -1 +1 @@
-1121258
+1121268
diff --git a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutNativeToken.snap
@@ -1 +1 @@
-1157508
+1157518
diff --git a/.../BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_ExistingId.snap b/.../BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_ExistingId.snap
@@ -1 +1 @@
-296697
+296707
diff --git a/...shots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_NewId.snap b/...shots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_NewId.snap
@@ -1 +1 @@
-1135179
+1135179
diff --git a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_SingleBin.snap b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_SingleBin.snap
@@ -1 +1 @@
-541453
+541463
diff --git a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_ThreeBins.snap b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_ThreeBins.snap
@@ -1 +1 @@
-915904
+915914
diff --git a/.forge-snapshots/BinPositionManager_NativeTokenTest#test_addLiquidity.snap b/.forge-snapshots/BinPositionManager_NativeTokenTest#test_addLiquidity.snap
@@ -1 +1 @@
-865941
+865951
diff --git a/src/pool-bin/BinPositionManager.sol b/src/pool-bin/BinPositionManager.sol
@@ -207,8 +207,12 @@ contract BinPositionManager is
         /// @dev Checks if the activeId is within slippage before calling mint. If user mint to activeId and there
         //       was a swap in hook.beforeMint() which changes the activeId, user txn will fail
         (uint24 activeId,,) = binPoolManager.getSlot0(params.poolKey.toId());
-        if (params.activeIdDesired + params.idSlippage < activeId) revert IdDesiredOverflows(activeId);
-        if (params.activeIdDesired - params.idSlippage > activeId) revert IdDesiredOverflows(activeId);
+        if (params.activeIdDesired + params.idSlippage < activeId) {
+            revert IdSlippageCaught(params.activeIdDesired, params.idSlippage, activeId);
+        }
+        if (params.activeIdDesired - params.idSlippage > activeId) {
+            revert IdSlippageCaught(params.activeIdDesired, params.idSlippage, activeId);
+        }
 
         bytes32[] memory liquidityConfigs = new bytes32[](deltaLen);
         for (uint256 i; i < liquidityConfigs.length; i++) {

diff --git a/src/pool-bin/interfaces/IBinPositionManager.sol b/src/pool-bin/interfaces/IBinPositionManager.sol
@@ -9,7 +9,7 @@ import {IPositionManager} from "../../interfaces/IPositionManager.sol";
 
 interface IBinPositionManager is IPositionManager {
     error IdOverflows(int256);
-    error IdDesiredOverflows(uint24);
+    error IdSlippageCaught(uint256 activeIdDesired, uint256 idSlippage, uint24 activeId);
     error AddLiquidityInputActiveIdMismath();
 
     /// @notice BinAddLiquidityParams

diff --git a/test/pool-bin/BinPositionManager_ModifyLiquidites.t.sol b/test/pool-bin/BinPositionManager_ModifyLiquidites.t.sol
@@ -190,7 +190,11 @@ contract BinPositionManager_ModifyLiquidityTest is BinLiquidityHelper, GasSnapsh
             _getAddParams(key1, binIds, 1 ether, 1 ether, activeId, alice);
         param.activeIdDesired = activeId - 1;
         bytes memory payload = Planner.init().add(Actions.BIN_ADD_LIQUIDITY, abi.encode(param)).encode();
-        vm.expectRevert(abi.encodeWithSelector(IBinPositionManager.IdDesiredOverflows.selector, activeId));
+        vm.expectRevert(
+            abi.encodeWithSelector(
+                IBinPositionManager.IdSlippageCaught.selector, param.activeIdDesired, param.idSlippage, activeId
+            )
+        );
         binPm.modifyLiquidities(payload, _deadline);
     }