Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix: adding check for blocked addresses before escrowing fees (backport #1890) #1950

Merged
merged 3 commits into from
Aug 10, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 9, 2022

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

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

You are currently cherry-picking commit 7694903.
  (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/apps/29-fee/keeper/msg_server.go
	modified:   testing/simapp/app.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/apps/29-fee/keeper/msg_server_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: adding check for blocked addresses before escrowing fees

* refactor: move check below isLocked check

* refactor: use sdk error instead of fee error

* feat: adding check to RegisterPayee

* chore: format import

* refactor: remove dist module from unblocked addr

(cherry picked from commit 7694903)

# Conflicts:
#	modules/apps/29-fee/keeper/msg_server_test.go
@crodriguezvega crodriguezvega merged commit 3830bd7 into release/v4.0.x Aug 10, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v4.0.x/pr-1890 branch August 10, 2022 05:54
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 27, 2023
cosmos#1890) (cosmos#1950)

* fix: adding check for blocked addresses before escrowing fees (cosmos#1890)

* fix: adding check for blocked addresses before escrowing fees

* refactor: move check below isLocked check

* refactor: use sdk error instead of fee error

* feat: adding check to RegisterPayee

* chore: format import

* refactor: remove dist module from unblocked addr

(cherry picked from commit 7694903)

# Conflicts:
#	modules/apps/29-fee/keeper/msg_server_test.go

* fix conflicts

Co-authored-by: Sean King <seantking@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <crodveg@gmail.com>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
cosmos#1890) (cosmos#1950)

* fix: adding check for blocked addresses before escrowing fees (cosmos#1890)

* fix: adding check for blocked addresses before escrowing fees

* refactor: move check below isLocked check

* refactor: use sdk error instead of fee error

* feat: adding check to RegisterPayee

* chore: format import

* refactor: remove dist module from unblocked addr

(cherry picked from commit 7694903)

# Conflicts:
#	modules/apps/29-fee/keeper/msg_server_test.go

* fix conflicts

Co-authored-by: Sean King <seantking@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <crodveg@gmail.com>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
cosmos#1890) (cosmos#1950)

* fix: adding check for blocked addresses before escrowing fees (cosmos#1890)

* fix: adding check for blocked addresses before escrowing fees

* refactor: move check below isLocked check

* refactor: use sdk error instead of fee error

* feat: adding check to RegisterPayee

* chore: format import

* refactor: remove dist module from unblocked addr

(cherry picked from commit 7694903)

# Conflicts:
#	modules/apps/29-fee/keeper/msg_server_test.go

* fix conflicts

Co-authored-by: Sean King <seantking@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <crodveg@gmail.com>
@ulbqb ulbqb mentioned this pull request Jul 31, 2023
9 tasks
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants