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

call packet.GetSequence() rather than passing the func as argument (backport #1130) #1139

Merged
merged 2 commits into from
Mar 21, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 17, 2022

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

On branch mergify/bp/release/v3.0.x/pr-1130
Your branch is up to date with 'origin/release/v3.0.x'.

You are currently cherry-picking commit dbd2df2.
  (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/core/04-channel/keeper/packet.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

…1130)

* call packet.GetSequence() rather than passing the func as argument

* add changelog entry

(cherry picked from commit dbd2df2)

# Conflicts:
#	CHANGELOG.md
@crodriguezvega crodriguezvega merged commit 10ebf0d into release/v3.0.x Mar 21, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v3.0.x/pr-1130 branch March 21, 2022 11:06
ellie4x pushed a commit to Carina-labs/ibc-go that referenced this pull request Sep 14, 2022
…ackport cosmos#1130) (cosmos#1139)

* call packet.GetSequence() rather than passing the func as argument (cosmos#1130)

* call packet.GetSequence() rather than passing the func as argument

* add changelog entry

(cherry picked from commit dbd2df2)

# Conflicts:
#	CHANGELOG.md

* fix conflicts

Co-authored-by: Carlos Rodriguez <[email protected]>
dudong2 pushed a commit to dudong2/ibc-go that referenced this pull request Jan 19, 2023
…ackport cosmos#1130) (cosmos#1139)

* call packet.GetSequence() rather than passing the func as argument (cosmos#1130)

* call packet.GetSequence() rather than passing the func as argument

* add changelog entry

(cherry picked from commit dbd2df2)

* fix conflicts

Co-authored-by: Carlos Rodriguez <[email protected]>
CosmosCar pushed a commit to caelus-labs/ibc-go that referenced this pull request Nov 6, 2023
<!--
Please read and fill out this form before submitting your PR.

Please make sure you have reviewed our contributors guide before
submitting your
first PR.
-->

## Overview

When I follow the instructions here:
https://rollkit.dev/tutorials/gm-world#macos-setup, I encountered the
following error:

```
github.com/cosmos/cosmos-sdk/server imports
        github.com/rollkit/rollkit/node imports
        github.com/rollkit/rollkit/mempool/v1 imports
        github.com/cometbft/cometbft/abci/example/code: package github.com/cometbft/cometbft/abci/example/code provided by github.com/cometbft/cometbft at latest version v0.37.2 but not at required version v0.38.0-rc2
```

Then I finally found package
`github.com/cometbft/cometbft/abci/example/code` has been removed. Use
the code defined in the abci types instead.

## Checklist

<!-- 
Please complete the checklist to ensure that the PR is ready to be
reviewed.

IMPORTANT:
PRs should be left in Draft until the below checklist is completed.
-->

- [ ] New and updated code has appropriate documentation
- [ ] New and updated code has new and/or updated testing
- [ ] Required CI checks are passing
- [ ] Visual proof for any user facing features like CLI or
documentation updates
- [ ] Linked issues closed with keywords
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.

3 participants