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

refactor: adapting transfer metadata bytes field to memo string (backport #2595) #2598

Merged
merged 2 commits into from
Oct 26, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 26, 2022

This is an automatic backport of pull request #2595 done by Mergify.
Cherry-pick of 05685b3 has failed:

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

You are currently cherry-picking commit 05685b3.
  (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:   docs/ibc/proto-docs.md
	modified:   modules/apps/transfer/ibc_module.go
	modified:   modules/apps/transfer/keeper/msg_server.go
	modified:   modules/apps/transfer/types/events.go
	modified:   proto/ibc/applications/transfer/v1/tx.proto
	modified:   proto/ibc/applications/transfer/v2/packet.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   go.mod
	both modified:   go.sum
	both modified:   modules/apps/29-fee/transfer_test.go
	both modified:   modules/apps/transfer/client/cli/tx.go
	both modified:   modules/apps/transfer/keeper/mbt_relay_test.go
	both modified:   modules/apps/transfer/keeper/msg_server_test.go
	both modified:   modules/apps/transfer/keeper/relay.go
	both modified:   modules/apps/transfer/keeper/relay_test.go
	both modified:   modules/apps/transfer/transfer_test.go
	both modified:   modules/apps/transfer/types/msgs.go
	both modified:   modules/apps/transfer/types/msgs_test.go
	both modified:   modules/apps/transfer/types/packet.go
	both modified:   modules/apps/transfer/types/packet.pb.go
	both modified:   modules/apps/transfer/types/packet_test.go
	both modified:   modules/apps/transfer/types/tx.pb.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

* adapting transfer metadata bytes field to memo string

* updating changelog

(cherry picked from commit 05685b3)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
#	modules/apps/29-fee/transfer_test.go
#	modules/apps/transfer/client/cli/tx.go
#	modules/apps/transfer/keeper/mbt_relay_test.go
#	modules/apps/transfer/keeper/msg_server_test.go
#	modules/apps/transfer/keeper/relay.go
#	modules/apps/transfer/keeper/relay_test.go
#	modules/apps/transfer/transfer_test.go
#	modules/apps/transfer/types/msgs.go
#	modules/apps/transfer/types/msgs_test.go
#	modules/apps/transfer/types/packet.go
#	modules/apps/transfer/types/packet.pb.go
#	modules/apps/transfer/types/packet_test.go
#	modules/apps/transfer/types/tx.pb.go
@damiannolan damiannolan removed their assignment Oct 26, 2022
@colin-axner colin-axner merged commit e967f18 into release/v4.2.x Oct 26, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v4.2.x/pr-2595 branch October 26, 2022 14:31
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 27, 2023
…port cosmos#2595) (cosmos#2598)

* refactor: adapting transfer metadata bytes field to memo string (cosmos#2595)

* adapting transfer metadata bytes field to memo string

* updating changelog

(cherry picked from commit 05685b3)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
#	modules/apps/29-fee/transfer_test.go
#	modules/apps/transfer/client/cli/tx.go
#	modules/apps/transfer/keeper/mbt_relay_test.go
#	modules/apps/transfer/keeper/msg_server_test.go
#	modules/apps/transfer/keeper/relay.go
#	modules/apps/transfer/keeper/relay_test.go
#	modules/apps/transfer/transfer_test.go
#	modules/apps/transfer/types/msgs.go
#	modules/apps/transfer/types/msgs_test.go
#	modules/apps/transfer/types/packet.go
#	modules/apps/transfer/types/packet.pb.go
#	modules/apps/transfer/types/packet_test.go
#	modules/apps/transfer/types/tx.pb.go

* resolving conflicts

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
…port cosmos#2595) (cosmos#2598)

* refactor: adapting transfer metadata bytes field to memo string (cosmos#2595)

* adapting transfer metadata bytes field to memo string

* updating changelog

(cherry picked from commit 05685b3)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
#	modules/apps/29-fee/transfer_test.go
#	modules/apps/transfer/client/cli/tx.go
#	modules/apps/transfer/keeper/mbt_relay_test.go
#	modules/apps/transfer/keeper/msg_server_test.go
#	modules/apps/transfer/keeper/relay.go
#	modules/apps/transfer/keeper/relay_test.go
#	modules/apps/transfer/transfer_test.go
#	modules/apps/transfer/types/msgs.go
#	modules/apps/transfer/types/msgs_test.go
#	modules/apps/transfer/types/packet.go
#	modules/apps/transfer/types/packet.pb.go
#	modules/apps/transfer/types/packet_test.go
#	modules/apps/transfer/types/tx.pb.go

* resolving conflicts

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
…port cosmos#2595) (cosmos#2598)

* refactor: adapting transfer metadata bytes field to memo string (cosmos#2595)

* adapting transfer metadata bytes field to memo string

* updating changelog

(cherry picked from commit 05685b3)

# Conflicts:
#	CHANGELOG.md
#	go.mod
#	go.sum
#	modules/apps/29-fee/transfer_test.go
#	modules/apps/transfer/client/cli/tx.go
#	modules/apps/transfer/keeper/mbt_relay_test.go
#	modules/apps/transfer/keeper/msg_server_test.go
#	modules/apps/transfer/keeper/relay.go
#	modules/apps/transfer/keeper/relay_test.go
#	modules/apps/transfer/transfer_test.go
#	modules/apps/transfer/types/msgs.go
#	modules/apps/transfer/types/msgs_test.go
#	modules/apps/transfer/types/packet.go
#	modules/apps/transfer/types/packet.pb.go
#	modules/apps/transfer/types/packet_test.go
#	modules/apps/transfer/types/tx.pb.go

* resolving conflicts

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
@ulbqb ulbqb mentioned this pull request Jul 31, 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