Skip to content

fix: prevent blocked addresses from sending ICS 20 transfers (backport #1907)#1946

Merged
crodriguezvega merged 2 commits intorelease/v4.0.xfrom
mergify/bp/release/v4.0.x/pr-1907
Aug 9, 2022
Merged

fix: prevent blocked addresses from sending ICS 20 transfers (backport #1907)#1946
crodriguezvega merged 2 commits intorelease/v4.0.xfrom
mergify/bp/release/v4.0.x/pr-1907

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Aug 9, 2022

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

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

You are currently cherry-picking commit f891c29.
  (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:   modules/apps/transfer/keeper/msg_server.go
	new file:   modules/apps/transfer/keeper/msg_server_test.go
	modified:   modules/apps/transfer/keeper/relay.go
	modified:   testing/chain.go

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

* fix bug, add test

Ensures that a sender account isn't a blocked address
Added test cases for MsgTransfer handling

* update documentation

* move blocked address check to SendTransfer

* add changelog entry

(cherry picked from commit f891c29)

# Conflicts:
#	modules/apps/transfer/keeper/relay_test.go
@crodriguezvega crodriguezvega merged commit dd49a93 into release/v4.0.x Aug 9, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v4.0.x/pr-1907 branch August 9, 2022 19:18
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 27, 2023
…cosmos#1907) (cosmos#1946)

* fix: prevent blocked addresses from sending ICS 20 transfers (cosmos#1907)

* fix bug, add test

Ensures that a sender account isn't a blocked address
Added test cases for MsgTransfer handling

* update documentation

* move blocked address check to SendTransfer

* add changelog entry

(cherry picked from commit f891c29)

* fix conflicts
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
…cosmos#1907) (cosmos#1946)

* fix: prevent blocked addresses from sending ICS 20 transfers (cosmos#1907)

* fix bug, add test

Ensures that a sender account isn't a blocked address
Added test cases for MsgTransfer handling

* update documentation

* move blocked address check to SendTransfer

* add changelog entry

(cherry picked from commit f891c29)

* fix conflicts
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
…cosmos#1907) (cosmos#1946)

* fix: prevent blocked addresses from sending ICS 20 transfers (cosmos#1907)

* fix bug, add test

Ensures that a sender account isn't a blocked address
Added test cases for MsgTransfer handling

* update documentation

* move blocked address check to SendTransfer

* add changelog entry

(cherry picked from commit f891c29)

* fix conflicts
@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.

4 participants