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(callbacks)!: SendPacket validation bypass and erroneous event emission are fixed (backport #4568) #4596

Closed
wants to merge 4 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 7, 2023

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

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

You are currently cherry-picking commit e1928999.
  (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:   modules/apps/callbacks/ibc_middleware_test.go
	modified:   modules/apps/callbacks/types/errors.go

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

…ssion are fixed (#4568)

* fix: fixed callbacks out of gas handling

* fix: fixed panics and oog errors not showing up on events

* docs(callbacks): added godocs for error precedence

---------

Co-authored-by: Carlos Rodriguez <[email protected]>
(cherry picked from commit e192899)

# Conflicts:
#	modules/apps/callbacks/ibc_middleware.go
@srdtrk
Copy link
Member

srdtrk commented Sep 8, 2023

Pushed empty commit to run the stuck workflows

@srdtrk srdtrk removed the conflicts label Sep 9, 2023
@colin-axner
Copy link
Contributor

Should we be targetting the callbacks release branch?

@srdtrk
Copy link
Member

srdtrk commented Sep 11, 2023

I think not @colin-axner, this is a breaking change. I think we should create a new release branch from v7.3.x after merging this.

@crodriguezvega
Copy link
Contributor

But if this change requires a callbacks/v0.2.x release branch, shouldn't we first create that release branch from callbacks/v0.1.x and then backport to v0.2.x this change?

@srdtrk
Copy link
Member

srdtrk commented Sep 13, 2023

We could do that @crodriguezvega. But merging this PR to release/v7.3.x and then creating callbacks/v0.2.x from release/v7.3.x ensures that release/v7.3.x has the latest modifications to callbacks which should be the case currently.

So we need to decide whether we want to ensure that release/v7.3.x is up to date on callbacks or not. If not, then we should create the callbacks/v0.2.x branch from callbacks/v0.1.x instead of release/v7.3.x. I don't have a preference.

@crodriguezvega
Copy link
Contributor

ensures that release/v7.3.x has the latest modifications to callbacks which should be the case currently.

Is there a reason or a benefit why release/v7.3.x should be up-to-date with the latest callbacks changes?

@srdtrk
Copy link
Member

srdtrk commented Sep 18, 2023

We have created a new release branch for callbacks and this should be backported there

@srdtrk srdtrk closed this Sep 18, 2023
@mergify mergify bot deleted the mergify/bp/release/v7.3.x/pr-4568 branch September 18, 2023 10:43
@damiannolan
Copy link
Contributor

We have created a new release branch for callbacks and this should be backported there

was this ever backported? see #5173

@crodriguezvega
Copy link
Contributor

We have created a new release branch for callbacks and this should be backported there

was this ever backported? see #5173

I don't think so. I can slap the backport label to the PR and let the contributor know that we will close his PR instead.

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.

5 participants