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

feat(bank): Allow injectable restrictions on bank transfers (backport #14224) #17457

Merged
merged 3 commits into from
Sep 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 18, 2023

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

On branch mergify/bp/release/v0.50.x/pr-14224
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit ff2e5a236.
  (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:   x/bank/README.md
	new file:   x/bank/keeper/export_test.go
	modified:   x/bank/keeper/keeper.go
	modified:   x/bank/keeper/keeper_test.go
	modified:   x/bank/keeper/send.go
	new file:   x/bank/types/restrictions.go
	new file:   x/bank/types/restrictions_test.go
	modified:   x/gov/testutil/expected_keepers_mocks.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

(cherry picked from commit ff2e5a2)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner August 18, 2023 22:51
@mergify mergify bot added the conflicts label Aug 18, 2023
@julienrbrt julienrbrt marked this pull request as draft August 18, 2023 22:52
@julienrbrt
Copy link
Member

julienrbrt commented Aug 18, 2023

Let's wait after #17453 and more internal discussion and audit before merging this.

@julienrbrt julienrbrt marked this pull request as ready for review August 24, 2023 14:45
@julienrbrt
Copy link
Member

Gentle ping @elias-orijtech

@elias-orijtech
Copy link
Contributor

Sorry, I wasn't aware I held up the merge. The PR itself LGTM. I still think the proposed API makes it too easy to introduce incompatible restriction functions, but I suppose we can wait and see how it turns out.

@julienrbrt julienrbrt merged commit 8cff58c into release/v0.50.x Sep 7, 2023
49 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-14224 branch September 7, 2023 20:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants