feat: Remove single flag

pancakeswap · Aug 7, 2024 · e46cf4c · e46cf4c
1 parent 3d14b86
commit e46cf4c
Show file tree

Hide file tree

Showing 24 changed files with 27 additions and 32 deletions.
diff --git a/...nFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_ExistingId.snap b/...nFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_ExistingId.snap
@@ -1 +1 @@
-180120
+179955
diff --git a/...ts/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_NewId.snap b/...ts/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_NewId.snap
@@ -1 +1 @@
-634289
+634124
diff --git a/...e-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId.snap b/...e-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId.snap
@@ -1 +1 @@
-900548
+900384
diff --git a/...ts/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId_WithHook.snap b/...ts/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId_WithHook.snap
@@ -1 +1 @@
-1265777
+1265613
diff --git a/...shots/BinFungiblePositionManager_AddLiquidityTest#testBatch_AddLiquidityWithActiveId.snap b/...shots/BinFungiblePositionManager_AddLiquidityTest#testBatch_AddLiquidityWithActiveId.snap
@@ -1 +1 @@
-913480
+913315
diff --git a/...tionManager_AddLiquidityTest#testBatch_AddLiquidityWithActiveId_WithoutCloseCurrency.snap b/...tionManager_AddLiquidityTest#testBatch_AddLiquidityWithActiveId_WithoutCloseCurrency.snap
@@ -1 +1 @@
-900549
+900385
diff --git a/...ePositionManager_RemoveLiquidityTest#testBatch_RemoveLiquidityWithActiveId_ThreeBins.snap b/...ePositionManager_RemoveLiquidityTest#testBatch_RemoveLiquidityWithActiveId_ThreeBins.snap
@@ -1 +1 @@
-222600
+222469
diff --git a/...veLiquidityTest#testBatch_RemoveLiquidityWithActiveId_ThreeBins_WithoutCloseCurrency.snap b/...veLiquidityTest#testBatch_RemoveLiquidityWithActiveId_ThreeBins_WithoutCloseCurrency.snap
@@ -1 +1 @@
-212096
+211964
diff --git a/...iblePositionManager_RemoveLiquidityTest#testRemoveLiquidityOutsideActiveId_ThreeBins.snap b/...iblePositionManager_RemoveLiquidityTest#testRemoveLiquidityOutsideActiveId_ThreeBins.snap
@@ -1 +1 @@
-146273
+146141
diff --git a/...ungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidityWithActiveId_ThreeBins.snap b/...ungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidityWithActiveId_ThreeBins.snap
@@ -1 +1 @@
-212096
+211964
diff --git a/...ge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidity_Half.snap b/...ge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidity_Half.snap
@@ -1 +1 @@
-237562
+237397
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2IncludingInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2IncludingInit.snap
@@ -1 +1 @@
-1017192
+1017028
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutInit.snap
@@ -1 +1 @@
-977380
+977216
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutNativeToken.snap
@@ -1 +1 @@
-1021528
+1021364
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3IncludingInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3IncludingInit.snap
@@ -1 +1 @@
-1096118
+1095954
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutInit.snap
@@ -1 +1 @@
-1056359
+1056195
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutNativeToken.snap
@@ -1 +1 @@
-1093888
+1093724
diff --git a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2IncludingInit.snap b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2IncludingInit.snap
@@ -1 +1 @@
-1017204
+1017040
diff --git a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutInit.snap b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutInit.snap
@@ -1 +1 @@
-977392
+977228
diff --git a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutNativeToken.snap
@@ -1 +1 @@
-1021525
+1021361
diff --git a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3IncludingInit.snap b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3IncludingInit.snap
@@ -1 +1 @@
-1094100
+1093936
diff --git a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutInit.snap b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutInit.snap
@@ -1 +1 @@
-1054341
+1054177
diff --git a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutNativeToken.snap
@@ -1 +1 @@
-1091866
+1091702
diff --git a/src/pool-bin/BinFungiblePositionManager.sol b/src/pool-bin/BinFungiblePositionManager.sol
@@ -93,20 +93,15 @@ contract BinFungiblePositionManager is
         checkDeadline(deadline)
         returns (bytes[] memory)
     {
-        return abi.decode(vault.lock(abi.encode(msg.sender, false, lockData)), (bytes[]));
+        return abi.decode(vault.lock(abi.encode(msg.sender, lockData)), (bytes[]));
     }
 
     function lockAcquired(bytes calldata rawData) external override returns (bytes memory returnData) {
         if (msg.sender != address(vault)) revert OnlyVaultCaller();
 
-        (address sender, bool isSingle, bytes memory lockData) = abi.decode(rawData, (address, bool, bytes));
-        if (isSingle) {
-            CallbackData memory data = abi.decode(lockData, (CallbackData));
-            return _handleSingleAction(data, sender, true);
-        } else {
-            bytes[] memory params = abi.decode(lockData, (bytes[]));
-            return _dispatch(params, sender);
-        }
+        (address sender, bytes memory lockData) = abi.decode(rawData, (address, bytes));
+        bytes[] memory params = abi.decode(lockData, (bytes[]));
+        return _dispatch(params, sender);
     }
 
     function _dispatch(bytes[] memory params, address sender) internal returns (bytes memory returnDataArrayBytes) {