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

MsgTransferResponse add sequence (backport #2377) #2468

Merged
merged 2 commits into from
Oct 5, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 4, 2022

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

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

You are currently cherry-picking commit 3363917.
  (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
	modified:   docs/ibc/proto-docs.md
	modified:   modules/apps/transfer/keeper/msg_server_test.go
	modified:   modules/apps/transfer/types/tx.pb.go
	modified:   proto/ibc/applications/transfer/v1/tx.proto

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

## Description

Returns sequence from `sendTransfer`, and returns it with the `MsgTransferResponse`. This is not an API breaking change.

Retrieving the sequence at the time of creating the transfer is necessary in the packet forward middleware for correlation with multihop packet flows.

strangelove-ventures/packet-forward-middleware#33
strangelove-ventures/interchaintest#306

Closes #1969

---

- [x] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#pr-targeting))
- [x] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
- [x] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules/structure.md).
- [x] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/master/CONTRIBUTING.md#testing)
Existing test coverage exercises this new method due to the re-routing of `SendTransfer` through `SendPacketTransfer`
- [x] Updated relevant documentation (`docs/`) or specification (`x/<module>/spec/`)
- [x] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code).
- [x] Added a relevant changelog entry to the `Unreleased` section in `CHANGELOG.md`
- [x] Re-reviewed `Files changed` in the Github PR explorer
- [x] Review `Codecov Report` in the comment section below once CI passes

(cherry picked from commit 3363917)

# Conflicts:
#	modules/apps/transfer/keeper/msg_server.go
#	modules/apps/transfer/keeper/relay.go
@lgtm-com
Copy link

lgtm-com bot commented Oct 4, 2022

This pull request introduces 4 alerts when merging b51ab8f into 15496c0 - view on LGTM.com

new alerts:

  • 2 for Useless assignment to local variable
  • 2 for Unreachable statement

Copy link
Contributor

@colin-axner colin-axner left a comment

Choose a reason for hiding this comment

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

Thanks for fixing conflicts @damiannolan, looks like I forgot to backport the private send transfer func

@colin-axner colin-axner merged commit fb5156f into release/v6.0.x Oct 5, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v6.0.x/pr-2377 branch October 5, 2022 11:21
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