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

fix: remove 08-wasm from 02-client exported (backport #5306) #5313

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 5, 2023

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

On branch mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x/pr-5306
Your branch is up to date with 'origin/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x'.

You are currently cherry-picking commit e3ab9bec.
  (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/core/exported/client.go
	modified:   modules/light-clients/08-wasm/keeper/keeper_test.go
	modified:   modules/light-clients/08-wasm/testing/wasm_endpoint.go
	modified:   modules/light-clients/08-wasm/types/client_message.go
	modified:   modules/light-clients/08-wasm/types/client_state.go
	modified:   modules/light-clients/08-wasm/types/consensus_state.go
	modified:   modules/light-clients/08-wasm/types/types_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   e2e/tests/wasm/grandpa_test.go
	both modified:   modules/core/02-client/types/params.go
	both modified:   modules/light-clients/08-wasm/types/client_message_test.go
	both modified:   modules/light-clients/08-wasm/types/consensus_state_test.go
	both modified:   modules/light-clients/08-wasm/types/keys.go
	both modified:   modules/light-clients/08-wasm/types/validation.go
	both modified:   modules/light-clients/08-wasm/types/validation_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: remove 08-wasm from 02-client exported

* fix grandpa test

* add function to add 08-wasm to allowed clients

* e2e: add gov proposal to add 08-wasm client to list of allowed clients

* use cosmos chain when querying gov module address

* make functions for querying allowed clients and to add 08-wasm

* Update modules/light-clients/08-wasm/types/validation.go

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>

* Update modules/light-clients/08-wasm/types/keys.go

Co-authored-by: Damian Nolan <damiannolan@gmail.com>

* Update keys.go

---------

Co-authored-by: DimitrisJim <d.f.hilliard@gmail.com>
Co-authored-by: Damian Nolan <damiannolan@gmail.com>
(cherry picked from commit e3ab9be)

# Conflicts:
#	e2e/tests/wasm/grandpa_test.go
#	modules/core/02-client/types/params.go
#	modules/light-clients/08-wasm/types/client_message_test.go
#	modules/light-clients/08-wasm/types/consensus_state_test.go
#	modules/light-clients/08-wasm/types/keys.go
#	modules/light-clients/08-wasm/types/validation.go
#	modules/light-clients/08-wasm/types/validation_test.go
Copy link
Member

@damiannolan damiannolan left a comment

Choose a reason for hiding this comment

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

fast @crodriguezvega 🐎 thanks for fixing conflicts!

@crodriguezvega crodriguezvega merged commit 1156da4 into 08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x Dec 5, 2023
17 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/08-wasm/release/v0.1.x+ibc-go-v7.3.x-wasmvm-v1.5.x/pr-5306 branch December 5, 2023 12:24
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