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(statemachine)!: re-implement legacy msg interface (backport #3907) #3938

Merged
merged 2 commits into from
Jun 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 22, 2023

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

On branch mergify/bp/release/v7.2.x/pr-3907
Your branch is up to date with 'origin/release/v7.2.x'.

You are currently cherry-picking commit f2b22491.
  (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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/29-fee/types/msgs.go
	both modified:   modules/apps/transfer/types/msgs.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

(cherry picked from commit f2b2249)

# Conflicts:
#	modules/apps/29-fee/types/msgs.go
#	modules/apps/transfer/types/msgs.go
)

// NewMsgUpdateParams creates a new MsgUpdateParams instance
func NewMsgUpdateParams(authority string, params Params) *MsgUpdateParams {
Copy link
Member

Choose a reason for hiding this comment

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

Remove MsgUpdateParams stuff as its not being introduced until v8.

@damiannolan damiannolan removed their assignment Jun 22, 2023
@crodriguezvega
Copy link
Contributor

Thank you for taking care of the conflicts, @damiannolan 💟

@crodriguezvega crodriguezvega merged commit d7d3e1a into release/v7.2.x Jun 22, 2023
14 of 15 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v7.2.x/pr-3907 branch June 22, 2023 14:32
@faddat faddat mentioned this pull request Jun 23, 2023
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants