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.

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

Accurate swap gas #645

Merged
merged 7 commits into from
May 13, 2024
Merged

Accurate swap gas #645

merged 7 commits into from
May 13, 2024

Conversation

hensha256
Copy link
Contributor

No description provided.

@gretzke gretzke self-requested a review May 13, 2024 16:13
Copy link

Forge code coverage:

File % Lines % Statements % Branches % Funcs
src/ERC6909.sol 91.30% (21/23) 85.71% (24/28) 100.00% (4/4) 85.71% (6/7)
src/ERC6909Claims.sol 100.00% (6/6) 100.00% (8/8) 100.00% (4/4) 100.00% (1/1)
src/Extsload.sol 0.00% (0/3) 0.00% (0/4) 100.00% (0/0) 0.00% (0/2)
src/NoDelegateCall.sol 100.00% (3/3) 100.00% (5/5) 100.00% (2/2) 100.00% (3/3)
src/PoolManager.sol 94.51% (86/91) 93.08% (121/130) 97.22% (35/36) 82.76% (24/29)
src/ProtocolFees.sol 100.00% (20/20) 97.06% (33/34) 91.67% (11/12) 100.00% (6/6)
src/libraries/BitMath.sol 100.00% (47/47) 100.00% (57/57) 100.00% (36/36) 100.00% (2/2)
src/libraries/CurrencyDelta.sol 100.00% (4/4) 100.00% (6/6) 100.00% (0/0) 100.00% (3/3)
src/libraries/CurrencySettleTake.sol 100.00% (10/10) 100.00% (10/10) 50.00% (3/6) 100.00% (2/2)
src/libraries/FullMath.sol 100.00% (29/29) 100.00% (33/33) 100.00% (8/8) 100.00% (2/2)
src/libraries/Hooks.sol 100.00% (75/75) 99.25% (133/134) 98.15% (53/54) 100.00% (15/15)
src/libraries/LPFeeLibrary.sol 100.00% (5/5) 100.00% (9/9) 100.00% (4/4) 100.00% (3/3)
src/libraries/LiquidityMath.sol 100.00% (2/2) 100.00% (1/1) 100.00% (1/1) 100.00% (1/1)
src/libraries/Lock.sol 100.00% (4/4) 100.00% (4/4) 100.00% (0/0) 100.00% (3/3)
src/libraries/NonZeroDeltaCount.sol 100.00% (6/6) 100.00% (6/6) 100.00% (0/0) 100.00% (3/3)
src/libraries/Pool.sol 99.35% (153/154) 98.19% (163/166) 94.44% (85/90) 100.00% (13/13)
src/libraries/PoolGetters.sol 100.00% (3/3) 100.00% (3/3) 100.00% (0/0) 100.00% (3/3)
src/libraries/Position.sol 100.00% (11/11) 100.00% (12/12) 100.00% (4/4) 100.00% (2/2)
src/libraries/ProtocolFeeLibrary.sol 100.00% (10/10) 100.00% (18/18) 100.00% (4/4) 100.00% (4/4)
src/libraries/Reserves.sol 100.00% (8/8) 100.00% (13/13) 100.00% (6/6) 100.00% (3/3)
src/libraries/SafeCast.sol 100.00% (8/8) 100.00% (14/14) 100.00% (8/8) 100.00% (4/4)
src/libraries/SqrtPriceMath.sol 100.00% (32/32) 100.00% (66/66) 87.50% (21/24) 100.00% (8/8)
src/libraries/SwapMath.sol 100.00% (23/23) 100.00% (30/30) 100.00% (12/12) 100.00% (1/1)
src/libraries/TickBitmap.sol 100.00% (19/19) 100.00% (34/34) 100.00% (6/6) 100.00% (3/3)
src/libraries/TickMath.sol 97.87% (92/94) 97.30% (144/148) 97.83% (45/46) 50.00% (2/4)
src/libraries/UnsafeMath.sol 100.00% (1/1) 100.00% (1/1) 100.00% (0/0) 100.00% (1/1)
src/types/BalanceDelta.sol 100.00% (2/2) 100.00% (2/2) 100.00% (0/0) 100.00% (2/2)
src/types/Currency.sol 100.00% (15/15) 91.67% (22/24) 80.00% (8/10) 100.00% (6/6)
src/types/PoolId.sol 100.00% (1/1) 100.00% (1/1) 100.00% (0/0) 100.00% (1/1)
Total 82.57% (1251/1515) 82.62% (1706/2065) 61.20% (500/817) 74.66% (271/363)

PoolSwapTest.TestSettings({takeClaims: false, settleUsingBurn: false});

swapRouter.swap(key, swapParams, testSettings, ZERO_BYTES);
swapRouterNoChecks.swap(key, swapParams);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you keep these same tests with the checks as well, and just add two that are only for gas? Don't want to lose testing coverage

gretzke
gretzke previously approved these changes May 13, 2024
@hensha256 hensha256 enabled auto-merge (squash) May 13, 2024 16:22
@hensha256 hensha256 merged commit 2ca3f3b into main May 13, 2024
6 checks passed
@hensha256 hensha256 deleted the accurate-swap-gas branch May 13, 2024 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants