POC: amountSpecified matches deltas #491
Merged
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
ewilz
force-pushed
the
amountSpecified
branch
from
4af1124 to
6403b3d
Compare
hensha256
reviewed
Mar 5, 2024
test/PoolManager.t.sol
Outdated
| @@ -464,7 +464,7 @@ contract PoolManagerTest is Test, Deployers, GasSnapshot { | |||
| modifyLiquidityRouter.modifyLiquidity{value: 1 ether}(nativeKey, liqParams, ZERO_BYTES); | |||
|
|
|||
| IPoolManager.SwapParams memory params = | |||
| IPoolManager.SwapParams({zeroForOne: true, amountSpecified: 100, sqrtPriceLimitX96: SQRT_RATIO_1_2}); | |||
| IPoolManager.SwapParams({zeroForOne: true, amountSpecified: -100, sqrtPriceLimitX96: SQRT_RATIO_1_2}); | |||
There was a problem hiding this comment.
This identical struct is used all over this file, and DynamicFees.t.sol. I wonder if we should just save it as our default SWAP_PARAMS in Deployers.sol like we have LIQ_PARAMS etc in there. And then al these files can just use that constant defined in 1 place?
There was a problem hiding this comment.
or SWAP_EXACT_IN_PARAMS or something
hensha256
reviewed
Mar 5, 2024
Merged
hensha256
approved these changes
Mar 6, 2024
hensha256
added a commit
that referenced
this pull request
Mar 13, 2024
* Remove access lock * remove current hook * Remove nested locking * Locker library tests * Rename empty lock test * Test skeleton * Test for a nested swap * Tests for nested function calls * snapshots * Separate libs, rename error * Remove lock caller * merge errors * Flipping the sign of deltas * update comments * remove unnecessary read of result * move delta flip to sqrtprice lib * remove duplicate test * amountSpecified matches deltas (#491) Co-authored-by: hensha256 <[email protected]> * PR nits --------- Co-authored-by: Emily Williams <[email protected]>
hensha256
added a commit
that referenced
this pull request
May 9, 2024
* Remove access lock * remove current hook * Remove nested locking * Locker library tests * Rename empty lock test * Test skeleton * Test for a nested swap * Tests for nested function calls * snapshots * Separate libs, rename error * Remove lock caller * merge errors * Flipping the sign of deltas * update comments * refactor hook callsite * linting * first draft of swap impl * Compiling and tests passing * first test passing * Add todo * other TODO * reduce calls to account delta * check delta modification in callsite * fix error and compiler warnings * skeleton for modify position * Test * Add liquidity check in modify router * add liq test * linting * remove unnecessary read of result * move delta flip to sqrtprice lib * remove duplicate test * amountSpecified matches deltas (#491) Co-authored-by: hensha256 <[email protected]> * common var, and custom error * refactor of hook callsites and perms * PR comments, clean up swap comments * Allow noop on the pool * Update src/PoolManager.sol Co-authored-by: saucepoint <[email protected]> * correct delta taken from user * PR comments * liq to liquidity * refactor logic into hook contract * move all delta settling to the end * Factor out swap logic into helper * small refactor mdoify liq * amountToSwap variable * more tests * beginning of fuzz work * full fuzz test of beforeSwap return * rename * split comments on multiple lines * Update src/libraries/Hooks.sol Co-authored-by: Sara Reynolds <[email protected]> * refactor processing hook deltas * remove console imports * nit PR comments * remove unneeded check * refactor logic into hook contract * modifyLiquidity to match swap * remove unneeded check * PR comments * fix fuzz test * remove extra check and add comments * correct gas snaps * Natspec updates * natspec * PR comments * comment protocol fee clearer * PR comments --------- Co-authored-by: Emily Williams <[email protected]> Co-authored-by: saucepoint <[email protected]> Co-authored-by: Sara Reynolds <[email protected]>
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.
Related Issue
Which issue does this pull request resolve?
Description of changes