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: add authz support for ics20 (backport #3079) #3101

Merged
merged 3 commits into from
Feb 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 2, 2023

This is an automatic backport of pull request #3079 done by Mergify.
Cherry-pick of 6c008ea has failed:

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

You are currently cherry-picking commit 6c008ea2.
  (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
	new file:   e2e/tests/transfer/authz_test.go
	modified:   go.mod
	new file:   modules/apps/transfer/types/authz.pb.go
	modified:   modules/apps/transfer/types/codec.go
	modified:   modules/apps/transfer/types/errors.go
	new file:   modules/apps/transfer/types/transfer_authorization.go
	new file:   modules/apps/transfer/types/transfer_authorization_test.go
	renamed:    modules/apps/transfer/types/ack_test.go -> modules/apps/transfer/types/types_test.go
	new file:   proto/ibc/applications/transfer/v1/authz.proto

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/e2e-manual-simd.yaml
	deleted by us:   e2e/testconfig/testconfig.go
	deleted by us:   e2e/testsuite/codec.go
	deleted by us:   e2e/testsuite/testsuite.go
	deleted by us:   e2e/testvalues/values.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

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
Co-authored-by: Cian Hatton <cianhatton@gmail.com>
Co-authored-by: Charleen Fei <charly@interchain.io>
Co-authored-by: Zaki Manian <zaki@manian.org>
(cherry picked from commit 6c008ea)

# Conflicts:
#	.github/workflows/e2e-manual-simd.yaml
#	e2e/testconfig/testconfig.go
#	e2e/testsuite/codec.go
#	e2e/testsuite/testsuite.go
#	e2e/testvalues/values.go
@chatton chatton merged commit f08fa66 into release/v7.0.x Feb 2, 2023
@chatton chatton deleted the mergify/bp/release/v7.0.x/pr-3079 branch February 2, 2023 11:47
@faddat faddat mentioned this pull request Jun 23, 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.

3 participants