Refactor swap logic and add getSqrtPriceTarget function
#662
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The commit refactors the swap logic to use a newly added function, getSqrtPriceTarget. This function, defined in the SwapMath library, computes the square root price target for the next swap step. A corresponding fuzz test has been included in test/libraries/SwapMath.t.sol to confirm the correctness of the function. The update simplifies the code and enhances readability by abstracting complex operations into a standalone function.
shuhuiluo
force-pushed
the
get-sqrt-price-target
branch
from
8ee3cf0 to
7f4c9bd
Compare
hensha256
reviewed
May 21, 2024
| // sqrtPriceTargetX96 = min(sqrtPriceNextX96, sqrtPriceLimitX96) | ||
| let nextOrLimit := xor(lt(sqrtPriceNextX96, sqrtPriceLimitX96), zeroForOne) | ||
| let symDiff := xor(sqrtPriceNextX96, sqrtPriceLimitX96) | ||
| sqrtPriceTargetX96 := xor(sqrtPriceLimitX96, mul(symDiff, nextOrLimit)) |
hensha256
previously approved these changes
May 21, 2024
hensha256
approved these changes
May 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #280.
Related Issue
Which issue does this pull request resolve?
Description of changes
Improvements to the
SwapMathlibrary have been implemented. A new function,getSqrtPriceTarget, written inYulusing bitwise operations, has been introduced to replace a nested ternary operation withinPool.swap:( params.zeroForOne ? step.sqrtPriceNextX96 < params.sqrtPriceLimitX96 : step.sqrtPriceNextX96 > params.sqrtPriceLimitX96 ) ? params.sqrtPriceLimitX96 : step.sqrtPriceNextX96which basically was doing
The commit refactors the swap logic to use a newly added function, getSqrtPriceTarget. This function, defined in the SwapMath library, computes the square root price target for the next swap step. A corresponding fuzz test has been included in test/libraries/SwapMath.t.sol to confirm the correctness of the function. The update simplifies the code and enhances readability by abstracting complex operations into a standalone function.