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!: support for metaprotocol types (backport #2960) #2966

Merged
merged 3 commits into from
Feb 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 27, 2024

This is an automatic backport of pull request #2960 done by Mergify.
Cherry-pick of 3ae75ed has failed:

On branch mergify/bp/release/v15.x/pr-2960
Your branch is up to date with 'origin/release/v15.x'.

You are currently cherry-picking commit 3ae75ed.
  (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:
	new file:   .changelog/unreleased/features/2960-add-metaprotocols-support.md
	new file:   .dockerignore
	modified:   app/modules.go
	new file:   docs/docs/metaprotocols/README.md
	new file:   docs/docs/metaprotocols/_category_.json
	new file:   proto/gaia/metaprotocols/extensions.proto
	modified:   tests/e2e/chain.go
	modified:   tests/e2e/e2e_bank_test.go
	modified:   tests/e2e/e2e_exec_test.go
	modified:   tests/e2e/e2e_test.go
	new file:   x/metaprotocols/README.md
	new file:   x/metaprotocols/module.go
	new file:   x/metaprotocols/types/codec.go
	new file:   x/metaprotocols/types/extensions.pb.go
	new file:   x/metaprotocols/types/keys.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	added by them:   .changelog/v15.0.0/dependencies/2960-add-metaprotocols-support.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

* experimental: add message types for metaprotocols

* experimental: refine multiprotocols support

* Update x/metaprotocols/types/keys.go

Co-authored-by: Simon Noetzlin <[email protected]>

* appease linter

* add docs and rebuild protos

* add docs, tests, readme

* update docs

* update e2e - enable all

* appease linter

* Update tests/e2e/e2e_bank_test.go

Co-authored-by: Philip Offtermatt <[email protected]>

* Update x/metaprotocols/README.md

Co-authored-by: Simon Noetzlin <[email protected]>

* docs: update changelog files

---------

Co-authored-by: Simon Noetzlin <[email protected]>
Co-authored-by: Philip Offtermatt <[email protected]>
(cherry picked from commit 3ae75ed)

# Conflicts:
#	.changelog/v15.0.0/dependencies/2960-add-metaprotocols-support.md
Copy link
Contributor Author

mergify bot commented Feb 27, 2024

Cherry-pick of 3ae75ed has failed:

On branch mergify/bp/release/v15.x/pr-2960
Your branch is up to date with 'origin/release/v15.x'.

You are currently cherry-picking commit 3ae75ed.
  (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:
	new file:   .changelog/unreleased/features/2960-add-metaprotocols-support.md
	new file:   .dockerignore
	modified:   app/modules.go
	new file:   docs/docs/metaprotocols/README.md
	new file:   docs/docs/metaprotocols/_category_.json
	new file:   proto/gaia/metaprotocols/extensions.proto
	modified:   tests/e2e/chain.go
	modified:   tests/e2e/e2e_bank_test.go
	modified:   tests/e2e/e2e_exec_test.go
	modified:   tests/e2e/e2e_test.go
	new file:   x/metaprotocols/README.md
	new file:   x/metaprotocols/module.go
	new file:   x/metaprotocols/types/codec.go
	new file:   x/metaprotocols/types/extensions.pb.go
	new file:   x/metaprotocols/types/keys.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	added by them:   .changelog/v15.0.0/dependencies/2960-add-metaprotocols-support.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@MSalopek
Copy link
Contributor

Had to manually move files in the .changelog directory. Parts of the cherry pick failed and changelog was messed up.

@MSalopek MSalopek merged commit 137c600 into release/v15.x Feb 27, 2024
17 checks passed
@MSalopek MSalopek deleted the mergify/bp/release/v15.x/pr-2960 branch February 27, 2024 19:05
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.

1 participant