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

Query osmo equivilent is staked via superfluid (backport #1632) #1676

Merged
merged 3 commits into from
Jun 7, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 6, 2022

This is an automatic backport of pull request #1632 done by Mergify.
Cherry-pick of 19fedeb has failed:

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

You are currently cherry-picking commit 19fedeb.
  (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:   CHANGELOG.md
	modified:   docs/core/proto-docs.md
	modified:   proto/osmosis/superfluid/query.proto
	modified:   proto/osmosis/superfluid/superfluid.proto
	modified:   x/superfluid/keeper/grpc_query_test.go
	modified:   x/superfluid/types/query.pb.go
	modified:   x/superfluid/types/superfluid.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/superfluid/keeper/grpc_query.go

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

* fix proto

* get osmo equivilent is staked via superfluid

* format

* fix go_fmt

* Revert "fix go_fmt"

This reverts commit 5407105.

* augment SuperfluidDelegationsByDelegator query

* remove fmt

* format

* fix spell

* fix spell, changelog

* query

(cherry picked from commit 19fedeb)

# Conflicts:
#	x/superfluid/keeper/grpc_query.go
@mergify mergify bot requested a review from a team June 6, 2022 08:56
@mergify mergify bot added the conflicts label Jun 6, 2022
@hieuvubk hieuvubk merged commit ddd75fe into v9.x Jun 7, 2022
@hieuvubk hieuvubk deleted the mergify/bp/v9.x/pr-1632 branch June 7, 2022 11:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants