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

Protorev query highest liquidity pools (backport #4829) #4949

Merged
merged 2 commits into from
Apr 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 18, 2023

This is an automatic backport of pull request #4829 done by Mergify.
Cherry-pick of 5f4beb7 has failed:

On branch mergify/bp/v15.x/pr-4829
Your branch is up to date with 'origin/v15.x'.

You are currently cherry-picking commit 5f4beb71.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   proto/osmosis/protorev/v1beta1/query.proto
	modified:   x/protorev/keeper/grpc_query.go
	modified:   x/protorev/keeper/grpc_query_test.go
	modified:   x/protorev/types/query.pb.go
	modified:   x/protorev/types/query.pb.gw.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/protorev/client/cli/query.go
	both modified:   x/protorev/protorev.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Update proto files for protorev pool query

- protorev pool query will return pool id given a denom pair for the highest liquidity method

* add grpc query handler logic for GetProtoRevPool query

* Add cli query support

* Add test for GetProtoRevPool query

* Change endpoint to pool and re-gen proto code

* add pool query in documentation

* Specify the query is for highest liquidity method pools only

* Change comment to represent query

Co-authored-by: David Terpay <[email protected]>

* change comments in proto file and generated pb

* fix test comment

* Add query to changelog

---------

Co-authored-by: David Terpay <[email protected]>
(cherry picked from commit 5f4beb7)

# Conflicts:
#	CHANGELOG.md
#	x/protorev/client/cli/query.go
#	x/protorev/protorev.md
@mergify mergify bot added the conflicts label Apr 18, 2023
@github-actions github-actions bot added C:CLI C:docs Improvements or additions to documentation labels Apr 18, 2023
@p0mvn
Copy link
Member

p0mvn commented Apr 18, 2023

Hi @NotJeremyLiu , can you please help with resolvng conflicts?

- Main issue I think is I rebased on main when I should've rebased on v15 since this was to be backported
- I only added this entry into the changelog since the other changes may not be reflected in the backport
@NotJeremyLiu
Copy link
Contributor

@p0mvn resolved conflicts, should be good to merge now

@p0mvn p0mvn merged commit f99cc7b into v15.x Apr 19, 2023
@p0mvn p0mvn deleted the mergify/bp/v15.x/pr-4829 branch April 19, 2023 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:CLI C:docs Improvements or additions to documentation conflicts
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants