Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix amount0 and amount1 calculation with improved price range checks #955

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix amount0 and amount1 calculation with improved price range checks #955

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7339e4c
Fix amount0 and amount1 calculation with improved price range checks …
nigeldelviero Feb 26, 2025
0af5013
Update test/utils/AmountHelpers.sol for better readability
nigeldelviero Mar 5, 2025
3b6e0f4
Removed redundant condition for sqrtPriceX96 > sqrtPriceX96Upper, sim…
nigeldelviero Mar 5, 2025
fbbcc5c
Changed getMaxAmountInForPool from public to external for gas optimiz…
nigeldelviero Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions test/utils/AmountHelpers.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@ library AmountHelpers {
IPoolManager manager,
IPoolManager.ModifyLiquidityParams memory params,
PoolKey memory key
) public view returns (uint256 amount0, uint256 amount1) {
) external view returns (uint256 amount0, uint256 amount1) {
PoolId id = key.toId();
uint128 liquidity = StateLibrary.getLiquidity(manager, id);
(uint160 sqrtPriceX96,,,) = StateLibrary.getSlot0(manager, id);
(uint160 sqrtPriceX96, , , ) = StateLibrary.getSlot0(manager, id);

uint160 sqrtPriceX96Lower = TickMath.getSqrtPriceAtTick(params.tickLower);
uint160 sqrtPriceX96Upper = TickMath.getSqrtPriceAtTick(params.tickUpper);

require(sqrtPriceX96Lower <= sqrtPriceX96 && sqrtPriceX96 <= sqrtPriceX96Upper, "Price out of range");

amount0 = LiquidityAmounts.getAmount0ForLiquidity(sqrtPriceX96Lower, sqrtPriceX96, liquidity);
amount1 = LiquidityAmounts.getAmount1ForLiquidity(sqrtPriceX96Upper, sqrtPriceX96, liquidity);
amount1 = LiquidityAmounts.getAmount1ForLiquidity(sqrtPriceX96, sqrtPriceX96Upper, liquidity);
}
}