diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2IncludingInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2IncludingInit.snap
index b7e65a3..8b64adc 100644
--- a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2IncludingInit.snap
+++ b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2IncludingInit.snap
@@ -1 +1 @@
-1134821
\ No newline at end of file
+1134190
\ No newline at end of file
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutInit.snap
index 14df6e7..1173f3c 100644
--- a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutInit.snap
+++ b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutInit.snap
@@ -1 +1 @@
-1022062
\ No newline at end of file
+1021438
\ No newline at end of file
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutNativeToken.snap
index fbc4d1c..da60602 100644
--- a/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutNativeToken.snap
+++ b/.forge-snapshots/BinMigratorFromPancakeswapV2Test#testMigrateFromV2WithoutNativeToken.snap
@@ -1 +1 @@
-1091391
\ No newline at end of file
+1090789
\ No newline at end of file
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3IncludingInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3IncludingInit.snap
index 066f104..4d93460 100644
--- a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3IncludingInit.snap
+++ b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3IncludingInit.snap
@@ -1 +1 @@
-1207148
\ No newline at end of file
+1206517
\ No newline at end of file
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutInit.snap b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutInit.snap
index 8ba6c7a..1757cbf 100644
--- a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutInit.snap
+++ b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutInit.snap
@@ -1 +1 @@
-1094484
\ No newline at end of file
+1093860
\ No newline at end of file
diff --git a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutNativeToken.snap
index d51df27..ee65772 100644
--- a/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutNativeToken.snap
+++ b/.forge-snapshots/BinMigratorFromPancakeswapV3Test#testMigrateFromV3WithoutNativeToken.snap
@@ -1 +1 @@
-1157796
\ No newline at end of file
+1157194
\ No newline at end of file
diff --git a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2IncludingInit.snap b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2IncludingInit.snap
index c72f389..6d6eae6 100644
--- a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2IncludingInit.snap
+++ b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2IncludingInit.snap
@@ -1 +1 @@
-1134833
\ No newline at end of file
+1134202
\ No newline at end of file
diff --git a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutInit.snap b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutInit.snap
index c54c9e2..4e38d9f 100644
--- a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutInit.snap
+++ b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutInit.snap
@@ -1 +1 @@
-1022074
\ No newline at end of file
+1021450
\ No newline at end of file
diff --git a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutNativeToken.snap
index c9573cc..758657b 100644
--- a/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutNativeToken.snap
+++ b/.forge-snapshots/BinMigratorFromUniswapV2Test#testMigrateFromV2WithoutNativeToken.snap
@@ -1 +1 @@
-1091387
\ No newline at end of file
+1090785
\ No newline at end of file
diff --git a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3IncludingInit.snap b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3IncludingInit.snap
index 3ed3810..6701d82 100644
--- a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3IncludingInit.snap
+++ b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3IncludingInit.snap
@@ -1 +1 @@
-1205130
\ No newline at end of file
+1204499
\ No newline at end of file
diff --git a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutInit.snap b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutInit.snap
index d9dcc7b..2d3cdee 100644
--- a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutInit.snap
+++ b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutInit.snap
@@ -1 +1 @@
-1092466
\ No newline at end of file
+1091842
\ No newline at end of file
diff --git a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutNativeToken.snap b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutNativeToken.snap
index be50129..2a2cf4b 100644
--- a/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutNativeToken.snap
+++ b/.forge-snapshots/BinMigratorFromUniswapV3Test#testMigrateFromV3WithoutNativeToken.snap
@@ -1 +1 @@
-1155775
\ No newline at end of file
+1155173
\ No newline at end of file
diff --git a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_ExistingId.snap b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_ExistingId.snap
index 6fa3528..c74da5b 100644
--- a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_ExistingId.snap
+++ b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_ExistingId.snap
@@ -1 +1 @@
-297809
\ No newline at end of file
+297200
\ No newline at end of file
diff --git a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_NewId.snap b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_NewId.snap
index faa5ced..fe26310 100644
--- a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_NewId.snap
+++ b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_OutsideActiveId_NewId.snap
@@ -1 +1 @@
-1136284
\ No newline at end of file
+1135675
\ No newline at end of file
diff --git a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_SingleBin.snap b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_SingleBin.snap
index 628dbec..89241f1 100644
--- a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_SingleBin.snap
+++ b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_SingleBin.snap
@@ -1 +1 @@
-542371
\ No newline at end of file
+541769
\ No newline at end of file
diff --git a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_ThreeBins.snap b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_ThreeBins.snap
index cb5d354..2e39a24 100644
--- a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_ThreeBins.snap
+++ b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_addLiquidity_ThreeBins.snap
@@ -1 +1 @@
-916923
\ No newline at end of file
+916321
\ No newline at end of file
diff --git a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_decreaseLiquidity_threeBins.snap b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_decreaseLiquidity_threeBins.snap
index baab317..6766654 100644
--- a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_decreaseLiquidity_threeBins.snap
+++ b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_decreaseLiquidity_threeBins.snap
@@ -1 +1 @@
-189052
\ No newline at end of file
+188542
\ No newline at end of file
diff --git a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_decreaseLiquidity_threeBins_half.snap b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_decreaseLiquidity_threeBins_half.snap
index 9579c8c..44f1836 100644
--- a/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_decreaseLiquidity_threeBins_half.snap
+++ b/.forge-snapshots/BinPositionManager_ModifyLiquidityTest#test_decreaseLiquidity_threeBins_half.snap
@@ -1 +1 @@
-208183
\ No newline at end of file
+207546
\ No newline at end of file
diff --git a/.forge-snapshots/BinPositionManager_NativeTokenTest#test_addLiquidity.snap b/.forge-snapshots/BinPositionManager_NativeTokenTest#test_addLiquidity.snap
index 2c8cce3..90a32e7 100644
--- a/.forge-snapshots/BinPositionManager_NativeTokenTest#test_addLiquidity.snap
+++ b/.forge-snapshots/BinPositionManager_NativeTokenTest#test_addLiquidity.snap
@@ -1 +1 @@
-866978
\ No newline at end of file
+866354
\ No newline at end of file
diff --git a/.forge-snapshots/BinPositionManager_NativeTokenTest#test_decreaseLiquidity.snap b/.forge-snapshots/BinPositionManager_NativeTokenTest#test_decreaseLiquidity.snap
index c387daf..df2a108 100644
--- a/.forge-snapshots/BinPositionManager_NativeTokenTest#test_decreaseLiquidity.snap
+++ b/.forge-snapshots/BinPositionManager_NativeTokenTest#test_decreaseLiquidity.snap
@@ -1 +1 @@
-193706
\ No newline at end of file
+193196
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_DifferentRecipient.snap b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_DifferentRecipient.snap
index 0cf2644..981265e 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_DifferentRecipient.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_DifferentRecipient.snap
@@ -1 +1 @@
-142901
\ No newline at end of file
+142282
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapEthForToken.snap b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapEthForToken.snap
index a5fa153..0ac87d1 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapEthForToken.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapEthForToken.snap
@@ -1 +1 @@
-136478
\ No newline at end of file
+135837
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapTokenForEth.snap b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapTokenForEth.snap
index d7db427..9b69e9e 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapTokenForEth.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapTokenForEth.snap
@@ -1 +1 @@
-141948
\ No newline at end of file
+141329
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_1.snap b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_1.snap
index c317945..17f7fb3 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_1.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_1.snap
@@ -1 +1 @@
-142897
\ No newline at end of file
+142278
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_2.snap b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_2.snap
index 9f0294e..1ceaf67 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_2.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_2.snap
@@ -1 +1 @@
-142930
\ No newline at end of file
+142311
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInput_MultiHopDifferentRecipient.snap b/.forge-snapshots/BinSwapRouterTest#testExactInput_MultiHopDifferentRecipient.snap
index 302d4f7..06ffb7a 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInput_MultiHopDifferentRecipient.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInput_MultiHopDifferentRecipient.snap
@@ -1 +1 @@
-175017
\ No newline at end of file
+173713
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_DifferentRecipient.snap b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_DifferentRecipient.snap
index 9916d09..21eadb4 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_DifferentRecipient.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_DifferentRecipient.snap
@@ -1 +1 @@
-147182
\ No newline at end of file
+146563
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_1.snap b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_1.snap
index 02eb738..c070c74 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_1.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_1.snap
@@ -1 +1 @@
-147178
\ No newline at end of file
+146559
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_2.snap b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_2.snap
index 637d07e..aca0eed 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_2.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_2.snap
@@ -1 +1 @@
-147208
\ No newline at end of file
+146589
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactOutput_MultiHopDifferentRecipient.snap b/.forge-snapshots/BinSwapRouterTest#testExactOutput_MultiHopDifferentRecipient.snap
index 2ab778a..0dfd2b4 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactOutput_MultiHopDifferentRecipient.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactOutput_MultiHopDifferentRecipient.snap
@@ -1 +1 @@
-178651
\ No newline at end of file
+177347
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactOutput_SingleHop.snap b/.forge-snapshots/BinSwapRouterTest#testExactOutput_SingleHop.snap
index f8c8629..0342979 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactOutput_SingleHop.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactOutput_SingleHop.snap
@@ -1 +1 @@
-148950
\ No newline at end of file
+148331
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2IncludingInit.snap b/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2IncludingInit.snap
index 63ccef9..79cdd99 100644
--- a/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2IncludingInit.snap
+++ b/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2IncludingInit.snap
@@ -1 +1 @@
-744337
\ No newline at end of file
+743688
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2WithoutInit.snap b/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2WithoutInit.snap
index 525f554..4c56ffa 100644
--- a/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2WithoutInit.snap
+++ b/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2WithoutInit.snap
@@ -1 +1 @@
-629382
\ No newline at end of file
+628733
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2WithoutNativeToken.snap b/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2WithoutNativeToken.snap
index 5f7dc37..f4669cc 100644
--- a/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2WithoutNativeToken.snap
+++ b/.forge-snapshots/CLMigratorFromPancakeswapV2Test#testCLMigrateFromV2WithoutNativeToken.snap
@@ -1 +1 @@
-700973
\ No newline at end of file
+700346
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3IncludingInit.snap b/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3IncludingInit.snap
index 79de154..432d69d 100644
--- a/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3IncludingInit.snap
+++ b/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3IncludingInit.snap
@@ -1 +1 @@
-794218
\ No newline at end of file
+793569
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3WithoutInit.snap b/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3WithoutInit.snap
index 4438f4e..6008c00 100644
--- a/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3WithoutInit.snap
+++ b/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3WithoutInit.snap
@@ -1 +1 @@
-681818
\ No newline at end of file
+681169
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3WithoutNativeToken.snap b/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3WithoutNativeToken.snap
index d0c9814..c28ca7e 100644
--- a/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3WithoutNativeToken.snap
+++ b/.forge-snapshots/CLMigratorFromPancakeswapV3Test#testCLMigrateFromV3WithoutNativeToken.snap
@@ -1 +1 @@
-750896
\ No newline at end of file
+750269
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2IncludingInit.snap b/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2IncludingInit.snap
index 22ef3cf..8167da4 100644
--- a/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2IncludingInit.snap
+++ b/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2IncludingInit.snap
@@ -1 +1 @@
-744349
\ No newline at end of file
+743700
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2WithoutInit.snap b/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2WithoutInit.snap
index bffd40b..4fb5e6a 100644
--- a/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2WithoutInit.snap
+++ b/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2WithoutInit.snap
@@ -1 +1 @@
-629394
\ No newline at end of file
+628745
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2WithoutNativeToken.snap b/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2WithoutNativeToken.snap
index 5f7dc37..f4669cc 100644
--- a/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2WithoutNativeToken.snap
+++ b/.forge-snapshots/CLMigratorFromUniswapV2Test#testCLMigrateFromV2WithoutNativeToken.snap
@@ -1 +1 @@
-700973
\ No newline at end of file
+700346
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3IncludingInit.snap b/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3IncludingInit.snap
index d44465b..b77a77c 100644
--- a/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3IncludingInit.snap
+++ b/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3IncludingInit.snap
@@ -1 +1 @@
-792200
\ No newline at end of file
+791551
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3WithoutInit.snap b/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3WithoutInit.snap
index be4ae7c..5125715 100644
--- a/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3WithoutInit.snap
+++ b/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3WithoutInit.snap
@@ -1 +1 @@
-679800
\ No newline at end of file
+679151
\ No newline at end of file
diff --git a/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3WithoutNativeToken.snap b/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3WithoutNativeToken.snap
index 9d71fb5..678a80b 100644
--- a/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3WithoutNativeToken.snap
+++ b/.forge-snapshots/CLMigratorFromUniswapV3Test#testCLMigrateFromV3WithoutNativeToken.snap
@@ -1 +1 @@
-748878
\ No newline at end of file
+748251
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_burn_nonEmpty_native_withClose.snap b/.forge-snapshots/CLPositionManager_burn_nonEmpty_native_withClose.snap
index 98a272d..973c259 100644
--- a/.forge-snapshots/CLPositionManager_burn_nonEmpty_native_withClose.snap
+++ b/.forge-snapshots/CLPositionManager_burn_nonEmpty_native_withClose.snap
@@ -1 +1 @@
-176469
\ No newline at end of file
+175798
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_burn_nonEmpty_native_withTakePair.snap b/.forge-snapshots/CLPositionManager_burn_nonEmpty_native_withTakePair.snap
index 4127e2e..a90017a 100644
--- a/.forge-snapshots/CLPositionManager_burn_nonEmpty_native_withTakePair.snap
+++ b/.forge-snapshots/CLPositionManager_burn_nonEmpty_native_withTakePair.snap
@@ -1 +1 @@
-175784
\ No newline at end of file
+175113
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_burn_nonEmpty_withClose.snap b/.forge-snapshots/CLPositionManager_burn_nonEmpty_withClose.snap
index 4fc7179..633dd71 100644
--- a/.forge-snapshots/CLPositionManager_burn_nonEmpty_withClose.snap
+++ b/.forge-snapshots/CLPositionManager_burn_nonEmpty_withClose.snap
@@ -1 +1 @@
-185048
\ No newline at end of file
+184377
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_burn_nonEmpty_withTakePair.snap b/.forge-snapshots/CLPositionManager_burn_nonEmpty_withTakePair.snap
index d763dd1..19017f9 100644
--- a/.forge-snapshots/CLPositionManager_burn_nonEmpty_withTakePair.snap
+++ b/.forge-snapshots/CLPositionManager_burn_nonEmpty_withTakePair.snap
@@ -1 +1 @@
-184363
\ No newline at end of file
+183692
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_collect_native.snap b/.forge-snapshots/CLPositionManager_collect_native.snap
index e7aa121..c814998 100644
--- a/.forge-snapshots/CLPositionManager_collect_native.snap
+++ b/.forge-snapshots/CLPositionManager_collect_native.snap
@@ -1 +1 @@
-207935
\ No newline at end of file
+207264
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_collect_sameRange.snap b/.forge-snapshots/CLPositionManager_collect_sameRange.snap
index ead0bd7..858be24 100644
--- a/.forge-snapshots/CLPositionManager_collect_sameRange.snap
+++ b/.forge-snapshots/CLPositionManager_collect_sameRange.snap
@@ -1 +1 @@
-216514
\ No newline at end of file
+215843
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_collect_withClose.snap b/.forge-snapshots/CLPositionManager_collect_withClose.snap
index ead0bd7..858be24 100644
--- a/.forge-snapshots/CLPositionManager_collect_withClose.snap
+++ b/.forge-snapshots/CLPositionManager_collect_withClose.snap
@@ -1 +1 @@
-216514
\ No newline at end of file
+215843
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_collect_withTakePair.snap b/.forge-snapshots/CLPositionManager_collect_withTakePair.snap
index 93734f5..ba82353 100644
--- a/.forge-snapshots/CLPositionManager_collect_withTakePair.snap
+++ b/.forge-snapshots/CLPositionManager_collect_withTakePair.snap
@@ -1 +1 @@
-215841
\ No newline at end of file
+215170
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_decreaseLiquidity_native.snap b/.forge-snapshots/CLPositionManager_decreaseLiquidity_native.snap
index 68b57bd..6158e08 100644
--- a/.forge-snapshots/CLPositionManager_decreaseLiquidity_native.snap
+++ b/.forge-snapshots/CLPositionManager_decreaseLiquidity_native.snap
@@ -1 +1 @@
-173218
\ No newline at end of file
+172547
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_decreaseLiquidity_withClose.snap b/.forge-snapshots/CLPositionManager_decreaseLiquidity_withClose.snap
index d35a56b..c10a817 100644
--- a/.forge-snapshots/CLPositionManager_decreaseLiquidity_withClose.snap
+++ b/.forge-snapshots/CLPositionManager_decreaseLiquidity_withClose.snap
@@ -1 +1 @@
-181797
\ No newline at end of file
+181126
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_decreaseLiquidity_withTakePair.snap b/.forge-snapshots/CLPositionManager_decreaseLiquidity_withTakePair.snap
index 5ef512e..3b6f6d7 100644
--- a/.forge-snapshots/CLPositionManager_decreaseLiquidity_withTakePair.snap
+++ b/.forge-snapshots/CLPositionManager_decreaseLiquidity_withTakePair.snap
@@ -1 +1 @@
-181124
\ No newline at end of file
+180453
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_decrease_burnEmpty.snap b/.forge-snapshots/CLPositionManager_decrease_burnEmpty.snap
index c7152e3..e5d17a7 100644
--- a/.forge-snapshots/CLPositionManager_decrease_burnEmpty.snap
+++ b/.forge-snapshots/CLPositionManager_decrease_burnEmpty.snap
@@ -1 +1 @@
-188731
\ No newline at end of file
+188060
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_decrease_burnEmpty_native.snap b/.forge-snapshots/CLPositionManager_decrease_burnEmpty_native.snap
index f0d0d5d..c441e7a 100644
--- a/.forge-snapshots/CLPositionManager_decrease_burnEmpty_native.snap
+++ b/.forge-snapshots/CLPositionManager_decrease_burnEmpty_native.snap
@@ -1 +1 @@
-180152
\ No newline at end of file
+179481
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_decrease_sameRange_allLiquidity.snap b/.forge-snapshots/CLPositionManager_decrease_sameRange_allLiquidity.snap
index 3c860c5..b4c5042 100644
--- a/.forge-snapshots/CLPositionManager_decrease_sameRange_allLiquidity.snap
+++ b/.forge-snapshots/CLPositionManager_decrease_sameRange_allLiquidity.snap
@@ -1 +1 @@
-194422
\ No newline at end of file
+193751
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_decrease_take_take.snap b/.forge-snapshots/CLPositionManager_decrease_take_take.snap
index d7fd6f6..6828e0c 100644
--- a/.forge-snapshots/CLPositionManager_decrease_take_take.snap
+++ b/.forge-snapshots/CLPositionManager_decrease_take_take.snap
@@ -1 +1 @@
-182390
\ No newline at end of file
+181719
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_increaseLiquidity_erc20_withClose.snap b/.forge-snapshots/CLPositionManager_increaseLiquidity_erc20_withClose.snap
index 307bf2a..9f5e3a6 100644
--- a/.forge-snapshots/CLPositionManager_increaseLiquidity_erc20_withClose.snap
+++ b/.forge-snapshots/CLPositionManager_increaseLiquidity_erc20_withClose.snap
@@ -1 +1 @@
-221161
\ No newline at end of file
+220534
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_increaseLiquidity_erc20_withSettlePair.snap b/.forge-snapshots/CLPositionManager_increaseLiquidity_erc20_withSettlePair.snap
index 9734e8e..021f2a5 100644
--- a/.forge-snapshots/CLPositionManager_increaseLiquidity_erc20_withSettlePair.snap
+++ b/.forge-snapshots/CLPositionManager_increaseLiquidity_erc20_withSettlePair.snap
@@ -1 +1 @@
-220128
\ No newline at end of file
+219501
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_increaseLiquidity_native.snap b/.forge-snapshots/CLPositionManager_increaseLiquidity_native.snap
index ed44c27..b550521 100644
--- a/.forge-snapshots/CLPositionManager_increaseLiquidity_native.snap
+++ b/.forge-snapshots/CLPositionManager_increaseLiquidity_native.snap
@@ -1 +1 @@
-203061
\ No newline at end of file
+202412
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_increase_autocompoundExactUnclaimedFees.snap b/.forge-snapshots/CLPositionManager_increase_autocompoundExactUnclaimedFees.snap
index 8fed2e9..4c7225a 100644
--- a/.forge-snapshots/CLPositionManager_increase_autocompoundExactUnclaimedFees.snap
+++ b/.forge-snapshots/CLPositionManager_increase_autocompoundExactUnclaimedFees.snap
@@ -1 +1 @@
-166109
\ No newline at end of file
+165420
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_increase_autocompoundExcessFeesCredit.snap b/.forge-snapshots/CLPositionManager_increase_autocompoundExcessFeesCredit.snap
index 2b29e9b..73e2fbf 100644
--- a/.forge-snapshots/CLPositionManager_increase_autocompoundExcessFeesCredit.snap
+++ b/.forge-snapshots/CLPositionManager_increase_autocompoundExcessFeesCredit.snap
@@ -1 +1 @@
-239386
\ No newline at end of file
+238715
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_increase_autocompound_clearExcess.snap b/.forge-snapshots/CLPositionManager_increase_autocompound_clearExcess.snap
index da62aa6..f90fab2 100644
--- a/.forge-snapshots/CLPositionManager_increase_autocompound_clearExcess.snap
+++ b/.forge-snapshots/CLPositionManager_increase_autocompound_clearExcess.snap
@@ -1 +1 @@
-210144
\ No newline at end of file
+209473
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_mint_native.snap b/.forge-snapshots/CLPositionManager_mint_native.snap
index 1343ceb..afb45e5 100644
--- a/.forge-snapshots/CLPositionManager_mint_native.snap
+++ b/.forge-snapshots/CLPositionManager_mint_native.snap
@@ -1 +1 @@
-539251
\ No newline at end of file
+538602
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_mint_nativeWithSweep_withClose.snap b/.forge-snapshots/CLPositionManager_mint_nativeWithSweep_withClose.snap
index 1a8bb07..c730ac9 100644
--- a/.forge-snapshots/CLPositionManager_mint_nativeWithSweep_withClose.snap
+++ b/.forge-snapshots/CLPositionManager_mint_nativeWithSweep_withClose.snap
@@ -1 +1 @@
-547780
\ No newline at end of file
+547131
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_mint_nativeWithSweep_withSettlePair.snap b/.forge-snapshots/CLPositionManager_mint_nativeWithSweep_withSettlePair.snap
index eada0e8..3aacbbf 100644
--- a/.forge-snapshots/CLPositionManager_mint_nativeWithSweep_withSettlePair.snap
+++ b/.forge-snapshots/CLPositionManager_mint_nativeWithSweep_withSettlePair.snap
@@ -1 +1 @@
-547031
\ No newline at end of file
+546382
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_mint_onSameTickLower.snap b/.forge-snapshots/CLPositionManager_mint_onSameTickLower.snap
index a0f4b12..5bb6701 100644
--- a/.forge-snapshots/CLPositionManager_mint_onSameTickLower.snap
+++ b/.forge-snapshots/CLPositionManager_mint_onSameTickLower.snap
@@ -1 +1 @@
-394147
\ No newline at end of file
+393520
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_mint_onSameTickUpper.snap b/.forge-snapshots/CLPositionManager_mint_onSameTickUpper.snap
index 23dac70..a54abdf 100644
--- a/.forge-snapshots/CLPositionManager_mint_onSameTickUpper.snap
+++ b/.forge-snapshots/CLPositionManager_mint_onSameTickUpper.snap
@@ -1 +1 @@
-394584
\ No newline at end of file
+393957
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_mint_sameRange.snap b/.forge-snapshots/CLPositionManager_mint_sameRange.snap
index 7505e20..31be31e 100644
--- a/.forge-snapshots/CLPositionManager_mint_sameRange.snap
+++ b/.forge-snapshots/CLPositionManager_mint_sameRange.snap
@@ -1 +1 @@
-303372
\ No newline at end of file
+302745
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_mint_settleWithBalance_sweep.snap b/.forge-snapshots/CLPositionManager_mint_settleWithBalance_sweep.snap
index bfef856..8eec83d 100644
--- a/.forge-snapshots/CLPositionManager_mint_settleWithBalance_sweep.snap
+++ b/.forge-snapshots/CLPositionManager_mint_settleWithBalance_sweep.snap
@@ -1 +1 @@
-593441
\ No newline at end of file
+592814
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_mint_warmedPool_differentRange.snap b/.forge-snapshots/CLPositionManager_mint_warmedPool_differentRange.snap
index b80d2d3..488295d 100644
--- a/.forge-snapshots/CLPositionManager_mint_warmedPool_differentRange.snap
+++ b/.forge-snapshots/CLPositionManager_mint_warmedPool_differentRange.snap
@@ -1 +1 @@
-399859
\ No newline at end of file
+399232
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_mint_withClose.snap b/.forge-snapshots/CLPositionManager_mint_withClose.snap
index e4fe679..b3a49c7 100644
--- a/.forge-snapshots/CLPositionManager_mint_withClose.snap
+++ b/.forge-snapshots/CLPositionManager_mint_withClose.snap
@@ -1 +1 @@
-594591
\ No newline at end of file
+593964
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_mint_withSettlePair.snap b/.forge-snapshots/CLPositionManager_mint_withSettlePair.snap
index 0c4738f..5d08e26 100644
--- a/.forge-snapshots/CLPositionManager_mint_withSettlePair.snap
+++ b/.forge-snapshots/CLPositionManager_mint_withSettlePair.snap
@@ -1 +1 @@
-593700
\ No newline at end of file
+593073
\ No newline at end of file
diff --git a/.forge-snapshots/CLPositionManager_multicall_initialize_mint.snap b/.forge-snapshots/CLPositionManager_multicall_initialize_mint.snap
index 62e7a61..bd82a24 100644
--- a/.forge-snapshots/CLPositionManager_multicall_initialize_mint.snap
+++ b/.forge-snapshots/CLPositionManager_multicall_initialize_mint.snap
@@ -1 +1 @@
-653692
\ No newline at end of file
+653065
\ No newline at end of file
diff --git a/.forge-snapshots/CLSwapRouterTest#ExactInput.snap b/.forge-snapshots/CLSwapRouterTest#ExactInput.snap
index e54854d..0d33793 100644
--- a/.forge-snapshots/CLSwapRouterTest#ExactInput.snap
+++ b/.forge-snapshots/CLSwapRouterTest#ExactInput.snap
@@ -1 +1 @@
-242280
\ No newline at end of file
+240904
\ No newline at end of file
diff --git a/.forge-snapshots/CLSwapRouterTest#ExactInputSingle.snap b/.forge-snapshots/CLSwapRouterTest#ExactInputSingle.snap
index bc32139..0a67624 100644
--- a/.forge-snapshots/CLSwapRouterTest#ExactInputSingle.snap
+++ b/.forge-snapshots/CLSwapRouterTest#ExactInputSingle.snap
@@ -1 +1 @@
-176687
\ No newline at end of file
+176032
\ No newline at end of file
diff --git a/.forge-snapshots/CLSwapRouterTest#ExactOutput.snap b/.forge-snapshots/CLSwapRouterTest#ExactOutput.snap
index e54e9b3..30ff2cb 100644
--- a/.forge-snapshots/CLSwapRouterTest#ExactOutput.snap
+++ b/.forge-snapshots/CLSwapRouterTest#ExactOutput.snap
@@ -1 +1 @@
-241172
\ No newline at end of file
+239796
\ No newline at end of file
diff --git a/.forge-snapshots/CLSwapRouterTest#ExactOutputSingle.snap b/.forge-snapshots/CLSwapRouterTest#ExactOutputSingle.snap
index 12a63ab..f223a8c 100644
--- a/.forge-snapshots/CLSwapRouterTest#ExactOutputSingle.snap
+++ b/.forge-snapshots/CLSwapRouterTest#ExactOutputSingle.snap
@@ -1 +1 @@
-176397
\ No newline at end of file
+175742
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 57f34d3..048faec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,9 @@ foundry-out/
 .DS_Store
 .idea
 
+# Ignores local env variables, avoid committing sensitive information
+.env
+
 # Ignores development broadcast logs
 !/broadcast
 /broadcast/*
diff --git a/lib/pancake-v4-core b/lib/pancake-v4-core
index 857b4bf..d6d6824 160000
--- a/lib/pancake-v4-core
+++ b/lib/pancake-v4-core
@@ -1 +1 @@
-Subproject commit 857b4bf8055e74465900b5c15997fa100ee3044a
+Subproject commit d6d68247bc9c2c4dd4e66a9db53e81d6c171920c
diff --git a/script/01_DeployCLPositionManager.s.sol b/script/01_DeployCLPositionManager.s.sol
index 07b287c..3429020 100644
--- a/script/01_DeployCLPositionManager.s.sol
+++ b/script/01_DeployCLPositionManager.s.sol
@@ -9,7 +9,7 @@ import {IAllowanceTransfer} from "permit2/src/interfaces/IAllowanceTransfer.sol"
 import {CLPositionManager} from "../src/pool-cl/CLPositionManager.sol";
 
 /**
- * forge script script/01_DeployCLPositionManager.s.sol:DeployCLPositionManagerScript -vvv \
+ * forge script --sig 'run(uint256)' script/01_DeployCLPositionManager.s.sol:DeployCLPositionManagerScript <unsubscribeGasLimit> -vvv \
  *     --rpc-url $RPC_URL \
  *     --broadcast \
  *     --slow \
diff --git a/script/config/bsc-testnet.json b/script/config/bsc-testnet.json
index 2a95660..41da0f0 100644
--- a/script/config/bsc-testnet.json
+++ b/script/config/bsc-testnet.json
@@ -1,17 +1,17 @@
 {
   "permit2": "0x31c2F6fcFf4F8759b3Bd5Bf0e1084A055615c768",
   "weth": "0xae13d989daC2f0dEbFf460aC112a837C89BAa7cd",
-  "vault": "0x08F012b8E2f3021db8bd2A896A7F422F4041F131",
-  "clPoolManager": "0x969D90aC74A1a5228b66440f8C8326a8dA47A5F9",
-  "binPoolManager": "0x437ef7C8C00d20a8535ae1786c5800c88413e7Af",
-  "clPositionManager": "0x89A7D45D007077485CB5aE2abFB740b1fe4FF574",
-  "binPositionManager": "0xfB84c0D67f217f078E949d791b8d3081FE91Bca2",
-  "clQuoter": "0x2BafB051b2cD5a20F6579aeC3F0CF4958CE986a3",
-  "binQuoter": "0xbE4CEFaA182a41Afd2D0e1f183EB368B3489cc36",
-  "clMigrator": "0xc872e4425D83141Dc517418FD32e9550f42Ffe34.",
-  "binMigrator": "0xf342FfB466018938c6251E2CC62Cf6AD8D936cf8",
+  "vault": "0x0a125Bb36e409957Ed951eF1FBe20e81D682EAb6",
+  "clPoolManager": "0x26Ca53c8C5CE90E22aA1FadDA68AB9a08f7BA06f",
+  "binPoolManager": "0x1DF0be383e9d17DA4448E57712849aBE5b3Fa33b",
+  "clPositionManager": "0x095bd2cf90ef113aa8c53904cE54C17f4583046d",
+  "binPositionManager": "0x26008c91a2D47147d6739db3fFd3598A27da859d",
+  "clQuoter": "0xcC2d7c533444BE73F15de4C20F4a4773966989dC",
+  "binQuoter": "0x386571a8FC839385e34bd3B212FAD4dD9eEe59D4",
+  "clMigrator": "0x67d0fC894EeBcA66e59485A13BaAdF044956184D.",
+  "binMigrator": "0x9D19187B5c54dFF5f863CD0f258AC0B2c302c6d7",
   "factoryV3": "0x0BFbCF9fa4f9C56B0F40a671Ad40E0805A091865",
   "factoryV2": "0x6725F303b657a9451d8BA641348b6761A6CC7a17",
   "factoryStable": "0xe6A00f8b819244e8Ab9Ea930e46449C2F20B6609",
-  "mixedQuoter": "0x91B50D0ac455126ef30A5163A3Aa539eE815115a"
+  "mixedQuoter": "0x86d61dCc6D32bb0d03C1A82A66A24c2e88626C34"
 }
diff --git a/script/config/ethereum-sepolia.json b/script/config/ethereum-sepolia.json
index 41cb40c..9c31452 100755
--- a/script/config/ethereum-sepolia.json
+++ b/script/config/ethereum-sepolia.json
@@ -1,17 +1,17 @@
 {
   "permit2": "0x31c2F6fcFf4F8759b3Bd5Bf0e1084A055615c768",
   "weth": "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14",
-  "vault": "0xA9B361Df352a80BA3213c656b4EfA5436EC80362",
-  "clPoolManager": "0x6F9302eE8760c764d775B1550C65468Ec4C25Dfc",
-  "binPoolManager": "0xc0270E12dd2bCF9A22A928af6047e247508E5615",
-  "clPositionManager": "0x969D90aC74A1a5228b66440f8C8326a8dA47A5F9",
-  "binPositionManager": "0xda00d92f2977B806E51f221132c722d4b0D53514",
-  "clQuoter": "0x437ef7C8C00d20a8535ae1786c5800c88413e7Af",
-  "binQuoter": "0x1541841e05371968CB67038d8b7D4B64605614a4",
-  "clMigrator": "0x2BafB051b2cD5a20F6579aeC3F0CF4958CE986a3",
-  "binMigrator": "0xbE4CEFaA182a41Afd2D0e1f183EB368B3489cc36.",
+  "vault": "0x4670F769Daa625FF5F89719AE5295E9824f5805f",
+  "clPoolManager": "0xD4EAc75ee0E76EAD6AC6995DF30CA14b38549682",
+  "binPoolManager": "0x0Ca8430E263A098B998E47e0544C2C82B30CbDB1",
+  "clPositionManager": "0x53C9802F47295979c0E154779eD10fa6af27D7cA",
+  "binPositionManager": "0x21015eF9927e06b7Fc19D986A214e449Aa22FF7d",
+  "clQuoter": "0x6B71bA938100FD313Be08E680639900E0cfE3d74",
+  "binQuoter": "0x4DcaF8f6040B12a2C6149956Cc2e36FA3b7a60b9",
+  "clMigrator": "0x32D31C2020868057E0ba5876c1710962978d3EC3",
+  "binMigrator": "0x1A9A9e622dB78075fED5Cf77F382aA74CB657517.",
   "factoryV3": "0x0BFbCF9fa4f9C56B0F40a671Ad40E0805A091865",
   "factoryV2": "0x1bdc540dEB9Ed1fA29964DeEcCc524A8f5e2198e",
   "factoryStable": "0x000000000000000000000000000000000000dEaD",
-  "mixedQuoter": "0xc872e4425d83141dc517418fd32e9550f42ffe34"
+  "mixedQuoter": "0x3F47BDA24e069FC5f28B74d4FAB27EeBA006eF92"
 }