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: do not flatten events attributes by event types (backport #14691) #14702

Merged
merged 4 commits into from
Jan 20, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 19, 2023

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

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

You are currently cherry-picking commit d5d39c053.
  (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:   math/dec_test.go
	modified:   math/int_test.go
	modified:   types/events.go
	modified:   types/events_test.go
	modified:   types/result_test.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

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
(cherry picked from commit d5d39c0)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner January 19, 2023 19:47
@mergify mergify bot added the conflicts label Jan 19, 2023
@tac0turtle
Copy link
Member

We should notify relayers of this.

@tac0turtle
Copy link
Member

tac0turtle commented Jan 20, 2023

merging for now, pinged the ibc team.

cc @jackzampolin @adizere for visibility

@tac0turtle tac0turtle merged commit 425ee43 into release/v0.47.x Jan 20, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.47.x/pr-14691 branch January 20, 2023 12:26
@adizere
Copy link
Contributor

adizere commented Jan 25, 2023

It's difficult for me to say if this will break relayers (in addition to the even encoding breaking changes Tendermint v0.37.0). Should we expect it to be a breaking change and do tests? Thanks!

@tac0turtle
Copy link
Member

@julienrbrt want to cut a new rc and ill update ibc to see if things break?

@julienrbrt
Copy link
Member

@julienrbrt want to cut a new rc and ill update ibc to see if things break?

Sure thing, but isn't it better to have an RC2 with #14713 and the IAVL changes?
You can always use a pseudo version based on the latest commit (as I type it is v0.47.0-rc1.0.20230124153503-bf38ebfcd5b1).

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.

4 participants