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

Jump to bottom

feat(CL): core swaprouter logic and tests (merge to main 3) #3496

Merged
merged 5 commits into from
Nov 23, 2022
Merged

feat(CL): core swaprouter logic and tests (merge to main 3) #3496

merged 5 commits into from
Nov 23, 2022

Conversation

p0mvn
Copy link
Member

@p0mvn p0mvn commented Nov 23, 2022 •
edited
Loading

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:

  • fully merges x/swaprouter and its tests
  • disables the failing tests that depend on gamm refactor
  • inclides minor non-breaking API changes in GAMM

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

@p0mvn p0mvn requested a review from a team November 23, 2022 02:28
@p0mvn p0mvn changed the title feat(CL): swaprouter logic and tests (merge to main 3) feat(CL): core swaprouter logic and tests (merge to main 3) Nov 23, 2022
@github-actions github-actions bot added C:app-wiring Changes to the app folder C:CLI C:simulator Edits simulator or simulations C:x/gamm Changes, features and bugs related to the gamm module. C:x/swaprouter labels Nov 23, 2022
@p0mvn p0mvn added the V:state/compatible/no_backport State machine compatible PR, depends on prior breaks label Nov 23, 2022
@p0mvn p0mvn requested a review from czarcas7ic November 23, 2022 02:34
czarcas7ic
czarcas7ic approved these changes Nov 23, 2022
View reviewed changes
Copy link
Member

@czarcas7ic czarcas7ic left a comment

Choose a reason for hiding this comment

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

👍

osmoutils/store_helper_test.go Outdated Show resolved Hide resolved
x/swaprouter/client/cli/cli_test.go Show resolved Hide resolved
x/swaprouter/client/cli/query.go Show resolved Hide resolved
x/swaprouter/client/cli/query.go Show resolved Hide resolved
x/swaprouter/msg_server.go Outdated Show resolved Hide resolved
x/swaprouter/types/routes.go Outdated Show resolved Hide resolved
x/swaprouter/types/routes.go Show resolved Hide resolved
@p0mvn p0mvn merged commit f9058fb into main Nov 23, 2022
@p0mvn p0mvn deleted the roman/cl-swaprouter-3 branch November 23, 2022 23:49
@p0mvn p0mvn mentioned this pull request Nov 24, 2022
Merged
p0mvn added a commit that referenced this pull request Nov 25, 2022
@p0mvn
Revert "feat(CL): core swaprouter logic and tests (merge to main 3) (#…
542f29d 
…3496)"

This reverts commit f9058fb.
p0mvn added a commit that referenced this pull request Nov 25, 2022
@p0mvn
Revert "feat(CL): core swaprouter logic and tests (merge to main 3) (#…
a8e4940 
…3496)" (#3515)

This reverts commit f9058fb.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@czarcas7ic czarcas7ic czarcas7ic approved these changes

Assignees
No one assigned
Labels
C:app-wiring Changes to the app folder C:CLI C:simulator Edits simulator or simulations C:x/gamm Changes, features and bugs related to the gamm module. C:x/swaprouter V:state/compatible/no_backport State machine compatible PR, depends on prior breaks
Projects
Osmosis Chain Development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@p0mvn @czarcas7ic