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(poolmanager): v2 SpotPrice query with 36 decimals (backport #6488) #6561

Merged
merged 1 commit into from
Sep 27, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 27, 2023

This is an automatic backport of pull request #6488 done by Mergify.
Cherry-pick of b1bfa20 has failed:

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

You are currently cherry-picking commit b1bfa200.
  (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:   cmd/querygen/main.go
	modified:   cmd/querygen/templates/grpcTemplate.go
	modified:   cmd/querygen/templates/grpc_template.tmpl
	new file:   proto/osmosis/poolmanager/v2/query.proto
	new file:   proto/osmosis/poolmanager/v2/query.yml
	modified:   x/concentrated-liquidity/client/grpc/grpc_query.go
	modified:   x/cosmwasmpool/client/grpc/grpc_query.go
	modified:   x/downtime-detector/client/grpc/grpc_query.go
	modified:   x/ibc-rate-limit/client/grpc/grpc_query.go
	modified:   x/poolmanager/client/cli/query.go
	modified:   x/poolmanager/client/grpc/grpc_query.go
	new file:   x/poolmanager/client/grpcv2/grpc_query.go
	modified:   x/poolmanager/client/query_proto_wrap.go
	new file:   x/poolmanager/client/queryprotov2/query.pb.go
	new file:   x/poolmanager/client/queryprotov2/query.pb.gw.go
	modified:   x/poolmanager/module/module.go
	modified:   x/twap/client/grpc/grpc_query.go
	modified:   x/valset-pref/client/grpc/grpc_query.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.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

Copy link
Member

@p0mvn p0mvn left a comment

Choose a reason for hiding this comment

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

Synced through epoch

@p0mvn p0mvn merged commit 47fe15a into v19.x Sep 27, 2023
1 check passed
@p0mvn p0mvn deleted the mergify/bp/v19.x/pr-6488 branch September 27, 2023 21:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant