-
Notifications
You must be signed in to change notification settings - Fork 586
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
colin-axner
merged 2 commits into
release/v4.2.x
from
mergify/bp/release/v4.2.x/pr-2595
Oct 26, 2022
Merged
refactor: adapting transfer metadata bytes field to memo string (backport #2595) #2598
colin-axner
merged 2 commits into
release/v4.2.x
from
mergify/bp/release/v4.2.x/pr-2595
Oct 26, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
mergify
bot
requested review from
AdityaSripal,
seantking,
charleenfei,
colin-axner,
damiannolan,
fedekunze,
crodriguezvega and
chatton
as code owners
October 26, 2022 13:20
damiannolan
approved these changes
Oct 26, 2022
colin-axner
approved these changes
Oct 26, 2022
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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #2595 done by Mergify.
Cherry-pick of 05685b3 has failed:
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>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com