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

feat(CL): gamm refactor, switch to swaprouter for pool creation & swaps (merge to main 4) #3504

Merged
merged 2 commits into from
Nov 24, 2022

Conversation

p0mvn
Copy link
Member

@p0mvn p0mvn commented Nov 24, 2022

Closes: #XXX

What is the purpose of the change

We would like to drop concentrated-liquidity-main branch to avoid branch synching overhead. As part of that, we are going to be incrementally merging the current concentrated liquidity feature state to main.

All this logic has already been given a round of reviews since we treated concentrated-liqudiity-main branch as main with appropriate review processes.

This particular PR does the following:

  • refactors gamm to start utilizing pool creation, pool id management and swap routing via the new swaprouter module
  • changes any other helper functions to use swaprouter where applicable
  • enables swaprouter tests

All deleted tests have been ported from gamm to swaprouter in previous PRs:

This is the final swaprouter PR. As soon as we merge gamm refactor, the swap router can be fully enabled.

For the latest state of the feature that we are merging, see: https://github.com/osmosis-labs/osmosis/tree/concentrated-liquidity-main

See spec: https://github.com/osmosis-labs/osmosis/pull/3052/files

@github-actions github-actions bot added C:app-wiring Changes to the app folder C:CLI C:docs Improvements or additions to documentation C:simulator Edits simulator or simulations C:x/gamm Changes, features and bugs related to the gamm module. C:x/incentives C:x/pool-incentives C:x/superfluid C:x/swaprouter C:x/twap Changes to the twap module C:x/txfees labels Nov 24, 2022
@p0mvn p0mvn added the V:state/breaking State machine breaking PR label Nov 24, 2022
@p0mvn p0mvn marked this pull request as ready for review November 24, 2022 01:05
@p0mvn p0mvn requested review from a team and czarcas7ic November 24, 2022 01:05
@p0mvn
Copy link
Member Author

p0mvn commented Nov 24, 2022

Merging to continue progress on concentrated liquidity. This refactor has been reviewed per PR when merging into concentrated-liquidity-main

CC: @ValarDragon to review the gamm-specific changes

@p0mvn p0mvn merged commit afcf5d7 into main Nov 24, 2022
@p0mvn p0mvn deleted the roman/cl-swaprouter-4 branch November 24, 2022 17:42
p0mvn added a commit that referenced this pull request Nov 24, 2022
…on & swaps (merge to main 4) (#3504)"

This reverts commit afcf5d7.
p0mvn added a commit that referenced this pull request Nov 25, 2022
…on & swaps (merge to main 4) (#3504)" (#3513)

This reverts commit afcf5d7.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:app-wiring Changes to the app folder C:CLI C:docs Improvements or additions to documentation C:simulator Edits simulator or simulations C:x/gamm Changes, features and bugs related to the gamm module. C:x/incentives C:x/pool-incentives C:x/superfluid C:x/swaprouter C:x/twap Changes to the twap module C:x/txfees V:state/breaking State machine breaking PR
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants