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

fix: Implement LegacyGovUpdateParams for querying legacy proposals (backport #476) #477

Merged
merged 3 commits into from
Jul 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 12, 2024

Description

closes: #XXXX


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • added appropriate labels to the PR
  • targeted the correct branch
  • provided a link to the relevant issue or specification
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

This is an automatic backport of pull request #476 done by [Mergify](https://mergify.com).

)

* fix: Implement LegacyGovUpdateParams for querying legacy proposals

* buf-lint

* lint

* upgrade handler

(cherry picked from commit 71d54a4)

# Conflicts:
#	app/upgrades.go
#	x/oracle/types/msgs.go
#	x/oracle/types/tx.pb.go
Copy link
Contributor Author

mergify bot commented Jul 12, 2024

Cherry-pick of 71d54a4 has failed:

On branch mergify/bp/release/v0.3.x/pr-476
Your branch is up to date with 'origin/release/v0.3.x'.

You are currently cherry-picking commit 71d54a4.
  (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/ojo/oracle/v1/tx.proto
	modified:   x/oracle/keeper/msg_server.go
	modified:   x/oracle/types/codec.go
	modified:   x/oracle/types/proposal.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/upgrades.go
	both modified:   x/oracle/types/msgs.go
	both modified:   x/oracle/types/tx.pb.go

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

@mergify mergify bot requested a review from a team as a code owner July 12, 2024 18:26
@mergify mergify bot added the conflicts label Jul 12, 2024
@rbajollari rbajollari merged commit 2d3ebd7 into release/v0.3.x Jul 12, 2024
24 of 25 checks passed
@rbajollari rbajollari deleted the mergify/bp/release/v0.3.x/pr-476 branch July 12, 2024 18:50
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