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(statemachine)!: Add allow all client wildcard to AllowedClients param (backport #5429) #5609

Merged
merged 8 commits into from
Jan 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 15, 2024

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

On branch mergify/bp/release/v8.1.x/pr-5429
Your branch is up to date with 'origin/release/v8.1.x'.

You are currently cherry-picking commit d5949b1a.
  (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/docs/01-ibc/11-troubleshooting.md
	modified:   docs/docs/03-light-clients/01-developer-guide/09-setup.md
	modified:   docs/docs/03-light-clients/02-localhost/02-integration.md
	modified:   docs/params/params.md
	modified:   modules/core/02-client/types/keys.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/docs/03-light-clients/04-wasm/03-integration.md
	deleted by us:   e2e/tests/wasm/grandpa_test.go
	deleted by us:   e2e/testsuite/testconfig.go
	deleted by us:   e2e/testvalues/values.go
	both modified:   modules/core/02-client/types/params.go
	both modified:   modules/core/02-client/types/params_test.go
	deleted by us:   modules/light-clients/08-wasm/keeper/keeper_test.go
	deleted by us:   modules/light-clients/08-wasm/testing/wasm_endpoint.go
	deleted by us:   modules/light-clients/08-wasm/types/types_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

…param (#5429)

* add wildcard allow all client

* minor

* fix lint

* minor and doc update

* review comments

* if allow all clients is present, no other client types should be in the allow list

* clean up code to allow wasm client type

* remove unused variable

* Fix build failures, tweak err message.

* modify allow clients list in genesis with feature releases

* chore: adding v8.1 to minor versions in e2e feat releases struct

* update docs

* chore: doc lint fixes

---------

Co-authored-by: GnaD <89174180+GNaD13@users.noreply.github.com>
Co-authored-by: Du Nguyen <61083705+lichdu29@users.noreply.github.com>
Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
Co-authored-by: Damian Nolan <damiannolan@gmail.com>
Co-authored-by: Đỗ Việt Hoàng <hoangdv2429@gmail.com>
Co-authored-by: Charly <charly@interchain.io>
(cherry picked from commit d5949b1)

# Conflicts:
#	docs/docs/03-light-clients/04-wasm/03-integration.md
#	e2e/tests/wasm/grandpa_test.go
#	e2e/testsuite/testconfig.go
#	e2e/testvalues/values.go
#	modules/core/02-client/types/params.go
#	modules/core/02-client/types/params_test.go
#	modules/light-clients/08-wasm/keeper/keeper_test.go
#	modules/light-clients/08-wasm/testing/wasm_endpoint.go
#	modules/light-clients/08-wasm/types/types_test.go
@damiannolan
Copy link
Member

I recommend using the file filter to remove docs changes from the diffs. The markdown link checkers is now failing because of the removal of the docs directory, we could also remove that. I don't see any need for it on release branches if all docs are now maintained on main.

@damiannolan
Copy link
Member

The differences between this and the original PR:

  • Docs directory removed
  • E2E diretory removed
  • Changes to 08-wasm client removed (as 08-wasm does not exist on this release branch)

Copy link
Contributor

@DimitrisJim DimitrisJim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

big thanks for cleaning up after sloppy mergify here ❤️

Copy link
Contributor

@crodriguezvega crodriguezvega left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a ton, @damiannolan!

@crodriguezvega crodriguezvega merged commit b99a6bf into release/v8.1.x Jan 15, 2024
19 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v8.1.x/pr-5429 branch January 15, 2024 16:35
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